diff options
204 files changed, 3861 insertions, 2064 deletions
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 26eb9e26bd004..28540a9167075 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -13,7 +13,7 @@ into your `configuration.nix` or bring them into scope with `nix-shell -p rustc For other versions such as daily builds (beta and nightly), use either `rustup` from nixpkgs (which will manage the rust installation in your home directory), -or use Mozilla's [Rust nightlies overlay](#using-the-rust-nightlies-overlay). +or use a community maintained [Rust overlay](#using-community-rust-overlays). ## Compiling Rust applications with Cargo {#compiling-rust-applications-with-cargo} @@ -411,7 +411,7 @@ you of the correct hash. `rustPlatform` provides the following hooks to automate Cargo builds: -* `cargoSetupHook`: configure Cargo to use depenencies vendored +* `cargoSetupHook`: configure Cargo to use dependencies vendored through `fetchCargoTarball`. This hook uses the `cargoDeps` environment variable to find the vendored dependencies. If a project already vendors its dependencies, the variable `cargoVendorDir` can @@ -672,7 +672,7 @@ Some crates require external libraries. For crates from `defaultCrateOverrides` package in nixpkgs itself. Starting from that file, one can add more overrides, to add features -or build inputs by overriding the hello crate in a seperate file. +or build inputs by overriding the hello crate in a separate file. ```nix with import <nixpkgs> {}; @@ -871,76 +871,107 @@ rustc 1.26.0-nightly (188e693b3 2018-03-26) To see that you are using nightly. -## Using the Rust nightlies overlay {#using-the-rust-nightlies-overlay} +## Using community Rust overlays {#using-community-rust-overlays} -Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope. -This overlay can _also_ be used to install recent unstable or stable versions -of Rust, if desired. +There are two community maintained approaches to Rust toolchain management: +- [oxalica's Rust overlay](https://github.com/oxalica/rust-overlay) +- [fenix](https://github.com/nix-community/fenix) -### Rust overlay installation {#rust-overlay-installation} - -You can use this overlay by either changing your local nixpkgs configuration, -or by adding the overlay declaratively in a nix expression, e.g. in `configuration.nix`. -For more information see [the manual on installing overlays](#sec-overlays-install). - -#### Imperative rust overlay installation {#imperative-rust-overlay-installation} +Oxalica's overlay allows you to select a particular Rust version and components. +See [their documentation](https://github.com/oxalica/rust-overlay#rust-overlay) for more +detailed usage. -Clone [nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla), -and create a symbolic link to the file -[rust-overlay.nix](https://github.com/mozilla/nixpkgs-mozilla/blob/master/rust-overlay.nix) -in the `~/.config/nixpkgs/overlays` directory. +Fenix is an alternative to `rustup` and can also be used as an overlay. -```ShellSession -$ git clone https://github.com/mozilla/nixpkgs-mozilla.git -$ mkdir -p ~/.config/nixpkgs/overlays -$ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix -``` +Both Oxalica's overlay and fenix better integrate with nix and cache optimizations. +Because of this and ergonomics, either of those community projects +should be preferred to the Mozilla's Rust overlay (nixpkgs-mozilla). -### Declarative rust overlay installation {#declarative-rust-overlay-installation} - -Add the following to your `configuration.nix`, `home-configuration.nix`, `shell.nix`, or similar: +### How to select a specific rustc and toolchain version {#how-to-select-a-specific-rustc-and-toolchain-version} +You can consume the oxalica overlay and use it to grab a specific Rust toolchain version. +Here is an example `shell.nix` showing how to grab the current stable toolchain: ```nix { pkgs ? import <nixpkgs> { overlays = [ - (import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz)) - # Further overlays go here + (import (fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz")) ]; - }; -}; + } +}: +pkgs.mkShell { + nativeBuildInputs = with pkgs; [ + pkg-config + rust-bin.stable.latest.minimal + ]; +} ``` -Note that this will fetch the latest overlay version when rebuilding your system. +You can try this out by: +1. Saving that to `shell.nix` +2. Executing `nix-shell --pure --command 'rustc --version'` -### Rust overlay usage {#rust-overlay-usage} +As of writing, this prints out `rustc 1.56.0 (09c42c458 2021-10-18)`. -The overlay contains attribute sets corresponding to different versions of the rust toolchain, such as: +### How to use an overlay toolchain in a derivation {#how-to-use-an-overlay-toolchain-in-a-derivation} -* `latest.rustChannels.stable` -* `latest.rustChannels.nightly` -* a function `rustChannelOf`, called as `(rustChannelOf { date = "2018-04-11"; channel = "nightly"; })`, or... -* `(nixpkgs.rustChannelOf { rustToolchain = ./rust-toolchain; })` if you have a local `rust-toolchain` file (see https://github.com/mozilla/nixpkgs-mozilla#using-in-nix-expressions for an example) +You can also use an overlay's Rust toolchain with `buildRustPackage`. +The below snippet demonstrates invoking `buildRustPackage` with an oxalica overlay selected Rust toolchain: +```nix +with import <nixpkgs> { + overlays = [ + (import (fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz")) + ]; +}; -Each of these contain packages such as `rust`, which contains your usual rust development tools with the respective toolchain chosen. -For example, you might want to add `latest.rustChannels.stable.rust` to the list of packages in your configuration. +rustPlatform.buildRustPackage rec { + pname = "ripgrep"; + version = "12.1.1"; + nativeBuildInputs = [ + rust-bin.stable.latest.minimal + ]; + + src = fetchFromGitHub { + owner = "BurntSushi"; + repo = "ripgrep"; + rev = version; + sha256 = "1hqps7l5qrjh9f914r5i6kmcz6f1yb951nv4lby0cjnp5l253kps"; + }; -Imperatively, the latest stable version can be installed with the following command: + cargoSha256 = "03wf9r2csi6jpa7v5sw5lpxkrk4wfzwmzx7k3991q3bdjzcwnnwp"; -```ShellSession -$ nix-env -Ai nixpkgs.latest.rustChannels.stable.rust + meta = with lib; { + description = "A fast line-oriented regex search tool, similar to ag and ack"; + homepage = "https://github.com/BurntSushi/ripgrep"; + license = licenses.unlicense; + maintainers = [ maintainers.tailhook ]; + }; +} ``` -Or using the attribute with nix-shell: +Follow the below steps to try that snippet. +1. create a new directory +1. save the above snippet as `default.nix` in that directory +1. cd into that directory and run `nix-build` -```ShellSession -$ nix-shell -p nixpkgs.latest.rustChannels.stable.rust -``` +### Rust overlay installation {#rust-overlay-installation} + +You can use this overlay by either changing your local nixpkgs configuration, +or by adding the overlay declaratively in a nix expression, e.g. in `configuration.nix`. +For more information see [the manual on installing overlays](#sec-overlays-install). + +### Declarative Rust overlay installation {#declarative-rust-overlay-installation} -Substitute the `nixpkgs` prefix with `nixos` on NixOS. -To install the beta or nightly channel, "stable" should be substituted by -"nightly" or "beta", or -use the function provided by this overlay to pull a version based on a -build date. +This snippet shows how to use oxalica's Rust overlay. +Add the following to your `configuration.nix`, `home-configuration.nix`, `shell.nix`, or similar: -The overlay automatically updates itself as it uses the same source as -[rustup](https://www.rustup.rs/). +```nix +{ pkgs ? import <nixpkgs> { + overlays = [ + (import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz")) + # Further overlays go here + ]; + }; +}; +``` + +Note that this will fetch the latest overlay version when rebuilding your system. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c76f39f769247..931040ad89020 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6252,6 +6252,12 @@ githubId = 278013; name = "Tomasz Kontusz"; }; + kubukoz = { + email = "kubukoz@gmail.com"; + github = "kubukoz"; + githubId = 894884; + name = "Jakub Kozłowski"; + }; kurnevsky = { email = "kurnevsky@gmail.com"; github = "kurnevsky"; @@ -8904,6 +8910,12 @@ githubId = 421510; name = "Noé Rubinstein"; }; + photex = { + email = "photex@gmail.com"; + github = "photex"; + githubId = 301903; + name = "Chip Collier"; + }; phreedom = { email = "phreedom@yandex.ru"; github = "phreedom"; @@ -10784,6 +10796,12 @@ github = "staccato"; githubId = 86573128; }; + stackshadow = { + email = "stackshadow@evilbrain.de"; + github = "stackshadow"; + githubId = 7512804; + name = "Martin Langlotz"; + }; steell = { email = "steve@steellworks.com"; github = "Steell"; diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index 52cce90991831..990185bbb3bc7 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -37,7 +37,7 @@ let keyDrv = drv: if canEval drv.drvPath then { key = drv.drvPath; value = drv; } else { }; immediateDependenciesOf = drv: - concatLists (mapAttrsToList (n: v: derivationsIn v) (removeAttrs drv ["meta" "passthru"])); + concatLists (mapAttrsToList (n: v: derivationsIn v) (removeAttrs drv (["meta" "passthru"] ++ optionals (drv?passthru) (attrNames drv.passthru)))); derivationsIn = x: if !canEval x then [] diff --git a/nixos/doc/manual/administration/cleaning-store.chapter.md b/nixos/doc/manual/administration/cleaning-store.chapter.md index fb2090b31d84a..c9140d0869c77 100644 --- a/nixos/doc/manual/administration/cleaning-store.chapter.md +++ b/nixos/doc/manual/administration/cleaning-store.chapter.md @@ -58,5 +58,5 @@ a while to finish. ## NixOS Boot Entries {#sect-nixos-gc-boot-entries} If your `/boot` partition runs out of space, after clearing old profiles -you must rebuild your system with `nixos-rebuild` to update the `/boot` -partition and clear space. +you must rebuild your system with `nixos-rebuild boot` or `nixos-rebuild +switch` to update the `/boot` partition and clear space. diff --git a/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml b/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml index 0ca98dd6e5101..4243d2bf53f9b 100644 --- a/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml +++ b/nixos/doc/manual/from_md/administration/cleaning-store.chapter.xml @@ -64,7 +64,8 @@ $ nix-store --optimise <para> If your <literal>/boot</literal> partition runs out of space, after clearing old profiles you must rebuild your system with - <literal>nixos-rebuild</literal> to update the + <literal>nixos-rebuild boot</literal> or + <literal>nixos-rebuild switch</literal> to update the <literal>/boot</literal> partition and clear space. </para> </section> diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 4a134e42a0f9f..121d9e4ad4baa 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -413,6 +413,11 @@ <link linkend="opt-hardware.rasdaemon.enable">hardware.rasdaemon</link>. </para> </listitem> + <listitem> + <para> + <literal>code-server</literal>-module now available + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-incompatibilities"> @@ -1743,6 +1748,14 @@ Superuser created successfully. </listitem> <listitem> <para> + A new option + <literal>services.prometheus.enableReload</literal> has been + added which can be enabled to reload the prometheus service + when its config file changes instead of restarting. + </para> + </listitem> + <listitem> + <para> Dokuwiki now supports caddy! However </para> <itemizedlist spacing="compact"> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 1e815616f2015..0d114bbde8705 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -124,6 +124,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [rasdaemon](https://github.com/mchehab/rasdaemon), a hardware error logging daemon. Available as [hardware.rasdaemon](#opt-hardware.rasdaemon.enable). +- `code-server`-module now available + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The `services.wakeonlan` option was removed, and replaced with `networking.interfaces.<name>.wakeOnLan`. @@ -493,6 +495,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `cawbird` Twitter client now uses its own API keys to count as different application than upstream builds. This is done to evade application-level rate limiting. While existing accounts continue to work, users may want to remove and re-register their account in the client to enjoy a better user experience and benefit from this change. +- A new option `services.prometheus.enableReload` has been added which can be enabled to reload the prometheus service when its config file changes instead of restarting. + - Dokuwiki now supports caddy! However - the nginx option has been removed, in the new configuration, please use the `dokuwiki.webserver = "nginx"` instead. - The "${hostname}" option has been deprecated, please use `dokuwiki.sites = [ "${hostname}" ]` instead diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dc152848fb48d..c951db5822a23 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -974,6 +974,7 @@ ./services/web-apps/atlassian/jira.nix ./services/web-apps/bookstack.nix ./services/web-apps/calibre-web.nix + ./services/web-apps/code-server.nix ./services/web-apps/convos.nix ./services/web-apps/cryptpad.nix ./services/web-apps/dex.nix diff --git a/nixos/modules/services/audio/roon-server.nix b/nixos/modules/services/audio/roon-server.nix index 42da5a100170f..566c7cae42ce6 100644 --- a/nixos/modules/services/audio/roon-server.nix +++ b/nixos/modules/services/audio/roon-server.nix @@ -42,7 +42,7 @@ in { environment.ROON_DATAROOT = "/var/lib/${name}"; serviceConfig = { - ExecStart = "${pkgs.roon-server}/start.sh"; + ExecStart = "${pkgs.roon-server}/bin/RoonServer"; LimitNOFILE = 8192; User = cfg.user; Group = cfg.group; diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix index 8f6c4fa1d4f6e..4be3e881a9dc3 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -13,10 +13,10 @@ let # Use upstream config files passed through spa-json-dump as the base # Patched here as necessary for them to work with this module defaults = { - alsa-monitor = (builtins.fromJSON (builtins.readFile ./media-session/alsa-monitor.conf.json)); - bluez-monitor = (builtins.fromJSON (builtins.readFile ./media-session/bluez-monitor.conf.json)); - media-session = (builtins.fromJSON (builtins.readFile ./media-session/media-session.conf.json)); - v4l2-monitor = (builtins.fromJSON (builtins.readFile ./media-session/v4l2-monitor.conf.json)); + alsa-monitor = lib.importJSON ./media-session/alsa-monitor.conf.json; + bluez-monitor = lib.importJSON ./media-session/bluez-monitor.conf.json; + media-session = lib.importJSON ./media-session/media-session.conf.json; + v4l2-monitor = lib.importJSON ./media-session/v4l2-monitor.conf.json; }; configs = { diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index 273d518033db0..55755ecd64577 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -22,11 +22,11 @@ let # Use upstream config files passed through spa-json-dump as the base # Patched here as necessary for them to work with this module defaults = { - client = builtins.fromJSON (builtins.readFile ./daemon/client.conf.json); - client-rt = builtins.fromJSON (builtins.readFile ./daemon/client-rt.conf.json); - jack = builtins.fromJSON (builtins.readFile ./daemon/jack.conf.json); - pipewire = builtins.fromJSON (builtins.readFile ./daemon/pipewire.conf.json); - pipewire-pulse = builtins.fromJSON (builtins.readFile ./daemon/pipewire-pulse.conf.json); + client = lib.importJSON ./daemon/client.conf.json; + client-rt = lib.importJSON ./daemon/client-rt.conf.json; + jack = lib.importJSON ./daemon/jack.conf.json; + pipewire = lib.importJSON ./daemon/pipewire.conf.json; + pipewire-pulse = lib.importJSON ./daemon/pipewire-pulse.conf.json; }; configs = { diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index d2b37cf688bf8..5f7bda1acbc64 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -7,6 +7,30 @@ let workingDir = "/var/lib/" + cfg.stateDir; + prometheusYmlOut = "${workingDir}/prometheus-substituted.yaml"; + + writeConfig = pkgs.writeShellScriptBin "write-prometheus-config" '' + PATH="${makeBinPath (with pkgs; [ coreutils envsubst ])}" + touch '${prometheusYmlOut}' + chmod 600 '${prometheusYmlOut}' + envsubst -o '${prometheusYmlOut}' -i '${prometheusYml}' + ''; + + triggerReload = pkgs.writeShellScriptBin "trigger-reload-prometheus" '' + PATH="${makeBinPath (with pkgs; [ systemd ])}" + if systemctl -q is-active prometheus.service; then + systemctl reload prometheus.service + fi + ''; + + reload = pkgs.writeShellScriptBin "reload-prometheus" '' + PATH="${makeBinPath (with pkgs; [ systemd coreutils gnugrep ])}" + cursor=$(journalctl --show-cursor -n0 | grep -oP "cursor: \K.*") + kill -HUP $MAINPID + journalctl -u prometheus.service --after-cursor="$cursor" -f \ + | grep -m 1 "Completed loading of configuration file" > /dev/null + ''; + # a wrapper that verifies that the configuration is valid promtoolCheck = what: name: file: if cfg.checkConfig then @@ -47,7 +71,11 @@ let cmdlineArgs = cfg.extraFlags ++ [ "--storage.tsdb.path=${workingDir}/data/" - "--config.file=/run/prometheus/prometheus-substituted.yaml" + "--config.file=${ + if cfg.enableReload + then prometheusYmlOut + else "/run/prometheus/prometheus-substituted.yaml" + }" "--web.listen-address=${cfg.listenAddress}:${builtins.toString cfg.port}" "--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}" "--alertmanager.timeout=${toString cfg.alertmanagerTimeout}s" @@ -731,6 +759,25 @@ in { ''; }; + enableReload = mkOption { + default = false; + type = types.bool; + description = '' + Reload prometheus when configuration file changes (instead of restart). + + The following property holds: switching to a configuration + (<literal>switch-to-configuration</literal>) that changes the prometheus + configuration only finishes successully when prometheus has finished + loading the new configuration. + + Note that prometheus will also get reloaded when the location of the + <option>environmentFile</option> changes but not when its contents + changes. So when you change it contents make sure to reload prometheus + manually or include the hash of <option>environmentFile</option> in its + name. + ''; + }; + environmentFile = mkOption { type = types.nullOr types.path; default = null; @@ -928,7 +975,7 @@ in { systemd.services.prometheus = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - preStart = '' + preStart = mkIf (!cfg.enableReload) '' ${lib.getBin pkgs.envsubst}/bin/envsubst -o "/run/prometheus/prometheus-substituted.yaml" \ -i "${prometheusYml}" ''; @@ -936,9 +983,10 @@ in { ExecStart = "${cfg.package}/bin/prometheus" + optionalString (length cmdlineArgs != 0) (" \\\n " + concatStringsSep " \\\n " cmdlineArgs); + ExecReload = mkIf cfg.enableReload "+${reload}/bin/reload-prometheus"; User = "prometheus"; Restart = "always"; - EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; + EnvironmentFile = mkIf (cfg.environmentFile != null && !cfg.enableReload) [ cfg.environmentFile ]; RuntimeDirectory = "prometheus"; RuntimeDirectoryMode = "0700"; WorkingDirectory = workingDir; @@ -946,5 +994,48 @@ in { StateDirectoryMode = "0700"; }; }; + systemd.services.prometheus-config-write = mkIf cfg.enableReload { + wantedBy = [ "prometheus.service" ]; + before = [ "prometheus.service" ]; + serviceConfig = { + Type = "oneshot"; + User = "prometheus"; + StateDirectory = cfg.stateDir; + StateDirectoryMode = "0700"; + EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; + ExecStart = "${writeConfig}/bin/write-prometheus-config"; + }; + }; + # prometheus-config-reload will activate after prometheus. However, what we + # don't want is that on startup it immediately reloads prometheus because + # prometheus itself might have just started. + # + # Instead we only want to reload prometheus when the config file has + # changed. So on startup prometheus-config-reload will just output a + # harmless message and then stay active (RemainAfterExit). + # + # Then, when the config file has changed, switch-to-configuration notices + # that this service has changed and needs to be reloaded + # (reloadIfChanged). The reload command then actually writes the new config + # and reloads prometheus. + systemd.services.prometheus-config-reload = mkIf cfg.enableReload { + wantedBy = [ "prometheus.service" ]; + after = [ "prometheus.service" ]; + reloadIfChanged = true; + serviceConfig = { + Type = "oneshot"; + User = "prometheus"; + StateDirectory = cfg.stateDir; + StateDirectoryMode = "0700"; + EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; + RemainAfterExit = true; + TimeoutSec = 60; + ExecStart = "${pkgs.logger}/bin/logger 'prometheus-config-reload will only reload prometheus when reloaded itself.'"; + ExecReload = [ + "${writeConfig}/bin/write-prometheus-config" + "+${triggerReload}/bin/trigger-reload-prometheus" + ]; + }; + }; }; } diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix index e34b6e0510a51..36f7b937d5acd 100644 --- a/nixos/modules/services/video/epgstation/default.nix +++ b/nixos/modules/services/video/epgstation/default.nix @@ -33,7 +33,7 @@ let fi ''; - streamingConfig = builtins.fromJSON (builtins.readFile ./streaming.json); + streamingConfig = lib.importJSON ./streaming.json; logConfig = { appenders.stdout.type = "stdout"; categories = { diff --git a/nixos/modules/services/web-apps/code-server.nix b/nixos/modules/services/web-apps/code-server.nix new file mode 100644 index 0000000000000..474e9140ae87b --- /dev/null +++ b/nixos/modules/services/web-apps/code-server.nix @@ -0,0 +1,139 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + + cfg = config.services.code-server; + defaultUser = "code-server"; + defaultGroup = defaultUser; + +in { + ###### interface + options = { + services.code-server = { + enable = mkEnableOption "code-server"; + + package = mkOption { + default = pkgs.code-server; + defaultText = "pkgs.code-server"; + description = "Which code-server derivation to use."; + type = types.package; + }; + + extraPackages = mkOption { + default = [ ]; + description = "Packages that are available in the PATH of code-server."; + example = "[ pkgs.go ]"; + type = types.listOf types.package; + }; + + extraEnvironment = mkOption { + type = types.attrsOf types.str; + description = + "Additional environment variables to passed to code-server."; + default = { }; + example = { PKG_CONFIG_PATH = "/run/current-system/sw/lib/pkgconfig"; }; + }; + + extraArguments = mkOption { + default = [ "--disable-telemetry" ]; + description = "Additional arguments that passed to code-server"; + example = ''[ "--verbose" ]''; + type = types.listOf types.str; + }; + + host = mkOption { + default = "127.0.0.1"; + description = "The host-ip to bind to."; + type = types.str; + }; + + port = mkOption { + default = 4444; + description = "The port where code-server runs."; + type = types.port; + }; + + auth = mkOption { + default = "password"; + description = "The type of authentication to use."; + type = types.enum [ "none" "password" ]; + }; + + hashedPassword = mkOption { + default = ""; + description = + "Create the password with: 'echo -n 'thisismypassword' | npx argon2-cli -e'."; + type = types.str; + }; + + user = mkOption { + default = defaultUser; + example = "yourUser"; + description = '' + The user to run code-server as. + By default, a user named <literal>${defaultUser}</literal> will be created. + ''; + type = types.str; + }; + + group = mkOption { + default = defaultGroup; + example = "yourGroup"; + description = '' + The group to run code-server under. + By default, a group named <literal>${defaultGroup}</literal> will be created. + ''; + type = types.str; + }; + + extraGroups = mkOption { + default = [ ]; + description = + "An array of additional groups for the <literal>${defaultUser}</literal> user."; + example = [ "docker" ]; + type = types.listOf types.str; + }; + + }; + }; + + ###### implementation + config = mkIf cfg.enable { + systemd.services.code-server = { + description = "VSCode server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + path = cfg.extraPackages; + environment = { + HASHED_PASSWORD = cfg.hashedPassword; + } // cfg.extraEnvironment; + serviceConfig = { + ExecStart = "${cfg.package}/bin/code-server --bind-addr ${cfg.host}:${toString cfg.port} --auth ${cfg.auth} " + builtins.concatStringsSep " " cfg.extraArguments; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + RuntimeDirectory = cfg.user; + User = cfg.user; + Group = cfg.group; + Restart = "on-failure"; + }; + + }; + + users.users."${cfg.user}" = mkMerge [ + (mkIf (cfg.user == defaultUser) { + isNormalUser = true; + description = "code-server user"; + inherit (cfg) group; + }) + { + packages = cfg.extraPackages; + inherit (cfg) extraGroups; + } + ]; + + users.groups."${defaultGroup}" = mkIf (cfg.group == defaultGroup) { }; + + }; + + meta.maintainers = with maintainers; [ stackshadow ]; +} diff --git a/nixos/modules/services/web-servers/trafficserver/default.nix b/nixos/modules/services/web-servers/trafficserver/default.nix index 706ea5bfefba0..b52087fa038c1 100644 --- a/nixos/modules/services/web-servers/trafficserver/default.nix +++ b/nixos/modules/services/web-servers/trafficserver/default.nix @@ -61,7 +61,7 @@ in ipAllow = mkOption { type = types.nullOr yaml.type; - default = builtins.fromJSON (builtins.readFile ./ip_allow.json); + default = lib.importJSON ./ip_allow.json; defaultText = literalDocBook "upstream defaults"; example = literalExpression '' { @@ -84,7 +84,7 @@ in logging = mkOption { type = types.nullOr yaml.type; - default = builtins.fromJSON (builtins.readFile ./logging.json); + default = lib.importJSON ./logging.json; defaultText = literalDocBook "upstream defaults"; example = { }; description = '' diff --git a/nixos/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl index eed20065087fa..be6b2d9ae71ef 100644 --- a/nixos/modules/system/etc/setup-etc.pl +++ b/nixos/modules/system/etc/setup-etc.pl @@ -138,3 +138,9 @@ foreach my $fn (@oldCopied) { # Rewrite /etc/.clean. close CLEAN; write_file("/etc/.clean", map { "$_\n" } @copied); + +# Create /etc/NIXOS tag if not exists. +# When /etc is not on a persistent filesystem, it will be wiped after reboot, +# so we need to check and re-create it during activation. +open TAG, ">>/etc/NIXOS"; +close TAG; diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index 3cc38ebe34716..a7b955d447215 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -58,9 +58,9 @@ let [ ./hardware-configuration.nix <nixpkgs/nixos/modules/testing/test-instrumentation.nix> ]; - } // (builtins.fromJSON (builtins.readFile ${ + } // pkgs.lib.importJSON ${ pkgs.writeText "simpleConfig.json" (builtins.toJSON simpleConfig) - }))) + }) ''; in { name = "os-prober"; diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index 70ac78a4a4689..d102b4c075186 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -41,6 +41,7 @@ in import ./make-test-python.nix { networking.firewall.allowedTCPPorts = [ grpcPort ]; services.prometheus = { enable = true; + enableReload = true; scrapeConfigs = [ { job_name = "prometheus"; @@ -118,6 +119,36 @@ in import ./make-test-python.nix { # }; #}; }; + # Adds a "specialisation" of the above config which allows us to + # "switch" to it and see if the services.prometheus.enableReload + # functionality actually reloads the prometheus service instead of + # restarting it. + specialisation = { + "prometheus-config-change" = { + configuration = { + environment.systemPackages = [ pkgs.yq ]; + + # This configuration just adds a new prometheus job + # to scrape the node_exporter metrics of the s3 machine. + # We also use an environmentFile to test if that works correctly. + services.prometheus = { + environmentFile = pkgs.writeText "prometheus-config-env-file" '' + JOB_NAME=s3-node_exporter + ''; + scrapeConfigs = [ + { + job_name = "$JOB_NAME"; + static_configs = [ + { + targets = [ "s3:9100" ]; + } + ]; + } + ]; + }; + }; + }; + }; }; query = { pkgs, ... }: { @@ -171,10 +202,17 @@ in import ./make-test-python.nix { }; environment.systemPackages = [ pkgs.minio-client ]; + + services.prometheus.exporters.node = { + enable = true; + openFirewall = true; + }; }; }; testScript = { nodes, ... } : '' + import json + # Before starting the other machines we first make sure that our S3 service is online # and has a bucket added for thanos: s3.start() @@ -193,6 +231,12 @@ in import ./make-test-python.nix { # Check if prometheus responds to requests: prometheus.wait_for_unit("prometheus.service") + + # Check if prometheus' config file is correctly locked down because it could contain secrets. + prometheus.succeed( + "stat -c '%a %U' /var/lib/prometheus2/prometheus-substituted.yaml | grep '600 prometheus'" + ) + prometheus.wait_for_open_port(${toString queryPort}) prometheus.succeed("curl -sf http://127.0.0.1:${toString queryPort}/metrics") @@ -245,5 +289,61 @@ in import ./make-test-python.nix { + "jq .thanos.labels.some_label | " + "grep 'required by thanos'" ) + + # Check if switching to a NixOS configuration that changes the prometheus + # configuration reloads (instead of restarts) prometheus before the switch + # finishes successfully: + with subtest("config change reloads prometheus"): + # We check if prometheus has finished reloading by looking for the message + # "Completed loading of configuration file" in the journal between the start + # and finish of switching to the new NixOS configuration. + # + # To mark the start we record the journal cursor before starting the switch: + cursor_before_switching = json.loads( + prometheus.succeed("journalctl -n1 -o json --output-fields=__CURSOR") + )["__CURSOR"] + + # Now we switch: + prometheus_config_change = prometheus.succeed( + "readlink /run/current-system/specialisation/prometheus-config-change" + ).strip() + prometheus.succeed(prometheus_config_change + "/bin/switch-to-configuration test") + + # Next we retrieve all logs since the start of switching: + logs_after_starting_switching = prometheus.succeed( + """ + journalctl --after-cursor='{cursor_before_switching}' -o json --output-fields=MESSAGE + """.format( + cursor_before_switching=cursor_before_switching + ) + ) + + # Finally we check if the message "Completed loading of configuration file" + # occurs before the "finished switching to system configuration" message: + finished_switching_msg = ( + "finished switching to system configuration " + prometheus_config_change + ) + reloaded_before_switching_finished = False + finished_switching = False + for log_line in logs_after_starting_switching.split("\n"): + msg = json.loads(log_line)["MESSAGE"] + if "Completed loading of configuration file" in msg: + reloaded_before_switching_finished = True + if msg == finished_switching_msg: + finished_switching = True + break + + assert reloaded_before_switching_finished + assert finished_switching + + # Check if the reloaded config includes the new s3-node_exporter job: + prometheus.succeed( + """ + curl -sf http://127.0.0.1:${toString queryPort}/api/v1/status/config \ + | jq -r .data.yaml \ + | yq '.scrape_configs | any(.job_name == "s3-node_exporter")' \ + | grep true + """ + ) ''; } diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix new file mode 100644 index 0000000000000..c46c7d338b2e2 --- /dev/null +++ b/nixos/tests/wine.nix @@ -0,0 +1,41 @@ +{ system ? builtins.currentSystem +, pkgs ? import ../.. { inherit system; config = { }; } +}: + +let + inherit (pkgs.lib) concatMapStrings listToAttrs; + inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; + + hello32 = "${pkgs.pkgsCross.mingw32.hello}/bin/hello.exe"; + hello64 = "${pkgs.pkgsCross.mingwW64.hello}/bin/hello.exe"; + + makeWineTest = packageSet: exes: variant: rec { + name = "${packageSet}-${variant}"; + value = makeTest { + inherit name; + meta = with pkgs.lib.maintainers; { maintainers = [ chkno ]; }; + + machine = { pkgs, ... }: { + environment.systemPackages = [ pkgs."${packageSet}"."${variant}" ]; + virtualisation.diskSize = "800"; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + ${concatMapStrings (exe: '' + greeting = machine.succeed( + "bash -c 'wine ${exe} 2> >(tee wine-stderr >&2)'" + ) + assert 'Hello, world!' in greeting + machine.fail( + "fgrep 'Could not find Wine Gecko. HTML rendering will be disabled.' wine-stderr" + ) + '') exes} + ''; + }; + }; + + variants = [ "base" "full" "minimal" "staging" "unstable" ]; + +in listToAttrs (map (makeWineTest "winePackages" [ hello32 ]) variants + ++ map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants) diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix index e445132ee3c07..5a1be2eaf0c3c 100644 --- a/pkgs/applications/audio/ashuffle/default.nix +++ b/pkgs/applications/audio/ashuffle/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ashuffle"; - version = "3.10.1"; + version = "3.12.3"; src = fetchFromGitHub { owner = "joshkunz"; repo = "ashuffle"; rev = "v${version}"; - sha256 = "103jhajqwryiaf52qqgshajcnsxsz4l8gn3sz6bxs7k0yq5x1knr"; + sha256 = "sha256-y2DH8SjSZ8hV6DAC4uDw5Wn7O0oj/WIhIr4BE/+jUxM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 33df06e77e4cb..9cce4af929840 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "3.7.1"; + version = "3.8.0"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "jKuuM1vQANGYE2W0OGl+35mB1ve5K/xPcBTk2O1azPRBDlRVU0DHRSQy2T71kwhxES1ASRt91qAV/dATk6oUkw=="; + sha512 = "wdOJYmUHPSuijQjmkwq1jLX3qgLzmFxDihlETELlzk13RcpCcczL++V5dqdiQY6UmZVP3KL4VPjXubSq4CmXlQ=="; }; appimageContents = appimageTools.extractType2 { @@ -33,7 +33,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/32"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/33"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 606f80d1e41ed..e5a97aee86cda 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.36"; + version = "1.37"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-QyhBoWCkj7iYXAFsyVH6+XH2P/MQEXZQfAcUDu4Rtco="; + sha256 = "sha256-r9H+qF542j2qjmOEjJLAtnMU7SkJBJB8nH39zhkZu9M="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix new file mode 100644 index 0000000000000..160243cdf34f8 --- /dev/null +++ b/pkgs/applications/audio/tenacity/default.nix @@ -0,0 +1,148 @@ +{ stdenv +, lib +, fetchFromSourcehut +, cmake +, wxGTK +, pkg-config +, python3 +, gettext +, glib +, file +, lame +, libvorbis +, libmad +, libjack2 +, lv2 +, lilv +, makeWrapper +, serd +, sord +, sqlite +, sratom +, suil +, alsa-lib +, libsndfile +, soxr +, flac +, twolame +, expat +, libid3tag +, libopus +, ffmpeg +, soundtouch +, pcre +, portaudio +, linuxHeaders +, at-spi2-core +, dbus +, epoxy +, libXdmcp +, libXtst +, libpthreadstubs +, libselinux +, libsepol +, libxkbcommon +, util-linux +}: + +stdenv.mkDerivation rec { + pname = "tenacity"; + version = "unstable-2021-10-18"; + + src = fetchFromSourcehut { + owner = "~tenacity"; + repo = "tenacity"; + rev = "697c0e764ccb19c1e2f3073ae08ecdac7aa710e4"; + sha256 = "1fc9xz8lyl8si08wkzncpxq92vizan60c3640qr4kbnxg7vi2iy4"; + }; + + postPatch = '' + touch src/RevisionIdent.h + + substituteInPlace src/FileNames.cpp \ + --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h + ''; + + postFixup = '' + rm $out/tenacity + wrapProgram "$out/bin/tenacity" \ + --suffix AUDACITY_PATH : "$out/share/tenacity" \ + --suffix AUDACITY_MODULES_PATH : "$out/lib/tenacity/modules" \ + --prefix LD_LIBRARY_PATH : "$out/lib/tenacity" \ + --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + NIX_CFLAGS_COMPILE = "-D GIT_DESCRIBE=\"\""; + + # tenacity only looks for ffmpeg at runtime, so we need to link it in manually + NIX_LDFLAGS = toString [ + "-lavcodec" + "-lavdevice" + "-lavfilter" + "-lavformat" + "-lavresample" + "-lavutil" + "-lpostproc" + "-lswresample" + "-lswscale" + ]; + + nativeBuildInputs = [ + cmake + gettext + makeWrapper + pkg-config + python3 + ] ++ lib.optionals stdenv.isLinux [ + linuxHeaders + ]; + + buildInputs = [ + alsa-lib + expat + ffmpeg + file + flac + glib + lame + libid3tag + libjack2 + libmad + libopus + libsndfile + libvorbis + lilv + lv2 + pcre + portaudio + serd + sord + soundtouch + soxr + sqlite + sratom + suil + twolame + wxGTK + wxGTK.gtk + ] ++ lib.optionals stdenv.isLinux [ + at-spi2-core + dbus + epoxy + libXdmcp + libXtst + libpthreadstubs + libxkbcommon + libselinux + libsepol + util-linux + ]; + + meta = with lib; { + description = "Sound editor with graphical UI"; + homepage = "https://tenacityaudio.org/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ irenes lheckemann ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 23a0e47916092..e2f08e5e6b412 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -3,13 +3,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-gJvUW/U+O83Q0VDo6a5VkWx2RuofMNs/mPn/hnM2XiE="; + sha256 = "sha256-TAngdQz3FupoqPrqskjSQ9xSDbZV4/6+j7C4NjBFcFw="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 2cb07e9954fc7..c3406494aeb44 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -31,8 +31,8 @@ }) (fetchNuGet { name = "BTCPayServer.Lightning.All"; - version = "1.2.13"; - sha256 = "16nhahb6bnjwhw3wh044zfkqpb5k40kyhdazs2h6y4phjhm5hq2r"; + version = "1.2.14"; + sha256 = "0avb0jlisx1nv0ary2nc82aamn95qmrrqshwbk8szzjqgvxzv4k2"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Charge"; @@ -46,11 +46,6 @@ }) (fetchNuGet { name = "BTCPayServer.Lightning.Common"; - version = "1.2.6"; - sha256 = "09p2ks1qgy6jnpcfwgdnxvldyyadwnh3mwmq9z89vvzmmgs19xkk"; - }) - (fetchNuGet { - name = "BTCPayServer.Lightning.Common"; version = "1.2.7"; sha256 = "1hz4bn3aw537r253ipdpa6sydwhb6dh3r82xp1jizn9a6mnw54x6"; }) @@ -61,8 +56,8 @@ }) (fetchNuGet { name = "BTCPayServer.Lightning.LND"; - version = "1.2.9"; - sha256 = "1zyr58kwdyb02dfgxza73fqvzcjlf59msllmf06anl9im4pqcjx6"; + version = "1.2.10"; + sha256 = "10m8kw7598l9ap6y17znvm43cz5ca6qxbrh105knyb6hfzpsyqwp"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Ptarmigan"; diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 0cec96b7a6ee5..04f3c1fcbc841 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -16,15 +16,15 @@ , zlib }: let - py3 = python3.withPackages (p: [ p.Mako ]); + py3 = python3.withPackages (p: [ p.Mako p.mrkd ]); in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "9271e9e89d60332b66afedbf8d6eab2a4a488782ab400ee1f60667d73c5a9a96"; + sha256 = "3c9dcb686217b2efe0e988e90b95777c4591e3335e259e01a94af87e0bf01809"; }; nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ]; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index a1ce67abf9ae1..636d377ebe485 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.34.3"; + version = "2.34.4"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "07r7gfn44c4bdcq9rgs6v4frrl2g004lh9lcsrj6rbqy6949r9j2"; + sha256 = "00zl7ywmkbhwzkj7p618rin5pd0ix8cas5q1b8ka6ynw4wlg3w5c"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index a64ab5249a535..9b88861d0ea67 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.12"; + version = "0.9.12-1"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "1d1ppj8djqm97k18cbdvbgv9a5vhvxdgjiqair0bmxc44hwapl65"; + sha256 = "sha256-+HATcxdIDQGDIQBF08yy/eKBcS10Hp7C0nZFVsYFNwQ="; }; - cargoSha256 = "09kcacz836sm1zsi08mmf4ca5vbqc0lwwaam9p4vi0v4kd45axx9"; + cargoSha256 = "sha256-1qg4ZnSORRVI7eCVMrR7lY3tzo7KJt+dC2RBXqbKrig="; nativeBuildInputs = [ clang ]; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index f3075d085c457..f840218d850c8 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -34,7 +34,7 @@ let inherit (spec) owner rev sha256; } ) - (builtins.fromJSON (builtins.readFile ./deps.json)); + (lib.importJSON ./deps.json); in stdenv.mkDerivation rec { pname = "cudatext"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 13e82ba3cf150..d2b870bb82d63 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -444,6 +444,21 @@ license = lib.licenses.free; }; }) {}; + capf-autosuggest = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "capf-autosuggest"; + ename = "capf-autosuggest"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/capf-autosuggest-0.2.tar"; + sha256 = "0a3bkf3c1gwv9m4rq9kvgw48y5av4arnymnm64yija55ygrnm88b"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/capf-autosuggest.html"; + license = lib.licenses.free; + }; + }) {}; caps-lock = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "caps-lock"; @@ -1101,10 +1116,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.6"; + version = "0.8.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.6.tar"; - sha256 = "0amr1s1q5w4513qw31qsr8gpsfgj5b2j7qn017rmwbaf1mj0k6z0"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.8.tar"; + sha256 = "035xakji5vypdpc06qp9yhg8ny7qn80h8kax6cl80p0lljplzrnn"; }; packageRequires = [ emacs seq ]; meta = { @@ -1161,10 +1176,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20211024"; + version = "20211101"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20211024.tar"; - sha256 = "165mscb1kpgd3db92vklglnaph60rvrr8wm3hpkhrbyac100ryji"; + url = "https://elpa.gnu.org/packages/eev-20211101.tar"; + sha256 = "0sxbf116msfv6ly1dqga2sz2zpqr78nzp3v44qy7rps2887incmr"; }; packageRequires = [ emacs ]; meta = { @@ -1275,6 +1290,41 @@ license = lib.licenses.free; }; }) {}; + embark = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "embark"; + ename = "embark"; + version = "0.13"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/embark-0.13.tar"; + sha256 = "04x3cfikfvzr2xl1zh6kj0q31160kmh1vrzyrla3n6f8z5qch63x"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/embark.html"; + license = lib.licenses.free; + }; + }) {}; + embark-consult = callPackage ({ consult + , elpaBuild + , emacs + , embark + , fetchurl + , lib }: + elpaBuild { + pname = "embark-consult"; + ename = "embark-consult"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/embark-consult-0.2.tar"; + sha256 = "0f1022yk6d88glrrawa8cl6yd5n44p8wnbfwn0f8z6j1n8wxq37z"; + }; + packageRequires = [ consult emacs embark ]; + meta = { + homepage = "https://elpa.gnu.org/packages/embark-consult.html"; + license = lib.licenses.free; + }; + }) {}; emms = callPackage ({ cl-lib ? null , elpaBuild , fetchurl @@ -1284,10 +1334,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "7.7"; + version = "7.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-7.7.tar"; - sha256 = "0n9nx4wgjxkr8nsxcq8svg0x0qkqj7bsd2j0ihy4jzj29xmyxl0h"; + url = "https://elpa.gnu.org/packages/emms-7.8.tar"; + sha256 = "1nlb9rrdlbcqghph30r9i9m1brbdha818czbms0zhzdisxb0smi0"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -1424,10 +1474,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.24"; + version = "0.25"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.24.tar"; - sha256 = "0lj1a3cmbpf4h6x8k6x8cdm1qb51ca6filydnvi5zcda8zpl060s"; + url = "https://elpa.gnu.org/packages/exwm-0.25.tar"; + sha256 = "0imd4v9ccvpsskmfnycz5fgabsvdjp1msg5v8rc7x0v26r3kr4x7"; }; packageRequires = [ xelb ]; meta = { @@ -1499,10 +1549,10 @@ elpaBuild { pname = "flymake-proselint"; ename = "flymake-proselint"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-proselint-0.2.2.tar"; - sha256 = "0v43d2cszrq8lzshm17x6aiqbkzwz5kj8x5sznc3nip9gaqsrfv1"; + url = "https://elpa.gnu.org/packages/flymake-proselint-0.2.3.tar"; + sha256 = "1384m52zkrlkkkyxg1zimp7dwrxhx8wbvw5ga5vg78yl6cqx9kbc"; }; packageRequires = [ emacs ]; meta = { @@ -2013,10 +2063,10 @@ elpaBuild { pname = "ivy-posframe"; ename = "ivy-posframe"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.2.tar"; - sha256 = "1x6pm0pry2j7yazhxvq1gydbymwll9yg85m8qi4sh8s0pnm0vjzk"; + url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.3.tar"; + sha256 = "0b498qzaydjrhplx4d7zcrs883dlrhfiz812sv4m3pmhfwifcchh"; }; packageRequires = [ emacs ivy posframe ]; meta = { @@ -3005,10 +3055,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.7"; + version = "0.4.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.7.tar"; - sha256 = "0y5milfjf45bi7gj7brl2lhyla8nsj3dc1a4nfq1wx3zw8arlc50"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.12.tar"; + sha256 = "0xkzx5narbry0kbamzxv1hjgsal98cj9rp3ck25xg2ywb6nspwcw"; }; packageRequires = [ emacs ]; meta = { @@ -3050,10 +3100,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.0.4.tar"; - sha256 = "0i2pw90gw9zb22gj8yyvcp3b2k1bxxhbjj0idvr5iz1vd9023bc6"; + url = "https://elpa.gnu.org/packages/posframe-1.1.0.tar"; + sha256 = "0ddm149dz71nksbpz7rwa8cax1nisf6wklv5iq4zrcbf5ghpagkg"; }; packageRequires = [ emacs ]; meta = { @@ -3651,10 +3701,10 @@ elpaBuild { pname = "sketch-mode"; ename = "sketch-mode"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sketch-mode-1.0.3.tar"; - sha256 = "17xa8754zp07izgd3b9hywlwd1jrbzyc5y1rrhin7w6r0pyvqs51"; + url = "https://elpa.gnu.org/packages/sketch-mode-1.0.4.tar"; + sha256 = "1gv03ykr40laf52hm8p0glfsy895jghkp5a8q599zwg5wpz3zdc9"; }; packageRequires = []; meta = { @@ -4045,10 +4095,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.1.3"; + version = "2.5.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.1.3.tar"; - sha256 = "1qcwdavfrbw8yyfy5rbzbcfyqavqbz13jncahkqlgwbkqvmgh7y5"; + url = "https://elpa.gnu.org/packages/tramp-2.5.1.4.tar"; + sha256 = "0mk9r9hj43klah7mwldg4bw7fxcqvrbwv1gj6g90zdfsflqy7nh9"; }; packageRequires = [ emacs ]; meta = { @@ -4090,10 +4140,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.3.6"; + version = "0.3.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.3.6.tar"; - sha256 = "11n2551kvfjrqyk0x78bz6pirnfs126cbchiv1pchqwyk8z8c9ks"; + url = "https://elpa.gnu.org/packages/transient-0.3.7.tar"; + sha256 = "0x4xjbaw98dma7232bzw53rbq9q70vms6lvvramng7vfaz0mcy2a"; }; packageRequires = [ emacs ]; meta = { @@ -4219,10 +4269,10 @@ elpaBuild { pname = "vc-backup"; ename = "vc-backup"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vc-backup-1.0.0.tar"; - sha256 = "0vcrbb4s1rzar9q882kfcslycxvycp61923sg82i29b7yd0yrgdr"; + url = "https://elpa.gnu.org/packages/vc-backup-1.1.0.tar"; + sha256 = "1ipkymndxymbayrgr3jz27p64bkjf1nq9h4w3afpzkpqzw237ak5"; }; packageRequires = []; meta = { @@ -4337,6 +4387,26 @@ license = lib.licenses.free; }; }) {}; + vertico-posframe = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , posframe + , vertico }: + elpaBuild { + pname = "vertico-posframe"; + ename = "vertico-posframe"; + version = "0.3.10"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vertico-posframe-0.3.10.tar"; + sha256 = "1bksipfi92adlmnk2rdw33c2g6qhw8hplcg67xhc299svqlkd0j2"; + }; + packageRequires = [ emacs posframe vertico ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vertico-posframe.html"; + license = lib.licenses.free; + }; + }) {}; vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "vigenere"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 0cf2eae0d6546..90f13e870c735 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -282,10 +282,10 @@ elpaBuild { pname = "flymake-kondor"; ename = "flymake-kondor"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.2.tar"; - sha256 = "17mmn9mj4zl5f7byairkgxz6s2mrq73q3219s73c0b2g0g846krn"; + url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.3.tar"; + sha256 = "07k8b3wayp1h4hir98zs5srjjsnh6w0h9pzn4vnq9s2jr355509n"; }; packageRequires = [ emacs ]; meta = { @@ -387,10 +387,10 @@ elpaBuild { pname = "geiser-guile"; ename = "geiser-guile"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.17.tar"; - sha256 = "0g4982rfxjp08qi6nxz73lsbdwf388fx511394yw4s7ml6v1m4kd"; + url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.18.tar"; + sha256 = "1jnqra7gysscn0gb1ap56rbjlrnhsmma7q4yfiy3zxsz8m69xhqf"; }; packageRequires = [ emacs geiser ]; meta = { @@ -975,10 +975,10 @@ elpaBuild { pname = "rust-mode"; ename = "rust-mode"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.0.tar"; - sha256 = "0ch3hf954iy5hh5zyjjg68szdk5icppmi8nbap27wfwgvhvyfa67"; + url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.1.tar"; + sha256 = "1rybjnaycvjgqp8g8lkjzgvnwd4565cbx88qlnxfrlqd5161r1k3"; }; packageRequires = [ emacs ]; meta = { @@ -1099,10 +1099,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "8.4.1"; + version = "8.4.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swift-mode-8.4.1.tar"; - sha256 = "0f87bjgva0iv818bh2dqvc1svrwh5zm134jpxcmvmzr1yqazx4qp"; + url = "https://elpa.nongnu.org/nongnu/swift-mode-8.4.2.tar"; + sha256 = "0rkri1414f2w2bw76dwnmylcdca6x9bkdvlq1aznz76ac259klji"; }; packageRequires = [ emacs seq ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 5b0ef0fa8e48d..118065eb31ca2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -213,11 +213,11 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20211002, - 1952 + 20211103, + 1551 ], - "commit": "ea9d91be117056f1e49479c94d034e8c6f8df5a0", - "sha256": "0z0ilyq0h1ic62gk3gwfiagp8hv4vl2z663fhxwl9g5r94rc3pxi" + "commit": "b868ef7065039899628a2846dd1274233e07a310", + "sha256": "1a8rr7ni9x4n21lysfhczf0j0nqi9xd17s39lfpxmpp10s36mrxf" }, "stable": { "version": [ @@ -1148,8 +1148,8 @@ "auto-complete", "rtags" ], - "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", - "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" + "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", + "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" }, "stable": { "version": [ @@ -1948,6 +1948,26 @@ } }, { + "ename": "agda-editor-tactics", + "commit": "1806c594f0ae0d7eb8be7e4baf4bf66af32c3d46", + "sha256": "11lfpa1hdbrnbrrhpqmi3lzx28wbfnw4j29rywwcjlcb6a0ax50v", + "fetcher": "github", + "repo": "alhassy/next-700-module-systems", + "unstable": { + "version": [ + 20211024, + 2357 + ], + "deps": [ + "dash", + "org", + "s" + ], + "commit": "c401c0c1ec0ad38bb5ee1636504e0e531b9e34b9", + "sha256": "0y5dp3i97w96dy5p5yk4gxs4db9n260sn1q2vp1j6afi30mn2mb9" + } + }, + { "ename": "agda2-mode", "commit": "714e0fe062981d27e3f1d48b2fd759d60bbb4d8c", "sha256": "0vbi64fri02ziy68dvpq1y946w4n4mla8gh1cmldqq8x24l8ssdg", @@ -1962,8 +1982,8 @@ "annotation", "eri" ], - "commit": "bea11a04df5f82b2b8782bcad5bf2af2a6b88b65", - "sha256": "043pl1cdyy8yfmw50kqwf7xn0alcm98zzms962v7jdgbhbq07882" + "commit": "475d9add939bf86936a1d5b41c3260f0000bd3c8", + "sha256": "0f7849s67gzzrnkb57hm2p6hbkrd50s02m9l5xfqg286dinhqp0v" }, "stable": { "version": [ @@ -2344,8 +2364,8 @@ "deps": [ "flycheck" ], - "commit": "135be1a851a1110dffe8bb349183b73a49a1f090", - "sha256": "09j59s5agyvngk5z75dl129gdzlq2kn11qlgc9798fy1gx11cahw" + "commit": "1bcc7c68abcd6471604c9b7fe7f85b0878bbd435", + "sha256": "10kpdra8m015xsh7w25v18zd62csayji0p5jqgif20bw6g8g20a7" }, "stable": { "version": [ @@ -2969,6 +2989,21 @@ } }, { + "ename": "ancient-one-dark-theme", + "commit": "df6184184228dfdb0b0e4a770c30c67d05a9bf94", + "sha256": "064yiab7ll7nwls7p8cyh8glmzr4msmdhl4vvvy45ll5diyfbkfa", + "fetcher": "github", + "repo": "holodata/ancient-one-dark-emacs", + "unstable": { + "version": [ + 20211030, + 1358 + ], + "commit": "2a4319971f42c754dd43806b66c13317741d6939", + "sha256": "1965wfdaqr7p3b0yc287xdb367xib491ljp7yazn3dxxy7ayd25h" + } + }, + { "ename": "android-env", "commit": "570ad0e94736d9fd16f3909bcfa928a9153ea703", "sha256": "1gfxrfg42rn2rzh5fr4w6h8ngczhl56jghfgrffz9x8wcxxmqgpr", @@ -3246,8 +3281,8 @@ 20200914, 644 ], - "commit": "bea11a04df5f82b2b8782bcad5bf2af2a6b88b65", - "sha256": "043pl1cdyy8yfmw50kqwf7xn0alcm98zzms962v7jdgbhbq07882" + "commit": "475d9add939bf86936a1d5b41c3260f0000bd3c8", + "sha256": "0f7849s67gzzrnkb57hm2p6hbkrd50s02m9l5xfqg286dinhqp0v" }, "stable": { "version": [ @@ -3380,26 +3415,20 @@ "repo": "zellio/ansible-vault-mode", "unstable": { "version": [ - 20211016, - 2350 - ], - "deps": [ - "seq" + 20211027, + 1528 ], - "commit": "71c783384de8f2db05453db0dd3ff0cd256d6ea9", - "sha256": "0f3k1lzf0cw19vrs85dsl0zw2m7zjd7p7hgxajl8y4n2438ksnvr" + "commit": "5deca2fdb640fa70e614e66ee37e1d6739d39ba4", + "sha256": "169vfz5xz58f9avb74vzpdk1k0wj4ylc26c15ggl0y19acqx4hdw" }, "stable": { "version": [ 0, - 4, - 2 - ], - "deps": [ - "seq" + 5, + 1 ], - "commit": "6bfc1fb7caa10c613561142b748482befde48900", - "sha256": "0f3k1lzf0cw19vrs85dsl0zw2m7zjd7p7hgxajl8y4n2438ksnvr" + "commit": "4fc188a9817cb4c7e0f19b6f1ae720c902f7ebe9", + "sha256": "169vfz5xz58f9avb74vzpdk1k0wj4ylc26c15ggl0y19acqx4hdw" } }, { @@ -3604,11 +3633,11 @@ "repo": "raxod502/apheleia", "unstable": { "version": [ - 20211025, - 128 + 20211031, + 1757 ], - "commit": "1bf7db7477db4ca93740a5ebc5ad3c0dc3777273", - "sha256": "1nc0w5l53kq4z6qy6qwzkwp8cb8n0328i9jakdzhpg2lllmapz66" + "commit": "1b7f2cf9969e7dfe610780b38b6f3dd834d1c01d", + "sha256": "1gy4pczi6lwvcjfxng8kf6nd4czpi261k4p46dgny686hr70mzc9" }, "stable": { "version": [ @@ -3765,11 +3794,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20210809, - 1934 + 20211103, + 1600 ], - "commit": "e84255cf485004b6b2cb37ce9e0be62fd6512f8b", - "sha256": "06rcf08f8qm068ck2mxqbg03vkr0hf5nnsbzpwmn7i6qqw23x6jd" + "commit": "008cd61d8b42367316b147eef2a81636f01faeee", + "sha256": "04k12kb19xzw3dm4ydiy1m3qfpv0smvr33847lh4bhkiv1wyilp8" }, "stable": { "version": [ @@ -5017,11 +5046,11 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20210210, - 1744 + 20211101, + 1155 ], - "commit": "62c936d502f35d168b9e59a66c994d74a62ad2cf", - "sha256": "07ilprnidpg8wn28h8ra9ml6pxaixg734ybya0gj1ac6sc3ky52s" + "commit": "2a19931b275dc3c70c4bb16a3c60046800ba631a", + "sha256": "00f0n6pz0qi2fandcgj8skgj169bwxrda62vkrf0frwpavwpmkml" } }, { @@ -5061,11 +5090,11 @@ "repo": "mattfidler/auto-indent-mode.el", "unstable": { "version": [ - 20191112, - 1418 + 20211029, + 11 ], - "commit": "ebb1ee5ca24f3040c34b9455502a0e94f19903d0", - "sha256": "19p73jws7iddgs14cnfz9lb5ggyicqk08pasf66fkcvyhzydnwkm" + "commit": "664006b67329a8e27330541547f8c2187dab947c", + "sha256": "07nf07xzc30jnyr9s8vp561vgq64610gdhlwzkbanvnkmj20v9li" }, "stable": { "version": [ @@ -5601,8 +5630,8 @@ "avy", "embark" ], - "commit": "560af655922582f3f20a46fb1969915ee34028a4", - "sha256": "0nzygmj6j7f3fw2acifb25lcxswx704fgxlsvl6ya1z6kkamfcx4" + "commit": "0b524bda8d9c5f9e26898e383e98a4ec689fa144", + "sha256": "1jgl9n6js71sx4j1wg2nl5aaqmsq2hzna0qawz813637kaylrdxn" }, "stable": { "version": [ @@ -6381,11 +6410,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20211006, - 855 + 20211031, + 1941 ], - "commit": "41745212f75b4deafb27fc790df1a74ae344df84", - "sha256": "12h7sndahwpyqc1sr2dgf3wz5g6hizb908iw3rfyhxjgss2yai3b" + "commit": "cdb2643dba39fe2bd64ba3b190b94d1ef1d83b18", + "sha256": "0ln06dprnivx9zxm6n23ppyx7x4kbn0f85pxwvkq32aq7wnqz82m" } }, { @@ -7068,36 +7097,6 @@ } }, { - "ename": "bibtex-actions", - "commit": "a6050cc5f04343c5a0e3992d223eca3b50acec7c", - "sha256": "1yfrs54gb38877322rmg6p7lqy91km33vil867qgbyj016ss4x7s", - "fetcher": "github", - "repo": "bdarcus/bibtex-actions", - "unstable": { - "version": [ - 20211025, - 1224 - ], - "deps": [ - "bibtex-completion", - "parsebib" - ], - "commit": "c170aa4381b093892efe14ffc8da6d726d305088", - "sha256": "1qn6h5qfia6wxzy7qnrcxxadjp4wsvbnlmca0sv6f2sxxbphf835" - }, - "stable": { - "version": [ - 0, - 4 - ], - "deps": [ - "bibtex-completion" - ], - "commit": "c18b1ad05168597a3cbaee67775d15d2ebb737f4", - "sha256": "0x45wq2nw753dz6694li3f0zmjm0rljmrr5rvj2qrhgqldlwn6zn" - } - }, - { "ename": "bibtex-completion", "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3", "sha256": "06mg9fwp6jwr6fbnzh4z8am47bspcl8hv0icmdpc9lmzbcyfpg8f", @@ -7316,14 +7315,14 @@ "repo": "rnkn/binder", "unstable": { "version": [ - 20210131, - 1227 + 20211030, + 511 ], "deps": [ "seq" ], - "commit": "52f1c11b01a5f7e7a470a73dec4c3335dea4124b", - "sha256": "00kjjr28bvimbdhg016n0g6ws1lix87c1bic1xb3nk0bvnbkpwfp" + "commit": "8cefdf0959f0da33250044cf4890b69cfdcf0c5b", + "sha256": "0q4cz07s8qzkvnym7ab2l111dk88nfigpf0r3x0jcxx2qivs52s4" }, "stable": { "version": [ @@ -7543,6 +7542,30 @@ } }, { + "ename": "blamer", + "commit": "4424e068324a241450fb4e8b6cccb697fdb2f187", + "sha256": "0fis6f2gpzj88mdf24fbply6a63i753bmlxfwlglbxx5k457wkkj", + "fetcher": "github", + "repo": "artawower/blamer.el", + "unstable": { + "version": [ + 20211102, + 2116 + ], + "commit": "9979fbe64cdb7aaa8548a3ab430afbe27d00323f", + "sha256": "02anikbwihgficgnvrdhmizf1l5syf4bvzhwfq5ips6b6ldsfxis" + }, + "stable": { + "version": [ + 0, + 2, + 1 + ], + "commit": "1117a34dc09ae6b65eca88e2b6199d4b90e52af7", + "sha256": "114cbb32y0bd39yajs2m0pbm8fwdx3cfnf0qs1sf343qyzzkb319" + } + }, + { "ename": "blgrep", "commit": "e78ed9dc4a7ff57524e79213973157ab364ae14d", "sha256": "0w7453vh9c73hdfgr06693kwvhznn9xr1hqa65izlsx2fjhqc9gm", @@ -9820,8 +9843,8 @@ 20210707, 2310 ], - "commit": "a47240bf428b1de2e16eba28cb1eb355f1e00a80", - "sha256": "1mz6jf8l8i6m7my0kxpfmsna0wzh5brwiwslb4rbmbp8q1lisbk0" + "commit": "a3bb240667686a007f3dd0649a093b7326e130cf", + "sha256": "03svmpz905nhpcgriq66sw4la2v58l2490h663yggf313zlplych" }, "stable": { "version": [ @@ -9980,8 +10003,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20211001, - 1042 + 20211103, + 1654 ], "deps": [ "ansi", @@ -9992,8 +10015,8 @@ "s", "shut-up" ], - "commit": "fe66b65944be8e03359ffe6f06618ecab8232f6b", - "sha256": "0mw6adyvjf4x5d83iy1gf5v36nr4dm09806ybgfkfvivsd348k97" + "commit": "467979414c85bb2ce83f5c6ab9f95721164e9efa", + "sha256": "0jccv6aprs4fq2m7b2hdxp0dgkjkwjfmlh5ywbl5pacms3c3l82l" }, "stable": { "version": [ @@ -10190,8 +10213,8 @@ 20210501, 820 ], - "commit": "ce0517127586e26f95f94f45d22a832f40a28321", - "sha256": "1qx99sigzmj4fc5wcaqs6wnyzsrzcqg73czn5aknxqkzd1whsk3a" + "commit": "251df5b02c91311140d2375b019c1de836655fd0", + "sha256": "14cxh58rfc2dprb9grshfhwg0fggw469yk8l9dwhc4sy8bf9cd4v" } }, { @@ -10239,8 +10262,8 @@ 20200904, 1431 ], - "commit": "ce0517127586e26f95f94f45d22a832f40a28321", - "sha256": "1qx99sigzmj4fc5wcaqs6wnyzsrzcqg73czn5aknxqkzd1whsk3a" + "commit": "251df5b02c91311140d2375b019c1de836655fd0", + "sha256": "14cxh58rfc2dprb9grshfhwg0fggw469yk8l9dwhc4sy8bf9cd4v" } }, { @@ -10509,8 +10532,8 @@ 20171115, 2108 ], - "commit": "da01eaa8153cd9b5a3da151f23a30c351e9cf7b9", - "sha256": "09nkkx9xc2ygn6s8lsa46d2cmh32wybf1b8y62nxc62m4scyz05n" + "commit": "1a3b84397c11d99cbeaadfccd7472ac914f715b2", + "sha256": "05xk1zmngk90vdskmj2ldlc14sk13g6adckch7g83nhdhw936x9h" }, "stable": { "version": [ @@ -11300,8 +11323,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20211021, - 545 + 20211103, + 2049 ], "deps": [ "clojure-mode", @@ -11312,8 +11335,8 @@ "sesman", "spinner" ], - "commit": "6a17686799b7ef97bc15fa041016421e5c875bfb", - "sha256": "1ifq42bdikz9p8038yyrm9k07bg6h7ddsiw8zlrsawbk5vc3xy72" + "commit": "7228402c093a7660a6bee6e4c1c69cce81703013", + "sha256": "174az297qq5x5x13ga99zvw7pn4n7aazplby348w79sih5flkl1z" }, "stable": { "version": [ @@ -11575,6 +11598,25 @@ } }, { + "ename": "citar", + "commit": "b2aa35ca3930920d61e50dd75394f70ccd1c737b", + "sha256": "0x66iwimvrihyxs5h816f2k2f2wgdn1kmiahvh5nfff6kx1xdplj", + "fetcher": "github", + "repo": "bdarcus/citar", + "unstable": { + "version": [ + 20211101, + 1853 + ], + "deps": [ + "bibtex-completion", + "parsebib" + ], + "commit": "e2e86bb9ad854548253322751f433b0b940fca1a", + "sha256": "1yfmk1calvzh44pzh3041lj5vrrgs67m6iq93v7knl59ghy2japw" + } + }, + { "ename": "citeproc", "commit": "20aa56e9a4809cee1082224b1b4e65921a48bda1", "sha256": "1qphg2bg7vvjzgvnsscbyf40llxxh4aa2s2ffk8vsbfd4p8208cq", @@ -11582,8 +11624,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20211014, - 1115 + 20211104, + 751 ], "deps": [ "dash", @@ -11594,8 +11636,8 @@ "s", "string-inflection" ], - "commit": "c8ff95862823cdff067e8cc9bb7f5ef537e8f1d9", - "sha256": "1dqs5slpd9i8dj6fgryg46zabd6c134qrdq8dkj1i5n0k17ni0h1" + "commit": "e93b45fe125d2ed61c60136638b3836ec770f879", + "sha256": "176h3xs9jgxcgslp9vklzzsk5s02nf8zdljcjgnjkfxrjng26s8b" }, "stable": { "version": [ @@ -12014,8 +12056,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20211025, - 1151 + 20211031, + 723 ], "deps": [ "cider", @@ -12028,8 +12070,8 @@ "seq", "yasnippet" ], - "commit": "4b7312be8e8e629f9de6e64b0fb809e78a39f832", - "sha256": "1jxch7apckzajpnpfk5k79pmyxw0drj87s0f18ajmd4syimnaxra" + "commit": "9eab9469fe2a06275b7cac7e53eb48ceb5724f81", + "sha256": "0gg6pavih3nifcgdpafsl463f50klaf7mhmh9iz9sz45iyfz2q1i" }, "stable": { "version": [ @@ -12276,11 +12318,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20210821, - 2010 + 20211028, + 1217 ], - "commit": "e1dc7caee76d117a366f8b8b1c2da7e6400636a8", - "sha256": "101fallqv90dgjdiq24hc63yw2a3df12y5cclcg9p4hk8rinc80x" + "commit": "feb03a603b2080b36492b538aeb2041bac4d129c", + "sha256": "1x2fqc003hkvk0gqqgzy0xnya1mx6mi864gicvf2fxbvvwl28vvh" }, "stable": { "version": [ @@ -12306,8 +12348,8 @@ "deps": [ "clojure-mode" ], - "commit": "e1dc7caee76d117a366f8b8b1c2da7e6400636a8", - "sha256": "101fallqv90dgjdiq24hc63yw2a3df12y5cclcg9p4hk8rinc80x" + "commit": "feb03a603b2080b36492b538aeb2041bac4d129c", + "sha256": "1x2fqc003hkvk0gqqgzy0xnya1mx6mi864gicvf2fxbvvwl28vvh" }, "stable": { "version": [ @@ -12609,8 +12651,8 @@ 20210104, 1831 ], - "commit": "0ce50dd78f68b697e1ab29d52d733b87c5bfb67d", - "sha256": "0rifl9lqnkylcv2nqf6qwahicyv34wss9fqmw3xlgkkghk56c5w0" + "commit": "909f435b9302f0cd02a73f34bc3316a8e1620bae", + "sha256": "16435f7clz33gl9j1l86ng5i4cgj7qgcv49335k39wjjzqdhqqa2" }, "stable": { "version": [ @@ -12618,10 +12660,10 @@ 22, 0, -1, - 1 + 2 ], - "commit": "167060303b6d9ffb56b2785cec0f7e363f0876c6", - "sha256": "0zaw4zjxsrjfm4rajqlh4wff158crbxyjpajbmh4yckd3gnz1swr" + "commit": "28a033cc7de056d1a74857606397bb294ebe27ac", + "sha256": "18ir7q31l9jqshx3hixiaq9nvlfasxqrmr0a57q852xb0ad31gcj" } }, { @@ -12689,11 +12731,11 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20200824, - 240 + 20211102, + 2232 ], - "commit": "b967605d571d827c1cb041c174fb363985758729", - "sha256": "1h4c6czj7zr1p8b0233rxmczkaf7hh72869lijsvkvx9xmq9pk8w" + "commit": "46c9034f28cc559f8c93650baa1a64a42b06c535", + "sha256": "1dy6n1cdn05bdr4f1wk72gav5mnfbm23i6cp2vh6nd1nq5kkkchp" }, "stable": { "version": [ @@ -13290,11 +13332,11 @@ "repo": "matthewbauer/comint-hyperlink", "unstable": { "version": [ - 20191104, - 2224 + 20211026, + 100 ], - "commit": "a7878825788ff6b9d6b8a5adf0214a028bad895e", - "sha256": "19fww5aciqx4h67hpmzf564n0ygzg69v1sk1qjyhbs27pq5zrjmq" + "commit": "905f2db1f95950899301b9f71faed9e9362cf5dc", + "sha256": "1d5a0c33zdziz1yw2nv65qyi122zz7b5y9vgsx6kfz7xj32sc8s5" }, "stable": { "version": [ @@ -14116,16 +14158,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20211017, - 1548 + 20211104, + 1200 ], "deps": [ "company", "ht", "s" ], - "commit": "80c84e3071e1aca9c058c4b5061b72fb9536a697", - "sha256": "0bgaikvn0z1j2xh4g3q7rh655kjgfwnbv5v2kmk38kvwn4mgahz7" + "commit": "44ef04f5f21285d68bd419f4f153e192777d9991", + "sha256": "1gca3i7ylk28wx7wa722ismy6irya96k8qf1zjh851sn2m7bkfin" }, "stable": { "version": [ @@ -14798,15 +14840,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20210419, - 607 + 20211103, + 232 ], "deps": [ "company", "posframe" ], - "commit": "c7a820a35ff132aaec53c81e05afc829de39eb68", - "sha256": "0fyc7c4r4jfa5y0x9lfcqlx0qazg1d4il5p0bdw4hdcpjd2h26ys" + "commit": "e104c0d0ee8db4a5fc852b3fc951e52989ee8755", + "sha256": "05q2v2faa7ydx242208wxir8fkkrr34n773fllkkp9m228hc5mv7" }, "stable": { "version": [ @@ -14837,8 +14879,8 @@ "company", "prescient" ], - "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e", - "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr" + "commit": "292ac9fe351d469f44765d487f6b9a1c1a68ad1e", + "sha256": "0ywx7q41i9pzmfgwv83mz5z17gril2s0r7y77hbbriww5yy1ihx4" }, "stable": { "version": [ @@ -15026,8 +15068,8 @@ "company", "rtags" ], - "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", - "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" + "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", + "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" }, "stable": { "version": [ @@ -15791,11 +15833,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20211024, - 1830 + 20211103, + 1226 ], - "commit": "ae2761ead41a2e8bae011cee0f57830d6bf423b5", - "sha256": "1ff582cpl3w61n3mv5s7cz4mjlzkza5cn83lllp232zd7bnw68h6" + "commit": "3b18b04524f0e963070ab6c61d4d3a3f10507d12", + "sha256": "07m3v8lg91ql0j0vicf59cavhyn0xva8qd83xxlngnsivqsa0h63" }, "stable": { "version": [ @@ -15947,16 +15989,16 @@ "repo": "gagbo/consult-lsp", "unstable": { "version": [ - 20210930, - 1225 + 20211103, + 1200 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "b9aa9617f174a304040ae75d35483fa8d4ade5d7", - "sha256": "0px09bvi8x5b7h4w3mdffj1fnl7nk51xybpxz7n8v8i7v1w3547z" + "commit": "91deff6bcaee55ee4e33a4a9fe943d8de305e26c", + "sha256": "10nwwkdx537xr9d5zi5drbw4whrfha27kq0xd1jkvvdsqiaydxrl" }, "stable": { "version": [ @@ -16175,14 +16217,14 @@ "repo": "liuyinz/emacs-conventional-changelog", "unstable": { "version": [ - 20211019, - 1205 + 20211103, + 1242 ], "deps": [ "transient" ], - "commit": "7087ef60c3301e23b284f5e578a9717b9bb8b740", - "sha256": "0p1jlw550fvh0xhvr5b2z39vnbk6q6nbn6sgh1k97ar62pgwcgc3" + "commit": "9db9dcfdff2ff8cf6a88e938646cb26ce0f61774", + "sha256": "1qm6v88mz6bxz0yg2yw5xfiz5jjnz3i9vwaa3irnywzs6prw7pa4" }, "stable": { "version": [ @@ -16508,8 +16550,8 @@ "deps": [ "counsel" ], - "commit": "3321bf78231e443cb98520dbb30a6c49e004c6a7", - "sha256": "08xqga2qnn6y5zq7r2xd1mcg6zjzaiiaw2damp4djcjd2fsm4zl1" + "commit": "72b31889581f20f4037c0361f5259ff3633bc128", + "sha256": "0crnrp5gd055gpxj4qiiwlik8llqhs5dyixfa8r8mzaxanv6bdg9" } }, { @@ -17035,16 +17077,16 @@ "repo": "AdamNiederer/cov", "unstable": { "version": [ - 20210330, - 44 + 20211026, + 308 ], "deps": [ "elquery", "f", "s" ], - "commit": "62a4650f97eddebf6cd04b662a69b15ba72472c1", - "sha256": "01l38yfgzh4apvj9ipl50b5shf6vnyqdciklpbajciynz118p19q" + "commit": "58cf3d5fd2d71084083a293b0fc7ce947aadaf26", + "sha256": "0lbsc5dz810gcvpapqa0x9b0wpd9fb1sb4qj32ypfbc3ywklzd38" } }, { @@ -18312,8 +18354,8 @@ 20190111, 2150 ], - "commit": "1461e514c00056eef58c7c18262012b1510ba692", - "sha256": "0835zi21kp4xlf21lyzwy64lns0p4pka49z30fpzfwdgbdcmmhmd" + "commit": "b5f81f5e900922356ee7aeedf78a54fa96f85c71", + "sha256": "0rb5sngg8l1l4wdixhq4jzf2a55x60c0xzyzrqvpb596pacadbg9" }, "stable": { "version": [ @@ -18887,8 +18929,8 @@ 20210928, 656 ], - "commit": "77eff49a054e08a474608237f0faae13acb4489b", - "sha256": "00xqgjwihd1r625mba788l0270bd9is8g211rsln91wmfv7gnifk" + "commit": "a19868f2fb8f7fc4132b4e9bfac5cdd65f245181", + "sha256": "1gmcnj3ldhqy417wv2lqfh53pg8glfz28bgd26sx5nbw7w5lhd9r" }, "stable": { "version": [ @@ -19228,8 +19270,8 @@ "ccc", "cdb" ], - "commit": "ce0517127586e26f95f94f45d22a832f40a28321", - "sha256": "1qx99sigzmj4fc5wcaqs6wnyzsrzcqg73czn5aknxqkzd1whsk3a" + "commit": "251df5b02c91311140d2375b019c1de836655fd0", + "sha256": "14cxh58rfc2dprb9grshfhwg0fggw469yk8l9dwhc4sy8bf9cd4v" } }, { @@ -19477,11 +19519,11 @@ "repo": "ideasman42/emacs-default-font-presets", "unstable": { "version": [ - 20211007, - 309 + 20211104, + 52 ], - "commit": "1985fc92c62c0a1e660639f78518a42d055045fa", - "sha256": "12ink0pj2mpyf0g6q0smypirw9rvjlg0rr7zj7xw8k6jfhlhlf0l" + "commit": "dbb6c6c5350ba76b12bd69a584b0634a8262a76f", + "sha256": "1yjc4g50r0jghf5a0qipfzys6krgz5vqizm3hlq4lh29hvkazc6i" } }, { @@ -19916,8 +19958,8 @@ 20211002, 1657 ], - "commit": "206d06512cd9934644fa9ea3e17b5e78d01b7e64", - "sha256": "1d51lnwvy53zhq99m6bdm4sp2ykhnwcijc8gpxjqy3c8vnzdbjyk" + "commit": "e1b4b0258289d442e349f67f175f05be6f4347d4", + "sha256": "0yqmaa12sdci6wy95fany03rcqsm9avrjldzrypa9xv5a2ayi48f" } }, { @@ -20145,14 +20187,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210928, - 139 + 20211102, + 242 ], "deps": [ "cl-lib" ], - "commit": "6b7ca8c310ec1c1a83990c8d1c013c68f61d9d51", - "sha256": "1iigna8p76v57hahw3qcsnkd86gqspfb738c74vj5chb1wgb48dw" + "commit": "47f8724ced083c4f5aca9e0751bfd2489198d1be", + "sha256": "186b66fr2hj75si88431dx8jcp2icvk6qb2xi0z24ll7rxwccskg" }, "stable": { "version": [ @@ -21186,20 +21228,20 @@ "repo": "crocket/dired-single", "unstable": { "version": [ - 20211017, - 1240 + 20211101, + 2319 ], - "commit": "f760aa94ea3f87845dd2325287d05447322a60bc", - "sha256": "1l7gh1pi24f6dllzpw72r5hd0iafgrhp4hzn29s35054xhhkkvqp" + "commit": "b254f9b7bfc96a5eab5760a56811f2872d2c590a", + "sha256": "1w243yq5m6zd6yvcsnvxf8162fd6i0l5izqj11mji7jzyqxl1ih3" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "27120d6a079541e994105e3f969032d3ae7edaa4", - "sha256": "14q8lp1x1b78ra9mk90n6dyrm1j9ny5pr7valgpkg8agqyqn7xmn" + "commit": "b254f9b7bfc96a5eab5760a56811f2872d2c590a", + "sha256": "1w243yq5m6zd6yvcsnvxf8162fd6i0l5izqj11mji7jzyqxl1ih3" } }, { @@ -22154,8 +22196,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20211017, - 1058 + 20211101, + 717 ], "deps": [ "dash", @@ -22165,8 +22207,8 @@ "tablist", "transient" ], - "commit": "3382dbb8bd8f4f80291faeae6abbb48e673fcc04", - "sha256": "0iggpym4p5x600d3afqza125s9sifjjy9n6cc6kjw8kdr7h4m827" + "commit": "a7097f68a96470ae7d77b86c7bdee9acb095f06e", + "sha256": "1dnrk8fc725l3nk0rr0xxzz8zizs3558spprjbg8ry1l5fahjm9a" }, "stable": { "version": [ @@ -23243,8 +23285,8 @@ 20210909, 1010 ], - "commit": "530621843764e7a5a4630144102374e8d16b2ff6", - "sha256": "1d9g6g682f4hgybsq29qmxihg8ynkzchvgvfl8ss0rqxs8r7j4bj" + "commit": "4060ee0f13866916336f4ba2c14fa836c9ad04da", + "sha256": "0ffxaj9l186ln642j86m9j79hkn71wqqx8xyzcwg2cc3avqnm3sx" }, "stable": { "version": [ @@ -24009,26 +24051,25 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20211021, - 2257 + 20211102, + 2220 ], "deps": [ "parsebib" ], - "commit": "c11ffdff2377620a4c0567ac6272dbc2b29672d9", - "sha256": "080r21khhxk9823vpbmig5q2n2ch3pn2bc54470bc2pzlp7fbbpd" + "commit": "84c7234c4901207fa0520af96922c2b8e407ff4c", + "sha256": "18gvmymkpzws8s4zjcm1kijyr55dgfcq201z3w1jzhkhcs01bfsc" }, "stable": { "version": [ 2, - 32, - 2 + 33 ], "deps": [ "parsebib" ], - "commit": "831ffcca35601e169c0778035688c5d17d138b58", - "sha256": "04kw0akp35r2ibrcav4kaf34d1xs8pckjiygv7h1nqpv6dmrgfq7" + "commit": "84c7234c4901207fa0520af96922c2b8e407ff4c", + "sha256": "18gvmymkpzws8s4zjcm1kijyr55dgfcq201z3w1jzhkhcs01bfsc" } }, { @@ -24141,7 +24182,7 @@ "version": [ 0, 6, - 17 + 18 ], "deps": [ "ansi", @@ -24151,8 +24192,8 @@ "f", "s" ], - "commit": "3a77ba9f1064c2bca47b401974c009e65727c46e", - "sha256": "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn" + "commit": "d173cdf487bc2c62305e2232db96290bc021950f", + "sha256": "182qgddfv8nd89y1l55rs5vm5i61ayc8cxbplb8zx0alnid9xrw1" } }, { @@ -24926,8 +24967,8 @@ "fsharp-mode", "jsonrpc" ], - "commit": "3d3b977b0fc36dbde0e2a66adf6f93b829e4fce4", - "sha256": "07nn95a2mv2f8llhq9xaxiy5lr2b6j5mjy5bgq2c7idkhrkdqdnp" + "commit": "e92e270c6c987497041fac65cded82146cd41dde", + "sha256": "0jzxdim6mpj984cmhxzpafig6dcaav5x98y59f4ji3dxc95qs6r7" }, "stable": { "version": [ @@ -25003,11 +25044,11 @@ "url": "https://forge.chapril.org/hjuvi/eide.git", "unstable": { "version": [ - 20211023, - 2001 + 20211027, + 617 ], - "commit": "83ed534e78f5b9f4b32c0c8b3d636174afbdd5dd", - "sha256": "1i0prbvzz2m0596gxws6fj8wf7nrwqpnhcxqg0542ij0mk9j81xm" + "commit": "5bb04501a7f5bb3f5be33b8b96742f1ac9839a8d", + "sha256": "0w3xc2yhdrhcb5fjy1h877y14k1iidcqc548qnxjyzal8l0z5nw1" }, "stable": { "version": [ @@ -25203,8 +25244,8 @@ 20210613, 1418 ], - "commit": "b5a5a405d04f61ec9c5fcb19357a50a4b9e36a25", - "sha256": "1w6ps78saxdvx64a2y1vvzn11mvb6bw9657zfin0yibh2s91hqrk" + "commit": "960f3fb962c35d3196bab20b2a3f6d6228119277", + "sha256": "1d1lkcnjjdca73frn611gz9rck73mn2kxq207lh2ykww3wkaa0pa" }, "stable": { "version": [ @@ -25553,11 +25594,15 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20211024, - 1829 + 20211102, + 1943 ], - "commit": "f42b01907ff9f40bcc2cfe04808ad9477314f83c", - "sha256": "1rsld1hi19vx7r60i8rr2ih1bvsq5bck0fk5jr8yfxa4afgn0xlv" + "commit": "4a44c72a8cca50677315b1af7dbcae471421ef3f", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://github.com/doublep/eldev/archive/4a44c72a8cca50677315b1af7dbcae471421ef3f.tar.gz': Couldn't resolve host name (6); retrying in 330 ms\nwarning: unable to download 'https://github.com/doublep/eldev/archive/4a44c72a8cca50677315b1af7dbcae471421ef3f.tar.gz': Couldn't resolve host name (6); retrying in 517 ms\nwarning: unable to download 'https://github.com/doublep/eldev/archive/4a44c72a8cca50677315b1af7dbcae471421ef3f.tar.gz': Couldn't resolve host name (6); retrying in 1178 ms\nwarning: unable to download 'https://github.com/doublep/eldev/archive/4a44c72a8cca50677315b1af7dbcae471421ef3f.tar.gz': HTTP error 302 (curl error: Couldn't resolve host name); retrying in 2285 ms\nerror: unable to download 'https://github.com/doublep/eldev/archive/4a44c72a8cca50677315b1af7dbcae471421ef3f.tar.gz': HTTP error 302 (curl error: Couldn't resolve host name)\n" + ] }, "stable": { "version": [ @@ -25688,11 +25733,11 @@ "repo": "it-is-wednesday/eldoc-toml", "unstable": { "version": [ - 20211024, - 2247 + 20211026, + 1122 ], - "commit": "60f1de70942e163034ef093c61f50f29820c3c04", - "sha256": "1qkcin1b6b41m69gmhj5q4g2lnzfh2w237f87s5zfpkid0mzw7k9" + "commit": "61106be3c3f3a5b293c3f285eec8c6f400142b6d", + "sha256": "079vxv575v4qhdc05jn0ba17f8451nqmdpvh6x4wbg5vdchrqvyp" } }, { @@ -26880,8 +26925,8 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20201011, - 1950 + 20211101, + 1023 ], "deps": [ "cl-lib", @@ -26889,8 +26934,8 @@ "f", "trinary" ], - "commit": "ac0ab88abca1215cac60f8a986dadf3011b444bb", - "sha256": "0g712vmiabia8aqvdw15i4416dgvy73flsijb6x8mq6bbxw6mmrc" + "commit": "22bb5bd15e3f4fc2a9f10b998626fec18fd3a1a0", + "sha256": "1cccxhni2xk5zc0rf807himgdh8aj0m247q0y1xngc9amjms9hqj" } }, { @@ -27473,11 +27518,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20211022, - 4 + 20211103, + 1737 ], - "commit": "560af655922582f3f20a46fb1969915ee34028a4", - "sha256": "0nzygmj6j7f3fw2acifb25lcxswx704fgxlsvl6ya1z6kkamfcx4" + "commit": "0b524bda8d9c5f9e26898e383e98a4ec689fa144", + "sha256": "1jgl9n6js71sx4j1wg2nl5aaqmsq2hzna0qawz813637kaylrdxn" }, "stable": { "version": [ @@ -27496,15 +27541,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20211012, - 1921 + 20211031, + 1522 ], "deps": [ "consult", "embark" ], - "commit": "560af655922582f3f20a46fb1969915ee34028a4", - "sha256": "0nzygmj6j7f3fw2acifb25lcxswx704fgxlsvl6ya1z6kkamfcx4" + "commit": "0b524bda8d9c5f9e26898e383e98a4ec689fa144", + "sha256": "1jgl9n6js71sx4j1wg2nl5aaqmsq2hzna0qawz813637kaylrdxn" }, "stable": { "version": [ @@ -27671,29 +27716,29 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20211019, - 2004 + 20211101, + 1746 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "0657a1facdf39464a0049e2abaec850da5057854", - "sha256": "0cfacz95430xq3zsk7dz1463yc7xk2gqj5byj3537jp4vyhr947g" + "commit": "777c904c9d6c8dfff3ed21c5e4a24a6432f8ee52", + "sha256": "0kg312x6ka4nxpbwsfyhg8n4a2yqi0wcfxgbj17sfcs9d3ssijs8" }, "stable": { "version": [ 7, - 7 + 8 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "bc0d2ec1ba99409421d3f75aae315e10b5014b31", - "sha256": "13jwf5dxhj1ch2l4klxjy1h1by70lhx99bsjdx23pvr6di0srnj9" + "commit": "4529ea69dd86c5e88d7fb7d568a5258b20988042", + "sha256": "1hyxcpv020dhm15fvdq2jgdqzsn2ara8156dpz4c93g8kj614crx" } }, { @@ -28428,8 +28473,8 @@ "deps": [ "closql" ], - "commit": "d8a26b55c2e2dc3edb0e8da7ea6ea4f9024564d5", - "sha256": "1fz2k04iaz6r6jp4jw81gszqxz11x7v3nvm690scbgyim5big66s" + "commit": "9be7c61fe119d9d984d8f3a91139c794300a77f2", + "sha256": "03qymnnsw5fb2xv1bm4z8arz8mnzqhg988baj15r13j1fcakl55r" }, "stable": { "version": [ @@ -29022,14 +29067,14 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20211022, - 2302 + 20211103, + 2356 ], "deps": [ "cl-lib" ], - "commit": "5692fc1f1e8d7f81706bf9d9df9ce371deb9486b", - "sha256": "0ac3i547r8kg9hb2xb0khmgnsvnz79lag4mk5ia608zhiyfzpqs6" + "commit": "63fe57790e212a3375fd9af2ccb3184f3e1d821b", + "sha256": "1hac7p9v510iw15livf3mx8f5f522n6s3w4mbhflilymb3bxclgh" }, "stable": { "version": [ @@ -29076,8 +29121,8 @@ 20200914, 644 ], - "commit": "bea11a04df5f82b2b8782bcad5bf2af2a6b88b65", - "sha256": "043pl1cdyy8yfmw50kqwf7xn0alcm98zzms962v7jdgbhbq07882" + "commit": "475d9add939bf86936a1d5b41c3260f0000bd3c8", + "sha256": "0f7849s67gzzrnkb57hm2p6hbkrd50s02m9l5xfqg286dinhqp0v" }, "stable": { "version": [ @@ -29100,17 +29145,17 @@ 20210315, 1640 ], - "commit": "1d768922b984287892afb1d950ec83a3031c5f7d", - "sha256": "039v8iqx3pyvrc66lmvvdpf8w2s975hm4s1w6j0bm6h5ca9aqr0q" + "commit": "b3d4affcf9880255f6edc2e67095015e6ed2aca2", + "sha256": "1rz9akamp7qc8m417xgbjbm0785bj1jsjpaabzmq3pjxcqzykna0" }, "stable": { "version": [ 24, 1, - 2 + 4 ], - "commit": "0706178dea1c62d8d63c33c86bbf473dcaef89d5", - "sha256": "0kkrng9822vkgw8l7vqglrrmhpq9pqrm7x8786s1bjl31bxd8i9z" + "commit": "eef2e7066ecdf9de5dc7fd81dc5043d9a9757efa", + "sha256": "0gpjl5avpfgrkm6g3p8b2b3zgfvrpsxgvzgb01mhbcw8mi2raka0" } }, { @@ -29538,25 +29583,25 @@ "repo": "xuchunyang/eshell-did-you-mean", "unstable": { "version": [ - 20150915, - 1952 + 20211104, + 237 ], "deps": [ "cl-lib" ], - "commit": "7cb6ef8e2274d0a50a9e114d412307a6543533d5", - "sha256": "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg" + "commit": "80cd8c4b186a2fb29621cf634bcf2bcd914f1e3d", + "sha256": "158g8b4crm0gf5pilfxf89hdsb22gr1wbrjyx9gf45bmcll3i9vf" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "7cb6ef8e2274d0a50a9e114d412307a6543533d5", - "sha256": "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg" + "commit": "80cd8c4b186a2fb29621cf634bcf2bcd914f1e3d", + "sha256": "158g8b4crm0gf5pilfxf89hdsb22gr1wbrjyx9gf45bmcll3i9vf" } }, { @@ -29750,8 +29795,8 @@ "deps": [ "vterm" ], - "commit": "a33073e9e8a56632c76cdd227574107185ae2cf7", - "sha256": "18m04xzrqlhrbpb3w3jqwrihvq1i9vx9301sn9h9qrxby7m3pxcp" + "commit": "f2212dbfa51aa4b67efda55304b2b3811e8e0625", + "sha256": "02q1iyh77m7vg9cip7c9wzpiggnsbhhicfs5rqzpc5d7n70gbk2p" } }, { @@ -30148,27 +30193,27 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20211009, - 55 + 20211103, + 1525 ], "deps": [ "csv-mode", "ess" ], - "commit": "6fd97a89c73815672de7df21d1ecd362a66126b5", - "sha256": "1vbq9xnspbmykbz4axrxskfsb30bzcnfkymiyfy82shb65r53fn4" + "commit": "060ea424d7781d652ae385a48384848b6ded0105", + "sha256": "1nwdf2i47j1m1vhy8ng02xbrmr15gm97fmnd5z4yb29gj2kb69fv" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "csv-mode", "ess" ], - "commit": "845412ba57efab1a28fbaf0dcdbe76bdab03f828", - "sha256": "0m5wmxi4zq3xy9jsg7d2318iyn9g6fpzqiraq0810fbmrdl4dda4" + "commit": "fddf070b51dbcbf7fa060a9998e676e8d0c15e1d", + "sha256": "1zhlinkfzybkk0gbr1pskvx69wk566r6a5dxgpjjry247hq76ci2" } }, { @@ -30777,15 +30822,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20211024, - 1417 + 20211028, + 1851 ], "deps": [ "annalist", "evil" ], - "commit": "1d296af2ec45e98b93048148d5468b05385b1ff6", - "sha256": "1c2xv3486dcrlv2vnl901f9vs3d3krzxpmfnw2h3598fdkv1z60f" + "commit": "9e47d61bdfb63495503e62955ac5509b34c51de0", + "sha256": "06lwla41sr7m4bzlixbivn46c0ydc2hx0jfcqgi9lxk447v8ixcs" }, "stable": { "version": [ @@ -31444,16 +31489,16 @@ "repo": "hlissner/evil-multiedit", "unstable": { "version": [ - 20211023, - 1906 + 20211030, + 2202 ], "deps": [ "cl-lib", "evil", "iedit" ], - "commit": "50179bfb269b35d248a77105f7feb7bbc87fd302", - "sha256": "113q1j90rdnqiwca1d2jkmksh8bm1cf8klj6pm2gimida8s9vfmb" + "commit": "dd88d83a6c4d8501b809aa58d18ac2d51ad5fddb", + "sha256": "028qnaiwnx78c412iywsr4wqsh6fw6mjk5aqpkf5xrk7gvka27h0" }, "stable": { "version": [ @@ -32258,14 +32303,25 @@ "repo": "emacsorphanage/evil-textobj-line", "unstable": { "version": [ - 20150729, - 1522 + 20211101, + 1429 + ], + "deps": [ + "evil" + ], + "commit": "9eaf9a5485c2b5c05e16552b34632ca520cd681d", + "sha256": "1w98gc1sqik8ab35a1hg5853dwar98a8qd94lxpq4ckabpgypins" + }, + "stable": { + "version": [ + 0, + 1 ], "deps": [ "evil" ], - "commit": "3d401b6831bdbeec967ec8e64177a8950251e812", - "sha256": "1vnk27bizzi321mdq3k39zxv8w20ifxbhxabiy685nyk89cq3mbj" + "commit": "9eaf9a5485c2b5c05e16552b34632ca520cd681d", + "sha256": "1w98gc1sqik8ab35a1hg5853dwar98a8qd94lxpq4ckabpgypins" } }, { @@ -32295,15 +32351,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20211022, - 1336 + 20211029, + 514 ], "deps": [ "evil", "tree-sitter" ], - "commit": "a573121b2a053b8a3682a2e1ab86bee0337da2e7", - "sha256": "000dkma3cj38als7pyv4c4338bs1l6m4rfdmh6afi09r9m78vnan" + "commit": "08823ff97277fe50540d8226c7d298e06fb14932", + "sha256": "0w0kj6nd2achp7s6h56vzjjb28c8m5i45laa11iph3g8avvyhf2c" } }, { @@ -33545,14 +33601,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20211020, - 653 + 20211030, + 1408 ], "deps": [ "s" ], - "commit": "b76b60564929137d3cb0bf61ae5818381a36f467", - "sha256": "151mih9zp0ndh8jzzz43vqh7zqwdc8c6gn3ni3hb77rgqj11gvg9" + "commit": "2e37cc1d19f0f6f710932610639e4fd206884770", + "sha256": "0j0mqlx5xv1m1ik61q82lj6y030226k7isswd5plbq2v5z1d8b76" } }, { @@ -33724,6 +33780,28 @@ } }, { + "ename": "fb2-reader", + "commit": "5142d1146d359070e56eeaa5a20dabfc46803ec6", + "sha256": "1gznaxn1p7gzg0s161agx0x4p1v6kqql907k2vj6bxv3j4dqi94z", + "fetcher": "github", + "repo": "jumper047/fb2-reader", + "unstable": { + "version": [ + 20211104, + 24 + ], + "deps": [ + "async", + "dash", + "f", + "s", + "visual-fill-column" + ], + "commit": "3d4f2aef7051ab35f63ed94fda19ab25d1182883", + "sha256": "01vjz1bq7lrf8ynrfyr8lvkll0z228p9qdwj933c3812wjwgk6ml" + } + }, + { "ename": "fcitx", "commit": "e8c40f09d9397b3ca32a7ed37203f490497dc984", "sha256": "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx", @@ -33892,20 +33970,20 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20211021, - 1908 + 20211101, + 1749 ], - "commit": "8c0b2904a9d1bb93552eb4dbc83539bd1f0300ae", - "sha256": "1bhypfb21in3zmc8vpiami4lp381lw591dbmaisgml2glvcbsa62" + "commit": "777c19b8cbf48f3247f8bd47f61858581ad02b50", + "sha256": "0v9a6psnlbh9cyibp95k2frix29ma6b69cgivmh8z4nrp0ycywc7" }, "stable": { "version": [ 0, - 3, + 4, 0 ], - "commit": "ea8564a2cc4f7e10b3fc13faf26a4f098b159f00", - "sha256": "03z3f60qsn6k9wg1km49ad4xlwp82114r5pzibnxly2n0vmmdsyb" + "commit": "815f4c9433fa389bf10ddcf1da6f280e512912ff", + "sha256": "0v9a6psnlbh9cyibp95k2frix29ma6b69cgivmh8z4nrp0ycywc7" } }, { @@ -34042,15 +34120,15 @@ "repo": "knpatel401/filetree", "unstable": { "version": [ - 20211008, - 2353 + 20211025, + 2000 ], "deps": [ "dash", "helm" ], - "commit": "1f0bcf009bf124c213d64dd2726061db6af981b5", - "sha256": "1wsqddl48shi2815zmx609g39bpc9kn28hv26vpjljap8qxpxpzw" + "commit": "a7a71d875cb666bed34e2ec86ae7921d8af5c28a", + "sha256": "08lz5zksnc8728v8gxpmc587pi7i85iv7f35d46appffwc42hfra" } }, { @@ -35157,14 +35235,14 @@ "repo": "lewang/flx", "unstable": { "version": [ - 20191115, - 659 + 20211101, + 146 ], "deps": [ "cl-lib" ], - "commit": "647cb2f92f9936c62e277d7a74ad54a80502d255", - "sha256": "1mslib2zrj1ckl8hiyidc4hi4r83pcv3i1hincvqd2f7qj957lxv" + "commit": "e3b3f0533e44c5250ce73d728b59a7e96c692b5d", + "sha256": "0sgs83gn6ms90yk68ygvcib8k5k94ql6s23qzllas07qzmx0cn48" }, "stable": { "version": [ @@ -35194,8 +35272,8 @@ "cl-lib", "flx" ], - "commit": "647cb2f92f9936c62e277d7a74ad54a80502d255", - "sha256": "1mslib2zrj1ckl8hiyidc4hi4r83pcv3i1hincvqd2f7qj957lxv" + "commit": "e3b3f0533e44c5250ce73d728b59a7e96c692b5d", + "sha256": "0sgs83gn6ms90yk68ygvcib8k5k94ql6s23qzllas07qzmx0cn48" }, "stable": { "version": [ @@ -36235,16 +36313,16 @@ "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20210814, - 1627 + 20211027, + 1357 ], "deps": [ "flycheck", "grammarly", "s" ], - "commit": "509641db723adff48781cfaef391f87e19d043a4", - "sha256": "1gqd21w8n2b4yfdi46qn0q01csglw5gr1f7l8maldxff10l11fyg" + "commit": "cb086c996db0837e774a5dc9edca9592e2e8f9a8", + "sha256": "08njaf2fxfiww5c967qrz18zq3sazdlwdvg66nbxkyzhyhgy6r3b" }, "stable": { "version": [ @@ -36622,8 +36700,8 @@ "flycheck", "keg" ], - "commit": "41a5432e58a74eb830801b21047e5e2f77dcf757", - "sha256": "0jn57vfabyw1b67b5l8ziay65df9jllngwhv8a64ybpmqpryg4k4" + "commit": "bf2457d128dca207b3fb00a2660eb662327f877b", + "sha256": "0yc24n8mvppxni3hbfwk1p5spxqswax90l2v0gwc9wf20djmkdfq" } }, { @@ -37427,8 +37505,8 @@ "flycheck", "rtags" ], - "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", - "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" + "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", + "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" }, "stable": { "version": [ @@ -38388,11 +38466,11 @@ "repo": "turbo-cafe/flymake-kondor", "unstable": { "version": [ - 20211023, - 739 + 20211026, + 501 ], - "commit": "470228acfaed703198bbb04198461ef9a44821b0", - "sha256": "0jdff6wmkw3v19nidyiiw87wl90kxg7r7j85bq1cg9l5pppxnhfy" + "commit": "784e57f36812a37e323409b90b935ef3c6920a22", + "sha256": "1vcl1q07faqqmrryyia36hbgf78g3cs51pbi0bx41yzz779ribvk" }, "stable": { "version": [ @@ -38964,8 +39042,8 @@ 20210724, 1042 ], - "commit": "0bb9ea9969669acce7e9eb1e2c2da6c1dd91a23c", - "sha256": "0jyn2vwkpc1jh7p5z6nbhd4pz80g3ycgi54r9zd7g6r27jlsrbd6" + "commit": "2e098db03cba74149257e31213097d043780e80a", + "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" }, "stable": { "version": [ @@ -38992,8 +39070,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "0bb9ea9969669acce7e9eb1e2c2da6c1dd91a23c", - "sha256": "0jyn2vwkpc1jh7p5z6nbhd4pz80g3ycgi54r9zd7g6r27jlsrbd6" + "commit": "2e098db03cba74149257e31213097d043780e80a", + "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" }, "stable": { "version": [ @@ -39024,8 +39102,8 @@ "flyspell-correct", "helm" ], - "commit": "0bb9ea9969669acce7e9eb1e2c2da6c1dd91a23c", - "sha256": "0jyn2vwkpc1jh7p5z6nbhd4pz80g3ycgi54r9zd7g6r27jlsrbd6" + "commit": "2e098db03cba74149257e31213097d043780e80a", + "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" }, "stable": { "version": [ @@ -39056,8 +39134,8 @@ "flyspell-correct", "ivy" ], - "commit": "0bb9ea9969669acce7e9eb1e2c2da6c1dd91a23c", - "sha256": "0jyn2vwkpc1jh7p5z6nbhd4pz80g3ycgi54r9zd7g6r27jlsrbd6" + "commit": "2e098db03cba74149257e31213097d043780e80a", + "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" }, "stable": { "version": [ @@ -39088,8 +39166,8 @@ "flyspell-correct", "popup" ], - "commit": "0bb9ea9969669acce7e9eb1e2c2da6c1dd91a23c", - "sha256": "0jyn2vwkpc1jh7p5z6nbhd4pz80g3ycgi54r9zd7g6r27jlsrbd6" + "commit": "2e098db03cba74149257e31213097d043780e80a", + "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" }, "stable": { "version": [ @@ -39561,8 +39639,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20211020, - 1748 + 20211103, + 2319 ], "deps": [ "closql", @@ -39575,8 +39653,8 @@ "transient", "yaml" ], - "commit": "72b29bd7bc4172705b55bdd2a5070202ec154069", - "sha256": "054flhapx770f9fg9l0ipbgmdwzxwprkz74v571cn67prrp7j35j" + "commit": "760affa8de6dd4ccb1607d343e36b54296473074", + "sha256": "0139z7h835669f6msflnp940106s3x29k7kagiga413ijjiv140h" }, "stable": { "version": [ @@ -39776,14 +39854,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20211017, - 1118 + 20211104, + 1141 ], "deps": [ "seq" ], - "commit": "984475e2b9432bbba505c567a705804d69936b31", - "sha256": "0q4pgdw8l4iwfakdmmx122gidhgp7q5nfjwcdpjyd3rm3bqmyra7" + "commit": "bf1849456f6c7587e15a44a0e5c7e1f93810a6e2", + "sha256": "1hm2qw11kka2sfafqqhxvbc7ksrgsz5x7difmrbx03ljnib6fvcg" }, "stable": { "version": [ @@ -40326,14 +40404,14 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20211020, - 1758 + 20211031, + 1617 ], "deps": [ "s" ], - "commit": "3d3b977b0fc36dbde0e2a66adf6f93b829e4fce4", - "sha256": "07nn95a2mv2f8llhq9xaxiy5lr2b6j5mjy5bgq2c7idkhrkdqdnp" + "commit": "e92e270c6c987497041fac65cded82146cd41dde", + "sha256": "0jzxdim6mpj984cmhxzpafig6dcaav5x98y59f4ji3dxc95qs6r7" }, "stable": { "version": [ @@ -40399,8 +40477,8 @@ "deps": [ "cl-lib" ], - "commit": "cefe1975e5e278533e891f846b9e7773965093cc", - "sha256": "0cwchcvbdq4h6z1yll920439a3ii3kn6dz71xd7fk3k991zpncy5" + "commit": "8515fe960b5b0bfce158ad91e9141f07a2c5fcc4", + "sha256": "19ch4ndc0pcw6ggv49wpdkq42pw7m86g973g7qrv4mgf95aprbi0" }, "stable": { "version": [ @@ -41164,25 +41242,25 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20210508, - 1838 + 20211029, + 1512 ], "deps": [ "geiser" ], - "commit": "8dda28f4f1758221f84f5cb5dc5b5ca5fd56caa9", - "sha256": "0iw23nlgqppf6f00ly50m8lq85n9mv244pw3whxv0hynfjxr2ic0" + "commit": "1c5affdf1354220b49ab08b5a7665ebf61080863", + "sha256": "0gndf0w8dbv54bzc04svp2ck8wypa7i3b8kpixf6rkg91l79xpci" }, "stable": { "version": [ 0, - 17 + 18 ], "deps": [ "geiser" ], - "commit": "8dda28f4f1758221f84f5cb5dc5b5ca5fd56caa9", - "sha256": "0iw23nlgqppf6f00ly50m8lq85n9mv244pw3whxv0hynfjxr2ic0" + "commit": "1c5affdf1354220b49ab08b5a7665ebf61080863", + "sha256": "0gndf0w8dbv54bzc04svp2ck8wypa7i3b8kpixf6rkg91l79xpci" } }, { @@ -41333,15 +41411,15 @@ "url": "https://alexschroeder.ch/cgit/gemini-write", "unstable": { "version": [ - 20211009, - 2110 + 20211026, + 1639 ], "deps": [ "elpher", "gemini-mode" ], - "commit": "7e1fe7d4f2c65c0854eb571edc78e5a45d7078de", - "sha256": "0p1ch44w7sn73p87a7k47drgdj4sam961arfr4k0ii4fny54cyip" + "commit": "169333a5c251c14a84286dea02a63d1a5e93cf54", + "sha256": "1mfg8yb03wr278x6whzqz0y68xsl2g5zdwak08j9a6yigib8pmcf" } }, { @@ -41477,11 +41555,11 @@ "repo": "matsuyoshi30/germanium-el", "unstable": { "version": [ - 20210912, - 1407 + 20211101, + 1453 ], - "commit": "22e7aac319f45b45c884d504f060f27b2dae159f", - "sha256": "010sn05dpscj8nikr8hgvyybqdya6597kvh9a0ck1a4papqncbvm" + "commit": "1f28da73dd767b1cf5afe2230a0fd81bfbb1bb6f", + "sha256": "1v1ig4pf5ydb4b1fnjv9awdr2kfwzv1vbgqgkqhbswasxzzz4vgm" } }, { @@ -41501,8 +41579,8 @@ "magit", "s" ], - "commit": "ba1e4423ed08abc2f427afd60216dc586a931075", - "sha256": "09bfjahnxhbablrjrwkc4mm1sfxxk1nkl4ws2dy8dz55dqhjyiic" + "commit": "3de210e2bcf9a7ce9a2a448cd910ffe477de8432", + "sha256": "1aaaff18crz86f1mpjkwc6vfjdayjnv4imqrl8qnqfccbmkb5z4w" } }, { @@ -42134,8 +42212,8 @@ "transient", "with-editor" ], - "commit": "aba0a596115b42fbd60347d893bcc319020ce5a2", - "sha256": "128jni29ka15wnkmwp5s3pnlwxvfq3g961f7zg1c72k1yh3crq3f" + "commit": "2bd1d823ddebb0cfef31a3338916aaef9ae01660", + "sha256": "1d3hhsb7r7ch3q6azchvpjf885mfnqx6xg5wl3iqbyhhr0i8q7vj" }, "stable": { "version": [ @@ -42763,11 +42841,14 @@ "repo": "TxGVNN/github-explorer", "unstable": { "version": [ - 20210825, - 1440 + 20211031, + 120 + ], + "deps": [ + "graphql" ], - "commit": "cd1186fb6ca7728c1cf2478ad3878a6401c65246", - "sha256": "0zfnqsw3918rfcfapzgfalrd5w6rhy01ym6ykdswrlv38zd9kjk6" + "commit": "a40c122e6768578254641fc0f24a8437ee70fac9", + "sha256": "1n7h5sw6b6907w2ry9d1knmda86s8iy9bim75ggyy6qcy06w0jdh" }, "stable": { "version": [ @@ -42845,8 +42926,8 @@ "repo": "charignon/github-review", "unstable": { "version": [ - 20211011, - 1933 + 20211029, + 243 ], "deps": [ "a", @@ -42855,8 +42936,8 @@ "ghub", "s" ], - "commit": "2a24e75dfc2d9f37789ff60b4c10deb7c96f3f88", - "sha256": "1mahd3kg5rr6jf1x3ixjvhgkv9c8fq8mxvikrmpjciari05sd58y" + "commit": "725fbc7b385228f53a7ddc46a92c1276bab4aea8", + "sha256": "1261p65wlpl9s5xqq1jfnkj7hrn27a4bn85rxc3allqdl5hc63hd" } }, { @@ -44367,8 +44448,8 @@ 20211025, 443 ], - "commit": "5bc52d326a7168e22a61542f9b48a053d14aca87", - "sha256": "1bvfd07daiqw7sf11bvrx0g19869hd4sgjnifrhvq17xrpwv4cdf" + "commit": "8de1c3b660602b6739444ceed3e48214c417fe38", + "sha256": "0b8jbcs848ck0zbl6rmyyac3mbhx58zq04l7wvi7paficg9lphj9" }, "stable": { "version": [ @@ -44450,11 +44531,11 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20211017, - 1732 + 20211031, + 1513 ], - "commit": "6023ca87b28fa05ebad320c8b9c5887c6dd0f51b", - "sha256": "15bqjmwfdqp2np6fln6xjyw59c5iddvzsyga0lvb8raa753cdh2k" + "commit": "36139cb1898c763be08167c74b5c5d05efada9e5", + "sha256": "06r5zpp4k4flv9slkpgxfy9m9c7b5kyix2si30bdka3fq4c1jwl5" }, "stable": { "version": [ @@ -44595,11 +44676,11 @@ "repo": "io12/good-scroll.el", "unstable": { "version": [ - 20210820, - 633 + 20211101, + 942 ], - "commit": "bd369750d3aeb7e210c1c033569a53d0fda898c9", - "sha256": "0dkqipsbl7sl6j6asqv7y0md2kxx91n1k4hms7d4jbj4shka7hnz" + "commit": "a7ffd5c0e5935cebd545a0570f64949077f71ee3", + "sha256": "0f1zs3fjz5yc25qjka5g60018554ssdbp4j7xj275pmzrc78915w" }, "stable": { "version": [ @@ -44997,8 +45078,8 @@ "magit-popup", "s" ], - "commit": "d99e99542ffe1e054b2da68fac48ee5ce2bd4987", - "sha256": "0p4y8j6x086wr6w13l7z1vbzq5aza2hw2hlazsjs6n4c60p9bnbp" + "commit": "14d8083c9ca296ce3c3e6d4fe21e455119f56db5", + "sha256": "0k8k22vwd0148sr8lnxjsvrhsp4byfb8icaqhk9cshws3g5hpb7w" }, "stable": { "version": [ @@ -45224,16 +45305,16 @@ "repo": "emacs-grammarly/grammarly", "unstable": { "version": [ - 20210219, - 1713 + 20211027, + 1359 ], "deps": [ "request", "s", "websocket" ], - "commit": "e0ae37f23a34ff0b7959963314410f30d75dddb1", - "sha256": "0pjvlamld25rbphpnwjyvfscmk7im6qvj9cgy8gd8d7hlzch49cv" + "commit": "38d5c0384e90d577c4c657110fe4ef2d76b6146a", + "sha256": "0dxds8w213ad4czw5mrrb8a2i41jwsvrphy797lln5j7h404gs07" }, "stable": { "version": [ @@ -45414,8 +45495,8 @@ 20210912, 1544 ], - "commit": "1912bd08f558e4609f4dd30ba91181b6ce7f69d9", - "sha256": "0938cb40i5gs8sqksn2k1zpjm1g9a989dm7fb80dzm71r32y596n" + "commit": "80e9ac8020f7a4a8a963136698eb97a9fca28f7d", + "sha256": "1m4glbijclbhhzq8apvfyslfv1lgn3hy3wcfiynrpkxnxszygnyx" } }, { @@ -46144,11 +46225,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20211023, - 1734 + 20211029, + 2148 ], - "commit": "567539b97d1e8fe4b59e5383d24d48b32de1f927", - "sha256": "0a51mkfavx0cm9v4sdkl53rvxiz3sv00p2v3byinym3ijsccmhj1" + "commit": "397379a3e032f31e98a57f5eb2187a0607c6bd7a", + "sha256": "0qmknrb4h20cp4ldzkiwnvgggr3pg1qjbkql0wz9vg4h90bf3gfh" } }, { @@ -47103,16 +47184,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20211023, - 428 + 20211031, + 1714 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "a030335d3f5d108ef2c79e9bf0a4d2437c9cd026", - "sha256": "02ikh0mrrym5yzg6y76mjik00makprh9n09bhcs27xhsb8izmk2y" + "commit": "349663e85eddb40ed6ae78329e6abc47513b17f1", + "sha256": "0as1wk8crs9yizn1h6pqj60z4df59f6m632kfcnwl08yvzhiva3n" }, "stable": { "version": [ @@ -48017,8 +48098,8 @@ "deps": [ "async" ], - "commit": "a030335d3f5d108ef2c79e9bf0a4d2437c9cd026", - "sha256": "02ikh0mrrym5yzg6y76mjik00makprh9n09bhcs27xhsb8izmk2y" + "commit": "349663e85eddb40ed6ae78329e6abc47513b17f1", + "sha256": "0as1wk8crs9yizn1h6pqj60z4df59f6m632kfcnwl08yvzhiva3n" }, "stable": { "version": [ @@ -50398,15 +50479,15 @@ "repo": "tumashu/helm-posframe", "unstable": { "version": [ - 20210412, - 1147 + 20211103, + 236 ], "deps": [ "helm", "posframe" ], - "commit": "2412e5b3c584c7683982a7e9cfa10a67427f2567", - "sha256": "0k4lmgvrxm4lswafc3fb8aab3ax0gnkkq64vg3vmiry85kih2cqb" + "commit": "87461b52b6f3f378c63642a33f584d4a4ba28351", + "sha256": "1hmf1l6hmir0kvpl5h0wk4l17nmk0lfi659lvg89jc1sm18v2xv9" } }, { @@ -50877,8 +50958,8 @@ "helm", "rtags" ], - "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", - "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" + "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", + "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" }, "stable": { "version": [ @@ -52775,11 +52856,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20211007, - 309 + 20211029, + 602 ], - "commit": "2c6a47cc37b0dfcd8489e4fe36c379f0a47d451d", - "sha256": "15jxlzbxkpyfd6mr7jhs6vfxizdwsr5bi2g6xplndndmwdqq8x49" + "commit": "0593a1a77db28503025d5c1850e6a99551c3bcbd", + "sha256": "1rkxm6ak1zaqzp6q6mqpng0k4qjnsshkwydfxfm63xfsgr4vwhwv" } }, { @@ -52826,11 +52907,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20211006, - 1402 + 20211025, + 2138 ], - "commit": "e8be12a44ee659d73cf934530adc58ab9a48e9dd", - "sha256": "10bs34jjnza2lf8q32dki54wpyyy815k5a35n2r76xnimayrcy5p" + "commit": "121f24c12c6711f65157259d90cbe88a53c10336", + "sha256": "0mwhqhf84kf76wrqz6l9rp4majfl7dnxs1dg49qls32lv44ihs2x" } }, { @@ -54788,15 +54869,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20210728, - 846 + 20211103, + 1521 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "3cc9361b4c0ca88fd3ba218633ea1edeae18d6fe", - "sha256": "04zj69lwjcwz0dmmwz84lfr3w0cdca94pv69ldvik4qh685cd0n9" + "commit": "8553aef4e4bd22e35a236413b09980c6f93a9041", + "sha256": "15r63yqaslsdg760xiwrg2d7cxiiyvzrjzfmnfx8zwg32nfpkh1b" }, "stable": { "version": [ @@ -55655,14 +55736,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20210811, - 645 + 20211027, + 1611 ], "deps": [ "clojure-mode" ], - "commit": "38e7dc1829646b93473c31d704bda0dee6644a38", - "sha256": "1g2dacwf8dnm289y7cpy3vpdyp6qndwg52nvgdxzsbg9xx7wdz72" + "commit": "765653dc23dc2a2c1520a1e24332ab9d4b49dd47", + "sha256": "1hbylg5nsix65a85bibwgzcyjkf19rjvdkg04p9hnvsgh59x2d5l" }, "stable": { "version": [ @@ -56106,11 +56187,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20211007, - 357 + 20211101, + 558 ], - "commit": "d82680ab7a7531a1c9369e65f2714285e43c6688", - "sha256": "0n1vh8rpn9zkwpnwm03rmz6xmcqicj9wzc0q6jbfg1ndc6yz29rw" + "commit": "1ca71416869e7515a9c2587b35f21a11921686f3", + "sha256": "0pl2hpcy9165np17gwa9qhqxb43kwm0z746pxcga7rfg6apy6krc" } }, { @@ -57503,15 +57584,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20210922, - 24 + 20211103, + 233 ], "deps": [ "ivy", "posframe" ], - "commit": "b4a522b7f81d49e7664f90a4f9ff1c2def08a3a9", - "sha256": "05rd1kylq0114mnw0rfj2k15pir9shgy19n1ih86i85h718z2z80" + "commit": "5d9420252ca855d6d206f1f8ef5993a6be3c618f", + "sha256": "1yan9h12208dalzgpffqxnzv8b0hwzhzna01gnzb9wmkcfi3fpmh" }, "stable": { "version": [ @@ -57542,8 +57623,8 @@ "ivy", "prescient" ], - "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e", - "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr" + "commit": "292ac9fe351d469f44765d487f6b9a1c1a68ad1e", + "sha256": "0ywx7q41i9pzmfgwv83mz5z17gril2s0r7y77hbbriww5yy1ihx4" }, "stable": { "version": [ @@ -57634,8 +57715,8 @@ "ivy", "rtags" ], - "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", - "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" + "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", + "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" }, "stable": { "version": [ @@ -58683,11 +58764,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20210512, - 2301 + 20211027, + 1852 ], - "commit": "c5cc024a06684b91da9bb05fecf681426596af5e", - "sha256": "1qkkqqq4r5j10s4q17r2r4ryim0gpknr5h512jj9yk52a77q1g7d" + "commit": "647cae28087529d18367f895d7ef689c7f64c6bd", + "sha256": "086h53mmdjx30093zazwylx3fg7jvbcjy63q4ph63ybizsbiy5lg" } }, { @@ -59059,8 +59140,8 @@ "deps": [ "cl-lib" ], - "commit": "e6a9059fc823a17496e1a5114652d92a9071a78f", - "sha256": "16i0i0dz6yk24ny66irlfh9xjllp7a78ccx95mrlpqcxsjkcqv62" + "commit": "a059c4105b374ce037b4cc0c942f9aed96508021", + "sha256": "0cghwxk43jzajb5f5l4904bl2p95bdcld2qc25r08a5d34jidvl1" }, "stable": { "version": [ @@ -59572,8 +59653,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20210818, - 310 + 20211103, + 449 ], "deps": [ "dash", @@ -59582,8 +59663,8 @@ "spinner", "vterm" ], - "commit": "5b95b278772de8339ac198fe6eaadb0427d680fb", - "sha256": "11spibld7dyggr38hzkrd05lmdf847d57cc9qyk01mb3bli21vxd" + "commit": "74aa827032e34f1d4202831008bcfa3c29b9f0c8", + "sha256": "03rmj7pj91bhg1kzqha9l5glnxgrjqmbsmblamrka4k22r09pcn6" }, "stable": { "version": [ @@ -59772,8 +59853,8 @@ "websocket", "zmq" ], - "commit": "1f0612eb936d36abab0f27b09cca691e81fc6e74", - "sha256": "1mpch20iahijlgwg8bjpjg7bm9hd2wyskqbknafw8jkwyj7dvng2" + "commit": "20e68a683632d4772780199216932223fa404aa7", + "sha256": "1ivq67cbkvb675sllrs1184a32agvh3c2i950vf017jjf1hab05k" }, "stable": { "version": [ @@ -60305,20 +60386,20 @@ "repo": "ifosch/keepass-mode", "unstable": { "version": [ - 20210110, - 630 + 20211030, + 948 ], - "commit": "515343a7667b2bf4253309449f65a6eb94933df7", - "sha256": "0hrq521swki0l3m81wk9p7pkc5j99li441fb75h7107v6z0p102c" + "commit": "be190a86fd82337fe5280c1833f92d1f9997bced", + "sha256": "1z252qqv55yzjz5w2cq1vpcwdnzwkm1hldc9a5i9qv1dkp73nkkd" }, "stable": { "version": [ 0, 0, - 4 + 5 ], - "commit": "cd07542fddf080927eae927afdcf62be1b087503", - "sha256": "1syz5yds6b59dws6f8b6az2ng7czwnq34izlc9y25c8ng94bynm5" + "commit": "f432bb60f9f3bd027025140d723906dcabeefaef", + "sha256": "0wrzbcd070l8yjqxg7mmglc3kfgy420y3wnykky198y83xsv3qy2" } }, { @@ -60329,11 +60410,11 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20211023, - 1823 + 20211104, + 617 ], - "commit": "41a5432e58a74eb830801b21047e5e2f77dcf757", - "sha256": "0jn57vfabyw1b67b5l8ziay65df9jllngwhv8a64ybpmqpryg4k4" + "commit": "bf2457d128dca207b3fb00a2660eb662327f877b", + "sha256": "0yc24n8mvppxni3hbfwk1p5spxqswax90l2v0gwc9wf20djmkdfq" } }, { @@ -60347,8 +60428,8 @@ 20200601, 333 ], - "commit": "41a5432e58a74eb830801b21047e5e2f77dcf757", - "sha256": "0jn57vfabyw1b67b5l8ziay65df9jllngwhv8a64ybpmqpryg4k4" + "commit": "bf2457d128dca207b3fb00a2660eb662327f877b", + "sha256": "0yc24n8mvppxni3hbfwk1p5spxqswax90l2v0gwc9wf20djmkdfq" } }, { @@ -60615,14 +60696,14 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20210125, - 823 + 20211027, + 1933 ], "deps": [ "cl-lib" ], - "commit": "0b282e19ac3d23b9a74f656b137b9eebeb2aaa39", - "sha256": "0ni03xnakai9ncq07gwzqy4walgijd04bnxslk3b4xnnk60i8m2h" + "commit": "20e5ab2a8bfdf9b44c813c6abd96b478f822ddef", + "sha256": "1acflsq0yh3sj607g2yasdbwacyzdh27hmgplybxc3zg464gldj1" }, "stable": { "version": [ @@ -61009,8 +61090,8 @@ 20210318, 2106 ], - "commit": "6430e1356248313f5cdd3a96c8861b17b12c0be7", - "sha256": "01rzf8v9psihzpg0s5ar2svkxccmb32ypwsms3863c67ag9d9818" + "commit": "e8725996ac8cc8d533ba91f1e8325b74928d0b7d", + "sha256": "0px17zsy1dawgkm5zjbkg8j4zbsgiswkfcwrg1dxp0bf1b3my1j6" }, "stable": { "version": [ @@ -61375,8 +61456,8 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20210914, - 1158 + 20211031, + 133 ], "deps": [ "dash", @@ -61385,8 +61466,8 @@ "transient", "with-editor" ], - "commit": "7cb6e4f2d571d45c49dba2427f7e65a9e0a994f2", - "sha256": "1h9daqmskb9cv0s1w3rbv4p5sg5pmym0pkwz922hy72kvm593fyg" + "commit": "cfe2aff207d22af0be08835302a74bc52a30f69a", + "sha256": "1jfg73vam49rg4kw88mvh4arlf02w8vsgyxnqwr4f3112x3m1r76" }, "stable": { "version": [ @@ -61420,8 +61501,8 @@ "evil", "kubernetes" ], - "commit": "7cb6e4f2d571d45c49dba2427f7e65a9e0a994f2", - "sha256": "1h9daqmskb9cv0s1w3rbv4p5sg5pmym0pkwz922hy72kvm593fyg" + "commit": "cfe2aff207d22af0be08835302a74bc52a30f69a", + "sha256": "1jfg73vam49rg4kw88mvh4arlf02w8vsgyxnqwr4f3112x3m1r76" }, "stable": { "version": [ @@ -61571,16 +61652,16 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20210826, - 1017 + 20211103, + 1633 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "a992e92bf80f5d9e401f916a9e74acce05af4a8e", - "sha256": "0di6p1wapm714vd8d85d1wwzlh68ikfjw3qpjninbmjrzw2bwqp4" + "commit": "397bde14a67e91cb95ca6b2d5a5d5025cae243c3", + "sha256": "1kjda08zpzwvmk17f4654zvxildg1dyfxm10n6py0mfc0ldp8rf3" }, "stable": { "version": [ @@ -61696,16 +61777,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20211008, - 1231 + 20211029, + 1658 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "933a1b37b86685bb1f2df2a2185741b0d21aaa78", - "sha256": "0mxsqf78y4chm4yyxbfz69p56m3n35c5sv4agdwg6griaf0s5f59" + "commit": "6b453ab1f1fd0c48bb18ce077009e038c649cf04", + "sha256": "13bprd1vg4adr61hbcbih3p2yghlx4ygw5zi0vgcfr2r4lbpnn6k" } }, { @@ -62212,11 +62293,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20210611, - 1550 + 20211030, + 621 ], - "commit": "0ccc52bb85592d09499a09768a61ecfeccbfdf1e", - "sha256": "0nwma6cvvlfyjxkrzi724brkx5s6k64n994nbwp7zaz6rqs1xmfd" + "commit": "61365188be30c34c0e8b6f2004488e60a83dfcd6", + "sha256": "1fps4pmwhciksk21b9w7y6y827panf8xr80rk14fjsf2j2bpv841" }, "stable": { "version": [ @@ -62800,8 +62881,8 @@ 20210603, 1241 ], - "commit": "f39ec6a9b93f09e1a49ee84405d1e03e04adc7cf", - "sha256": "0ri06q30z699amw7a94a14ccf83zx547przviqw0wla3l2xaw26j" + "commit": "3d2483d6a46552eaa832f8e6df5dc1162e58fc79", + "sha256": "1vpif0g45xh16sqqsjh9hin61kzc2la79pmrxl3rmw2jvpg6pzym" }, "stable": { "version": [ @@ -63066,17 +63147,17 @@ 20211011, 954 ], - "commit": "1f5f7e81f37d14c18b303d6d2b5cc489761298e7", - "sha256": "0db5ssmwx9rni11hmm4bv2ykvfk6vc25lkd0wbhl6ixxf51iijzq" + "commit": "faad1b26fd53121bd65e938ad4a4e78281712bde", + "sha256": "0bm2hxk2fhr11q2v45issa268snz0mxjhyc3ik2w8kg12faz936g" }, "stable": { "version": [ 0, - 27, + 28, 0 ], - "commit": "d5d3a30e724a4ba2d5a96b51180e1fd907e57d32", - "sha256": "180z2clv90zwg9dkzbzs2wmiydz5z4hwmry93qp9ywn9qg1iaqfk" + "commit": "16fee65109043bc5d899c5f34dd10354bd087615", + "sha256": "0bm2hxk2fhr11q2v45issa268snz0mxjhyc3ik2w8kg12faz936g" } }, { @@ -63087,16 +63168,16 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20211021, - 1653 + 20211025, + 1745 ], "deps": [ "fringe-helper", "ht", "indicators" ], - "commit": "efc88f21cd206b7ded3d10a0159a5a4196db86ae", - "sha256": "1nbp91vwh5pd3dk35h6j2mhknnpkz899lczab5zxqkzl52rcg7qz" + "commit": "593bbe1277651e1281807f84e46a4e9a75ced784", + "sha256": "1r8dkbca9abjs5g949hqkn54ggd2wmgl60h10jx8y9s6c07g14hq" }, "stable": { "version": [ @@ -63613,11 +63694,11 @@ "repo": "publicimageltd/lister", "unstable": { "version": [ - 20211023, - 1842 + 20211028, + 1659 ], - "commit": "cdc4ee6df5033824582648974d20ac442f2d61da", - "sha256": "0ip3fbd2byjhhwlyapqm96w6q2275k6vpfxl0nlms9v2f4mfnvg2" + "commit": "22df7ad4a7cccd5e5861a37127263317ef6bea2a", + "sha256": "07im7gnrn8n8hsaf7zyfj7h1r5ig0bw7p0g26sicgwgbhfnz22y9" }, "stable": { "version": [ @@ -63757,14 +63838,14 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20210528, - 815 + 20211101, + 948 ], "deps": [ "s" ], - "commit": "18d523d5b6a8cecc3e93c550d2ceab2d1035de02", - "sha256": "1d8dlb2xsqk88lac7f9n0y8ridkn6gfl5pb6sr2n66v9mq75j6rq" + "commit": "ba7d22140a165b0fdd900a8d04916115ca6ab8ff", + "sha256": "1bdybw44pmhfpikdv1kg2sx88546xyncks5a4b2s0ak4p66r82k3" } }, { @@ -63901,11 +63982,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20211023, - 2036 + 20211102, + 152 ], - "commit": "3191fbb9954815bdef0af5a3d469b4f820d5a233", - "sha256": "01mg0ahqxgj1igxv2x4z8ind4k7jv0b4yg2i90nsgzgrkg2kd2f8" + "commit": "bd933c7351751eecc0f988166e983a9e478531be", + "sha256": "1apdjil570i9kjl4hm952cp5rjh68vhi23a1mq1d0vna4sc6pzl1" }, "stable": { "version": [ @@ -64535,15 +64616,15 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20211021, - 57 + 20211101, + 2351 ], "deps": [ "map", "seq" ], - "commit": "49efa7e59deaa2a0385e420b18df905a2328f9c4", - "sha256": "02qd7cg1g3812vflrxsrg9hd7yh60cyknn16l6cffn0iax2v2mdn" + "commit": "d95cf6dea7addd020d1ccacc25527f181b3eaa63", + "sha256": "1jxmnfyxak6c11glsx0j912bhv4y4ly0zbyjl37dfn78vb3yr7y5" }, "stable": { "version": [ @@ -64574,8 +64655,8 @@ "dash", "loopy" ], - "commit": "49efa7e59deaa2a0385e420b18df905a2328f9c4", - "sha256": "02qd7cg1g3812vflrxsrg9hd7yh60cyknn16l6cffn0iax2v2mdn" + "commit": "d95cf6dea7addd020d1ccacc25527f181b3eaa63", + "sha256": "1jxmnfyxak6c11glsx0j912bhv4y4ly0zbyjl37dfn78vb3yr7y5" }, "stable": { "version": [ @@ -65087,8 +65168,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20211023, - 2009 + 20211103, + 1331 ], "deps": [ "dash", @@ -65098,8 +65179,8 @@ "markdown-mode", "spinner" ], - "commit": "6157b3dde2c56f734a0789225240c521acdf2c7c", - "sha256": "0p4lab475h0s4269zyg0ggnvx3mgqw6xix05a5nyf3jc441cfdjq" + "commit": "293a43819a96eb94b90bc14b6cb11ebfd090e8c8", + "sha256": "0rd3nh9wslp753cm5xypp9h8x2p7a5s7v6gkdqfs80fzdiy8ny3m" }, "stable": { "version": [ @@ -65246,16 +65327,16 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20210513, - 1022 + 20211103, + 619 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "72fd57643d2e8eccb9a55058ec0c89bdc04dba7d", - "sha256": "1p90d85bm51fjxy4q3fxjc4xj2vzabyi9db1bjl2j0q9pr2yphsz" + "commit": "d428dbcf1802fbe147271c8dc74b073bd9cd7403", + "sha256": "0y31dajhd6jfla4h137k78clvwsfj1pdmgd61ni83yl6ackpvm8c" } }, { @@ -65433,16 +65514,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20211009, - 1545 + 20211101, + 131 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "d08c5528ba0a63433a466c2fa1265ec3250fcef1", - "sha256": "0p12arjl03y2ax8b6g36ppnb1qqkkc2pvv415wsgxydqias775mq" + "commit": "dd4c181a22d19a28236c442cf6c9cd4bbd6d85f8", + "sha256": "1awvnv29ca3whfg48icwqhgdfijrags61cmq9dn6mn0w849b6k4m" }, "stable": { "version": [ @@ -65953,8 +66034,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20211019, - 1404 + 20211101, + 1824 ], "deps": [ "dash", @@ -65963,8 +66044,8 @@ "transient", "with-editor" ], - "commit": "aba0a596115b42fbd60347d893bcc319020ce5a2", - "sha256": "128jni29ka15wnkmwp5s3pnlwxvfq3g961f7zg1c72k1yh3crq3f" + "commit": "2bd1d823ddebb0cfef31a3338916aaef9ae01660", + "sha256": "1d3hhsb7r7ch3q6azchvpjf885mfnqx6xg5wl3iqbyhhr0i8q7vj" }, "stable": { "version": [ @@ -66036,6 +66117,24 @@ } }, { + "ename": "magit-commit-mark", + "commit": "2d6e8cd768a8d119f1ac3407f9d5793b084e8f1d", + "sha256": "0dvw9plzhm3yql719xi2n4j1v9q31g67jnwx5n5pzjk90v2rzqxm", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-magit-commit-mark", + "unstable": { + "version": [ + 20211101, + 948 + ], + "deps": [ + "magit" + ], + "commit": "3debd2bdf20b78e108d309be606db01bb2cb4810", + "sha256": "0pmggb980an5nxjq5jkxfvib9akqyd4k9j80ljpbayhiypda93a2" + } + }, + { "ename": "magit-delta", "commit": "6e045d09ceec253bbd033b561ab077d897e9b6b2", "sha256": "0r7g8p7g348cfz31q0mgxxa591n8clwpaack487ycc1nzsqbj726", @@ -66311,8 +66410,8 @@ "libgit", "magit" ], - "commit": "aba0a596115b42fbd60347d893bcc319020ce5a2", - "sha256": "128jni29ka15wnkmwp5s3pnlwxvfq3g961f7zg1c72k1yh3crq3f" + "commit": "2bd1d823ddebb0cfef31a3338916aaef9ae01660", + "sha256": "1d3hhsb7r7ch3q6azchvpjf885mfnqx6xg5wl3iqbyhhr0i8q7vj" }, "stable": { "version": [ @@ -66479,8 +66578,8 @@ "deps": [ "dash" ], - "commit": "aba0a596115b42fbd60347d893bcc319020ce5a2", - "sha256": "128jni29ka15wnkmwp5s3pnlwxvfq3g961f7zg1c72k1yh3crq3f" + "commit": "2bd1d823ddebb0cfef31a3338916aaef9ae01660", + "sha256": "1d3hhsb7r7ch3q6azchvpjf885mfnqx6xg5wl3iqbyhhr0i8q7vj" }, "stable": { "version": [ @@ -67275,11 +67374,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20211016, - 117 + 20211028, + 1244 ], - "commit": "86ac625169041cdc706c5e39cae0bf314c042473", - "sha256": "1i38nxhqp9j3hrc0a23gjqds2v04vswzysw378linb7fyhylz7vv" + "commit": "09d8ab38a5a4aa55a83968dc3e454d11fee05255", + "sha256": "140hbxyb7z09vp0f0h5fad4jiyfz4s34nnhgrw3vpm1whspq7ng8" }, "stable": { "version": [ @@ -67910,20 +68009,20 @@ "repo": "dochang/mb-url", "unstable": { "version": [ - 20211013, - 611 + 20211029, + 2220 ], - "commit": "f6b608db585231eee231d5473edcf4183bb678fe", - "sha256": "1rrg7skg1ifh6bnplxdcp1wryqgwf3aspcvdrrh8k6wd1z7zgdai" + "commit": "670d31edc0938c49c77d80543c6b2a955edadf85", + "sha256": "0sdiwgkhqnxq3pva9cyvcjyc69qvpxc91785p1z3rgvb9z3bshjj" }, "stable": { "version": [ 0, - 7, + 8, 0 ], - "commit": "f6b608db585231eee231d5473edcf4183bb678fe", - "sha256": "1rrg7skg1ifh6bnplxdcp1wryqgwf3aspcvdrrh8k6wd1z7zgdai" + "commit": "670d31edc0938c49c77d80543c6b2a955edadf85", + "sha256": "0sdiwgkhqnxq3pva9cyvcjyc69qvpxc91785p1z3rgvb9z3bshjj" } }, { @@ -68311,16 +68410,16 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20211024, - 1408 + 20211104, + 807 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "26c4aa2797b4ce1b24aa83e06d0b82d94e4cea15", - "sha256": "0m7xpg719n6zsbh82k1i7f2p9nd54avxywrypla3wk3kvjfdc1z3" + "commit": "95a9df3e469355cb867724d1dd1139ec4e21540d", + "sha256": "0s231294mgf951y5swqr3hrh1q48ip5p8w4vvj3kqjsq15n0lw3s" } }, { @@ -68334,8 +68433,8 @@ 20210720, 950 ], - "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", - "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" + "commit": "27600243558e2596a6bbdc52540389c298488adb", + "sha256": "0fn66n8ln0xc4l25l48yshzrmyy7sf7ik9nqpfhhpzslcf249h39" }, "stable": { "version": [ @@ -68364,8 +68463,8 @@ "auto-complete", "merlin" ], - "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", - "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" + "commit": "27600243558e2596a6bbdc52540389c298488adb", + "sha256": "0fn66n8ln0xc4l25l48yshzrmyy7sf7ik9nqpfhhpzslcf249h39" }, "stable": { "version": [ @@ -68398,8 +68497,8 @@ "company", "merlin" ], - "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", - "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" + "commit": "27600243558e2596a6bbdc52540389c298488adb", + "sha256": "0fn66n8ln0xc4l25l48yshzrmyy7sf7ik9nqpfhhpzslcf249h39" }, "stable": { "version": [ @@ -68461,8 +68560,8 @@ "iedit", "merlin" ], - "commit": "e4791e22986993c36c3f5c91e8dff93494cc232e", - "sha256": "16hkwzsw3igb9ybcjmbmxhrhgy78m8465fv3vys7w3783w6bzkxx" + "commit": "27600243558e2596a6bbdc52540389c298488adb", + "sha256": "0fn66n8ln0xc4l25l48yshzrmyy7sf7ik9nqpfhhpzslcf249h39" }, "stable": { "version": [ @@ -68714,14 +68813,14 @@ "repo": "ianxm/emacs-tracker", "unstable": { "version": [ - 20210207, - 1100 + 20211026, + 1347 ], "deps": [ "seq" ], - "commit": "e0ddd7a17da899fa85b1d49f1260042f8caa0612", - "sha256": "0k9lk2z8rnc2pa4wb2afj9byfryqlnw5hg1vs3bx6f0hs8rwa8yh" + "commit": "115f6de4a01b9e10936b7e6d1fdadd3770bae391", + "sha256": "11jdk260j9axi4f852vzgzqfb0kpl3hry02wfbhba3qp5bff2j7m" } }, { @@ -68819,8 +68918,8 @@ 20210131, 2152 ], - "commit": "b46db59948c9e0d47b613931fd62fac0c4a75388", - "sha256": "1jgxp9zcnjnyk4wg4h50glmf18x5hwy8p97d530rycbvv4kpxnh3" + "commit": "5927a54208996cbb7b435fe89bb65ac8beb61bb6", + "sha256": "1dhz1yfy3gbmpf4nrys11166wzylv5vl1sg1sncwgq67r8zf729x" }, "stable": { "version": [ @@ -68846,8 +68945,8 @@ "deps": [ "calfw" ], - "commit": "1cd9cbc7f8cfe40833d1af726644ae45a3d07dc0", - "sha256": "1cm7y1nfbl8625rpk5i9zcmp9p6rzqdzxy9wcjs8yrdfsc0biq3q" + "commit": "67f9596dcd43b7ece3ab6e7a6ce8dc18a4851fe8", + "sha256": "01is2x9yfijxz0w7h7nrygkk0dkxnz0a3p3w38kvariqis8vbhl0" }, "stable": { "version": [ @@ -69825,15 +69924,15 @@ "repo": "damon-kwok/modern-sh", "unstable": { "version": [ - 20211015, - 335 + 20211101, + 1001 ], "deps": [ "eval-in-repl", "hydra" ], - "commit": "e88d83958ab43e17b9763b3220e0dde862b49a83", - "sha256": "0x2j9i3kns5w9b6bklvmf077dbc5mdim3f4l68nbl0l6kcmlb68k" + "commit": "8ebebe77304aa8170f7af809e7564c79d3bd45da", + "sha256": "00ixkd1586xv7707a1gpshml221wmnv92d3dyk1fzzxvws39zvdg" } }, { @@ -69883,11 +69982,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20211023, - 1952 + 20211104, + 736 ], - "commit": "45b92cf80505db759b38316ea32a877517c78b21", - "sha256": "13kvsvsc19asmp31ncfj53jdm7kfamdawrqxar9ndzx4a65i60wp" + "commit": "ef234d41fd2d45f32e7c40e6f334231916c9dad9", + "sha256": "068im2wq70rfac8l1a6542ishjay3apgx4hqga22x5bvb4kq6351" }, "stable": { "version": [ @@ -70230,11 +70329,11 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20211024, - 2312 + 20211031, + 1815 ], - "commit": "78dd308a079115267e9e31f3d5e774d1f3d6399f", - "sha256": "1y9vrwhzwmb5apgdx3qfqwxgf3wza51cxpjkf1f9m4x5pwmrlzpw" + "commit": "5ce7cc070ff5a295b1cc4b15b94698447f9596ae", + "sha256": "0yrxdxd3iv6vmym8fwp1d1r3bliid5my3a9720pdbhd887i6m4bx" }, "stable": { "version": [ @@ -70518,8 +70617,8 @@ 20210306, 1053 ], - "commit": "d0d8a87c1ef19b7bd1d2c040e4ef38951b07fbd0", - "sha256": "0xzjfrn0m8mc6k8vrggrf50x0ssbb9yq9c5qnval8gk8v78rpyl5" + "commit": "5e7fdb7551b1928d09eaf2114f19601458bc6c31", + "sha256": "1jab8w5mbh4x0kc8sfidd29609d2m9m06mv03fh4q6wip4rfkl24" }, "stable": { "version": [ @@ -70992,14 +71091,14 @@ "repo": "wavexx/mu4e-jump-to-list.el", "unstable": { "version": [ - 20200913, - 1558 + 20211030, + 2307 ], "deps": [ "cl-lib" ], - "commit": "a9a3a1d371451d12e0ec24e456c7d90ccacd9cdd", - "sha256": "0yq7ky2yk2j6i2p5bzh06ipbj2ab70bi6hvq7hf4jqvr2i94mlwb" + "commit": "4d362a668be4ae624ee96bf7806b25505b4bdf5c", + "sha256": "0jqnmzaa2vf4gxy9yzrvhijm3s4zaip4qxgxjlb240fr9ray6rgf" } }, { @@ -71078,11 +71177,11 @@ "repo": "wavexx/mu4e-query-fragments.el", "unstable": { "version": [ - 20200913, - 1558 + 20211030, + 2307 ], - "commit": "6a81d43fcbdc51c2fc47d88f4fd8f25d8f906b79", - "sha256": "0sdjkxb7f31bsi1vj6vn2aw1lwq026sz782ys92zprncjp2mkizp" + "commit": "8d93ede3772353e2dbc307de03e06e37ea6a0b6c", + "sha256": "0pl9hiwl5snpw9cfga0v9ypw83mz4nw6754whd4f37fs9xc6df31" } }, { @@ -71199,14 +71298,14 @@ "repo": "ReanGD/emacs-multi-compile", "unstable": { "version": [ - 20210923, - 233 + 20211027, + 1954 ], "deps": [ "dash" ], - "commit": "03ae81739e44b70903dcdaae86a5ccaecc73eb9b", - "sha256": "1qvlf7f1wjlai25a09fnir3gsida3zpnr8vfvv687lxvngf7r53r" + "commit": "3f936abeb3e910cd6221f99ced30004b41bd9ffa", + "sha256": "0hk0mxwza04vqxmr4c8z5l1mbwy3kmffkn7mw75k005fl9apj56x" } }, { @@ -71440,14 +71539,14 @@ "repo": "zevlg/multitran.el", "unstable": { "version": [ - 20211016, - 958 + 20211027, + 1833 ], "deps": [ "cl-lib" ], - "commit": "8b1c9874dfa65917d1bc6044bc210cd0001723cc", - "sha256": "1mi5f90nicmhsm0wxqwn1rliq3cb9hihxqw7scp9zd2ajrai37n4" + "commit": "910f4c929e1d9c1844ddc467f72eef2e03aa3f97", + "sha256": "13lmhp2vm953s4phqdd119kp7s3p0kb3kqz4z6g3ga6m6py3gq3i" }, "stable": { "version": [ @@ -72494,14 +72593,14 @@ "repo": "SpringHan/netease-cloud-music.el", "unstable": { "version": [ - 20211002, - 1453 + 20211030, + 1339 ], "deps": [ "request" ], - "commit": "58962d7e04a8cc62f0792b15050fdc5a0c3d20c7", - "sha256": "0kc26kvsyv2f65pjl33lc0cmjvcnnjyf6vvfpbjxy771c0a44ism" + "commit": "d821e0359883ae5ccc12a1cb0f684909cbde98a3", + "sha256": "0p595lfwzzmjzxx4mdzp47bab07ypxkk3jk3yzvd1dcf2lgd0h9k" }, "stable": { "version": [ @@ -72857,8 +72956,8 @@ "repo": "nim-lang/nim-mode", "unstable": { "version": [ - 20191219, - 847 + 20211102, + 917 ], "deps": [ "commenter", @@ -72866,8 +72965,8 @@ "flycheck-nimsuggest", "let-alist" ], - "commit": "d832d6b1fb5e69fedcdddf442d62251dd0f1f489", - "sha256": "0m0khxcnq6whhxvblqyxrz21xfnpfjg4c8dn4x4i080dhmnmbzka" + "commit": "744e076f0bea1c5ddc49f92397d9aa98ffa7eff8", + "sha256": "0jjrjsks3q8qpipxcqdkm8pi3pjnkcxcydspbf0rkvy3x6i5mwkv" }, "stable": { "version": [ @@ -73213,16 +73312,16 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20210921, - 1131 + 20211031, + 1221 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "4e584d4da81c400de145dbb7a58e63819cbaf340", - "sha256": "0z5bww7cmlri2hn3fz3yad0scbsnhhddi21f50cmhdghgn1iaw41" + "commit": "34d82e2c2e4c190b85e751dd3f295daa264baa55", + "sha256": "1ivmybr94rwrdgxp5d761yy8hnhcdwmiqkhxnyk1bbbyd0a1kxj4" } }, { @@ -73306,14 +73405,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20210825, - 356 + 20211103, + 1646 ], "deps": [ "cl-lib" ], - "commit": "dcc96cbf5f018a91d406926d3b69715847ef665a", - "sha256": "1c6nq2sykbsjy30zakfpny503644bbwgb4pxhfsd4wywj5yyzw66" + "commit": "3a30eb7aa7db56072652c43b1b27595ff8c52a32", + "sha256": "0xgz2hsiy1z0vv69xkls2mbqw6361sqb8vp9ljbyrx42616ziq28" }, "stable": { "version": [ @@ -73626,19 +73725,20 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20211019, - 1143 + 20211030, + 1819 ], - "commit": "93104f0d9de4fa2919896a55dfdd207bbaf22589", - "sha256": "0dvxz3djl50cwz9j4sm95z269ypmkmh0n0365l7jhsqy91lbp7q3" + "commit": "78416a3e97fd19df5c89cdaf564c76be0edea740", + "sha256": "1m8x5q9q1q5lzfjjxvyqvm36wh7s0csr38hb3qidy75jg707p0py" }, "stable": { "version": [ 0, - 34 + 34, + 1 ], - "commit": "f25e48e0234a050cab38306a066605a0f8bd3d12", - "sha256": "08k7slmq894fiwkfc5bfqjckfdj8lb1b07cmmz6g5yr87yyjkmll" + "commit": "6858c365956ba26b42721093707e5a57ca8a6b93", + "sha256": "1bzcnly2xhyfw35k277i8qmw2gdy35jvkriwcyv9y3g7aicbqcc7" } }, { @@ -75505,8 +75605,8 @@ 20210923, 1348 ], - "commit": "15a6b28440320942e65a769e64bf3eb63cbc20eb", - "sha256": "1x16rk29lhrb9rv6jbvdpc4swmyc31ixi8i7prnbslrfgrzw2f70" + "commit": "54f41596355394cd0ce08435c21c3cc3d1f7eda3", + "sha256": "15f3ix73jjw41jcvnz70lgyrm0bh3287i1rcnl5x95wk0czkmhnj" }, "stable": { "version": [ @@ -75699,26 +75799,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20211015, - 1032 + 20211029, + 611 ], "deps": [ "org-re-reveal" ], - "commit": "12a795417f9ec0d06245a71de595b7aaba86c3df", - "sha256": "1g3sjign97svlf2y0x6bnd4sv7rnqf9ak4gagk58ih7m2ipq174b" + "commit": "44eb766df39b722a26cabebec44bb359bcca1e49", + "sha256": "12mdp7pxb4nga1pp17d3kawb55kjdnjc1fg8lavyq4ydznyzn225" }, "stable": { "version": [ - 3, - 25, + 4, + 0, 0 ], "deps": [ "org-re-reveal" ], - "commit": "12a795417f9ec0d06245a71de595b7aaba86c3df", - "sha256": "1g3sjign97svlf2y0x6bnd4sv7rnqf9ak4gagk58ih7m2ipq174b" + "commit": "c26ddb39288b60ba96f970fa20ef810aa4d0f418", + "sha256": "12mdp7pxb4nga1pp17d3kawb55kjdnjc1fg8lavyq4ydznyzn225" } }, { @@ -75855,20 +75955,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20210902, - 1202 + 20211030, + 838 ], - "commit": "95479d5178fc5017060c963a45de0d2095c00e0f", - "sha256": "0bliylh02lcga84jysf1jr80bgrn8m7cy4n047fr06cjqdqr4sp4" + "commit": "a31ac05a161a91fe5c157930b62a6c07037982ee", + "sha256": "0wc0rki4zvzdxs126g5c8d92h1vfn9slfkdx831rr9d0jx93wc7s" }, "stable": { "version": [ 2, 0, - 3 + 4 ], - "commit": "bfb221845c2e26f923ab80fdcd8f80b70b6adee1", - "sha256": "0qhv4ah9bn1mjvivgxp7z1gf91d0cdr2ma5cy5xaja97ispa4l3z" + "commit": "a31ac05a161a91fe5c157930b62a6c07037982ee", + "sha256": "0wc0rki4zvzdxs126g5c8d92h1vfn9slfkdx831rr9d0jx93wc7s" } }, { @@ -77856,16 +77956,16 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20210820, - 519 + 20211029, + 1604 ], "deps": [ "dash", "org", "s" ], - "commit": "7bc78ebf7c1c334e8cc73af44793a7eaffb66a99", - "sha256": "0g1ahvsn50kr79q9bbrmgf78j1wfcibjp0j57qv7kxiqc71s7s19" + "commit": "450dbacacfc0828e40a76a48a5933db60ec7d197", + "sha256": "1aqn97lqisa4v48pg3zs877ws9cqivby7mrzqacr7n29q44kvmmn" }, "stable": { "version": [ @@ -78347,20 +78447,20 @@ "repo": "unhammer/org-mru-clock", "unstable": { "version": [ - 20210408, - 1259 + 20211029, + 1147 ], - "commit": "229461b92ff89fd96cd7730df9fd589a8b0ef949", - "sha256": "1gl63m7h7zisjqljlckcqr0f16zkadfw9jr9h54kypm51alpjzkm" + "commit": "454d317bf772a616cb76cf2212f111c7977016a2", + "sha256": "1bib2ch2grb7qlyhc7aq82ca1i16nqi8h84nfvlwgx45al8r3k4l" }, "stable": { "version": [ 0, - 4, - 4 + 6, + 1 ], - "commit": "1b19fb0f77dbd519a29997642954dc33fe12b810", - "sha256": "1g4hszrmvx41iz6i2m4nr2qhl098gklqg384ir3r1nfw7y5ll29l" + "commit": "454d317bf772a616cb76cf2212f111c7977016a2", + "sha256": "1bib2ch2grb7qlyhc7aq82ca1i16nqi8h84nfvlwgx45al8r3k4l" } }, { @@ -79097,16 +79197,16 @@ "repo": "oer/org-re-reveal-citeproc", "unstable": { "version": [ - 20211024, - 831 + 20211028, + 1328 ], "deps": [ "citeproc", "org", "org-re-reveal" ], - "commit": "f1f5a00fc8570234a8d421868b170aa9819c792a", - "sha256": "0vxyqbh69l82xascygg0b4k915nq8dz4q77j03fr28xfmv550w5y" + "commit": "faa9ea387917b20bd1499ad90199ff3d417c00c2", + "sha256": "09yvfp4nh3g2jfs4v8jx70y6vyahypwvfjwrcqg5z0sqssbmxhnc" }, "stable": { "version": [ @@ -79131,15 +79231,15 @@ "repo": "oer/org-re-reveal-ref", "unstable": { "version": [ - 20210104, - 1650 + 20211029, + 551 ], "deps": [ "org-re-reveal", "org-ref" ], - "commit": "f406e5fc1ae2b1e6f5f85b43932e71381f214e6b", - "sha256": "08j3a503fipx45735zp94q8d41xl890ba2bf5fm4pzvrpf5k4pwy" + "commit": "ea9661864d5fbef87b12b78f516c13a40c683f24", + "sha256": "1vaszb0n5p48mrf5hzci2yyh51b32ws1fk6r4q0gky41ixz243v8" }, "stable": { "version": [ @@ -79241,10 +79341,11 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20211024, - 2329 + 20211103, + 1318 ], "deps": [ + "avy", "bibtex-completion", "citeproc", "dash", @@ -79254,8 +79355,8 @@ "parsebib", "s" ], - "commit": "dec2acedecdd1253e8e02b7a4aaeb98cda37b5d4", - "sha256": "1q3n08qxry4digpzf4n6gl2bymdg52kxna412acwrpjhbk1q1ca5" + "commit": "4a465be9f8a4093a4afa22abc77a2012624f5e90", + "sha256": "16pnx1j1zg90yawsw29nxqq97sjigc9vmaxgc3aw18rnhardv0s3" }, "stable": { "version": [ @@ -79402,8 +79503,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20211022, - 815 + 20211101, + 639 ], "deps": [ "dash", @@ -79413,8 +79514,8 @@ "magit-section", "org" ], - "commit": "2c75b194d8f75a8edaec77d503a47d1bf0c58f24", - "sha256": "1ykpi5sbipm15y6bfr143vq4xpap0fl6d5w69ll42j2v5lwjh8x8" + "commit": "3e47f198c7b6c3254944d98357e41840e5e1b102", + "sha256": "1bfrpljx95bqk2gwabsf80igp206nlb6d7b4dr0mlsj8rlzwv96s" }, "stable": { "version": [ @@ -81963,8 +82064,8 @@ "deps": [ "org" ], - "commit": "14723c3cb93abec61a8bd35c6e4162754f902a6a", - "sha256": "1dlf5iw32lc3lwrh5ssl2cisgd31s688s50z9w37pslqx2mi1nl2" + "commit": "9438efc34f3837ed18da5a97bb705e945b234bff", + "sha256": "01zgyawwqsq4w29w8da3kff0r8qyzh5zmmpm63b6zrb71dxx5yzg" }, "stable": { "version": [ @@ -82317,14 +82418,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20211025, - 1424 + 20211030, + 838 ], "deps": [ "org" ], - "commit": "a995a9cf4ca578939cc36ea229d5c28ca6a3fd1e", - "sha256": "0i6byp5bhlcfidhp5b7ddlm9xnw5rjfnkxvw3gqbwfhgzfdb2jc4" + "commit": "c06c88812bb2db267366c2bb95123235e20aa5bc", + "sha256": "0lsxrgbpgac9hclcnrk49nhllyvjfqs0fxik9mxsf22bl1vdds1z" } }, { @@ -84779,14 +84880,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20210920, - 345 + 20211103, + 522 ], "deps": [ "cl-lib" ], - "commit": "ca6f778a3f1995600fc3d369bc636888812c80cc", - "sha256": "0y1yyp1amvr6v8nji19m7yvksw0pai8ajs73v2345dcdz51flpfc" + "commit": "54dc30840c8019f387ccdb84bbab06ca2cf8f296", + "sha256": "1d2jmxfb6a93d9h4m7w482f3dbhhn2s6wiynzwxjl8af1l19f5aa" }, "stable": { "version": [ @@ -87276,8 +87377,8 @@ 20211011, 435 ], - "commit": "6a2ddcb35432afb56f32e11518c2b6ae7795e8c0", - "sha256": "0sv8bi34fbg0awi8maah5fs13s0wmzbvalq13z2zx9ybb8ivrsfi" + "commit": "1ffc269afa46a9e7a5c1e5511752e49cfcb3aad4", + "sha256": "1hpx2qi4ybh1fxjzkfkddj350r3rqrbjazjwas3nvqxwrs9ksqbr" }, "stable": { "version": [ @@ -87541,11 +87642,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20211025, - 1411 + 20211104, + 512 ], - "commit": "70ba4e77c114d980c0d87ed1f6b201188a3f8954", - "sha256": "048gykchqwfcxnkd3n8f8s1grqg6p2c4wfpj1lfa411k0r9xj8pf" + "commit": "c153c288a462e10fc468d7474f0082e6c8f5c527", + "sha256": "1wg1w7h0nzi2gbwyvhi93mnnzz71b415j7amnpv8migd81p6g3sa" }, "stable": { "version": [ @@ -87824,11 +87925,11 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210724, - 1756 + 20211031, + 1908 ], - "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e", - "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr" + "commit": "292ac9fe351d469f44765d487f6b9a1c1a68ad1e", + "sha256": "0ywx7q41i9pzmfgwv83mz5z17gril2s0r7y77hbbriww5yy1ihx4" }, "stable": { "version": [ @@ -87954,16 +88055,16 @@ "url": "https://gitee.com/shaqxu/prettify-math.git", "unstable": { "version": [ - 20211024, - 419 + 20211102, + 610 ], "deps": [ "dash", "jsonrpc", "s" ], - "commit": "cd5d24d96cf63a2eaea16d5bd616f14d10eac325", - "sha256": "16nbp2766yz8bcfakwghgypka8xf9vxq3m5pxwm8jjv2hb5bjcy9" + "commit": "491bdd6764afeaf3211dd0199e19a06b7bbb7e0a", + "sha256": "1v6qdkcwrnns22vlzxywv1rxkblbm3z6ms849fwzmabjvcbfaq1b" } }, { @@ -88507,11 +88608,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210930, - 1757 + 20211103, + 2050 ], - "commit": "7f64570d3e6829d767d340c8584f3e4f3472ee81", - "sha256": "1a5a2xmnic27swm85rz44iymvym7jagwis25a3mzn9d5spsqaagy" + "commit": "584ff420b2c5637b05be5c4808754d6e947ab6c1", + "sha256": "1vw392iv4nsdifhq8bf6bsw9mc15pvz05b6wg316j0rrjibmci6p" }, "stable": { "version": [ @@ -89021,17 +89122,17 @@ 20211013, 1726 ], - "commit": "0707f2e7f556c8396d6027d0533ec3a56d1061db", - "sha256": "0nna3s41hgysa8p4x65nswpxs1fdk5k41gn8vsf0gmaidm6fnh05" + "commit": "7ccf4d8f67878a6ceb2184df279478cb3314372b", + "sha256": "1fqf7vvha45dzgqcban2zd3kvf5w5nz69jlcw7ad7qg6kf97150l" }, "stable": { "version": [ 3, 19, - 0 + 1 ], - "commit": "17b30e96476be70b8773b2b807bab857fd3ceb39", - "sha256": "0rx4r4d7hqr0gi3v90jbkm2lnkj9p37dhgwx9d0w7kgh3rvr4i7g" + "commit": "7c40b2df1fdf6f414c1c18c789715a9c948a0725", + "sha256": "1swpq2lkkgz5pwq6q3jn6xgkbaiq9dy20rvmrlghdp0fkfg2a011" } }, { @@ -89934,8 +90035,8 @@ "async", "xr" ], - "commit": "d110c46907e3e9b78106498c86193786e49b2897", - "sha256": "0ipz8pqqavzfmafbixakd82l4571jc0k9ay5idp3l7kmh4c6z3rd" + "commit": "778a1eaff3dbb71692939da1fba7daf4ceb22abc", + "sha256": "10w0bydn4r8pjn1ygqnxcd39kxwgz397xzamdpb9ayyy72182h4c" }, "stable": { "version": [ @@ -90087,6 +90188,21 @@ } }, { + "ename": "pyinspect", + "commit": "da9396dfd85cbef7e92e8aa9db75cd5fc7a2372c", + "sha256": "0hmrnf52yb2yi9j23kj7w4l4nknx3hl9d08ryhd3k7caakxnmwmy", + "fetcher": "github", + "repo": "it-is-wednesday/pyinspect.el", + "unstable": { + "version": [ + 20211102, + 1415 + ], + "commit": "36cf624236c8b4cce852dd52b64d058d4d4a32fd", + "sha256": "0g2k9fgjvcq2jc3j2k2x2v1vghaf0hyarzvdby5vzycsp7jlzcjm" + } + }, + { "ename": "pylint", "commit": "a073c91d6f4d31b82f6bfee785044c4e3ae96d3f", "sha256": "1138a8dn9y4ypbphs1zfvr8gr4vdjcy0adsl4xfbgsls4kcdwpxx", @@ -90097,8 +90213,8 @@ 20210411, 1931 ], - "commit": "b6ca3b9d6f7ad42accdf90044628521bd711d1ec", - "sha256": "09y452zk3bk57piqdnyzb7nkp1h540h1sb2rl6cr9rhjwfk60zch" + "commit": "65b552a7ce6734dc7bfe53a14342853750cc92a1", + "sha256": "1pshp0q3iv8jzmpyfiwb1myb1xw82hga1wnqm7x5vzdcrdmzc3ip" }, "stable": { "version": [ @@ -90597,8 +90713,8 @@ 20211010, 1334 ], - "commit": "fea4e6101f320a95f2a375a5c805911a788f20aa", - "sha256": "1dsigkg9zkymazgs24hjnn0f5ywvlxja2ycvqq13q0sb26qsh688" + "commit": "a2c51cd1d54d507ec1902bc5c7bc888fe5a23c8d", + "sha256": "0zikg9gbcdzjlm6kdg71i28zxic4k22iijfvf7x4dvx5pc8pw8f6" }, "stable": { "version": [ @@ -91022,11 +91138,31 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20211024, - 1323 + 20211103, + 112 + ], + "commit": "d78c7381bd47bae8e5f9ae14681935f08206240a", + "sha256": "0g80y1hg7jk5291nf0yw6708lf17lwi8ka15a5y2lgrnahq8pd0g" + } + }, + { + "ename": "rails-i18n", + "commit": "4be03fa1fece3bd2a77c1aed929ae3475ab602dd", + "sha256": "0jzj1l63yavwn0jxvm92hfxk1m2kyb6sf7kbn2k9v5lkq0iqpl3f", + "fetcher": "github", + "repo": "otavioschwanck/rails-i18n.el", + "unstable": { + "version": [ + 20211026, + 1404 ], - "commit": "5b6ac3ff995004bc055c1d33cc65a02558a10599", - "sha256": "1r5g9y573hrpgdqypaks3wmf322ff5pilfv2dm01ck9fkiy7rqy1" + "deps": [ + "dash", + "projectile", + "yaml" + ], + "commit": "86be9e70f6fe90484f88d6c68c2f337f6ecd5651", + "sha256": "0z6icgg3hkn141yg7asnpdlir8nlmr4kcrddy2drclgn431pdl5l" } }, { @@ -91442,20 +91578,20 @@ "repo": "thiagoa/rbtagger", "unstable": { "version": [ - 20211019, - 1454 + 20211026, + 2318 ], - "commit": "339ac47fe2448e1d391c9f415c9f701ff999a4b0", - "sha256": "13idz1cvynj9y27mahayn33whr05sffa6yfbyzrzj0xk5gb3qrd0" + "commit": "351c4006ddacc2f66e6ff8c79d981613e9a8bd22", + "sha256": "1ycjw62wlnkbbanqrz6my6xrfffcs9rnf27ihvmwni5k2carv9p0" }, "stable": { "version": [ 0, 4, - 4 + 5 ], - "commit": "339ac47fe2448e1d391c9f415c9f701ff999a4b0", - "sha256": "13idz1cvynj9y27mahayn33whr05sffa6yfbyzrzj0xk5gb3qrd0" + "commit": "bbab9900c7b8cb406da662e4f99064e1a2de729e", + "sha256": "0cr32q67ap87b4acbglay0mx9mmpdm7h9byx2q21ad5p5ra1y17w" } }, { @@ -92178,11 +92314,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20211006, - 1406 + 20211104, + 51 ], - "commit": "8b794d194799468443252d9a54489b5beb01eb76", - "sha256": "0712jasmpmphdr8xxdw03dz8p99js9wdc8lrcda3n5hq3g6i1yyp" + "commit": "7288211d9dd5bae411cc697f7782dc3e01ac0b04", + "sha256": "038wzg76spaqd6a766l9vr1lx1plkhbai7srbdasr0r7a464c746" } }, { @@ -94097,8 +94233,8 @@ 20210313, 1541 ], - "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", - "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" + "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", + "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" }, "stable": { "version": [ @@ -94123,8 +94259,8 @@ "deps": [ "rtags" ], - "commit": "cdff9b47fc17710aad7815652490c3c620b5e792", - "sha256": "0mrb2dayd8ls56cjlp63315ai0ds09d4qsajgv5kks2gqqxbkrjb" + "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", + "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" }, "stable": { "version": [ @@ -94610,20 +94746,20 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20211022, - 1728 + 20211029, + 1133 ], - "commit": "6e1004490f385d9410e53160204c0760b76b2230", - "sha256": "0b94l19grb2w5lmz908sqhv6qmmjg9516hjqcs69n2rk8khxcq18" + "commit": "3b81e81097463e7161de047ad340e4fe572dcc2a", + "sha256": "0i05hhfdqg4p4f7l0ylqcw4b0wj9ni3s412d1fp04lpminb74sv3" }, "stable": { "version": [ 1, 0, - 0 + 1 ], - "commit": "d0c1ffa68d0ba0af0b35b761d2d73a2c1b4fc7a3", - "sha256": "08gz7wq1las3bqqs8qhmhmncax4j6kjnyxpfzslby3b1dkclc7ig" + "commit": "d2b4cde98b660efd746d8853cf8ac04e4570e047", + "sha256": "1chb3a97cwf1pkxn8cm3wc35gfh9k55l7khg7pklmx36isr3csjv" } }, { @@ -94657,8 +94793,28 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20211018, - 1934 + 20211103, + 1558 + ], + "deps": [ + "dash", + "f", + "let-alist", + "markdown-mode", + "project", + "rust-mode", + "s", + "seq", + "spinner", + "xterm-color" + ], + "commit": "fc2b1057ad848521a28631f049a1d95d7f088ad8", + "sha256": "1zj254rvizlzh96fvpxa1fkw86i0n5h2fv9zr75q9ysj1qrh31yg" + }, + "stable": { + "version": [ + 2, + 0 ], "deps": [ "dash", @@ -94672,8 +94828,8 @@ "spinner", "xterm-color" ], - "commit": "d76d4128db2287ed5ff067634aac94970d99f438", - "sha256": "078g4ig74y4sy6ki07pkw8n2qivdv6ijwf72i55imw01scpm0k5x" + "commit": "ac0cb72de118b143d9a24584073550a7ab5ef9fe", + "sha256": "1x06lp0c656zm07n28lnkqp678y4f9zkd9n5m0lramndllrpk3x2" } }, { @@ -95162,8 +95318,8 @@ 20200830, 301 ], - "commit": "5532563a6707187a990409fd5deca3e01a220d24", - "sha256": "02664kfad9ahh8b3nlkp7fipkbn0ljryx2j2yx93kbaxi8lbq5zm" + "commit": "caadce26d0e6ed7039e7ba76ad05397aaa5a17f4", + "sha256": "02pwqgl0k7xq08rnz74xgha4w226qsds576z1kr106d3gz7mhscv" } }, { @@ -95546,11 +95702,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20211022, - 523 + 20211104, + 259 ], - "commit": "d8582732d1eb03c7f6bba62f39ba66af365dde2c", - "sha256": "19w6hlwm92mp45hrskp324m6qfhqvnpbphgdgkkikdr9n7c8wfg8" + "commit": "8962f5f8a79c9178a577732ddfbb333a101bc7fc", + "sha256": "157affz6jsar9gnj5nj8ks8zl3dyrwzq4j1g0njvcs4vpz5zf4p9" } }, { @@ -95561,11 +95717,11 @@ "repo": "ideasman42/emacs-scroll-on-jump", "unstable": { "version": [ - 20211006, - 1416 + 20211104, + 51 ], - "commit": "a2d6996a36ee2d3d4d4426d1bea60b6717ded10d", - "sha256": "0ixjwi3m0dmsivdqfm1bcs7rbp1cw0fhw4hgj4ym49p1acjhha5f" + "commit": "0cf26a15bb6278c4273ee53f6a8d7d790792fc29", + "sha256": "0ns1mxbfw5s7mimzqwxbi2sbbs6w60gi7z3l5hmxiv1qwdl0a8p7" } }, { @@ -96020,8 +96176,8 @@ "prescient", "selectrum" ], - "commit": "027c2137a8d9e01a1d4c7b5e5d98da017dd2d48e", - "sha256": "04hwfqia53bk2fi7kw1pzwi5v0rgimr15kw6mmjlvcmwk0c1mghr" + "commit": "292ac9fe351d469f44765d487f6b9a1c1a68ad1e", + "sha256": "0ywx7q41i9pzmfgwv83mz5z17gril2s0r7y77hbbriww5yy1ihx4" }, "stable": { "version": [ @@ -96936,8 +97092,8 @@ 20211024, 2053 ], - "commit": "18875b02c43cf88738d25d9fa114aa7c3d905ed3", - "sha256": "1maz3adpkh1w0sxivy4fmhvh9a8giv91mbs23kxbc6zgjwnq0q0v" + "commit": "232a52eb5d7a9c3ca9f5983140578ddd86ba33a1", + "sha256": "0cz6d2msa3dxabbrd9vsm49s4g4f1a1cqi2bmzi96l327kbkzbqy" } }, { @@ -96987,6 +97143,30 @@ } }, { + "ename": "shenshou", + "commit": "8c4760dcd5eeb18604676989e460cfe84af1c39a", + "sha256": "0c7livcm6srj6ll9ibk0im6fxfjk74yi9x2mv5x02d2fzbqmy7m4", + "fetcher": "github", + "repo": "redguardtoo/shenshou", + "unstable": { + "version": [ + 20211103, + 1010 + ], + "commit": "8e12d366ca371fc259294485047a431a7c610605", + "sha256": "09w57wq9mw3yjklxsqm87xl2q229qwqp48ssxlp5xpwhwljgwd2j" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "8e12d366ca371fc259294485047a431a7c610605", + "sha256": "09w57wq9mw3yjklxsqm87xl2q229qwqp48ssxlp5xpwhwljgwd2j" + } + }, + { "ename": "shfmt", "commit": "a20dde08de1a7cd70739a791e1ae321e8f152685", "sha256": "1k4rr658473vd6xad2z40dl7f26sb1zv9nc1938cg61pqi10bjan", @@ -97065,11 +97245,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210924, - 445 + 20211029, + 150 ], - "commit": "c088fe627f12597726dfc2062454e2e7bd99798a", - "sha256": "0bhvhhqs55nh1qb212zmmxw76l22xd830pvw0n9wihv02yrg7kim" + "commit": "cb3b873063304ce5e1a5fd386c5f8c933964cd55", + "sha256": "19ly819cg5nnjcsr3aqk21hriyv2v8v64xfmyvk1j5p668y6mqkm" } }, { @@ -98905,15 +99085,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20210904, - 1621 + 20211101, + 1101 ], "deps": [ "cl-lib", "dash" ], - "commit": "2834c66c4f09778d0c57e99886c329188eed591a", - "sha256": "0zy5jamid6qkx8rml9ccqv85f2sr10j1rp3j77acggkf6zf3c096" + "commit": "f59a40d54f35299007c396bd667ce3e9ec4714e3", + "sha256": "0n0c2knva2c6ajdhqglr2yzhr53sgqr4bscsd1lwmwajgb0iyrw3" }, "stable": { "version": [ @@ -100473,11 +100653,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20211025, - 312 + 20211103, + 328 ], - "commit": "74079bfbc37cddbd4161f883503bb190d885ae1e", - "sha256": "1k9jlhfgvgshhq4kiy87wg4fra70gmm95ws27bmqah8fld719jj8" + "commit": "1159eeec13acbba5ecfc24aa8f6aa620c1274d17", + "sha256": "1fm40dkh0albrw2cv6wkkgssp4aka2gamxczkgnvwa4ifkf7p3i0" } }, { @@ -101493,16 +101673,16 @@ 20200606, 1308 ], - "commit": "ef629fd74c5d963f5b68507179896169a34a078e", - "sha256": "1wnx8s8cabg8zja0w0cvk6jfsqbkgbszdx624v1bl6g5iiv2im1j" + "commit": "16a65055f92497b035d866fa4b39d1786c4f4b8c", + "sha256": "0dkg4ddj0bjn8drvx49ffb4y6q84r27cbh8dxrwi9ikcwqb61b6w" }, "stable": { "version": [ 1, - 3 + 4 ], - "commit": "05900351a9ec7b774931a2a59c15c9f0b6d443f6", - "sha256": "18gb1f9ndi64f5zyxrgy9wfjgbn0s12wv6b3817xnj61crhvqwd0" + "commit": "262b2fc5b533f6f609c43a6f543c9d0d185b8f55", + "sha256": "0g0jnry8y858dl3z5w4zd02s0lq9qvha848xb8i1xpsx8xh8plf9" } }, { @@ -102567,14 +102747,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20211017, - 542 + 20211031, + 543 ], "deps": [ "seq" ], - "commit": "e24626440ce350596f4c1676f6644437a0500bbd", - "sha256": "09pr8v78nz8nza9l4g87i0xfnp84rmjm2kq1ff6g4a6nisdxyfxm" + "commit": "4777c409ba0cd0d02b9a8397ba810e449b5ac213", + "sha256": "0dmrshlkhavzlfxhm2fi37x7rf1h203iiamdqvqb7dqq0axah5r7" }, "stable": { "version": [ @@ -102906,8 +103086,8 @@ "hydra", "multiple-cursors" ], - "commit": "b3b1257e676514d93cd2d71a10a485bf00b5375f", - "sha256": "0ic6i589y8g41mpi9vzsd76rzcskxaxicfwwpw8d9g44p8zfghfz" + "commit": "5675976cad4cbeee30f43e6c4b28c2e5904575a5", + "sha256": "06cl7njizn68vml21lsl3p66wpcdcw6ah49jqjvwzjkzivrds3m5" } }, { @@ -103650,11 +103830,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20210726, - 1827 + 20211027, + 1900 ], - "commit": "f35b97823f27e8d0f378bbd18b79a61f9e34cc55", - "sha256": "097zvklc90dy90p62fbk5khnysijzmb6knvzyi8m6wba2g32v4mh" + "commit": "2d271a2733463f3be711c31da036236b53f6224e", + "sha256": "0n4n3ln5n3ygkb2pa9ag8pwqqs7a9lkzzb0j04b0rphjhmsn5hbr" }, "stable": { "version": [ @@ -103865,15 +104045,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20211024, - 712 + 20211102, + 1327 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "a8ae6b54f047426778b4c72d315c45603c0eb24a", - "sha256": "1l6hzrr363l44g54idamcra3rn3wmlkfc545v8lq0rj3gnnpzkd6" + "commit": "7829e605467a3177e143f5c6ff9e55ac00803c8f", + "sha256": "0v7pmj2y7d8pidlais20kk7qi5kksq6pc7pn2fsb5q90p2mdlw9q" }, "stable": { "version": [ @@ -104657,11 +104837,11 @@ "repo": "Dspil/text-categories", "unstable": { "version": [ - 20211001, - 830 + 20211031, + 947 ], - "commit": "f73b0e63072463c91a75a292fa21d39a9f06b81c", - "sha256": "08m24ap72y461zpackcdprh48vivvd75jz85pw0ad51ysvxq0z08" + "commit": "d400c2692373c14d7cf773e7ae587cbe9c7d1e13", + "sha256": "1wbx74pc0lzb51gs43zhs66jid4kyaavcgckx37m5m05k17kdv97" } }, { @@ -104971,18 +105151,18 @@ 20200212, 1903 ], - "commit": "e5e1e1c5506c1bd2c83a3296cacbbb89a045cf36", - "sha256": "0glraqhqvvhml8by829cvj5rs9qd674drz0i6jgcqr4kyvvwzw89" + "commit": "0d838c46aeb771ec5c1e3108faeb82cd3da935aa", + "sha256": "02drmjh4ay8krimf7bm32f72n5d6929ylc2znpnp70vihn40ybjr" }, "stable": { "version": [ 2021, - 10, - 25, + 11, + 1, 0 ], - "commit": "adb281261e173ad5fa8d04db5bc52b221313f6f8", - "sha256": "1k7y24qkvcicmdw1f54ii777yy2qw5czzbyy4rb4aisfq8iygp45" + "commit": "bea461a963aae123322e893bc3a03ba1ad0657d5", + "sha256": "0y9jsq8lmz1xj0r3ybs4qbqwfvc3jbawpd3h4516zw1k5nwgf7d4" } }, { @@ -105038,8 +105218,8 @@ "deps": [ "haskell-mode" ], - "commit": "15794a97222d45036749bc7ab3a82e81fed12e87", - "sha256": "181ixq71pldpivf5qkfyrgpjx1cw5smaagcpayjrdawwrkpfkrm9" + "commit": "cff017c60a92d446f1c7f0eaf65b9b63a0224800", + "sha256": "0xfm3hniijpd3wky62khg57il1gfxza0byr64v1aa6drsw9ygc4i" }, "stable": { "version": [ @@ -105287,19 +105467,19 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20211018, - 2351 + 20211101, + 1649 ], - "commit": "653923cd419616dc1486abb919581a99e6d32539", - "sha256": "17y7rdb4bn9f44j5k8ixp1cbxn6prh67h4xim8hnypy7q2v4rl10" + "commit": "3da96d529c09dc1000de425f937380895ab9efa6", + "sha256": "0k2l15lkk3b5y7qfzhjid8l1clam5j9nhm635a1qmhjgcdln18x3" }, "stable": { "version": [ 1, - 6 + 8 ], - "commit": "acb033ab8e3f4ab7899daa7a7fc0d67187b0554e", - "sha256": "1mnhymvwcb3dqzpbsa2z70w90zdqrmlwczgf1ql41c2fxw7wzaqa" + "commit": "3da96d529c09dc1000de425f937380895ab9efa6", + "sha256": "0k2l15lkk3b5y7qfzhjid8l1clam5j9nhm635a1qmhjgcdln18x3" } }, { @@ -106065,26 +106245,26 @@ }, { "ename": "transient", - "commit": "331370880770a0332c35a499ea3044820afb9967", - "sha256": "1splwjaf4w9cgmld5c4q7l4kgma8k4ydlgflq14dfpb5pnxcn0rc", + "commit": "cdd8115e3ab3df5f74a21dbf63d89ee11b4f1c17", + "sha256": "04xkdspn475dlch5fcw21phhdhshxlbyznjbi0l7qk8snm130qpv", "fetcher": "github", "repo": "magit/transient", "unstable": { "version": [ - 20211023, - 2151 + 20211104, + 143 ], - "commit": "9e60c46f0728beca42e368d55de03e9c7ec62ddc", - "sha256": "0r33qf56rdlvf79cxkgymcv5l868xkbhz5smpsa5qms39rs97mna" + "commit": "202271f755497bacb50a1f2b3c93566e816f447e", + "sha256": "1y0rir7w12h85jagjdnww9wgwi1aazmm22ry7gz9wiax6mm1pcdn" }, "stable": { "version": [ 0, 3, - 6 + 7 ], - "commit": "51e833e5152e9fdcdc1dbbf34ad2d4905bde1f69", - "sha256": "10k9dzs8y6i0rfckclxm5n3maylmh95993n5dvrs8rbmlcpmihvy" + "commit": "74cba5a418ff1b1661494fc2970c330ecdbb4b22", + "sha256": "0c7wbd0j0b802bzdpdkrx2q7wm7b9s56rk554dnadkpywhmdiqwn" } }, { @@ -106455,8 +106635,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211019, - 1654 + 20211101, + 1223 ], "deps": [ "ace-window", @@ -106468,14 +106648,14 @@ "pfuture", "s" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", + "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "ace-window", @@ -106487,8 +106667,8 @@ "pfuture", "s" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -106499,28 +106679,28 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211006, - 1837 + 20211102, + 2155 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", + "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -106538,21 +106718,21 @@ "evil", "treemacs" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", + "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "evil", "treemacs" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -106569,20 +106749,20 @@ "deps": [ "treemacs" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", + "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "treemacs" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -106601,22 +106781,22 @@ "pfuture", "treemacs" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", + "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -106635,22 +106815,22 @@ "persp-mode", "treemacs" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", + "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -106669,22 +106849,22 @@ "perspective", "treemacs" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", + "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -106702,21 +106882,21 @@ "projectile", "treemacs" ], - "commit": "4fb0480ae6c110a74b7365fb59b84d31ca38ded2", - "sha256": "1v37c0gi2ijibvm5rf9pnk6mazbaiyiraqrqhxpqf6pn31wavcif" + "commit": "e4b15841c9671f9b26f370a8cbaa61632b459db4", + "sha256": "030k0pbzsnjwm2q0na7f5rfp2avrabf7rmanp3a4cxgf8dvdgm5c" }, "stable": { "version": [ 2, 9, - 4 + 5 ], "deps": [ "projectile", "treemacs" ], - "commit": "cb48a2dc3077064d85aa14e9531b21e27b7183bd", - "sha256": "1g2fy2qkscqx01av92hpjbr6qld8s1gk59cdjbff8fm0vlx8xk2p" + "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", + "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, { @@ -107774,11 +107954,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20211007, - 306 + 20211030, + 612 ], - "commit": "71c474e29f6ad726386604a5058761892951782e", - "sha256": "1rwcr0d1nrkvssiyf2s7zicp3did8y4x5p0vmvg8n0d3vqsh3d3v" + "commit": "ab8bc10e424bccc847800c31ab41888db789d55d", + "sha256": "1vdaysc328gwqi57fp4cfbl96g76m8wc2qr53wgb3l89m9kx5sgg" } }, { @@ -109390,20 +109570,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20210809, - 2140 + 20211103, + 1927 ], - "commit": "6f5b454782d5c2ce9d86616c3d015935d3d5dd6b", - "sha256": "172520apwczyp6c0apga1bz2vbfzy60jdyiq09sjk34533fymcg4" + "commit": "f9ea5780ec65e6f30451514b72ce99619dd8457f", + "sha256": "1l38ax1ms7s2qwjnqd0djf2gcy5jpqha55d17vyvkx1kgwjapja7" }, "stable": { "version": [ 2, - 14, + 15, 0 ], - "commit": "0d7f7d36f6ae8130a9bd40845f156a3e3b30eb49", - "sha256": "1bpfxfgq5q022rx592wkigj5chq8ihry8lgrni4rsqbbmbrc1h4b" + "commit": "f9ea5780ec65e6f30451514b72ce99619dd8457f", + "sha256": "1l38ax1ms7s2qwjnqd0djf2gcy5jpqha55d17vyvkx1kgwjapja7" } }, { @@ -109470,20 +109650,19 @@ "repo": "mihaiolteanu/versuri", "unstable": { "version": [ - 20200316, - 852 + 20211102, + 1142 ], "deps": [ "anaphora", "dash", "esqlite", "esxml", - "ivy", "request", "s" ], - "commit": "41e20583d1080beeeda0e36d1b2e6d74b9c57920", - "sha256": "0fgc1rai9gp6lwl0rxr9400vi420py0c0b8nv9wzl12ph80yhwj7" + "commit": "eafc925e3089aa80cefd6ceeb0cb87abce5490a9", + "sha256": "1gqbd6iwfpicqrpigyki402jy73a58nx0k3akzybzgljdgw7xg9p" } }, { @@ -109787,11 +109966,11 @@ "repo": "thanhvg/emacs-virtual-comment", "unstable": { "version": [ - 20210928, - 758 + 20211103, + 209 ], - "commit": "24271e081be3bb9ebcb41e27e1dad9623a837205", - "sha256": "1np4mbw1fry8ja74vy3hjs9fx301c7k8zq3h4a9i7jbnkvzh9iyi" + "commit": "4effa95c7d6243fc5696597f488653f9d2a5d4a6", + "sha256": "164yiiqqxk2fpjk65y72fr71j05b1330zmvbaxh0w3ww2axkjz68" } }, { @@ -110358,16 +110537,16 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20211023, - 1716 + 20211028, + 704 ], "deps": [ "org", "org-roam", "s" ], - "commit": "d6792e95c499a2ee85b0d8b11295b61777a46038", - "sha256": "08h26ki2j5nx5rxhgi6vxmxwpisg8d9vg8jsmcczlql2sfmsh8mj" + "commit": "a1cdaf43649e133e1d571b597195e2d17c7c5928", + "sha256": "0qqz7xy6yfscjac05klckf81pcmfwgl4jhd5i4g873xmrclmfzwi" }, "stable": { "version": [ @@ -110453,11 +110632,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20211009, - 252 + 20211025, + 2324 ], - "commit": "c088fe627f12597726dfc2062454e2e7bd99798a", - "sha256": "0bhvhhqs55nh1qb212zmmxw76l22xd830pvw0n9wihv02yrg7kim" + "commit": "cb3b873063304ce5e1a5fd386c5f8c933964cd55", + "sha256": "19ly819cg5nnjcsr3aqk21hriyv2v8v64xfmyvk1j5p668y6mqkm" } }, { @@ -110587,8 +110766,8 @@ "org", "transient" ], - "commit": "00b4fd5cae7fe27085995dbb178828fb765c7edc", - "sha256": "1ya91159i58x4mccpnx429kq2k0xc04alikbly549qm8yw1y1hxg" + "commit": "0cb9c2fef6e611b4389f7df7fcccc17744053e9b", + "sha256": "1fv4bn6c04kv39jv25r09pvxc5hz5gwwbj16fhxs5930rf77ikqb" }, "stable": { "version": [ @@ -110678,16 +110857,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20211008, - 1118 + 20211028, + 1330 ], "deps": [ "apel", "flim", "semi" ], - "commit": "92ded1534ce7143f379b92a4029db275f3e22ee8", - "sha256": "0ai48j19dpyny1mmf81wjwmr5i5i5rnaj4d5n0hfchs4dcng0xrq" + "commit": "475514f22c0869d7b84cdf0b957f9ae75a45605b", + "sha256": "050dglv2l5z7pgrkzpmplzjm5mx3b4yg4zaqp2ghd9ddd19kn3y8" } }, { @@ -111620,11 +111799,11 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20210429, - 805 + 20211104, + 812 ], - "commit": "6ce65ec5c992b1e1cb538610f1c3708e9d467c39", - "sha256": "0cz5c0zy4lz0534nfr2xf7p0d09ppcfdmry4335gx19vz47fj60n" + "commit": "f22244202fdac5064d5eff95c6f35ae887b01142", + "sha256": "0zv80aarrqlgnp7icvmm9yxlpc9qpdzn73lfrvrpry1rmv301wfp" }, "stable": { "version": [ @@ -112193,11 +112372,11 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20211015, - 1917 + 20211028, + 2105 ], - "commit": "8d52f933e50624c7bca3880f57297ac17ba4ac2d", - "sha256": "0k0k7mbsizsbgyjb92qj9hp5f2jbwbkzmfbxjhbmniw87q1flmmp" + "commit": "521f75e3f37c7fe204bddb8a29ce862cae8f59bd", + "sha256": "0my9zbrzgn4h6wxl172iw6mn2dvcn3r85bdcl3pyv0hc5n7lkzxz" }, "stable": { "version": [ @@ -113033,8 +113212,8 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20210630, - 740 + 20211102, + 1607 ], "deps": [ "aio", @@ -113044,8 +113223,8 @@ "f", "s" ], - "commit": "95b0b37cf5bb6474f054056b0dad9402c700c5b7", - "sha256": "09xiabicada3ziyinlc9fczcdy2nr01fn3fqlq1vpjzb5882k63l" + "commit": "61f4fe7b5cc2549ea7363635307279becac53ea7", + "sha256": "188p1lk7d6gbnshikb7qf646ljpcrsdssr0k9jd1vgga8iz22k0d" } }, { @@ -114261,11 +114440,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20210713, - 455 + 20211031, + 456 ], - "commit": "06a6bcfc58d1f1cd8815c674c9fcbbf193bba0a9", - "sha256": "0mp68h924hfj86rya0kvk16w82lvllmiryz8ry70ngcfmwdh930v" + "commit": "787bb0a13c6e1b28e904e1b7f18564d5e97c9c93", + "sha256": "1yf6nnvzx7pv7qfx1wln9ksanapnf5b0chyrdhzy9wyjfx00hclz" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix b/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix index 1e1fffe9adbc2..eaa7d8b577934 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix @@ -6,13 +6,13 @@ trivialBuild rec { pname = "sunrise-commander"; - version = "0.pre+unstable=2021-07-22"; + version = "0.pre+unstable=2021-09-27"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "7662f635c372224e2356d745185db1e718fb7ee4"; - hash = "sha256-NYUqJ2rDidVchX2B0+ApNbQeZFxxCnKRYXb6Ia+NzLI="; + rev = "16e6df7e86c7a383fb4400fae94af32baf9cb24e"; + hash = "sha256-D36qiRi5OTZrBtJ/bD/javAWizZ8NLlC/YP4rdLCSsw="; }; buildInputs = [ diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 3992fc5c2ec47..4d8835c29c5f1 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -17,7 +17,7 @@ let loName = toLower product; + ".vmoptions"; in -with stdenv; lib.makeOverridable mkDerivation rec { +with stdenv; lib.makeOverridable mkDerivation (rec { inherit name src; meta = args.meta // { inherit mainProgram; }; @@ -94,4 +94,4 @@ with stdenv; lib.makeOverridable mkDerivation rec { } // lib.optionalAttrs (!(meta.license.free or true)) { preferLocalBuild = true; -} +}) diff --git a/pkgs/applications/editors/kakoune/plugins/aliases.nix b/pkgs/applications/editors/kakoune/plugins/aliases.nix index 5ff2a03441def..cf9a65c43f2b3 100644 --- a/pkgs/applications/editors/kakoune/plugins/aliases.nix +++ b/pkgs/applications/editors/kakoune/plugins/aliases.nix @@ -33,7 +33,7 @@ let deprecations = lib.mapAttrs (old: info: throw "${old} was renamed to ${info.new} on ${info.date}. Please update to ${info.new}." - ) (builtins.fromJSON (builtins.readFile ./deprecated.json)); + ) (lib.importJSON ./deprecated.json); in mapAliases ({ diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 36dad897668c4..f8333dce6ddad 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "458"; + version = "460"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-oVNgXelFMVT5V41SRlnN+pnYzOWbdDKQQcvRWFZqEro="; + sha256 = "sha256-cIvidbvMAWVs/XnS7I5ZQkuya9lfuRPNCRSTbFnKhSw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix index be9d02bf33937..f17730cc7e955 100644 --- a/pkgs/applications/misc/coreaction/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, libcsys, libcprime, cmake, ninja, }: +{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "coreaction"; @@ -27,8 +27,8 @@ mkDerivation rec { buildInputs = [ qtsvg qtbase - libcsys libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/tools/archivers/corearchiver/default.nix b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix index 217520dde9945..56a05bc434ecf 100644 --- a/pkgs/tools/archivers/corearchiver/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja, }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "corearchiver"; @@ -18,9 +18,10 @@ mkDerivation rec { buildInputs = [ qtbase - libcprime libarchive-qt libarchive + libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix index 9ad99e3aa06be..3ec918db7af9f 100644 --- a/pkgs/applications/misc/corefm/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libcprime, libcsys, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "corefm"; diff --git a/pkgs/applications/misc/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix index 6d665479764a3..719047c8de7bb 100644 --- a/pkgs/applications/misc/coregarage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "coregarage"; @@ -18,9 +18,10 @@ mkDerivation rec { buildInputs = [ qtbase - libcprime libarchive libarchive-qt + libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix index ad1fabb25043f..fb9bcd5e8ef4e 100644 --- a/pkgs/applications/misc/corehunt/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libcprime, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "corehunt"; @@ -19,6 +19,7 @@ mkDerivation rec { buildInputs = [ qtbase libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/graphics/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix index 1dcff1f6e8f25..224c946d1175f 100644 --- a/pkgs/applications/graphics/coreimage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, libcprime, qtbase, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "coreimage"; @@ -19,6 +19,7 @@ mkDerivation rec { buildInputs = [ qtbase libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix new file mode 100644 index 0000000000000..d8df86abd8705 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix @@ -0,0 +1,35 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, libzen, libmediainfo, zlib, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coreinfo"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-kLBOvvulHE1+4TyZVEVZwEA+Id7+w8fI3ll+QL2ukr0="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libzen + libmediainfo + zlib + libcprime + libcsys + ]; + + meta = with lib; { + description = "A file information tool from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreinfo"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix new file mode 100644 index 0000000000000..3d4e6ddc30108 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -0,0 +1,35 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, xorg, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corekeyboard"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-0CbQ43BN4ORvtxs6FwNkgk/0jcVdFJq/tqvjUGYanM4="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtx11extras + xorg.libXtst + xorg.libX11 + libcprime + libcsys + ]; + + meta = with lib; { + description = "A virtual keyboard for X11 from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corekeyboard"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix new file mode 100644 index 0000000000000..fcd1bfa4a4ff6 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepad"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2bGHVv0+0NlkIqnvWm014Kr20uARWnOS5xSuNmCt/bQ="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A document editor from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepad"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix new file mode 100644 index 0000000000000..6410da3ba607c --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepaint"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-nATraYm7FZEXoNWgXt1G86KdrAvRgM358F+YdfWcnkg="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A paint app from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepaint"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix new file mode 100644 index 0000000000000..bb93391c2af80 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, poppler, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepdf"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-HeOklgCwJ5h3DeelJOZqasG+eC9DGG3R0Cqg2yPKYhM="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + poppler + libcprime + libcsys + ]; + + meta = with lib; { + description = "A PDF viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepdf"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix new file mode 100644 index 0000000000000..80d3a096ffe66 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepins"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-H/l/MHHrTmkfznVKUHFAhim8b/arT5SNK5fxTvjsTE4="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A bookmarking app from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepins"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix new file mode 100644 index 0000000000000..f92d532ba4a55 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corerenamer"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-OI7M7vV0CA42J5cWCqgGKEzUUHSgIJCWRTXmKRD6Jb0="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A batch file renamer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corerenamer"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix index bb2404b1ed522..bf9f5e49aea62 100644 --- a/pkgs/tools/misc/coreshot/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, libcprime, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "coreshot"; @@ -20,6 +20,7 @@ mkDerivation rec { qtbase qtx11extras libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix new file mode 100644 index 0000000000000..a6d71eaa6cb62 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, lm_sensors, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corestats"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/WBetvbd8e4v+j6e2xbGtSLwNMdLlaahSIks6r889B4="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + lm_sensors + libcprime + libcsys + ]; + + meta = with lib; { + description = "A system resource viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corestats"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix new file mode 100644 index 0000000000000..57216f4710dad --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -0,0 +1,35 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, kglobalaccel, xorg, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corestuff"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/mmCIHZXn/Jpjr37neI6owWuU1VO6o7wmRj6ZH8tUbo="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtx11extras + kglobalaccel + xorg.libXcomposite + libcprime + libcsys + ]; + + meta = with lib; { + description = "An activity viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corestuff"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/terminal-emulators/coreterminal/default.nix b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix index e358fae0716f6..c2085686aab86 100644 --- a/pkgs/applications/terminal-emulators/coreterminal/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix @@ -1,12 +1,13 @@ { mkDerivation , lib , fetchFromGitLab -, cmake -, ninja , qtbase , qtserialport , qtermwidget +, cmake +, ninja , libcprime +, libcsys }: mkDerivation rec { @@ -30,6 +31,7 @@ mkDerivation rec { qtserialport qtermwidget libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/pkgs/applications/misc/cubocore-packages/coretime/default.nix new file mode 100644 index 0000000000000..af33d474e3509 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtmultimedia, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coretime"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-b7oqHhsuHsy96IAXPUtw+WqneEHgn/nUDgHiJt2aXXM="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtmultimedia + libcprime + libcsys + ]; + + meta = with lib; { + description = "A time related task manager from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coretime"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch index 8a8b0ae401091..8a8b0ae401091 100644 --- a/pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch diff --git a/pkgs/applications/misc/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix index eff253ffcc2e3..154f4a389948a 100644 --- a/pkgs/applications/misc/coretoppings/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix @@ -1,8 +1,32 @@ -{ mkDerivation, lib, fetchFromGitLab, libcprime, cmake, ninja -, ffmpeg, qtbase, qtx11extras, qtconnectivity, v4l-utils, grim, wf-recorder -, libdbusmenu, playerctl, xorg, iio-sensor-proxy, inotify-tools -, bluez, networkmanager, connman, redshift, gawk -, polkit, libnotify, systemd, xdg-utils }: +{ mkDerivation +, lib +, fetchFromGitLab +, ffmpeg +, cmake +, ninja +, qtbase +, qtx11extras +, qtconnectivity +, v4l-utils +, grim +, wf-recorder +, libdbusmenu +, playerctl +, xorg +, iio-sensor-proxy +, inotify-tools +, bluez +, networkmanager +, connman +, redshift +, gawk +, polkit +, libnotify +, systemd +, xdg-utils +, libcprime +, libcsys +}: mkDerivation rec { pname = "coretoppings"; @@ -15,22 +39,21 @@ mkDerivation rec { sha256 = "sha256-DpmzGqjW1swLirRLzd5nblAb40LHAmf8nL+VykQNL3E="; }; - nativeBuildInputs = [ - cmake - ninja - ]; - patches = [ # Fix file cannot create directory: /var/empty/share/polkit-1/actions ./0001-fix-install-phase.patch ]; + nativeBuildInputs = [ + cmake + ninja + ]; + buildInputs = [ qtbase qtx11extras qtconnectivity libdbusmenu - libcprime ffmpeg v4l-utils grim @@ -50,6 +73,8 @@ mkDerivation rec { libnotify systemd xdg-utils + libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix new file mode 100644 index 0000000000000..0a6ccaf721427 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coreuniverse"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YZCMyYMAvd/xQYNUnURIvmQwaM+X+Ql93OS4ZIyAZLY="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "Shows information about apps from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreuniverse"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libcprime/0001-fix-application-dirs.patch b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch index b454abb188bcc..b454abb188bcc 100644 --- a/pkgs/development/libraries/libcprime/0001-fix-application-dirs.patch +++ b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch diff --git a/pkgs/development/libraries/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix index d312c832243ad..00e297bf276a5 100644 --- a/pkgs/development/libraries/libcprime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix @@ -19,7 +19,9 @@ mkDerivation rec { sha256 = "sha256-RywvFATA/+fDP/TR5QRWaJlDgy3EID//iVmrJcj3GXI="; }; - patches = [ ./0001-fix-application-dirs.patch ]; + patches = [ + ./0001-fix-application-dirs.patch + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/development/libraries/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix index cec6e501bb5b3..d1dde9942e92f 100644 --- a/pkgs/development/libraries/libcsys/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, udisks2, qtbase, cmake, ninja, }: +{ mkDerivation, lib, fetchFromGitLab, udisks2, qtbase, cmake, ninja }: mkDerivation rec { pname = "libcsys"; diff --git a/pkgs/applications/misc/lavalauncher/default.nix b/pkgs/applications/misc/lavalauncher/default.nix index 533d3757a6ef6..f6071978b8676 100644 --- a/pkgs/applications/misc/lavalauncher/default.nix +++ b/pkgs/applications/misc/lavalauncher/default.nix @@ -7,24 +7,26 @@ , scdoc , cairo , librsvg +, libxkbcommon , wayland , wayland-protocols }: stdenv.mkDerivation rec { pname = "lavalauncher"; - version = "2.0.0"; + version = "2.1.1"; src = fetchgit { url = "https://git.sr.ht/~leon_plickat/lavalauncher"; rev = "v${version}"; - sha256 = "MXREycR4ZetTe71ZwEqyozMJN9OLTDvU0W4J8qkTQAs="; + sha256 = "hobhZ6s9m2xCdAurdj0EF1BeS88j96133zu+2jb1FMM="; }; nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ cairo librsvg + libxkbcommon wayland wayland-protocols ]; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index fac17c978db93..9aed6daa5c313 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.2.6"; + version = "4.2.7"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "sha256-H8vFbQHFTO7blTJyfaEuyVUIljhfFautIrXV73zmBeI="; + sha256 = "sha256-PVG4KZX6KxkrooywgEmqOItyLt5hGs+b/KCaguduGyc="; }; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 8ac9235121c37..a512c119d53af 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -88,7 +88,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.5.8"; + version = "10.5.10"; lang = "en-US"; @@ -98,7 +98,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1bn31r3cayv79pjw5ndji5qzxy552cb2mcavij3nwchsmnfqp4z1"; + sha256 = "0mvclh2f2lqj5kf98p0xdbaa6wxshwb8dkcna5sl561cw8nnayc2"; }; i686-linux = fetchurl { @@ -106,7 +106,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "1j3xxflwwjwxfayixj75dn6a2ka751s53f60dpkfzwpp5rfwl572"; + sha256 = "1g714abhh3ynmparb516z5syl7i64n7s5mga0zxb4598bhzi5zkg"; }; }; in diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/applications/networking/cluster/kube-score/default.nix index 707abd5e2bf48..6ef24ded1a678 100644 --- a/pkgs/applications/networking/cluster/kube-score/default.nix +++ b/pkgs/applications/networking/cluster/kube-score/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-score"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "zegl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FZbq7f8Urx3tlJOBPnPyp1enFsmtrxqNjR42CTNo6GI="; + sha256 = "sha256-QAtsXNmR+Sg9xmvP7x6b2jAJkUcL/sMYk8i5CSzjVos="; }; - vendorSha256 = "sha256-8Rg57Uj/hdNqAj40MKZ/5PObRkdsInbsRT1ZkRqGTfo="; + vendorSha256 = "sha256-kPYvkovzQDmoB67TZHCKZ5jtW6pN3gHxBPKAU8prbgo="; meta = with lib; { description = "Kubernetes object analysis with recommendations for improved reliability and security"; diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix index 7249c2a5cef45..29a8388bd5cc4 100644 --- a/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.4.10"; + version = "0.4.12"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D1/ljIOc5vK6HcYmk0WNnIRGBt1vJk9dGxl5GjhKhuA="; + sha256 = "sha256-03eGWuDV/GS2YgDQ7LaqonU7K/ohI8sQD4dXbJGXeXw="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index dd7c6f0c573ed..bce13052e5ac4 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -16,7 +16,7 @@ }: let - pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); + pinData = lib.importJSON ./pin.json; executableName = "element-desktop"; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; in diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 33af19a9a5766..fae96e8e5e7ae 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, jq, conf ? {} }: let - pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); + pinData = lib.importJSON ./pin.json; noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org piwik = false; # disable analytics diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index 432d69ac7a47e..ae9627afe30d6 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -2,7 +2,7 @@ , fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit, fetchYarnDeps }: let - pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); + pinData = lib.importJSON ./pin.json; in stdenv.mkDerivation rec { pname = "keytar"; diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index ff3b2ba9134d1..de38c7a90bad0 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps }: let - pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); + pinData = lib.importJSON ./pin.json; in rustPlatform.buildRustPackage rec { pname = "seshat-node"; diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix index 015c44e428bd1..c1bfc98047bec 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix @@ -8,7 +8,7 @@ }: let - pinData = builtins.fromJSON (builtins.readFile ./pin.json); + pinData = lib.importJSON ./pin.json; noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 5af24287c171b..d53bcda2a69de 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.2.1"; + version = "91.3.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/af/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/af/thunderbird-91.3.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "953e07d7198b8b13f312ef620caf6e232c361f78dd04ebd69c753f7b75e55f42"; + sha256 = "067592da3bdc40cb8a7d8f64e3c5d116575604f1305b8eac4b5b1cc7f79dccf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ar/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ar/thunderbird-91.3.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "29f34eac79855c01550a259d3663c662ec9bd259c0b20bf392efb0de1f44af8d"; + sha256 = "3a52d7c0e48496cd2259494196b0514412e922535877ddd322ceb82d02a47a39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ast/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ast/thunderbird-91.3.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "284d8935a5527b58f84ba9acabc0a67c51a7e1587f843d8b0ec9555e6f6d8f4e"; + sha256 = "e07001f03b642887ae4a4e2415ce6bb50542d5af7cd8a9f0531081bb084e56eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/be/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/be/thunderbird-91.3.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "6a535aac3b4eb839a2aca1df28ac8425c142c68bd5c6907f5b9999a45b62c9c3"; + sha256 = "ae12e02ef735813f2f807a32b101ea8ac621bff3f01f4e4b3c5e0fa6c178b812"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/bg/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/bg/thunderbird-91.3.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "74dde907aaa3877651e1f2bec43a208ff36bf7d860333eaac6f8cdd20d48dc39"; + sha256 = "3892a660dcc417cbb951bd8362b8fdf06ef35606e98f121ea6f549646a0a8b89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/br/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/br/thunderbird-91.3.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "6b396a289addae8d5ade8355f8c93c285ce6833852149a0fed3f741d9ceea220"; + sha256 = "2fd0c6eca16a1435d0abd5d8fa66d68c8024f992ee57b741178c2d253f9bb7d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ca/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ca/thunderbird-91.3.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0611d49fd90777b3af1bd5b5effd3b4a5b267c7c33e6476ceed906a070a0e675"; + sha256 = "45fa1b1e80b646af457b189e07fa13c8bee61df1d80066b0b3d65414a682e105"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/cak/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/cak/thunderbird-91.3.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "032e7034ab5aada649258dfa43cc10d6e00cf5be6f06b8bede06d2ca19625d79"; + sha256 = "3211236401fbf52b6085c1fe7e82e081c2d7d4f13514b11ced5a483986dabecf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/cs/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/cs/thunderbird-91.3.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "b0591e3bdf5e9273269354924fcfa8001579961f089f1011226faf1f4b0ab2e6"; + sha256 = "259bf43995f7990bd1ef78e030db88966688323f363f15af2065c7c551a9e6ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/cy/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/cy/thunderbird-91.3.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4087f5c5609169b6834e2eed3fdaf614826c47f3ca99177292fd379ef5d430b3"; + sha256 = "2e1719dc5b7c3687c390c7ac07ab0392a3e8f32624ebd40d2cf8208796da054e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/da/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/da/thunderbird-91.3.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b72f768cc2d9c2bad536e2467d1abfe68671b242fcac801e57297694fd41d231"; + sha256 = "49d8e99d05928d4678408a3b38da2f5c4915a802966c7328f4d410d5d0f7d82e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/de/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/de/thunderbird-91.3.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "48990ead3d84cb023e8c3e6e34113209b49e6ed3e29766fb5374fe577cd5cd94"; + sha256 = "0059061919afe9a38a3647896693e4773c3656887657b761356ff698b839cef5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/dsb/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/dsb/thunderbird-91.3.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "c7e93ffe9d8ab0bc00db145771e65fec6c589208c28c3e0ecb5bb49471b9ed61"; + sha256 = "7ac2f44c66860967cabd64e94f0b104b2807f4b6297dd2ad828525962d8d5976"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/el/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/el/thunderbird-91.3.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "c35372524d77123bb9827d26efcd29e0fb9de402744b22a3c99563531410e2b3"; + sha256 = "3fcde9b4cac6c46a6be2fe15f200cde1f96b59732f1e87b5645538568969817f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/en-CA/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/en-CA/thunderbird-91.3.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "d20fa4b8c7224f35f06d384b5f37c277c56ac35f2099f59735197a0334c9f3ec"; + sha256 = "13e33af2f7c29f8bcc479a09b3f8ab82362c01984700c5371eb8c050ef0524b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/en-GB/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/en-GB/thunderbird-91.3.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "af0787957918aee6bb931b30ab92722c3ea8fe1e3fd60602d172a598422f7896"; + sha256 = "94e8bf04d513caa7cd74c4e93851a59911352e666b7bf86c8a795d63177f2e0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/en-US/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/en-US/thunderbird-91.3.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f8968d5ecf27e37bb8204291a9739ab804ef77c082e11b4e82fc7e02c8bf0da4"; + sha256 = "a5cf280ad34305f7a83d331f554488c08e8c62acf2eb895ba7a6bcbc4aad3180"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/es-AR/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/es-AR/thunderbird-91.3.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ec281675876941240ccebe0c48bbb4ae0ed442b795cd7ee1be51ec59c4331220"; + sha256 = "ae253fa8d23ee19105566a76be6ad4584ba2c5cb1eef6a3135d488109f25dea7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/es-ES/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/es-ES/thunderbird-91.3.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "6436ab381f1ab7fbcf1289d50300d7238f1095022cf18d6441832a8f61df68ea"; + sha256 = "1ede7664984d3ba3ba74163f58f02d5a982aa586c000a9d2b51efdb4b0b39210"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/et/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/et/thunderbird-91.3.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "1e49089b98dcfebdc1465b93d625b6ea1b6fee4642ca915035fabdc97710eb0f"; + sha256 = "93e29146782ccaa5ba9cc0b30f4f6273d8c57f39c678bc2dc825af5f46415ff1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/eu/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/eu/thunderbird-91.3.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "c6a1418f15a019924b459b952330b9851c50907a7c12f3d430a79268ebdb7bac"; + sha256 = "ef431ab48190366acad917c5d8710e2df89ee31cf88ccfea206bfb49fbd2083c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/fi/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/fi/thunderbird-91.3.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "588261a4c0e9cfa0c9f506f4fd2e9e14f123d10e96f0cc1724b4ea4607151264"; + sha256 = "e4fba7cbb9cdb515eb29757bbda8b3f1fd091a5c1a35d345b34c547002c44ab7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/fr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/fr/thunderbird-91.3.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "9ca2d54c6f6f04ee887621332cc35aeabd0f9b73db621c41e8925bafb316670a"; + sha256 = "127de8d089c8ad535f2ca0dd60856a8822e8adffb3e5f3af868881c36e78da97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/fy-NL/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/fy-NL/thunderbird-91.3.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "df9bae4cc2d3bd2778047d4589ec1a8e23f7b8c7fc760817decb9341b59dc0b9"; + sha256 = "28b4e3490105558c6fc47b9189451e0359f0ecfdaf9b40af173483cbef618981"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ga-IE/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ga-IE/thunderbird-91.3.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "8d6445032f39152c62e98fe9093cefbaa383d2bff203734ca04a501b44a3a0c2"; + sha256 = "2b16e222cf5f9468bae76f1f3b7b0af8c7b6f8a7a9f263e9d1b1e9320e244fad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/gd/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/gd/thunderbird-91.3.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "b947847398a8e086d062f8e54f515d53e39afab48ec59ca0aceb956ea0e0917f"; + sha256 = "9368396e0ca3784201f3e2d2bf6c1c87d0d0dade72f96c450119929a4ae34ae5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/gl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/gl/thunderbird-91.3.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "3dddbb5cc78171719ed2e7c3ba854c0a346ca5324a898c698dfb79c7881051c0"; + sha256 = "7c90a96061ae3d237636baaa4fe439ae47542d0880b81687bc3a5a9e40edded9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/he/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/he/thunderbird-91.3.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "e77eb74db9111e54b1e492fb5752fa92ec6eed96a7146392d1ba19d63b5e2ab8"; + sha256 = "12e42b78aa9757b8274df1395667b89214d393a2dd5969b374a0bf5816f04f31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hr/thunderbird-91.3.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "3e4d46ecc0ef83a619775d48e4df81295e3e95ad1e9a96efeafa26d7f24b85ee"; + sha256 = "f27542cf34fffd6aa71c479278b843ce435f4a8272130f7d8cde6f155e82b813"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hsb/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hsb/thunderbird-91.3.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "36453d6aca463fce338ac4a15c438290bdaa377aff72a56f0acefeba19860986"; + sha256 = "f21bbe1720441392a276f3a2f6025da48f74efcfb7bfbe783f134be013874cf6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hu/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hu/thunderbird-91.3.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "dd05c379727762fde0c2456a7bbd67cc45fb7ccfbbf88958b887d6637867e80e"; + sha256 = "64b16f848c5a361d9709c2075fdf3ca4f7eb885f3f1cd9ec5acffc260b31982a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hy-AM/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/hy-AM/thunderbird-91.3.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "35e4db20ff927cf079607fd0e7d207c155f23c7890cc6347ac069c9d252f6ad3"; + sha256 = "da650d001f9b10227c5a5f5225725ef9085aa71f95dca0ffc4452fc2d6b48d90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/id/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/id/thunderbird-91.3.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "9cc7a35aed1e5808a80cade5b77d064f3bd36f08107dbbdd3b92ac11c8c83766"; + sha256 = "12fcb1295b43b8bfd9607b819a78dd931c5efb092d6a5ddc70199c3625c4c033"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/is/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/is/thunderbird-91.3.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "de645fdf79f33195a7caed9461214f834fb2e52f3da764bde71608fd3783305e"; + sha256 = "48250a36caa8727b6e5bf1369199b4e202c7692ef62ffd97999b71a59c8182b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/it/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/it/thunderbird-91.3.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f9a80f01d18cd36ac5c0a18d65908f329bc3d7ec506e0f201b833ed973528dca"; + sha256 = "aebf9b22dd1af357fdd1709448d3d753319a2f817bc30ed15ba364c75fe5ec40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ja/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ja/thunderbird-91.3.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9345cfdb7e35fc15e94bab52f058dacecd813da210c81770f3037c6f3f982478"; + sha256 = "3a1580283928525b20a163f13c4cb9554484823ddc28699a8d8879860ccf3a73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ka/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ka/thunderbird-91.3.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "49e535b7b8322645b81b8137ded607cbe54e70977a07b800114421fb529b045b"; + sha256 = "a2d2b5e2b884fa1b9547c76b9fce154431ef0db80af45379079f1c2d5c6d14b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/kab/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/kab/thunderbird-91.3.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "9e66e0654c5ca2d4fec6101bd40a2ab68f17ad4a27ff58db4a1c5d927d76761d"; + sha256 = "0b909906f58125048fd4683946e62653b5c9064085b3f129b20d865c8463198b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/kk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/kk/thunderbird-91.3.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c929ef91d1ed17db64a36b5c8653e98e1be05b7bef48c062c40c0e37a88f6844"; + sha256 = "5256b328a8920f01b5e93617c3e98a54e27094a383047df9a98f5ac50772e0fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ko/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ko/thunderbird-91.3.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "758c31e642a796e3c8be2848e9789bf9c3d4f896790c80603491235ba126a195"; + sha256 = "445644ffbdff8af1910f664a9ed81512af95c9882f5b1ce1add02dac715ab0e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/lt/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/lt/thunderbird-91.3.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "7173cb778a4f1bc625b5dde4eedf59911eb649e29c20f8f2a2eca455696fbdfb"; + sha256 = "0b3dbd1b6e71036b64c98920ef755f418cf6c11feba93ba8d873d438a032bf87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/lv/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/lv/thunderbird-91.3.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ec9ef897898c788521725879906c56593dd08e9b862b1ad32f7133bba7843b94"; + sha256 = "2bc934ce28dd4775984ae2f4db79db54806b34fdb415ec4420ae3b8927fe10a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ms/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ms/thunderbird-91.3.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "1f95835843d33a80821c077b26ea5e6330ea3d1a818bb122623a6024dc98515c"; + sha256 = "e13dad427c8d0cb9aa79c48f4f8124ea996cabb34efdbd4ed8e90e233d00b6e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/nb-NO/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/nb-NO/thunderbird-91.3.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "f5aff84dd6016a4223df28fc92185cffc1771107bc4f7c442bef0d19ae4cccf5"; + sha256 = "e984fe009aa98be81153b1285370fae6187705bfbfe652b3c45e83f5bb0070ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/nl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/nl/thunderbird-91.3.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "1146a72a68b454abdb3ab19e0a487e0aa46af0fec4c9261459ac20785a66f8ca"; + sha256 = "55744aaba9ae0c282d7eeba0beae71101cdfbf689bbad8a6312af3f2abc41778"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/nn-NO/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/nn-NO/thunderbird-91.3.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "a63d1124b72b4ad1e26f34b26792e576a63ade3aee161965058f6ba2144f4edc"; + sha256 = "b404dfee5b164a0401da149c33535e51030b21da29fc97d1822bc82cec2b6808"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pa-IN/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pa-IN/thunderbird-91.3.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "245692605721b9610bb730f7164c64daebad372f881842a3e2d92dd27cf2c23c"; + sha256 = "cb0bb35c9cbb31443658847bc49d29730b192b6a25875acceac3fa4fd7436edd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pl/thunderbird-91.3.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b3b3f9b4f4e2f310b24b148960dbbada8dedd444968f923e7295ce2e3f561bc0"; + sha256 = "3a0ea72ba75230b4809901138350e0f13f981daaf590455aa75787cb107a0c24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pt-BR/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pt-BR/thunderbird-91.3.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "dc0a70cb19880a9ea7a076ea03c12150bf2ed6349bee7f7cd64b9ba261366e99"; + sha256 = "8e9deefa5bb510e244d8c6416371e24a2f6c97548eda5a25bf03a7aa5d500b7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pt-PT/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/pt-PT/thunderbird-91.3.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "be20940db6d0b0399ea90e97ce4073c698c9caa822535cfdadaf5019aaa283f0"; + sha256 = "753235eb471c7bb62f766baff612bd1df5926ff248ee174604496edb7c75546b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/rm/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/rm/thunderbird-91.3.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "8e996281032049eeb70c12ecc10dd321b055d917edc3f16c12b073160552a76a"; + sha256 = "a298343b057a4d25b89386cde253ddd897550250e81b8abd6a68ff240d41c600"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ro/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ro/thunderbird-91.3.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "d015483952516c37169d263660776a572877d6db50b4e4bc42c9d285cc413032"; + sha256 = "df52bc68926b9239d3b26fbbfea3ec7aa98837296243325dfe153e9afea6a0fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ru/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/ru/thunderbird-91.3.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "90404c19d3ab7d5142310ae23699b346ee07ab5704b02f3b89e1972737460448"; + sha256 = "001b1145aca605e8e5d72a1fda411546de1d2cb82f7be5626d5766018e1a692a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sk/thunderbird-91.3.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "2ed8cea88291714fe25b3f06777340536e24c1837743e6dd16bf2e66e90ed057"; + sha256 = "822e852ec3d2d5a50f042bd2e5b2ec6929441b8116a2cadf2369c769602b85b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sl/thunderbird-91.3.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "be29a12cd0d52f11f19cff89df0d0a883802328cbe036e9f01c2be7d296d5a4a"; + sha256 = "752538090cd3d72cb5d04cc9abf0b089e437a7726cf8eee27b5ebe2d63162b8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sq/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sq/thunderbird-91.3.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "b9f0b22b8004af1e7704048eb7223bda77723f664aab3596a3e2fed538eab39f"; + sha256 = "a8548722e8c67da69c8f2e15855dd076b1435c5a1c6c34100dfae8de0eab7543"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sr/thunderbird-91.3.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "1edd87244be553d61bd5db1de74068130e9a3ccfa387d21c489f9a777bbae732"; + sha256 = "d6c86caa9b272b3281b9a3eea8ded13546f4d09518081feb3fd16b995955d6e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sv-SE/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/sv-SE/thunderbird-91.3.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e218a20074e50dbe20d2dba7e81d5febdbcad8031e0fd9d88aca469da9cea267"; + sha256 = "a5af37b0803881489bc775e25592901ca77de996b07c4df658f17a9b66c94fc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/th/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/th/thunderbird-91.3.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "fa65b90c1cc903f3e1b743e142736b1c7e897eb6bf9a80cb0bffa60db627aba2"; + sha256 = "a0292086c9e9d0462118ca5945627bb04f8943e3afcdcf3da054ff52ccd45442"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/tr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/tr/thunderbird-91.3.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "5af2e6453aa5523169d6922a8a888b757accad60802d7a457a1ee244cd74c3bc"; + sha256 = "f02b7dde392fd77cde01a9ae860a46acf11554ec32d1b606c2a0145562bea1d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/uk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/uk/thunderbird-91.3.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "effad7de717f0597447a7559e666ee3cdb0a1270daa01226d662cab0be84a4dc"; + sha256 = "1cb2935c1517b10adb370ceea6866912656c668dd8e82abcfb0f59435a85a854"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/uz/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/uz/thunderbird-91.3.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "f3c8d3d4ca4c076eb8bcc8a06df32622b87b4d4ae397ee36f5de27a947d443ee"; + sha256 = "4ad88f7f036ec199bd69ab7628d2bdf2f162603e8290cc19e4ccd586bef691fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/vi/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/vi/thunderbird-91.3.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "ac464ab32927c822776b1cf873ea9b9a9473c18ac08b18534332050bde7b1dfe"; + sha256 = "538a9996a604d9464a6c1315c683d6bd80b585d3bcf59fa93272444c22fec59e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/zh-CN/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/zh-CN/thunderbird-91.3.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "44869c19113316a02518eb19fb5b1a7a85e266fccf7a3172d1938d758a5efa6a"; + sha256 = "470123b053cab95930e8594684e65a656da032ea4e46aae4c325f119fbed4a46"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/zh-TW/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-x86_64/zh-TW/thunderbird-91.3.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "82d915747e3e5459acba3e17663de422586f27e7bbc3a5698d992f82ee3d0cc1"; + sha256 = "cead4d02b5dd39dd146d1f2b28b61e5f30804018cd226d36e56bd39e010d82c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/af/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/af/thunderbird-91.3.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5ccbc3453b76c3e02a05b94905c48cdad99bb15042fb2cfc58c7f619a263da07"; + sha256 = "4ac3b8ea2e7371710b03beca630d409a7f3e101e267e15b2ef49004da728e021"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ar/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ar/thunderbird-91.3.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "616fc2f0265f204b8699dd0beafc02220d7ba9b2243350730573824f6fa49462"; + sha256 = "545423946de595760829c2263b90f1ca2aef3ec576a28c96c37ec6bfc3269fd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ast/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ast/thunderbird-91.3.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "046386e67e1b775f1f228e3056660db023093180f1c200f6380b6d3744b8ce4d"; + sha256 = "1ff0fc8052bcb5c26396114be2ebce66e939cfe962c17807183ccb538dc29df1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/be/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/be/thunderbird-91.3.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "bf64b91b16bdf4dbdfb88972432f2d2cce002a6ff8c708779511b54a05a7008f"; + sha256 = "079a3e51861d0396d89978b46bcbcc5d786b3b4d728064c7709aefb2ba95ba40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/bg/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/bg/thunderbird-91.3.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f544fbff341165e8e304a8a643be60c8b742973402861b298171699c45fe622b"; + sha256 = "04b095d3b52972e06324630b938cf703143158996036f1d338740e9058c666c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/br/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/br/thunderbird-91.3.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "c76ec7e65fc4980f12e05f863d8babab09d771f9679d21c93d8dab0f76d16898"; + sha256 = "82ad96bb61b2c170a0c750328b110772bff263493628c8a0c00396051a30ae4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ca/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ca/thunderbird-91.3.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "6c609f7b5886e7a7c70470d4bb35370284a454b109ca92cff9741bcc3086e9f8"; + sha256 = "e5c4a5c5edbfc95e2dbbf331e8a794fdbef77e111da3b467d050571b6447ff70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/cak/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/cak/thunderbird-91.3.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f210ac1e0740c7105abd388e9b5e22d9e199ab3deb43842c3a82ecf5e6d15f01"; + sha256 = "4c99da8214856553fd01e4bea4c01945abe799280bf4e6da94e57b8c85e5e047"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/cs/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/cs/thunderbird-91.3.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "108d9bfa0b9bef9433f4837517d3d157d46c8578f889b9fb81bc72178f6dfe52"; + sha256 = "f7a9037ed7889f5de489f875611cf6a5d644b93f26b0dbddcb6e49b5f11ee2be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/cy/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/cy/thunderbird-91.3.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1bd421b89cded34d9a656b4e44b78c7b07557221b87dc99831ea7029ff6eead2"; + sha256 = "bba109d3b1ec5b5deeb7c8bd036260490252961c52855c4d879ddb73858a1110"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/da/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/da/thunderbird-91.3.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "4db52d6017baeb8a5f925b7cfcdfb89a3ed8af9d3c1a41c4a63d122e4f214ecd"; + sha256 = "182600e06827d9abf7b8428e3dc883036119d23431923eb019b6a6dc197f7e28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/de/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/de/thunderbird-91.3.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "584c0e8a03b068652f61978af053028ca3793e1679ff0ea214bc6f8a99761f0c"; + sha256 = "24f69ecdf96f2823e709fe4ca6f48c2eca8b8574e8ff10e7ac48a78b8a847d76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/dsb/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/dsb/thunderbird-91.3.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "f838e8b6fdfb09e44771cfe02d22abb63722c65a0e430c77aca9fb5a53a97c4c"; + sha256 = "9c7ea981a4d8ca2917fc160dbe5598b7bf8c63a9af4b3010cfa870632f4b8e7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/el/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/el/thunderbird-91.3.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "0b0a6cb3c77e0a4f86bd3adbd4bac229d50323a88b355e470184f932b9602e4b"; + sha256 = "e55668dac59dea1f5faddf0d2d63b223932a086dc79a577f2e811dba4b3e16d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/en-CA/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/en-CA/thunderbird-91.3.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "7e22ff64aed5187db9621754f1eedb158285c2514f3eca836103833ac6183f7c"; + sha256 = "b60e6106c054e8d1a107b5601fc96555024b3894334cc4f825a953bf4198e2b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/en-GB/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/en-GB/thunderbird-91.3.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a3be3dec0ec4789f8370c23e47b7ed0bef6802d28e3985c66d1a531a3aa986cf"; + sha256 = "c63b78c881f9c98523214d70053fbe25c84209ea17b634f51fabe47f7a68e700"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/en-US/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/en-US/thunderbird-91.3.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "31c35df101e8d3f97c3df72b7660086fdf4f6612068fd03558d5f9dca2d23507"; + sha256 = "2f43f460a7b31c128c8cdae2829bbfd82a5381854d722901e8c07843d73f5030"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/es-AR/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/es-AR/thunderbird-91.3.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "70db1a684f76886131214bb0c48dccd75763f041e06428ee6fef54a3a8d524c0"; + sha256 = "5bfdc77b75b5acfff4a013884298d68ba76946f6ded7b39d973c4a4a20f0c09a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/es-ES/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/es-ES/thunderbird-91.3.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "d0b792b494bea690adc6a2eb967a988920ca497db08c539f92349c925ccb7c33"; + sha256 = "5c793c8ba89d886a67ced4e6cd2271cbd9a516efc1bbf981e4b302ee4223dc37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/et/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/et/thunderbird-91.3.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "2e4c3111435cb965972aec73eb181f7e3aac8faa03c8c8f0d7869ace109b433c"; + sha256 = "548e4ff7682d36034dac4b82bee239ff5241b8605982d4ea3e21d59f43710888"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/eu/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/eu/thunderbird-91.3.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "875e98a6ffcb614b3f062b7d12069eeb9f1c9dcd62916020369ede9ac76b8f92"; + sha256 = "1c24768b70b1cd8310ed5bd9bc08aab036952c692ddb5cdda7e0605b61746713"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/fi/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/fi/thunderbird-91.3.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "982a28220ed9d6881d83baaf99540e7eb5d689b0b7fca179d4847838f2596a3c"; + sha256 = "fdd4a914633aa6b1aeb4c737c63e7b0a39c60ab15b320ae37221c5a7eb273620"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/fr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/fr/thunderbird-91.3.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "f0421269313849e90eab46698176f1ca425d2bf8136748628a35b0a8baf26c06"; + sha256 = "b582ff509cea4bfcdafa4b260db4831565ea60b7ac64e3163c9a43814790277b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/fy-NL/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/fy-NL/thunderbird-91.3.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "d49aafc5baebb88b4b2ef7ea5240babe09b16632edebf9a39081aaf183e9ae3b"; + sha256 = "61fa2a02f179e50d9d4bf43cf037a6b545982ee479f7c8f040ca57fc2586ed2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ga-IE/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ga-IE/thunderbird-91.3.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "665df98e5dd0ab4cff25b530bccfdfe4b44f2a81da9167b37aeedf7f05e1f59e"; + sha256 = "c0651a533f2690ad17b336e4de840932c4711e10fec64b80f2fec18d0449f1dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/gd/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/gd/thunderbird-91.3.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "28acbaec011f0222530d0f8411444fdf0743d05c05c1fc04a0c130208dd5e9f9"; + sha256 = "49f7b349a5d55ccbcdeb2ca464aac2ff6c0712b6ea1e8f124ca7562913e8c633"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/gl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/gl/thunderbird-91.3.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "97c23e4eac308b51252c0532770961133f2540b94a9dc095c0351e39f42ab038"; + sha256 = "04eca02158c56920f08368bb78ce7affaaa3d6793e6a3361b41e3c8856804130"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/he/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/he/thunderbird-91.3.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "dfd4f5b4c9f396b4a512b38292b73f5a44146b3b46ab0d4e448067481e940914"; + sha256 = "150ea785d46bb8debe554533edd53abc2a5711ddf64268f4479dc0eda2e85be9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hr/thunderbird-91.3.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "07a1f4a58af9172912237c35c220efbe80fbcd44151dc0bce3e40ede38dff054"; + sha256 = "d837a407f1a117299a7540fd718f4f7cffdf056871ba5f1adf09da5ecd84eb23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hsb/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hsb/thunderbird-91.3.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c1b4e64ebdcc1a06d4428d3507aa1899f3d4c27ae428161f7219ea34302b1946"; + sha256 = "d7e3e2287a2218f80f055c450b67ece63ae97320eef1dca77cd153a2106d4bc9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hu/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hu/thunderbird-91.3.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c57005f3f10938b8cfc6adef1d5452b3235605b97a23d22da1f4528b1e356d2d"; + sha256 = "157a156e393b5a69a326aa0e9be02bd2ae3bd48433382a803ccb9c5c354ed498"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hy-AM/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/hy-AM/thunderbird-91.3.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "73525dc142b6762f803ced2b567a23244b22239d355fe89507cbe59ad1130edc"; + sha256 = "bbb783688762040579258fd8650124770f2a1b6ab8dd050df5c8e0bb057510ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/id/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/id/thunderbird-91.3.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "3f79327af36f3174cb303c65b13a0ae164bf24c87e367ba14bb46b1b6e2370b4"; + sha256 = "f14f33e5c8de0e59839654fd472ca20f592669bd739097831e011b3ad6ca3e3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/is/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/is/thunderbird-91.3.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "58f7012723cf4ce6673fed01d038b2517c710585c6f8724181e4a91d717b2351"; + sha256 = "5a6be55557ef79101cf61c4fa684a52be1afa1a972a69e02998a35cbfd3212a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/it/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/it/thunderbird-91.3.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "b0e7b9aa39a05148a0ef83d860fd2ab40d2aa1a66a31dd1e9a59d390d56c6e42"; + sha256 = "565299abc53960d3bb7c2a4abac86c2f5864a089aa4b908aceab20651b6d4c25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ja/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ja/thunderbird-91.3.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e02978eef0fc814ca190bf8bde29ae382fc2e14c61200e78ec1f43809d7cca9a"; + sha256 = "03244c4102177b81ad105ca31790000314c35813e6fa2efa2020b99b4ac45391"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ka/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ka/thunderbird-91.3.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "b11a6e09556d9f943765badb6145c5db2b7bb54cd3016de686e821aa66308bd5"; + sha256 = "2640b2cab838dea0f2252898302fe0008c2b3807da4c8c45224047a7975b9461"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/kab/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/kab/thunderbird-91.3.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "604f1c4a21b58b995e72ac48549802c588b0542c352de813aa4dcc02bbc0c686"; + sha256 = "083cd62d42936adeb069b620b19c7a66f761c40c82b56205626b9e1a6364b64d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/kk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/kk/thunderbird-91.3.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "29479a9970a622e23901c6022058d635874b41e24c7f5aef42536abc922dd1ea"; + sha256 = "8a973b47dfbe996d8e7dc894bb0cc0b473743eec0caf05f11646b3552c287516"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ko/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ko/thunderbird-91.3.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f34050010ff533a1c3949b11ad51c6902d6efec8c92904b2906ab80f95291e6d"; + sha256 = "6f7a992d226028a6398932c8bcaf9d522ff72cfbb60336875b83e74d22564967"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/lt/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/lt/thunderbird-91.3.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "be3e4c5bff078c2129d6f4e1a6a820efa62cce2750e3e1359dfba0ea93e58b5a"; + sha256 = "76cda4386e76388de5d0b660541f1ae5c40ef31609c329226e07573265b34c05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/lv/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/lv/thunderbird-91.3.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "bd6ec1783bcd5efbf51f963eef3db42f71b50e8826fe4896dc7356d10f4eefce"; + sha256 = "9bc2b1358965e4bdaf875625296d2e40bc6f21709237b38011f82169937cf022"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ms/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ms/thunderbird-91.3.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "6279588bd47020c61250c211849b8fcbc4f480318a725090f316bb9f2099c31f"; + sha256 = "5860567197e95c1fbca7585796b34adaf453923be9e726ea33e54e390a7e800f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/nb-NO/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/nb-NO/thunderbird-91.3.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "0f0a0fb9f6556f4207e63a12e846d2917d8e221321b51ba34860094876c3528f"; + sha256 = "5b50ebc02d93303547704312f11e10a5470bcc116da55573f6d256ec90e5d5cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/nl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/nl/thunderbird-91.3.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "2f3c40fffa081ec62396fc3b715331280603b38b6d5fe5f4b16de1ab6727a713"; + sha256 = "99756c19427ab548d6cd64a5805549ed51af95e41eaa97eff821bfea2b3691ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/nn-NO/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/nn-NO/thunderbird-91.3.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "da9c9cc55abbd4f0679b53b6635868fb2a5f56165292a82903512058fa57f988"; + sha256 = "2888793a3490fbebd2148128662a63a7a482c7d770e8e4c4be3e725af5eb5c1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pa-IN/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pa-IN/thunderbird-91.3.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "065db90edaec65fc7cb240d7793afae97110761bca269ffc4e172d0fd5dcbeae"; + sha256 = "a4d6ffa089fc309e208508986f91283a6c839f8cee109e073d3d6a0d25397292"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pl/thunderbird-91.3.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "4e0a43f1633728dbb25dcd60218b31fa45131a8189f94d8ebeff202bc251ac55"; + sha256 = "7a9f677c39700e7b1212047327f1b080004c42c3094eb4bf7a487b39a65458df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pt-BR/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pt-BR/thunderbird-91.3.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a013acdee4b7e983c71dd39607103f1794b967addc57c538a8ca94437551743c"; + sha256 = "0967d12e7cd9d2fd4d55dc75bfb02fb07ca61c60d2f0ccb295b8c264cb565957"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pt-PT/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/pt-PT/thunderbird-91.3.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "4bf7b530490f1fc1d031040790a568bee42206f393f8c13994551e6ff4d1ede2"; + sha256 = "1be6b84a42c215928de2dbb36bd9e0f01303eb1ba4224126c12a98205316746c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/rm/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/rm/thunderbird-91.3.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "829ffbd9402f5cf80cdd8b001081d6f67628c842cc3c73f8191b6f6ff1d54d52"; + sha256 = "54b4f955412f9c53d37188f42be5a7cc8ee1357458171d6134299145acde76d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ro/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ro/thunderbird-91.3.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "6bc72633a3b45faf2aa51627caf5674f1b05e16840b952f58f7f86ef6ad483b9"; + sha256 = "4f31a0eeafbe516c93b00b5ac5e7b06a35db471a19965955b8f25713984b7b9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ru/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/ru/thunderbird-91.3.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "141787ba7f5aeb0faa2a33e0d84fda8fa8d31681c6fdd0e884a69cc339042048"; + sha256 = "247c78a1dc8d6013744de242efc6ddac6f2f3d10d86e1348769e90124f5eb6df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sk/thunderbird-91.3.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "90363481a491a239e4c3da49bc87ed3ca795e4ce0eaf2239ac5a298e5d7abc10"; + sha256 = "73b69b08de497cc2c5e50e7226b7c6de61546b1198a6757b8a63c6399fd2a9e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sl/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sl/thunderbird-91.3.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "95e57777da6f9fcb41bb3116771be2e90b023315433d41e21884b34feb6a38e4"; + sha256 = "3d822e2c79d38e26353cb8810b8468580d2157b62aadcfca1d96874bb7ee0681"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sq/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sq/thunderbird-91.3.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "d7e0a12bd5c7edfb130e4defdc25b8776fb71722fb146cd5309d52405ad231bd"; + sha256 = "c8e185af246c6059e85554968fa91c1ff0477e824fdf05d1860dc36ff7dd8a47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sr/thunderbird-91.3.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "b17dbc3424ce90c0360a75476d1d25568fb4e7c6e1e90a197ab332e5584cb88e"; + sha256 = "61da012cc5aa8dab7855deef3f26c20efdbca12c788caede60a4825289850b72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sv-SE/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/sv-SE/thunderbird-91.3.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "027f7f817823e939261c05113b3cc5518b3fff1d061e66e8fcd5703504259f2b"; + sha256 = "064e2ca29bd5c1d63bae872d4419b537d5a75bec75a602847a115da15a0dcfae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/th/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/th/thunderbird-91.3.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "268473436cc5230bc60b38c0678eaa71c64b5f9c3780120df51c1063790e1855"; + sha256 = "791adf04802aca3323c4a7659a83ca3affa9b93c1ae9a011447d6ad638f256df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/tr/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/tr/thunderbird-91.3.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "79bad44e8e9dd7962d67b395d27c046d84c50f3eb66c53bc10de8a9c3d94a059"; + sha256 = "494fa955b325df483902df74c99e0a5a24c50670bcac7f62d5da5989b4c3555f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/uk/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/uk/thunderbird-91.3.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c363f700537f3a466fb438ec4339b5e83b60c721faa647b4ab77c907ab9b1f21"; + sha256 = "aaf7fd5dd2c2ad95cf0ea5333a59e6f953e36ad2b19b0a24cd42075ff6a96e44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/uz/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/uz/thunderbird-91.3.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "2de957d36eb6c2b5a7d33d6a06e9f4f1072981fd8530aa18d609a892f963c975"; + sha256 = "5ae7dee3ae3c33a0278c5b10401be741ed91d2cef3d00c9e6686d065830e0f32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/vi/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/vi/thunderbird-91.3.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "5006d6c79aff928e307a92eb3867364f206ee1d872e275d3ebf63b9a4cf286de"; + sha256 = "455183213bfc0936a71c3f8fd35d4b753cfafb5c72df514232df97b2af75f10f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/zh-CN/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/zh-CN/thunderbird-91.3.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "4893ea232fa746efc32cb0d84800b46fbdffb49a13fbc244559ca0382561ebca"; + sha256 = "13b600caa35aae9e6d82b7969afeb6951f2d2824a4c5af33eecf7b004e421ebd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/zh-TW/thunderbird-91.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.3.0/linux-i686/zh-TW/thunderbird-91.3.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "37ad46134d268639514eeb267a89aeb20fc318bde923b9eb552c281b23ae153e"; + sha256 = "4f01236b849f03599df14efc1f4cf7519077b72697758f41c69ce84a084ac37e"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 9c0359ea558c7..4bae5387255df 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.2.1"; + version = "91.3.0"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "3152f20ad5f0fd3ce2c1672e91f07ab8921ffb5ecf487e6b0d7d7464445c8d8df106eea0bd8d912ffa84ab0ad403dfcfb19be97f50a015150c9091201a0dff6d"; + sha512 = "938de817ed2cad90f665559da1dfc266f34b6ca2e688ee364112edfdb1167183a8225132ed50b672ceb14402be933be82fd1ef8b46f103cdf1534a403fb472d9"; }; patches = [ ]; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 3ba21cf6c8be5..ed10121e5cdfb 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -110,6 +110,14 @@ stdenv.mkDerivation rec { rev = "9808325853ba9eb035115e5b056305a1c9d362a0"; sha256 = "sha256-gJSqycCtbAVr5qnVEbHFUvIuTOvaxFIeffpzd6nH4DE="; }) + + # https://trac.sagemath.org/ticket/32420 + (fetchSageDiff { + base = "9.5.beta2"; + name = "sympy-1.9-update.patch"; + rev = "beed4e16aff32e47d0c3b1c58cb1e2f4c38590f8"; + sha256 = "sha256-3eJPfWfCrCAQ5filIn7FbzjRQeO9QyTIVl/HyRuqFtE="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index fe43c494dd42e..347151b1a7f95 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -5,7 +5,7 @@ }: let - data = (builtins.fromJSON (builtins.readFile ./data.json)); + data = lib.importJSON ./data.json; version = data.version; src = fetchFromGitLab { diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 63df2be4a27ac..6614e3913b8ec 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitLab, git, buildGoModule }: let - data = (builtins.fromJSON (builtins.readFile ../data.json)); + data = lib.importJSON ../data.json; in buildGoModule rec { pname = "gitlab-workhorse"; diff --git a/pkgs/applications/video/kodi-packages/libretro-genplus/default.nix b/pkgs/applications/video/kodi-packages/libretro-genplus/default.nix new file mode 100644 index 0000000000000..064375107e26e --- /dev/null +++ b/pkgs/applications/video/kodi-packages/libretro-genplus/default.nix @@ -0,0 +1,31 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libretro, genesis-plus-gx }: + +buildKodiBinaryAddon rec { + pname = "kodi-libretro-genplus"; + namespace = "game.libretro.genplus"; + version = "1.7.4.31"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "game.libretro.genplus"; + rev = "${version}-${rel}"; + sha256 = "0lcii32wzpswjjkwhv250l238g31akr66dhkbv8gj4v1i4z7hry8"; + }; + + extraCMakeFlags = [ + "-DGENPLUS_LIB=${genesis-plus-gx}/lib/retroarch/cores/genesis_plus_gx_libretro.so" + ]; + + extraBuildInputs = [ genesis-plus-gx ]; + propagatedBuildInputs = [ + libretro + ]; + + meta = with lib; { + homepage = "https://github.com/kodi-game/game.libretro.genplus"; + description = "Genesis Plus GX GameClient for Kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 12ca0dfe4cb6c..97e707a587e3e 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,25 @@ -{ config, lib, stdenv, fetchFromGitHub, fetchpatch -, addOpenGLRunpath, docutils, perl, pkg-config, python3, wafHook, which -, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs -, nv-codec-headers, lua, libuchardet, libiconv ? null +{ config +, lib +, stdenv +, fetchFromGitHub +, fetchpatch +, addOpenGLRunpath +, docutils +, perl +, pkg-config +, python3 +, wafHook +, which +, ffmpeg +, freefont_ttf +, freetype +, libass +, libpthreadstubs +, mujs +, nv-codec-headers +, lua +, libuchardet +, libiconv ? null , CoreFoundation, Cocoa, CoreAudio, MediaPlayer , waylandSupport ? stdenv.isLinux @@ -30,7 +48,7 @@ , libdrm ? null , mesa ? null -, alsaSupport ? stdenv.isLinux, alsa-lib ? null +, alsaSupport ? stdenv.isLinux, alsa-lib ? null , archiveSupport ? true, libarchive ? null , bluraySupport ? true, libbluray ? null , bs2bSupport ? true, libbs2b ? null @@ -95,54 +113,22 @@ let in stdenv.mkDerivation rec { pname = "mpv"; - version = "0.33.1"; + version = "0.34.0"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; src = fetchFromGitHub { - owner = "mpv-player"; - repo = "mpv"; - rev = "v${version}"; - sha256 = "06rw1f55zcsj78ql8w70j9ljp2qb1pv594xj7q9cmq7i92a7hq45"; + owner = "mpv-player"; + repo = "mpv"; + rev = "v${version}"; + sha256 = "sha256-qa6xZV4aLcHBMa2bIqoKjte4+KWEGGZre4L0u1+eDE8="; }; - patches = [ - # To make mpv build with libplacebo 3.104.0: - (fetchpatch { # vo_gpu: placebo: update for upstream API changes - url = "https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.patch"; - sha256 = "1yfc6220ak5kc5kf7zklmsa944nr9q0qaa27l507pgrmvcyiyzrx"; - }) - # TOREMOVE when > 0.33.1 - # youtube-dl has been abandonned and is now unusable w/ - # youtube.com. Mpv migrated to yt-dlp since the 0.33.1 but did not - # cut a new release yet. See - # https://github.com/mpv-player/mpv/pull/9209 - (fetchpatch { - url = "https://github.com/mpv-player/mpv/commit/d1c92bfd79ef81ac804fcc20aee2ed24e8d587aa.patch"; - sha256 = "1dwxzng3gsrx0gjljm5jmfcjz3pzdss9z2l0n25rmmb4nbcrcx1f"; - }) - ]; - postPatch = '' patchShebangs ./TOOLS/ ''; - - passthru = { - inherit - # The wrapper consults luaEnv and lua.version - luaEnv - lua - # In the wrapper, we want to reference vapoursynth which has the - # `python3` passthru attribute (which has the `sitePrefix` - # attribute). This way we'll be sure that in the wrapper we'll - # use the same python3.sitePrefix used to build vapoursynth. - vapoursynthSupport - vapoursynth - ; - }; - - NIX_LDFLAGS = optionalString x11Support "-lX11 -lXext " - + optionalString stdenv.isDarwin "-framework CoreFoundation"; + NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext " + + lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; wafConfigureFlags = [ "--enable-libmpv-shared" @@ -150,60 +136,71 @@ in stdenv.mkDerivation rec { "--disable-libmpv-static" "--disable-static-build" "--disable-build-date" # Purity - (enableFeature archiveSupport "libarchive") - (enableFeature cddaSupport "cdda") - (enableFeature dvdnavSupport "dvdnav") - (enableFeature openalSupport "openal") - (enableFeature sdl2Support "sdl2") - (enableFeature sixelSupport "sixel") - (enableFeature vaapiSupport "vaapi") - (enableFeature waylandSupport "wayland") - (enableFeature stdenv.isLinux "dvbin") + (lib.enableFeature archiveSupport "libarchive") + (lib.enableFeature cddaSupport "cdda") + (lib.enableFeature dvdnavSupport "dvdnav") + (lib.enableFeature openalSupport "openal") + (lib.enableFeature sdl2Support "sdl2") + (lib.enableFeature sixelSupport "sixel") + (lib.enableFeature vaapiSupport "vaapi") + (lib.enableFeature waylandSupport "wayland") + (lib.enableFeature stdenv.isLinux "dvbin") ] # Disable whilst Swift isn't supported ++ lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; nativeBuildInputs = [ - addOpenGLRunpath docutils perl pkg-config python3 wafHook which - ] ++ optional swiftSupport swift; + addOpenGLRunpath + docutils + perl + pkg-config + python3 + wafHook + which + ] ++ lib.optionals swiftSupport [ swift ]; buildInputs = [ - ffmpeg freetype libass libpthreadstubs - luaEnv libuchardet mujs - ] ++ optional alsaSupport alsa-lib - ++ optional archiveSupport libarchive - ++ optional bluraySupport libbluray - ++ optional bs2bSupport libbs2b - ++ optional cacaSupport libcaca - ++ optional cmsSupport lcms2 - ++ optional jackaudioSupport libjack2 - ++ optional libpngSupport libpng - ++ optional openalSupport openalSoft - ++ optional pulseSupport libpulseaudio - ++ optional rubberbandSupport rubberband - ++ optional screenSaverSupport libXScrnSaver - ++ optional sdl2Support SDL2 - ++ optional sixelSupport libsixel - ++ optional speexSupport speex - ++ optional theoraSupport libtheora - ++ optional vaapiSupport libva - ++ optional vapoursynthSupport vapoursynth - ++ optional vdpauSupport libvdpau - ++ optional xineramaSupport libXinerama - ++ optional xvSupport libXv - ++ optional zimgSupport zimg - ++ optional stdenv.isDarwin libiconv - ++ optional stdenv.isLinux nv-codec-headers - ++ optionals cddaSupport [ libcdio libcdio-paranoia ] - ++ optionals drmSupport [ libdrm mesa ] - ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] - ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] - ++ optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ] - ++ optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ] - ++ optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ]; + ffmpeg + freetype + libass + libpthreadstubs + libuchardet + luaEnv + mujs + ] ++ lib.optionals alsaSupport [ alsa-lib ] + ++ lib.optionals archiveSupport [ libarchive ] + ++ lib.optionals bluraySupport [ libbluray ] + ++ lib.optionals bs2bSupport [ libbs2b ] + ++ lib.optionals cacaSupport [ libcaca ] + ++ lib.optionals cddaSupport [ libcdio libcdio-paranoia ] + ++ lib.optionals cmsSupport [ lcms2 ] + ++ lib.optionals drmSupport [ libdrm mesa ] + ++ lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] + ++ lib.optionals jackaudioSupport [ libjack2 ] + ++ lib.optionals libpngSupport [ libpng ] + ++ lib.optionals openalSupport [ openalSoft ] + ++ lib.optionals pulseSupport [ libpulseaudio ] + ++ lib.optionals rubberbandSupport [ rubberband ] + ++ lib.optionals screenSaverSupport [ libXScrnSaver ] + ++ lib.optionals sdl2Support [ SDL2 ] + ++ lib.optionals sixelSupport [ libsixel ] + ++ lib.optionals speexSupport [ speex ] + ++ lib.optionals theoraSupport [ libtheora ] + ++ lib.optionals vaapiSupport [ libva ] + ++ lib.optionals vapoursynthSupport [ vapoursynth ] + ++ lib.optionals vdpauSupport [ libvdpau ] + ++ lib.optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ] + ++ lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] + ++ lib.optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ] + ++ lib.optionals xineramaSupport [ libXinerama ] + ++ lib.optionals xvSupport [ libXv ] + ++ lib.optionals zimgSupport [ zimg ] + ++ lib.optionals stdenv.isLinux [ nv-codec-headers ] + ++ lib.optionals stdenv.isDarwin [ libiconv ] + ++ lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ]; enableParallelBuilding = true; - postBuild = optionalString stdenv.isDarwin '' + postBuild = lib.optionalString stdenv.isDarwin '' python3 TOOLS/osxbundle.py -s build/mpv ''; @@ -219,28 +216,40 @@ in stdenv.mkDerivation rec { substituteInPlace $out/lib/pkgconfig/mpv.pc \ --replace "$out/include" "$dev/include" - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications cp -r build/mpv.app $out/Applications ''; # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. # See the explanation in addOpenGLRunpath. - postFixup = optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/bin/mpv ''; meta = with lib; { - description = "A media player that supports many video formats (MPlayer and mplayer2 fork)"; homepage = "https://mpv.io"; + description = "General-purpose media player, fork of MPlayer and mplayer2"; + longDescription = '' + mpv is a free and open-source general-purpose video player, based on the + MPlayer and mplayer2 projects, with great improvements above both. + ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; platforms = platforms.darwin ++ platforms.linux; + }; - longDescription = '' - mpv is a free and open-source general-purpose video player, - based on the MPlayer and mplayer2 projects, with great - improvements above both. - ''; + passthru = { + inherit + # The wrapper consults luaEnv and lua.version + luaEnv + lua + # In the wrapper, we want to reference vapoursynth which has the `python3` + # passthru attribute (which has the `sitePrefix` attribute). This way we'll + # be sure that in the wrapper we'll use the same python3.sitePrefix used to + # build vapoursynth. + vapoursynthSupport + vapoursynth + ; }; } diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index 984623ed7780a..6166ae10d4eba 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -1,8 +1,8 @@ # Arguments that this derivation gets when it is created with `callPackage` { stdenv , lib -, symlinkJoin , makeWrapper +, symlinkJoin , yt-dlp }: @@ -10,7 +10,7 @@ mpv: let - # arguments to the function (called `wrapMpv` in all-packages.nix) + # arguments to the function (exposed as `wrapMpv` in all-packages.nix) wrapper = { extraMakeWrapperArgs ? [], youtubeSupport ? true, diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 007ef4262ef2b..6d4e0f18d6fba 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , qmake , qtscript , wrapQtAppsHook @@ -8,14 +8,20 @@ stdenv.mkDerivation rec { pname = "smplayer"; - version = "21.1.0"; + version = "21.10.0"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-Y0uq32XoQ8fpIJDScRfA7p3RYd6x1PWZSsYyAYYKf/c="; + src = fetchFromGitHub { + owner = "smplayer-dev"; + repo = pname; + rev = "v${version}"; + hash = "sha256-p6036c8KX3GCINmkjHZlDLgHhLKri+t2WNWzP4KsSI8="; }; - nativeBuildInputs = [ qmake wrapQtAppsHook ]; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + buildInputs = [ qtscript ]; dontUseQmakeConfigure = true; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 27e414b12e2ac..88c17e8f4a31b 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -110,20 +110,25 @@ in }; noto-fonts-emoji = let - version = "2.028"; + version = "2.034"; emojiPythonEnv = python3.withPackages (p: with p; [ fonttools nototools ]); in stdenv.mkDerivation { pname = "noto-fonts-emoji"; - version = builtins.replaceStrings [ "_" ] [ "." ] version; + inherit version; src = fetchFromGitHub { owner = "googlefonts"; repo = "noto-emoji"; rev = "v${version}"; - sha256 = "0dy7px7wfl6bqkfzz82jm4gvbjp338ddsx0mwfl6m7z48l7ng4v6"; + sha256 = "1d6zzk0ii43iqfnjbldwp8sasyx99lbjp1nfgqjla7ixld6yp98l"; }; + makeFlags = [ + # TODO(@sternenseemann): remove if afdko is new enough to know about Unicode 14.0 + "BYPASS_SEQUENCE_CHECK=True" + ]; + nativeBuildInputs = [ cairo imagemagick @@ -166,31 +171,32 @@ in homepage = "https://github.com/googlefonts/noto-emoji"; license = with licenses; [ ofl asl20 ]; platforms = platforms.all; - maintainers = with maintainers; [ mathnerd314 ]; + maintainers = with maintainers; [ mathnerd314 sternenseemann ]; }; }; - noto-fonts-emoji-blob-bin = stdenv.mkDerivation rec { - pname = "noto-fonts-emoji-blob-bin"; - version = "2019-06-14-Emoji-12"; - - src = fetchurl { + noto-fonts-emoji-blob-bin = + let + pname = "noto-fonts-emoji-blob-bin"; + version = "14.0.1"; + in + fetchurl { + name = "${pname}-${version}"; url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf"; - sha256 = "0snvymglmvpnfgsriw2cnnqm0f4llav0jvzir6mpd17mqqhhabbh"; - }; + sha256 = "sha256-wSH9kRJ8y2i5ZDqzeT96dJcEJnHDSpU8bOhmxaT+UCg="; - dontUnpack = true; - - installPhase = '' - install -D $src $out/share/fonts/blobmoji/Blobmoji.ttf - ''; + downloadToTemp = true; + recursiveHash = true; + postFetch = '' + install -Dm 444 $downloadedFile $out/share/fonts/blobmoji/Blobmoji.ttf + ''; - meta = with lib; { - description = "Noto Emoji with extended Blob support"; - homepage = "https://github.com/C1710/blobmoji"; - license = with licenses; [ ofl asl20 ]; - platforms = platforms.all; - maintainers = with maintainers; [ rileyinman ]; + meta = with lib; { + description = "Noto Emoji with extended Blob support"; + homepage = "https://github.com/C1710/blobmoji"; + license = with licenses; [ ofl asl20 ]; + platforms = platforms.all; + maintainers = with maintainers; [ rileyinman jk ]; + }; }; - }; } diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 21c7b23537ecb..2745019762357 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mate-themes"; - version = "3.22.22"; + version = "3.22.23"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18crdwfpfm3br4pv94wy7rpmzzb69im4j8dgq1b7c8gcbbzay05x"; + sha256 = "1avgzccdmr7y18rnp3xrhwk82alv2dlig3wh7ivgahcqdiiavrb1"; }; nativeBuildInputs = [ pkg-config gettext gtk3 ]; diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index 5aebd6aef43a8..e379f5369f5b1 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "mate-tweak"; - version = "21.04.3"; + version = "21.10.0"; src = fetchFromGitHub { owner = "ubuntu-mate"; repo = pname; rev = version; - sha256 = "0vpzy7awhb1xfsdjsrchy5b9dygj4ixdcvgx5v5w8hllmi4yxpc1"; + sha256 = "0m61p6idajsrrbjps7s1pnl6nfzwpy7j6l9bdhqi9gaaij687shn"; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix index 7fec8fd3ff60d..1fd2fd8dc09e4 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix index e802e2eea5287..da5e9c49d2360 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix index 2654c4f9e7260..fdde25bd361df 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix index c33d6afad102b..f503b03a833c2 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix index 6941a6dd0ddf9..1c776f69e2dba 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix index 756b419434df3..a55a708b3726a 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix index d627fd9311f85..b9d706653065b 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix index 6663d9778bc2c..e248555a6d022 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix index b2bf2877c8a83..a7473710d14ba 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix index 738b31fe1d122..794545ea80a0b 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix index 5e2d42276ce7d..8468708699109 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix index c2a4085f730c8..67b50220ba2d0 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.hotspot; }; diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index f8e7c31353f74..6b8a251197d8c 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -3,7 +3,7 @@ , callPackage , fetchgit , ghcjsSrcJson ? null -, ghcjsSrc ? fetchgit (builtins.fromJSON (builtins.readFile ghcjsSrcJson)) +, ghcjsSrc ? fetchgit lib.importJSON ghcjsSrcJson , bootPkgs , stage0 , haskellLib diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix index 529be6e2a56e8..a0184eb94e580 100644 --- a/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -80,24 +80,24 @@ let + lib.optionalString (!withGui) "-core"; in stdenv.mkDerivation rec { - version = "1.8.13"; + version = "1.8.16"; name = "${flavor}-${version}"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = version; - sha256 = "0qg3qyj1b7wbaw2rsfly7nf3115h26nskl4ggrn6plhx272ni84p"; + sha256 = "sha256-6d+y0Lgr+h0qYpCsa/ihvSMNuAdRMNQRuxZFpkWLDvg="; }; - teensyduino_version = "153"; + teensyduino_version = "155"; teensyduino_src = fetchurl { url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}"; sha256 = { - linux64 = "02qgsj4h4zrjxkcclx7clsqbqd699kg0dq1xxa9hbj3vfnddjv1f"; - linux32 = "14xaff8xj176ih8ifdvxsly5xgjjm82dqbn7lqq81a43i0svjjyn"; - linuxarm = "0xpg9axa6dqyhccm9cpvsv2al7rgwy4gv2l8b2kffvn974dl5759"; - linuxaarch64 = "1lyn4zy4l5mml3c19fw6i2pk1ypnq6mgjmxmzk9d54wpf6n3j5dk"; + linux64 = "sha256-DypCbCm4RKYgnFJRwoHyPht6dFG48YvWM4RzEDdJE6U="; + linux32 = "sha256-MJ4xsTAZPO8BhO/VWSjBAjBVLrKM+3PNi1fiF8dsuVQ="; + linuxarm = "sha256-x5JdYflLThohos9RTAWt4XrzvksB7VWfXTKqgXZ1d6Q="; + linuxaarch64 = "sha256-N18nvavEMhvt2jOrdI+tsXtbWIdsj1n4aMVeaaBlcT4="; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; # Used because teensyduino requires jars be a specific size @@ -105,14 +105,13 @@ stdenv.mkDerivation rec { url = "https://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz"; sha256 = { - linux64 = "1bdlk51dqiyg5pw23hs8rfv8nrjqy0jqfl89h1466ahahpnd080v"; - linux32 = "0mgsw9wpwv1pgs2jslzflh7zf4ggqjgcd55hmdzrj0dvgkyw4cr2"; - linuxarm = "08n4lpak3i7yfyi0085j4nq14gb2n7zx85wl9drp8gaavxnfbp5f"; - linuxaarch64 = "0m4nhykzknm2hdpz1fhr2hbpncry53kvzs9y5lgj7rx3sy6ygbh7"; + linux64 = "sha256-VK+Skl2xjqPWYEEKt1CCLwBZRxoyRfYQ3/60Byen9po="; + linux32 = "sha256-fjqV4avddmWAdFqMuUNUcDguxv3SI45m5QHFiWP8EKE="; + linuxarm = "sha256-Br8vUN7njI7VCH+ZvUh44l8LcgW+61+Q0x2AiXxIhTM="; + linuxaarch64 = "sha256-bOizBUUuyINg0/EqEatBq9lECT97JXxKbesCGyCA3YQ="; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; - # the glib setup hook will populate GSETTINGS_SCHEMAS_PATH, # wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS # so 'save as...' works: diff --git a/pkgs/development/embedded/arduino/arduino-core/downloads.nix b/pkgs/development/embedded/arduino/arduino-core/downloads.nix index 76fa7664f0e09..14ce93d2c50a8 100644 --- a/pkgs/development/embedded/arduino/arduino-core/downloads.nix +++ b/pkgs/development/embedded/arduino/arduino-core/downloads.nix @@ -83,17 +83,17 @@ url = "https://github.com/arduino-libraries/SD/archive/1.2.4.zip"; sha256 = "123g9px9nqcrsx696wqwzjd5s4hr55nxgfz95b7ws3v007i1f3fz"; }; - "build/Servo-1.1.6.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Servo/archive/1.1.6.zip"; - sha256 = "1z9k9lxzj5d3f8h9hy86f4k5wgfr2a9zcvjh76qmpvv6clcv3js3"; + "build/Servo-1.1.8.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Servo/archive/1.1.8.zip"; + sha256 = "sha256-8mfRQG/HIRVvdiRApjMib6n1ENqAB63vGsxe6vwndeU="; }; "build/LiquidCrystal-1.0.7.zip" = fetchurl { url = "https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip"; sha256 = "1wrxrqz3n4yrj9j1a2b7pdd7a1rlyi974ra7crv5amjng8817x9n"; }; - "build/Adafruit_Circuit_Playground-1.10.4.zip" = fetchurl { - url = "https://github.com/adafruit/Adafruit_CircuitPlayground/archive/1.10.4.zip"; - sha256 = "194az5pxxzs0wg4ng7w0zqrdw93qdyv02y0q2yy57dr4kwfrm6nl"; + "build/Adafruit_Circuit_Playground-1.11.3.zip" = fetchurl { + url = "https://github.com/adafruit/Adafruit_CircuitPlayground/archive/1.11.3.zip"; + sha256 = "sha256-YL4ZAi9Fno+rG/bAdjxnXIglfZnbN6KpXFpj23Bf3LQ="; }; "build/libastylej-2.05.1-5.zip" = fetchurl { url = "https://downloads.arduino.cc/libastylej-2.05.1-5.zip"; @@ -103,20 +103,24 @@ url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.2-2.zip"; sha256 = "0sqzwp1lfjy452z3d4ma5c4blwsj7za72ymxf7crpq9dh9qd8f53"; }; - "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip" = fetchurl { - url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.10/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip"; - sha256 = "0bs5qdglsfc2q5c48m6wdjpzhz4ya4askh1g8364dp6p7jmg6w0d"; + "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.12.0.zip" = fetchurl { + url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.12.0/WiFi101-Updater-ArduinoIDE-Plugin-0.12.0.zip"; + sha256 = "sha256-6RM7Sr/tk5PVeonhzaa6WvRaz+7av+MhSYKPAinaOkg="; }; "build/avr-1.8.3.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/cores/avr-1.8.3.tar.bz2"; sha256 = "051wnc0nmsmxvvs4c79zvjag33yx5il2pz2j7qyjsxkp4jc9p2ny"; }; + "build/arduino-examples-1.9.1.zip" = fetchurl { + url = "https://github.com/arduino/arduino-examples/archive/refs/tags/1.9.1.zip"; + sha256 = "sha256-kAxIhYQ8P2ULTzQwi6bUXXEXJ53mKNgQxuwX3QYhNoQ="; + }; } // optionalAttrs (system == "x86_64-linux") { - "build/arduino-builder-linux64-1.5.4.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.5.4.tar.bz2"; - sha256 = "1cgvwlvxzzpjaj4njz1mrsif27l26dwkz9c7gbhdj0lvlk3xsa7s"; + "build/arduino-builder-linux64-1.6.1.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.6.1.tar.bz2"; + sha256 = "sha256-QUHuC+rE5vrMX8+Bkfuw+59UQdJAekeoaZd1Mch7UXE="; }; "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino7-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino7-x86_64-pc-linux-gnu.tar.bz2"; @@ -133,9 +137,9 @@ } // optionalAttrs (system == "i686-linux") { - "build/arduino-builder-linux32-1.5.2.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.5.2.tar.bz2"; - sha256 = "1slzw8fzxkqsp2izjisjd1rxxbqkrq6n72jc4frk5z2gdm6zfa0l"; + "build/arduino-builder-linux32-1.6.1.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.6.1.tar.bz2"; + sha256 = "sha256-GX2oGUGYYyatLroASBCBOGjsdCws06907O+O5Rz7Kls="; }; "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino5-i686-pc-linux-gnu.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-i686-pc-linux-gnu.tar.bz2"; @@ -152,9 +156,9 @@ } // optionalAttrs (system == "x86_64-darwin") { - "build/arduino-builder-macosx-1.5.2-signed.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.5.2-signed.tar.bz2"; - sha256 = "1pa795vwly1z9h1bp5qzbx2c2pq4n6p7ab5ivhmd3q89z0ywyqgz"; + "build/arduino-builder-macosx-1.6.1-signed.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.6.1-signed.tar.bz2"; + sha256 = "sha256-icMXwovzT2UQAKry9sWyRvcNxPXaFdltAPyW/DDVEFA="; }; "build/macosx/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2"; @@ -175,13 +179,13 @@ } // optionalAttrs (system == "aarch64-linux") { - "build/arduino-builder-linuxaarch64-1.5.2.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linuxaarch64-1.5.2.tar.bz2"; - sha256 = "14k7h7anjizbs2h04phw784slpfbi6hch9skvhy5ll805dmr24ci"; + "build/arduino-builder-linuxaarch64-1.6.1.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linuxaarch64-1.6.1.tar.bz2"; + sha256 = "sha256-BLcAIvGt0OQfjN87W1aLpLAQchhdFHoBqJPCcIWyHxQ="; }; - "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino5-aarch64-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-aarch64-pc-linux-gnu.tar.bz2"; - sha256 = "040cspc41iv59fb2g9fzc6w5523dvqa1bavxni7s8w731ccp176x"; + "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino7-aarch64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino7-aarch64-pc-linux-gnu.tar.bz2"; + sha256 = "sha256-A9Miud9toXKJ6efGIzw0qFNdnGRcGe/HcroZ5WkU8zk="; }; "build/linux/avrdude-6.3.0-arduino17-aarch64-pc-linux-gnu.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-aarch64-pc-linux-gnu.tar.bz2"; @@ -194,9 +198,9 @@ } // optionalAttrs (builtins.match "armv[67]l-linux" system != null) { - "build/arduino-builder-linuxarm-1.5.2.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.5.2.tar.bz2"; - sha256 = "1vs2s5px07jb2sdv83qxkf9lxmsy8j4dm7bn3vpw5dcjqd3qdyww"; + "build/arduino-builder-linuxarm-1.6.1.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.6.1.tar.bz2"; + sha256 = "sha256-VtJxhRaOOKdBxmTWjTYnSPAXl728hMksBKSKS49qiMU="; }; "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino5-arm-linux-gnueabihf.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-arm-linux-gnueabihf.tar.bz2"; diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index 12f7464f064e9..589a836967c05 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "24.1.3"; - sha256 = "sha256-l0+eZh4F/erY0ZKikUilRPiwkIhEL1Fb5BauR7gh+Ew="; + version = "24.1.4"; + sha256 = "sha256-QE2VRayIswVrAOv9/bq+ebv3xxIL3fFMnfm5u1Wh8j4="; } diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index fe06a64bcf565..db9e5be6f2ed5 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, fetchFromGitHub, fixDarwinDylibNames -, autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4 -, perl, python3, rapidjson, re2, snappy, thrift, tzdata , utf8proc, which +, autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, jemalloc +, lz4, perl, python3, rapidjson, re2, snappy, thrift, tzdata , utf8proc, which , zlib, zstd , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -31,22 +31,23 @@ in stdenv.mkDerivation rec { }; sourceRoot = "apache-arrow-${version}/cpp"; - ARROW_JEMALLOC_URL = fetchurl { + ARROW_JEMALLOC_URL = jemalloc.src; + + ARROW_MIMALLOC_URL = fetchFromGitHub { # From # ./cpp/cmake_modules/ThirdpartyToolchain.cmake # ./cpp/thirdparty/versions.txt - url = - "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2"; - hash = "sha256-NDMOXOJ2CZ4uiVDZM121qHVomkxqVnUe87HYxTf4h/Y="; + owner = "microsoft"; + repo = "mimalloc"; + rev = "v1.7.2"; + hash = "sha256-yHupYFgC8mJuLUSpuEAfwF7l6Ue4EiuO1Q4qN4T6wWc="; }; - ARROW_MIMALLOC_URL = fetchurl { - # From - # ./cpp/cmake_modules/ThirdpartyToolchain.cmake - # ./cpp/thirdparty/versions.txt - url = - "https://github.com/microsoft/mimalloc/archive/v1.7.2.tar.gz"; - hash = "sha256-sZEuNUVlpLaYQQ91g8D4OTSm27Ot5Uq33csVaTIJNr0="; + ARROW_XSIMD_URL = fetchFromGitHub { + owner = "xtensor-stack"; + repo = "xsimd"; + rev = "aeec9c872c8b475dedd7781336710f2dd2666cb2"; + hash = "sha256-vWKdJkieKhaxyAJhijXUmD7NmNvMWd79PskQojulA1w="; }; patches = [ @@ -119,11 +120,6 @@ in stdenv.mkDerivation rec { "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"; - ARROW_XSIMD_URL = fetchurl { - url = "https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz"; - sha256 = "09kvl962c6b0wnb7pb2n9dhvkflzwalgq6gwwi8628fgi9n1x10a"; - }; - doInstallCheck = true; ARROW_TEST_DATA = if doInstallCheck then "${arrow-testing}/data" else null; diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix index 92e5ad44b8717..39a75c5116223 100644 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -6,7 +6,6 @@ , aws-c-http , aws-c-io , cmake -, ninja , s2n-tls }: @@ -23,7 +22,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ninja ]; buildInputs = [ diff --git a/pkgs/development/libraries/cpptoml/default.nix b/pkgs/development/libraries/cpptoml/default.nix new file mode 100644 index 0000000000000..a3528444c6a15 --- /dev/null +++ b/pkgs/development/libraries/cpptoml/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, cmake, libcxxCmakeModule ? false }: + +stdenv.mkDerivation rec { + pname = "cpptoml"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "skystrife"; + repo = "cpptoml"; + rev = "fededad7169e538ca47e11a9ee9251bc361a9a65"; + sha256 = "0zlgdlk9nsskmr8xc2ajm6mn1x5wz82ssx9w88s02icz71mcihrx"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + # If this package is built with clang it will attempt to + # use libcxx via the Cmake find_package interface. + # The default libcxx stdenv in llvmPackages doesn't provide + # this and so will fail. + "-DENABLE_LIBCXX=${if libcxxCmakeModule then "ON" else "OFF"}" + "-DCPPTOML_BUILD_EXAMPLES=OFF" + ]; + + outputs = [ "out" ]; + + meta = with lib; { + description = "C++ TOML configuration library"; + homepage = "https://github.com/skystrife/cpptoml"; + license = licenses.mit; + maintainers = with maintainers; [ photex ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 3f78ef4041a68..571a2aa95fe1a 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation ({ BASH_SHELL = "/bin/sh"; # Used by libgcc, elf-header, and others to determine ABI - passthru = { inherit version; }; + passthru = { inherit version; minorRelease = version; }; } // (removeAttrs args [ "withLinuxHeaders" "withGd" ]) // diff --git a/pkgs/development/libraries/glibc/mtrace.nix b/pkgs/development/libraries/glibc/mtrace.nix new file mode 100644 index 0000000000000..fed24aff27966 --- /dev/null +++ b/pkgs/development/libraries/glibc/mtrace.nix @@ -0,0 +1,38 @@ +{ glibc, perl }: + +# Small wrapper which only exposes `mtrace(3)` from `glibc`. This can't be placed +# into `glibc` itself because it depends on Perl which would mean that the final +# `glibc` inside a stdenv bootstrap has a dependency `glibc -> perl -> bootstrap tools`, +# so this is now in its own package that isn't used for bootstrapping. +# +# `glibc` needs to be overridden here because it's still needed to `./configure` the source in order +# to have a build environment where we can call the needed make target. + +glibc.overrideAttrs ({ meta ? {}, ... }: { + pname = "glibc-mtrace"; + + buildPhase = '' + runHook preBuild + + mkdir malloc + make -C ../glibc-${glibc.minorRelease}/malloc objdir=`pwd` `pwd`/malloc/mtrace; + + runHook postBuild + ''; + + installPhase = '' + mkdir -p $out/bin + mv malloc/mtrace $out/bin/ + ''; + + # Perl interpreter used for `mtrace`. + buildInputs = [ perl ]; + + # Reset a few things declared by `pkgs.glibc`. + outputs = [ "out" ]; + separateDebugInfo = false; + + meta = meta // { + description = "Perl script used to interpret and provide human readable output of the trace log contained in the file mtracedata, whose contents were produced by mtrace(3)."; + }; +}) diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index d493f31d37506..9a5b0cbc77272 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -1,76 +1,76 @@ { lib , stdenv -, clang-tools -, grpc -, curl +, fetchFromGitHub +, abseil-cpp +, c-ares , cmake +, crc32c +, curl +, grpc +, gbenchmark +, gtest +, ninja +, nlohmann_json , pkg-config -, fetchFromGitHub -, doxygen , protobuf -, crc32c -, fetchurl -, openssl -, libnsl + # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173 +, apis ? [ "*" ] }: let + googleapisRev = "ed739492993c4a99629b6430affdd6c0fb59d435"; googleapis = fetchFromGitHub { owner = "googleapis"; repo = "googleapis"; - rev = "9c9f778aedde02f9826d2ae5d0f9c96409ba0f25"; - sha256 = "1gd3nwv8qf503wy6km0ad6akdvss9w5b1k3jqizy5gah1fkirkpi"; - }; - googleapis-cpp-cmakefiles = stdenv.mkDerivation rec { - pname = "googleapis-cpp-cmakefiles"; - version = "0.1.5"; - src = fetchFromGitHub { - owner = "googleapis"; - repo = "cpp-cmakefiles"; - rev = "v${version}"; - sha256 = "02zkcq2wl831ayd9qy009xvfx7q80pgycx7mzz9vknwd0nn6dd0n"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ grpc openssl protobuf ]; - - postPatch = '' - sed -e 's,https://github.com/googleapis/googleapis/archive/9c9f778aedde02f9826d2ae5d0f9c96409ba0f25.tar.gz,file://${googleapis},' \ - -i CMakeLists.txt - ''; - }; - _nlohmann_json = fetchurl { - url = "https://github.com/nlohmann/json/releases/download/v3.4.0/json.hpp"; - sha256 = "0pw3jpi572irbp2dqclmyhgic6k9rxav5mpp9ygbp9xj48gnvnk3"; + rev = googleapisRev; + hash = "sha256:1xrnh77vb8hxmf1ywqsifzd39kylhbdyah0b0b9bm7nw0mnahssl"; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "google-cloud-cpp"; - version = "0.14.0"; + version = "1.32.1"; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-cpp"; rev = "v${version}"; - sha256 = "15wci4m8h6py7fqfziq8mp5m6pxp2h1cbh5rp2k90mk5js4jb9pa"; + sha256 = "0g720sni70nlncv4spm4rlfykdkpjnv81axfz2jd1arpdajm0mg9"; }; - buildInputs = [ curl crc32c googleapis-cpp-cmakefiles grpc protobuf libnsl ]; - nativeBuildInputs = [ clang-tools cmake pkg-config doxygen ]; - - outputs = [ "out" "dev" ]; - postPatch = '' - sed -e 's,https://github.com/nlohmann/json/releases/download/v3.4.0/json.hpp,file://${_nlohmann_json},' \ - -i cmake/DownloadNlohmannJson.cmake + substituteInPlace external/googleapis/CMakeLists.txt \ + --replace "https://github.com/googleapis/googleapis/archive/${googleapisRev}.tar.gz" "file://${googleapis}" ''; + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + + buildInputs = [ + abseil-cpp + c-ares + crc32c + curl + grpc + gbenchmark + gtest + nlohmann_json + protobuf + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" + "-DBUILD_TESTING:BOOL=ON" + "-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF" + ] ++ lib.optionals (apis != [ "*" ]) [ + "-DGOOGLE_CLOUD_CPP_ENABLE=${lib.concatStringsSep ";" apis}" ]; meta = with lib; { license = with licenses; [ asl20 ]; homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ cpcloud ]; }; } diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index a44535fbf90ec..130fc60a12c90 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -5,7 +5,7 @@ }: let - release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-frog.json); + release = lib.importJSON ./release-info/LanguageMachines-frog.json; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix index 7e890a8d09c9a..61134a8ebfb3b 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -3,7 +3,7 @@ }: let - release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-frogdata.json); + release = lib.importJSON ./release-info/LanguageMachines-frogdata.json; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index fc5e622bcf4fb..3137d86468339 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -4,7 +4,7 @@ , languageMachines }: let - release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-libfolia.json); + release = lib.importJSON ./release-info/LanguageMachines-libfolia.json; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix index efa9ada7d56c9..49fc3c850ae8a 100644 --- a/pkgs/development/libraries/languagemachines/mbt.nix +++ b/pkgs/development/libraries/languagemachines/mbt.nix @@ -5,7 +5,7 @@ }: let - release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-mbt.json); + release = lib.importJSON ./release-info/LanguageMachines-mbt.json; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix index c09f00b1160b6..53bbd131bfaf4 100644 --- a/pkgs/development/libraries/languagemachines/ticcutils.nix +++ b/pkgs/development/libraries/languagemachines/ticcutils.nix @@ -3,7 +3,7 @@ , libxml2, zlib, bzip2, libtar }: let - release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-ticcutils.json); + release = lib.importJSON ./release-info/LanguageMachines-ticcutils.json; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix index de22c41ec4970..9ca0b080a21d0 100644 --- a/pkgs/development/libraries/languagemachines/timbl.nix +++ b/pkgs/development/libraries/languagemachines/timbl.nix @@ -5,7 +5,7 @@ }: let - release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-timbl.json); + release = lib.importJSON ./release-info/LanguageMachines-timbl.json; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix index 27812e8b3f051..42bc5edb43f7d 100644 --- a/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/pkgs/development/libraries/languagemachines/timblserver.nix @@ -5,7 +5,7 @@ }: let - release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-timblserver.json); + release = lib.importJSON ./release-info/LanguageMachines-timblserver.json; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix index d8c8d99552c84..429858256068d 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -5,7 +5,7 @@ }: let - release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-ucto.json); + release = lib.importJSON ./release-info/LanguageMachines-ucto.json; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index cad6362272499..7f8d4889c62e8 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -3,7 +3,7 @@ }: let - release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-uctodata.json); + release = lib.importJSON ./release-info/LanguageMachines-uctodata.json; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index dfb67b6a12a7a..00c595d1d2daf 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -213,11 +213,11 @@ stdenv.mkDerivation { # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb - ++ lib.optional enableCuda cudatoolkit ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; - propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; + propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy + ++ lib.optional enableCuda cudatoolkit; nativeBuildInputs = [ cmake pkg-config unzip ]; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 548b0df096bcf..10459d959b299 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -269,11 +269,11 @@ stdenv.mkDerivation { # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb - ++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ] ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; - propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; + propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy + ++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ]; nativeBuildInputs = [ cmake pkg-config unzip ]; diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index b4a2634867bc1..f55f9e83aec49 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.19"; + version = "1.0.20"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-LEXxqzHzTadgK2PV9Wiud9MzblDHdF4L5T4fVydRJW8="; + sha256 = "sha256-afyAHTyW9x2KxR1q/K3t5Dpv9OzATcYiSgiDn2S924E="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 741c6f4898b66..ca3e4a2436910 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "or-tools"; - version = "9.0"; + version = "9.1"; disabled = python.pythonOlder "3.6"; # not supported upstream src = fetchFromGitHub { owner = "google"; repo = "or-tools"; rev = "v${version}"; - sha256 = "0yihrsg8wj4b82xwg1hbn97my8zqd7xhw7dk7wm2axsyvqd6m3b3"; + sha256 = "sha256-dEYMPWpa3J9EqtCq3kubdUYJivNRTOKUpNDx3UC1IcQ="; }; # The original build system uses cmake which does things like pull diff --git a/pkgs/development/libraries/science/math/osqp/default.nix b/pkgs/development/libraries/science/math/osqp/default.nix index 00f2726f60fee..485ec06773bb4 100644 --- a/pkgs/development/libraries/science/math/osqp/default.nix +++ b/pkgs/development/libraries/science/math/osqp/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "osqp"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "oxfordcontrol"; repo = "osqp"; rev = "v${version}"; - sha256 = "1gwk1bqsk0rd85zf7xplbwq822y5pnxjmqc14jj6knqbab9afvrs"; + sha256 = "sha256-RYk3zuZrJXPcF27eMhdoZAio4DZ+I+nFaUEg1g/aLNk="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index d696961a4eb07..29ad55cacd3a7 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { "--enable-all" "--enable-base64encode" "--enable-pkcs11" + "--enable-writedup" "--enable-reproducible-build" "--enable-tls13" ]; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index b86189306b8ae..1f63b2cfc871b 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -4,11 +4,11 @@ lib.fix (self: stdenv.mkDerivation rec { pname = "xmlsec"; - version = "1.2.32"; + version = "1.2.33"; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "sha256-44NwKFMjYATlsI5CS4r+m1P+nzGqp6U4LznZUz63wEM="; + sha256 = "sha256-JgQdNaIKJF7Vovue4HXxCCVmTSdCIMtRkDQPqHpNCTE="; }; patches = [ diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 316c1ba8313e6..25a19d059f230 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -64,9 +64,9 @@ let addons = repoXmls.addons or []; }; in - builtins.fromJSON (builtins.readFile "${mkRepoJson repoXmlSpec}") + lib.importJSON "${mkRepoJson repoXmlSpec}" else - builtins.fromJSON (builtins.readFile repoJson); + lib.importJSON repoJson; # Converts all 'archives' keys in a repo spec to fetchurl calls. fetchArchives = attrSet: diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 7ec85d90f7d30..9249df059bf0b 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiogithubapi"; - version = "21.8.1"; + version = "21.11.0"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "1l59bb956gymi2dkgg88mr0nc80wqvw2dv69qf4f1xr3jxy03qa2"; + sha256 = "sha256-sxWgLd+oQv9qNOpyAYXsBcqGbo/ugNXzGF5nbdcNLFw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/editdistance/default.nix b/pkgs/development/python-modules/editdistance/default.nix index a831570363da1..41b20ca8969f3 100644 --- a/pkgs/development/python-modules/editdistance/default.nix +++ b/pkgs/development/python-modules/editdistance/default.nix @@ -13,8 +13,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "roy-ht"; repo = pname; - rev = version; - sha256 = "1qajskfyx2ki81ybksf0lgl1pdyw7al4ci39zrj66ylsn8fssg89"; + rev = "v${version}"; + sha256 = "17xkndwdyf14nfxk25z1qnhkzm0yxw65fpj78c01haq241zfzjr5"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/mrkd/default.nix b/pkgs/development/python-modules/mrkd/default.nix new file mode 100644 index 0000000000000..22cd93910d6b9 --- /dev/null +++ b/pkgs/development/python-modules/mrkd/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jinja2 +, mistune +, pygments +, setuptools +}: + +buildPythonPackage rec { + pname = "mrkd"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "456f8c1be99da268554b29c6b5383532e58119def5a65d85270bc6a0ecc26aaf"; + }; + + propagatedBuildInputs = [ jinja2 mistune pygments setuptools ]; + + pythonImportsCheck = [ "mrkd" ]; + + meta = with lib; { + description = "Write man pages using Markdown, and convert them to Roff or HTML"; + homepage = "https://github.com/refi64/mrkd"; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix index 97033224c14af..0d3716ca289eb 100644 --- a/pkgs/development/python-modules/nassl/default.nix +++ b/pkgs/development/python-modules/nassl/default.nix @@ -70,14 +70,14 @@ let in buildPythonPackage rec { pname = "nassl"; - version = "4.0.0"; + version = "4.0.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - hash = "sha256-6lk2YfI9km10YbJAn38fvo9qa4iXcByL+udCsDe+kvU="; + hash = "sha256-QzO7ABh2weBO6NVFIj7kZpS8ashbDGompuvdKteJeUc="; }; postPatch = let diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix index 32806004f767e..37b6fb75e9389 100644 --- a/pkgs/development/python-modules/pytautulli/default.nix +++ b/pkgs/development/python-modules/pytautulli/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytautulli"; - version = "21.10.0"; + version = "21.10.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "1gi1jalwzf1aykvdmdbvr7hvfch9wbbjra87f1vzdmkb5iiirw01"; + sha256 = "sha256-ckDqKPseOrGyWGvcPyj99cvQS+w4AHUkO4FHOIo9MDM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 49a2935655959..65553dc18834a 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , internetarchive , fetchPypi -, youtube-dl +, yt-dlp , docopt , isPy27 }: @@ -19,10 +19,12 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace setup.py --replace "docopt==0.6.2" "docopt" + substituteInPlace setup.py \ + --replace "docopt==0.6.2" "docopt" \ + --replace "internetarchive==2.0.3" "internetarchive" ''; - propagatedBuildInputs = [ internetarchive docopt youtube-dl ]; + propagatedBuildInputs = [ internetarchive docopt yt-dlp ]; pythonImportsCheck = [ "tubeup" ]; diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index ac389b0912d4f..1770472a2d8bf 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2021.10.7"; + version = "2021.11.0"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "sha256-xhJKgOOi5N2oxTpy5KlRtmtb2nepp/k7TvEppkIbtWA="; + sha256 = "sha256-4N1wamy0nqAmVezOd3kBicUAZXRob8gNA89N3fY1Y7o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index d06b362e2ce45..f389ebb4578e4 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -437,7 +437,10 @@ in "--with-xslt-include=${libxslt.dev}/include" "--with-exslt-lib=${libxslt.out}/lib" "--with-exslt-include=${libxslt.dev}/include" - ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; + ] ++ lib.optionals stdenv.isDarwin [ + "--with-iconv-dir=${libiconv}" + "--with-opt-include=${libiconv}/include" + ]; }; openssl = attrs: { diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 3e4c4e237cd3e..6195c5f376139 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.58.14"; + version = "0.58.15"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NbuhZkU3QYoqeVVh7/G6P+IeixuakD0+7QXU6YC1VN4="; + sha256 = "102f984x6hpfjcshqd6s26c0lxjyr8rq6q4bwh9ymvrsxsylj3ng"; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix index 92bbbd452145f..3a3a39b3eeeec 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix @@ -37,7 +37,7 @@ let srcDeps = lib.attrsets.attrValues srcDepsSet; srcDepsSet = let - srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); + srcs = lib.importJSON ./src-deps.json; toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { urls = d.urls; sha256 = d.sha256; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix index 5eb0926503c84..ee39a7c6f7b23 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix @@ -37,7 +37,7 @@ let srcDeps = lib.attrsets.attrValues srcDepsSet; srcDepsSet = let - srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); + srcs = lib.importJSON ./src-deps.json; toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { urls = d.urls; sha256 = d.sha256; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index fd29102b7e58f..1f51fceff3b55 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -37,7 +37,7 @@ let srcDeps = lib.attrsets.attrValues srcDepsSet; srcDepsSet = let - srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); + srcs = lib.importJSON ./src-deps.json; toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { urls = d.urls; sha256 = d.sha256; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 47e01c5ad807c..36f7ffb8a5d30 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -40,7 +40,7 @@ let srcDeps = lib.attrsets.attrValues srcDepsSet; srcDepsSet = let - srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); + srcs = lib.importJSON ./src-deps.json; toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { urls = d.urls; sha256 = d.sha256; diff --git a/pkgs/development/tools/build-managers/go-mk/default.nix b/pkgs/development/tools/build-managers/go-mk/default.nix new file mode 100644 index 0000000000000..f543d60da9572 --- /dev/null +++ b/pkgs/development/tools/build-managers/go-mk/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoPackage +, fetchFromGitHub +}: + +buildGoPackage rec { + pname = "go-mk"; + version = "0.pre+date=2015-03-24"; + + src = fetchFromGitHub { + owner = "dcjones"; + repo = "mk"; + rev = "73d1b31466c16d0a13a220e5fad7cd8ef6d984d1"; + hash = "sha256-fk2Qd3LDMx+RapKi1M9yCuxpS0IB6xlbEWW+H6t94AI="; + }; + + goPackagePath = "github.com/dcjones/mk"; + + meta = with lib; { + inherit (src.meta) homepage; + description = "A reboot of Plan9's mk, written in Go"; + longDescription = '' + Mk is a reboot of the Plan 9 mk command, which itself is a successor to + make. This tool is for anyone who loves make, but hates all its stupid + bullshit. + ''; + license = licenses.bsd2; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/build-managers/mk/builder.sh b/pkgs/development/tools/build-managers/mk/builder.sh deleted file mode 100644 index 73678ae9f5ccc..0000000000000 --- a/pkgs/development/tools/build-managers/mk/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup -installFlags="PREFIX=$out" -preInstall="mkdir -p $out/man/man1 $out/bin" -genericBuild diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix deleted file mode 100644 index afc0b6f1ec01d..0000000000000 --- a/pkgs/development/tools/build-managers/mk/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "mk"; - version = "unstable-2006-01-31"; - src = fetchurl { - url = "http://tarballs.nixos.org/${pname}-20060131.tar.gz"; - sha256 = "0za8dp1211bdp4584xb59liqpww7w1ql0cmlv34p9y928nibcxsr"; - }; - builder = ./builder.sh; - - meta = { - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix new file mode 100644 index 0000000000000..74b1caa2c0e67 --- /dev/null +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -0,0 +1,65 @@ +{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }: + +let + version = "0.0.7"; + assets = { + x86_64-darwin = { + asset = "scala-cli-x86_64-apple-darwin.gz"; + sha256 = "0v6vlmw1zrzvbpa59y4cfv74mx56lyx109vk9cb942pyiv0ia6gf"; + }; + x86_64-linux = { + asset = "scala-cli-x86_64-pc-linux.gz"; + sha256 = "1xdkvjfw550lpjw5fsrv7mbnx5i8ix8lrxcd31yipm8p9g4vjcdn"; + }; + }; +in +stdenv.mkDerivation { + pname = "scala-cli"; + inherit version; + nativeBuildInputs = [ autoPatchelfHook installShellFiles ]; + buildInputs = [ coreutils zlib stdenv.cc.cc ]; + src = + let + asset = assets."${stdenv.hostPlatform.system}" or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); + in + fetchurl { + url = "https://github.com/Virtuslab/scala-cli/releases/download/v${version}/${asset.asset}"; + sha256 = asset.sha256; + }; + + unpackPhase = '' + runHook preUnpack + gzip -d < $src > scala-cli + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + install -Dm755 scala-cli $out/bin/scala-cli + runHook postInstall + ''; + + # We need to call autopatchelf before generating completions + dontAutoPatchelf = true; + + postFixup = '' + autoPatchelf $out + + # hack to ensure the completion function looks right + # as $0 is used to generate the compdef directive + PATH="$out/bin:$PATH" + + installShellCompletion --cmd scala-cli \ + --bash <(scala-cli completions bash) \ + --zsh <(scala-cli completions zsh) + ''; + + meta = with lib; { + homepage = "https://scala-cli.virtuslab.org"; + downloadPage = "https://github.com/VirtusLab/scala-cli/releases/v${version}"; + license = licenses.asl20; + description = "Command-line tool to interact with the Scala language"; + maintainers = [ maintainers.kubukoz ]; + platforms = builtins.attrNames assets; + }; +} diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index fc074da137aca..a5b8540db45a7 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.8"; + version = "0.10.9"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-K/Pjo5VD9w4knelK0YwXFoZOzJDzjzlMjHF6fJZo524="; + outputHash = "sha256-Z0wngo7FP5sHpmPkTwitqTvNL0IEqqWwccy3mZpTIKU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 044a44c42fadc..824b9dc44d6ed 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.33.1"; + version = "0.34.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-n0VuzYlgn9IGiaxzDeuVjMqFbDwTe3UjExk7BT2DNZc="; + sha256 = "sha256-T8eFCFzDU0GTd7n141XKT34lRXoU2LOrl0Rlh1WLsmo="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index eafa2b7b85dcb..aea34c5d57c15 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "packer"; - version = "1.7.6"; + version = "1.7.8"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-nZeOtV6sbgzUhDOlWJ5eLzOh0gsaukXFrPg3y8x9ce4="; + sha256 = "sha256-VLHibkyuB8H2zfUCAuk7lBKbW5bl2kJOkwpo/iqsdm8="; }; - vendorSha256 = "sha256-zg4mVFvP/SciCLDF9FopqzeiE5dfpxfZJ6BYjcj2BZ0="; + vendorSha256 = "sha256-NB3oD4IB2xC9+d2eghPa1hnJM7Eop88zvRFlHdQDn38="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 0b38d1d8e2677..145ee75800240 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -51,7 +51,7 @@ let mkdir $out '' + (lib.concatStrings (lib.mapAttrsToList (name: grammar: "ln -s ${fetchGrammar grammar} $out/${name}\n") - (import ./grammars)))); + (import ./grammars { inherit lib; })))); builtGrammars = let diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index aa93298743601..a682f80692674 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -1,49 +1,51 @@ +{ lib }: + { - tree-sitter-agda = (builtins.fromJSON (builtins.readFile ./tree-sitter-agda.json)); - tree-sitter-bash = (builtins.fromJSON (builtins.readFile ./tree-sitter-bash.json)); - tree-sitter-c = (builtins.fromJSON (builtins.readFile ./tree-sitter-c.json)); - tree-sitter-c-sharp = (builtins.fromJSON (builtins.readFile ./tree-sitter-c-sharp.json)); - tree-sitter-clojure = (builtins.fromJSON (builtins.readFile ./tree-sitter-clojure.json)); - tree-sitter-comment = (builtins.fromJSON (builtins.readFile ./tree-sitter-comment.json)); - tree-sitter-cpp = (builtins.fromJSON (builtins.readFile ./tree-sitter-cpp.json)); - tree-sitter-css = (builtins.fromJSON (builtins.readFile ./tree-sitter-css.json)); - tree-sitter-dart = (builtins.fromJSON (builtins.readFile ./tree-sitter-dart.json)); - tree-sitter-dot = (builtins.fromJSON (builtins.readFile ./tree-sitter-dot.json)); - tree-sitter-elisp = (builtins.fromJSON (builtins.readFile ./tree-sitter-elisp.json)); - tree-sitter-embedded-template = (builtins.fromJSON (builtins.readFile ./tree-sitter-embedded-template.json)); - tree-sitter-fennel = (builtins.fromJSON (builtins.readFile ./tree-sitter-fennel.json)); - tree-sitter-fish = (builtins.fromJSON (builtins.readFile ./tree-sitter-fish.json)); - tree-sitter-fluent = (builtins.fromJSON (builtins.readFile ./tree-sitter-fluent.json)); - tree-sitter-go = (builtins.fromJSON (builtins.readFile ./tree-sitter-go.json)); - tree-sitter-haskell = (builtins.fromJSON (builtins.readFile ./tree-sitter-haskell.json)); - tree-sitter-html = (builtins.fromJSON (builtins.readFile ./tree-sitter-html.json)); - tree-sitter-java = (builtins.fromJSON (builtins.readFile ./tree-sitter-java.json)); - tree-sitter-javascript = (builtins.fromJSON (builtins.readFile ./tree-sitter-javascript.json)); - tree-sitter-jsdoc = (builtins.fromJSON (builtins.readFile ./tree-sitter-jsdoc.json)); - tree-sitter-json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json)); - tree-sitter-julia = (builtins.fromJSON (builtins.readFile ./tree-sitter-julia.json)); - tree-sitter-latex = (builtins.fromJSON (builtins.readFile ./tree-sitter-latex.json)); - tree-sitter-lua = (builtins.fromJSON (builtins.readFile ./tree-sitter-lua.json)); - tree-sitter-make = (builtins.fromJSON (builtins.readFile ./tree-sitter-make.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)); - tree-sitter-ql = (builtins.fromJSON (builtins.readFile ./tree-sitter-ql.json)); - tree-sitter-regex = (builtins.fromJSON (builtins.readFile ./tree-sitter-regex.json)); - tree-sitter-rst = (builtins.fromJSON (builtins.readFile ./tree-sitter-rst.json)); - tree-sitter-ruby = (builtins.fromJSON (builtins.readFile ./tree-sitter-ruby.json)); - tree-sitter-rust = (builtins.fromJSON (builtins.readFile ./tree-sitter-rust.json)); - tree-sitter-scala = (builtins.fromJSON (builtins.readFile ./tree-sitter-scala.json)); - tree-sitter-svelte = (builtins.fromJSON (builtins.readFile ./tree-sitter-svelte.json)); - tree-sitter-swift = (builtins.fromJSON (builtins.readFile ./tree-sitter-swift.json)); - tree-sitter-toml = (builtins.fromJSON (builtins.readFile ./tree-sitter-toml.json)); - tree-sitter-tsq = (builtins.fromJSON (builtins.readFile ./tree-sitter-tsq.json)); - tree-sitter-typescript = (builtins.fromJSON (builtins.readFile ./tree-sitter-typescript.json)); - tree-sitter-verilog = (builtins.fromJSON (builtins.readFile ./tree-sitter-verilog.json)); - tree-sitter-vim = (builtins.fromJSON (builtins.readFile ./tree-sitter-vim.json)); - tree-sitter-yaml = (builtins.fromJSON (builtins.readFile ./tree-sitter-yaml.json)); - tree-sitter-zig = (builtins.fromJSON (builtins.readFile ./tree-sitter-zig.json)); + tree-sitter-agda = lib.importJSON ./tree-sitter-agda.json; + tree-sitter-bash = lib.importJSON ./tree-sitter-bash.json; + tree-sitter-c = lib.importJSON ./tree-sitter-c.json; + tree-sitter-c-sharp = lib.importJSON ./tree-sitter-c-sharp.json; + tree-sitter-clojure = lib.importJSON ./tree-sitter-clojure.json; + tree-sitter-comment = lib.importJSON ./tree-sitter-comment.json; + tree-sitter-cpp = lib.importJSON ./tree-sitter-cpp.json; + tree-sitter-css = lib.importJSON ./tree-sitter-css.json; + tree-sitter-dart = lib.importJSON ./tree-sitter-dart.json; + tree-sitter-dot = lib.importJSON ./tree-sitter-dot.json; + tree-sitter-elisp = lib.importJSON ./tree-sitter-elisp.json; + tree-sitter-embedded-template = lib.importJSON ./tree-sitter-embedded-template.json; + tree-sitter-fennel = lib.importJSON ./tree-sitter-fennel.json; + tree-sitter-fish = lib.importJSON ./tree-sitter-fish.json; + tree-sitter-fluent = lib.importJSON ./tree-sitter-fluent.json; + tree-sitter-go = lib.importJSON ./tree-sitter-go.json; + tree-sitter-haskell = lib.importJSON ./tree-sitter-haskell.json; + tree-sitter-html = lib.importJSON ./tree-sitter-html.json; + tree-sitter-java = lib.importJSON ./tree-sitter-java.json; + tree-sitter-javascript = lib.importJSON ./tree-sitter-javascript.json; + tree-sitter-jsdoc = lib.importJSON ./tree-sitter-jsdoc.json; + tree-sitter-json = lib.importJSON ./tree-sitter-json.json; + tree-sitter-julia = lib.importJSON ./tree-sitter-julia.json; + tree-sitter-latex = lib.importJSON ./tree-sitter-latex.json; + tree-sitter-lua = lib.importJSON ./tree-sitter-lua.json; + tree-sitter-make = lib.importJSON ./tree-sitter-make.json; + tree-sitter-markdown = lib.importJSON ./tree-sitter-markdown.json; + tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json; + tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json; + tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json; + tree-sitter-php = lib.importJSON ./tree-sitter-php.json; + tree-sitter-python = lib.importJSON ./tree-sitter-python.json; + tree-sitter-ql = lib.importJSON ./tree-sitter-ql.json; + tree-sitter-regex = lib.importJSON ./tree-sitter-regex.json; + tree-sitter-rst = lib.importJSON ./tree-sitter-rst.json; + tree-sitter-ruby = lib.importJSON ./tree-sitter-ruby.json; + tree-sitter-rust = lib.importJSON ./tree-sitter-rust.json; + tree-sitter-scala = lib.importJSON ./tree-sitter-scala.json; + tree-sitter-svelte = lib.importJSON ./tree-sitter-svelte.json; + tree-sitter-swift = lib.importJSON ./tree-sitter-swift.json; + tree-sitter-toml = lib.importJSON ./tree-sitter-toml.json; + tree-sitter-tsq = lib.importJSON ./tree-sitter-tsq.json; + tree-sitter-typescript = lib.importJSON ./tree-sitter-typescript.json; + tree-sitter-verilog = lib.importJSON ./tree-sitter-verilog.json; + tree-sitter-vim = lib.importJSON ./tree-sitter-vim.json; + tree-sitter-yaml = lib.importJSON ./tree-sitter-yaml.json; + tree-sitter-zig = lib.importJSON ./tree-sitter-zig.json; } diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index bb1736b3ce716..5ebd08dca02c2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -261,7 +261,7 @@ let ${foreachSh allGrammars ({name, ...}: '' # indentation hack - printf " %s = (builtins.fromJSON (builtins.readFile ./%s.json));\n" "${name}" "${name}"'')} + printf " %s = lib.importJSON ./%s.json;\n" "${name}" "${name}"'')} echo "}" ) \ > "$outputDir/default.nix" ''; diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 71977d1a74efd..e5b5f9b06076a 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.76.0"; + version = "0.85.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-yfTfWMyRo1QP0QCbJOxNC1eAYmJQ/yKvWjThXd7r7Bc="; + sha256 = "sha256-I2t5tuBlO2RpY8+zWSTIDOziriqE6PGKVIwPdmvXuKo="; }; - vendorSha256 = "sha256-dD+8ZraY0RvoGxJZSWG31Iif+R5CDNtQ9H7J8Ty0x7U="; + vendorSha256 = "sha256-V7iXPM2WTR5zls/EFxpoLKrconP88om6y2CFNiuS6g4="; meta = with lib; { homepage = "https://www.planetscale.com/"; diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index aaffa4f821301..344ab9fe9f740 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.23"; + version = "1.0.24"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "1drjngcqkaahzk92jysrzv86fhj02c074xffd7kn3k6q8fxc0976"; + sha256 = "sha256-/blukivL6+xsnChxDp5gCr5w8S3bBuhO459YkLGxYmA="; fetchSubmodules = true; }; diff --git a/pkgs/development/web/netlify-cli/default.nix b/pkgs/development/web/netlify-cli/default.nix index f16cce4c15111..6c3e8dd4e86ed 100644 --- a/pkgs/development/web/netlify-cli/default.nix +++ b/pkgs/development/web/netlify-cli/default.nix @@ -6,7 +6,7 @@ in preRebuild = '' export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild" ''; - src = fetchFromGitHub (builtins.fromJSON (builtins.readFile ./netlify-cli.json)); + src = fetchFromGitHub (lib.importJSON ./netlify-cli.json); bypassCache = true; reconstructLock = true; passthru.tests.test = callPackage ./test.nix { }; diff --git a/pkgs/development/web/netlify-cli/generate.sh b/pkgs/development/web/netlify-cli/generate.sh index 41858cd980973..5d12fde8689e7 100755 --- a/pkgs/development/web/netlify-cli/generate.sh +++ b/pkgs/development/web/netlify-cli/generate.sh @@ -2,7 +2,7 @@ set -eu -o pipefail cd "$( dirname "${BASH_SOURCE[0]}" )" rm -f ./node-env.nix -src="$(nix-build --expr '(import ../../../.. {}).fetchFromGitHub (builtins.fromJSON (builtins.readFile ./netlify-cli.json))')" +src="$(nix-build --expr '(import ../../../.. {}).fetchFromGitHub (lib.importJSON ./netlify-cli.json)')" echo $src node2nix \ --input $src/package.json \ diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 7b88b0f8fd372..3f0f0e78e07a1 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,5 +1,7 @@ { lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser , pkg-config, which +# for `.pkgs` attribute +, callPackage # Updater dependencies , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell , gnupg @@ -40,9 +42,7 @@ let (builtins.attrNames sharedLibDeps); extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; -in - - stdenv.mkDerivation { + self = stdenv.mkDerivation { inherit version; name = "${baseName}-${version}"; @@ -83,6 +83,10 @@ in passthru.interpreterName = "nodejs"; + passthru.pkgs = callPackage ../../node-packages/default.nix { + nodejs = self; + }; + setupHook = ./setup-hook.sh; pos = builtins.unsafeGetAttrPos "version" args; @@ -147,4 +151,5 @@ in }; passthru.python = python; # to ensure nodeEnv uses the same version -} + }; +in self diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 7fd3dc61dd42d..4f9688c844ff4 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -95,7 +95,7 @@ let (lib.attrNames self.df-hashes)); self = rec { - df-hashes = builtins.fromJSON (builtins.readFile ./game.json); + df-hashes = lib.importJSON ./game.json; # Aliases for the latest Dwarf Fortress and the selected Therapist install dwarf-fortress = getAttr (versionToName latestVersion) df-games; diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index bf1dc1c95732b..25a6d6befad13 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,6 +1,6 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config, git -, qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng -, ffmpeg, libevdev, libusb1, zlib, curl, python3 +{ gcc11Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git +, qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng +, ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers , sdl2Support ? true, SDL2 , pulseaudioSupport ? true, libpulseaudio , waylandSupport ? true, wayland @@ -8,21 +8,23 @@ }: let - majorVersion = "0.0.16"; - gitVersion = "12235-a4f4b81e6"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) + majorVersion = "0.0.19"; + gitVersion = "12975-37383f421"; in -mkDerivation { +gcc11Stdenv.mkDerivation { pname = "rpcs3"; version = "${majorVersion}-${gitVersion}"; src = fetchFromGitHub { owner = "RPCS3"; repo = "rpcs3"; - rev = "a4f4b81e6b0c00f4c30f9f5f182e5fe56f9fb03c"; + rev = "37383f4217e1c510a543e100d0ca495800b3361a"; fetchSubmodules = true; - sha256 = "1d70nljl1kmpbk50jpjki7dglw1bbxd7x4qzg6nz5np2sdsbpckd"; + sha256 = "1pm1r4j4cdcmr8xmslyv2n6iwcjldnr396by4r6lgf4mdlnwahhm"; }; + passthru.updateScript = ./update.sh; + preConfigure = '' cat > ./rpcs3/git-version.h <<EOF #define RPCS3_GIT_VERSION "${gitVersion}" @@ -38,16 +40,18 @@ mkDerivation { "-DUSE_SYSTEM_LIBPNG=ON" "-DUSE_SYSTEM_FFMPEG=ON" "-DUSE_SYSTEM_CURL=ON" - # NB: Can't use this yet, our CMake doesn't include FindWolfSSL.cmake - #"-DUSE_SYSTEM_WOLFSSL=ON" + "-DUSE_SYSTEM_WOLFSSL=ON" + "-DUSE_SYSTEM_FAUDIO=ON" + "-DUSE_SYSTEM_PUGIXML=ON" + "-DUSE_SYSTEM_FLATBUFFERS=ON" "-DUSE_NATIVE_INSTRUCTIONS=OFF" ]; - nativeBuildInputs = [ cmake pkg-config git ]; + nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook ]; buildInputs = [ - qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg - libevdev zlib libusb1 curl python3 + qtbase qtquickcontrols qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg + libevdev zlib libusb1 curl wolfssl python3 pugixml faudio flatbuffers ] ++ lib.optional sdl2Support SDL2 ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional alsaSupport alsa-lib @@ -56,7 +60,7 @@ mkDerivation { meta = with lib; { description = "PS3 emulator/debugger"; homepage = "https://rpcs3.net/"; - maintainers = with maintainers; [ abbradar neonfuz ilian ]; + maintainers = with maintainers; [ abbradar neonfuz ilian zane ]; license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/misc/emulators/rpcs3/update.sh b/pkgs/misc/emulators/rpcs3/update.sh new file mode 100755 index 0000000000000..05be4dfeda1de --- /dev/null +++ b/pkgs/misc/emulators/rpcs3/update.sh @@ -0,0 +1,56 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p gnused jq nix-prefetch-git curl + +set -eou pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" +if [[ ! "$(basename $ROOT)" == "rpcs3" || ! -f "$ROOT/default.nix" ]]; then + echo "ERROR: Not in the rpcs3 folder" + exit 1 +fi + +if [[ ! -v GITHUB_TOKEN ]]; then + echo "ERROR: \$GITHUB_TOKEN not set" + exit 1 +fi + +PAYLOAD=$(jq -cn --rawfile query /dev/stdin '{"query": $query}' <<EOF | curl -s -H "Authorization: bearer $GITHUB_TOKEN" -d '@-' https://api.github.com/graphql +{ + repository(owner: "RPCS3", name: "rpcs3") { + branch: ref(qualifiedName: "refs/heads/master") { + target { + oid + ... on Commit { + history { + totalCount + } + } + } + } + + tag: refs(refPrefix: "refs/tags/", first: 1, orderBy: {field: TAG_COMMIT_DATE, direction: DESC}) { + nodes { + name + } + } + } +} +EOF +) +RPCS3_COMMIT=$(jq -r .data.repository.branch.target.oid <<< "$PAYLOAD") +RPCS3_MAJORVER=$(jq -r .data.repository.tag.nodes[0].name <<< "$PAYLOAD" | sed 's/^v//g') +RPCS3_COUNT=$(jq -r .data.repository.branch.target.history.totalCount <<< "$PAYLOAD") + +RPCS3_GITVER="$RPCS3_COUNT-${RPCS3_COMMIT::9}" +echo "INFO: Latest commit is $RPCS3_COMMIT" +echo "INFO: Latest version is $RPCS3_MAJORVER-$RPCS3_GITVER" + +RPCS3_SHA256=$(nix-prefetch-git --quiet --fetch-submodules https://github.com/RPCS3/rpcs3.git "$RPCS3_COMMIT" | jq -r .sha256) +echo "INFO: SHA256 is $RPCS3_SHA256" + +sed -i -E \ + -e "s/majorVersion\s+.+$/majorVersion = \"${RPCS3_MAJORVER}\";/g" \ + -e "s/gitVersion\s+.+$/gitVersion = \"${RPCS3_GITVER}\";/g" \ + -e "s/rev\s*=\s*\"[a-z0-9]+\";$/rev = \"${RPCS3_COMMIT}\";/g" \ + -e "s/sha256\s*=\s*\"[a-z0-9]+\";$/sha256 = \"${RPCS3_SHA256}\";/g" \ + "$ROOT/default.nix" diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 3c7d5c29770f1..647185c8b9ba2 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -19,14 +19,14 @@ in rec { ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { - version = "2.47.1"; + version = "2.47.2"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi"; - sha256 = "0ld03pjm65xkpgqkvfsmk6h9krjsqbgxw4b8rvl2fj20j8l0w2zh"; + sha256 = "07d6nrk2g0614kvwdjym1wq21d2bwy3pscwikk80qhnd6rrww875"; }; gecko64 = fetchurl rec { - version = "2.47.1"; + version = "2.47.2"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi"; - sha256 = "0jj7azmpy07319238g52a8m4nkdwj9g010i355ykxnl8m5wjwcb9"; + sha256 = "0iffhvdawc499nbn4k99k33cr7g8sdfcvq8k3z1g6gw24h87d5h5"; }; ## see http://wiki.winehq.org/Mono diff --git a/pkgs/misc/screensavers/pipes-rs/default.nix b/pkgs/misc/screensavers/pipes-rs/default.nix index 22443dc11732e..3e2f4179d8edc 100644 --- a/pkgs/misc/screensavers/pipes-rs/default.nix +++ b/pkgs/misc/screensavers/pipes-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pipes-rs"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "lhvy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BC6QqSZ7siDVSO8oOH7DimTe6RFnCBygmvtPrQgsC/Q="; + sha256 = "sha256-HtwUYYQqldEtE9VkQAJscW8jp/u8Cb4/G5d2uqanOjI="; }; - cargoSha256 = "sha256-nctkc2vDE7WXm84g/EkGKc1/ju/Xy9d/nc8NPIVFl58="; + cargoSha256 = "sha256-o/aPB0jfZfg2sDkgCBlLlCK3gbjjHZeiG8OxRXKXJyY="; doInstallCheck = true; diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/misc/vim-plugins/aliases.nix index b880c15d790a6..8f3308a122be0 100644 --- a/pkgs/misc/vim-plugins/aliases.nix +++ b/pkgs/misc/vim-plugins/aliases.nix @@ -32,7 +32,7 @@ let deprecations = lib.mapAttrs (old: info: throw "${old} was renamed to ${info.new} on ${info.date}. Please update to ${info.new}." - ) (builtins.fromJSON (builtins.readFile ./deprecated.json)); + ) (lib.importJSON ./deprecated.json); in mapAliases (with prev; { diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix index 8683da040d731..393ea0f44502b 100644 --- a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix @@ -13,7 +13,7 @@ let # Get as close as possible as the `package.json` required version. # This is what drives omnisharp. - rtDepsSrcsFromJson = builtins.fromJSON (builtins.readFile ./rt-deps-bin-srcs.json); + rtDepsSrcsFromJson = lib.importJSON ./rt-deps-bin-srcs.json; rtDepsBinSrcs = builtins.mapAttrs (k: v: let diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index e21530cba4fa8..f28f6c0cef556 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.14.15"; + version = "5.14.16"; release = "1"; suffix = "xanmod${release}-cacule"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-Z0A2D2t9rDUav4VpG3XdI13LConfWWs7PtsVfLyEQI8="; + sha256 = "sha256-ro7WnN0BPxW/8sajUyGTnvmbemKJEadSBcFmjZ+Wtrs="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 5b354bee7aad3..adb46db59af98 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/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.14-zen1"; + modDirVersion = "5.14.15-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-cW3i672F7dmU3tzR1cJCkrm8T6F9uYt4DyMFDL37Fpo="; + sha256 = "sha256-2nShtZodkPBCbGdK0dI+RGTRS5/JOUP/7//L//MJI4c="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index b818ddc5f2ac9..f64a0a0ef158f 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -53,7 +53,7 @@ extra = src.extra; inherit version sha256; }; - patches = builtins.fromJSON (builtins.readFile ./hardened/patches.json); + patches = lib.importJSON ./hardened/patches.json; in lib.mapAttrs mkPatch patches; # https://bugzilla.kernel.org/show_bug.cgi?id=197591#c6 diff --git a/pkgs/os-specific/linux/msr/000-include-sysmacros.patch b/pkgs/os-specific/linux/msr/000-include-sysmacros.patch new file mode 100644 index 0000000000000..5fa96cd146997 --- /dev/null +++ b/pkgs/os-specific/linux/msr/000-include-sysmacros.patch @@ -0,0 +1,11 @@ +diff -Naur msr-old/msr.c msr-20060208/msr.c +--- msr-old/msr.c 1969-12-31 21:00:01.000000000 -0300 ++++ msr-20060208/msr.c 2021-11-02 21:19:34.576722617 -0300 +@@ -19,6 +19,7 @@ + #include <stdio.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <fcntl.h> + #include <errno.h> + #include <unistd.h> diff --git a/pkgs/os-specific/linux/msr/default.nix b/pkgs/os-specific/linux/msr/default.nix new file mode 100644 index 0000000000000..0ffc460120965 --- /dev/null +++ b/pkgs/os-specific/linux/msr/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchzip +, installShellFiles +}: + +stdenv.mkDerivation rec { + pname = "msr"; + version = "20060208"; + + src = fetchzip { + name = "${pname}-${version}"; + url = "http://www.etallen.com/msr/${pname}-${version}.src.tar.gz"; + hash = "sha256-e01qYWbOALkXp5NpexuVodMxA3EBySejJ6ZBpZjyT+E="; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + patches = [ + ./000-include-sysmacros.patch + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin/ + cp msr $out/bin/ + installManPage msr.man + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://www.etallen.com/msr.html"; + description = "Linux tool to display or modify x86 model-specific registers (MSRs)"; + license = licenses.bsd0; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index e8912f4b5374a..dddc7f42d884f 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -97,7 +97,7 @@ let "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; "addons/mp3" = mp3-202; }; - }) (builtins.fromJSON (builtins.readFile ./versions.json)); + }) (lib.importJSON ./versions.json); in { # Supported releases (as of 2020-10-26). diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index bdc0377038ae3..8331f888b4674 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "21.08.2.1"; + version = "21.08.3.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1nx5j82hvcifq6j59b8pm5dxmxhb2820kicfkl0gbyw63yx1izjn"; + sha256 = "0riynmdmq44hqjdfd8acvc14miy5yqbwvsmbm1xcgsjdxjan8l2z"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index a461608badf08..ecd3063e09341 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -11,6 +11,7 @@ , lib , libgmpris , llvmPackages_10 +, mpg123 , rpmextract , wavpack @@ -44,11 +45,11 @@ let in stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.26.2-69"; + version = "4.27.0-70"; src = fetchurl { - url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm"; - sha256 = "sha256-zxUVtOi4fN3EuCbzH/SEse24Qz7/0jozzDX1yW8bhCU="; + url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}sse42.fc34.x86_64.rpm"; + sha256 = "sha256-12EMKkMMMcQZwgvK0YjuHknv2JLqU3REcJUTPUmYZ6A="; }; unpackPhase = '' @@ -68,6 +69,7 @@ stdenv.mkDerivation rec { gupnp-av_0_12 libgmpris llvmPackages_10.openmp + mpg123 wavpack ]; diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index f8d49770370f6..75d08caf3a214 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2021-09-03"; + version = "unstable-2021-09-21"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "c84956befe88daeeb9512acaa9fa82395665df16"; - sha256 = "sha256-dHFIeA2RCoqC0ROYUUbSoLZ4frRWBJaNJWohpK8xN7I="; + rev = "0b918b357cb0c282d53cbdf59e1931a2054cd60a"; + sha256 = "sha256-vUhP71vZ5XFG7MDkPFpAcCUL4kIdzHJ1hAkwqIi6ksQ="; }; # We have no LTO on i686 since commit 22284b0 diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 7fba57a94be65..693d5fc280fce 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2021-09-15T04-54-25Z"; + version = "2021-10-27T16-29-42Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-h1RuYRduCZFCklwa/gvkTZXTi71UDb8ofMPb+X9KIuA="; + sha256 = "sha256-U/1NuWyNX0OUrtysV3ShvbyxiSiYzMFNK3lmAVs6D3Y="; }; - vendorSha256 = "sha256-ccqa5ltblk1Z/RRJkC1h+EpkxylWdKXfNRYOeOzrPb4="; + vendorSha256 = "sha256-GLooogUglKxEk7X9UI4VZvj+mJ9LXLZEjFsxCpzm61I="; doCheck = false; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index d97a5df42e19d..16a47795d3e77 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -5,14 +5,16 @@ , fetchurl , ffmpeg , freetype +, icu66 +, krb5 , lib , makeWrapper , stdenv -, zlib +, openssl }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-831"; + version = "1.8-846"; src = let @@ -20,47 +22,67 @@ stdenv.mkDerivation rec { in fetchurl { url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - sha256 = "sha256-SeMSC7K6DV7rVr1w/SqMnLvipoWbypS/gJnSZmpfXZk="; + sha256 = "sha256-BoHvODaAcK5b4/syOm3vpOTpq9ETovpWKUqG+UGr2e0="; }; buildInputs = [ alsa-lib - alsa-utils - cifs-utils - ffmpeg freetype - zlib + krb5 + stdenv.cc.cc.lib ]; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - installPhase = '' - runHook preInstall - mkdir -p $out - mv * $out - runHook postInstall - ''; + propagatedBuildInputs = [ alsa-utils cifs-utils ffmpeg ]; - postFixup = + installPhase = let - linkFix = bin: '' - sed -i '/ulimit/d' ${bin} - sed -i '/ln -sf/d' ${bin} - ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin} - ''; - wrapFix = bin: '' - wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsa-utils cifs-utils ffmpeg ]} + # NB: While this might seem like odd behavior, it's what Roon expects. The + # tarball distribution provides scripts that do a bunch of nonsense on top + # of what wrapBin is doing here, so consider it the lesser of two evils. + # I didn't bother checking whether the symlinks are really necessary, but + # I wouldn't put it past Roon to have custom code based on the binary + # name, so we're playing it safe. + wrapBin = binPath: '' + ( + binDir="$(dirname "${binPath}")" + binName="$(basename "${binPath}")" + dotnetDir="$out/RoonDotnet" + + ln -sf "$dotnetDir/dotnet" "$dotnetDir/$binName" + rm "${binPath}" + makeWrapper "$dotnetDir/$binName" "${binPath}" \ + --add-flags "$binDir/$binName.dll" \ + --argv0 "$binName" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ icu66 openssl ]}" \ + --prefix PATH : "$dotnetDir" \ + --run "cd $binDir" \ + --set DOTNET_ROOT "$dotnetDir" + ) ''; in '' - ${linkFix "$out/Appliance/RAATServer"} - ${linkFix "$out/Appliance/RoonAppliance"} - ${linkFix "$out/Server/RoonServer"} + runHook preInstall + mkdir -p $out + mv * $out + + rm $out/check.sh + rm $out/start.sh + rm $out/VERSION + + ${wrapBin "$out/Appliance/RAATServer"} + ${wrapBin "$out/Appliance/RoonAppliance"} + ${wrapBin "$out/Server/RoonServer"} + + mkdir -p $out/bin + makeWrapper "$out/Server/RoonServer" "$out/bin/RoonServer" --run "cd $out" + + # This is unused and depends on an ancient version of lttng-ust, so we + # just patch it out + patchelf --remove-needed liblttng-ust.so.0 $out/RoonDotnet/shared/Microsoft.NETCore.App/5.0.0/libcoreclrtraceptprovider.so - sed -i '/which avconv/c\ WHICH_AVCONV=1' $out/check.sh - sed -i '/^check_ulimit/d' $out/check.sh - ${wrapFix "$out/check.sh"} - ${wrapFix "$out/start.sh"} + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index 0d9ac5d192d33..62fa819fb8a53 100644 --- a/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -13,7 +13,7 @@ }: let - pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); + pinData = lib.importJSON ./pin.json; # we need a different version than the one already available in nixpkgs esbuild-hedgedoc = buildGoModule rec { diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 14137fa0e607f..7a07c4ffdc4d9 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.38.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "155rn0balgikkhy77gbva6a88pgwm27flzgjyphiwzwnah1mmhca"; + sha256 = "sha256-eN1tTKNuZMU3qObHaqq70bdkmZeAD6LNAQau9JGSXpE="; }; - cargoSha256 = "1pk56s47mk0f8cww6h1y43jdnf311g35xynz1jvhrk31yyjhb0jl"; + cargoSha256 = "sha256-6TZz8b8fALPTDRxzp+7ZWCHjOwVtqRjdSO6aEwZcMnc="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/tools/audio/botamusique/default.nix index 36bd134333863..d13bbd13c9220 100644 --- a/pkgs/tools/audio/botamusique/default.nix +++ b/pkgs/tools/audio/botamusique/default.nix @@ -9,6 +9,7 @@ # For the update script , coreutils +, curl , nix-prefetch-git , jq , nodePackages @@ -41,7 +42,7 @@ let in stdenv.mkDerivation rec { pname = "botamusique"; - version = "unstable-${lib.substring 0 10 srcJson.date}"; + version = srcJson.version; inherit src; @@ -67,21 +68,21 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - python3Packages.wrapPython - nodejs makeWrapper + nodejs + python3Packages.wrapPython ]; pythonPath = with python3Packages; [ - pymumble - packaging - magic - requests - youtube-dl flask + magic mutagen + packaging pillow + pymumble pyradios + requests + yt-dlp ]; buildPhase = '' @@ -118,9 +119,17 @@ stdenv.mkDerivation rec { ''; passthru.updateScript = pkgs.writeShellScript "botamusique-updater" '' - export PATH=${lib.makeBinPath [ coreutils nix-prefetch-git jq nodePackages.node2nix ]} + export PATH=${lib.makeBinPath [ coreutils curl nix-prefetch-git jq nodePackages.node2nix ]} + set -ex + + OWNER=azlux + REPO=botamusique + VERSION=$(curl https://api.github.com/repos/$OWNER/$REPO/releases/latest | jq -r '.tag_name') - nix-prefetch-git https://github.com/azlux/botamusique > ${toString ./src.json} + nix-prefetch-git --rev "$VERSION" --url https://github.com/$OWNER/$REPO | \ + jq > ${toString ./src.json } \ + --arg version "$VERSION" \ + '.version |= $version' path=$(jq '.path' -r < ${toString ./src.json}) tmp=$(mktemp -d) @@ -129,7 +138,7 @@ stdenv.mkDerivation rec { # botamusique doesn't have a version in its package.json # But that's needed for node2nix jq < "$path"/web/package.json > "$tmp/package.json" \ - --arg version "0.0.0" \ + --arg version "$VERSION" \ '.version |= $version' node2nix \ diff --git a/pkgs/tools/audio/botamusique/node-packages.nix b/pkgs/tools/audio/botamusique/node-packages.nix index 89c7d8d980368..afff50cb922bd 100644 --- a/pkgs/tools/audio/botamusique/node-packages.nix +++ b/pkgs/tools/audio/botamusique/node-packages.nix @@ -4526,8 +4526,8 @@ let args = { name = "botamusique"; packageName = "botamusique"; - version = "0.0.0"; - src = ../../../../../../../../../tmp/tmp.IOzfGq3zuo; + version = "7.2.2"; + src = ../../../../../../../../../tmp/tmp.axdirie3HR; dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.7" diff --git a/pkgs/tools/audio/botamusique/src.json b/pkgs/tools/audio/botamusique/src.json index ab5c4819ecbe2..22a9c01bce737 100644 --- a/pkgs/tools/audio/botamusique/src.json +++ b/pkgs/tools/audio/botamusique/src.json @@ -1,11 +1,12 @@ { "url": "https://github.com/azlux/botamusique", - "rev": "3733353170e1d24b5f3ce2a21643c27ca2a39835", - "date": "2021-09-01T12:19:37+02:00", - "path": "/nix/store/07vl4lhi6dshh4n7pcyrxvy9m028rrbr-botamusique", - "sha256": "0cggan70zymbh9iwggq9a04zkky86k9cncprxb9nnr35gp4l4992", + "rev": "9b9b4e40ce7b077ebfa3b9be08d32025d1e43bc3", + "date": "2021-10-27T02:29:59+02:00", + "path": "/nix/store/9gxn2bw0757yrmx0xhhwq642lixyy88x-botamusique", + "sha256": "07n6nyi84ddqp2x8xrds7q83yfqapl5qhkcprzjsmvxhv4a3ar8q", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, - "leaveDotGit": false + "leaveDotGit": false, + "version": "7.2.2" } diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 72f142105b710..06b8aa4d96099 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.205"; + version = "1.207"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-elFmsqtndo4ReR4IoyhC56k0PMqy5QrUxOGUQLGeu0I="; + sha256 = "0k9dv4s44k1khrhr6acsb2sqr5iq3d03ync82nzan5j7mckzs76v"; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix index 087a5ce7f9a32..85437e09efbba 100644 --- a/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/pkgs/tools/misc/lokalise2-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lokalise2-cli"; - version = "2.6.7"; + version = "2.6.8"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${version}"; - sha256 = "sha256-p3JvaDDebbIgOvTh0e7yYe3qOXvj1pLSG95hpK62M7s="; + sha256 = "sha256-U8XN7cH64ICVxcjmIWBeelOT3qQlGt6MhOPgUWkCPF0="; }; - vendorSha256 = "sha256-KJ8haktP9qoG5QsKnTOkvE8L+SQ9Z6hrsjUeS0wrdLs="; + vendorSha256 = "sha256-PM3Jjgq6mbM6iVCXRos9UsqqFNaXOqq713GZ2R9tQww="; doCheck = false; diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index 6d91a54e56dc2..44edf294f1926 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pistol"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NUHk48P3kUx+e9BR9k9K/VaHnbZ6Do6RRf1S0974sO8="; + sha256 = "sha256-rpHtU8CnRh4C75tjdyJWCzbyaHvzyBpGSbJpXW8J9VM="; }; - vendorSha256 = "sha256-n98cjXsgg2w3shbZPnk3g7mBbzV5Tc3jd9ZtiRk1KUM="; + vendorSha256 = "sha256-ivFH7KtWf4nHCdAJrb6HgKP6aIIjgBKG5XwbeJHBDvU="; doCheck = false; diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index 13509af98c029..a3aa31d4deddf 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication +{ lib, stdenv, fetchFromGitHub, buildPythonApplication , colorama, decorator, psutil, pyte, six , go, mock, pytestCheckHook, pytest-mock }: @@ -18,6 +18,23 @@ buildPythonApplication rec { checkInputs = [ go mock pytestCheckHook pytest-mock ]; + disabledTests = lib.optional stdenv.isDarwin [ + "test_settings_defaults" + "test_from_file" + "test_from_env" + "test_settings_from_args" + "test_get_all_executables_exclude_paths" + "test_with_blank_cache" + "test_with_filled_cache" + "test_when_etag_changed" + "test_for_generic_shell" + "test_on_first_run" + "test_on_run_after_other_commands" + "test_when_cant_configure_automatically" + "test_when_already_configured" + "test_when_successfully_configured" + ]; + meta = with lib; { homepage = "https://github.com/nvbn/thefuck"; description = "Magnificent app which corrects your previous console command"; diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix index 3ec9bce0b4c79..311fffb408743 100644 --- a/pkgs/tools/networking/connman/connman.nix +++ b/pkgs/tools/networking/connman/connman.nix @@ -67,17 +67,17 @@ stdenv.mkDerivation rec { libmnl gnutls readline - ] ++ optionals (enableOpenconnect) [ openconnect ]; + ] ++ optionals (enableOpenconnect) [ openconnect ] + ++ optionals (firewallType == "iptables") [ iptables ] + ++ optionals (firewallType == "nftables") [ libnftnl ] + ++ optionals (enablePolkit) [ polkit ] + ++ optionals (enablePptp) [ pptp ppp ] + ; nativeBuildInputs = [ pkg-config file - ] - ++ optionals (enablePolkit) [ polkit ] - ++ optionals (enablePptp) [ pptp ppp ] - ++ optionals (firewallType == "iptables") [ iptables ] - ++ optionals (firewallType == "nftables") [ libnftnl ] - ; + ]; # fix invalid path to 'file' postPatch = '' diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index f4907da645ad8..b448c6d359406 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-09-02T09-21-27Z"; + version = "2021-10-07T04-19-58Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-6G0MyeDYc8Y6eib2T+2VB5mDjyO13FdBsufy57osIEk="; + sha256 = "sha256-FF4blsNzr2M/ZZ2epTBhFkoj6s9Iw5GGXY65mKftojk="; }; - vendorSha256 = "sha256-J1khnNTiHkTPRjNlU2yQu8b+bwKP/KBF1KxTIvGLs+U="; + vendorSha256 = "sha256-GFxB5Gxnc6m91EjF2z108J1WmggCQrUhxwEA+Sih+94="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index 2840b9d8400a2..f1f8545c96de4 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -2,7 +2,7 @@ with lib; -let versions = builtins.fromJSON (builtins.readFile ./versions.json); +let versions = lib.importJSON ./versions.json; arch = if stdenv.isi686 then "386" else if stdenv.isx86_64 then "amd64" else if stdenv.isAarch32 then "arm" diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/tools/networking/oapi-codegen/default.nix index 41e80a3e12cbb..47d243782c748 100644 --- a/pkgs/tools/networking/oapi-codegen/default.nix +++ b/pkgs/tools/networking/oapi-codegen/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "deepmap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8hyRuGKspWqv+uBeSz4i12Grl83EQVPWB1weEVf9yhA="; + sha256 = "sha256-VAtfJ1PXTSPMoQ4NqX0GcZMyi15edxWj6Xsj6h1b7hc="; }; - vendorSha256 = "sha256-YCZzIsu1mMAAjLGHISrDkfY4Lx0az2SZV8bnZOMalx8="; + vendorSha256 = "sha256-s6+Rs+G4z5fcmUiwGjeDoQYKWJz0a/PCejfKyn8WWxs="; # Tests use network doCheck = false; diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index e7ae903e8682b..9a2e1b4bbc781 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -1,17 +1,27 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, kubernetes-helm }: buildGoModule rec { pname = "telepresence2"; - version = "2.4.0"; + version = "2.4.6"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "1v2jkhdlyq37akqyhb8mwsh7rjdv2fjw8kyzys3dv04k3dy5sl0f"; + sha256 = "09w7yk7jk5m6clq3drbgdr61w60b21jmfd635brfahms8pykmmzl"; }; - vendorSha256 = "1snmp461h8driy1w1xggk669yxl0sjl1m9pbqm7dwk44yb94zi1q"; + # The Helm chart is go:embed'ed as a tarball in the binary. + # That tarball is generated by running ./build-aux/package_embedded_chart/main.go, + # which tries to invoke helm from tools/bin/helm. + # Oh well… + preBuild = '' + mkdir -p tools/bin + ln -sfn ${kubernetes-helm}/bin/helm tools/bin/helm + go run ./build-aux/package_embedded_chart/main.go ${src.rev} + ''; + + vendorSha256 = "0przkcqaf56a0sgan2xxqfpbs9nbmq4brwdv1qnag7i9myzvixxb"; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index bb17691cbad44..0284e5117d315 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "sha256-sMcbOTLdmAXp3U2XeNM0hrwOTjzr+9B6IvAaVbjhuFY="; + sha256 = "sha256-5bx9KGZD7m+FX9hWU1pu8uJ2FU+P/TetRS3kJL5jhhI="; }; vendorSha256 = "sha256-QQN8ePOQ7DT9KeuY4ohFuPtocuinh3Y3us6QMnCQ4gc="; @@ -33,6 +33,6 @@ buildGoModule rec { "An experiment in scalable routing as an encrypted IPv6 overlay network"; homepage = "https://yggdrasil-network.github.io/"; license = licenses.lgpl3; - maintainers = with maintainers; [ ehmry gazally lassulus ]; + maintainers = with maintainers; [ bbigras ehmry gazally lassulus ]; }; } diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 9331bdba68438..6f30a76bcd985 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.6.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GKdfi4hdvpB9VY8VqGYNjTezmPxotrzL/XSm1H5VLQs="; + sha256 = "sha256-GKX+5N8BPm4VmI10mzPJORjwLpuOLLjO+Q+RNelKUVI="; }; - vendorSha256 = "sha256-APF6WHuH+YzgX3GbkSzZArGdiE7xPsLljEzCu96BvO4="; + vendorSha256 = "sha256-NPMJ5sCdbfDraRoK5fSdaxMpYS2i8ir0cklGDoHNLAY="; doCheck = false; diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix index 6eee4adf1d427..a32f788bf4dca 100644 --- a/pkgs/tools/package-management/nix-bundle/default.nix +++ b/pkgs/tools/package-management/nix-bundle/default.nix @@ -1,4 +1,13 @@ -{ stdenv, lib, fetchFromGitHub, nix, makeWrapper, coreutils, gnutar, gzip, bzip2 }: +{ lib +, stdenv +, fetchFromGitHub +, bzip2 +, coreutils +, gnutar +, gzip +, makeWrapper +, nix +}: stdenv.mkDerivation rec { pname = "nix-bundle"; @@ -13,25 +22,40 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - # coreutils, gnutar is actually needed by nix for bootstrap - buildInputs = [ nix coreutils gnutar gzip bzip2 ]; - - binPath = lib.makeBinPath [ nix coreutils gnutar gzip bzip2 ]; + # coreutils, gnutar are needed by nix for bootstrap + buildInputs = [ + bzip2 + coreutils + gnutar + gzip + nix + ]; makeFlags = [ "PREFIX=$(out)" ]; postInstall = '' mkdir -p $out/bin makeWrapper $out/share/nix-bundle/nix-bundle.sh $out/bin/nix-bundle \ - --prefix PATH : ${binPath} - cp $out/share/nix-bundle/nix-run.sh $out/bin/nix-run + --prefix PATH : ${lib.makeBinPath buildInputs} + ln -s $out/share/nix-bundle/nix-run.sh $out/bin/nix-run ''; meta = with lib; { - maintainers = [ maintainers.matthewbauer ]; - platforms = platforms.all; + homepage = "https://github.com/matthewbauer/nix-bundle"; description = "Create bundles from Nixpkgs attributes"; + longDescription = '' + nix-bundle is a way to package Nix attributes into single-file + executables. + + Benefits: + - Single-file output + - Can be run by non-root users + - No runtime + - Distro agnostic + - No installation + ''; license = licenses.mit; - homepage = "https://github.com/matthewbauer/nix-bundle"; + maintainers = [ maintainers.matthewbauer ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index da461a96957a3..f471393b2cfc2 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , autoconf , automake @@ -77,7 +78,7 @@ stdenv.mkDerivation rec { ''; homepage = src.meta.homepage; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ roberth ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 7d7afa624931e..050621cd20ef8 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -4,6 +4,7 @@ , fetchurl , lib , libsecret +, libxshmfence , makeDesktopItem , makeWrapper , stdenv @@ -11,78 +12,61 @@ , wrapGAppsHook }: -let - inherit (stdenv.hostPlatform) system; - +stdenv.mkDerivation rec { pname = "bitwarden"; + version = "1.29.1"; - version = { - x86_64-linux = "1.28.1"; - }.${system} or ""; - - sha256 = { - x86_64-linux = "sha256-vyEbISZDTN+CHqSEtElzfg4M4i+2RjUux5vzwJw8/dc="; - }.${system} or ""; - - meta = with lib; { - description = "A secure and free password manager for all of your devices"; - homepage = "https://bitwarden.com"; - license = licenses.gpl3; - maintainers = with maintainers; [ kiwi ]; - platforms = [ "x86_64-linux" ]; + src = fetchurl { + url = "https://github.com/bitwarden/desktop/releases/download/v${version}/Bitwarden-${version}-amd64.deb"; + sha256 = "0rxy19bazi7a6m2bpx6wadg5d9p0k324h369vgr5ppmxb69d6zp8"; }; - linux = stdenv.mkDerivation rec { - inherit pname version meta; - - src = fetchurl { - url = "https://github.com/bitwarden/desktop/releases/download/" - + "v${version}/Bitwarden-${version}-amd64.deb"; - inherit sha256; - }; + desktopItem = makeDesktopItem { + name = "bitwarden"; + exec = "bitwarden %U"; + icon = "bitwarden"; + comment = "A secure and free password manager for all of your devices"; + desktopName = "Bitwarden"; + categories = "Utility"; + }; - desktopItem = makeDesktopItem { - name = "bitwarden"; - exec = "bitwarden %U"; - icon = "bitwarden"; - comment = "A secure and free password manager for all of your devices"; - desktopName = "Bitwarden"; - categories = "Utility"; - }; + dontBuild = true; + dontConfigure = true; + dontPatchELF = true; + dontWrapGApps = true; - dontBuild = true; - dontConfigure = true; - dontPatchELF = true; - dontWrapGApps = true; + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; - buildInputs = [ libsecret ] ++ atomEnv.packages; + buildInputs = [ libsecret libxshmfence ] ++ atomEnv.packages; - nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; + unpackPhase = "dpkg-deb -x $src ."; - unpackPhase = "dpkg-deb -x $src ."; + installPhase = '' + mkdir -p "$out/bin" + cp -R "opt" "$out" + cp -R "usr/share" "$out/share" + chmod -R g-w "$out" - installPhase = '' - mkdir -p "$out/bin" - cp -R "opt" "$out" - cp -R "usr/share" "$out/share" - chmod -R g-w "$out" + # Desktop file + mkdir -p "$out/share/applications" + cp "${desktopItem}/share/applications/"* "$out/share/applications" + ''; - # Desktop file - mkdir -p "$out/share/applications" - cp "${desktopItem}/share/applications/"* "$out/share/applications" - ''; + runtimeDependencies = [ + (lib.getLib udev) + ]; - runtimeDependencies = [ - (lib.getLib udev) - ]; + postFixup = '' + makeWrapper $out/opt/Bitwarden/bitwarden $out/bin/bitwarden \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \ + "''${gappsWrapperArgs[@]}" + ''; - postFixup = '' - makeWrapper $out/opt/Bitwarden/bitwarden $out/bin/bitwarden \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \ - "''${gappsWrapperArgs[@]}" - ''; + meta = with lib; { + description = "A secure and free password manager for all of your devices"; + homepage = "https://bitwarden.com"; + license = licenses.gpl3; + maintainers = with maintainers; [ kiwi ]; + platforms = [ "x86_64-linux" ]; }; - -in if stdenv.isDarwin -then throw "Bitwarden has not been packaged for macOS yet" -else linux +} diff --git a/pkgs/tools/security/credslayer/default.nix b/pkgs/tools/security/credslayer/default.nix index 0de8d37c0db4f..223f9dd70eb9a 100644 --- a/pkgs/tools/security/credslayer/default.nix +++ b/pkgs/tools/security/credslayer/default.nix @@ -29,10 +29,20 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # Requires a telnet setup "test_telnet" + # stdout has all the correct data, but the underlying test code fails + # functionally everything seems to be intact + "http_get_auth" + "test_http_post_auth" + "test_ntlmssp" ]; pythonImportsCheck = [ "credslayer" ]; + postInstall = '' + wrapProgram $out/bin/credslayer \ + --prefix PATH : "${lib.makeBinPath [ wireshark-cli ]}" + ''; + meta = with lib; { description = "Extract credentials and other useful info from network captures"; homepage = "https://github.com/ShellCode33/CredSLayer"; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 63f25bc12efea..7cbbaee458203 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -6,7 +6,7 @@ }: let - all_data = builtins.fromJSON (builtins.readFile ./data.json); + all_data = lib.importJSON ./data.json; system_map = { # i686-linux = "i386"; Uncomment if enpass 6 becomes available on i386 x86_64-linux = "amd64"; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 7517614b64956..3166571b42571 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-11-02"; + version = "2021-11-04"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-47/gsOZaFI3ujht3dj2lvsspe/Iv/ujdFkcvhgGAm9E="; + sha256 = "sha256-4qNQcmBq0q+FDRGtunUfngO+1jAK+fUBUHsq8E2rAy0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix index 64bb10cb8bf2f..9877aaad7e98a 100644 --- a/pkgs/tools/security/libtpms/default.nix +++ b/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.8.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-XvugcpoFQhdCBBg7hOgsUzSn4ad7RUuAEkvyiPLg4Lw="; + sha256 = "sha256-9u5Yq9PXMADvyWZo5aFa0GNzqVsbyN25o/cYQdbrUO0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index e001239f3136e..6064a80d6cd5d 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, whois, perl }: +{ lib, stdenv, whois, libxcrypt, perl, pkg-config }: stdenv.mkDerivation { - name = "mkpasswd-${whois.version}"; + pname = "mkpasswd"; + inherit (whois) version; + inherit (whois) src; - src = whois.src; + nativeBuildInputs = [ perl pkg-config ]; + buildInputs = [ libxcrypt ]; - nativeBuildInputs = [ perl ]; - - preConfigure = whois.preConfigure; + inherit (whois) preConfigure; buildPhase = "make mkpasswd"; installPhase = "make install-mkpasswd"; diff --git a/pkgs/tools/security/onlykey/default.nix b/pkgs/tools/security/onlykey/default.nix index 4cad7e513acd1..312f580c02395 100644 --- a/pkgs/tools/security/onlykey/default.nix +++ b/pkgs/tools/security/onlykey/default.nix @@ -12,7 +12,7 @@ let # parse the version from package.json version = let - packageJson = builtins.fromJSON (builtins.readFile ./package.json); + packageJson = lib.importJSON ./package.json; splits = builtins.split "^.*#v(.*)$" (builtins.getAttr "onlykey" (builtins.head packageJson)); matches = builtins.elemAt splits 1; elem = builtins.head matches; diff --git a/pkgs/tools/security/otpauth/default.nix b/pkgs/tools/security/otpauth/default.nix index 28dfab546a8b9..fe01c40d2c4c4 100644 --- a/pkgs/tools/security/otpauth/default.nix +++ b/pkgs/tools/security/otpauth/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "otpauth"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "dim13"; repo = "otpauth"; rev = "v${version}"; - sha256 = "sha256-Jr1cZbXKZa6M7tIex67SjDPkWSYHWSZ7vRYd8us7Oek="; + sha256 = "sha256-LGDeNkCxVLDVpwi5VFFL0DFsf8CexI7Nc5l+l2ASHaw="; }; runVend = true; diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index 3a8af973cf7ad..278e009039297 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -22,9 +22,6 @@ # pass-import , withPass ? false , pass - - # git-credential-helper -, withGitCredential ? false }: rustPlatform.buildRustPackage rec { @@ -47,7 +44,11 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; - postPatch = lib.optionalString withFzf '' + postPatch = '' + patchShebangs bin/git-credential-rbw + substituteInPlace bin/git-credential-rbw \ + --replace rbw $out/bin/rbw + '' + lib.optionalString withFzf '' patchShebangs bin/rbw-fzf substituteInPlace bin/rbw-fzf \ --replace fzf ${fzf}/bin/fzf \ @@ -61,10 +62,6 @@ rustPlatform.buildRustPackage rec { patchShebangs bin/pass-import substituteInPlace bin/pass-import \ --replace pass ${pass}/bin/pass - '' + lib.optionalString withGitCredential '' - patchShebangs bin/git-credential-rbw - substituteInPlace bin/git-credential-rbw \ - --replace rbw $out/bin/rbw ''; preConfigure = '' @@ -77,14 +74,14 @@ rustPlatform.buildRustPackage rec { $out/bin/rbw gen-completions $shell > rbw.$shell installShellCompletion rbw.$shell done + '' + '' + cp bin/git-credential-rbw $out/bin '' + lib.optionalString withFzf '' cp bin/rbw-fzf $out/bin '' + lib.optionalString withRofi '' cp bin/rbw-rofi $out/bin '' + lib.optionalString withPass '' cp bin/pass-import $out/bin - '' + lib.optionalString withGitCredential '' - cp bin/git-credential-rbw $out/bin ''; meta = with lib; { diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix index fa2d774e1174b..de67a453fc5fc 100644 --- a/pkgs/tools/security/swtpm/default.nix +++ b/pkgs/tools/security/swtpm/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "swtpm"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "stefanberger"; repo = "swtpm"; rev = "v${version}"; - sha256 = "sha256-7YzdwGAGECj7PhaCOf/dLSILPXqtbylCkN79vuFBw5Y="; + sha256 = "sha256-iy8xjKnPLq1ntZa9x+KtLDznzu6m+1db3NPeGQESUVo="; }; patches = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ]; prePatch = '' - # Makefile tries to create the directory /var/lib/swtpm-localcafor, which fails + # Makefile tries to create the directory /var/lib/swtpm-localca, which fails substituteInPlace samples/Makefile.am \ --replace 'install-data-local:' 'do-not-execute:' diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index a735e35624f7c..7e4ce71ec547d 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,23 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, which +{ lib +, stdenv +, fetchFromGitHub , darwin ? null -, xorgproto ? null +, fontconfig ? null +, freetype ? null , libX11 , libXext ? null , libXt ? null -, fontconfig ? null -, freetype ? null , perl ? null # For building web manuals +, which +, xorgproto ? null }: stdenv.mkDerivation { pname = "plan9port"; - version = "2021-04-22"; + version = "0.pre+date=2021-10-19"; src = fetchFromGitHub { owner = "9fans"; repo = "plan9port"; - rev = "70cc6e5ba7798b315c3fb3aae19620a01604a459"; - hash = "sha256-HCn8R9YSocHrpw/xK5n8gsCLSAbAQgw0NtjO9vYIbKo="; + rev = "d0d440860f2000a1560abb3f593cdc325fcead4c"; + hash = "sha256-2aYXqPGwrReyFPrLDtEjgQd/RJjpOfI3ge/tDocYpRQ="; }; postPatch = '' @@ -44,10 +47,18 @@ stdenv.mkDerivation { buildInputs = [ perl ] ++ lib.optionals (!stdenv.isDarwin) [ - xorgproto libX11 libXext libXt fontconfig - freetype # fontsrv wants ft2build.h provides system fonts for acme and sam. + fontconfig + freetype # fontsrv wants ft2build.h provides system fonts for acme and sam + libX11 + libXext + libXt + xorgproto ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - Carbon Cocoa IOKit Metal QuartzCore + Carbon + Cocoa + IOKit + Metal + QuartzCore ]); builder = ./builder.sh; diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/tools/text/chroma/default.nix index f99c090eb975d..42784d65a7391 100644 --- a/pkgs/tools/text/chroma/default.nix +++ b/pkgs/tools/text/chroma/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let - srcInfo = builtins.fromJSON (builtins.readFile ./src.json); + srcInfo = lib.importJSON ./src.json; in buildGoModule rec { diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 3240f65167e16..e7a1bdcfd800b 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -2,17 +2,17 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) - asciidoctor (2.0.15) - asciidoctor-diagram (2.1.2) + asciidoctor (2.0.16) + asciidoctor-diagram (2.2.1) asciidoctor (>= 1.5.7, < 3.x) - asciidoctor-diagram-ditaamini (~> 1.0.0) + asciidoctor-diagram-ditaamini (~> 1.0) asciidoctor-diagram-plantuml (~> 1.2021) rexml - asciidoctor-diagram-ditaamini (1.0.0) - asciidoctor-diagram-plantuml (1.2021.7) + asciidoctor-diagram-ditaamini (1.0.1) + asciidoctor-diagram-plantuml (1.2021.8) asciidoctor-epub3 (1.5.1) asciidoctor (>= 1.5.6, < 3.0.0) gepub (~> 1.0.0) @@ -21,7 +21,7 @@ GEM asciidoctor (~> 2.0) asciimath (~> 2.0) mathematical (~> 1.6.0) - asciidoctor-pdf (1.6.0) + asciidoctor-pdf (1.6.1) asciidoctor (~> 2.0) concurrent-ruby (~> 1.1) prawn (~> 2.4.0) @@ -35,25 +35,25 @@ GEM asciidoctor (>= 2.0.0, < 3.0.0) concurrent-ruby (~> 1.0) thread_safe (~> 0.3.5) - asciimath (2.0.2) + asciimath (2.0.3) coderay (1.1.3) concurrent-ruby (1.1.9) - css_parser (1.9.0) + css_parser (1.10.0) addressable - gepub (1.0.13) - nokogiri (>= 1.8.2, < 1.12) + gepub (1.0.15) + nokogiri (>= 1.8.2, < 2.0) rubyzip (> 1.1.1, < 2.4) hashery (2.1.2) - i18n (1.8.10) + i18n (1.8.11) concurrent-ruby (~> 1.0) mathematical (1.6.14) ruby-enum (~> 0.4) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0225) - mini_portile2 (2.5.3) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + mime-types-data (3.2021.0901) + mini_portile2 (2.6.1) + nokogiri (1.12.5) + mini_portile2 (~> 2.6.1) racc (~> 1.4) pdf-core (0.9.0) pdf-reader (2.5.0) @@ -79,13 +79,13 @@ GEM prawn (~> 2.2) public_suffix (4.0.6) pygments.rb (2.2.0) - racc (1.5.2) + racc (1.6.0) rexml (3.2.5) - rouge (3.26.0) + rouge (3.26.1) ruby-enum (0.9.0) i18n ruby-rc4 (0.1.5) - rubyzip (2.3.0) + rubyzip (2.3.2) safe_yaml (1.0.5) thread_safe (0.3.6) treetop (1.6.11) @@ -107,4 +107,4 @@ DEPENDENCIES rouge BUNDLED WITH - 2.1.4 + 2.2.24 diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index 6fe57ff48565c..b227121d6b86b 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; afm = { groups = ["default"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k3lijm4dmiz977bfmpclk5glj5jwv7bidamwwwywm60ywb0n4n4"; + sha256 = "10h4pmmkbcrpy7bn76wxzkb0hriabh1k3ii1g8lm0mdji5drlhq2"; type = "gem"; }; - version = "2.0.15"; + version = "2.0.16"; }; asciidoctor-diagram = { dependencies = ["asciidoctor" "asciidoctor-diagram-ditaamini" "asciidoctor-diagram-plantuml" "rexml"]; @@ -46,30 +46,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09ci775f7y7d6spn0fl5wfmfyxianjp4z0p3fwcrzajy63f381v9"; + sha256 = "1z1ilpczjaydhcwpz3yygn03yrx2ljjj55xczwkrlb8rzgh03br3"; type = "gem"; }; - version = "2.1.2"; + version = "2.2.1"; }; asciidoctor-diagram-ditaamini = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1frnjz0j00v5hqp5macgnn6jq77jcpjy2l6hqmn5jn5ds7bmi2rl"; + sha256 = "1nva5n6nyns0xp77d1dxng1rjhc8ma6gyd8hczjq3h9qqxcw2q4h"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; asciidoctor-diagram-plantuml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kcxwbaancxfq08fr7syg8mxsi97jiczxyp4an2x0ymq3mkss0k8"; + sha256 = "0n018kmqzapf5y1bacb5yyvb9jfwxdkfqnviwxivwz9322b9w6j7"; type = "gem"; }; - version = "1.2021.7"; + version = "1.2021.8"; }; asciidoctor-epub3 = { dependencies = ["asciidoctor" "gepub" "mime-types"]; @@ -99,10 +99,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sxfz3qp2j76jlab7fb1d1ylbf0h2nnbkhg019qqch5wkd4k1iw9"; + sha256 = "17d3fa6ix6r5ikydqz41r620mm98s076wdg4w6ydsr655r7mvnpk"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; asciidoctor-revealjs = { dependencies = ["asciidoctor" "concurrent-ruby" "thread_safe"]; @@ -120,10 +120,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yq9av7rh493xqmx4cq3fjl0c6d8njxp53qw4hg2d3xkyn2lyfc5"; + sha256 = "0h4fz93pf96y5syxwpv0vibjf7lidv2718ikpvyd2vy8c1am8zyn"; type = "gem"; }; - version = "2.0.2"; + version = "2.0.3"; }; coderay = { groups = ["default"]; @@ -151,10 +151,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xs4ind9xd099rb52b73pch8ha143dl8bhivqsbba4wrvxpbx751"; + sha256 = "1q8gj3wkc2mbzsqw5zcsr3kyzrrb2pda03pi769rjbvqr94g3bm5"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; gepub = { dependencies = ["nokogiri" "rubyzip"]; @@ -162,10 +162,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01q33rkvqrhxqm8zgkhgcqhrqdfzgxswxfgiagdjxw67qdn1pids"; + sha256 = "08fny807zd4700f263ckc76bladjipsniyk3clv8a7x76x3fqshx"; type = "gem"; }; - version = "1.0.13"; + version = "1.0.15"; }; hashery = { groups = ["default"]; @@ -183,10 +183,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; + sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; type = "gem"; }; - version = "1.8.10"; + version = "1.8.11"; }; mathematical = { dependencies = ["ruby-enum"]; @@ -215,20 +215,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi"; + sha256 = "1z5wvk6qi4ws1kjh7xn1rfirqw5m72bwvqacck1fjpbh33pcrwxv"; type = "gem"; }; - version = "3.2021.0225"; + version = "3.2021.0901"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; + sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; type = "gem"; }; - version = "2.5.3"; + version = "2.6.1"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -236,10 +236,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; + sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; type = "gem"; }; - version = "1.11.7"; + version = "1.12.5"; }; pdf-core = { groups = ["default"]; @@ -352,10 +352,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; }; rexml = { groups = ["default"]; @@ -372,10 +372,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; + sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf"; type = "gem"; }; - version = "3.26.0"; + version = "3.26.1"; }; ruby-enum = { dependencies = ["i18n"]; @@ -403,10 +403,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.2"; }; safe_yaml = { groups = ["default"]; diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 32907ea3fb757..1cb9c8d40177a 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.9.2"; + version = "0.10.0"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "2dnjyx3q46n7v1wl46vfgs9rhb3kvhijsd3ydq6amdf6vlf4mf1zsiakd5iycdh0i799zq61yspsibc87mcrs8l289lnwl955avs068"; + sha512 = "3gq6awxvkz2hb8xzcwqhdhdqgspvqjfzm50bq9i29qy2iisq9vzb91bdp3f4q2sqcmk3gms44xyxyn3ih2hwlzsnk0f5prjzyg97fjj"; }; nativeBuildInputs = [ which ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f110ba952906..171e7f110b476 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1022,10 +1022,6 @@ with pkgs; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - coreterminal = libsForQt5.callPackage ../applications/terminal-emulators/coreterminal { - inherit (lxqt) qtermwidget; - }; - ctx = callPackage ../applications/terminal-emulators/ctx { }; darktile = callPackage ../applications/terminal-emulators/darktile { }; @@ -1537,8 +1533,6 @@ with pkgs; codeql = callPackage ../development/tools/analysis/codeql { }; - corearchiver = libsForQt5.callPackage ../tools/archivers/corearchiver { }; - container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { }; @@ -1575,8 +1569,12 @@ with pkgs; cozy = callPackage ../applications/audio/cozy { }; + cpptoml = callPackage ../development/libraries/cpptoml { }; + cpuid = callPackage ../os-specific/linux/cpuid { }; + msr = callPackage ../os-specific/linux/msr { }; + ctrtool = callPackage ../tools/archivers/ctrtool { }; crowbar = callPackage ../tools/security/crowbar { }; @@ -2186,6 +2184,8 @@ with pkgs; bmake = callPackage ../development/tools/build-managers/bmake { }; + go-mk = callPackage ../development/tools/build-managers/go-mk { }; + boca = callPackage ../development/libraries/boca { }; bochs = callPackage ../applications/virtualization/bochs { @@ -3321,6 +3321,8 @@ with pkgs; mq-cli = callPackage ../tools/system/mq-cli { }; + mrkd = with python3Packages; toPythonApplication mrkd; + n2n = callPackage ../tools/networking/n2n { }; nextdns = callPackage ../applications/networking/nextdns { }; @@ -4163,16 +4165,8 @@ with pkgs; qtbase = qt5.qtbase; }; - coregarage = libsForQt5.callPackage ../applications/misc/coregarage { }; - - coreshot = libsForQt5.callPackage ../tools/misc/coreshot { }; - c14 = callPackage ../applications/networking/c14 { }; - corehunt = libsForQt5.callPackage ../applications/misc/corehunt { }; - - coretoppings = libsForQt5.callPackage ../applications/misc/coretoppings { }; - certstrap = callPackage ../tools/security/certstrap { }; cfssl = callPackage ../tools/security/cfssl { }; @@ -6790,10 +6784,6 @@ with pkgs; libscrypt = callPackage ../development/libraries/libscrypt { }; - libcsys = libsForQt5.callPackage ../development/libraries/libcsys { }; - - libcprime = libsForQt5.callPackage ../development/libraries/libcprime { }; - libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; libcoap = callPackage ../applications/networking/libcoap { @@ -7079,13 +7069,9 @@ with pkgs; nodejs_latest = nodejs-16_x; nodejs-slim_latest = nodejs-slim-16_x; - nodePackages_latest = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix { - nodejs = nodejs_latest; - }); + nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs; - nodePackages = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix { - inherit nodejs; - }); + nodePackages = dontRecurseIntoAttrs nodejs.pkgs; np2kai = callPackage ../misc/emulators/np2kai { }; @@ -11159,8 +11145,8 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix; - adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix; + adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix { inherit lib; }; + adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix { inherit lib; }; adoptopenjdk-hotspot-bin-16 = if stdenv.isLinux then callPackage adoptopenjdk-bin-16-packages-linux.jdk-hotspot {} @@ -11177,8 +11163,8 @@ with pkgs; then callPackage adoptopenjdk-bin-16-packages-linux.jre-openj9 {} else callPackage adoptopenjdk-bin-16-packages-darwin.jre-openj9 {}; - adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix; - adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix; + adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix { inherit lib; }; + adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix { inherit lib; }; adoptopenjdk-hotspot-bin-15 = if stdenv.isLinux then callPackage adoptopenjdk-bin-15-packages-linux.jdk-hotspot {} @@ -11195,8 +11181,8 @@ with pkgs; then callPackage adoptopenjdk-bin-15-packages-linux.jre-openj9 {} else callPackage adoptopenjdk-bin-15-packages-darwin.jre-openj9 {}; - adoptopenjdk-bin-14-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk14-linux.nix; - adoptopenjdk-bin-14-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk14-darwin.nix; + adoptopenjdk-bin-14-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk14-linux.nix { inherit lib; }; + adoptopenjdk-bin-14-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk14-darwin.nix { inherit lib; }; adoptopenjdk-hotspot-bin-14 = if stdenv.isLinux then callPackage adoptopenjdk-bin-14-packages-linux.jdk-hotspot {} @@ -11213,8 +11199,8 @@ with pkgs; then callPackage adoptopenjdk-bin-14-packages-linux.jre-openj9 {} else callPackage adoptopenjdk-bin-14-packages-darwin.jre-openj9 {}; - adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix; - adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix; + adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix { inherit lib; }; + adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix { inherit lib; }; adoptopenjdk-hotspot-bin-13 = if stdenv.isLinux then callPackage adoptopenjdk-bin-13-packages-linux.jdk-hotspot {} @@ -11231,8 +11217,8 @@ with pkgs; then callPackage adoptopenjdk-bin-13-packages-linux.jre-openj9 {} else callPackage adoptopenjdk-bin-13-packages-darwin.jre-openj9 {}; - adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix; - adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix; + adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix { inherit lib; }; + adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix { inherit lib; }; adoptopenjdk-hotspot-bin-11 = if stdenv.isLinux then callPackage adoptopenjdk-bin-11-packages-linux.jdk-hotspot {} @@ -11249,8 +11235,8 @@ with pkgs; then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {} else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {}; - adoptopenjdk-bin-8-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix; - adoptopenjdk-bin-8-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix; + adoptopenjdk-bin-8-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix { inherit lib; }; + adoptopenjdk-bin-8-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix { inherit lib; }; adoptopenjdk-hotspot-bin-8 = if stdenv.isLinux then callPackage adoptopenjdk-bin-8-packages-linux.jdk-hotspot {} @@ -13316,6 +13302,13 @@ with pkgs; ### END OF LUA + ### CuboCore + CuboCore = recurseIntoAttrs (import ./cubocore-packages.nix { + inherit newScope lxqt lib libsForQt5; + }); + + ### End of CuboCore + lush2 = callPackage ../development/interpreters/lush {}; maude = callPackage ../development/interpreters/maude { @@ -14800,8 +14793,6 @@ with pkgs; minizinc = callPackage ../development/tools/minizinc { }; minizincide = qt514.callPackage ../development/tools/minizinc/ide.nix { }; - mk = callPackage ../development/tools/build-managers/mk { }; - mkcert = callPackage ../development/tools/misc/mkcert { }; mkdocs = callPackage ../development/tools/documentation/mkdocs { }; @@ -15097,6 +15088,8 @@ with pkgs; sbt-extras = callPackage ../development/tools/build-managers/sbt-extras { }; + scala-cli = callPackage ../development/tools/build-managers/scala-cli {}; + scc = callPackage ../development/tools/misc/scc { }; scss-lint = callPackage ../development/tools/scss-lint { }; @@ -16334,6 +16327,8 @@ with pkgs; stdenv = gccStdenv; # doesn't compile without gcc }; + mtrace = callPackage ../development/libraries/glibc/mtrace.nix { }; + # Provided by libc on Operating Systems that use the Extensible Linker Format. elf-header = if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" @@ -23849,8 +23844,6 @@ with pkgs; cheesecutter = callPackage ../applications/audio/cheesecutter { }; - corefm = libsForQt5.callPackage ../applications/misc/corefm { }; - milkytracker = callPackage ../applications/audio/milkytracker { }; ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; @@ -24193,8 +24186,6 @@ with pkgs; copyq = libsForQt5.callPackage ../applications/misc/copyq { }; - coreaction = libsForQt5.callPackage ../applications/misc/coreaction { }; - corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; coriander = callPackage ../applications/video/coriander { @@ -24205,8 +24196,6 @@ with pkgs; ffmpeg = ffmpeg-full; }; - coreimage = libsForQt5.callPackage ../applications/graphics/coreimage { }; - csa = callPackage ../applications/audio/csa { }; csound = callPackage ../applications/audio/csound { }; @@ -28242,6 +28231,8 @@ with pkgs; temporal = callPackage ../applications/networking/cluster/temporal { }; + tenacity = callPackage ../applications/audio/tenacity { wxGTK = wxGTK31-gtk3; }; + tendermint = callPackage ../tools/networking/tendermint { }; termdbms = callPackage ../development/tools/database/termdbms { }; diff --git a/pkgs/top-level/cubocore-packages.nix b/pkgs/top-level/cubocore-packages.nix new file mode 100644 index 0000000000000..3c6ed65e92868 --- /dev/null +++ b/pkgs/top-level/cubocore-packages.nix @@ -0,0 +1,94 @@ +{ newScope, lxqt, lib, libsForQt5 }: + +let + packages = self: with self; { + + # Libs + libcprime = libsForQt5.callPackage ../applications/misc/cubocore-packages/libcprime { }; + + libcsys = libsForQt5.callPackage ../applications/misc/cubocore-packages/libcsys { }; + + # Apps + coreaction = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreaction { + inherit libcprime libcsys; + }; + + corearchiver = libsForQt5.callPackage ../applications/misc/cubocore-packages/corearchiver { + inherit libcprime libcsys; + }; + + corefm = libsForQt5.callPackage ../applications/misc/cubocore-packages/corefm { + inherit libcprime libcsys; + }; + + coregarage = libsForQt5.callPackage ../applications/misc/cubocore-packages/coregarage { + inherit libcprime libcsys; + }; + + corehunt = libsForQt5.callPackage ../applications/misc/cubocore-packages/corehunt { + inherit libcprime libcsys; + }; + + coreimage = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreimage { + inherit libcprime libcsys; + }; + + coreinfo = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreinfo { + inherit libcprime libcsys; + }; + + corekeyboard = libsForQt5.callPackage ../applications/misc/cubocore-packages/corekeyboard { + inherit libcprime libcsys; + }; + + corepad = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepad { + inherit libcprime libcsys; + }; + + corepaint = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepaint { + inherit libcprime libcsys; + }; + + corepdf = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepdf { + inherit libcprime libcsys; + }; + + corepins = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepins { + inherit libcprime libcsys; + }; + + corerenamer = libsForQt5.callPackage ../applications/misc/cubocore-packages/corerenamer { + inherit libcprime libcsys; + }; + + coreshot = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreshot { + inherit libcprime libcsys; + }; + + corestats = libsForQt5.callPackage ../applications/misc/cubocore-packages/corestats { + inherit libcprime libcsys; + }; + + corestuff = libsForQt5.callPackage ../applications/misc/cubocore-packages/corestuff { + inherit libcprime libcsys; + }; + + coreterminal = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreterminal { + inherit (lxqt) qtermwidget; + inherit libcprime libcsys; + }; + + coretime = libsForQt5.callPackage ../applications/misc/cubocore-packages/coretime { + inherit libcprime libcsys; + }; + + coretoppings = libsForQt5.callPackage ../applications/misc/cubocore-packages/coretoppings { + inherit libcprime libcsys; + }; + + coreuniverse = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreuniverse { + inherit libcprime libcsys; + }; + }; +in +lib.makeScope newScope packages diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 53730739622f1..e7c848ab55600 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -3,7 +3,7 @@ with lib; let - inherit (libretro) snes9x; + inherit (libretro) genesis-plus-gx snes9x; in let self = rec { @@ -74,6 +74,8 @@ let self = rec { libretro = callPackage ../applications/video/kodi-packages/libretro { }; + libretro-genplus = callPackage ../applications/video/kodi-packages/libretro-genplus { inherit genesis-plus-gx; }; + libretro-snes9x = callPackage ../applications/video/kodi-packages/libretro-snes9x { inherit snes9x; }; jellyfin = callPackage ../applications/video/kodi-packages/jellyfin { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3178b4994ce9e..595967fa63b30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4878,6 +4878,8 @@ in { mpyq = callPackage ../development/python-modules/mpyq { }; + mrkd = callPackage ../development/python-modules/mrkd { }; + ms-cv = callPackage ../development/python-modules/ms-cv { }; msal = callPackage ../development/python-modules/msal { }; |