types.nullOr t
diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml
index 8abc66dfec192..cd68a428a6fbd 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixos/doc/manual/development/releases.xml
@@ -8,24 +8,26 @@
Release process
- Going through an example of releasing NixOS 17.09:
+ Going through an example of releasing NixOS 19.09:
One month before the beta
-
+
- Send an email to the nix-devel mailinglist as a warning about upcoming
- beta "feature freeze" in a month.
+ Create an announcement on feature freeze
in a month.
- Discuss with Eelco Dolstra and the community (via IRC, ML) about what
- will reach the deadline. Any issue or Pull Request targeting the release
- should be included in the release milestone.
+ Discuss with Eelco Dolstra and the community (via IRC, ML) about what will reach the deadline. Any issue or Pull Request targeting the release should be included in the release milestone.
+
+
+
+
+ Remove attributes that we know we will not be able to support, especially if there is a stable alternative. E.g. Check that our Linux kernels’
@@ -34,113 +36,113 @@
At beta release time
-
+
-
+
+git checkout -b release-19.09
+
- git tag -a -s -m "Release 17.09-beta" 17.09-beta
- && git push origin 17.09-beta
+ system.defaultChannel attribute in nixos/modules/misc/version.nix
- From the master branch run git checkout -b
- release-17.09 .
+ versionSuffix in nixos/release.nix
+
+
+
+ To get the commit count, use the following command:
+
+
+
+git rev-list --count release-19.09
+
+
+
- nixos/doc/manual/release-notes/rl-1909.xml .
+
+
+
+ Get all new NixOS modules:
+
+
+git diff release-19.03..release-19.09 nixos/modules/module-list.nix | grep ^+
+
+
+
+
+ Note systemd, kernel, glibc, desktop environment, and Nix upgrades.
+
+
+
- system.defaultChannel attribute in
- nixos/modules/misc/version.nix
+ Tag the release:
+
+git tag --annotate --message="Release 19.09-beta" 19.09-beta
+git push upstream 19.09-beta
+
- versionSuffix in
- nixos/release.nix , use
- git rev-list --count 17.09-beta
- to get the commit count.
+ master branch, increment the .version file
+
+echo -n "20.03" > .version
+
- echo -n "18.03" > .version on master.
+ codeName in lib/trivial.nix This will be the name for the next release.
- rl-2003.xml .
- Create a new release notes file for the upcoming release + 1, in this
- case rl-1803.xml .
+ Contact the infrastructure team to create the necessary Hydra Jobsets.
- Create two Hydra jobsets: release-17.09 and release-17.09-small with
- stableBranch set to false.
+ channels.nix
- Remove attributes that we know we will not be able to support,
- especially if there is a stable alternative. E.g. Check that our
- Linux kernels'
-
- Edit changelog at
- nixos/doc/manual/release-notes/rl-1709.xml (double
- check desktop versions are noted)
+
-
-
-
- Get all new NixOS modules git diff
- release-17.03..release-17.09 nixos/modules/module-list.nix|grep
- ^+
-
-
-
-
- Note systemd, kernel, glibc and Nix upgrades.
-
-
-
-
+
During Beta
-
+
- Monitor the master branch for bugfixes and minor updates and cherry-pick
- them to the release branch.
+ Monitor the master branch for bugfixes and minor updates and cherry-pick them to the release branch.
@@ -149,7 +151,7 @@
Before the final release
-
+
Re-check that the release notes are complete.
@@ -157,21 +159,17 @@
- Release Nix (currently only Eelco Dolstra can do that).
-
-
- Change stableBranch to true in Hydra and wait for
- the channel to update.
+ Change stableBranch to true in Hydra and wait for the channel to update.
@@ -180,76 +178,143 @@
At final release time
-
+
- git tag -s -a -m "Release 15.09" 15.09
+ Update
- Update "Chapter 4. Upgrading NixOS" section of the manual to match
- new stable release version.
+ Update rl-1909.xml with the release date.
- Update the
- NIXOS_SERIES
- in the
-
+
+git tag --annotate --message="Release 19.09" 19.09
+git push upstream 19.09
+
+
+
+
+ Update
+
+
+
+ NIXOS_SERIES in the Makefile .
+
+
+
+
+ nixos-release.tt with the new NixOS version.
+
+
+
+
+ flake.nix input released-nixpkgs to 19.09.
+
+
+
+
+ Run ./update.sh (this updates flake.lock to updated channel).
+
+
+
+
+
+
+
+
+
+
+
- Get number of commits for the release: git log
- release-14.04..release-14.12 --format=%an|wc -l
+ Create a new topic on
+
+
+
+ You should include the following information:
+
+
+
- Commits by contributor: git log release-14.04..release-14.12
- --format=%an|sort|uniq -c|sort -rn
+ Number of commits for the release:
+
+bash git log release-19.03..release-19.09 --format=%an | wc -l
+
- Create a new topic on
+
+git shortlog --summary --numbered release-19.03..release-19.09
+
+
+
+ Best to check how the previous post was formulated to see what needs to be included.
+
-
+
Release Management Team
+
- For each release there are two release managers. After each release the
- release manager having managed two releases steps down and the release
- management team of the last release appoints a new release manager.
+ For each release there are two release managers. After each release the release manager having managed two releases steps down and the release management team of the last release appoints a new release manager.
+
- This makes sure a release management team always consists of one release
- manager who already has managed one release and one release manager being
- introduced to their role, making it easier to pass on knowledge and
- experience.
+ This makes sure a release management team always consists of one release manager who already has managed one release and one release manager being introduced to their role, making it easier to pass on knowledge and experience.
+
- Release managers for the current NixOS release are tracked by GitHub team
- @NixOS/nixos-release-managers .
+ Release managers for the current NixOS release are tracked by GitHub team @NixOS/nixos-release-managers .
+
- A release manager's role and responsibilities are:
+ A release manager’s role and responsibilities are:
+
- manage the release process start discussions about features and changes for a given release create a roadmap release in cooperation with Eelco Dolstra decide which bug fixes, features, etc... get backported after a release
+
+ manage the release process
+
+
+
+
+ start discussions about features and changes for a given release
+
+
+
+
+ create a roadmap
+
+
+
+
+ release in cooperation with Eelco Dolstra
+
+
+
+
+ decide which bug fixes, features, etc… get backported after a release
+
+
diff --git a/nixos/doc/manual/development/settings-options.xml b/nixos/doc/manual/development/settings-options.xml
index 84895adb444d3..c99c3af92f894 100644
--- a/nixos/doc/manual/development/settings-options.xml
+++ b/nixos/doc/manual/development/settings-options.xml
@@ -137,7 +137,7 @@ in {
description = ''
Configuration for foo, see
<link xlink:href="https://example.com/docs/foo"/>
- for supported values.
+ for supported settings.
'';
};
};
@@ -167,13 +167,50 @@ in {
# We know that the `user` attribute exists because we set a default value
# for it above, allowing us to use it without worries here
- users.users.${cfg.settings.user} = {}
+ users.users.${cfg.settings.user} = {};
# ...
};
}
+
+ Option declarations for attributes
+
+ Some settings attributes may deserve some extra care. They may need a different type, default or merging behavior, or they are essential options that should show their documentation in the manual. This can be done using
+ Declaring a type-checked <literal>settings</literal> attribute
+
+ We extend above example using freeform modules to declare an option for the port, which will enforce it to be a valid integer and make it show up in the manual.
+
+
+settings = lib.mkOption {
+ type = lib.types.submodule {
+
+ freeformType = settingsFormat.type;
+
+ # Declare an option for the port such that the type is checked and this option
+ # is shown in the manual.
+ options.port = lib.mkOption {
+ type = lib.types.port;
+ default = 8080;
+ description = ''
+ Which port this service should listen on.
+ '';
+ };
+
+ };
+ default = {};
+ description = ''
+ Configuration for Foo, see
+ <link xlink:href="https://example.com/docs/foo"/>
+ for supported values.
+ '';
+};
+
+
+
+
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml
index 602f134f9cbfa..d244356dbed19 100644
--- a/nixos/doc/manual/development/writing-modules.xml
+++ b/nixos/doc/manual/development/writing-modules.xml
@@ -183,5 +183,6 @@ in {
mutableUsers = false . Another way is to temporarily add
the following to your configuration:
-
Important: delete the $hostname.qcow2 file if you have
started the virtual machine at least once without the right users, otherwise
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml
index 45d68f8787f1b..d2d1245c57ac9 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.xml
+++ b/nixos/doc/manual/installation/installing-from-other-distro.xml
@@ -211,7 +211,7 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable
use sudo )
-
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 5f216df66f84d..c7ed3b3c0c97f 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -550,7 +550,7 @@ Retype new UNIX password: ***
# Note: setting fileSystems is generally not
# necessary, since nixos-generate-config figures them out
# automatically in hardware-configuration.nix.
- #/mnt :
-# nixos-enter /mnt
+# nixos-enter --root /mnt
Run a shell command:
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 0e9ba027a382a..87f1228561949 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -796,7 +796,7 @@ users.users.me =
or any other display manager in NixOS as they all support auto-login. If you used this module specifically
because it permitted root auto-login you can override the lightdm-autologin pam module like:
-
+
+
+ PHP 7.2 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 20.09 release.
+
+
Python 3 now defaults to Python 3.8 instead of 3.7.
@@ -109,10 +114,21 @@ systemd.services.mysql.serviceConfig.ProtectHome = lib.mkForce "read-only";
systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ];
+
+ The MySQL service no longer runs its systemd service startup script as root anymore. A dedicated non root
+ super user account is required for operation. This means users with an existing MySQL or MariaDB database server are required to run the following SQL statements
+ as a super admin user before upgrading:
+
+CREATE USER IF NOT EXISTS 'mysql'@'localhost' identified with unix_socket;
+GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION;
+
+ If you use MySQL instead of MariaDB please replace unix_socket with auth_socket . If you have changed the value of mysql to a different user please change 'mysql'@'localhost' to the corresponding user instead.
+
- Two new option man-db caches, which are needed by utilities
like whatis and apropos . The caches are generated during the build of
the NixOS configuration: since this can be expensive when a large number of packages are installed, the
@@ -121,7 +137,7 @@ systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ];
- services.postfix.sslCACert was replaced by services.postfix.tlsTrustedAuthorities which now defaults to system certifcate authorities.
+ services.postfix.sslCACert was replaced by services.postfix.tlsTrustedAuthorities which now defaults to system certificate authorities.
@@ -140,6 +156,64 @@ systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ];
Support for built-in LCDs in various pieces of Logitech hardware (keyboards and USB speakers). hardware.logitech.lcd.enable enables support for all hardware supported by the g15daemon project.
+
+
+ Zabbix now defaults to 5.0, updated from 4.4. Please carefully read through
+
+
+ If you are using Zabbix Server with a MySQL or MariaDB database you should note that using a character set of utf8 and a collate of utf8_bin has become mandatory with
+ this release. See the upstream
+ SELECT
+ default_character_set_name,
+ default_collation_name
+ FROM
+ information_schema.schemata
+ WHERE
+ schema_name = 'zabbix';
+
+ If these values are not correct you should take a backup of your database and convert the character set and collation as required. Here is an
+
+ ALTER DATABASE `zabbix` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
+
+ -- the following will produce a list of SQL commands you should subsequently execute
+ SELECT CONCAT("ALTER TABLE ", TABLE_NAME," CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;") AS ExecuteTheString
+ FROM information_schema.`COLUMNS`
+ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ci";
+
+
+
+
+
+ The NixOS module system now supports freeform modules as a mix between types.attrsOf and types.submodule . These allow you to explicitly declare a subset of options while still permitting definitions without an associated option. See
+
+
+
+ The GRUB module gained support for basic password protection, which
+ allows to restrict non-default entries in the boot menu to one or more
+ users. The users and passwords are defined via the option
+ boot.loader.grub.users .
+ Note: Password support is only avaiable in GRUB version 2.
+
+
+
+
+ Following its deprecation in 20.03, the Perl NixOS test driver has been removed.
+ All remaining tests have been ported to the Python test framework.
+ Code outside nixpkgs using make-test.nix or
+ testing.nix needs to be ported to
+ make-test-python.nix and
+ testing-python.nix respectively.
+
+
@@ -159,6 +233,11 @@ systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ];
There is a new doas , a lighter alternative to sudo with many of the same features.
+
+
+
+
@@ -183,12 +262,10 @@ systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ];
in the source tree for downloaded modules instead of using go's buildGoModule switched from
modSha256 to the vendorSha256
- attribute to pin fetched version data. buildGoModule
- still accepts modSha256 with a warning, but support will
- be removed in the next release.
+ attribute to pin fetched version data.
@@ -197,7 +274,7 @@ systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ];
phantomjs project is
phantomJsSupport = true to the package instanciation:
+ It can still be enabled by providing phantomJsSupport = true to the package instantiation:
{
services.grafana.package = pkgs.grafana.overrideAttrs (oldAttrs: rec {
phantomJsSupport = false;
@@ -209,7 +286,7 @@ systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ];
The /var/lib/supybot
as its default stateVersion
- is 20.09 or higher. It also enables number of
+ is 20.09 or higher. It also enables a number of
systemd.services.supybot.serviceConfig .
@@ -523,6 +600,46 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
In the resilio module, [::1] instead of 0.0.0.0 .
+
+
+
+
+ Users of services.openafsClient.packages.module ,
+ services.openafsClient.packages.programs and
+ services.openafsServer.package to select a different
+ OpenAFS package. OpenAFS 1.6 will be removed in the next release. The
+ package openafs and the service options will then
+ silently point to the OpenAFS 1.8 release.
+
+
+ See also the OpenAFS
+
+
+ The storage format of the server key has changed and the key must be converted before running the new release.
+
+
+
+
+ When updating multiple database servers, turn off the database servers
+ from the highest IP down to the lowest with resting periods in
+ between. Start up in reverse order. Do not concurrently run database
+ servers working with different OpenAFS releases!
+
+
+
+
+ Update servers first, then clients.
+
+
+
@@ -616,18 +733,54 @@ services.dokuwiki."mywiki" = {
...
};
+ The base package has also been upgraded to the 2020-07-29 "Hogfather" release. Plugins might be incompatible or require upgrading.
The "/var/lib/postgresql/${cfg.package.psqlSchema}" regardless of your
- 17.09 or below
+ 17.03 or below
should double check what the value of their /var/db/postgresql ) and then explicitly
set this value to maintain compatibility:
services.postgresql.dataDir = "/var/db/postgresql";
+
+ The postgresql module now expects there to be a database super user account called postgres regardless of your 17.03 or below should run the following SQL statements as a
+ database super admin user before upgrading:
+
+CREATE ROLE postgres LOGIN SUPERUSER;
+
+
+
+
+
+ The USBGuard module now removes options and instead hardcodes values for IPCAccessControlFiles , ruleFiles , and auditFilePath . Audit logs can be found in the journal.
+
+
+
+
+ The NixOS module system now evaluates option definitions more strictly, allowing it to detect a larger set of problems.
+ As a result, what previously evaluated may not do so anymore.
+ See
+
+
+
+ For NixOS configuration options, the type loaOf , after
+ its initial deprecation in release 20.03, has been removed. In NixOS and
+ Nixpkgs options using this type have been converted to attrsOf .
+ For more information on this change have look at these links:
+
+
+
+
+ config.systemd.services.${name}.path now returns a list of paths instead of a colon-separated string.
+
@@ -664,6 +817,11 @@ services.postgresql.dataDir = "/var/db/postgresql";
The default output of buildGoPackage is now $out instead of $bin .
+
+
+ buildGoModule doCheck now defaults to true .
+
+
Packages built using buildRustPackage now use release
@@ -834,6 +992,73 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
There are no functional changes, however this may require updating some configurations to use correct types for all attributes.
+
+
+ The fontconfig module stopped generating fontconfig 2.10.x config and cache.
+ Fontconfig 2.10.x was removed from Nixpkgs - it hasn't been used in any nixpkgs package anymore.
+
+
+
+
+ Nginx module nginxModules.fastcgi-cache-purge renamed to official name nginxModules.cache-purge .
+ Nginx module nginxModules.ngx_aws_auth renamed to official name nginxModules.aws-auth .
+ The packages perl , rsync and strace were removed from systemPackages . If you need them, install them again with configuration.nix .
+
+
+
+
+ The undervolt option no longer needs to apply its
+ settings every 30s. If they still become undone, open an issue and restore
+ the previous behaviour using undervolt.useTimer .
+
+
+
+
+ Agda has been heavily reworked.
+
+
+
+ agda.mkDerivation has been heavily changed and
+ is now located at agdaPackages.mkDerivation .
+
+
+
+
+ New top-level packages agda and
+ agda.withPackages have been added, the second
+ of which sets up agda with access to chosen libraries.
+
+
+
+
+ All agda libraries now live under
+ agdaPackages .
+
+
+
+
+ Many broken libraries have been removed.
+
+
+
+ See the
+
+
+
+ The deepin package set has been removed from
+ nixpkgs. It was a work in progress to package the
+ netease-cloud-music has also been
+ removed, as it depends on libraries from deepin.
+
+
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index c8824c2690d33..15429a7160c5a 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -24,11 +24,11 @@
check ? true
, prefix ? []
, lib ? import ../../lib
+, extraModules ? let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH";
+ in if e == "" then [] else [(import e)]
}:
let extraArgs_ = extraArgs; pkgs_ = pkgs;
- extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH";
- in if e == "" then [] else [(import e)];
in
let
diff --git a/nixos/lib/make-options-doc/options-to-docbook.xsl b/nixos/lib/make-options-doc/options-to-docbook.xsl
index 72ac89d4ff62c..18d19fddaca24 100644
--- a/nixos/lib/make-options-doc/options-to-docbook.xsl
+++ b/nixos/lib/make-options-doc/options-to-docbook.xsl
@@ -20,7 +20,7 @@
Configuration Options
-
-sub getTTYText {
- my ($self, $tty) = @_;
-
- my ($status, $out) = $self->execute("fold -w\$(stty -F /dev/tty${tty} size | awk '{print \$2}') /dev/vcs${tty}");
- return $out;
-}
-
-# Wait until TTY's text matches a particular regular expression
-sub waitUntilTTYMatches {
- my ($self, $tty, $regexp) = @_;
-
- $self->nest("waiting for $regexp to appear on tty $tty", sub {
- retry sub {
- my ($retries_remaining) = @_;
- if ($retries_remaining == 0) {
- $self->log("Last chance to match /$regexp/ on TTY$tty, which currently contains:");
- $self->log($self->getTTYText($tty));
- }
-
- return 1 if $self->getTTYText($tty) =~ /$regexp/;
- }
- });
-}
-
-# Debugging: Dump the contents of the TTY
-sub dumpTTYContents {
- my ($self, $tty) = @_;
-
- $self->execute("fold -w 80 /dev/vcs${tty} | systemd-cat");
-}
-
-# Take a screenshot and return the result as text using optical character
-# recognition.
-sub getScreenText {
- my ($self) = @_;
-
- system("command -v tesseract &> /dev/null") == 0
- or die "getScreenText used but enableOCR is false";
-
- my $text;
- $self->nest("performing optical character recognition", sub {
- my $tmpbase = Cwd::abs_path(".")."/ocr";
- my $tmpin = $tmpbase."in.ppm";
-
- $self->sendMonitorCommand("screendump $tmpin");
-
- my $magickArgs = "-filter Catrom -density 72 -resample 300 "
- . "-contrast -normalize -despeckle -type grayscale "
- . "-sharpen 1 -posterize 3 -negate -gamma 100 "
- . "-blur 1x65535";
- my $tessArgs = "-c debug_file=/dev/null --psm 11 --oem 2";
-
- $text = `convert $magickArgs $tmpin tiff:- | tesseract - - $tessArgs`;
- my $status = $? >> 8;
- unlink $tmpin;
-
- die "OCR failed with exit code $status" if $status != 0;
- });
- return $text;
-}
-
-
-# Wait until a specific regexp matches the textual contents of the screen.
-sub waitForText {
- my ($self, $regexp) = @_;
- $self->nest("waiting for $regexp to appear on the screen", sub {
- retry sub {
- my ($retries_remaining) = @_;
- if ($retries_remaining == 0) {
- $self->log("Last chance to match /$regexp/ on the screen, which currently contains:");
- $self->log($self->getScreenText);
- }
-
- return 1 if $self->getScreenText =~ /$regexp/;
- }
- });
-}
-
-
-# Wait until it is possible to connect to the X server. Note that
-# testing the existence of /tmp/.X11-unix/X0 is insufficient.
-sub waitForX {
- my ($self, $regexp) = @_;
- $self->nest("waiting for the X11 server", sub {
- retry sub {
- my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'Reached target Current graphical'");
- return 0 if $status != 0;
- ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]");
- return 1 if $status == 0;
- }
- });
-}
-
-
-sub getWindowNames {
- my ($self) = @_;
- my $res = $self->mustSucceed(
- q{xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'});
- return split /\n/, $res;
-}
-
-
-sub waitForWindow {
- my ($self, $regexp) = @_;
- $self->nest("waiting for a window to appear", sub {
- retry sub {
- my @names = $self->getWindowNames;
-
- my ($retries_remaining) = @_;
- if ($retries_remaining == 0) {
- $self->log("Last chance to match /$regexp/ on the the window list, which currently contains:");
- $self->log(join(", ", @names));
- }
-
- foreach my $n (@names) {
- return 1 if $n =~ /$regexp/;
- }
- }
- });
-}
-
-
-sub copyFileFromHost {
- my ($self, $from, $to) = @_;
- my $s = `cat $from` or die;
- $s =~ s/'/'\\''/g;
- $self->mustSucceed("echo '$s' > $to");
-}
-
-
-my %charToKey = (
- 'A' => "shift-a", 'N' => "shift-n", '-' => "0x0C", '_' => "shift-0x0C", '!' => "shift-0x02",
- 'B' => "shift-b", 'O' => "shift-o", '=' => "0x0D", '+' => "shift-0x0D", '@' => "shift-0x03",
- 'C' => "shift-c", 'P' => "shift-p", '[' => "0x1A", '{' => "shift-0x1A", '#' => "shift-0x04",
- 'D' => "shift-d", 'Q' => "shift-q", ']' => "0x1B", '}' => "shift-0x1B", '$' => "shift-0x05",
- 'E' => "shift-e", 'R' => "shift-r", ';' => "0x27", ':' => "shift-0x27", '%' => "shift-0x06",
- 'F' => "shift-f", 'S' => "shift-s", '\'' => "0x28", '"' => "shift-0x28", '^' => "shift-0x07",
- 'G' => "shift-g", 'T' => "shift-t", '`' => "0x29", '~' => "shift-0x29", '&' => "shift-0x08",
- 'H' => "shift-h", 'U' => "shift-u", '\\' => "0x2B", '|' => "shift-0x2B", '*' => "shift-0x09",
- 'I' => "shift-i", 'V' => "shift-v", ',' => "0x33", '<' => "shift-0x33", '(' => "shift-0x0A",
- 'J' => "shift-j", 'W' => "shift-w", '.' => "0x34", '>' => "shift-0x34", ')' => "shift-0x0B",
- 'K' => "shift-k", 'X' => "shift-x", '/' => "0x35", '?' => "shift-0x35",
- 'L' => "shift-l", 'Y' => "shift-y", ' ' => "spc",
- 'M' => "shift-m", 'Z' => "shift-z", "\n" => "ret",
-);
-
-
-sub sendKeys {
- my ($self, @keys) = @_;
- foreach my $key (@keys) {
- $key = $charToKey{$key} if exists $charToKey{$key};
- $self->sendMonitorCommand("sendkey $key");
- }
-}
-
-
-sub sendChars {
- my ($self, $chars) = @_;
- $self->nest("sending keys ‘$chars’", sub {
- $self->sendKeys(split //, $chars);
- });
-}
-
-
-# Sleep N seconds (in virtual guest time, not real time).
-sub sleep {
- my ($self, $time) = @_;
- $self->succeed("sleep $time");
-}
-
-
-# Forward a TCP port on the host to a TCP port on the guest. Useful
-# during interactive testing.
-sub forwardPort {
- my ($self, $hostPort, $guestPort) = @_;
- $hostPort = 8080 unless defined $hostPort;
- $guestPort = 80 unless defined $guestPort;
- $self->sendMonitorCommand("hostfwd_add tcp::$hostPort-:$guestPort");
-}
-
-
-1;
diff --git a/nixos/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl
deleted file mode 100644
index a3354fb0e1eb8..0000000000000
--- a/nixos/lib/test-driver/test-driver.pl
+++ /dev/null
@@ -1,191 +0,0 @@
-#! /somewhere/perl -w
-
-use strict;
-use Machine;
-use Term::ReadLine;
-use IO::File;
-use IO::Pty;
-use Logger;
-use Cwd;
-use POSIX qw(_exit dup2);
-use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
-
-$SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly
-
-STDERR->autoflush(1);
-
-my $log = new Logger;
-
-
-# Start vde_switch for each network required by the test.
-my %vlans;
-foreach my $vlan (split / /, $ENV{VLANS} || "") {
- next if defined $vlans{$vlan};
- # Start vde_switch as a child process. We don't run it in daemon
- # mode because we want the child process to be cleaned up when we
- # die. Since we have to make sure that the control socket is
- # ready, we send a dummy command to vde_switch (via stdin) and
- # wait for a reply. Note that vde_switch requires stdin to be a
- # TTY, so we create one.
- $log->log("starting VDE switch for network $vlan");
- my $socket = Cwd::abs_path "./vde$vlan.ctl";
- my $pty = new IO::Pty;
- my ($stdoutR, $stdoutW); pipe $stdoutR, $stdoutW;
- my $pid = fork(); die "cannot fork" unless defined $pid;
- if ($pid == 0) {
- dup2(fileno($pty->slave), 0);
- dup2(fileno($stdoutW), 1);
- exec "vde_switch -s $socket --dirmode 0700" or _exit(1);
- }
- close $stdoutW;
- print $pty "version\n";
- readline $stdoutR or die "cannot start vde_switch";
- $ENV{"QEMU_VDE_SOCKET_$vlan"} = $socket;
- $vlans{$vlan} = $pty;
- die unless -e "$socket/ctl";
-}
-
-
-my %vms;
-my $context = "";
-
-sub createMachine {
- my ($args) = @_;
- my $vm = Machine->new({%{$args}, log => $log, redirectSerial => ($ENV{USE_SERIAL} // "0") ne "1"});
- $vms{$vm->name} = $vm;
- $context .= "my \$" . $vm->name . " = \$vms{'" . $vm->name . "'}; ";
- return $vm;
-}
-
-foreach my $vmScript (@ARGV) {
- my $vm = createMachine({startCommand => $vmScript});
-}
-
-
-sub startAll {
- $log->nest("starting all VMs", sub {
- $_->start foreach values %vms;
- });
-}
-
-
-# Wait until all VMs have terminated.
-sub joinAll {
- $log->nest("waiting for all VMs to finish", sub {
- $_->waitForShutdown foreach values %vms;
- });
-}
-
-
-# In interactive tests, this allows the non-interactive test script to
-# be executed conveniently.
-sub testScript {
- eval "$context $ENV{testScript};\n";
- warn $@ if $@;
-}
-
-
-my $nrTests = 0;
-my $nrSucceeded = 0;
-
-
-sub subtest {
- my ($name, $coderef) = @_;
- $log->nest("subtest: $name", sub {
- $nrTests++;
- eval { &$coderef };
- if ($@) {
- $log->log("error: $@", { error => 1 });
- } else {
- $nrSucceeded++;
- }
- });
-}
-
-
-sub runTests {
- if (defined $ENV{tests}) {
- $log->nest("running the VM test script", sub {
- eval "$context $ENV{tests}";
- if ($@) {
- $log->log("error: $@", { error => 1 });
- die $@;
- }
- }, { expanded => 1 });
- } else {
- my $term = Term::ReadLine->new('nixos-vm-test');
- $term->ReadHistory;
- while (defined ($_ = $term->readline("> "))) {
- eval "$context $_\n";
- warn $@ if $@;
- }
- $term->WriteHistory;
- }
-
- # Copy the kernel coverage data for each machine, if the kernel
- # has been compiled with coverage instrumentation.
- $log->nest("collecting coverage data", sub {
- foreach my $vm (values %vms) {
- my $gcovDir = "/sys/kernel/debug/gcov";
-
- next unless $vm->isUp();
-
- my ($status, $out) = $vm->execute("test -e $gcovDir");
- next if $status != 0;
-
- # Figure out where to put the *.gcda files so that the
- # report generator can find the corresponding kernel
- # sources.
- my $kernelDir = $vm->mustSucceed("echo \$(dirname \$(readlink -f /run/current-system/kernel))/.build/linux-*");
- chomp $kernelDir;
- my $coverageDir = "/tmp/xchg/coverage-data/$kernelDir";
-
- # Copy all the *.gcda files.
- $vm->execute("for d in $gcovDir/nix/store/*/.build/linux-*; do for i in \$(cd \$d && find -name '*.gcda'); do echo \$i; mkdir -p $coverageDir/\$(dirname \$i); cp -v \$d/\$i $coverageDir/\$i; done; done");
- }
- });
-
- $log->nest("syncing", sub {
- foreach my $vm (values %vms) {
- next unless $vm->isUp();
- $vm->execute("sync");
- }
- });
-
- if ($nrTests != 0) {
- $log->log("$nrSucceeded out of $nrTests tests succeeded",
- ($nrSucceeded < $nrTests ? { error => 1 } : { }));
- }
-}
-
-
-# Create an empty raw virtual disk with the given name and size (in
-# MiB).
-sub createDisk {
- my ($name, $size) = @_;
- system("qemu-img create -f raw $name ${size}M") == 0
- or die "cannot create image of size $size";
-}
-
-
-END {
- $log->nest("cleaning up", sub {
- foreach my $vm (values %vms) {
- if ($vm->{pid}) {
- $log->log("killing " . $vm->{name} . " (pid " . $vm->{pid} . ")");
- kill 9, $vm->{pid};
- }
- }
- });
- $log->close();
-}
-
-my $now1 = clock_gettime(CLOCK_MONOTONIC);
-
-runTests;
-
-my $now2 = clock_gettime(CLOCK_MONOTONIC);
-
-printf STDERR "test script finished in %.2fs\n", $now2 - $now1;
-
-exit ($nrSucceeded < $nrTests ? 1 : 0);
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 7b8d5803aa5a6..93f94587c0a50 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -424,15 +424,18 @@ def succeed(self, *commands: str) -> str:
output += out
return output
- def fail(self, *commands: str) -> None:
+ def fail(self, *commands: str) -> str:
"""Execute each command and check that it fails."""
+ output = ""
for command in commands:
with self.nested("must fail: {}".format(command)):
- status, output = self.execute(command)
+ (status, out) = self.execute(command)
if status == 0:
raise Exception(
"command `{}` unexpectedly succeeded".format(command)
)
+ output += out
+ return output
def wait_until_succeeds(self, command: str) -> str:
"""Wait until a command returns success and return its output.
@@ -837,7 +840,8 @@ def window_is_visible(last_try: bool) -> bool:
retry(window_is_visible)
def sleep(self, secs: int) -> None:
- time.sleep(secs)
+ # We want to sleep in *guest* time, not *host* time.
+ self.succeed(f"sleep {secs}")
def forward_port(self, host_port: int = 8080, guest_port: int = 80) -> None:
"""Forward a TCP port on the host to a TCP port on the guest.
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
deleted file mode 100644
index 5c784c2f0abe4..0000000000000
--- a/nixos/lib/testing.nix
+++ /dev/null
@@ -1,258 +0,0 @@
-{ system
-, pkgs ? import ../.. { inherit system config; }
- # Use a minimal kernel?
-, minimal ? false
- # Ignored
-, config ? {}
- # Modules to add to each VM
-, extraConfigurations ? [] }:
-
-with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; };
-with pkgs;
-
-rec {
-
- inherit pkgs;
-
-
- testDriver = lib.warn ''
- Perl VM tests are deprecated and will be removed for 20.09.
- Please update your tests to use the python test driver.
- See https://github.com/NixOS/nixpkgs/pull/71684 for details.
- '' stdenv.mkDerivation {
- name = "nixos-test-driver";
-
- buildInputs = [ makeWrapper perl ];
-
- dontUnpack = true;
-
- preferLocalBuild = true;
-
- installPhase =
- ''
- mkdir -p $out/bin
- cp ${./test-driver/test-driver.pl} $out/bin/nixos-test-driver
- chmod u+x $out/bin/nixos-test-driver
-
- libDir=$out/${perl.libPrefix}
- mkdir -p $libDir
- cp ${./test-driver/Machine.pm} $libDir/Machine.pm
- cp ${./test-driver/Logger.pm} $libDir/Logger.pm
-
- wrapProgram $out/bin/nixos-test-driver \
- --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \
- --prefix PERL5LIB : "${with perlPackages; makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/${perl.libPrefix}"
- '';
- };
-
-
- # Run an automated test suite in the given virtual network.
- # `driver' is the script that runs the network.
- runTests = driver:
- stdenv.mkDerivation {
- name = "vm-test-run-${driver.testName}";
-
- requiredSystemFeatures = [ "kvm" "nixos-test" ];
-
- buildCommand =
- ''
- mkdir -p $out
-
- LOGFILE=/dev/null tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver
-
- for i in */xchg/coverage-data; do
- mkdir -p $out/coverage-data
- mv $i $out/coverage-data/$(dirname $(dirname $i))
- done
- '';
- };
-
-
- makeTest =
- { testScript
- , makeCoverageReport ? false
- , enableOCR ? false
- , name ? "unnamed"
- , ...
- } @ t:
-
- let
- # A standard store path to the vm monitor is built like this:
- # /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor
- # The max filename length of a unix domain socket is 108 bytes.
- # This means $name can at most be 50 bytes long.
- maxTestNameLen = 50;
- testNameLen = builtins.stringLength name;
-
- testDriverName = with builtins;
- if testNameLen > maxTestNameLen then
- abort ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " +
- "it's currently ${toString testNameLen} characters long.")
- else
- "nixos-test-driver-${name}";
-
- nodes = buildVirtualNetwork (
- t.nodes or (if t ? machine then { machine = t.machine; } else { }));
-
- testScript' =
- # Call the test script with the computed nodes.
- if lib.isFunction testScript
- then testScript { inherit nodes; }
- else testScript;
-
- vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);
-
- vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
-
- ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; };
-
- imagemagick_tiff = imagemagick_light.override { inherit libtiff; };
-
- # Generate onvenience wrappers for running the test driver
- # interactively with the specified network, and for starting the
- # VMs from the command line.
- driver = runCommand testDriverName
- { buildInputs = [ makeWrapper];
- testScript = testScript';
- preferLocalBuild = true;
- testName = name;
- }
- ''
- mkdir -p $out/bin
- echo "$testScript" > $out/test-script
- ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
- vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done))
- wrapProgram $out/bin/nixos-test-driver \
- --add-flags "''${vms[*]}" \
- ${lib.optionalString enableOCR
- "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \
- --run "export testScript=\"\$(cat $out/test-script)\"" \
- --set VLANS '${toString vlans}'
- ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
- wrapProgram $out/bin/nixos-run-vms \
- --add-flags "''${vms[*]}" \
- ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
- --set tests 'startAll; joinAll;' \
- --set VLANS '${toString vlans}' \
- ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"}
- ''; # "
-
- passMeta = drv: drv // lib.optionalAttrs (t ? meta) {
- meta = (drv.meta or {}) // t.meta;
- };
-
- test = passMeta (runTests driver);
- report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; });
-
- nodeNames = builtins.attrNames nodes;
- invalidNodeNames = lib.filter
- (node: builtins.match "^[A-z_][A-z0-9_]+$" node == null) nodeNames;
-
- in
- if lib.length invalidNodeNames > 0 then
- throw ''
- Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
- All machines are referenced as perl variables in the testing framework which will break the
- script when special characters are used.
-
- Please stick to alphanumeric chars and underscores as separation.
- ''
- else
- (if makeCoverageReport then report else test) // {
- inherit nodes driver test;
- };
-
- runInMachine =
- { drv
- , machine
- , preBuild ? ""
- , postBuild ? ""
- , ... # ???
- }:
- let
- vm = buildVM { }
- [ machine
- { key = "run-in-machine";
- networking.hostName = "client";
- nix.readOnlyStore = false;
- virtualisation.writableStore = false;
- }
- ];
-
- buildrunner = writeText "vm-build" ''
- source $1
-
- ${coreutils}/bin/mkdir -p $TMPDIR
- cd $TMPDIR
-
- exec $origBuilder $origArgs
- '';
-
- testScript = ''
- startAll;
- $client->waitForUnit("multi-user.target");
- ${preBuild}
- $client->succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2");
- ${postBuild}
- $client->succeed("sync"); # flush all data before pulling the plug
- '';
-
- vmRunCommand = writeText "vm-run" ''
- xchg=vm-state-client/xchg
- ${coreutils}/bin/mkdir $out
- ${coreutils}/bin/mkdir -p $xchg
-
- for i in $passAsFile; do
- i2=''${i}Path
- _basename=$(${coreutils}/bin/basename ''${!i2})
- ${coreutils}/bin/cp ''${!i2} $xchg/$_basename
- eval $i2=/tmp/xchg/$_basename
- ${coreutils}/bin/ls -la $xchg
- done
-
- unset i i2 _basename
- export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env
- unset xchg
-
- export tests='${testScript}'
- ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm
- ''; # */
-
- in
- lib.overrideDerivation drv (attrs: {
- requiredSystemFeatures = [ "kvm" ];
- builder = "${bash}/bin/sh";
- args = ["-e" vmRunCommand];
- origArgs = attrs.args;
- origBuilder = attrs.builder;
- });
-
-
- runInMachineWithX = { require ? [], ... } @ args:
- let
- client =
- { ... }:
- {
- inherit require;
- imports = [
- ../tests/common/auto.nix
- ];
- virtualisation.memorySize = 1024;
- services.xserver.enable = true;
- test-support.displayManager.auto.enable = true;
- services.xserver.displayManager.defaultSession = "none+icewm";
- services.xserver.windowManager.icewm.enable = true;
- };
- in
- runInMachine ({
- machine = client;
- preBuild =
- ''
- $client->waitForX;
- '';
- } // args);
-
-
- simpleTest = as: (makeTest as).test;
-
-}
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index 36f3e7af873d2..b09f4ca47a3fc 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -63,8 +63,8 @@ in {
fsType = "ext4";
configFile = pkgs.writeText "configuration.nix"
''
- {
- imports = [ ];
+ { modulesPath, ... }: {
+ imports = [ "''${modulesPath}/virtualisation/amazon-image.nix" ];
${optionalString config.ec2.hvm ''
ec2.hvm = true;
''}
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 145eb49ced7a3..89e24f2ccfd95 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -29,7 +29,7 @@ log() {
echo "$@" >&2
}
-if [ -z "$1" ]; then
+if [ "$#" -ne 1 ]; then
log "Usage: ./upload-amazon-image.sh IMAGE_OUTPUT"
exit 1
fi
diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix
deleted file mode 100644
index 7e311a21acf69..0000000000000
--- a/nixos/modules/config/fonts/fontconfig-penultimate.nix
+++ /dev/null
@@ -1,292 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.fonts.fontconfig;
-
- fcBool = x: "" + (boolToString x) + " ";
-
- # back-supported fontconfig version and package
- # version is used for font cache generation
- supportVersion = "210";
- supportPkg = pkgs."fontconfig_${supportVersion}";
-
- # latest fontconfig version and package
- # version is used for configuration folder name, /etc/fonts/VERSION/
- # note: format differs from supportVersion and can not be used with makeCacheConf
- latestVersion = pkgs.fontconfig.configVersion;
- latestPkg = pkgs.fontconfig;
-
- # supported version fonts.conf
- supportFontsConf = pkgs.makeFontsConf { fontconfig = supportPkg; fontDirectories = config.fonts.fonts; };
-
- # configuration file to read fontconfig cache
- # version dependent
- # priority 0
- cacheConfSupport = makeCacheConf { version = supportVersion; };
- cacheConfLatest = makeCacheConf {};
-
- # generate the font cache setting file for a fontconfig version
- # use latest when no version is passed
- makeCacheConf = { version ? null }:
- let
- fcPackage = if version == null
- then "fontconfig"
- else "fontconfig_${version}";
- makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; };
- cache = makeCache pkgs.${fcPackage};
- cache32 = makeCache pkgs.pkgsi686Linux.${fcPackage};
- in
- pkgs.writeText "fc-00-nixos-cache.conf" ''
-
-
-
-
- ${concatStringsSep "\n" (map (font: "${font} ") config.fonts.fonts)}
-
- ${cache}
- ${optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) ''
- ${cache32}
- ''}
-
- '';
-
- # local configuration file
- localConf = pkgs.writeText "fc-local.conf" cfg.localConf;
-
- # rendering settings configuration files
- # priority 10
- hintingConf = pkgs.writeText "fc-10-hinting.conf" ''
-
-
-
-
-
-
-
- ${fcBool cfg.hinting.enable}
-
-
- ${fcBool cfg.hinting.autohint}
-
-
- hintslight
-
-
-
-
- '';
-
- antialiasConf = pkgs.writeText "fc-10-antialias.conf" ''
-
-
-
-
-
-
-
- ${fcBool cfg.antialias}
-
-
-
-
- '';
-
- subpixelConf = pkgs.writeText "fc-10-subpixel.conf" ''
-
-
-
-
-
-
-
- ${cfg.subpixel.rgba}
-
-
- lcd${cfg.subpixel.lcdfilter}
-
-
-
-
- '';
-
- dpiConf = pkgs.writeText "fc-11-dpi.conf" ''
-
-
-
-
-
-
- ${toString cfg.dpi}
-
-
-
-
- '';
-
- # default fonts configuration file
- # priority 52
- defaultFontsConf =
- let genDefault = fonts: name:
- optionalString (fonts != []) ''
-
- ${name}
-
- ${concatStringsSep ""
- (map (font: ''
- ${font}
- '') fonts)}
-
-
- '';
- in
- pkgs.writeText "fc-52-nixos-default-fonts.conf" ''
-
-
-
-
-
- ${genDefault cfg.defaultFonts.sansSerif "sans-serif"}
-
- ${genDefault cfg.defaultFonts.serif "serif"}
-
- ${genDefault cfg.defaultFonts.monospace "monospace"}
-
-
- '';
-
- # reject Type 1 fonts
- # priority 53
- rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" ''
-
-
-
-
-
-
-
-
- Type 1
-
-
-
-
- '';
-
- # The configuration to be included in /etc/font/
- penultimateConf = pkgs.runCommand "fontconfig-penultimate-conf" {
- preferLocalBuild = true;
- } ''
- support_folder=$out/etc/fonts/conf.d
- latest_folder=$out/etc/fonts/${latestVersion}/conf.d
-
- mkdir -p $support_folder
- mkdir -p $latest_folder
-
- # fonts.conf
- ln -s ${supportFontsConf} $support_folder/../fonts.conf
- ln -s ${latestPkg.out}/etc/fonts/fonts.conf \
- $latest_folder/../fonts.conf
-
- # fontconfig-penultimate various configuration files
- ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \
- $support_folder
- ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \
- $latest_folder
-
- ln -s ${cacheConfSupport} $support_folder/00-nixos-cache.conf
- ln -s ${cacheConfLatest} $latest_folder/00-nixos-cache.conf
-
- rm $support_folder/10-antialias.conf $latest_folder/10-antialias.conf
- ln -s ${antialiasConf} $support_folder/10-antialias.conf
- ln -s ${antialiasConf} $latest_folder/10-antialias.conf
-
- rm $support_folder/10-hinting.conf $latest_folder/10-hinting.conf
- ln -s ${hintingConf} $support_folder/10-hinting.conf
- ln -s ${hintingConf} $latest_folder/10-hinting.conf
-
- ${optionalString cfg.useEmbeddedBitmaps ''
- rm $support_folder/10-no-embedded-bitmaps.conf
- rm $latest_folder/10-no-embedded-bitmaps.conf
- ''}
-
- rm $support_folder/10-subpixel.conf $latest_folder/10-subpixel.conf
- ln -s ${subpixelConf} $support_folder/10-subpixel.conf
- ln -s ${subpixelConf} $latest_folder/10-subpixel.conf
-
- ${optionalString (cfg.dpi != 0) ''
- ln -s ${dpiConf} $support_folder/11-dpi.conf
- ln -s ${dpiConf} $latest_folder/11-dpi.conf
- ''}
-
- # 50-user.conf
- ${optionalString (!cfg.includeUserConf) ''
- rm $support_folder/50-user.conf
- rm $latest_folder/50-user.conf
- ''}
-
- # 51-local.conf
- rm $latest_folder/51-local.conf
- substitute \
- ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/51-local.conf \
- $latest_folder/51-local.conf \
- --replace local.conf /etc/fonts/${latestVersion}/local.conf
-
- # local.conf (indirect priority 51)
- ${optionalString (cfg.localConf != "") ''
- ln -s ${localConf} $support_folder/../local.conf
- ln -s ${localConf} $latest_folder/../local.conf
- ''}
-
- # 52-nixos-default-fonts.conf
- ln -s ${defaultFontsConf} $support_folder/52-nixos-default-fonts.conf
- ln -s ${defaultFontsConf} $latest_folder/52-nixos-default-fonts.conf
-
- # 53-no-bitmaps.conf
- ${optionalString cfg.allowBitmaps ''
- rm $support_folder/53-no-bitmaps.conf
- rm $latest_folder/53-no-bitmaps.conf
- ''}
-
- ${optionalString (!cfg.allowType1) ''
- # 53-nixos-reject-type1.conf
- ln -s ${rejectType1} $support_folder/53-nixos-reject-type1.conf
- ln -s ${rejectType1} $latest_folder/53-nixos-reject-type1.conf
- ''}
- '';
-
-in
-{
-
- options = {
-
- fonts = {
-
- fontconfig = {
-
- penultimate = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enable fontconfig-penultimate settings to supplement the
- NixOS defaults by providing per-font rendering defaults and
- metric aliases.
- '';
- };
- };
-
- };
- };
-
- };
-
- config = mkIf (config.fonts.fontconfig.enable && config.fonts.fontconfig.penultimate.enable) {
-
- fonts.fontconfig.confPackages = [ penultimateConf ];
-
- };
-
-}
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 52d284f739b3c..1f1044bc5af82 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -1,11 +1,6 @@
/*
-NixOS support 2 fontconfig versions, "support" and "latest".
-
-- "latest" refers to default fontconfig package (pkgs.fontconfig).
- configuration files are linked to /etc/fonts/VERSION/conf.d/
-- "support" refers to supportPkg (pkgs."fontconfig_${supportVersion}").
- configuration files are linked to /etc/fonts/conf.d/
+Configuration files are linked to /etc/fonts/${pkgs.fontconfig.configVersion}/conf.d/
This module generates a package containing configuration files and link it in /etc/fonts.
@@ -22,40 +17,21 @@ let
cfg = config.fonts.fontconfig;
fcBool = x: "" + (boolToString x) + " ";
-
- # back-supported fontconfig version and package
- # version is used for font cache generation
- supportVersion = "210";
- supportPkg = pkgs."fontconfig_${supportVersion}";
-
- # latest fontconfig version and package
- # version is used for configuration folder name, /etc/fonts/VERSION/
- # note: format differs from supportVersion and can not be used with makeCacheConf
- latestVersion = pkgs.fontconfig.configVersion;
- latestPkg = pkgs.fontconfig;
-
- # supported version fonts.conf
- supportFontsConf = pkgs.makeFontsConf { fontconfig = supportPkg; fontDirectories = config.fonts.fonts; };
+ pkg = pkgs.fontconfig;
# configuration file to read fontconfig cache
- # version dependent
# priority 0
- cacheConfSupport = makeCacheConf { version = supportVersion; };
- cacheConfLatest = makeCacheConf {};
+ cacheConf = makeCacheConf {};
- # generate the font cache setting file for a fontconfig version
- # use latest when no version is passed
+ # generate the font cache setting file
# When cross-compiling, we can’t generate the cache, so we skip the
# part. fontconfig still works but is a little slower in
# looking things up.
- makeCacheConf = { version ? null }:
+ makeCacheConf = { }:
let
- fcPackage = if version == null
- then "fontconfig"
- else "fontconfig_${version}";
makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; };
- cache = makeCache pkgs.${fcPackage};
- cache32 = makeCache pkgs.pkgsi686Linux.${fcPackage};
+ cache = makeCache pkgs.fontconfig;
+ cache32 = makeCache pkgs.pkgsi686Linux.fontconfig;
in
pkgs.writeText "fc-00-nixos-cache.conf" ''
@@ -200,59 +176,47 @@ let
confPkg = pkgs.runCommand "fontconfig-conf" {
preferLocalBuild = true;
} ''
- support_folder=$out/etc/fonts/conf.d
- latest_folder=$out/etc/fonts/${latestVersion}/conf.d
-
- mkdir -p $support_folder
- mkdir -p $latest_folder
+ dst=$out/etc/fonts/${pkg.configVersion}/conf.d
+ mkdir -p $dst
# fonts.conf
- ln -s ${supportFontsConf} $support_folder/../fonts.conf
- ln -s ${latestPkg.out}/etc/fonts/fonts.conf \
- $latest_folder/../fonts.conf
+ ln -s ${pkg.out}/etc/fonts/fonts.conf \
+ $dst/../fonts.conf
+ # TODO: remove this legacy symlink once people stop using packages built before #95358 was merged
+ ln -s /etc/fonts/${pkg.configVersion}/fonts.conf \
+ $out/etc/fonts/fonts.conf
# fontconfig default config files
- ln -s ${supportPkg.out}/etc/fonts/conf.d/*.conf \
- $support_folder/
- # Latest fontconfig is configured to look for the upstream defaults inside the package.
+ ln -s ${pkg.out}/etc/fonts/conf.d/*.conf \
+ $dst/
# 00-nixos-cache.conf
- ln -s ${cacheConfSupport} \
- $support_folder/00-nixos-cache.conf
- ln -s ${cacheConfLatest} $latest_folder/00-nixos-cache.conf
+ ln -s ${cacheConf} $dst/00-nixos-cache.conf
# 10-nixos-rendering.conf
- ln -s ${renderConf} $support_folder/10-nixos-rendering.conf
- ln -s ${renderConf} $latest_folder/10-nixos-rendering.conf
+ ln -s ${renderConf} $dst/10-nixos-rendering.conf
# 50-user.conf
- ${optionalString (!cfg.includeUserConf) ''
- rm $support_folder/50-user.conf
- ''}
# Since latest fontconfig looks for default files inside the package,
# we had to move this one elsewhere to be able to exclude it here.
${optionalString cfg.includeUserConf ''
- ln -s ${latestPkg.out}/etc/fonts/conf.d.bak/50-user.conf $latest_folder/50-user.conf
+ ln -s ${pkg.out}/etc/fonts/conf.d.bak/50-user.conf $dst/50-user.conf
''}
# local.conf (indirect priority 51)
${optionalString (cfg.localConf != "") ''
- ln -s ${localConf} $support_folder/../local.conf
- ln -s ${localConf} $latest_folder/../local.conf
+ ln -s ${localConf} $dst/../local.conf
''}
# 52-nixos-default-fonts.conf
- ln -s ${defaultFontsConf} $support_folder/52-nixos-default-fonts.conf
- ln -s ${defaultFontsConf} $latest_folder/52-nixos-default-fonts.conf
+ ln -s ${defaultFontsConf} $dst/52-nixos-default-fonts.conf
# 53-no-bitmaps.conf
- ln -s ${rejectBitmaps} $support_folder/53-no-bitmaps.conf
- ln -s ${rejectBitmaps} $latest_folder/53-no-bitmaps.conf
+ ln -s ${rejectBitmaps} $dst/53-no-bitmaps.conf
${optionalString (!cfg.allowType1) ''
# 53-nixos-reject-type1.conf
- ln -s ${rejectType1} $support_folder/53-nixos-reject-type1.conf
- ln -s ${rejectType1} $latest_folder/53-nixos-reject-type1.conf
+ ln -s ${rejectType1} $dst/53-nixos-reject-type1.conf
''}
'';
@@ -486,7 +450,7 @@ in
environment.systemPackages = [ pkgs.fontconfig ];
environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/";
})
- (mkIf (cfg.enable && !cfg.penultimate.enable) {
+ (mkIf cfg.enable {
fonts.fontconfig.confPackages = [ confPkg ];
})
];
diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix
index ff16ffcf9c65b..c2302451d702f 100644
--- a/nixos/modules/config/krb5/default.nix
+++ b/nixos/modules/config/krb5/default.nix
@@ -41,31 +41,30 @@ let
value)
else value;
- mkIndent = depth: concatStrings (builtins.genList (_: " ") (2 * depth));
+ indent = " ";
- mkRelation = name: value: "${name} = ${mkVal { inherit value; }}";
+ mkRelation = name: value:
+ if (isList value) then
+ concatMapStringsSep "\n" (mkRelation name) value
+ else "${name} = ${mkVal value}";
- mkVal = { value, depth ? 0 }:
+ mkVal = value:
if (value == true) then "true"
else if (value == false) then "false"
else if (isInt value) then (toString value)
- else if (isList value) then
- concatMapStringsSep " " mkVal { inherit value depth; }
else if (isAttrs value) then
- (concatStringsSep "\n${mkIndent (depth + 1)}"
- ([ "{" ] ++ (mapAttrsToList
- (attrName: attrValue: let
- mappedAttrValue = mkVal {
- value = attrValue;
- depth = depth + 1;
- };
- in "${attrName} = ${mappedAttrValue}")
- value))) + "\n${mkIndent depth}}"
+ let configLines = concatLists
+ (map (splitString "\n")
+ (mapAttrsToList mkRelation value));
+ in
+ (concatStringsSep "\n${indent}"
+ ([ "{" ] ++ configLines))
+ + "\n}"
else value;
mkMappedAttrsOrString = value: concatMapStringsSep "\n"
(line: if builtins.stringLength line > 0
- then "${mkIndent 1}${line}"
+ then "${indent}${line}"
else line)
(splitString "\n"
(if isAttrs value then
@@ -114,7 +113,10 @@ in {
{
"ATHENA.MIT.EDU" = {
admin_server = "athena.mit.edu";
- kdc = "athena.mit.edu";
+ kdc = [
+ "athena01.mit.edu"
+ "athena02.mit.edu"
+ ];
};
};
'';
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index 873b8073fed9c..941ab78f86321 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -27,6 +27,7 @@ with lib;
fonts.fontconfig.enable = false;
nixpkgs.overlays = singleton (const (super: {
+ cairo = super.cairo.override { x11Support = false; };
dbus = super.dbus.override { x11Support = false; };
networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; };
networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; };
@@ -35,6 +36,7 @@ with lib;
networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };
networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
gobject-introspection = super.gobject-introspection.override { x11Support = false; };
+ qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };
}));
};
}
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index ae9710e3518b6..b3c5c6f93f368 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -33,14 +33,11 @@ let
pkgs.ncurses
pkgs.netcat
config.programs.ssh.package
- pkgs.perl
pkgs.procps
- pkgs.rsync
- pkgs.strace
pkgs.su
pkgs.time
pkgs.utillinux
- pkgs.which # 88K size
+ pkgs.which
pkgs.zstd
];
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 56b7af98b617b..0ab303d0ae47b 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -463,7 +463,7 @@ in {
users.users = mkOption {
default = {};
- type = with types; loaOf (submodule userOpts);
+ type = with types; attrsOf (submodule userOpts);
example = {
alice = {
uid = 1234;
@@ -487,7 +487,7 @@ in {
{ students.gid = 1001;
hackers = { };
};
- type = with types; loaOf (submodule groupOpts);
+ type = with types; attrsOf (submodule groupOpts);
description = ''
Additional groups to be created automatically by the system.
'';
diff --git a/nixos/modules/hardware/bladeRF.nix b/nixos/modules/hardware/bladeRF.nix
index 9254434771431..35b74b8382e3a 100644
--- a/nixos/modules/hardware/bladeRF.nix
+++ b/nixos/modules/hardware/bladeRF.nix
@@ -25,4 +25,4 @@ in
services.udev.packages = [ pkgs.libbladeRF ];
users.groups.bladerf = {};
};
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/hardware/ckb-next.nix b/nixos/modules/hardware/ckb-next.nix
index fe0ca9f26d54d..6932be1c54cad 100644
--- a/nixos/modules/hardware/ckb-next.nix
+++ b/nixos/modules/hardware/ckb-next.nix
@@ -43,7 +43,6 @@ in
serviceConfig = {
ExecStart = "${cfg.package}/bin/ckb-next-daemon ${optionalString (cfg.gid != null) "--gid=${builtins.toString cfg.gid}"}";
Restart = "on-failure";
- StandardOutput = "syslog";
};
};
};
diff --git a/nixos/modules/hardware/onlykey.nix b/nixos/modules/hardware/onlykey.nix
index b6820fe01911f..07358c8a87820 100644
--- a/nixos/modules/hardware/onlykey.nix
+++ b/nixos/modules/hardware/onlykey.nix
@@ -26,7 +26,7 @@ with lib;
####### implementation
config = mkIf config.hardware.onlykey.enable {
- services.udev.extraRules = builtin.readFile ./onlykey.udev;
+ services.udev.extraRules = builtins.readFile ./onlykey.udev;
};
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
index 79c835dc39095..87545e8420308 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
@@ -27,7 +27,7 @@
};
fileSystems."/boot/firmware" = {
- # This effectively "renames" the loaOf entry set in sd-image.nix
+ # This effectively "renames" the attrsOf entry set in sd-image.nix
mountPoint = "/boot";
neededForBoot = true;
};
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index ddad1116c94af..231c7bf0a6c25 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -108,6 +108,15 @@ in
'';
};
+ postBuildCommands = mkOption {
+ example = literalExample "'' dd if=\${pkgs.myBootLoader}/SPL of=$img bs=1024 seek=1 conv=notrunc ''";
+ default = "";
+ description = ''
+ Shell commands to run after the image is built.
+ Can be used for boards requiring to dd u-boot SPL before actual partitions.
+ '';
+ };
+
compressImage = mkOption {
type = types.bool;
default = true;
@@ -197,6 +206,9 @@ in
# Verify the FAT partition before copying it.
fsck.vfat -vn firmware_part.img
dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS
+
+ ${config.sdImage.postBuildCommands}
+
if test -n "$compressImage"; then
zstd -T$NIX_BUILD_CORES --rm $img
fi
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt b/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt
index 84252f292c54a..887bf60d0fbe4 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt
+++ b/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt
@@ -63,7 +63,7 @@ Activate the system: look for a directory in nix/store similar to:
Having found it, activate that nixos system *twice*:
chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate
chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate
-
+
This runs a 'hostname' command. Restore your old hostname with:
hostname OLDHOSTNAME
diff --git a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
index 25106733087ef..2a6c3ab11497f 100644
--- a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
+++ b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
@@ -1,4 +1,4 @@
-#! @shell@ -e
+#! @runtimeShell@ -e
# Shows the usage of this command to the user
diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh
index 1fdd4627a902c..c72ef6e9c28b3 100644
--- a/nixos/modules/installer/tools/nixos-enter.sh
+++ b/nixos/modules/installer/tools/nixos-enter.sh
@@ -1,4 +1,4 @@
-#! @shell@
+#! @runtimeShell@
set -e
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 0b62bca8367e7..e0252befdfdcb 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -1,4 +1,4 @@
-#! @shell@
+#! @runtimeShell@
set -e
shopt -s nullglob
diff --git a/nixos/modules/installer/tools/nixos-option/nixos-option.cc b/nixos/modules/installer/tools/nixos-option/nixos-option.cc
index 1a7b07a74f8ac..f779d82edbd6f 100644
--- a/nixos/modules/installer/tools/nixos-option/nixos-option.cc
+++ b/nixos/modules/installer/tools/nixos-option/nixos-option.cc
@@ -224,7 +224,7 @@ bool optionTypeIs(Context & ctx, Value & v, const std::string & soughtType)
bool isAggregateOptionType(Context & ctx, Value & v)
{
- return optionTypeIs(ctx, v, "attrsOf") || optionTypeIs(ctx, v, "listOf") || optionTypeIs(ctx, v, "loaOf");
+ return optionTypeIs(ctx, v, "attrsOf") || optionTypeIs(ctx, v, "listOf");
}
MakeError(OptionPathError, EvalError);
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 354274478a384..ed9c2509b6b64 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -1,6 +1,6 @@
-#! @shell@
+#! @runtimeShell@
-if [ -x "@shell@" ]; then export SHELL="@shell@"; fi;
+if [ -x "@runtimeShell@" ]; then export SHELL="@runtimeShell@"; fi;
set -e
set -o pipefail
@@ -288,7 +288,10 @@ fi
if [ "$action" = edit ]; then
if [[ -z $flake ]]; then
NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)}
- exec "${EDITOR:-nano}" "$NIXOS_CONFIG"
+ if [[ -d $NIXOS_CONFIG ]]; then
+ NIXOS_CONFIG=$NIXOS_CONFIG/default.nix
+ fi
+ exec ${EDITOR:-nano} "$NIXOS_CONFIG"
else
exec nix edit "${lockFlags[@]}" -- "$flake#$flakeAttr"
fi
diff --git a/nixos/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh
index fb0fe26116a6e..f5e3f32b3c632 100644
--- a/nixos/modules/installer/tools/nixos-version.sh
+++ b/nixos/modules/installer/tools/nixos-version.sh
@@ -1,4 +1,4 @@
-#! @shell@
+#! @runtimeShell@
case "$1" in
-h|--help)
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 111286214248d..1582f04930948 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -14,11 +14,13 @@ let
nixos-build-vms = makeProg {
name = "nixos-build-vms";
src = ./nixos-build-vms/nixos-build-vms.sh;
+ inherit (pkgs) runtimeShell;
};
nixos-install = makeProg {
name = "nixos-install";
src = ./nixos-install.sh;
+ inherit (pkgs) runtimeShell;
nix = config.nix.package.out;
path = makeBinPath [ nixos-enter ];
};
@@ -28,6 +30,7 @@ let
makeProg {
name = "nixos-rebuild";
src = ./nixos-rebuild.sh;
+ inherit (pkgs) runtimeShell;
nix = config.nix.package.out;
nix_x86_64_linux = fallback.x86_64-linux;
nix_i686_linux = fallback.i686-linux;
@@ -50,6 +53,7 @@ let
nixos-version = makeProg {
name = "nixos-version";
src = ./nixos-version.sh;
+ inherit (pkgs) runtimeShell;
inherit (config.system.nixos) version codeName revision;
inherit (config.system) configurationRevision;
json = builtins.toJSON ({
@@ -64,6 +68,7 @@ let
nixos-enter = makeProg {
name = "nixos-enter";
src = ./nixos-enter.sh;
+ inherit (pkgs) runtimeShell;
};
in
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 4692ea3265658..394da9a388922 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -198,7 +198,7 @@ in
bosun = 161;
kubernetes = 162;
peerflix = 163;
- chronos = 164;
+ #chronos = 164; # removed 2020-08-15
gitlab = 165;
tox-bootstrapd = 166;
cadvisor = 167;
@@ -247,7 +247,7 @@ in
bepasty = 215;
# pumpio = 216; # unused, removed 2018-02-24
nm-openvpn = 217;
- mathics = 218;
+ # mathics = 218; # unused, removed 2020-08-15
ejabberd = 219;
postsrsd = 220;
opendkim = 221;
@@ -321,7 +321,7 @@ in
monetdb = 290;
restic = 291;
openvpn = 292;
- meguca = 293;
+ # meguca = 293; # removed 2020-08-21
yarn = 294;
hdfs = 295;
mapred = 296;
@@ -622,7 +622,7 @@ in
monetdb = 290;
restic = 291;
openvpn = 292;
- meguca = 293;
+ # meguca = 293; # removed 2020-08-21
yarn = 294;
hdfs = 295;
mapred = 296;
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index dc668796c7886..92aa3be0a3667 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -127,7 +127,7 @@ in {
{ LOCATE_PATH = cfg.output;
};
- warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support searching as user other than root"
+ warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support the services.locate.localuser option; updatedb will run as root. (Silence with services.locate.localuser = null.)"
++ optional (isFindutils && cfg.pruneNames != []) "findutils locate does not support pruning by directory component"
++ optional (isFindutils && cfg.pruneBindMounts) "findutils locate does not support skipping bind mounts";
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 4f5a9250eaaee..25ac94b8e0f65 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -178,8 +178,6 @@ in
type = types.nullOr types.attrs; # TODO utilize lib.systems.parsedPlatform
default = null;
example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; };
- defaultText = literalExample
- ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';
description = ''
Specifies the platform for which NixOS should be
built. Specify this only if it is different from
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 939ee8dcfef8f..5e035df269985 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1,7 +1,6 @@
[
./config/debug-info.nix
./config/fonts/fontconfig.nix
- ./config/fonts/fontconfig-penultimate.nix
./config/fonts/fontdir.nix
./config/fonts/fonts.nix
./config/fonts/ghostscript.nix
@@ -263,6 +262,7 @@
./services/continuous-integration/buildbot/worker.nix
./services/continuous-integration/buildkite-agents.nix
./services/continuous-integration/hail.nix
+ ./services/continuous-integration/hercules-ci-agent/default.nix
./services/continuous-integration/hydra/default.nix
./services/continuous-integration/gitlab-runner.nix
./services/continuous-integration/gocd-agent/default.nix
@@ -297,10 +297,10 @@
./services/desktops/accountsservice.nix
./services/desktops/bamf.nix
./services/desktops/blueman.nix
- ./services/desktops/deepin/deepin.nix
./services/desktops/dleyna-renderer.nix
./services/desktops/dleyna-server.nix
./services/desktops/pantheon/files.nix
+ ./services/desktops/espanso.nix
./services/desktops/flatpak.nix
./services/desktops/geoclue2.nix
./services/desktops/gsignond.nix
@@ -331,6 +331,7 @@
./services/development/bloop.nix
./services/development/hoogle.nix
./services/development/jupyter/default.nix
+ ./services/development/jupyterhub/default.nix
./services/development/lorri.nix
./services/editors/emacs.nix
./services/editors/infinoted.nix
@@ -387,6 +388,7 @@
./services/logging/logrotate.nix
./services/logging/logstash.nix
./services/logging/rsyslogd.nix
+ ./services/logging/packetbeat.nix
./services/logging/syslog-ng.nix
./services/logging/syslogd.nix
./services/mail/clamsmtp.nix
@@ -465,14 +467,11 @@
./services/misc/leaps.nix
./services/misc/lidarr.nix
./services/misc/mame.nix
- ./services/misc/mathics.nix
./services/misc/matrix-appservice-discord.nix
./services/misc/matrix-synapse.nix
./services/misc/mautrix-telegram.nix
./services/misc/mbpfan.nix
./services/misc/mediatomb.nix
- ./services/misc/mesos-master.nix
- ./services/misc/mesos-slave.nix
./services/misc/metabase.nix
./services/misc/mwlib.nix
./services/misc/nix-daemon.nix
@@ -488,6 +487,7 @@
./services/misc/parsoid.nix
./services/misc/plex.nix
./services/misc/tautulli.nix
+ ./services/misc/pinnwand.nix
./services/misc/pykms.nix
./services/misc/radarr.nix
./services/misc/redmine.nix
@@ -588,6 +588,7 @@
./services/networking/atftpd.nix
./services/networking/avahi-daemon.nix
./services/networking/babeld.nix
+ ./services/networking/biboumi.nix
./services/networking/bind.nix
./services/networking/bitcoind.nix
./services/networking/autossh.nix
@@ -719,6 +720,7 @@
./services/networking/rdnssd.nix
./services/networking/redsocks.nix
./services/networking/resilio.nix
+ ./services/networking/robustirc-bridge.nix
./services/networking/rpcbind.nix
./services/networking/rxe.nix
./services/networking/sabnzbd.nix
@@ -784,10 +786,8 @@
./services/networking/znc/default.nix
./services/printing/cupsd.nix
./services/scheduling/atd.nix
- ./services/scheduling/chronos.nix
./services/scheduling/cron.nix
./services/scheduling/fcron.nix
- ./services/scheduling/marathon.nix
./services/search/elasticsearch.nix
./services/search/elasticsearch-curator.nix
./services/search/hound.nix
@@ -838,6 +838,7 @@
./services/ttys/gpm.nix
./services/ttys/kmscon.nix
./services/wayland/cage.nix
+ ./services/video/mirakurun.nix
./services/web-apps/atlassian/confluence.nix
./services/web-apps/atlassian/crowd.nix
./services/web-apps/atlassian/jira.nix
@@ -868,6 +869,7 @@
./services/web-apps/moinmoin.nix
./services/web-apps/restya-board.nix
./services/web-apps/sogo.nix
+ ./services/web-apps/rss-bridge.nix
./services/web-apps/tt-rss.nix
./services/web-apps/trac.nix
./services/web-apps/trilium.nix
@@ -888,7 +890,6 @@
./services/web-servers/lighttpd/collectd.nix
./services/web-servers/lighttpd/default.nix
./services/web-servers/lighttpd/gitweb.nix
- ./services/web-servers/meguca.nix
./services/web-servers/mighttpd2.nix
./services/web-servers/minio.nix
./services/web-servers/molly-brown.nix
@@ -926,6 +927,7 @@
./services/x11/gdk-pixbuf.nix
./services/x11/imwheel.nix
./services/x11/redshift.nix
+ ./services/x11/urserver.nix
./services/x11/urxvtd.nix
./services/x11/window-managers/awesome.nix
./services/x11/window-managers/default.nix
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 2a2fe119d30cb..3b67d628f9fd7 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -26,6 +26,7 @@
pkgs.fuse
pkgs.fuse3
pkgs.sshfs-fuse
+ pkgs.rsync
pkgs.socat
pkgs.screen
diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index ef8c0d74f0628..7bff79e827302 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -1,7 +1,7 @@
# A profile with most (vanilla) hardening options enabled by default,
# potentially at the cost of features and performance.
-{ lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
with lib;
@@ -27,6 +27,9 @@ with lib;
security.forcePageTableIsolation = mkDefault true;
+ # This is required by podman to run containers in rootless mode.
+ security.unprivilegedUsernsClone = mkDefault config.virtualisation.containers.enable;
+
security.virtualisation.flushL1DataCache = mkDefault "always";
security.apparmor.enable = mkDefault true;
diff --git a/nixos/modules/programs/ccache.nix b/nixos/modules/programs/ccache.nix
index 874774c72b47c..3c9e64932f16e 100644
--- a/nixos/modules/programs/ccache.nix
+++ b/nixos/modules/programs/ccache.nix
@@ -80,4 +80,4 @@ in {
];
})
];
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 38bdabb4fa812..8877356360a5b 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -33,7 +33,6 @@ in
{ PATH = [ "/bin" ];
INFOPATH = [ "/info" "/share/info" ];
KDEDIRS = [ "" ];
- STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ];
QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ];
QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ];
GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ];
diff --git a/nixos/modules/programs/gpaste.nix b/nixos/modules/programs/gpaste.nix
index 4f6deb77e5ebc..8bc52c28d814b 100644
--- a/nixos/modules/programs/gpaste.nix
+++ b/nixos/modules/programs/gpaste.nix
@@ -30,5 +30,7 @@ with lib;
environment.systemPackages = [ pkgs.gnome3.gpaste ];
services.dbus.packages = [ pkgs.gnome3.gpaste ];
systemd.packages = [ pkgs.gnome3.gpaste ];
+ # gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas.
+ services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ];
};
}
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index a983ffa4b890f..40af4d0ff5aeb 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -131,7 +131,7 @@ in
knownHosts = mkOption {
default = {};
- type = types.loaOf (types.submodule ({ name, ... }: {
+ type = types.attrsOf (types.submodule ({ name, ... }: {
options = {
certAuthority = mkOption {
type = types.bool;
diff --git a/nixos/modules/programs/tsm-client.nix b/nixos/modules/programs/tsm-client.nix
index eb6f12475286f..7ac4086d5f094 100644
--- a/nixos/modules/programs/tsm-client.nix
+++ b/nixos/modules/programs/tsm-client.nix
@@ -7,7 +7,7 @@ let
inherit (lib.modules) mkDefault mkIf;
inherit (lib.options) literalExample mkEnableOption mkOption;
inherit (lib.strings) concatStringsSep optionalString toLower;
- inherit (lib.types) addCheck attrsOf lines loaOf nullOr package path port str strMatching submodule;
+ inherit (lib.types) addCheck attrsOf lines nullOr package path port str strMatching submodule;
# Checks if given list of strings contains unique
# elements when compared without considering case.
@@ -178,7 +178,7 @@ let
client system-options file "dsm.sys"
'';
servers = mkOption {
- type = loaOf (submodule [ serverOptions ]);
+ type = attrsOf (submodule [ serverOptions ]);
default = {};
example.mainTsmServer = {
server = "tsmserver.company.com";
diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml
index 568c2de655766..14a7228ad9b02 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.xml
+++ b/nixos/modules/programs/zsh/oh-my-zsh.xml
@@ -73,7 +73,7 @@
{ pkgs, ... }:
{
- programs.zsh.ohMyZsh.customPkgs = with pkgs; [
+ programs.zsh.ohMyZsh.customPkgs = [
pkgs.nix-zsh-completions
# and even more...
];
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index cfe216d512b99..fad0b40a9dbc3 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -17,8 +17,13 @@ with lib;
(mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
# Completely removed modules
+ (mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.")
+ (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")
+ (mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "")
(mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "")
+ (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.")
+ (mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.")
(mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed")
@@ -28,6 +33,7 @@ with lib;
(mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed")
(mkRemovedOptionModule [ "services" "fourStore" ] "The fourStore module has been removed")
(mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed")
+ (mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed")
(mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " +
"https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"))
(mkRemovedOptionModule [ "services" "xserver" "multitouch" ] ''
@@ -43,6 +49,7 @@ with lib;
instead, or any other display manager in NixOS as they all support auto-login.
'')
(mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
+ (mkRemovedOptionModule [ "services" "meguca" ] "Use meguca has been removed from nixpkgs")
(mkRemovedOptionModule ["hardware" "brightnessctl" ] ''
The brightnessctl module was removed because newer versions of
brightnessctl don't require the udev rules anymore (they can use the
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 1f63e7b88bd59..29635dbe86430 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -150,6 +150,14 @@ let
'';
};
+ extraLegoFlags = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ Additional global flags to pass to all lego commands.
+ '';
+ };
+
extraLegoRenewFlags = mkOption {
type = types.listOf types.str;
default = [];
@@ -157,6 +165,14 @@ let
Additional flags to pass to lego renew.
'';
};
+
+ extraLegoRunFlags = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ Additional flags to pass to lego run.
+ '';
+ };
};
};
@@ -313,9 +329,10 @@ in
++ optionals (data.dnsProvider != null && !data.dnsPropagationCheck) [ "--dns.disable-cp" ]
++ concatLists (mapAttrsToList (name: root: [ "-d" name ]) data.extraDomains)
++ (if data.dnsProvider != null then [ "--dns" data.dnsProvider ] else [ "--http" "--http.webroot" data.webroot ])
- ++ optionals (cfg.server != null || data.server != null) ["--server" (if data.server == null then cfg.server else data.server)];
+ ++ optionals (cfg.server != null || data.server != null) ["--server" (if data.server == null then cfg.server else data.server)]
+ ++ data.extraLegoFlags;
certOpts = optionals data.ocspMustStaple [ "--must-staple" ];
- runOpts = escapeShellArgs (globalOpts ++ [ "run" ] ++ certOpts);
+ runOpts = escapeShellArgs (globalOpts ++ [ "run" ] ++ certOpts ++ data.extraLegoRunFlags);
renewOpts = escapeShellArgs (globalOpts ++
[ "renew" "--days" (toString cfg.validMinDays) ] ++
certOpts ++ data.extraLegoRenewFlags);
diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
index cfc65b347bc69..2ee10454fd26b 100644
--- a/nixos/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
@@ -23,11 +23,17 @@ in
default = [];
description = "List of packages to be added to apparmor's include path";
};
+ parserConfig = mkOption {
+ type = types.str;
+ default = "";
+ description = "AppArmor parser configuration file content";
+ };
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.apparmor-utils ];
+ environment.etc."apparmor/parser.conf".text = cfg.parserConfig;
boot.kernelParams = [ "apparmor=1" "security=apparmor" ];
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index 71428b82f5dac..c47be80b9dc3c 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -51,7 +51,7 @@ in
};
secretKeyFile = mkOption {
- type = types.path;
+ type = types.nullOr types.path;
default = null;
description = ''
A file containing your secret key. The security of your Duo application is tied to the security of your secret key.
diff --git a/nixos/modules/security/misc.nix b/nixos/modules/security/misc.nix
index 16e3bfb14199b..d51dbbb77f718 100644
--- a/nixos/modules/security/misc.nix
+++ b/nixos/modules/security/misc.nix
@@ -27,6 +27,16 @@ with lib;
'';
};
+ security.unprivilegedUsernsClone = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ When disabled, unprivileged users will not be able to create new namespaces.
+ By default unprivileged user namespaces are disabled.
+ This option only works in a hardened profile.
+ '';
+ };
+
security.protectKernelImage = mkOption {
type = types.bool;
default = false;
@@ -115,6 +125,10 @@ with lib;
];
})
+ (mkIf config.security.unprivilegedUsernsClone {
+ boot.kernel.sysctl."kernel.unprivileged_userns_clone" = mkDefault true;
+ })
+
(mkIf config.security.protectKernelImage {
# Disable hibernation (allows replacing the running kernel)
boot.kernelParams = [ "nohibernate" ];
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 565c15dec24b1..ce74805ef4132 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -544,7 +544,7 @@ in
security.pam.services = mkOption {
default = [];
- type = with types; loaOf (submodule pamOpts);
+ type = with types; attrsOf (submodule pamOpts);
description =
''
This option defines the PAM services. A service typically
diff --git a/nixos/modules/security/tpm2.nix b/nixos/modules/security/tpm2.nix
index 13804fb82cbaa..27f9b58c9755a 100644
--- a/nixos/modules/security/tpm2.nix
+++ b/nixos/modules/security/tpm2.nix
@@ -170,7 +170,6 @@ in {
Restart = "always";
RestartSec = 30;
BusName = "com.intel.tss2.Tabrmd";
- StandardOutput = "syslog";
ExecStart = "${cfg.abrmd.package}/bin/tpm2-abrmd";
User = "tss";
Group = "nogroup";
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index a0fadb018ecaa..2def74f85353b 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -160,8 +160,11 @@ in
config = {
security.wrappers = {
+ # These are mount related wrappers that require the +s permission.
fusermount.source = "${pkgs.fuse}/bin/fusermount";
fusermount3.source = "${pkgs.fuse3}/bin/fusermount3";
+ mount.source = "${lib.getBin pkgs.utillinux}/bin/mount";
+ umount.source = "${lib.getBin pkgs.utillinux}/bin/umount";
};
boot.specialFileSystems.${parentWrapperDir} = {
diff --git a/nixos/modules/services/audio/icecast.nix b/nixos/modules/services/audio/icecast.nix
index f40ea6be29d45..6ca20a7a10866 100644
--- a/nixos/modules/services/audio/icecast.nix
+++ b/nixos/modules/services/audio/icecast.nix
@@ -47,7 +47,7 @@ in {
enable = mkEnableOption "Icecast server";
hostname = mkOption {
- type = types.str;
+ type = types.nullOr types.str;
description = "DNS name or IP address that will be used for the stream directory lookups or possibily the playlist generation if a Host header is not provided.";
default = config.networking.domain;
};
diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix
index 8098617d11f3c..0ca71b413cee0 100644
--- a/nixos/modules/services/backup/znapzend.nix
+++ b/nixos/modules/services/backup/znapzend.nix
@@ -220,7 +220,7 @@ let
};
destinations = mkOption {
- type = loaOf (destType config);
+ type = attrsOf (destType config);
description = "Additional destinations.";
default = {};
example = literalExample ''
@@ -328,7 +328,7 @@ in
};
zetup = mkOption {
- type = loaOf srcType;
+ type = attrsOf srcType;
description = "Znapzend configuration.";
default = {};
example = literalExample ''
diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix
new file mode 100644
index 0000000000000..4aed493c0fb0a
--- /dev/null
+++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix
@@ -0,0 +1,213 @@
+/*
+
+This file is for options that NixOS and nix-darwin have in common.
+
+Platform-specific code is in the respective default.nix files.
+
+ */
+
+{ config, lib, options, pkgs, ... }:
+
+let
+ inherit (lib) mkOption mkIf types filterAttrs literalExample mkRenamedOptionModule;
+
+ cfg =
+ config.services.hercules-ci-agent;
+
+ format = pkgs.formats.toml {};
+
+ settingsModule = { config, ... }: {
+ freeformType = format.type;
+ options = {
+ baseDirectory = mkOption {
+ type = types.path;
+ default = "/var/lib/hercules-ci-agent";
+ description = ''
+ State directory (secrets, work directory, etc) for agent
+ '';
+ };
+ concurrentTasks = mkOption {
+ description = ''
+ Number of tasks to perform simultaneously, such as evaluations, derivations.
+
+ You must have a total capacity across agents of at least 2 concurrent tasks on x86_64-linux
+ to allow for import from derivation.
+ '';
+ type = types.int;
+ default = 4;
+ };
+ workDirectory = mkOption {
+ description = ''
+ The directory in which temporary subdirectories are created for task state. This includes sources for Nix evaluation.
+ '';
+ type = types.path;
+ default = config.baseDirectory + "/work";
+ defaultText = literalExample ''baseDirectory + "/work"'';
+ };
+ staticSecretsDirectory = mkOption {
+ description = ''
+ This is the default directory to look for statically configured secrets like cluster-join-token.key .
+ '';
+ type = types.path;
+ default = config.baseDirectory + "/secrets";
+ defaultText = literalExample ''baseDirectory + "/secrets"'';
+ };
+ clusterJoinTokenPath = mkOption {
+ description = ''
+ Location of the cluster-join-token.key file.
+ '';
+ type = types.path;
+ default = config.staticSecretsDirectory + "/cluster-join-token.key";
+ defaultText = literalExample ''staticSecretsDirectory + "/cluster-join-token.key"'';
+ # internal: It's a bit too detailed to show by default in the docs,
+ # but useful to define explicitly to allow reuse by other modules.
+ internal = true;
+ };
+ binaryCachesPath = mkOption {
+ description = ''
+ Location of the binary-caches.json file.
+ '';
+ type = types.path;
+ default = config.staticSecretsDirectory + "/binary-caches.json";
+ defaultText = literalExample ''staticSecretsDirectory + "/binary-caches.json"'';
+ # internal: It's a bit too detailed to show by default in the docs,
+ # but useful to define explicitly to allow reuse by other modules.
+ internal = true;
+ };
+ };
+ };
+
+ checkNix =
+ if !cfg.checkNix
+ then ""
+ else if lib.versionAtLeast config.nix.package.version "2.4.0"
+ then ""
+ else pkgs.stdenv.mkDerivation {
+ name = "hercules-ci-check-system-nix-src";
+ inherit (config.nix.package) src patches;
+ configurePhase = ":";
+ buildPhase = ''
+ echo "Checking in-memory pathInfoCache expiry"
+ if ! grep 'struct PathInfoCacheValue' src/libstore/store-api.hh >/dev/null; then
+ cat 1>&2 <Hercules CI is a
+ continuous integation service that is centered around Nix.
+
+ Support is available at nix.package = patch pkgs.nix;
+
+ This option will be removed when Hercules CI Agent moves to Nix 2.4 (upcoming Nix release).
+ '';
+ };
+ checkNix = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to make sure that the system's Nix (nix-daemon) is compatible.
+
+ If you set this to false, please keep up with the change log.
+ '';
+ };
+ package = mkOption {
+ description = ''
+ Package containing the bin/hercules-ci-agent executable.
+ '';
+ type = types.package;
+ default = pkgs.hercules-ci-agent;
+ defaultText = literalExample "pkgs.hercules-ci-agent";
+ };
+ settings = mkOption {
+ description = ''
+ These settings are written to the agent.toml file.
+
+ Not all settings are listed as options, can be set nonetheless.
+
+ For the exhaustive list of settings, see postgresql.conf .";
+ settings = mkOption {
+ type = with types; attrsOf (oneOf [ bool float int str ]);
+ default = {};
+ description = ''
+ PostgreSQL configuration. Refer to
+ postgresql.conf .
+
+
+ String values will automatically be enclosed in single quotes. Single quotes will be
+ escaped with two single quotes as described by the upstream documentation linked above.
+ recovery.conf file.
'';
};
+
superUser = mkOption {
type = types.str;
- default= if versionAtLeast config.system.stateVersion "17.09" then "postgres" else "root";
+ default = "postgres";
internal = true;
+ readOnly = true;
description = ''
- NixOS traditionally used 'root' as superuser, most other distros use 'postgres'.
- From 17.09 we also try to follow this standard. Internal since changing this value
- would lead to breakage while setting up databases.
+ PostgreSQL superuser account to use for various operations. Internal since changing
+ this value would lead to breakage while setting up databases.
'';
};
};
@@ -244,6 +263,16 @@ in
config = mkIf cfg.enable {
+ services.postgresql.settings =
+ {
+ hba_file = "${pkgs.writeText "pg_hba.conf" cfg.authentication}";
+ ident_file = "${pkgs.writeText "pg_ident.conf" cfg.identMap}";
+ log_destination = "stderr";
+ log_line_prefix = cfg.logLinePrefix;
+ listen_addresses = if cfg.enableTCPIP then "*" else "localhost";
+ port = cfg.port;
+ };
+
services.postgresql.package =
# Note: when changing the default, make it conditional on
# ‘system.stateVersion’ to maintain compatibility with existing
@@ -310,6 +339,35 @@ in
''}
'';
+ # Wait for PostgreSQL to be ready to accept connections.
+ postStart =
+ ''
+ PSQL="psql --port=${toString cfg.port}"
+
+ while ! $PSQL -d postgres -c "" 2> /dev/null; do
+ if ! kill -0 "$MAINPID"; then exit 1; fi
+ sleep 0.1
+ done
+
+ if test -e "${cfg.dataDir}/.first_startup"; then
+ ${optionalString (cfg.initialScript != null) ''
+ $PSQL -f "${cfg.initialScript}" -d postgres
+ ''}
+ rm -f "${cfg.dataDir}/.first_startup"
+ fi
+ '' + optionalString (cfg.ensureDatabases != []) ''
+ ${concatMapStrings (database: ''
+ $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"'
+ '') cfg.ensureDatabases}
+ '' + ''
+ ${concatMapStrings (user: ''
+ $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"'
+ ${concatStringsSep "\n" (mapAttrsToList (database: permission: ''
+ $PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"'
+ '') user.ensurePermissions)}
+ '') cfg.ensureUsers}
+ '';
+
serviceConfig = mkMerge [
{ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
User = "postgres";
@@ -329,40 +387,6 @@ in
TimeoutSec = 120;
ExecStart = "${postgresql}/bin/postgres";
-
- # Wait for PostgreSQL to be ready to accept connections.
- ExecStartPost =
- let
- setupScript = pkgs.writeScript "postgresql-setup" (''
- #!${pkgs.runtimeShell} -e
-
- PSQL="${pkgs.utillinux}/bin/runuser -u ${cfg.superUser} -- psql --port=${toString cfg.port}"
-
- while ! $PSQL -d postgres -c "" 2> /dev/null; do
- if ! kill -0 "$MAINPID"; then exit 1; fi
- sleep 0.1
- done
-
- if test -e "${cfg.dataDir}/.first_startup"; then
- ${optionalString (cfg.initialScript != null) ''
- $PSQL -f "${cfg.initialScript}" -d postgres
- ''}
- rm -f "${cfg.dataDir}/.first_startup"
- fi
- '' + optionalString (cfg.ensureDatabases != []) ''
- ${concatMapStrings (database: ''
- $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"'
- '') cfg.ensureDatabases}
- '' + ''
- ${concatMapStrings (user: ''
- $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"'
- ${concatStringsSep "\n" (mapAttrsToList (database: permission: ''
- $PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"'
- '') user.ensurePermissions)}
- '') cfg.ensureUsers}
- '');
- in
- "+${setupScript}";
}
(mkIf (cfg.dataDir == "/var/lib/postgresql/${cfg.package.psqlSchema}") {
StateDirectory = "postgresql postgresql/${cfg.package.psqlSchema}";
diff --git a/nixos/modules/services/desktops/deepin/deepin.nix b/nixos/modules/services/desktops/deepin/deepin.nix
deleted file mode 100644
index f8fb73701af69..0000000000000
--- a/nixos/modules/services/desktops/deepin/deepin.nix
+++ /dev/null
@@ -1,123 +0,0 @@
-# deepin
-
-{ config, pkgs, lib, ... }:
-
-{
-
- ###### interface
-
- options = {
-
- services.deepin.core.enable = lib.mkEnableOption "
- Basic dbus and systemd services, groups and users needed by the
- Deepin Desktop Environment.
- ";
-
- services.deepin.deepin-menu.enable = lib.mkEnableOption "
- DBus service for unified menus in Deepin Desktop Environment.
- ";
-
- services.deepin.deepin-turbo.enable = lib.mkEnableOption "
- Turbo service for the Deepin Desktop Environment. It is a daemon
- that helps to launch applications faster.
- ";
-
- };
-
-
- ###### implementation
-
- config = lib.mkMerge [
-
- (lib.mkIf config.services.deepin.core.enable {
- environment.systemPackages = [
- pkgs.deepin.dde-api
- pkgs.deepin.dde-calendar
- pkgs.deepin.dde-control-center
- pkgs.deepin.dde-daemon
- pkgs.deepin.dde-dock
- pkgs.deepin.dde-launcher
- pkgs.deepin.dde-file-manager
- pkgs.deepin.dde-session-ui
- pkgs.deepin.deepin-anything
- pkgs.deepin.deepin-image-viewer
- ];
-
- services.dbus.packages = [
- pkgs.deepin.dde-api
- pkgs.deepin.dde-calendar
- pkgs.deepin.dde-control-center
- pkgs.deepin.dde-daemon
- pkgs.deepin.dde-dock
- pkgs.deepin.dde-launcher
- pkgs.deepin.dde-file-manager
- pkgs.deepin.dde-session-ui
- pkgs.deepin.deepin-anything
- pkgs.deepin.deepin-image-viewer
- ];
-
- systemd.packages = [
- pkgs.deepin.dde-api
- pkgs.deepin.dde-daemon
- pkgs.deepin.dde-file-manager
- pkgs.deepin.deepin-anything
- ];
-
- boot.extraModulePackages = [ config.boot.kernelPackages.deepin-anything ];
-
- boot.kernelModules = [ "vfs_monitor" ];
-
- users.groups.deepin-sound-player = { };
-
- users.users.deepin-sound-player = {
- description = "Deepin sound player";
- group = "deepin-sound-player";
- isSystemUser = true;
- };
-
- users.groups.deepin-daemon = { };
-
- users.users.deepin-daemon = {
- description = "Deepin daemon user";
- group = "deepin-daemon";
- isSystemUser = true;
- };
-
- users.groups.deepin_anything_server = { };
-
- users.users.deepin_anything_server = {
- description = "Deepin Anything Server";
- group = "deepin_anything_server";
- isSystemUser = true;
- };
-
- security.pam.services.deepin-auth-keyboard.text = ''
- # original at ${pkgs.deepin.dde-daemon}/etc/pam.d/deepin-auth-keyboard
- auth [success=2 default=ignore] pam_lsass.so
- auth [success=1 default=ignore] pam_unix.so nullok_secure try_first_pass
- auth requisite pam_deny.so
- auth required pam_permit.so
- '';
-
- environment.etc = {
- "polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla".source = "${pkgs.deepin.dde-api}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla";
- "polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla";
- "polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla";
- };
-
- services.deepin.deepin-menu.enable = true;
- services.deepin.deepin-turbo.enable = true;
- })
-
- (lib.mkIf config.services.deepin.deepin-menu.enable {
- services.dbus.packages = [ pkgs.deepin.deepin-menu ];
- })
-
- (lib.mkIf config.services.deepin.deepin-turbo.enable {
- environment.systemPackages = [ pkgs.deepin.deepin-turbo ];
- systemd.packages = [ pkgs.deepin.deepin-turbo ];
- })
-
- ];
-
-}
diff --git a/nixos/modules/services/desktops/espanso.nix b/nixos/modules/services/desktops/espanso.nix
new file mode 100644
index 0000000000000..cd2eadf88168e
--- /dev/null
+++ b/nixos/modules/services/desktops/espanso.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let cfg = config.services.espanso;
+in {
+ meta = { maintainers = with lib.maintainers; [ numkem ]; };
+
+ options = {
+ services.espanso = { enable = options.mkEnableOption "Espanso"; };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.user.services.espanso = {
+ description = "Espanso daemon";
+ path = with pkgs; [ espanso libnotify xclip ];
+ serviceConfig = {
+ ExecStart = "${pkgs.espanso}/bin/espanso daemon";
+ Restart = "on-failure";
+ };
+ wantedBy = [ "default.target" ];
+ };
+
+ environment.systemPackages = [ pkgs.espanso ];
+ };
+}
diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
index 542b2ead41040..6702bd395a03e 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -160,7 +160,7 @@ in
};
appConfig = mkOption {
- type = types.loaOf appConfigModule;
+ type = types.attrsOf appConfigModule;
default = {};
example = literalExample ''
"com.github.app" = {
diff --git a/nixos/modules/services/development/jupyterhub/default.nix b/nixos/modules/services/development/jupyterhub/default.nix
new file mode 100644
index 0000000000000..f1dcab68b0002
--- /dev/null
+++ b/nixos/modules/services/development/jupyterhub/default.nix
@@ -0,0 +1,190 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.jupyterhub;
+
+ kernels = (pkgs.jupyter-kernel.create {
+ definitions = if cfg.kernels != null
+ then cfg.kernels
+ else pkgs.jupyter-kernel.default;
+ });
+
+ jupyterhubConfig = pkgs.writeText "jupyterhub_config.py" ''
+ c.JupyterHub.bind_url = "http://${cfg.host}:${toString cfg.port}"
+
+ c.JupyterHub.authenticator_class = "${cfg.authentication}"
+ c.JupyterHub.spawner_class = "${cfg.spawner}"
+
+ c.SystemdSpawner.default_url = '/lab'
+ c.SystemdSpawner.cmd = "${cfg.jupyterlabEnv}/bin/jupyterhub-singleuser"
+ c.SystemdSpawner.environment = {
+ 'JUPYTER_PATH': '${kernels}'
+ }
+
+ ${cfg.extraConfig}
+ '';
+in {
+ meta.maintainers = with maintainers; [ costrouc ];
+
+ options.services.jupyterhub = {
+ enable = mkEnableOption "Jupyterhub development server";
+
+ authentication = mkOption {
+ type = types.str;
+ default = "jupyterhub.auth.PAMAuthenticator";
+ description = ''
+ Jupyterhub authentication to use
+
+ There are many authenticators available including: oauth, pam,
+ ldap, kerberos, etc.
+ '';
+ };
+
+ spawner = mkOption {
+ type = types.str;
+ default = "systemdspawner.SystemdSpawner";
+ description = ''
+ Jupyterhub spawner to use
+
+ There are many spawners available including: local process,
+ systemd, docker, kubernetes, yarn, batch, etc.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Extra contents appended to the jupyterhub configuration
+
+ Jupyterhub configuration is a normal python file using
+ Traitlets. https://jupyterhub.readthedocs.io/en/stable/getting-started/config-basics.html. The
+ base configuration of this module was designed to have sane
+ defaults for configuration but you can override anything since
+ this is a python file.
+ '';
+ example = literalExample ''
+ c.SystemdSpawner.mem_limit = '8G'
+ c.SystemdSpawner.cpu_limit = 2.0
+ '';
+ };
+
+ jupyterhubEnv = mkOption {
+ type = types.package;
+ default = (pkgs.python3.withPackages (p: with p; [
+ jupyterhub
+ jupyterhub-systemdspawner
+ ]));
+ description = ''
+ Python environment to run jupyterhub
+
+ Customizing will affect the packages available in the hub and
+ proxy. This will allow packages to be available for the
+ extraConfig that you may need. This will not normally need to
+ be changed.
+ '';
+ };
+
+ jupyterlabEnv = mkOption {
+ type = types.package;
+ default = (pkgs.python3.withPackages (p: with p; [
+ jupyterhub
+ jupyterlab
+ ]));
+ description = ''
+ Python environment to run jupyterlab
+
+ Customizing will affect the packages available in the
+ jupyterlab server and the default kernel provided. This is the
+ way to customize the jupyterlab extensions and jupyter
+ notebook extensions. This will not normally need to
+ be changed.
+ '';
+ };
+
+ kernels = mkOption {
+ type = types.nullOr (types.attrsOf(types.submodule (import ../jupyter/kernel-options.nix {
+ inherit lib;
+ })));
+
+ default = null;
+ example = literalExample ''
+ {
+ python3 = let
+ env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [
+ ipykernel
+ pandas
+ scikitlearn
+ ]));
+ in {
+ displayName = "Python 3 for machine learning";
+ argv = [
+ "''${env.interpreter}"
+ "-m"
+ "ipykernel_launcher"
+ "-f"
+ "{connection_file}"
+ ];
+ language = "python";
+ logo32 = "''${env}/''${env.sitePackages}/ipykernel/resources/logo-32x32.png";
+ logo64 = "''${env}/''${env.sitePackages}/ipykernel/resources/logo-64x64.png";
+ };
+ }
+ '';
+ description = ''
+ Declarative kernel config
+
+ Kernels can be declared in any language that supports and has
+ the required dependencies to communicate with a jupyter server.
+ In python's case, it means that ipykernel package must always be
+ included in the list of packages of the targeted environment.
+ '';
+ };
+
+ port = mkOption {
+ type = types.port;
+ default = 8000;
+ description = ''
+ Port number Jupyterhub will be listening on
+ '';
+ };
+
+ host = mkOption {
+ type = types.str;
+ default = "0.0.0.0";
+ description = ''
+ Bind IP JupyterHub will be listening on
+ '';
+ };
+
+ stateDirectory = mkOption {
+ type = types.str;
+ default = "jupyterhub";
+ description = ''
+ Directory for jupyterhub state (token + database)
+ '';
+ };
+ };
+
+ config = mkMerge [
+ (mkIf cfg.enable {
+ systemd.services.jupyterhub = {
+ description = "Jupyterhub development server";
+
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ serviceConfig = {
+ Restart = "always";
+ ExecStart = "${cfg.jupyterhubEnv}/bin/jupyterhub --config ${jupyterhubConfig}";
+ User = "root";
+ StateDirectory = cfg.stateDirectory;
+ WorkingDirectory = "/var/lib/${cfg.stateDirectory}";
+ };
+ };
+ })
+ ];
+}
diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix
index d791b387665fc..00d9eaad9eb9f 100644
--- a/nixos/modules/services/editors/emacs.nix
+++ b/nixos/modules/services/editors/emacs.nix
@@ -15,26 +15,27 @@ let
fi
'';
-desktopApplicationFile = pkgs.writeTextFile {
- name = "emacsclient.desktop";
- destination = "/share/applications/emacsclient.desktop";
- text = ''
-[Desktop Entry]
-Name=Emacsclient
-GenericName=Text Editor
-Comment=Edit text
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=emacseditor %F
-Icon=emacs
-Type=Application
-Terminal=false
-Categories=Development;TextEditor;
-StartupWMClass=Emacs
-Keywords=Text;Editor;
-'';
-};
-
-in {
+ desktopApplicationFile = pkgs.writeTextFile {
+ name = "emacsclient.desktop";
+ destination = "/share/applications/emacsclient.desktop";
+ text = ''
+ [Desktop Entry]
+ Name=Emacsclient
+ GenericName=Text Editor
+ Comment=Edit text
+ MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+ Exec=emacseditor %F
+ Icon=emacs
+ Type=Application
+ Terminal=false
+ Categories=Development;TextEditor;
+ StartupWMClass=Emacs
+ Keywords=Text;Editor;
+ '';
+ };
+
+in
+{
options.services.emacs = {
enable = mkOption {
@@ -86,10 +87,10 @@ in {
description = "Emacs: the extensible, self-documenting text editor";
serviceConfig = {
- Type = "forking";
+ Type = "forking";
ExecStart = "${pkgs.bash}/bin/bash -c 'source ${config.system.build.setEnvironment}; exec ${cfg.package}/bin/emacs --daemon'";
- ExecStop = "${cfg.package}/bin/emacsclient --eval (kill-emacs)";
- Restart = "always";
+ ExecStop = "${cfg.package}/bin/emacsclient --eval (kill-emacs)";
+ Restart = "always";
};
} // optionalAttrs cfg.enable { wantedBy = [ "default.target" ]; };
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index 74c60014dcea0..302aa1ed7c482 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -53,11 +53,11 @@
emacs
- emacs25
+ emacs
- The latest stable version of Emacs 25 using the
+ The latest stable version of Emacs using the
- emacs25-nox
+ emacs-nox
- Emacs 25 built without any dependency on X11 libraries.
+ Emacs built without any dependency on X11 libraries.
@@ -79,11 +79,11 @@
emacsMacport
- emacs25Macport
+ emacsMacport
- Emacs 25 with the "Mac port" patches, providing a more native look and
+ Emacs with the "Mac port" patches, providing a more native look and
feel under macOS.
@@ -322,7 +322,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
If you want, you can tweak the Emacs package itself from your
emacs.nix . For example, if you want to have a
GTK 3-based Emacs instead of the default GTK 2-based binary and remove the
- automatically generated emacs.desktop (useful is you
+ automatically generated emacs.desktop (useful if you
only use emacsclient ), you can change your file
emacs.nix in this way:
diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix
index bb4541a784dae..e1ce11a5aef62 100644
--- a/nixos/modules/services/hardware/fancontrol.nix
+++ b/nixos/modules/services/hardware/fancontrol.nix
@@ -12,7 +12,7 @@ in{
config = mkOption {
default = null;
- type = types.lines;
+ type = types.nullOr types.lines;
description = "Fancontrol configuration file content. See pwmconfig 8 7 .
'';
};
+
+ backupDir = mkOption {
+ type = types.str;
+ default = "${cfg.stateDir}/dump";
+ description = "Path to the dump files.";
+ };
+ };
+
+ ssh = {
+ enable = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Enable external SSH feature.";
+ };
+
+ clonePort = mkOption {
+ type = types.int;
+ default = 22;
+ example = 2222;
+ description = ''
+ SSH port displayed in clone URL.
+ The option is required to configure a service when the external visible port
+ differs from the local listening port i.e. if port forwarding is used.
+ '';
+ };
+ };
+
+ lfs = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enables git-lfs support.";
+ };
+
+ contentDir = mkOption {
+ type = types.str;
+ default = "${cfg.stateDir}/data/lfs";
+ description = "Where to store LFS files.";
+ };
};
appName = mkOption {
@@ -200,6 +239,12 @@ in
description = "HTTP listen port.";
};
+ enableUnixSocket = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Configure Gitea to listen on a unix socket instead of the default TCP port.";
+ };
+
cookieSecure = mkOption {
type = types.bool;
default = false;
@@ -300,14 +345,34 @@ in
ROOT = cfg.repositoryRoot;
};
- server = {
- DOMAIN = cfg.domain;
- HTTP_ADDR = cfg.httpAddress;
- HTTP_PORT = cfg.httpPort;
- ROOT_URL = cfg.rootUrl;
- STATIC_ROOT_PATH = cfg.staticRootPath;
- LFS_JWT_SECRET = "#jwtsecret#";
- };
+ server = mkMerge [
+ {
+ DOMAIN = cfg.domain;
+ STATIC_ROOT_PATH = cfg.staticRootPath;
+ LFS_JWT_SECRET = "#jwtsecret#";
+ ROOT_URL = cfg.rootUrl;
+ }
+ (mkIf cfg.enableUnixSocket {
+ PROTOCOL = "unix";
+ HTTP_ADDR = "/run/gitea/gitea.sock";
+ })
+ (mkIf (!cfg.enableUnixSocket) {
+ HTTP_ADDR = cfg.httpAddress;
+ HTTP_PORT = cfg.httpPort;
+ })
+ (mkIf cfg.ssh.enable {
+ DISABLE_SSH = false;
+ SSH_PORT = cfg.ssh.clonePort;
+ })
+ (mkIf (!cfg.ssh.enable) {
+ DISABLE_SSH = true;
+ })
+ (mkIf cfg.lfs.enable {
+ LFS_START_SERVER = true;
+ LFS_CONTENT_PATH = cfg.lfs.contentDir;
+ })
+
+ ];
session = {
COOKIE_NAME = "session";
@@ -357,12 +422,26 @@ in
};
systemd.tmpfiles.rules = [
- "d '${cfg.stateDir}' - ${cfg.user} gitea - -"
- "d '${cfg.stateDir}/conf' - ${cfg.user} gitea - -"
- "d '${cfg.stateDir}/custom' - ${cfg.user} gitea - -"
- "d '${cfg.stateDir}/custom/conf' - ${cfg.user} gitea - -"
- "d '${cfg.stateDir}/log' - ${cfg.user} gitea - -"
- "d '${cfg.repositoryRoot}' - ${cfg.user} gitea - -"
+ "d '${cfg.dump.backupDir}' 0750 ${cfg.user} gitea - -"
+ "z '${cfg.dump.backupDir}' 0750 ${cfg.user} gitea - -"
+ "Z '${cfg.dump.backupDir}' - ${cfg.user} gitea - -"
+ "d '${cfg.lfs.contentDir}' 0750 ${cfg.user} gitea - -"
+ "z '${cfg.lfs.contentDir}' 0750 ${cfg.user} gitea - -"
+ "Z '${cfg.lfs.contentDir}' - ${cfg.user} gitea - -"
+ "d '${cfg.repositoryRoot}' 0750 ${cfg.user} gitea - -"
+ "z '${cfg.repositoryRoot}' 0750 ${cfg.user} gitea - -"
+ "Z '${cfg.repositoryRoot}' - ${cfg.user} gitea - -"
+ "d '${cfg.stateDir}' 0750 ${cfg.user} gitea - -"
+ "d '${cfg.stateDir}/conf' 0750 ${cfg.user} gitea - -"
+ "d '${cfg.stateDir}/custom' 0750 ${cfg.user} gitea - -"
+ "d '${cfg.stateDir}/custom/conf' 0750 ${cfg.user} gitea - -"
+ "d '${cfg.stateDir}/log' 0750 ${cfg.user} gitea - -"
+ "z '${cfg.stateDir}' 0750 ${cfg.user} gitea - -"
+ "z '${cfg.stateDir}/.ssh' 0700 ${cfg.user} gitea - -"
+ "z '${cfg.stateDir}/conf' 0750 ${cfg.user} gitea - -"
+ "z '${cfg.stateDir}/custom' 0750 ${cfg.user} gitea - -"
+ "z '${cfg.stateDir}/custom/conf' 0750 ${cfg.user} gitea - -"
+ "z '${cfg.stateDir}/log' 0750 ${cfg.user} gitea - -"
"Z '${cfg.stateDir}' - ${cfg.user} gitea - -"
# If we have a folder or symlink with gitea locales, remove it
@@ -431,28 +510,39 @@ in
User = cfg.user;
Group = "gitea";
WorkingDirectory = cfg.stateDir;
- ExecStart = "${gitea}/bin/gitea web";
+ ExecStart = "${gitea}/bin/gitea web --pid /run/gitea/gitea.pid";
Restart = "always";
-
- # Filesystem
+ # Runtime directory and mode
+ RuntimeDirectory = "gitea";
+ RuntimeDirectoryMode = "0755";
+ # Access write directories
+ ReadWritePaths = [ cfg.dump.backupDir cfg.repositoryRoot cfg.stateDir cfg.lfs.contentDir ];
+ UMask = "0027";
+ # Capabilities
+ CapabilityBoundingSet = "";
+ # Security
+ NoNewPrivileges = true;
+ # Sandboxing
+ ProtectSystem = "strict";
ProtectHome = true;
+ PrivateTmp = true;
PrivateDevices = true;
+ PrivateUsers = true;
+ ProtectHostname = true;
+ ProtectClock = true;
ProtectKernelTunables = true;
ProtectKernelModules = true;
+ ProtectKernelLogs = true;
ProtectControlGroups = true;
- ReadWritePaths = cfg.stateDir;
- # Caps
- CapabilityBoundingSet = "";
- NoNewPrivileges = true;
- # Misc.
+ RestrictAddressFamilies = [ "AF_UNIX AF_INET AF_INET6" ];
LockPersonality = true;
+ MemoryDenyWriteExecute = true;
RestrictRealtime = true;
+ RestrictSUIDSGID = true;
PrivateMounts = true;
- PrivateUsers = true;
- MemoryDenyWriteExecute = true;
- SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @reboot @resources @setuid @swap";
+ # System Call Filtering
SystemCallArchitectures = "native";
- RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
+ SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @reboot @resources @setuid @swap";
};
environment = {
@@ -504,7 +594,7 @@ in
Type = "oneshot";
User = cfg.user;
ExecStart = "${gitea}/bin/gitea dump";
- WorkingDirectory = cfg.stateDir;
+ WorkingDirectory = cfg.dump.backupDir;
};
};
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index fa393de3219a1..425f35f37cb6d 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -54,7 +54,7 @@ let
'') gitlabConfig.production.repositories.storages))}
'';
- gitlabShellConfig = {
+ gitlabShellConfig = flip recursiveUpdate cfg.extraShellConfig {
user = cfg.user;
gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}";
http_settings.self_signed_cert = false;
@@ -517,6 +517,12 @@ in {
'';
};
+ extraShellConfig = mkOption {
+ type = types.attrs;
+ default = {};
+ description = "Extra configuration to merge into shell-config.yml";
+ };
+
extraConfig = mkOption {
type = types.attrs;
default = {};
@@ -696,7 +702,6 @@ in {
"L+ /run/gitlab/shell-config.yml - - - - ${pkgs.writeText "config.yml" (builtins.toJSON gitlabShellConfig)}"
"L+ ${cfg.statePath}/config/unicorn.rb - - - - ${./defaultUnicornConfig.rb}"
- "L+ ${cfg.statePath}/config/initializers/extra-gitlab.rb - - - - ${extraGitlabRb}"
];
systemd.services.gitlab-sidekiq = {
@@ -816,6 +821,7 @@ in {
rm -f ${cfg.statePath}/lib
cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
+ ln -sf ${extraGitlabRb} ${cfg.statePath}/config/initializers/extra-gitlab.rb
${cfg.packages.gitlab-shell}/bin/install
diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix
index f4a9c72b1545e..0c9c7548305ba 100644
--- a/nixos/modules/services/misc/gollum.nix
+++ b/nixos/modules/services/misc/gollum.nix
@@ -50,6 +50,12 @@ in
description = "Parse and interpret emoji tags";
};
+ h1-title = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Use the first h1 as page title";
+ };
+
branch = mkOption {
type = types.str;
default = "master";
@@ -98,10 +104,11 @@ in
${pkgs.gollum}/bin/gollum \
--port ${toString cfg.port} \
--host ${cfg.address} \
- --config ${builtins.toFile "gollum-config.rb" cfg.extraConfig} \
+ --config ${pkgs.writeText "gollum-config.rb" cfg.extraConfig} \
--ref ${cfg.branch} \
${optionalString cfg.mathjax "--mathjax"} \
${optionalString cfg.emoji "--emoji"} \
+ ${optionalString cfg.h1-title "--h1-title"} \
${optionalString (cfg.allowUploads != null) "--allow-uploads ${cfg.allowUploads}"} \
${cfg.stateDir}
'';
diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix
index 6ecdfb57dc358..0493dadea94ea 100644
--- a/nixos/modules/services/misc/jellyfin.nix
+++ b/nixos/modules/services/misc/jellyfin.nix
@@ -16,6 +16,14 @@ in
description = "User account under which Jellyfin runs.";
};
+ package = mkOption {
+ type = types.package;
+ example = literalExample "pkgs.jellyfin";
+ description = ''
+ Jellyfin package to use.
+ '';
+ };
+
group = mkOption {
type = types.str;
default = "jellyfin";
@@ -35,11 +43,16 @@ in
Group = cfg.group;
StateDirectory = "jellyfin";
CacheDirectory = "jellyfin";
- ExecStart = "${pkgs.jellyfin}/bin/jellyfin --datadir '/var/lib/${StateDirectory}' --cachedir '/var/cache/${CacheDirectory}'";
+ ExecStart = "${cfg.package}/bin/jellyfin --datadir '/var/lib/${StateDirectory}' --cachedir '/var/cache/${CacheDirectory}'";
Restart = "on-failure";
};
};
+ services.jellyfin.package = mkDefault (
+ if versionAtLeast config.system.stateVersion "20.09" then pkgs.jellyfin
+ else pkgs.jellyfin_10_5
+ );
+
users.users = mkIf (cfg.user == "jellyfin") {
jellyfin = {
group = cfg.group;
diff --git a/nixos/modules/services/misc/mathics.nix b/nixos/modules/services/misc/mathics.nix
deleted file mode 100644
index c588a30d76cd1..0000000000000
--- a/nixos/modules/services/misc/mathics.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ pkgs, lib, config, ... }:
-
-with lib;
-
-let
- cfg = config.services.mathics;
-
-in {
- options = {
- services.mathics = {
- enable = mkEnableOption "Mathics notebook service";
-
- external = mkOption {
- type = types.bool;
- default = false;
- description = "Listen on all interfaces, rather than just localhost?";
- };
-
- port = mkOption {
- type = types.int;
- default = 8000;
- description = "TCP port to listen on.";
- };
- };
- };
-
- config = mkIf cfg.enable {
-
- users.users.mathics = {
- group = config.users.groups.mathics.name;
- description = "Mathics user";
- home = "/var/lib/mathics";
- createHome = true;
- uid = config.ids.uids.mathics;
- };
-
- users.groups.mathics.gid = config.ids.gids.mathics;
-
- systemd.services.mathics = {
- description = "Mathics notebook server";
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
- serviceConfig = {
- User = config.users.users.mathics.name;
- Group = config.users.groups.mathics.name;
- ExecStart = concatStringsSep " " [
- "${pkgs.mathics}/bin/mathicsserver"
- "--port" (toString cfg.port)
- (if cfg.external then "--external" else "")
- ];
- };
- };
- };
-}
diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix
deleted file mode 100644
index 572a9847e46c6..0000000000000
--- a/nixos/modules/services/misc/mesos-master.nix
+++ /dev/null
@@ -1,125 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.services.mesos.master;
-
-in {
-
- options.services.mesos = {
-
- master = {
- enable = mkOption {
- description = "Whether to enable the Mesos Master.";
- default = false;
- type = types.bool;
- };
-
- ip = mkOption {
- description = "IP address to listen on.";
- default = "0.0.0.0";
- type = types.str;
- };
-
- port = mkOption {
- description = "Mesos Master port";
- default = 5050;
- type = types.int;
- };
-
- advertiseIp = mkOption {
- description = "IP address advertised to reach this master.";
- default = null;
- type = types.nullOr types.str;
- };
-
- advertisePort = mkOption {
- description = "Port advertised to reach this Mesos master.";
- default = null;
- type = types.nullOr types.int;
- };
-
- zk = mkOption {
- description = ''
- ZooKeeper URL (used for leader election amongst masters).
- May be one of:
- zk://host1:port1,host2:port2,.../mesos
- zk://username:password@host1:port1,host2:port2,.../mesos
- '';
- type = types.str;
- };
-
- workDir = mkOption {
- description = "The Mesos work directory.";
- default = "/var/lib/mesos/master";
- type = types.str;
- };
-
- extraCmdLineOptions = mkOption {
- description = ''
- Extra command line options for Mesos Master.
-
- See https://mesos.apache.org/documentation/latest/configuration/
- '';
- default = [ "" ];
- type = types.listOf types.str;
- example = [ "--credentials=VALUE" ];
- };
-
- quorum = mkOption {
- description = ''
- The size of the quorum of replicas when using 'replicated_log' based
- registry. It is imperative to set this value to be a majority of
- masters i.e., quorum > (number of masters)/2.
-
- If 0 will fall back to --registry=in_memory.
- '';
- default = 0;
- type = types.int;
- };
-
- logLevel = mkOption {
- description = ''
- The logging level used. Possible values:
- 'INFO', 'WARNING', 'ERROR'
- '';
- default = "INFO";
- type = types.str;
- };
-
- };
-
-
- };
-
-
- config = mkIf cfg.enable {
- systemd.tmpfiles.rules = [
- "d '${cfg.workDir}' 0700 - - - -"
- ];
- systemd.services.mesos-master = {
- description = "Mesos Master";
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
- serviceConfig = {
- ExecStart = ''
- ${pkgs.mesos}/bin/mesos-master \
- --ip=${cfg.ip} \
- --port=${toString cfg.port} \
- ${optionalString (cfg.advertiseIp != null) "--advertise_ip=${cfg.advertiseIp}"} \
- ${optionalString (cfg.advertisePort != null) "--advertise_port=${toString cfg.advertisePort}"} \
- ${if cfg.quorum == 0
- then "--registry=in_memory"
- else "--zk=${cfg.zk} --registry=replicated_log --quorum=${toString cfg.quorum}"} \
- --work_dir=${cfg.workDir} \
- --logging_level=${cfg.logLevel} \
- ${toString cfg.extraCmdLineOptions}
- '';
- Restart = "on-failure";
- };
- };
- };
-
-}
-
diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix
deleted file mode 100644
index 170065d0065e0..0000000000000
--- a/nixos/modules/services/misc/mesos-slave.nix
+++ /dev/null
@@ -1,220 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.services.mesos.slave;
-
- mkAttributes =
- attrs: concatStringsSep ";" (mapAttrsToList
- (k: v: "${k}:${v}")
- (filterAttrs (k: v: v != null) attrs));
- attribsArg = optionalString (cfg.attributes != {})
- "--attributes=${mkAttributes cfg.attributes}";
-
- containerizersArg = concatStringsSep "," (
- lib.unique (
- cfg.containerizers ++ (optional cfg.withDocker "docker")
- )
- );
-
- imageProvidersArg = concatStringsSep "," (
- lib.unique (
- cfg.imageProviders ++ (optional cfg.withDocker "docker")
- )
- );
-
- isolationArg = concatStringsSep "," (
- lib.unique (
- cfg.isolation ++ (optionals cfg.withDocker [ "filesystem/linux" "docker/runtime"])
- )
- );
-
-in {
-
- options.services.mesos = {
- slave = {
- enable = mkOption {
- description = "Whether to enable the Mesos Slave.";
- default = false;
- type = types.bool;
- };
-
- ip = mkOption {
- description = "IP address to listen on.";
- default = "0.0.0.0";
- type = types.str;
- };
-
- port = mkOption {
- description = "Port to listen on.";
- default = 5051;
- type = types.int;
- };
-
- advertiseIp = mkOption {
- description = "IP address advertised to reach this agent.";
- default = null;
- type = types.nullOr types.str;
- };
-
- advertisePort = mkOption {
- description = "Port advertised to reach this agent.";
- default = null;
- type = types.nullOr types.int;
- };
-
- containerizers = mkOption {
- description = ''
- List of containerizer implementations to compose in order to provide
- containerization. Available options are mesos and docker.
- The order the containerizers are specified is the order they are tried.
- '';
- default = [ "mesos" ];
- type = types.listOf types.str;
- };
-
- imageProviders = mkOption {
- description = "List of supported image providers, e.g., APPC,DOCKER.";
- default = [ ];
- type = types.listOf types.str;
- };
-
- imageProvisionerBackend = mkOption {
- description = ''
- Strategy for provisioning container rootfs from images,
- e.g., aufs, bind, copy, overlay.
- '';
- default = "copy";
- type = types.str;
- };
-
- isolation = mkOption {
- description = ''
- Isolation mechanisms to use, e.g., posix/cpu,posix/mem, or
- cgroups/cpu,cgroups/mem, or network/port_mapping, or `gpu/nvidia` for nvidia
- specific gpu isolation.
- '';
- default = [ "posix/cpu" "posix/mem" ];
- type = types.listOf types.str;
- };
-
- master = mkOption {
- description = ''
- May be one of:
- zk://host1:port1,host2:port2,.../path
- zk://username:password@host1:port1,host2:port2,.../path
- '';
- type = types.str;
- };
-
- withHadoop = mkOption {
- description = "Add the HADOOP_HOME to the slave.";
- default = false;
- type = types.bool;
- };
-
- withDocker = mkOption {
- description = "Enable the docker containerizer.";
- default = config.virtualisation.docker.enable;
- type = types.bool;
- };
-
- dockerRegistry = mkOption {
- description = ''
- The default url for pulling Docker images.
- It could either be a Docker registry server url,
- or a local path in which Docker image archives are stored.
- '';
- default = null;
- type = types.nullOr (types.either types.str types.path);
- };
-
- workDir = mkOption {
- description = "The Mesos work directory.";
- default = "/var/lib/mesos/slave";
- type = types.str;
- };
-
- extraCmdLineOptions = mkOption {
- description = ''
- Extra command line options for Mesos Slave.
-
- See https://mesos.apache.org/documentation/latest/configuration/
- '';
- default = [ "" ];
- type = types.listOf types.str;
- example = [ "--gc_delay=3days" ];
- };
-
- logLevel = mkOption {
- description = ''
- The logging level used. Possible values:
- 'INFO', 'WARNING', 'ERROR'
- '';
- default = "INFO";
- type = types.str;
- };
-
- attributes = mkOption {
- description = ''
- Machine attributes for the slave instance.
-
- Use caution when changing this; you may need to manually reset slave
- metadata before the slave can re-register.
- '';
- default = {};
- type = types.attrsOf types.str;
- example = { rack = "aa";
- host = "aabc123";
- os = "nixos"; };
- };
-
- executorEnvironmentVariables = mkOption {
- description = ''
- The environment variables that should be passed to the executor, and thus subsequently task(s).
- '';
- default = {
- PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
- };
- type = types.attrsOf types.str;
- };
- };
-
- };
-
- config = mkIf cfg.enable {
- systemd.tmpfiles.rules = [
- "d '${cfg.workDir}' 0701 - - - -"
- ];
- systemd.services.mesos-slave = {
- description = "Mesos Slave";
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ] ++ optionals cfg.withDocker [ "docker.service" ] ;
- path = [ pkgs.runtimeShellPackage ];
- serviceConfig = {
- ExecStart = ''
- ${pkgs.mesos}/bin/mesos-slave \
- --containerizers=${containerizersArg} \
- --image_providers=${imageProvidersArg} \
- --image_provisioner_backend=${cfg.imageProvisionerBackend} \
- --isolation=${isolationArg} \
- --ip=${cfg.ip} \
- --port=${toString cfg.port} \
- ${optionalString (cfg.advertiseIp != null) "--advertise_ip=${cfg.advertiseIp}"} \
- ${optionalString (cfg.advertisePort != null) "--advertise_port=${toString cfg.advertisePort}"} \
- --master=${cfg.master} \
- --work_dir=${cfg.workDir} \
- --logging_level=${cfg.logLevel} \
- ${attribsArg} \
- ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \
- ${optionalString cfg.withDocker "--docker=${pkgs.docker}/libexec/docker/docker"} \
- ${optionalString (cfg.dockerRegistry != null) "--docker_registry=${cfg.dockerRegistry}"} \
- --executor_environment_variables=${lib.escapeShellArg (builtins.toJSON cfg.executorEnvironmentVariables)} \
- ${toString cfg.extraCmdLineOptions}
- '';
- };
- };
- };
-
-}
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 924a007efc6dd..2680b1cc0d3b8 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -500,13 +500,6 @@ in
config = {
- assertions = [
- {
- assertion = config.nix.distributedBuilds || config.nix.buildMachines == [];
- message = "You must set `nix.distributedBuilds = true` to use nix.buildMachines";
- }
- ];
-
nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
nix.binaryCaches = [ "https://cache.nixos.org/" ];
@@ -594,16 +587,10 @@ in
nix.systemFeatures = mkDefault (
[ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++
- optionals (pkgs.stdenv.isx86_64 && pkgs.hostPlatform.platform ? gcc.arch) (
- # a x86_64 builder can run code for `platform.gcc.arch` and minor architectures:
- [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ {
- sandybridge = [ "gccarch-westmere" ];
- ivybridge = [ "gccarch-westmere" "gccarch-sandybridge" ];
- haswell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" ];
- broadwell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" ];
- skylake = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" ];
- skylake-avx512 = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" "gccarch-skylake" ];
- }.${pkgs.hostPlatform.platform.gcc.arch} or []
+ optionals (pkgs.hostPlatform.platform ? gcc.arch) (
+ # a builder can run code for `platform.gcc.arch` and inferior architectures
+ [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++
+ map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.platform.gcc.arch}
)
);
diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
index 7a71d2c8c6aa6..e2fbd3b401cc5 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -68,8 +68,8 @@ in
plugins = mkOption {
default = plugins: [];
defaultText = "plugins: []";
- example = literalExample "plugins: [ m3d-fio ]";
- description = "Additional plugins.";
+ example = literalExample "plugins: with plugins; [ m33-fio stlviewer ]";
+ description = "Additional plugins to be used. Available plugins are passed through the plugins input.";
};
extraConfig = mkOption {
diff --git a/nixos/modules/services/misc/pinnwand.nix b/nixos/modules/services/misc/pinnwand.nix
new file mode 100644
index 0000000000000..aa1ee5cfaa77d
--- /dev/null
+++ b/nixos/modules/services/misc/pinnwand.nix
@@ -0,0 +1,78 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.pinnwand;
+
+ format = pkgs.formats.toml {};
+ configFile = format.generate "pinnwand.toml" cfg.settings;
+in
+{
+ options.services.pinnwand = {
+ enable = mkEnableOption "Pinnwand";
+
+ port = mkOption {
+ type = types.port;
+ description = "The port to listen on.";
+ default = 8000;
+ };
+
+ settings = mkOption {
+ type = format.type;
+ description = ''
+ Your pinnwand.toml as a Nix attribute set. Look up
+ possible options in the Welcome to pinnwand, this site is a pastebin. It allows you to share code with others. If you write code in the text area below and press the paste button you will be given a link you can share with others so they can view your code as well.
People with the link can view your pasted code, only you can remove your paste and it expires automatically. Note that anyone could guess the URI to your paste so don't rely on it being private.
+ '';
+ footer = ''
+ View source code , the removal or expiry stories, or read the about page.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.pinnwand = {
+ description = "Pinnwannd HTTP Server";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ unitConfig.Documentation = "https://pinnwand.readthedocs.io/en/latest/";
+ serviceConfig = {
+ ExecStart = "${pkgs.pinnwand}/bin/pinnwand --configuration-path ${configFile} http --port ${toString(cfg.port)}";
+ StateDirectory = "pinnwand";
+ StateDirectoryMode = "0700";
+
+ AmbientCapabilities = [];
+ CapabilityBoundingSet = "";
+ DevicePolicy = "closed";
+ DynamicUser = true;
+ LockPersonality = true;
+ MemoryDenyWriteExecute = true;
+ PrivateDevices = true;
+ PrivateUsers = true;
+ ProtectClock = true;
+ ProtectControlGroups = true;
+ ProtectKernelLogs = true;
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
+ RestrictNamespaces = true;
+ RestrictRealtime = true;
+ SystemCallArchitectures = "native";
+ SystemCallFilter = "@system-service";
+ UMask = "0077";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index 0e71cf925692c..1313bdaccc49a 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -1,12 +1,12 @@
{ config, lib, pkgs, ... }:
let
- inherit (lib) mkDefault mkEnableOption mkIf mkOption types;
+ inherit (lib) mkBefore mkDefault mkEnableOption mkIf mkOption mkRemovedOptionModule types;
inherit (lib) concatStringsSep literalExample mapAttrsToList;
- inherit (lib) optional optionalAttrs optionalString singleton versionAtLeast;
+ inherit (lib) optional optionalAttrs optionalString;
cfg = config.services.redmine;
-
+ format = pkgs.formats.yaml {};
bundle = "${cfg.package}/share/redmine/bin/bundle";
databaseYml = pkgs.writeText "database.yml" ''
@@ -20,24 +20,8 @@ let
${optionalString (cfg.database.type == "mysql2" && cfg.database.socket != null) "socket: ${cfg.database.socket}"}
'';
- configurationYml = pkgs.writeText "configuration.yml" ''
- default:
- scm_subversion_command: ${pkgs.subversion}/bin/svn
- scm_mercurial_command: ${pkgs.mercurial}/bin/hg
- scm_git_command: ${pkgs.gitAndTools.git}/bin/git
- scm_cvs_command: ${pkgs.cvs}/bin/cvs
- scm_bazaar_command: ${pkgs.breezy}/bin/bzr
- scm_darcs_command: ${pkgs.darcs}/bin/darcs
-
- ${cfg.extraConfig}
- '';
-
- additionalEnvironment = pkgs.writeText "additional_environment.rb" ''
- config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576)
- config.logger.level = Logger::INFO
-
- ${cfg.extraEnv}
- '';
+ configurationYml = format.generate "configuration.yml" cfg.settings;
+ additionalEnvironment = pkgs.writeText "additional_environment.rb" cfg.extraEnv;
unpackTheme = unpack "theme";
unpackPlugin = unpack "plugin";
@@ -56,8 +40,13 @@ let
pgsqlLocal = cfg.database.createLocally && cfg.database.type == "postgresql";
in
-
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "redmine" "extraConfig" ] "Use services.redmine.settings instead.")
+ (mkRemovedOptionModule [ "services" "redmine" "database" "password" ] "Use services.redmine.database.passwordFile instead.")
+ ];
+
+ # interface
options = {
services.redmine = {
enable = mkEnableOption "Redmine";
@@ -93,21 +82,24 @@ in
description = "The state directory, logs and plugins are stored here.";
};
- extraConfig = mkOption {
- type = types.lines;
- default = "";
+ settings = mkOption {
+ type = format.type;
+ default = {};
description = ''
- Extra configuration in configuration.yml.
-
- See configuration.yml ). Refer to
+ database.user .
- Warning: this is stored in cleartext in the Nix store!
- Use database.passwordFile instead.
- '';
- };
-
passwordFile = mkOption {
type = types.nullOr types.path;
default = null;
@@ -226,11 +208,12 @@ in
};
};
+ # implementation
config = mkIf cfg.enable {
assertions = [
- { assertion = cfg.database.passwordFile != null || cfg.database.password != "" || cfg.database.socket != null;
- message = "one of services.redmine.database.socket, services.redmine.database.passwordFile, or services.redmine.database.password must be set";
+ { assertion = cfg.database.passwordFile != null || cfg.database.socket != null;
+ message = "one of services.redmine.database.socket or services.redmine.database.passwordFile must be set";
}
{ assertion = cfg.database.createLocally -> cfg.database.user == cfg.user;
message = "services.redmine.database.user must be set to ${cfg.user} if services.redmine.database.createLocally is set true";
@@ -243,6 +226,22 @@ in
}
];
+ services.redmine.settings = {
+ production = {
+ scm_subversion_command = "${pkgs.subversion}/bin/svn";
+ scm_mercurial_command = "${pkgs.mercurial}/bin/hg";
+ scm_git_command = "${pkgs.gitAndTools.git}/bin/git";
+ scm_cvs_command = "${pkgs.cvs}/bin/cvs";
+ scm_bazaar_command = "${pkgs.breezy}/bin/bzr";
+ scm_darcs_command = "${pkgs.darcs}/bin/darcs";
+ };
+ };
+
+ services.redmine.extraEnv = mkBefore ''
+ config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576)
+ config.logger.level = Logger::INFO
+ '';
+
services.mysql = mkIf mysqlLocal {
enable = true;
package = mkDefault pkgs.mariadb;
@@ -338,7 +337,7 @@ in
# handle database.passwordFile & permissions
- DBPASS=$(head -n1 ${cfg.database.passwordFile})
+ DBPASS=${optionalString (cfg.database.passwordFile != null) "$(head -n1 ${cfg.database.passwordFile})"}
cp -f ${databaseYml} "${cfg.stateDir}/config/database.yml"
sed -e "s,#dbpass#,$DBPASS,g" -i "${cfg.stateDir}/config/database.yml"
chmod 440 "${cfg.stateDir}/config/database.yml"
@@ -379,17 +378,6 @@ in
redmine.gid = config.ids.gids.redmine;
};
- warnings = optional (cfg.database.password != "")
- ''config.services.redmine.database.password will be stored as plaintext
- in the Nix store. Use database.passwordFile instead.'';
-
- # Create database passwordFile default when password is configured.
- services.redmine.database.passwordFile =
- (mkDefault (toString (pkgs.writeTextFile {
- name = "redmine-database-password";
- text = cfg.database.password;
- })));
-
};
}
diff --git a/nixos/modules/services/misc/ssm-agent.nix b/nixos/modules/services/misc/ssm-agent.nix
index f7c05deeecb56..00e806695fd5f 100644
--- a/nixos/modules/services/misc/ssm-agent.nix
+++ b/nixos/modules/services/misc/ssm-agent.nix
@@ -29,13 +29,15 @@ in {
config = mkIf cfg.enable {
systemd.services.ssm-agent = {
+ users.extraUsers.ssm-user = {};
+
inherit (cfg.package.meta) description;
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
- path = [ fake-lsb-release ];
+ path = [ fake-lsb-release pkgs.coreutils ];
serviceConfig = {
- ExecStart = "${cfg.package}/bin/agent";
+ ExecStart = "${cfg.package}/bin/amazon-ssm-agent";
KillMode = "process";
Restart = "on-failure";
RestartSec = "15min";
diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix
index 3da99a3b38c1b..386281e2b7cca 100644
--- a/nixos/modules/services/misc/sssd.nix
+++ b/nixos/modules/services/misc/sssd.nix
@@ -69,7 +69,7 @@ in {
mode = "0400";
};
- system.nssModules = pkgs.sssd;
+ system.nssModules = [ pkgs.sssd ];
system.nssDatabases = {
group = [ "sss" ];
passwd = [ "sss" ];
@@ -92,4 +92,6 @@ in {
services.openssh.authorizedKeysCommand = "/etc/ssh/authorized_keys_command";
services.openssh.authorizedKeysCommandUser = "nobody";
})];
+
+ meta.maintainers = with maintainers; [ bbigras ];
}
diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix
index ca9352272174e..aa51b83912cec 100644
--- a/nixos/modules/services/monitoring/monit.nix
+++ b/nixos/modules/services/monitoring/monit.nix
@@ -4,19 +4,29 @@ with lib;
let
cfg = config.services.monit;
+ extraConfig = pkgs.writeText "monitConfig" cfg.extraConfig;
in
{
+ imports = [
+ (mkRenamedOptionModule [ "services" "monit" "config" ] ["services" "monit" "extraConfig" ])
+ ];
+
options.services.monit = {
enable = mkEnableOption "Monit";
- config = mkOption {
+ configFiles = mkOption {
+ type = types.listOf types.path;
+ default = [];
+ description = "List of paths to be included in the monitrc file";
+ };
+
+ extraConfig = mkOption {
type = types.lines;
default = "";
- description = "monitrc content";
+ description = "Additional monit config as string";
};
-
};
config = mkIf cfg.enable {
@@ -24,7 +34,7 @@ in
environment.systemPackages = [ pkgs.monit ];
environment.etc.monitrc = {
- text = cfg.config;
+ text = concatMapStringsSep "\n" (path: "include ${path}") (cfg.configFiles ++ [extraConfig]);
mode = "0400";
};
diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index a5233a46e3411..2e73e15d3a867 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -133,16 +133,6 @@ in {
}
];
- systemd.tmpfiles.rules = [
- "d /var/cache/netdata 0755 ${cfg.user} ${cfg.group} -"
- "Z /var/cache/netdata - ${cfg.user} ${cfg.group} -"
- "d /var/log/netdata 0755 ${cfg.user} ${cfg.group} -"
- "Z /var/log/netdata - ${cfg.user} ${cfg.group} -"
- "d /var/lib/netdata 0755 ${cfg.user} ${cfg.group} -"
- "Z /var/lib/netdata - ${cfg.user} ${cfg.group} -"
- "d /etc/netdata 0755 ${cfg.user} ${cfg.group} -"
- "Z /etc/netdata - ${cfg.user} ${cfg.group} -"
- ];
systemd.services.netdata = {
description = "Real time performance monitoring";
after = [ "network.target" ];
@@ -158,11 +148,40 @@ in {
# User and group
User = cfg.user;
Group = cfg.group;
- # Runtime directory and mode
- RuntimeDirectory = "netdata";
- RuntimeDirectoryMode = "0755";
# Performance
LimitNOFILE = "30000";
+ # Runtime directory and mode
+ RuntimeDirectory = "netdata";
+ RuntimeDirectoryMode = "0750";
+ # State directory and mode
+ StateDirectory = "netdata";
+ StateDirectoryMode = "0750";
+ # Cache directory and mode
+ CacheDirectory = "netdata";
+ CacheDirectoryMode = "0750";
+ # Logs directory and mode
+ LogsDirectory = "netdata";
+ LogsDirectoryMode = "0750";
+ # Configuration directory and mode
+ ConfigurationDirectory = "netdata";
+ ConfigurationDirectoryMode = "0755";
+ # Capabilities
+ CapabilityBoundingSet = [
+ "CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins
+ "CAP_DAC_READ_SEARCH" # is required for apps plugin
+ "CAP_FOWNER" # is required for freeipmi plugin
+ "CAP_SETPCAP" # is required for apps, perf and slabinfo plugins
+ "CAP_SYS_ADMIN" # is required for perf plugin
+ "CAP_SYS_PTRACE" # is required for apps plugin
+ "CAP_SYS_RESOURCE" # is required for ebpf plugin
+ "CAP_NET_RAW" # is required for fping app
+ ];
+ # Sandboxing
+ ProtectSystem = "full";
+ ProtectHome = "read-only";
+ PrivateTmp = true;
+ ProtectControlGroups = true;
+ PrivateMounts = true;
};
};
diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index 84a72afac2f76..d7e06484b6928 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -46,7 +46,7 @@ let
cmdlineArgs = cfg.extraFlags ++ [
"--storage.tsdb.path=${workingDir}/data/"
"--config.file=${prometheusYml}"
- "--web.listen-address=${cfg.listenAddress}"
+ "--web.listen-address=${cfg.listenAddress}:${builtins.toString cfg.port}"
"--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}"
"--alertmanager.timeout=${toString cfg.alertmanagerTimeout}s"
] ++
@@ -489,9 +489,17 @@ in {
'';
};
+ port = mkOption {
+ type = types.port;
+ default = 9090;
+ description = ''
+ Port to listen on.
+ '';
+ };
+
listenAddress = mkOption {
type = types.str;
- default = "0.0.0.0:9090";
+ default = "0.0.0.0";
description = ''
Address to listen on for the web interface, API, and telemetry.
'';
@@ -619,6 +627,21 @@ in {
};
config = mkIf cfg.enable {
+ assertions = [
+ ( let
+ legacy = builtins.match "(.*):(.*)" cfg.listenAddress;
+ in {
+ assertion = legacy == null;
+ message = ''
+ Do not specify the port for Prometheus to listen on in the
+ listenAddress option; use the port option instead:
+ services.prometheus.listenAddress = ${builtins.elemAt legacy 0};
+ services.prometheus.port = ${builtins.elemAt legacy 1};
+ '';
+ }
+ )
+ ];
+
users.groups.prometheus.gid = config.ids.gids.prometheus;
users.users.prometheus = {
description = "Prometheus daemon user";
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index a3612be3cc235..c72b4abfcdce3 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -20,7 +20,7 @@ let
${pkgs.coreutils}/bin/cat << EOF
From: smartd on ${host} <${nm.sender}>
To: undisclosed-recipients:;
- Subject: SMART error on $SMARTD_DEVICESTRING: $SMARTD_FAILTYPE
+ Subject: $SMARTD_SUBJECT
$SMARTD_FULLMESSAGE
EOF
@@ -239,11 +239,7 @@ in
systemd.services.smartd = {
description = "S.M.A.R.T. Daemon";
-
wantedBy = [ "multi-user.target" ];
-
- path = [ pkgs.nettools ]; # for hostname and dnsdomanname calls in smartd
-
serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}";
};
diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix
index d51507c91a1fa..2c8b8b92cb38b 100644
--- a/nixos/modules/services/monitoring/zabbix-proxy.nix
+++ b/nixos/modules/services/monitoring/zabbix-proxy.nix
@@ -5,8 +5,8 @@ let
pgsql = config.services.postgresql;
mysql = config.services.mysql;
- inherit (lib) mkDefault mkEnableOption mkIf mkMerge mkOption;
- inherit (lib) attrValues concatMapStringsSep literalExample optional optionalAttrs optionalString types;
+ inherit (lib) mkAfter mkDefault mkEnableOption mkIf mkMerge mkOption;
+ inherit (lib) attrValues concatMapStringsSep getName literalExample optional optionalAttrs optionalString types;
inherit (lib.generators) toKeyValue;
user = "zabbix";
@@ -232,14 +232,15 @@ in
services.mysql = optionalAttrs mysqlLocal {
enable = true;
package = mkDefault pkgs.mariadb;
- ensureDatabases = [ cfg.database.name ];
- ensureUsers = [
- { name = cfg.database.user;
- ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
- }
- ];
};
+ systemd.services.mysql.postStart = mkAfter (optionalString mysqlLocal ''
+ ( echo "CREATE DATABASE IF NOT EXISTS \`${cfg.database.name}\` CHARACTER SET utf8 COLLATE utf8_bin;"
+ echo "CREATE USER IF NOT EXISTS '${cfg.database.user}'@'localhost' IDENTIFIED WITH ${if (getName config.services.mysql.package == getName pkgs.mariadb) then "unix_socket" else "auth_socket"};"
+ echo "GRANT ALL PRIVILEGES ON \`${cfg.database.name}\`.* TO '${cfg.database.user}'@'localhost';"
+ ) | ${config.services.mysql.package}/bin/mysql -N
+ '');
+
services.postgresql = optionalAttrs pgsqlLocal {
enable = true;
ensureDatabases = [ cfg.database.name ];
diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix
index df09488a8cccd..c8658634ecb62 100644
--- a/nixos/modules/services/monitoring/zabbix-server.nix
+++ b/nixos/modules/services/monitoring/zabbix-server.nix
@@ -5,8 +5,8 @@ let
pgsql = config.services.postgresql;
mysql = config.services.mysql;
- inherit (lib) mkDefault mkEnableOption mkIf mkMerge mkOption;
- inherit (lib) attrValues concatMapStringsSep literalExample optional optionalAttrs optionalString types;
+ inherit (lib) mkAfter mkDefault mkEnableOption mkIf mkMerge mkOption;
+ inherit (lib) attrValues concatMapStringsSep getName literalExample optional optionalAttrs optionalString types;
inherit (lib.generators) toKeyValue;
user = "zabbix";
@@ -220,14 +220,15 @@ in
services.mysql = optionalAttrs mysqlLocal {
enable = true;
package = mkDefault pkgs.mariadb;
- ensureDatabases = [ cfg.database.name ];
- ensureUsers = [
- { name = cfg.database.user;
- ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
- }
- ];
};
+ systemd.services.mysql.postStart = mkAfter (optionalString mysqlLocal ''
+ ( echo "CREATE DATABASE IF NOT EXISTS \`${cfg.database.name}\` CHARACTER SET utf8 COLLATE utf8_bin;"
+ echo "CREATE USER IF NOT EXISTS '${cfg.database.user}'@'localhost' IDENTIFIED WITH ${if (getName config.services.mysql.package == getName pkgs.mariadb) then "unix_socket" else "auth_socket"};"
+ echo "GRANT ALL PRIVILEGES ON \`${cfg.database.name}\`.* TO '${cfg.database.user}'@'localhost';"
+ ) | ${config.services.mysql.package}/bin/mysql -N
+ '');
+
services.postgresql = optionalAttrs pgsqlLocal {
enable = true;
ensureDatabases = [ cfg.database.name ];
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 7d18410ff0a45..f298f831fa7b2 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -25,6 +25,15 @@ let
then "/${lib.concatStringsSep "/" (lib.tail addr)}"
else null; # not valid for listen stream, skip
+ multiaddrToListenDatagram = addrRaw: let
+ addr = splitMulitaddr addrRaw;
+ s = builtins.elemAt addr;
+ in if s 0 == "ip4" && s 2 == "udp"
+ then "${s 1}:${s 3}"
+ else if s 0 == "ip6" && s 2 == "udp"
+ then "[${s 1}]:${s 3}"
+ else null; # not valid for listen datagram, skip
+
in {
###### interface
@@ -96,6 +105,8 @@ in {
default = [
"/ip4/0.0.0.0/tcp/4001"
"/ip6/::/tcp/4001"
+ "/ip4/0.0.0.0/udp/4001/quic"
+ "/ip6/::/udp/4001/quic"
];
description = "Where IPFS listens for incoming p2p connections";
};
@@ -266,9 +277,14 @@ in {
systemd.sockets.ipfs-gateway = {
wantedBy = [ "sockets.target" ];
- socketConfig.ListenStream = let
- fromCfg = multiaddrToListenStream cfg.gatewayAddress;
- in [ "" ] ++ lib.optional (fromCfg != null) fromCfg;
+ socketConfig = {
+ ListenStream = let
+ fromCfg = multiaddrToListenStream cfg.gatewayAddress;
+ in [ "" ] ++ lib.optional (fromCfg != null) fromCfg;
+ ListenDatagram = let
+ fromCfg = multiaddrToListenDatagram cfg.gatewayAddress;
+ in [ "" ] ++ lib.optional (fromCfg != null) fromCfg;
+ };
};
systemd.sockets.ipfs-api = {
diff --git a/nixos/modules/services/network-filesystems/orangefs/server.nix b/nixos/modules/services/network-filesystems/orangefs/server.nix
index 74ebdc1340245..8eb754fe61103 100644
--- a/nixos/modules/services/network-filesystems/orangefs/server.nix
+++ b/nixos/modules/services/network-filesystems/orangefs/server.nix
@@ -83,14 +83,14 @@ in {
};
dataStorageSpace = mkOption {
- type = types.str;
+ type = types.nullOr types.str;
default = null;
example = "/data/storage";
description = "Directory for data storage.";
};
metadataStorageSpace = mkOption {
- type = types.str;
+ type = types.nullOr types.str;
default = null;
example = "/data/meta";
description = "Directory for meta data storage.";
diff --git a/nixos/modules/services/networking/biboumi.nix b/nixos/modules/services/networking/biboumi.nix
new file mode 100644
index 0000000000000..66ddca93d8181
--- /dev/null
+++ b/nixos/modules/services/networking/biboumi.nix
@@ -0,0 +1,269 @@
+{ config, lib, pkgs, options, ... }:
+with lib;
+let
+ cfg = config.services.biboumi;
+ inherit (config.environment) etc;
+ rootDir = "/run/biboumi/mnt-root";
+ stateDir = "/var/lib/biboumi";
+ settingsFile = pkgs.writeText "biboumi.cfg" (
+ generators.toKeyValue {
+ mkKeyValue = k: v:
+ if v == null then ""
+ else generators.mkKeyValueDefault {} "=" k v;
+ } cfg.settings);
+ need_CAP_NET_BIND_SERVICE = cfg.settings.identd_port != 0 && cfg.settings.identd_port < 1024;
+in
+{
+ options = {
+ services.biboumi = {
+ enable = mkEnableOption "the Biboumi XMPP gateway to IRC";
+
+ settings = mkOption {
+ description = ''
+ See robustirc-bridge command. See usbguard generate-policy as
- root will generate a config for your currently plugged in devices.
- For a in depth guide consult the official documentation.
-
- Setting the rules option will ignore the
- ruleFile option.
- '';
- };
-
rules = mkOption {
type = types.nullOr types.lines;
default = null;
@@ -72,16 +58,20 @@ in {
allow with-interface equals { 08:*:* }
'';
description = ''
- The USBGuard daemon will load this policy rule set. Modifying it via
- the IPC interface won't work if you use this option, since the
- contents of this option will be written into the nix-store it will be
- read-only.
+ The USBGuard daemon will load this as the policy rule set.
+ As these rules are NixOS managed they are immutable and can't
+ be changed by the IPC interface.
+
+ If you do not set this option, the USBGuard daemon will load
+ it's policy rule set from ${defaultRuleFile} .
+ This file can be changed manually or via the IPC interface.
- You can still use usbguard generate-policy to
- generate rules, but you would have to insert them here.
+ Running usbguard generate-policy as root will
+ generate a config for your currently plugged in devices.
- Setting the rules option will ignore the
- ruleFile option.
+ For more details see
+ usbguard-rules.conf
+ 5 .
'';
};
@@ -155,17 +145,6 @@ in {
'';
};
- IPCAccessControlFiles = mkOption {
- type = types.path;
- default = "/var/lib/usbguard/IPCAccessControl.d/";
- description = ''
- The files at this location will be interpreted by the daemon as IPC
- access control definition files. See the IPC ACCESS CONTROL section
- in usbguard-daemon.conf
- 5
+ Using an alternative webserver as reverse-proxy (e.g. <literal>httpd</literal>)
+
+ By default, nginx is used as reverse-proxy for nextcloud .
+ However, it's possible to use e.g. httpd by explicitly disabling
+ nginx using listen.owner & listen.group in the
+ phpfpm pool.
+
+
+ An exemplary configuration may look like this:
+{ config, lib, pkgs, ... }: {
+
+
+
+
Maintainer information
diff --git a/nixos/modules/services/web-apps/rss-bridge.nix b/nixos/modules/services/web-apps/rss-bridge.nix
new file mode 100644
index 0000000000000..f1d5b7660f320
--- /dev/null
+++ b/nixos/modules/services/web-apps/rss-bridge.nix
@@ -0,0 +1,127 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let
+ cfg = config.services.rss-bridge;
+
+ poolName = "rss-bridge";
+
+ whitelist = pkgs.writeText "rss-bridge_whitelist.txt"
+ (concatStringsSep "\n" cfg.whitelist);
+in
+{
+ options = {
+ services.rss-bridge = {
+ enable = mkEnableOption "rss-bridge";
+
+ user = mkOption {
+ type = types.str;
+ default = "nginx";
+ example = "nginx";
+ description = ''
+ User account under which both the service and the web-application run.
+ '';
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "nginx";
+ example = "nginx";
+ description = ''
+ Group under which the web-application run.
+ '';
+ };
+
+ pool = mkOption {
+ type = types.str;
+ default = poolName;
+ description = ''
+ Name of existing phpfpm pool that is used to run web-application.
+ If not specified a pool will be created automatically with
+ default values.
+ '';
+ };
+
+ dataDir = mkOption {
+ type = types.str;
+ default = "/var/lib/rss-bridge";
+ description = ''
+ Location in which cache directory will be created.
+ You can put config.ini.php in here.
+ '';
+ };
+
+ virtualHost = mkOption {
+ type = types.nullOr types.str;
+ default = "rss-bridge";
+ description = ''
+ Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost.
+ '';
+ };
+
+ whitelist = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = options.literalExample ''
+ [
+ "Facebook"
+ "Instagram"
+ "Twitter"
+ ]
+ '';
+ description = ''
+ List of bridges to be whitelisted.
+ If the list is empty, rss-bridge will use whitelist.default.txt.
+ Use [ "*" ] to whitelist all.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.phpfpm.pools = mkIf (cfg.pool == poolName) {
+ ${poolName} = {
+ user = cfg.user;
+ settings = mapAttrs (name: mkDefault) {
+ "listen.owner" = cfg.user;
+ "listen.group" = cfg.user;
+ "listen.mode" = "0600";
+ "pm" = "dynamic";
+ "pm.max_children" = 75;
+ "pm.start_servers" = 10;
+ "pm.min_spare_servers" = 5;
+ "pm.max_spare_servers" = 20;
+ "pm.max_requests" = 500;
+ "catch_workers_output" = 1;
+ };
+ };
+ };
+ systemd.tmpfiles.rules = [
+ "d '${cfg.dataDir}/cache' 0750 ${cfg.user} ${cfg.group} - -"
+ (mkIf (cfg.whitelist != []) "L+ ${cfg.dataDir}/whitelist.txt - - - - ${whitelist}")
+ "z '${cfg.dataDir}/config.ini.php' 0750 ${cfg.user} ${cfg.group} - -"
+ ];
+
+ services.nginx = mkIf (cfg.virtualHost != null) {
+ enable = true;
+ virtualHosts = {
+ ${cfg.virtualHost} = {
+ root = "${pkgs.rss-bridge}";
+
+ locations."/" = {
+ tryFiles = "$uri /index.php$is_args$args";
+ };
+
+ locations."~ ^/index.php(/|$)" = {
+ extraConfig = ''
+ include ${pkgs.nginx}/conf/fastcgi_params;
+ fastcgi_split_path_info ^(.+\.php)(/.+)$;
+ fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param RSSBRIDGE_DATA ${cfg.dataDir};
+ '';
+ };
+ };
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/web-apps/sogo.nix b/nixos/modules/services/web-apps/sogo.nix
index 5f30124dd68ae..4610bb96cb5e4 100644
--- a/nixos/modules/services/web-apps/sogo.nix
+++ b/nixos/modules/services/web-apps/sogo.nix
@@ -77,7 +77,6 @@ in {
// Paths
WOSendMail = "/run/wrappers/bin/sendmail";
SOGoMailSpoolPath = "/var/lib/sogo/spool";
- SOGoZipPath = "${pkgs.zip}/bin/zip";
// Enable CSRF protection
SOGoXSRFValidationEnabled = YES;
// Remove dates from log (jornald does that)
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index 2ea9537b93de0..6a29f10d11954 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -632,8 +632,6 @@ let
User = "${cfg.user}";
Group = "tt_rss";
ExecStart = "${pkgs.php}/bin/php ${cfg.root}/update.php --daemon --quiet";
- StandardOutput = "syslog";
- StandardError = "syslog";
Restart = "on-failure";
RestartSec = "60";
SyslogIdentifier = "tt-rss";
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index e1d1217943bf5..fc4c2945394c3 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -10,6 +10,12 @@ let
pkg = cfg.package.out;
+ apachectl = pkgs.runCommand "apachectl" { meta.priority = -1; } ''
+ mkdir -p $out/bin
+ cp ${pkg}/bin/apachectl $out/bin/apachectl
+ sed -i $out/bin/apachectl -e 's|$HTTPD -t|$HTTPD -t -f ${httpdConf}|'
+ '';
+
httpdConf = cfg.configFile;
php = cfg.phpPackage.override { apacheHttpd = pkg; };
@@ -650,10 +656,29 @@ in
postRun = "systemctl reload httpd.service";
}) (filterAttrs (name: hostOpts: hostOpts.enableACME) cfg.virtualHosts);
- environment.systemPackages = [ pkg ];
+ environment.systemPackages = [
+ apachectl
+ pkg
+ ];
- # required for "apachectl configtest"
- environment.etc."httpd/httpd.conf".source = httpdConf;
+ services.logrotate = optionalAttrs (cfg.logFormat != "none") {
+ enable = mkDefault true;
+ paths.httpd = {
+ path = "${cfg.logDir}/*.log";
+ user = cfg.user;
+ group = cfg.group;
+ frequency = "daily";
+ keep = 28;
+ extraConfig = ''
+ sharedscripts
+ compress
+ delaycompress
+ postrotate
+ systemctl reload httpd.service > /dev/null 2>/dev/null || true
+ endscript
+ '';
+ };
+ };
services.httpd.phpOptions =
''
diff --git a/nixos/modules/services/web-servers/jboss/builder.sh b/nixos/modules/services/web-servers/jboss/builder.sh
index 2eb89a90f67d5..0e5af324c13fe 100644
--- a/nixos/modules/services/web-servers/jboss/builder.sh
+++ b/nixos/modules/services/web-servers/jboss/builder.sh
@@ -28,11 +28,11 @@ stop()
if test "\$1" = start
then
trap stop 15
-
+
start
elif test "\$1" = stop
then
- stop
+ stop
elif test "\$1" = init
then
echo "Are you sure you want to create a new server instance (old server instance will be lost!)?"
@@ -42,21 +42,21 @@ then
then
exit 1
fi
-
+
rm -rf $serverDir
mkdir -p $serverDir
cd $serverDir
cp -av $jboss/server/default .
sed -i -e "s|deploy/|$deployDir|" default/conf/jboss-service.xml
-
+
if ! test "$useJK" = ""
then
sed -i -e 's|false |true |' default/deploy/jboss-web.deployer/META-INF/jboss-service.xml
sed -i -e 's|||' default/deploy/jboss-web.deployer/server.xml
fi
-
+
# Make files accessible for the server user
-
+
chown -R $user $serverDir
for i in \`find $serverDir -type d\`
do
diff --git a/nixos/modules/services/web-servers/meguca.nix b/nixos/modules/services/web-servers/meguca.nix
deleted file mode 100644
index 5a00070dc9416..0000000000000
--- a/nixos/modules/services/web-servers/meguca.nix
+++ /dev/null
@@ -1,174 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
- cfg = config.services.meguca;
- postgres = config.services.postgresql;
-in with lib; {
- options.services.meguca = {
- enable = mkEnableOption "meguca";
-
- dataDir = mkOption {
- type = types.path;
- default = "/var/lib/meguca";
- example = "/home/okina/meguca";
- description = "Location where meguca stores it's database and links.";
- };
-
- password = mkOption {
- type = types.str;
- default = "meguca";
- example = "dumbpass";
- description = "Password for the meguca database.";
- };
-
- passwordFile = mkOption {
- type = types.path;
- default = "/run/keys/meguca-password-file";
- example = "/home/okina/meguca/keys/pass";
- description = "Password file for the meguca database.";
- };
-
- reverseProxy = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "192.168.1.5";
- description = "Reverse proxy IP.";
- };
-
- sslCertificate = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "/home/okina/meguca/ssl.cert";
- description = "Path to the SSL certificate.";
- };
-
- listenAddress = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "127.0.0.1:8000";
- description = "Listen on a specific IP address and port.";
- };
-
- cacheSize = mkOption {
- type = types.nullOr types.int;
- default = null;
- example = 256;
- description = "Cache size in MB.";
- };
-
- postgresArgs = mkOption {
- type = types.str;
- example = "user=meguca password=dumbpass dbname=meguca sslmode=disable";
- description = "Postgresql connection arguments.";
- };
-
- postgresArgsFile = mkOption {
- type = types.path;
- default = "/run/keys/meguca-postgres-args";
- example = "/home/okina/meguca/keys/postgres";
- description = "Postgresql connection arguments file.";
- };
-
- compressTraffic = mkOption {
- type = types.bool;
- default = false;
- description = "Compress all traffic with gzip.";
- };
-
- assumeReverseProxy = mkOption {
- type = types.bool;
- default = false;
- description = "Assume the server is behind a reverse proxy, when resolving client IPs.";
- };
-
- httpsOnly = mkOption {
- type = types.bool;
- default = false;
- description = "Serve and listen only through HTTPS.";
- };
-
- videoPaths = mkOption {
- type = types.listOf types.path;
- default = [];
- example = [ "/home/okina/Videos/tehe_pero.webm" ];
- description = "Videos that will be symlinked into www/videos.";
- };
- };
-
- config = mkIf cfg.enable {
- security.sudo.enable = cfg.enable;
- services.postgresql.enable = cfg.enable;
- services.postgresql.package = pkgs.postgresql_11;
- services.meguca.passwordFile = mkDefault (pkgs.writeText "meguca-password-file" cfg.password);
- services.meguca.postgresArgsFile = mkDefault (pkgs.writeText "meguca-postgres-args" cfg.postgresArgs);
- services.meguca.postgresArgs = mkDefault "user=meguca password=${cfg.password} dbname=meguca sslmode=disable";
-
- systemd.services.meguca = {
- description = "meguca";
- after = [ "network.target" "postgresql.service" ];
- wantedBy = [ "multi-user.target" ];
-
- preStart = ''
- # Ensure folder exists or create it and links and permissions are correct
- mkdir -p ${escapeShellArg cfg.dataDir}/www
- rm -rf ${escapeShellArg cfg.dataDir}/www/videos
- ln -sf ${pkgs.meguca}/share/meguca/www/* ${escapeShellArg cfg.dataDir}/www
- unlink ${escapeShellArg cfg.dataDir}/www/videos
- mkdir -p ${escapeShellArg cfg.dataDir}/www/videos
-
- for vid in ${escapeShellArg cfg.videoPaths}; do
- ln -sf $vid ${escapeShellArg cfg.dataDir}/www/videos
- done
-
- chmod 750 ${escapeShellArg cfg.dataDir}
- chown -R meguca:meguca ${escapeShellArg cfg.dataDir}
-
- # Ensure the database is correct or create it
- ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser \
- -SDR meguca || true
- ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb \
- -T template0 -E UTF8 -O meguca meguca || true
- ${pkgs.sudo}/bin/sudo -u meguca ${postgres.package}/bin/psql \
- -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${escapeShellArg cfg.passwordFile})';" || true
- '';
-
- script = ''
- cd ${escapeShellArg cfg.dataDir}
-
- ${pkgs.meguca}/bin/meguca -d "$(cat ${escapeShellArg cfg.postgresArgsFile})"''
- + optionalString (cfg.reverseProxy != null) " -R ${cfg.reverseProxy}"
- + optionalString (cfg.sslCertificate != null) " -S ${cfg.sslCertificate}"
- + optionalString (cfg.listenAddress != null) " -a ${cfg.listenAddress}"
- + optionalString (cfg.cacheSize != null) " -c ${toString cfg.cacheSize}"
- + optionalString (cfg.compressTraffic) " -g"
- + optionalString (cfg.assumeReverseProxy) " -r"
- + optionalString (cfg.httpsOnly) " -s" + " start";
-
- serviceConfig = {
- PermissionsStartOnly = true;
- Type = "forking";
- User = "meguca";
- Group = "meguca";
- ExecStop = "${pkgs.meguca}/bin/meguca stop";
- };
- };
-
- users = {
- groups.meguca.gid = config.ids.gids.meguca;
-
- users.meguca = {
- description = "meguca server service user";
- home = cfg.dataDir;
- createHome = true;
- group = "meguca";
- uid = config.ids.uids.meguca;
- };
- };
- };
-
- imports = [
- (mkRenamedOptionModule [ "services" "meguca" "baseDir" ] [ "services" "meguca" "dataDir" ])
- ];
-
- meta.maintainers = with maintainers; [ chiiruno ];
-}
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 4c4b7f39e6bb6..461888c4cc4f0 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -704,7 +704,10 @@ in
'';
serviceConfig = {
ExecStart = execCommand;
- ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ ExecReload = [
+ "${execCommand} -t"
+ "${pkgs.coreutils}/bin/kill -HUP $MAINPID"
+ ];
Restart = "always";
RestartSec = "10s";
StartLimitInterval = "1min";
@@ -761,8 +764,7 @@ in
serviceConfig.TimeoutSec = 60;
script = ''
if /run/current-system/systemd/bin/systemctl -q is-active nginx.service ; then
- ${execCommand} -t && \
- /run/current-system/systemd/bin/systemctl reload nginx.service
+ /run/current-system/systemd/bin/systemctl reload nginx.service
fi
'';
serviceConfig.RemainAfterExit = true;
diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix
index 65dcdbed00030..894271d1e55e4 100644
--- a/nixos/modules/services/web-servers/unit/default.nix
+++ b/nixos/modules/services/web-servers/unit/default.nix
@@ -120,9 +120,12 @@ in {
ProtectHome = true;
PrivateTmp = true;
PrivateDevices = true;
+ PrivateUsers = false;
ProtectHostname = true;
+ ProtectClock = true;
ProtectKernelTunables = true;
ProtectKernelModules = true;
+ ProtectKernelLogs = true;
ProtectControlGroups = true;
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
LockPersonality = true;
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 573049ab07af7..23ab7f2ae4332 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -200,7 +200,6 @@ in
KillMode = "mixed";
IgnoreSIGPIPE = "no";
BusName = "org.gnome.DisplayManager";
- StandardOutput = "syslog";
StandardError = "inherit";
ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
KeyringMode = "shared";
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 3bee21fa822e8..143785db0b4fc 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -253,7 +253,6 @@ in
KeyringMode = "shared";
KillMode = "mixed";
StandardError = "inherit";
- StandardOutput = "syslog";
};
environment.etc."lightdm/lightdm.conf".source = lightdmConf;
diff --git a/nixos/modules/services/x11/imwheel.nix b/nixos/modules/services/x11/imwheel.nix
index 3923df498e794..51f72dadbd43e 100644
--- a/nixos/modules/services/x11/imwheel.nix
+++ b/nixos/modules/services/x11/imwheel.nix
@@ -61,7 +61,8 @@ in
"--kill"
] ++ cfg.extraOptions);
ExecStop = "${pkgs.procps}/bin/pkill imwheel";
- Restart = "on-failure";
+ RestartSec = 3;
+ Restart = "always";
};
};
};
diff --git a/nixos/modules/services/x11/urserver.nix b/nixos/modules/services/x11/urserver.nix
new file mode 100644
index 0000000000000..0beb62eb766a3
--- /dev/null
+++ b/nixos/modules/services/x11/urserver.nix
@@ -0,0 +1,38 @@
+# urserver service
+{ config, lib, pkgs, ... }:
+
+let
+ cfg = config.services.urserver;
+in {
+
+ options.services.urserver.enable = lib.mkEnableOption "urserver";
+
+ config = lib.mkIf cfg.enable {
+
+ networking.firewall = {
+ allowedTCPPorts = [ 9510 9512 ];
+ allowedUDPPorts = [ 9511 9512 ];
+ };
+
+ systemd.user.services.urserver = {
+ description = ''
+ Server for Unified Remote: The one-and-only remote for your computer.
+ '';
+ wantedBy = [ "graphical-session.target" ];
+ partOf = [ "graphical-session.target" ];
+ after = [ "network.target" ];
+ serviceConfig = {
+ Type = "forking";
+ ExecStart = ''
+ ${pkgs.urserver}/bin/urserver --daemon
+ '';
+ ExecStop = ''
+ ${pkgs.procps}/bin/pkill urserver
+ '';
+ RestartSec = 3;
+ Restart = "on-failure";
+ };
+ };
+ };
+
+}
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index 30c59b88f82f9..070758720fe33 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -82,12 +82,11 @@ in
services.xserver.windowManager = {
session = [{
name = "xmonad";
- start = if (cfg.config != null) then ''
- ${xmonadBin}
- waitPID=$!
- '' else ''
- systemd-cat -t xmonad ${xmonad}/bin/xmonad &
- waitPID=$!
+ start = let
+ xmonadCommand = if (cfg.config != null) then xmonadBin else "${xmonad}/bin/xmonad";
+ in ''
+ systemd-cat -t xmonad ${xmonadCommand} &
+ waitPID=$!
'';
}];
};
diff --git a/nixos/modules/system/boot/emergency-mode.nix b/nixos/modules/system/boot/emergency-mode.nix
index 9cdab84161925..ec697bcee2680 100644
--- a/nixos/modules/system/boot/emergency-mode.nix
+++ b/nixos/modules/system/boot/emergency-mode.nix
@@ -34,4 +34,4 @@ with lib;
};
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh b/nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh
index e723b9eb7cb31..8ae23dc988c2d 100644
--- a/nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh
+++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir-builder.sh
@@ -63,7 +63,7 @@ addEntry() {
copyToKernelsDir $kernel; kernel=$result
copyToKernelsDir $initrd; initrd=$result
fi
-
+
mkdir -p $outdir
ln -sf $(readlink -f $path) $outdir/system
ln -sf $(readlink -f $path/init) $outdir/init
diff --git a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh
index 6f48d2539acee..2a1ec479fea04 100644
--- a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh
+++ b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh
@@ -53,7 +53,7 @@ addEntry() {
echo "exec $stage2"
)"
- [ "$path" != "$defaultConfig" ] || {
+ [ "$path" != "$defaultConfig" ] || {
echo "$content" > $tmp
echo "# older configurations: $targetOther" >> $tmp
chmod +x $tmp
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 166f89c706611..88190e8200b16 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -516,7 +516,7 @@ in
/dev/mapper/name .
'';
- type = with types; loaOf (submodule (
+ type = with types; attrsOf (submodule (
{ name, ... }: { options = {
name = mkOption {
@@ -641,7 +641,7 @@ in
credential = mkOption {
default = null;
example = "f1d00200d8dc783f7fb1e10ace8da27f8312d72692abfca2f7e4960a73f48e82e1f7571f6ebfcee9fb434f9886ccc8fcc52a6614d8d2";
- type = types.str;
+ type = types.nullOr types.str;
description = "The FIDO2 credential ID.";
};
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 54e3a691b2f83..0c1be71cf5326 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -378,12 +378,14 @@ mountFS() {
mkdir -p "/mnt-root$mountPoint"
- # For CIFS mounts, retry a few times before giving up.
+ # For ZFS and CIFS mounts, retry a few times before giving up.
+ # We do this for ZFS as a workaround for issue NixOS/nixpkgs#25383.
local n=0
while true; do
mount "/mnt-root$mountPoint" && break
- if [ "$fsType" != cifs -o "$n" -ge 10 ]; then fail; break; fi
+ if [ \( "$fsType" != cifs -a "$fsType" != zfs \) -o "$n" -ge 10 ]; then fail; break; fi
echo "retrying..."
+ sleep 1
n=$((n + 1))
done
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 7f13f67e8ef61..1b2f22a039cbd 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -36,7 +36,7 @@ let
set -euo pipefail
declare -A seen
- declare -a left
+ left=()
patchelf="${pkgs.buildPackages.patchelf}/bin/patchelf"
@@ -48,7 +48,7 @@ let
done
}
- add_needed $1
+ add_needed "$1"
while [ ''${#left[@]} -ne 0 ]; do
next=''${left[0]}
@@ -87,7 +87,9 @@ let
# copy what we need. Instead of using statically linked binaries,
# we just copy what we need from Glibc and use patchelf to make it
# work.
- extraUtils = pkgs.runCommandCC "extra-utils"
+ extraUtils = let
+ # Use lvm2 without udev support, which is the same lvm2 we already have in the closure anyways
+ lvm2 = pkgs.lvm2.override { udev = null; }; in pkgs.runCommandCC "extra-utils"
{ nativeBuildInputs = [pkgs.buildPackages.nukeReferences];
allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd
}
@@ -111,20 +113,21 @@ let
copy_bin_and_libs ${pkgs.utillinux}/sbin/blkid
# Copy dmsetup and lvm.
- copy_bin_and_libs ${getBin pkgs.lvm2}/bin/dmsetup
- copy_bin_and_libs ${getBin pkgs.lvm2}/bin/lvm
+ copy_bin_and_libs ${getBin lvm2}/bin/dmsetup
+ copy_bin_and_libs ${getBin lvm2}/bin/lvm
# Add RAID mdadm tool.
copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm
copy_bin_and_libs ${pkgs.mdadm}/sbin/mdmon
# Copy udev.
- copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd
- copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl
copy_bin_and_libs ${udev}/bin/udevadm
+ copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl
for BIN in ${udev}/lib/udev/*_id; do
copy_bin_and_libs $BIN
done
+ # systemd-udevd is only a symlink to udevadm these days
+ ln -sf udevadm $out/bin/systemd-udevd
# Copy modprobe.
copy_bin_and_libs ${pkgs.kmod}/bin/kmod
@@ -374,7 +377,8 @@ let
) config.boot.initrd.secrets)
}
- (cd "$tmp" && find . | cpio -H newc -o) | gzip >>"$1"
+ (cd "$tmp" && find . -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null) | \
+ ${config.boot.initrd.compressor} >> "$1"
'';
in
@@ -554,7 +558,7 @@ in
};
fileSystems = mkOption {
- type = with lib.types; loaOf (submodule {
+ type = with lib.types; attrsOf (submodule {
options.neededForBoot = mkOption {
default = false;
type = types.bool;
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index c6dbb96951ae0..5addc6f9ca44d 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -234,7 +234,6 @@ in rec {
path = mkOption {
default = [];
type = with types; listOf (oneOf [ package str ]);
- apply = ps: "${makeBinPath ps}:${makeSearchPathOutput "bin" "sbin" ps}";
description = ''
Packages added to the service's PATH
environment variable. Both the bin
@@ -379,6 +378,16 @@ in rec {
'';
};
+ listenDatagrams = mkOption {
+ default = [];
+ type = types.listOf types.str;
+ example = [ "0.0.0.0:993" "/run/my-socket" ];
+ description = ''
+ For each item in this list, a ListenDatagram
+ option in the [Socket] section will be created.
+ '';
+ };
+
socketConfig = mkOption {
default = {};
example = { ListenStream = "/run/my-socket"; };
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index a5f368c869a08..74d6957678f56 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -25,7 +25,7 @@ let
"nss-lookup.target"
"nss-user-lookup.target"
"time-sync.target"
- #"cryptsetup.target"
+ "cryptsetup.target"
"sigpwr.target"
"timers.target"
"paths.target"
@@ -81,10 +81,6 @@ let
"systemd-coredump.socket"
"systemd-coredump@.service"
- # SysV init compatibility.
- "systemd-initctl.socket"
- "systemd-initctl.service"
-
# Kernel module loading.
"systemd-modules-load.service"
"kmod-static-nodes.service"
@@ -261,7 +257,7 @@ let
pkgs.gnused
systemd
];
- environment.PATH = config.path;
+ environment.PATH = "${makeBinPath config.path}:${makeSearchPathOutput "bin" "sbin" config.path}";
}
(mkIf (config.preStart != "")
{ serviceConfig.ExecStartPre =
@@ -354,6 +350,7 @@ let
[Socket]
${attrsToSection def.socketConfig}
${concatStringsSep "\n" (map (s: "ListenStream=${s}") def.listenStreams)}
+ ${concatStringsSep "\n" (map (s: "ListenDatagram=${s}") def.listenDatagrams)}
'';
};
@@ -906,11 +903,9 @@ in
)
]);
passwd = (mkMerge [
- [ "mymachines" ]
(mkAfter [ "systemd" ])
]);
group = (mkMerge [
- [ "mymachines" ]
(mkAfter [ "systemd" ])
]);
};
@@ -1013,16 +1008,18 @@ in
"tmpfiles.d".source = (pkgs.symlinkJoin {
name = "tmpfiles.d";
- paths = cfg.tmpfiles.packages;
+ paths = map (p: p + "/lib/tmpfiles.d") cfg.tmpfiles.packages;
postBuild = ''
for i in $(cat $pathsPath); do
- (test -d $i/lib/tmpfiles.d && test $(ls $i/lib/tmpfiles.d/*.conf | wc -l) -ge 1) || (
- echo "ERROR: The path $i was passed to systemd.tmpfiles.packages but either does not contain the folder lib/tmpfiles.d or if it contains that folder, there are no files ending in .conf in it."
+ (test -d "$i" && test $(ls "$i"/*.conf | wc -l) -ge 1) || (
+ echo "ERROR: The path '$i' from systemd.tmpfiles.packages contains no *.conf files."
exit 1
)
done
- '';
- }) + "/lib/tmpfiles.d";
+ '' + concatMapStrings (name: optionalString (hasPrefix "tmpfiles.d/" name) ''
+ rm -f $out/${removePrefix "tmpfiles.d/" name}
+ '') config.system.build.etc.targets;
+ }) + "/*";
"systemd/system-generators" = { source = hooks "generators" cfg.generators; };
"systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; };
diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix
index 5bf5e2eb2ec58..26eb172210e73 100644
--- a/nixos/modules/system/boot/tmp.nix
+++ b/nixos/modules/system/boot/tmp.nix
@@ -36,4 +36,4 @@ with lib;
};
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix
index 1f4d54a1ae205..7478e3e80717f 100644
--- a/nixos/modules/system/etc/etc.nix
+++ b/nixos/modules/system/etc/etc.nix
@@ -46,7 +46,7 @@ in
Set of files that have to be linked in /etc .
'';
- type = with types; loaOf (submodule (
+ type = with types; attrsOf (submodule (
{ name, config, ... }:
{ options = {
diff --git a/nixos/modules/system/etc/make-etc.sh b/nixos/modules/system/etc/make-etc.sh
index 1ca4c3046f0e5..aabfb5e88a655 100644
--- a/nixos/modules/system/etc/make-etc.sh
+++ b/nixos/modules/system/etc/make-etc.sh
@@ -23,7 +23,7 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
done
else
-
+
mkdir -p $out/etc/$(dirname $target)
if ! [ -e $out/etc/$target ]; then
ln -s $source $out/etc/$target
@@ -34,13 +34,12 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
exit 1
fi
fi
-
+
if test "${modes_[$i]}" != symlink; then
echo "${modes_[$i]}" > $out/etc/$target.mode
echo "${users_[$i]}" > $out/etc/$target.uid
echo "${groups_[$i]}" > $out/etc/$target.gid
fi
-
+
fi
done
-
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix
index 9c3f2d8fccb23..dd337de98698c 100644
--- a/nixos/modules/tasks/encrypted-devices.nix
+++ b/nixos/modules/tasks/encrypted-devices.nix
@@ -54,7 +54,7 @@ in
options = {
fileSystems = mkOption {
- type = with lib.types; loaOf (submodule encryptedFSOptions);
+ type = with lib.types; attrsOf (submodule encryptedFSOptions);
};
swapDevices = mkOption {
type = with lib.types; listOf (submodule encryptedFSOptions);
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 0ade74b957a0c..3ea67dac7146d 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -159,7 +159,7 @@ in
"/bigdisk".label = "bigdisk";
}
'';
- type = types.loaOf (types.submodule [coreFileSystemOpts fileSystemOpts]);
+ type = types.attrsOf (types.submodule [coreFileSystemOpts fileSystemOpts]);
description = ''
The file systems to be mounted. It must include an entry for
the root directory (mountPoint = "/" ). Each
@@ -193,7 +193,7 @@ in
boot.specialFileSystems = mkOption {
default = {};
- type = types.loaOf (types.submodule coreFileSystemOpts);
+ type = types.attrsOf (types.submodule coreFileSystemOpts);
internal = true;
description = ''
Special filesystems that are mounted very early during boot.
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index c9d9c6c1657d2..9ca7c6fb3431b 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -191,13 +191,14 @@ in
};
requestEncryptionCredentials = mkOption {
- type = types.bool;
+ type = types.either types.bool (types.listOf types.str);
default = true;
+ example = [ "tank" "data" ];
description = ''
- Request encryption keys or passwords for all encrypted datasets on import.
- For root pools the encryption key can be supplied via both an
- interactive prompt (keylocation=prompt) and from a file
- (keylocation=file://).
+ If true on import encryption keys or passwords for all encrypted datasets
+ are requested. To only decrypt selected datasets supply a list of dataset
+ names instead. For root pools the encryption key can be supplied via both
+ an interactive prompt (keylocation=prompt) and from a file (keylocation=file://).
'';
};
@@ -419,9 +420,13 @@ in
fi
poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool.
fi
- ${lib.optionalString cfgZfs.requestEncryptionCredentials ''
- zfs load-key -a
- ''}
+ ${if isBool cfgZfs.requestEncryptionCredentials
+ then optionalString cfgZfs.requestEncryptionCredentials ''
+ zfs load-key -a
+ ''
+ else concatMapStrings (fs: ''
+ zfs load-key ${fs}
+ '') cfgZfs.requestEncryptionCredentials}
'') rootPools));
};
@@ -517,9 +522,16 @@ in
done
poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool.
if poolImported "${pool}"; then
- ${optionalString cfgZfs.requestEncryptionCredentials ''
+ ${optionalString (if isBool cfgZfs.requestEncryptionCredentials
+ then cfgZfs.requestEncryptionCredentials
+ else cfgZfs.requestEncryptionCredentials != []) ''
${packages.zfsUser}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'\t' read ds kl; do
- (case "$kl" in
+ (${optionalString (!isBool cfgZfs.requestEncryptionCredentials) ''
+ if ! echo '${concatStringsSep "\n" cfgZfs.requestEncryptionCredentials}' | grep -qFx "$ds"; then
+ continue
+ fi
+ ''}
+ case "$kl" in
none )
;;
prompt )
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 78d6696694997..c0e4d3979fdad 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -408,6 +408,9 @@ in
(this derives it from the machine-id that systemd generates) or
head -c4 /dev/urandom | od -A none -t x4
+
+ The primary use case is to ensure when using ZFS that a pool isn't imported
+ accidentally on a wrong machine.
'';
};
@@ -516,7 +519,7 @@ in
networking.useDHCP is true, then every
interface not listed here will be configured using DHCP.
'';
- type = with types; loaOf (submodule interfaceOpts);
+ type = with types; attrsOf (submodule interfaceOpts);
};
networking.vswitches = mkOption {
@@ -541,7 +544,7 @@ in
interfaces = mkOption {
example = [ "eth0" "eth1" ];
description = "The physical network interfaces connected by the vSwitch.";
- type = with types; loaOf (submodule vswitchInterfaceOpts);
+ type = with types; attrsOf (submodule vswitchInterfaceOpts);
};
controllers = mkOption {
@@ -1126,7 +1129,6 @@ in
++ optionals config.networking.wireless.enable [
pkgs.wirelesstools # FIXME: obsolete?
pkgs.iw
- pkgs.rfkill
]
++ bridgeStp;
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 1baeab53b0c2d..30ffb12cbadee 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -1,22 +1,13 @@
# This module allows the test driver to connect to the virtual machine
# via a root shell attached to port 514.
-{ config, lib, pkgs, ... }:
+{ options, config, lib, pkgs, ... }:
with lib;
with import ../../lib/qemu-flags.nix { inherit pkgs; };
{
- # This option is a dummy that if used in conjunction with
- # modules/virtualisation/qemu-vm.nix gets merged with the same option defined
- # there and only is declared here because some modules use
- # test-instrumentation.nix but not qemu-vm.nix.
- #
- # One particular example are the boot tests where we want instrumentation
- # within the images but not other stuff like setting up 9p filesystems.
- options.virtualisation.qemu = { };
-
config = {
systemd.services.backdoor =
@@ -55,7 +46,12 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; };
systemd.services."serial-getty@hvc0".enable = false;
# Only use a serial console, no TTY.
- virtualisation.qemu.consoles = [ qemuSerialDevice ];
+ # NOTE: optionalAttrs
+ # test-instrumentation.nix appears to be used without qemu-vm.nix, so
+ # we avoid defining consoles if not possible.
+ # TODO: refactor such that test-instrumentation can import qemu-vm
+ # or declare virtualisation.qemu.console option in a module that's always imported
+ virtualisation = lib.optionalAttrs (options ? virtualisation.qemu.consoles) { qemu.consoles = [ qemuSerialDevice ]; };
boot.initrd.preDeviceCommands =
''
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 3a6767d84a9bd..de97ba3f7bb0c 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -43,6 +43,12 @@ in
'';
};
+ ociSeccompBpfHook.enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable the OCI seccomp BPF hook";
+ };
+
containersConf = mkOption {
default = {};
description = "containers.conf configuration";
@@ -116,6 +122,12 @@ in
[network]
cni_plugin_dirs = ["${pkgs.cni-plugins}/bin/"]
+ ${lib.optionalString (cfg.ociSeccompBpfHook.enable == true) ''
+ [engine]
+ hooks_dir = [
+ "${config.boot.kernelPackages.oci-seccomp-bpf-hook}",
+ ]
+ ''}
'' + cfg.containersConf.extraConfig;
environment.etc."containers/registries.conf".source = toTOML "registries.conf" {
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix
index f267c97b17889..aa2fb73533ac9 100644
--- a/nixos/modules/virtualisation/cri-o.nix
+++ b/nixos/modules/virtualisation/cri-o.nix
@@ -85,7 +85,7 @@ in
environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml";
- environment.etc."crio/crio.conf".text = ''
+ environment.etc."crio/crio.conf.d/00-default.conf".text = ''
[crio]
storage_driver = "${cfg.storageDriver}"
@@ -100,6 +100,8 @@ in
cgroup_manager = "systemd"
log_level = "${cfg.logLevel}"
manage_ns_lifecycle = true
+ pinns_path = "${cfg.package}/bin/pinns"
+ hooks_dir = []
${optionalString (cfg.runtime != null) ''
default_runtime = "${cfg.runtime}"
@@ -109,6 +111,7 @@ in
'';
environment.etc."cni/net.d/10-crio-bridge.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf";
+ environment.etc."cni/net.d/99-loopback.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf";
# Enable common /etc/containers configuration
virtualisation.containers.enable = true;
diff --git a/nixos/modules/virtualisation/docker-preloader.nix b/nixos/modules/virtualisation/docker-preloader.nix
deleted file mode 100644
index 6ab83058dee1d..0000000000000
--- a/nixos/modules/virtualisation/docker-preloader.nix
+++ /dev/null
@@ -1,134 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-with builtins;
-
-let
- cfg = config.virtualisation;
-
- sanitizeImageName = image: replaceStrings ["/"] ["-"] image.imageName;
- hash = drv: head (split "-" (baseNameOf drv.outPath));
- # The label of an ext4 FS is limited to 16 bytes
- labelFromImage = image: substring 0 16 (hash image);
-
- # The Docker image is loaded and some files from /var/lib/docker/
- # are written into a qcow image.
- preload = image: pkgs.vmTools.runInLinuxVM (
- pkgs.runCommand "docker-preload-image-${sanitizeImageName image}" {
- buildInputs = with pkgs; [ docker e2fsprogs utillinux curl kmod ];
- preVM = pkgs.vmTools.createEmptyImage {
- size = cfg.dockerPreloader.qcowSize;
- fullName = "docker-deamon-image.qcow2";
- };
- }
- ''
- mkfs.ext4 /dev/vda
- e2label /dev/vda ${labelFromImage image}
- mkdir -p /var/lib/docker
- mount -t ext4 /dev/vda /var/lib/docker
-
- modprobe overlay
-
- # from https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
- mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
- cd /sys/fs/cgroup
- for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
- mkdir -p $sys
- if ! mountpoint -q $sys; then
- if ! mount -n -t cgroup -o $sys cgroup $sys; then
- rmdir $sys || true
- fi
- fi
- done
-
- dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock &
-
- until $(curl --output /dev/null --silent --connect-timeout 2 http://127.0.0.1:5555); do
- printf '.'
- sleep 1
- done
-
- docker load -i ${image}
-
- kill %1
- find /var/lib/docker/ -maxdepth 1 -mindepth 1 -not -name "image" -not -name "overlay2" | xargs rm -rf
- '');
-
- preloadedImages = map preload cfg.dockerPreloader.images;
-
-in
-
-{
- options.virtualisation.dockerPreloader = {
- images = mkOption {
- default = [ ];
- type = types.listOf types.package;
- description =
- ''
- A list of Docker images to preload (in the /var/lib/docker directory).
- '';
- };
- qcowSize = mkOption {
- default = 1024;
- type = types.int;
- description =
- ''
- The size (MB) of qcow files.
- '';
- };
- };
-
- config = mkIf (cfg.dockerPreloader.images != []) {
- assertions = [{
- # If docker.storageDriver is null, Docker choose the storage
- # driver. So, in this case, we cannot be sure overlay2 is used.
- assertion = cfg.docker.storageDriver == "overlay2"
- || cfg.docker.storageDriver == "overlay"
- || cfg.docker.storageDriver == null;
- message = "The Docker image Preloader only works with overlay2 storage driver!";
- }];
-
- virtualisation.qemu.options =
- map (path: "-drive if=virtio,file=${path}/disk-image.qcow2,readonly,media=cdrom,format=qcow2")
- preloadedImages;
-
-
- # All attached QCOW files are mounted and their contents are linked
- # to /var/lib/docker/ in order to make image available.
- systemd.services.docker-preloader = {
- description = "Preloaded Docker images";
- wantedBy = ["docker.service"];
- after = ["network.target"];
- path = with pkgs; [ mount rsync jq ];
- script = ''
- mkdir -p /var/lib/docker/overlay2/l /var/lib/docker/image/overlay2
- echo '{}' > /tmp/repositories.json
-
- for i in ${concatStringsSep " " (map labelFromImage cfg.dockerPreloader.images)}; do
- mkdir -p /mnt/docker-images/$i
-
- # The ext4 label is limited to 16 bytes
- mount /dev/disk/by-label/$(echo $i | cut -c1-16) -o ro,noload /mnt/docker-images/$i
-
- find /mnt/docker-images/$i/overlay2/ -maxdepth 1 -mindepth 1 -not -name l\
- -exec ln -s '{}' /var/lib/docker/overlay2/ \;
- cp -P /mnt/docker-images/$i/overlay2/l/* /var/lib/docker/overlay2/l/
-
- rsync -a /mnt/docker-images/$i/image/ /var/lib/docker/image/
-
- # Accumulate image definitions
- cp /tmp/repositories.json /tmp/repositories.json.tmp
- jq -s '.[0] * .[1]' \
- /tmp/repositories.json.tmp \
- /mnt/docker-images/$i/image/overlay2/repositories.json \
- > /tmp/repositories.json
- done
-
- mv /tmp/repositories.json /var/lib/docker/image/overlay2/repositories.json
- '';
- serviceConfig = {
- Type = "oneshot";
- };
- };
- };
-}
diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index b0fa03917c822..8fbb4efd20196 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -627,7 +627,7 @@ in
};
bindMounts = mkOption {
- type = with types; loaOf (submodule bindMountOpts);
+ type = with types; attrsOf (submodule bindMountOpts);
default = {};
example = literalExample ''
{ "/home" = { hostPath = "/home/alice";
diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix
index 828419fb4b9d7..55605b388b7ca 100644
--- a/nixos/modules/virtualisation/parallels-guest.nix
+++ b/nixos/modules/virtualisation/parallels-guest.nix
@@ -32,7 +32,7 @@ in
};
package = mkOption {
- type = types.package;
+ type = types.nullOr types.package;
default = config.boot.kernelPackages.prl-tools;
defaultText = "config.boot.kernelPackages.prl-tools";
example = literalExample "config.boot.kernelPackages.prl-tools";
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index a650dd72c2a48..42e43f5ee0233 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -264,7 +264,6 @@ in
{
imports = [
../profiles/qemu-guest.nix
- ./docker-preloader.nix
];
options = {
diff --git a/nixos/modules/virtualisation/railcar.nix b/nixos/modules/virtualisation/railcar.nix
index 3f188fc68e55f..10464f6289846 100644
--- a/nixos/modules/virtualisation/railcar.nix
+++ b/nixos/modules/virtualisation/railcar.nix
@@ -41,7 +41,7 @@ let
description = "Source for the in-container mount";
};
options = mkOption {
- type = loaOf (str);
+ type = attrsOf (str);
default = [ "bind" ];
description = ''
Mount options of the filesystem to be used.
@@ -61,7 +61,7 @@ in
containers = mkOption {
default = {};
description = "Declarative container configuration";
- type = with types; loaOf (submodule ({ name, config, ... }: {
+ type = with types; attrsOf (submodule ({ name, config, ... }: {
options = {
cmd = mkOption {
type = types.lines;
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index ece2d091f5adb..945ba90e3454c 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -106,11 +106,29 @@ in rec {
(onFullSupported "nixos.tests.networking.scripted.bridge")
(onFullSupported "nixos.tests.networking.scripted.dhcpOneIf")
(onFullSupported "nixos.tests.networking.scripted.dhcpSimple")
+ (onFullSupported "nixos.tests.networking.scripted.link")
(onFullSupported "nixos.tests.networking.scripted.loopback")
(onFullSupported "nixos.tests.networking.scripted.macvlan")
+ (onFullSupported "nixos.tests.networking.scripted.privacy")
+ (onFullSupported "nixos.tests.networking.scripted.routes")
(onFullSupported "nixos.tests.networking.scripted.sit")
(onFullSupported "nixos.tests.networking.scripted.static")
+ (onFullSupported "nixos.tests.networking.scripted.virtual")
(onFullSupported "nixos.tests.networking.scripted.vlan")
+ (onFullSupported "nixos.tests.networking.networkd.bond")
+ (onFullSupported "nixos.tests.networking.networkd.bridge")
+ (onFullSupported "nixos.tests.networking.networkd.dhcpOneIf")
+ (onFullSupported "nixos.tests.networking.networkd.dhcpSimple")
+ (onFullSupported "nixos.tests.networking.networkd.link")
+ (onFullSupported "nixos.tests.networking.networkd.loopback")
+ # Fails nondeterministically (https://github.com/NixOS/nixpkgs/issues/96709)
+ #(onFullSupported "nixos.tests.networking.networkd.macvlan")
+ (onFullSupported "nixos.tests.networking.networkd.privacy")
+ (onFullSupported "nixos.tests.networking.networkd.routes")
+ (onFullSupported "nixos.tests.networking.networkd.sit")
+ (onFullSupported "nixos.tests.networking.networkd.static")
+ (onFullSupported "nixos.tests.networking.networkd.virtual")
+ (onFullSupported "nixos.tests.networking.networkd.vlan")
(onFullSupported "nixos.tests.systemd-networkd-ipv6-prefix-delegation")
(onFullSupported "nixos.tests.nfs3.simple")
(onFullSupported "nixos.tests.nfs4.simple")
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 31dad3be8145b..60ef5a027637c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -34,6 +34,7 @@ in
bind = handleTest ./bind.nix {};
bitcoind = handleTest ./bitcoind.nix {};
bittorrent = handleTest ./bittorrent.nix {};
+ bitwarden = handleTest ./bitwarden.nix {};
blockbook-frontend = handleTest ./blockbook-frontend.nix {};
buildkite-agents = handleTest ./buildkite-agents.nix {};
boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64
@@ -48,6 +49,7 @@ in
ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {};
certmgr = handleTest ./certmgr.nix {};
cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {};
+ charliecloud = handleTest ./charliecloud.nix {};
chromium = (handleTestOn ["x86_64-linux"] ./chromium.nix {}).stable or {};
cjdns = handleTest ./cjdns.nix {};
clickhouse = handleTest ./clickhouse.nix {};
@@ -65,11 +67,13 @@ in
containers-macvlans = handleTest ./containers-macvlans.nix {};
containers-physical_interfaces = handleTest ./containers-physical_interfaces.nix {};
containers-portforward = handleTest ./containers-portforward.nix {};
+ containers-reloadable = handleTest ./containers-reloadable.nix {};
containers-restart_networking = handleTest ./containers-restart_networking.nix {};
containers-tmpfs = handleTest ./containers-tmpfs.nix {};
convos = handleTest ./convos.nix {};
corerad = handleTest ./corerad.nix {};
couchdb = handleTest ./couchdb.nix {};
+ cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {};
deluge = handleTest ./deluge.nix {};
dhparams = handleTest ./dhparams.nix {};
dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {};
@@ -78,15 +82,13 @@ in
docker = handleTestOn ["x86_64-linux"] ./docker.nix {};
oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {};
docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {};
- docker-preloader = handleTestOn ["x86_64-linux"] ./docker-preloader.nix {};
docker-registry = handleTest ./docker-registry.nix {};
docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {};
docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {};
documize = handleTest ./documize.nix {};
dokuwiki = handleTest ./dokuwiki.nix {};
dovecot = handleTest ./dovecot.nix {};
- # ec2-config doesn't work in a sandbox as the simulated ec2 instance needs network access
- #ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {};
+ ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {};
ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {};
ecryptfs = handleTest ./ecryptfs.nix {};
ejabberd = handleTest ./xmpp/ejabberd.nix {};
@@ -101,6 +103,7 @@ in
ferm = handleTest ./ferm.nix {};
firefox = handleTest ./firefox.nix {};
firefox-esr = handleTest ./firefox.nix { esr = true; };
+ firejail = handleTest ./firejail.nix {};
firewall = handleTest ./firewall.nix {};
fish = handleTest ./fish.nix {};
flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {};
@@ -194,12 +197,10 @@ in
mailcatcher = handleTest ./mailcatcher.nix {};
mariadb-galera-mariabackup = handleTest ./mysql/mariadb-galera-mariabackup.nix {};
mariadb-galera-rsync = handleTest ./mysql/mariadb-galera-rsync.nix {};
- mathics = handleTest ./mathics.nix {};
matomo = handleTest ./matomo.nix {};
matrix-synapse = handleTest ./matrix-synapse.nix {};
mediawiki = handleTest ./mediawiki.nix {};
memcached = handleTest ./memcached.nix {};
- mesos = handleTest ./mesos.nix {};
metabase = handleTest ./metabase.nix {};
miniflux = handleTest ./miniflux.nix {};
minio = handleTest ./minio.nix {};
@@ -268,6 +269,7 @@ in
pgjwt = handleTest ./pgjwt.nix {};
pgmanage = handleTest ./pgmanage.nix {};
php = handleTest ./php {};
+ pinnwand = handleTest ./pinnwand.nix {};
plasma5 = handleTest ./plasma5.nix {};
plotinus = handleTest ./plotinus.nix {};
podman = handleTestOn ["x86_64-linux"] ./podman.nix {};
@@ -296,6 +298,7 @@ in
redis = handleTest ./redis.nix {};
redmine = handleTest ./redmine.nix {};
restic = handleTest ./restic.nix {};
+ robustirc-bridge = handleTest ./robustirc-bridge.nix {};
roundcube = handleTest ./roundcube.nix {};
rspamd = handleTest ./rspamd.nix {};
rss2email = handleTest ./rss2email.nix {};
@@ -306,6 +309,8 @@ in
sanoid = handleTest ./sanoid.nix {};
sddm = handleTest ./sddm.nix {};
service-runner = handleTest ./service-runner.nix {};
+ shadowsocks = handleTest ./shadowsocks.nix {};
+ shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix {};
shiori = handleTest ./shiori.nix {};
signal-desktop = handleTest ./signal-desktop.nix {};
simple = handleTest ./simple.nix {};
@@ -319,6 +324,7 @@ in
spike = handleTest ./spike.nix {};
sonarr = handleTest ./sonarr.nix {};
sslh = handleTest ./sslh.nix {};
+ sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {};
strongswan-swanctl = handleTest ./strongswan-swanctl.nix {};
sudo = handleTest ./sudo.nix {};
switchTest = handleTest ./switch-test.nix {};
diff --git a/nixos/tests/bitcoind.nix b/nixos/tests/bitcoind.nix
index 95c6a5b91bce9..09f3e4a6ec078 100644
--- a/nixos/tests/bitcoind.nix
+++ b/nixos/tests/bitcoind.nix
@@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "bitcoind";
meta = with pkgs.stdenv.lib; {
- maintainers = with maintainers; [ maintainers."1000101" ];
+ maintainers = with maintainers; [ _1000101 ];
};
machine = { ... }: {
diff --git a/nixos/tests/bitwarden.nix b/nixos/tests/bitwarden.nix
new file mode 100644
index 0000000000000..a47c77cec2137
--- /dev/null
+++ b/nixos/tests/bitwarden.nix
@@ -0,0 +1,188 @@
+{ system ? builtins.currentSystem
+, config ? { }
+, pkgs ? import ../.. { inherit system config; }
+}:
+
+# These tests will:
+# * Set up a bitwarden-rs server
+# * Have Firefox use the web vault to create an account, log in, and save a password to the valut
+# * Have the bw cli log in and read that password from the vault
+#
+# Note that Firefox must be on the same machine as the server for WebCrypto APIs to be available (or HTTPS must be configured)
+#
+# The same tests should work without modification on the official bitwarden server, if we ever package that.
+
+with import ../lib/testing-python.nix { inherit system pkgs; };
+with pkgs.lib;
+let
+ backends = [ "sqlite" "mysql" "postgresql" ];
+
+ dbPassword = "please_dont_hack";
+
+ userEmail = "meow@example.com";
+ userPassword = "also_super_secret_ZJWpBKZi668QGt"; # Must be complex to avoid interstitial warning on the signup page
+
+ storedPassword = "seeeecret";
+
+ makeBitwardenTest = backend: makeTest {
+ name = "bitwarden_rs-${backend}";
+ meta = {
+ maintainers = with pkgs.stdenv.lib.maintainers; [ jjjollyjim ];
+ };
+
+ nodes = {
+ server = { pkgs, ... }:
+ let backendConfig = {
+ mysql = {
+ services.mysql = {
+ enable = true;
+ initialScript = pkgs.writeText "mysql-init.sql" ''
+ CREATE DATABASE bitwarden;
+ CREATE USER 'bitwardenuser'@'localhost' IDENTIFIED BY '${dbPassword}';
+ GRANT ALL ON `bitwarden`.* TO 'bitwardenuser'@'localhost';
+ FLUSH PRIVILEGES;
+ '';
+ package = pkgs.mysql;
+ };
+
+ services.bitwarden_rs.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden";
+
+ systemd.services.bitwarden_rs.after = [ "mysql.service" ];
+ };
+
+ postgresql = {
+ services.postgresql = {
+ enable = true;
+ initialScript = pkgs.writeText "postgresql-init.sql" ''
+ CREATE DATABASE bitwarden;
+ CREATE USER bitwardenuser WITH PASSWORD '${dbPassword}';
+ GRANT ALL PRIVILEGES ON DATABASE bitwarden TO bitwardenuser;
+ '';
+ };
+
+ services.bitwarden_rs.config.databaseUrl = "postgresql://bitwardenuser:${dbPassword}@localhost/bitwarden";
+
+ systemd.services.bitwarden_rs.after = [ "postgresql.service" ];
+ };
+
+ sqlite = { };
+ };
+ in
+ mkMerge [
+ backendConfig.${backend}
+ {
+ services.bitwarden_rs = {
+ enable = true;
+ dbBackend = backend;
+ config.rocketPort = 80;
+ };
+
+ networking.firewall.allowedTCPPorts = [ 80 ];
+
+ environment.systemPackages =
+ let
+ testRunner = pkgs.writers.writePython3Bin "test-runner"
+ {
+ libraries = [ pkgs.python3Packages.selenium ];
+ } ''
+ from selenium.webdriver import Firefox
+ from selenium.webdriver.firefox.options import Options
+ from selenium.webdriver.support.ui import WebDriverWait
+ from selenium.webdriver.support import expected_conditions as EC
+
+ options = Options()
+ options.add_argument('--headless')
+ driver = Firefox(options=options)
+
+ driver.implicitly_wait(20)
+ driver.get('http://localhost/#/register')
+
+ wait = WebDriverWait(driver, 10)
+
+ wait.until(EC.title_contains("Create Account"))
+
+ driver.find_element_by_css_selector('input#email').send_keys(
+ '${userEmail}'
+ )
+ driver.find_element_by_css_selector('input#name').send_keys(
+ 'A Cat'
+ )
+ driver.find_element_by_css_selector('input#masterPassword').send_keys(
+ '${userPassword}'
+ )
+ driver.find_element_by_css_selector('input#masterPasswordRetype').send_keys(
+ '${userPassword}'
+ )
+
+ driver.find_element_by_xpath("//button[contains(., 'Submit')]").click()
+
+ wait.until_not(EC.title_contains("Create Account"))
+
+ driver.find_element_by_css_selector('input#masterPassword').send_keys(
+ '${userPassword}'
+ )
+ driver.find_element_by_xpath("//button[contains(., 'Log In')]").click()
+
+ wait.until(EC.title_contains("My Vault"))
+
+ driver.find_element_by_xpath("//button[contains(., 'Add Item')]").click()
+
+ driver.find_element_by_css_selector('input#name').send_keys(
+ 'secrets'
+ )
+ driver.find_element_by_css_selector('input#loginPassword').send_keys(
+ '${storedPassword}'
+ )
+
+ driver.find_element_by_xpath("//button[contains(., 'Save')]").click()
+ '';
+ in
+ [ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ];
+
+ virtualisation.memorySize = 768;
+ }
+ ];
+
+ client = { pkgs, ... }:
+ {
+ environment.systemPackages = [ pkgs.bitwarden-cli ];
+ };
+ };
+
+ testScript = ''
+ start_all()
+ server.wait_for_unit("bitwarden_rs.service")
+ server.wait_for_open_port(80)
+
+ with subtest("configure the cli"):
+ client.succeed("bw --nointeraction config server http://server")
+
+ with subtest("can't login to nonexistant account"):
+ client.fail(
+ "bw --nointeraction --raw login ${userEmail} ${userPassword}"
+ )
+
+ with subtest("use the web interface to sign up, log in, and save a password"):
+ server.succeed("PYTHONUNBUFFERED=1 test-runner | systemd-cat -t test-runner")
+
+ with subtest("log in with the cli"):
+ key = client.succeed(
+ "bw --nointeraction --raw login ${userEmail} ${userPassword}"
+ ).strip()
+
+ with subtest("sync with the cli"):
+ client.succeed(f"bw --nointeraction --raw --session {key} sync -f")
+
+ with subtest("get the password with the cli"):
+ password = client.succeed(
+ f"bw --nointeraction --raw --session {key} list items | ${pkgs.jq}/bin/jq -r .[].login.password"
+ )
+ assert password.strip() == "${storedPassword}"
+ '';
+ };
+in
+builtins.listToAttrs (
+ map
+ (backend: { name = backend; value = makeBitwardenTest backend; })
+ backends
+)
diff --git a/nixos/tests/blockbook-frontend.nix b/nixos/tests/blockbook-frontend.nix
index 5fbfc6c30c1ac..742a02999e745 100644
--- a/nixos/tests/blockbook-frontend.nix
+++ b/nixos/tests/blockbook-frontend.nix
@@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "blockbook-frontend";
meta = with pkgs.stdenv.lib; {
- maintainers = with maintainers; [ maintainers."1000101" ];
+ maintainers = with maintainers; [ _1000101 ];
};
machine = { ... }: {
diff --git a/nixos/tests/charliecloud.nix b/nixos/tests/charliecloud.nix
new file mode 100644
index 0000000000000..acba41e228a66
--- /dev/null
+++ b/nixos/tests/charliecloud.nix
@@ -0,0 +1,43 @@
+# This test checks charliecloud image construction and run
+
+import ./make-test-python.nix ({ pkgs, ...} : let
+
+ dockerfile = pkgs.writeText "Dockerfile" ''
+ FROM nix
+ RUN mkdir /home /tmp
+ RUN touch /etc/passwd /etc/group
+ CMD ["true"]
+ '';
+
+in {
+ name = "charliecloud";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ bzizou ];
+ };
+
+ nodes = {
+ host = { ... }: {
+ environment.systemPackages = [ pkgs.charliecloud ];
+ virtualisation.docker.enable = true;
+ users.users.alice = {
+ isNormalUser = true;
+ extraGroups = [ "docker" ];
+ };
+ };
+ };
+
+ testScript = ''
+ host.start()
+ host.wait_for_unit("docker.service")
+ host.succeed(
+ 'su - alice -c "docker load --input=${pkgs.dockerTools.examples.nix}"'
+ )
+ host.succeed(
+ "cp ${dockerfile} /home/alice/Dockerfile"
+ )
+ host.succeed('su - alice -c "ch-build -t hello ."')
+ host.succeed('su - alice -c "ch-builder2tar hello /var/tmp"')
+ host.succeed('su - alice -c "ch-tar2dir /var/tmp/hello.tar.gz /var/tmp"')
+ host.succeed('su - alice -c "ch-run /var/tmp/hello -- echo Running_From_Container_OK"')
+ '';
+})
diff --git a/nixos/tests/common/acme/server/mkcerts.nix b/nixos/tests/common/acme/server/mkcerts.nix
index 2474019cbac3b..c9616bf9672cc 100644
--- a/nixos/tests/common/acme/server/mkcerts.nix
+++ b/nixos/tests/common/acme/server/mkcerts.nix
@@ -59,7 +59,8 @@ pkgs.runCommand "acme-snakeoil-ca" {
openssl genrsa -out snakeoil.key 4096
openssl req -new -key snakeoil.key -out snakeoil.csr
openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \
- -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500
+ -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500 \
+ -extfile "$OPENSSL_CONF" -extensions req_ext
addpem snakeoil.key ${lib.escapeShellArg fqdn} key
addpem snakeoil.pem ${lib.escapeShellArg fqdn} cert
'') domains}
diff --git a/nixos/tests/common/acme/server/snakeoil-certs.nix b/nixos/tests/common/acme/server/snakeoil-certs.nix
index fd537c3260f1d..7325b027c7ef0 100644
--- a/nixos/tests/common/acme/server/snakeoil-certs.nix
+++ b/nixos/tests/common/acme/server/snakeoil-certs.nix
@@ -2,170 +2,171 @@
{
ca.key = builtins.toFile "ca.key" ''
-----BEGIN PRIVATE KEY-----
- MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDCnVZGEn68ezXl
- DWE5gjsCPqutR4nxw/wvIbAxB2Vk2WeQ6HGvt2Jdrz5qer2IXd76YtpQeqd+ffet
- aLtMeFTr+Xy9yqEpx2AfvmEEcLnuiWbsUGZzsHwW7/4kPgAFBy9TwJn/k892lR6u
- QYa0QS39CX85kLMZ/LZXUyClIBa+IxT1OovmGqMOr4nGASRQP6d/nnyn41Knat/d
- tpyaa5zgfYwA6YW6UxcywvBSpMOXM0/82BFZGyALt3nQ+ffmrtKcvMjsNLBFaslV
- +zYO1PMbLbTCW8SmJTjhzuapXtBHruvoe24133XWlvcP1ylaTx0alwiQWJr1XEOU
- WLEFTgOTeRyiVDxDunpz+7oGcwzcdOG8nCgd6w0aYaECz1zvS3FYTQz+MiqmEkx6
- s4bj1U90I0kwUJbeWjjrGO7Y9Qq4i19GafDg7cAMn9eHCiNbNrPj6t/gfaVbCrbk
- m3ZVjkvLTQ2mb2lv7+tVii45227iNPuNS6lx2FVlr/DXiRrOVfghPvoOxUfXzogJ
- hZLV4Zki+ycbGQa5w8YMDYCv4c08dKA7AatVhNS60c1zgQNjuWF3BvocSySyGUon
- VT6h1DYlJ9YAqgqNpedgNR9kpp034SMhB7dj9leB6LRMA+c1fG/T+1lDbkA+vope
- pt4+30oDcCTYfEifl1HwqNw/bXDm1wIDAQABAoICABPbd/UYaAQVUk93yQbUKe81
- s9CvbvzTMYUhm9e02Hyszitz/D2gqZHDksvMkFA8u8aylXIGwdZfRglUmV/ZG1kk
- kLzQ0xbvN/ilNUL9uYsETBMqtPly9YZloHnUNa5NqF+UVGJGk7GWz5WaLANybx3V
- fTzDbfLl3TkVy0vt9UQbUkUfXyzwZNjXwmgIr8rcY9vasP90a3eXqRX3Tw1Wk6A4
- TzO8oB994O0WBO150Fc6Lhwvc72yzddENlLDXq8UAXtqq9mmGqJKnhZ+1mo3AkMw
- q7P1JyCIxcAMm26GtRvLVljXV0x5640kxDrCin6jeeW/qWkJEW6dpmuZjR5scmLI
- /9n8H+fGzdZH8bOPPotMy12doj3vJqvew3p0eIkmVctYMJKD0j/CWjvKJNE3Yx4O
- Ls47X/dEypX6anR1HQUXcpd6JfRWdIJANo2Duaz+HYbyA88bHcJL9shFYcjLs3sX
- R/TvnnKHvw/ud7XBgvLGwGAf/cDEuLI2tv+V7tkMGrMUv+gUJNZaJaCpdt+1iUwO
- QFq8APyBNn6FFw54TwXWfSjfSNh3geIMLHuErYVu9MIXvB7Yhh+ZvLcfLbmckhAX
- wb39RRHnCWvnw5Bm9hnsDhqfDsIoP+2wvUkViyHOmrKi8nSJhSk19C8AuQtSVcJg
- 5op+epEmjt70GHt52nuBAoIBAQD2a4Ftp4QxWE2d6oAFI6WPrX7nAwI5/ezCbO/h
- yoYAn6ucTVnn5/5ITJ8V4WTWZ4lkoZP3YSJiCyBhs8fN63J+RaJ/bFRblHDns1HA
- 2nlMVdNLg6uOfjgUJ8Y6xVM0J2dcFtwIFyK5pfZ7loxMZfvuovg74vDOi2vnO3dO
- 16DP3zUx6B/yIt57CYn8NWTq+MO2bzKUnczUQRx0yEzPOfOmVbcqGP8f7WEdDWXm
- 7scjjN53OPyKzLOVEhOMsUhIMBMO25I9ZpcVkyj3/nj+fFLf/XjOTM00M/S/KnOj
- RwaWffx6mSYS66qNc5JSsojhIiYyiGVEWIznBpNWDU35y/uXAoIBAQDKLj0dyig2
- kj1r3HvdgK4sRULqBQFMqE9ylxDmpJxAj6/A8hJ0RCBR57vnIIZMzK4+6K0l3VBJ
- ukzXJHJLPkZ0Uuo2zLuRLkyjBECH6KYznyTkUVRn50Oq6IoP6WTCfd3Eg+7AKYY1
- VFo2iR8sxeSQQ+AylFy6QcQ1xPIW30Jj1/LFjrRdRggapPEekpJec0pEqhasT8rR
- UFhRL2NdZnL5b7ZlsJc7gZKEJgNfxgzaCzloqLcjCgGpOhLKx0fFsNOqHcbIGMwG
- 6wQCOyNghQJ6AZtRD5TYCJow92FchWjoTIaMJ8RjMKQmxpiwM6wQG4J78Hd3mbhf
- q0hiQhPHaNbBAoIBAFeIeMFq8BpXM7sUwcURlI4lIx8Mgo33FVM7PzsFpfQyw9MR
- 5w3p6vnjvd8X4aoHvVZxzw3hA0WwjiAmrKMJL/KK6d45rP2bDUBBAplvAgeLtTLt
- 4tMLIwCF4HSgA55TIPQlaqO1FDC+M4BTSiMZVxS970/WnZPBEuNgzFDFZ+pvb4X6
- 3t40ZLNwAAQHM4IEPAFiHqWMKGZ9eo5BWIeEHnjHmfjqSDYfLJAVYk1WJIcMUzom
- lA76CBC8CxW/I94AtcRhWuFUv/Z5/+OYEYLUxtuqPm+J+JrCmf4OJmWppT1wI2+p
- V00BSeRVWXTm1piieM8ahF5y1hp6y3uV3k0NmKECggEBAMC42Ms3s6NpPSE+99eJ
- 3P0YPJOkl7uByNGbTKH+kW89SDRsy8iGVCSe9892gm5cwU/4LWyljO3qp2qBNG2i
- /DfP/bCk8bqPXsAZwoWK8DrO3bTCDepJWYhlx40pVkHLBwVXGdOVAXh+YswPY2cj
- cB9QhDrSj52AKU9z36yLvtY7uBA3Wph6tCjpx2n0H4/m6AmR9LDmEpf5tWYV/OrA
- SKKaqUw/y7kOZyKOtbKqr/98qYmpIYFF/ZVZZSZkVXcNeoZzgdOlR37ksVqLEsrj
- nxu7wli/uItBj/FTLjyqcvjUUYDyO1KtwBuyPUPgzYhBIN2Rt9+K6WRQelwnToFL
- 30ECggEBALzozykZj2sr3z8tQQRZuXLGotUFGsQCB8ikeqoeB8FbNNkC+qgflQGv
- zLRB2KWOvnboc94wVgBJH43xG0HBibZnBhUO8/HBI/WlmyEj9KQ/ZskUK4GVZkB6
- r/81ASLwH+P/rqrLEjcp1SIPPevjzCWD9VYR5m/qPHLNxStwGSrPjtPzgaFxhq84
- Jl+YVmNqVlrOKYYfIPh8exPLiTti3wfM61pVYFv56PI2gd5ysMWYnuN+vK0sbmZh
- cIWwykcKlODIngI7IzYqt8NuIJI0jrYyHgtUw4jaJzdF4mEOplGONxdz15jAGHtg
- JUsBXFNz132nP4iIr3UKrPedQZijSi4=
+ MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDd1G7OFpXIoHnr
+ rxdw+hiJVDY6nQDDKFt9FBKwlv7x2hCvX7bnyvHaL7H61c+80McGPISrQn3+MjuR
+ Zuqwax49DddNXbGt4WqGlx4LAeI37OgNUUz9foNr2rDDV744vwp14/PD1f3nqpWf
+ Ogzzsh8rxac0mZ5Se9HxOIpI7NRNuHJjj7HWZ4YxeOvi289rmpu0JPcp25njw7h6
+ FNfHu8GGp34Uj6wAxubdRyfViV8z9FMfbglLuA9i1OiSy3NQpq8VwBG+u/0iC7PQ
+ sQjxSragQu25sfATYIrFJQ4ZCvh0nxqKMeyPPBi6dAcMpa2AZAqtqv+CwWdo36Bt
+ S5XiC7rApgYn+yteKQHSbnCiG2W/boSbfg9lRk3w41dESENCADVajLb3Eovvp0tB
+ O/BALudvWjzAPbpXleVNr6ngWtGlsZTC7LXDgBqdW2KlzpZGcz+PW3ATlwip/ZFR
+ t7A15u5dVkWPVoPuQ0w1Tw+g9dxWFTNk3h+2d7K87IxQbcvqxeIDSEVFMrxo0e4C
+ G2udMcelZwARl6iNTAETa2zJW0XtAdGVM+HY1S/kU6U9J3nubDttAkAMABjPwyjL
+ G7hfyWqUHf9yPs49GsftAVvIy8XIeu0shD1BG11/VzvwpUCiRc+btuWi2erZ4ZfP
+ oQ5YoS9gt4S+Ipz7TPGBl+AUk9HO2QIDAQABAoICAGW+aLAXxc2GZUVHQp4r55Md
+ T94kYtQgL4435bafGwH8vchiQzcfazxiweRFqwl0TMS8fzE5xyYPDilLpfsStoTU
+ U1sFzVfuWviuWTY9P+/ctjZdgs2F+GtAm/CMzw+h9/9IdWbuQI3APO4SJxyjJw7h
+ kiZbCzXT2uAjybFXBq07GyQ1JSEszGzmhHLB1OoKuL2wcrj9IyFHhNZhtvLCWCoV
+ qotttjuI/xyg5VFYt5TRzEpPIu5a1pvDAYVK0XI9cXKtbLYp7RlveqMOgAaD+S2a
+ ZQTV60JH9n4j18p+sKR00SxvZ4vuyXzDePRBDUolGIy9MIJdiLueTiuzDmTmclnM
+ 8Yy7oliawW2Bn+1gaWpqmgzEUw9bXRSqIp2zGZ7HaQ+5c/MhS002+/i8WQyssfeg
+ 9EfI+Vl0D2avTxCECmsfjUxtkhzMYPVNbRPjt0QBEM+s8lDoNsP2zhMO441+TKpe
+ /5KZHIW+Y0US6GMIUs1o1byKfNz8Nj5HjEKO9CMyK6SBMJnCMroPD4H6opqk3lw9
+ 4mk04BdN556EzyJDT0a5/VpXG2DUYwFaNwE1ZPMu3Yx6IBoM1xx8mR80vHQCddmF
+ NP+BzkpUiHf0Txyy0YQWECZ/anTt0Bo0XqY5tirIM2dkG0ngNl9tGlw6gVAY1ky8
+ +cr7qKmhhwMWojaX/L+9AoIBAQD/BZAeF3l9I5RBh6ktWA+opzVyd6ejdLpc2Q1z
+ fmSmtUKRsEe51sWaIf6Sez408UaCMT2IQuppPgMnV8xfMM1/og75Cs8aPyAohwKo
+ IbOenXhLfFZiYB4y/Pac3F+FzNKsTT6n+fsE+82UHafY5ZI2FlPb2L0lfyx09zXv
+ fBYhcXgwSx5ymJLJSl8zFaEGn9qi3UB5ss44SaNM0n8SFGUQUk3PR7SFWSWgNxtl
+ CP7LWTsjXYoC/qBMe7b8JieK5aFk1EkkG1EkJvdiMnulMcMJzl+kj6LqVPmVDoZS
+ mMGvgKGJPpFgrbJ5wlA7uOhucGmMpFWP9RCav66DY4GHrLJPAoIBAQDerkZQ03AN
+ i2iJVjtL97TvDjrE8vtNFS/Auh8JyDIW4GGK3Y/ZoMedQpuu3e6NYM9aMjh+QJoA
+ kqhaiZ/tMXjEXJByglpc3a43g2ceWtJg5yLgexGgRtegbA57PRCo35Vhc6WycD1l
+ 6FZNxpTkd2BXX/69KWZ6PpSiLYPvdzxP5ZkYqoWRQIa4ee4orHfz/lUXJm1XwmyG
+ mx3hN9Z9m8Q/PGMGfwrorcp4DK53lmmhTZyPh+X5T5/KkVmrw/v5HEEB3JsknStR
+ 3DAqp2XZcRHsGQef9R7H+PINJm9nebjCraataaE4gr76znXKT23P80Ce5Lw6OQUW
+ XHhoL16gS+pXAoIBADTuz6ofTz01PFmZsfjSdXWZN1PKGEaqPOB2wP7+9h9QMkAR
+ KeId/Sfv9GotII1Woz70v4Pf983ebEMnSyla9NyQI7F3l+MnxSIEW/3P+PtsTgLF
+ DR0gPERzEzEd4Mnh6LyQz/eHwJ2ZMmOTADrZ8848Ni3EwAXfbrfcdBqAVAufBMZp
+ YSmCF72mLTpqO+EnHvd9GxvnjDxMtJOGgY+cIhoQK0xh4stm5JNrvMjs5A4LOGYv
+ zSyv80/Mwf92X/DJlwVZttDCxsXNPL3qIpX4TTZk2p9KnRMsjh1tRV4xjMpD1cOp
+ 8/zwMMJrHcI3sC70MERb+9KEmGy2ap+k8MbbhqsCggEAUAqqocDupR+4Kq2BUPQv
+ 6EHgJA0HAZUc/hSotXZtcsWiqiyr2Vkuhzt7BGcnqU/kGJK2tcL42D3fH/QaNUM0
+ Grj+/voWCw1v4uprtYCF4GkUo0X5dvgf570Pk4LGqzz6z/Wm2LX5i9jwtLItsNWs
+ HpwVz97CxCwcdxMPOpNMbZek6TXaHvTnuAWz8pDT6TNBWLnqUcJECjpVii/s/Gdy
+ KhzFp38g57QYdABy8e9x9pYUMY9yvaO+VyzZ46DlwIxEXavzZDzOZnVUJvDW7krz
+ Wz8/+2I7dzvnnYx0POiG3gtXPzwZxFtS1IpD0r2sRjQ0xSiI9BCs4HXKngBw7gN7
+ rwKCAQEAloJOFw4bafVXZVXuQVnLDm0/MNTfqxUzFE6V2WkMVkJqcpKt+ndApM8P
+ MJvojHWw1fmxDzIAwqZ9rXgnwWKydjSZBDYNjhGFUACVywHe5AjC4PPMUdltGptU
+ lY0BjC7qtwkVugr65goQkEzU61y9JgTqKpYsr3D+qXcoiDvWRuqk5Q0WfYJrUlE0
+ APWaqbxmkqUVDRrXXrifiluupk+BCV7cFSnnknSYbd9FZd9DuKaoNBlkp2J9LZE+
+ Ux74Cfro8SHINHmvqL+YLFUPVDWNeuXh5Kl6AaJ7yclCLXLxAIix3/rIf6mJeIGc
+ s9o9Sr49cibZ3CbMjCSNE3AOeVE1/Q==
-----END PRIVATE KEY-----
'';
ca.cert = builtins.toFile "ca.cert" ''
-----BEGIN CERTIFICATE-----
- MIIFDzCCAvegAwIBAgIUTRDYSWJvmlhwIR3pzVrIQfnboLEwDQYJKoZIhvcNAQEL
- BQAwFjEUMBIGA1UEAwwLU25ha2VvaWwgQ0EwIBcNMjAwMzIyMjI1NjE3WhgPMjEy
- MDAyMjcyMjU2MTdaMBYxFDASBgNVBAMMC1NuYWtlb2lsIENBMIICIjANBgkqhkiG
- 9w0BAQEFAAOCAg8AMIICCgKCAgEAwp1WRhJ+vHs15Q1hOYI7Aj6rrUeJ8cP8LyGw
- MQdlZNlnkOhxr7diXa8+anq9iF3e+mLaUHqnfn33rWi7THhU6/l8vcqhKcdgH75h
- BHC57olm7FBmc7B8Fu/+JD4ABQcvU8CZ/5PPdpUerkGGtEEt/Ql/OZCzGfy2V1Mg
- pSAWviMU9TqL5hqjDq+JxgEkUD+nf558p+NSp2rf3bacmmuc4H2MAOmFulMXMsLw
- UqTDlzNP/NgRWRsgC7d50Pn35q7SnLzI7DSwRWrJVfs2DtTzGy20wlvEpiU44c7m
- qV7QR67r6HtuNd911pb3D9cpWk8dGpcIkFia9VxDlFixBU4Dk3kcolQ8Q7p6c/u6
- BnMM3HThvJwoHesNGmGhAs9c70txWE0M/jIqphJMerOG49VPdCNJMFCW3lo46xju
- 2PUKuItfRmnw4O3ADJ/XhwojWzaz4+rf4H2lWwq25Jt2VY5Ly00Npm9pb+/rVYou
- Odtu4jT7jUupcdhVZa/w14kazlX4IT76DsVH186ICYWS1eGZIvsnGxkGucPGDA2A
- r+HNPHSgOwGrVYTUutHNc4EDY7lhdwb6HEskshlKJ1U+odQ2JSfWAKoKjaXnYDUf
- ZKadN+EjIQe3Y/ZXgei0TAPnNXxv0/tZQ25APr6KXqbePt9KA3Ak2HxIn5dR8Kjc
- P21w5tcCAwEAAaNTMFEwHQYDVR0OBBYEFCIoeYSYjtMiPrmxfHmcrsZkyTpvMB8G
- A1UdIwQYMBaAFCIoeYSYjtMiPrmxfHmcrsZkyTpvMA8GA1UdEwEB/wQFMAMBAf8w
- DQYJKoZIhvcNAQELBQADggIBAHPdwOgAxyhIhbqFObNftW8K3sptorB/Fj6jwYCm
- mHleFueqQnjTHMWsflOjREvQp1M307FWooGj+KQkjwvAyDc/Hmy7WgJxBg9p3vc+
- /Xf/e7ZfBl8rv7vH8VXW/BC1vVsILdFncrgTrP8/4psV50/cl1F4+nPBiekvvxwZ
- k+R7SgeSvcWT7YlOG8tm1M3al4F4mWzSRkYjkrXmwRCKAiya9xcGSt0Bob+LoM/O
- mpDGV/PMC1WAoDc1mMuXN2hSc0n68xMcuFs+dj/nQYn8uL5pzOxpX9560ynKyLDv
- yOzQlM2VuZ7H2hSIeYOFgrtHJJwhDtzjmUNDQpQdp9Fx+LONQTS1VLCTXND2i/3F
- 10X6PkdnLEn09RiPt5qy20pQkICxoEydmlwpFs32musYfJPdBPkZqZWrwINBv2Wb
- HfOmEB4xUvXufZ5Ju5icgggBkyNA3PCLo0GZFRrMtvA7i9IXOcXNR+njhKa9246V
- QQfeWiz05RmIvgShJYVsnZWtael8ni366d+UXypBYncohimyNlAD1n+Bh3z0PvBB
- +FK4JgOSeouM4SuBHdwmlZ/H0mvfUG81Y8Jbrw0yuRHtuCtX5HpN5GKpZPHDE7aQ
- fEShVB/GElC3n3DvgK9OJBeVVhYQgUEfJi4rsSxt3cdEI0NrdckUoZbApWVJ3CBc
- F8Y7
+ MIIFDzCCAvegAwIBAgIUX0P6NfX4gRUpFz+TNV/f26GHokgwDQYJKoZIhvcNAQEL
+ BQAwFjEUMBIGA1UEAwwLU25ha2VvaWwgQ0EwIBcNMjAwODI0MDc0MjEyWhgPMjEy
+ MDA3MzEwNzQyMTJaMBYxFDASBgNVBAMMC1NuYWtlb2lsIENBMIICIjANBgkqhkiG
+ 9w0BAQEFAAOCAg8AMIICCgKCAgEA3dRuzhaVyKB5668XcPoYiVQ2Op0AwyhbfRQS
+ sJb+8doQr1+258rx2i+x+tXPvNDHBjyEq0J9/jI7kWbqsGsePQ3XTV2xreFqhpce
+ CwHiN+zoDVFM/X6Da9qww1e+OL8KdePzw9X956qVnzoM87IfK8WnNJmeUnvR8TiK
+ SOzUTbhyY4+x1meGMXjr4tvPa5qbtCT3KduZ48O4ehTXx7vBhqd+FI+sAMbm3Ucn
+ 1YlfM/RTH24JS7gPYtTokstzUKavFcARvrv9Iguz0LEI8Uq2oELtubHwE2CKxSUO
+ GQr4dJ8aijHsjzwYunQHDKWtgGQKrar/gsFnaN+gbUuV4gu6wKYGJ/srXikB0m5w
+ ohtlv26Em34PZUZN8ONXREhDQgA1Woy29xKL76dLQTvwQC7nb1o8wD26V5XlTa+p
+ 4FrRpbGUwuy1w4AanVtipc6WRnM/j1twE5cIqf2RUbewNebuXVZFj1aD7kNMNU8P
+ oPXcVhUzZN4ftneyvOyMUG3L6sXiA0hFRTK8aNHuAhtrnTHHpWcAEZeojUwBE2ts
+ yVtF7QHRlTPh2NUv5FOlPSd57mw7bQJADAAYz8Moyxu4X8lqlB3/cj7OPRrH7QFb
+ yMvFyHrtLIQ9QRtdf1c78KVAokXPm7blotnq2eGXz6EOWKEvYLeEviKc+0zxgZfg
+ FJPRztkCAwEAAaNTMFEwHQYDVR0OBBYEFNhBZxryvykCjfPO85xB3wof2enAMB8G
+ A1UdIwQYMBaAFNhBZxryvykCjfPO85xB3wof2enAMA8GA1UdEwEB/wQFMAMBAf8w
+ DQYJKoZIhvcNAQELBQADggIBAEZwlsQ+3yd1MVxLRy9RjoA8hI7iWBNmvPUyNjlb
+ l/L9N+dZgdx9G5h/KPRUyzvUc/uk/ZxTWVPIOp13WI65qwsBKrwvYKiXiwzjt+9V
+ CKDRc1sOghTSXk4FD3L5UcKvTQ2lRcFsqxbkopEwQWhoCuhe4vFyt3Nx8ZGLCBUD
+ 3I5zMHtO8FtpZWKJPw46Yc1kasv0nlfly/vUbnErYfgjWX1hgWUcRgYdKwO4sOZ7
+ KbNma0WUsX5mWhXo4Kk7D15wATHO+j9s+j8m86duBL3A4HzpTo1DhHvBi0dkg0CO
+ XuSdByIzVLIPh3yhCHN1loRCP2rbzKM8IQeU/X5Q4UJeC/x9ew8Kk+RKXoHc8Y2C
+ JQO1DxuidyDJRhbb98wZo2YfIsdWQGjYZBe1XQRwBD28JnB+Rb9shml6lORWQn9y
+ P/STo9uWm5zvOCfqwbnCoetljDweItINx622G9SafBwPZc3o79oL7QSl8DgCtN6g
+ p0wGIlIBx+25w/96PqZcrYb8B7/uBHJviiKjBXDoIJWNiNRhW5HaFjeJdSKq7KIL
+ I/PO9KuHafif36ksG69X02Rio2/cTjgjEW1hGHcDRyyJWWaj7bd2eWuouh6FF22b
+ PA6FGY4vewDPnbLKLaix2ZIKxtedUDOH/qru3Mv58IFXmQ4iyM8oC8aOxYSQLZDn
+ 1yJD
-----END CERTIFICATE-----
'';
"acme.test".key = builtins.toFile "acme.test.key" ''
-----BEGIN RSA PRIVATE KEY-----
- MIIJKAIBAAKCAgEAlgQTZjKfs3aHw0J993k7jFAs+hVRPf//zHMAiUkPKUYPTSl1
- TxS/bPbhWzSoom00j4SLhGGGhbd+lnvTg0uvKbxskgATfw5clbm1ZN+gx4DuxwjL
- V3xIxpeSY+PKzs5z8w/k+AJh+zOPyXwH3ut3C+ogp1S/5IhmzV3a/yU/6k0zpGxj
- N6ZPRTXFrz93I1pPeCkJz90l7tj+2uFc9xtM20NQX52f0Y2oShcG8fKdNZVzuHHk
- ZXkrZIhou55/nRy2jKgFeD3GQQfa9rwPWrVybQ6tKMMkoazB/Unky9xcTI2LJarf
- xgHDO9v9yFBvmR4UM8B3kM82NHoENtHaZ2mmiMGZzTEQlf8xwYyHFrqBFIVRWEUr
- 7rr/O5Qr9gIN0T4u367HCexVYAKzbO2P9h75czzjMMoGkbXze9SMQ/ikrxEmwAHg
- r1Xxh6iQYmgPNk8AR3d9+o2I7WJZMUYZARLnuhVr9BNXv510iqZTqX8lcyL5fEj3
- ST4Ab+H7rfevZt6NU26iJLBYAjrA2mSvH+wvkboxrgSS8xYPkOW8NLNEbbodzofI
- pB+SaK53OIk0bj9c1YAgrSNER/TDTgDXrWUNrlfVZ/M7+AEdeU06wi7sVhVif6OB
- D3OpgKSNjeE6TuJH80Pi5MWugSFBr792Xb6uhVoPiVOFN+qiGB6UkwBgSKkCAwEA
- AQKCAgAmN7OZfZwh5DiCDhZ5TXFWNba/n16rJOTN+R5R20L5iNetGLrCAs8hu2N+
- ENRFTPzu8x14BEB5IF4niDRCZq2hPFeMemh9HfOIUV9c63vSV459NkhXaVpA/axV
- tlqchQwVCB+U70Z28JPZCLgYmnQhnOvktTqNxhIqj5aTGbJGxpQ5d0Nvkfbv8tsB
- 4nE/mGpWel39jqFzT+Tdbjx414Ok+GkpcsacZDJTbbpfOSfD1uc8PgepskzTt8y2
- v5JTPFVlUAjUsSgouQ+XfCGNQlx8XBjRIaXbal+hX4niRald91FTr0yC7UAHp+vn
- dFZ586fB526OfbuZctxP+vZhEhFSseQKxHQ0tB8me81xH44daVNr9PPUM69FDT3j
- ygJaUJjNEG3vVzePCDzhmxTmz2/rAClp77WTWziBWDoA6YWDDzhgNPrXWzLIbZIx
- ue9ZbGEOh/u5ZzrEXxKCz9FjDe9wQu3TeYUe0M+ejzwWgn7zdWDvjjmtLUUuun2Y
- wW7WANpu32qvB/V+qssw4O63tbRiwneRCnb8AF2ixgyWr6xyZwch4kacv1KMiixf
- gO/5GTj7ba5GcdGoktJb29cUEgz13yPd106RsHK4vcggFxfMbOVauNRIo6ddLwyS
- 8UMxLf2i2cToOLkHZrIb8FgimmzRoBd3yYzwVJBydiVcsrHQAQKCAQEAxlzFYCiQ
- hjEtblGnrkOC7Hx6HvqMelViOkGN8Y9VczG4GhwntmSE2nbpaAKhFBGdLfuSI3tJ
- Lf24f0IGgAhzPmpo2TjbxPO3YSKFTH71fznVBhtQ1iSxwZ1InXktnuhot6VSDx6A
- sbHSy1hMFy3nj+Zj5+fQ89tclzBzG9bCShaauO39KrPMwKi6CYoYdGhXBC3+OpHY
- zBNvmDTxG2kW8L42rlf14EH4pAlgKs4eeZbpcbZ6fXURP2hToHJ8swyKw/1p12WA
- cc19BKFJXL8nNP4uCf/fI0mVYpytz5KwUzG+z+umDqk+RRCH4mNB28xvEEuEyp/e
- /C5Is+WrlDAA6QKCAQEAwZsK4AJ/w4Xf4Q/SsnZJO9bfP1ejJjzKElt8rG28JXeb
- +FjykZZ6vw2gt2Boest2n9N4fBwaRkaHVtVS4iAmaDXozTlcvCLs2rVjPSguuQtW
- 80CKg6+dux+6gFN8IGzDCiX3pWUnhhiXvCcRYEcvgpH6GA5vuCNrXrjH0JFC0kef
- aaDMGMTbzhc2IIRztmWU4v8YJSSy5KOkIQLWO+7u9aGx9IqT5/z3gx3XrItyl0Bk
- aQmZEh7JOSyhmGhhf5LdeTLu2YgRw3/tzS+lPMX3+UPw99k9MdTOFn2pww5AdRmg
- aBIzV+/LBYG0pPRl0D8/6yzGVBPuUDQpmK9Z3gsxwQKCAQEAnNkMZN2Ocd1+6+V7
- LmtJog9HTSmWXMEZG7FsOJ661Yxx44txx2IyPsCaDNlPXxwSaiKrSo0Yr1oZQd8G
- XsTPw4HGiETSWijQTulJ99PH8SLck6iTwdBgEhV5LrN75FQnQVdizHu1DUzrvkiC
- Wi29FWb6howiCEDjNNVln5SwKn83NpVQgyyK8ag4+oQMlDdQ3wgzJ0Ld53hS3Eq4
- f5EYR6JQgIki7YGcxrB3L0GujTxMONMuhfdEfRvUTGFawwVe0FyYDW7AIrx2Z2vV
- I5YuvVNjOhrt6OwtSD1VnnWCITaLh8LwmlUu3NOWbudHUzKSe5MLXGEPo95BNKad
- hl5yyQKCAQBNo0gMJtRnawMpdLfwewDJL1SdSR6S0ePS0r8/Qk4l1D5GrByyB183
- yFY/0zhyra7nTt1NH9PlhJj3WFqBdZURSzUNP0iR5YuH9R9Twg5ihEqdB6/EOSOO
- i521okTvl83q/ui9ecAMxUXr3NrZ+hHyUWmyRe/FLub6uCzg1a+vNauWpzXRZPgk
- QCijh5oDdd7r3JIpKvtWNs01s7aHmDxZYjtDrmK7sDTtboUzm0QbpWXevUuV+aSF
- +gDfZlRa3WFVHfisYSWGeYG6O7YOlfDoE7fJHGOu3QC8Ai6Wmtt8Wgd6VHokdHO8
- xJPVZnCBvyt5up3Zz5hMr25S3VazdVfBAoIBAHVteqTGqWpKFxekGwR0RqE30wmN
- iIEwFhgOZ8sQ+6ViZJZUR4Nn2fchn2jVwF8V8J1GrJbTknqzAwdXtO3FbgfmmyF2
- 9VbS/GgomXhA9vJkM4KK3Iwo/y/nE9hRhtzuVE0QPudz2fyfaDgnWjcNM59064tH
- 88361LVJm3ixyWSBD41UZ7NgWWJX1y2f073vErsfcPpavF5lhn1oSkQnOlgMJsnl
- 24qeuzAgTWu/2rFpIA2EK30Bgvsl3pjJxHwyNDAgklV7C783LIoAHi7VO7tzZ6iF
- dmD5XLfcUZc3eaB7XehNQKBXDGLJeI5AFmjsHka5GUoitkU2PFrg/3+nJmg=
+ MIIJKgIBAAKCAgEA3dJl4ByHHRcqbZzblszHIS5eEW3TcXTvllqC1nedGLGU9dnA
+ YbdpDUYhvWz/y9AfRZ1d8jYz01jZtt5xWYG0QoQUdkCc9QPPh0Axrl38cGliB6IZ
+ IY0qftW9zrLSgCOUnXL/45JqSpD57DHMSSiJl3hoOo4keBaMRN/UK6F3DxD/nZEs
+ h+yBBh2js3qxleExqkX8InmjK9pG8j7qa4Be5Lh4iILBHbGAMaxM7ViNAg4KgWyg
+ d5+4qB86JFtE/cJ+r3D62ARjVaxU6ePOL0AwS/vx5ls6DFQC7+1CpGCNemgLPzcc
+ 70s0V0SAnF73xHYqRWjJFtumyvyTkiQWLg0zDQOugWd3B9ADuaIEx2nviPyphAtj
+ M3ZKrL2zN1aIfqzbxJ/L8TQFa2WPsPU2+iza/m9kMfLXZ4XPF/SJxQ+5yVH+rxx5
+ OWrXZ13nCMyeVoaXQofmG7oZvOQbtuT9r5DQZd9WN0P3G3sy0/dNnlNVn8uCBvXJ
+ TQhRKsy1FESZdgcFNtpJEG7BRG9Gc6i0V39aSRzShZyKJSBQhlc0FMTlX445EYsh
+ PKjEC/+Suq9wy/LuLjIkkqBbVg4617IlibLz0fDY/yrZqkfSqhCVsWnra21Ty3Mp
+ vD+wnskTzuGrvCVTe3KcWp+wkeH0xvhr8FXX6nn492YCfvZSITO3FF+qWt8CAwEA
+ AQKCAgEAk2xV0NCk66yNwjPRrTOD1IWgdyzqrijtYpvdAPSWL+c1/P8vYMIoy22k
+ 1uQuTSKQ5g9kdKmZYAlZCLRl2Pre9qYZg04GAsD5mAYN/rjwITWotTICSc4sRAeC
+ EnG+fPMovkvDzVdt1QjtURD3mFeculKH0wLNMhKqPswTkrvJCPZfLDVjxyJjzdC9
+ D3enttjnzSaeH7t/upFjPXSbD79NUe1YDkH4XuetL1Y3+jYz4P279bBgJaC9dN7s
+ IWWXQJ+W2rrXu+GOs03JUXjZe4XJk3ZqmpJezfq3yQWCmQSigovLjcPvMwpkSut4
+ HnTvbl6qUV8G5m4tOBMNcL8TDqAvIGY8Q2NAT0iKJN187FbHpjSwQL/Ckgqz/taJ
+ Q82LfIA1+IjwW372gY2Wge8tM/s3+2vOEn2k91sYfiKtrRFfrHBurehVQSpJb2gL
+ YPoUhUGu4C1nx44sQw+DgugOBp1BTKA1ZOBIk6NyS/J9sU3jSgMr88n10TyepP6w
+ OVk9kcNomnm/QIOyTDW4m76uoaxslg7kwOJ4j6wycddS8JtvEO4ZPk/fHZCbvlMv
+ /dAKsC3gigO2zW6IYYb7mSXI07Ew/rFH1NfSILiGw8GofJHDq3plGHZo9ycB6JC+
+ 9C8n9IWjn8ahwbulCoQQhdHwXvf61t+RzNFuFiyAT0PF2FtD/eECggEBAPYBNSEY
+ DSQc/Wh+UlnwQsevxfzatohgQgQJRU1ZpbHQrl2uxk1ISEwrfqZwFmFotdjjzSYe
+ e1WQ0uFYtdm1V/QeQK+8W0u7E7/fof4dR6XxrzJ2QmtWEmCnLOBUKCfPc7/4p4IU
+ 7Q8PDwuwvXgaASZDaEsyTxL9bBrNMLFx9hIScQ9CaygpKvufilCHG79maoKArLwX
+ s7G16qlT4YeEdiNuLGv0Ce0txJuFYp7cGClWQhruw+jIbr+Sn9pL9cn8GboCiUAq
+ VgZKsofhEkKIEbP1uFypX2JnyRSE/h0qDDcH1sEXjR9zYYpQjVpk3Jiipgw4PXis
+ 79uat5/QzUqVc1sCggEBAObVp686K9NpxYNoEliMijIdzFnK5J/TvoX9BBMz0dXc
+ CgQW40tBcroU5nRl3oCjT1Agn8mxWLXH3czx6cPlSA8fnMTJmev8FaLnEcM15pGI
+ 8/VCBbTegdezJ8vPRS/T9c4CViXo7d0qDMkjNyn22ojPPFYh8M1KVNhibDTEpXMQ
+ vJxBJgvHePj+5pMOIKwAvQicqD07fNp6jVPmB/GnprBkjcCQZtshNJzWrW3jk7Fr
+ xWpQJ8nam8wHdMvfKhpzvD6azahwmfKKaQmh/RwmH4xdtIKdh4j+u+Ax+Bxi0g7V
+ GQfusIFB1MO48yS6E56WZMmsPy+jhTcIB4prIbfu4c0CggEBALgqqUKwRc4+Ybvj
+ rfUk+GmT/s3QUwx/u4xYAGjq7y/SgWcjG9PphC559WPWz/p2sITB7ehWs5CYTjdj
+ +SgWKdVY/KZThamJUTy4yAZ8lxH1gGpvvEOs+S8gmGkMt88t8ILMPWMWFW7LoEDp
+ PL74ANpLZn29GROnY1IhQQ3mughHhBqfZ6d2QnaDtsGYlD5TBvPSLv7VY7Jr9VR0
+ toeEtAjMRzc+SFwmgmTHk9BIB1KTAAQ3sbTIsJh8xW1gpo5jTEND+Mpvp10oeMVe
+ yxPB2Db4gt/j8MOz3QaelbrxqplcJfsCjaT49RHeQiRlE/y070iApgx8s0idaFCd
+ ucLXZbcCggEBANkcsdg9RYVWoeCj3UWOAll6736xN/IgDb4mqVOKVN3qVT1dbbGV
+ wFvHVq66NdoWQH4kAUaKWN65OyQNkQqgt/MJj8EDwZNVCeCrp2hNZS0TfCn9TDK/
+ aa7AojivHesLWNHIHtEPUdLIPzhbuAHvXcJ58M0upTfhpwXTJOVI5Dji0BPDrw47
+ Msw3rBU6n35IP4Q/HHpjXl58EDuOS4B+aGjWWwF4kFWg2MR/oqWN/JdOv2LsO1A/
+ HnR7ut4aa5ZvrunPXooERrf6eSsHQnLcZKX4aNTFZ/pxZbJMLYo9ZEdxJVbxqPAa
+ RA1HAuJTZiquV+Pb755WFfEZy0Xk19URiS0CggEAPT1e+9sdNC15z79SxvJQ4pmT
+ xiXat+1pq9pxp5HEOre2sSAd7CF5lu/1VQd6p0gtLZY+Aw4BXOyMtzYWgIap+u9j
+ ThFl9qrTFppG5KlFKKpQ8dQQ8ofO1akS8cK8nQeSdvrqEC/kGT2rmVdeevhBlfGy
+ BZi2ikhEQrz5jsLgIdT7sN2aLFYtmzLU9THTvlfm4ckQ7jOTxvVahb+WRe/iMCwP
+ Exrb83JDo31jHvAoYqUFrZkmPA+DUWFlrqb21pCzmC/0iQSuDcayRRjZkY/s5iAh
+ gtI6YyAsSL8hKvFVCC+VJf1QvFOpgUfsZjrIZuSc3puBWtN2dirHf7EfyxgEOg==
-----END RSA PRIVATE KEY-----
'';
"acme.test".cert = builtins.toFile "acme.test.cert" ''
-----BEGIN CERTIFICATE-----
- MIIEoTCCAokCAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls
- IENBMCAXDTIwMDMyMjIyNTYxOFoYDzIxMjAwMjI3MjI1NjE4WjAUMRIwEAYDVQQD
- DAlhY21lLnRlc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCWBBNm
- Mp+zdofDQn33eTuMUCz6FVE9///McwCJSQ8pRg9NKXVPFL9s9uFbNKiibTSPhIuE
- YYaFt36We9ODS68pvGySABN/DlyVubVk36DHgO7HCMtXfEjGl5Jj48rOznPzD+T4
- AmH7M4/JfAfe63cL6iCnVL/kiGbNXdr/JT/qTTOkbGM3pk9FNcWvP3cjWk94KQnP
- 3SXu2P7a4Vz3G0zbQ1BfnZ/RjahKFwbx8p01lXO4ceRleStkiGi7nn+dHLaMqAV4
- PcZBB9r2vA9atXJtDq0owyShrMH9SeTL3FxMjYslqt/GAcM72/3IUG+ZHhQzwHeQ
- zzY0egQ20dpnaaaIwZnNMRCV/zHBjIcWuoEUhVFYRSvuuv87lCv2Ag3RPi7frscJ
- 7FVgArNs7Y/2HvlzPOMwygaRtfN71IxD+KSvESbAAeCvVfGHqJBiaA82TwBHd336
- jYjtYlkxRhkBEue6FWv0E1e/nXSKplOpfyVzIvl8SPdJPgBv4fut969m3o1TbqIk
- sFgCOsDaZK8f7C+RujGuBJLzFg+Q5bw0s0Rtuh3Oh8ikH5Jornc4iTRuP1zVgCCt
- I0RH9MNOANetZQ2uV9Vn8zv4AR15TTrCLuxWFWJ/o4EPc6mApI2N4TpO4kfzQ+Lk
- xa6BIUGvv3Zdvq6FWg+JU4U36qIYHpSTAGBIqQIDAQABMA0GCSqGSIb3DQEBCwUA
- A4ICAQBCDs0V4z00Ze6Ask3qDOLAPo4k85QCfItlRZmwl2XbPZq7kbe13MqF2wxx
- yiLalm6veK+ehU9MYN104hJZnuce5iEcZurk+8A+Pwn1Ifz+oWKVbUtUP3uV8Sm3
- chktJ2H1bebXtNJE5TwvdHiUkXU9ywQt2FkxiTSl6+eac7JKEQ8lVN/o6uYxF5ds
- +oIZplb7bv2XxsRCzq55F2tJX7fIzqXrSa+lQTnfLGmDVMAQX4TRB/lx0Gqd1a9y
- qGfFnZ7xVyW97f6PiL8MoxPfd2I2JzrzGyP/igNbFOW0ho1OwfxVmvZeS7fQSc5e
- +qu+nwnFfl0S4cHRif3G3zmz8Ryx9LM5TYkH41qePIHxoEO2sV0DgWJvbSjysV2S
- EU2a31dJ0aZ+z6YtZVpHlujKMVzxVTrqj74trS4LvU5h/9hv7e1gjYdox1TO0HMK
- mtDfgBevB21Tvxpz67Ijf31HvfTmCerKJEOjGnbYmyYpMeMNSONRDcToWk8sUwvi
- OWa5jlUFRAxgXNM09vCTPi9aRUhcFqACqfAd6I1NqGVlfplLWrc7SWaSa+PsLfBf
- 4EOZfk8iEKBVeYXNjg+CcD8j8yk/oEs816/jpihIk8haCDRWYWGKyyGnwn6OQb8d
- MdRO2b7Oi/AAmEF3jMlICqv286GIYK5qTKk2/CKHlOLPnsWEuA==
+ MIIEwDCCAqigAwIBAgICApowDQYJKoZIhvcNAQELBQAwFjEUMBIGA1UEAwwLU25h
+ a2VvaWwgQ0EwIBcNMjAwODI0MDc0MjEzWhgPMjEyMDA3MzEwNzQyMTNaMBQxEjAQ
+ BgNVBAMMCWFjbWUudGVzdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+ AN3SZeAchx0XKm2c25bMxyEuXhFt03F075ZagtZ3nRixlPXZwGG3aQ1GIb1s/8vQ
+ H0WdXfI2M9NY2bbecVmBtEKEFHZAnPUDz4dAMa5d/HBpYgeiGSGNKn7Vvc6y0oAj
+ lJ1y/+OSakqQ+ewxzEkoiZd4aDqOJHgWjETf1Cuhdw8Q/52RLIfsgQYdo7N6sZXh
+ MapF/CJ5oyvaRvI+6muAXuS4eIiCwR2xgDGsTO1YjQIOCoFsoHefuKgfOiRbRP3C
+ fq9w+tgEY1WsVOnjzi9AMEv78eZbOgxUAu/tQqRgjXpoCz83HO9LNFdEgJxe98R2
+ KkVoyRbbpsr8k5IkFi4NMw0DroFndwfQA7miBMdp74j8qYQLYzN2Sqy9szdWiH6s
+ 28Sfy/E0BWtlj7D1Nvos2v5vZDHy12eFzxf0icUPuclR/q8ceTlq12dd5wjMnlaG
+ l0KH5hu6GbzkG7bk/a+Q0GXfVjdD9xt7MtP3TZ5TVZ/Lggb1yU0IUSrMtRREmXYH
+ BTbaSRBuwURvRnOotFd/Wkkc0oWciiUgUIZXNBTE5V+OORGLITyoxAv/krqvcMvy
+ 7i4yJJKgW1YOOteyJYmy89Hw2P8q2apH0qoQlbFp62ttU8tzKbw/sJ7JE87hq7wl
+ U3tynFqfsJHh9Mb4a/BV1+p5+PdmAn72UiEztxRfqlrfAgMBAAGjGDAWMBQGA1Ud
+ EQQNMAuCCWFjbWUudGVzdDANBgkqhkiG9w0BAQsFAAOCAgEAM5WrCpBOmLrZ1QX8
+ l6vxVXwoI8pnqyy3cbAm3aLRPbw4gb0Ot90Pv/LoMhP0fkrNOKwH/FGRjSXyti0X
+ TheKrP7aEf6XL2/Xnb8rK2jYMQo6YJU9T+wBJA6Q+GBrc8SE75KfOi5NWJr8T4Ju
+ Etb+G05hXClrN19VFzIoz3L4kRV+xNMialcOT3xQfHtXCQUgwAWpPlwcJA/Jf60m
+ XsfwQwk2Ir16wq+Lc3y+mQ7d/dbG+FVrngFk4qN2B9M/Zyv4N9ZBbqeDUn3mYtJE
+ FeJrwHgmwH6slf1gBN3gxUKRW7Bvzxk548NdmLOyN+Y4StsqbOaYGtShUJA7f1Ng
+ qQqdgvxZ9MNwwMv9QVDZEnaaew3/oWOSmQGAai4hrc7gLMLJmIxzgfd5P6Dr06e4
+ 2zwsMuI8Qh/IDqu/CfmFYvaua0FEeyAtpoID9Y/KPM7fu9bJuxjZ6kqLVFkEi9nF
+ /rCMchcSA8N2z/vLPabpNotO7OYH3VD7aQGTfCL82dMlp1vwZ39S3Z1TFLLh3MZ+
+ BYcAv8kUvCV6kIdPAXvJRSQOJUlJRV7XiI2mwugdDzMx69wQ0Zc1e4WyGfiSiVYm
+ ckSJ/EkxuwT/ZYLqCAKSFGMlFhad9g1Zyvd67XgfZq5p0pJTtGxtn5j8QHy6PM6m
+ NbjvWnP8lDU8j2l3eSG58S14iGs=
-----END CERTIFICATE-----
'';
}
diff --git a/nixos/tests/common/ec2.nix b/nixos/tests/common/ec2.nix
index ba087bb600905..502fe96231f20 100644
--- a/nixos/tests/common/ec2.nix
+++ b/nixos/tests/common/ec2.nix
@@ -20,30 +20,44 @@ with pkgs.lib;
in makeTest {
name = "ec2-" + name;
nodes = {};
- testScript =
- ''
- my $imageDir = ($ENV{'TMPDIR'} // "/tmp") . "/vm-state-machine";
- mkdir $imageDir, 0700;
- my $diskImage = "$imageDir/machine.qcow2";
- system("qemu-img create -f qcow2 -o backing_file=${image} $diskImage") == 0 or die;
- system("qemu-img resize $diskImage 10G") == 0 or die;
+ testScript = ''
+ import os
+ import subprocess
- # Note: we use net=169.0.0.0/8 rather than
- # net=169.254.0.0/16 to prevent dhcpcd from getting horribly
- # confused. (It would get a DHCP lease in the 169.254.*
- # range, which it would then configure and prompty delete
- # again when it deletes link-local addresses.) Ideally we'd
- # turn off the DHCP server, but qemu does not have an option
- # to do that.
- my $startCommand = "qemu-kvm -m 1024";
- $startCommand .= " -device virtio-net-pci,netdev=vlan0";
- $startCommand .= " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'";
- $startCommand .= " -drive file=$diskImage,if=virtio,werror=report";
- $startCommand .= " \$QEMU_OPTS";
+ image_dir = os.path.join(
+ os.environ.get("TMPDIR", tempfile.gettempdir()), "tmp", "vm-state-machine"
+ )
+ os.makedirs(image_dir, mode=0o700, exist_ok=True)
+ disk_image = os.path.join(image_dir, "machine.qcow2")
+ subprocess.check_call(
+ [
+ "qemu-img",
+ "create",
+ "-f",
+ "qcow2",
+ "-o",
+ "backing_file=${image}",
+ disk_image,
+ ]
+ )
+ subprocess.check_call(["qemu-img", "resize", disk_image, "10G"])
- my $machine = createMachine({ startCommand => $startCommand });
+ # Note: we use net=169.0.0.0/8 rather than
+ # net=169.254.0.0/16 to prevent dhcpcd from getting horribly
+ # confused. (It would get a DHCP lease in the 169.254.*
+ # range, which it would then configure and prompty delete
+ # again when it deletes link-local addresses.) Ideally we'd
+ # turn off the DHCP server, but qemu does not have an option
+ # to do that.
+ start_command = (
+ "qemu-kvm -m 1024"
+ + " -device virtio-net-pci,netdev=vlan0"
+ + " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'"
+ + f" -drive file={disk_image},if=virtio,werror=report"
+ + " $QEMU_OPTS"
+ )
- ${script}
- '';
+ machine = create_machine({"startCommand": start_command})
+ '' + script;
};
}
diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix
index 35aff91e85b53..2d81f1639387d 100644
--- a/nixos/tests/containers-reloadable.nix
+++ b/nixos/tests/containers-reloadable.nix
@@ -9,13 +9,13 @@ let
};
};
- # prevent make-test.nix to change IP
+ # prevent make-test-python.nix to change IP
networking.interfaces = {
eth1.ipv4.addresses = lib.mkOverride 0 [ ];
};
};
in {
- name = "cotnainers-reloadable";
+ name = "containers-reloadable";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ danbst ];
};
diff --git a/nixos/tests/cri-o.nix b/nixos/tests/cri-o.nix
new file mode 100644
index 0000000000000..f13f1bdacb6af
--- /dev/null
+++ b/nixos/tests/cri-o.nix
@@ -0,0 +1,19 @@
+# This test runs CRI-O and verifies via critest
+import ./make-test-python.nix ({ pkgs, ... }: {
+ name = "cri-o";
+ maintainers = with pkgs.stdenv.lib.maintainers; teams.podman.members;
+
+ nodes = {
+ crio = {
+ virtualisation.cri-o.enable = true;
+ };
+ };
+
+ testScript = ''
+ start_all()
+ crio.wait_for_unit("crio.service")
+ crio.succeed(
+ "critest --ginkgo.focus='Runtime info' --runtime-endpoint unix:///var/run/crio/crio.sock"
+ )
+ '';
+})
diff --git a/nixos/tests/docker-preloader.nix b/nixos/tests/docker-preloader.nix
deleted file mode 100644
index c3e8aced351a6..0000000000000
--- a/nixos/tests/docker-preloader.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : {
- name = "docker-preloader";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ lewo ];
- };
-
- nodes = {
- docker =
- { pkgs, ... }:
- {
- virtualisation.docker.enable = true;
- virtualisation.dockerPreloader.images = [ pkgs.dockerTools.examples.nix pkgs.dockerTools.examples.bash ];
-
- services.openssh.enable = true;
- services.openssh.permitRootLogin = "yes";
- services.openssh.extraConfig = "PermitEmptyPasswords yes";
- users.extraUsers.root.password = "";
- };
- };
- testScript = ''
- startAll;
-
- $docker->waitForUnit("sockets.target");
- $docker->succeed("docker run nix nix-store --version");
- $docker->succeed("docker run bash bash --version");
- '';
-})
diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix
index 6afb6dcfda3da..58069366ca36e 100644
--- a/nixos/tests/dokuwiki.nix
+++ b/nixos/tests/dokuwiki.nix
@@ -33,7 +33,7 @@ let
in {
name = "dokuwiki";
meta = with pkgs.stdenv.lib; {
- maintainers = with maintainers; [ maintainers."1000101" ];
+ maintainers = with maintainers; [ _1000101 ];
};
machine = { ... }: {
services.dokuwiki."site1.local" = {
diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
index 5a59d65e6026f..df06724801684 100644
--- a/nixos/tests/ec2.nix
+++ b/nixos/tests/ec2.nix
@@ -3,58 +3,58 @@
pkgs ? import ../.. { inherit system config; }
}:
-with import ../lib/testing.nix { inherit system pkgs; };
+with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
with import common/ec2.nix { inherit makeTest pkgs; };
let
- imageCfg =
- (import ../lib/eval-config.nix {
- inherit system;
- modules = [
- ../maintainers/scripts/ec2/amazon-image.nix
- ../modules/testing/test-instrumentation.nix
- ../modules/profiles/qemu-guest.nix
- { ec2.hvm = true;
-
- # Hack to make the partition resizing work in QEMU.
- boot.initrd.postDeviceCommands = mkBefore
- ''
- ln -s vda /dev/xvda
- ln -s vda1 /dev/xvda1
- '';
-
- # Needed by nixos-rebuild due to the lack of network
- # access. Determined by trial and error.
- system.extraDependencies =
- with pkgs; (
- [
- # Needed for a nixos-rebuild.
- busybox
- stdenv
- stdenvNoCC
- mkinitcpio-nfs-utils
- unionfs-fuse
- cloud-utils
- desktop-file-utils
- texinfo
- libxslt.bin
- xorg.lndir
-
- # These are used in the configure-from-userdata tests
- # for EC2. Httpd and valgrind are requested by the
- # configuration.
- apacheHttpd apacheHttpd.doc apacheHttpd.man valgrind.doc
- ]
- );
- }
- ];
- }).config;
+ imageCfg = (import ../lib/eval-config.nix {
+ inherit system;
+ modules = [
+ ../maintainers/scripts/ec2/amazon-image.nix
+ ../modules/testing/test-instrumentation.nix
+ ../modules/profiles/qemu-guest.nix
+ {
+ ec2.hvm = true;
+
+ # Hack to make the partition resizing work in QEMU.
+ boot.initrd.postDeviceCommands = mkBefore ''
+ ln -s vda /dev/xvda
+ ln -s vda1 /dev/xvda1
+ '';
+
+ # Needed by nixos-rebuild due to the lack of network
+ # access. Determined by trial and error.
+ system.extraDependencies = with pkgs; ( [
+ # Needed for a nixos-rebuild.
+ busybox
+ cloud-utils
+ desktop-file-utils
+ libxslt.bin
+ mkinitcpio-nfs-utils
+ stdenv
+ stdenvNoCC
+ texinfo
+ unionfs-fuse
+ xorg.lndir
+
+ # These are used in the configure-from-userdata tests
+ # for EC2. Httpd and valgrind are requested by the
+ # configuration.
+ apacheHttpd
+ apacheHttpd.doc
+ apacheHttpd.man
+ valgrind.doc
+ ]);
+ }
+ ];
+ }).config;
image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.vhd";
sshKeys = import ./ssh-keys.nix pkgs;
snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text;
+ snakeOilPrivateKeyFile = pkgs.writeText "private-key" snakeOilPrivateKey;
snakeOilPublicKey = sshKeys.snakeOilPublicKey;
in {
@@ -68,43 +68,47 @@ in {
SSH_HOST_ED25519_KEY:${replaceStrings ["\n"] ["|"] snakeOilPrivateKey}
'';
script = ''
- $machine->start;
- $machine->waitForFile("/etc/ec2-metadata/user-data");
- $machine->waitForUnit("sshd.service");
+ machine.start()
+ machine.wait_for_file("/etc/ec2-metadata/user-data")
+ machine.wait_for_unit("sshd.service")
- $machine->succeed("grep unknown /etc/ec2-metadata/ami-manifest-path");
+ machine.succeed("grep unknown /etc/ec2-metadata/ami-manifest-path")
# We have no keys configured on the client side yet, so this should fail
- $machine->fail("ssh -o BatchMode=yes localhost exit");
+ machine.fail("ssh -o BatchMode=yes localhost exit")
# Let's install our client private key
- $machine->succeed("mkdir -p ~/.ssh");
+ machine.succeed("mkdir -p ~/.ssh")
- $machine->succeed("echo '${snakeOilPrivateKey}' > ~/.ssh/id_ed25519");
- $machine->succeed("chmod 600 ~/.ssh/id_ed25519");
+ machine.copy_from_host_via_shell(
+ "${snakeOilPrivateKeyFile}", "~/.ssh/id_ed25519"
+ )
+ machine.succeed("chmod 600 ~/.ssh/id_ed25519")
# We haven't configured the host key yet, so this should still fail
- $machine->fail("ssh -o BatchMode=yes localhost exit");
+ machine.fail("ssh -o BatchMode=yes localhost exit")
# Add the host key; ssh should finally succeed
- $machine->succeed("echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts");
- $machine->succeed("ssh -o BatchMode=yes localhost exit");
+ machine.succeed(
+ "echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts"
+ )
+ machine.succeed("ssh -o BatchMode=yes localhost exit")
# Test whether the root disk was resized.
- my $blocks = $machine->succeed("stat -c %b -f /");
- my $bsize = $machine->succeed("stat -c %S -f /");
- my $size = $blocks * $bsize;
- die "wrong free space $size" if $size < 9.7 * 1024 * 1024 * 1024 || $size > 10 * 1024 * 1024 * 1024;
+ blocks, block_size = map(int, machine.succeed("stat -c %b:%S -f /").split(":"))
+ GB = 1024 ** 3
+ assert 9.7 * GB <= blocks * block_size <= 10 * GB
# Just to make sure resizing is idempotent.
- $machine->shutdown;
- $machine->start;
- $machine->waitForFile("/etc/ec2-metadata/user-data");
+ machine.shutdown()
+ machine.start()
+ machine.wait_for_file("/etc/ec2-metadata/user-data")
'';
};
boot-ec2-config = makeEc2Test {
name = "config-userdata";
+ meta.broken = true; # amazon-init wants to download from the internet while building the system
inherit image;
sshPublicKey = snakeOilPublicKey;
@@ -133,17 +137,17 @@ in {
}
'';
script = ''
- $machine->start;
+ machine.start()
# amazon-init must succeed. if it fails, make the test fail
- # immediately instead of timing out in waitForFile.
- $machine->waitForUnit('amazon-init.service');
+ # immediately instead of timing out in wait_for_file.
+ machine.wait_for_unit("amazon-init.service")
- $machine->waitForFile("/etc/testFile");
- $machine->succeed("cat /etc/testFile | grep -q 'whoa'");
+ machine.wait_for_file("/etc/testFile")
+ assert "whoa" in machine.succeed("cat /etc/testFile")
- $machine->waitForUnit("httpd.service");
- $machine->succeed("curl http://localhost | grep Valgrind");
+ machine.wait_for_unit("httpd.service")
+ assert "Valgrind" in machine.succeed("curl http://localhost")
'';
};
}
diff --git a/nixos/tests/firejail.nix b/nixos/tests/firejail.nix
new file mode 100644
index 0000000000000..a723cb01664f3
--- /dev/null
+++ b/nixos/tests/firejail.nix
@@ -0,0 +1,82 @@
+import ./make-test-python.nix ({ pkgs, ...} : {
+ name = "firejail";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ sgo ];
+ };
+
+ nodes.machine = { ... }: {
+ imports = [ ./common/user-account.nix ];
+
+ programs.firejail = {
+ enable = true;
+ wrappedBinaries = {
+ bash-jailed = "${pkgs.bash}/bin/bash";
+ };
+ };
+
+ systemd.services.setupFirejailTest = {
+ wantedBy = [ "multi-user.target" ];
+ before = [ "multi-user.target" ];
+
+ environment = {
+ HOME = "/home/alice";
+ };
+
+ unitConfig = {
+ type = "oneshot";
+ RemainAfterExit = true;
+ user = "alice";
+ };
+
+ script = ''
+ cd $HOME
+
+ mkdir .password-store && echo s3cret > .password-store/secret
+ mkdir my-secrets && echo s3cret > my-secrets/secret
+
+ echo publ1c > public
+
+ mkdir -p .config/firejail
+ echo 'blacklist ''${HOME}/my-secrets' > .config/firejail/globals.local
+ '';
+ };
+ };
+
+ testScript = ''
+ start_all()
+ machine.wait_for_unit("multi-user.target")
+
+ # Test path acl with wrapper
+ machine.succeed("sudo -u alice bash-jailed -c 'cat ~/public' | grep -q publ1c")
+ machine.fail(
+ "sudo -u alice bash-jailed -c 'cat ~/.password-store/secret' | grep -q s3cret"
+ )
+ machine.fail("sudo -u alice bash-jailed -c 'cat ~/my-secrets/secret' | grep -q s3cret")
+
+
+ # Test path acl with firejail executable
+ machine.succeed("sudo -u alice firejail -- bash -c 'cat ~/public' | grep -q publ1c")
+ machine.fail(
+ "sudo -u alice firejail -- bash -c 'cat ~/.password-store/secret' | grep -q s3cret"
+ )
+ machine.fail(
+ "sudo -u alice firejail -- bash -c 'cat ~/my-secrets/secret' | grep -q s3cret"
+ )
+
+ # Disabling profiles
+ machine.succeed(
+ "sudo -u alice bash -c 'firejail --noprofile -- cat ~/.password-store/secret' | grep -q s3cret"
+ )
+
+ # CVE-2020-17367
+ machine.fail(
+ "sudo -u alice firejail --private-tmp id --output=/tmp/vuln1 && cat /tmp/vuln1"
+ )
+
+ # CVE-2020-17368
+ machine.fail(
+ "sudo -u alice firejail --private-tmp --output=/tmp/foo 'bash -c $(id>/tmp/vuln2;echo id)' && cat /tmp/vuln2"
+ )
+ '';
+})
+
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index b3d7aff8bd715..7e301be49d109 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -23,6 +23,13 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
services.xserver.desktopManager.gnome3.enable = true;
services.xserver.desktopManager.gnome3.debug = true;
+ environment.systemPackages = [
+ (pkgs.makeAutostartItem {
+ name = "org.gnome.Terminal";
+ package = pkgs.gnome3.gnome-terminal;
+ })
+ ];
+
virtualisation.memorySize = 1024;
};
@@ -65,9 +72,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
)
with subtest("Open Gnome Terminal"):
- machine.succeed(
- "${gnomeTerminalCommand}"
- )
# correct output should be (true, '"gnome-terminal-server"')
machine.wait_until_succeeds(
"${wmClass} | grep -q 'gnome-terminal-server'"
diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
index 5ed0dfcf9ab8f..8d845de70e248 100644
--- a/nixos/tests/hardened.nix
+++ b/nixos/tests/hardened.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, latestKernel ? false, ... } : {
+import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : {
name = "hardened";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ joachifm ];
@@ -47,84 +47,88 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... } : {
};
in
''
- $machine->waitForUnit("multi-user.target");
+ machine.wait_for_unit("multi-user.target")
+
+
+ with subtest("AppArmor profiles are loaded"):
+ machine.succeed("systemctl status apparmor.service")
- subtest "apparmor-loaded", sub {
- $machine->succeed("systemctl status apparmor.service");
- };
# AppArmor securityfs
- subtest "apparmor-securityfs", sub {
- $machine->succeed("mountpoint -q /sys/kernel/security");
- $machine->succeed("cat /sys/kernel/security/apparmor/profiles");
- };
+ with subtest("AppArmor securityfs is mounted"):
+ machine.succeed("mountpoint -q /sys/kernel/security")
+ machine.succeed("cat /sys/kernel/security/apparmor/profiles")
+
# Test loading out-of-tree modules
- subtest "extra-module-packages", sub {
- $machine->succeed("grep -Fq wireguard /proc/modules");
- };
+ with subtest("Out-of-tree modules can be loaded"):
+ machine.succeed("grep -Fq wireguard /proc/modules")
+
# Test hidepid
- subtest "hidepid", sub {
- $machine->succeed("grep -Fq hidepid=2 /proc/mounts");
+ with subtest("hidepid=2 option is applied and works"):
+ machine.succeed("grep -Fq hidepid=2 /proc/mounts")
# cannot use pgrep -u here, it segfaults when access to process info is denied
- $machine->succeed("[ `su - sybil -c 'ps --no-headers --user root | wc -l'` = 0 ]");
- $machine->succeed("[ `su - alice -c 'ps --no-headers --user root | wc -l'` != 0 ]");
- };
+ machine.succeed("[ `su - sybil -c 'ps --no-headers --user root | wc -l'` = 0 ]")
+ machine.succeed("[ `su - alice -c 'ps --no-headers --user root | wc -l'` != 0 ]")
+
# Test kernel module hardening
- subtest "lock-modules", sub {
+ with subtest("No more kernel modules can be loaded"):
# note: this better a be module we normally wouldn't load ...
- $machine->fail("modprobe dccp");
- };
+ machine.fail("modprobe dccp")
+
# Test userns
- subtest "userns", sub {
- $machine->succeed("unshare --user true");
- $machine->fail("su -l alice -c 'unshare --user true'");
- };
+ with subtest("User namespaces are restricted"):
+ machine.succeed("unshare --user true")
+ machine.fail("su -l alice -c 'unshare --user true'")
+
# Test dmesg restriction
- subtest "dmesg", sub {
- $machine->fail("su -l alice -c dmesg");
- };
+ with subtest("Regular users cannot access dmesg"):
+ machine.fail("su -l alice -c dmesg")
+
# Test access to kcore
- subtest "kcore", sub {
- $machine->fail("cat /proc/kcore");
- };
+ with subtest("Kcore is inaccessible as root"):
+ machine.fail("cat /proc/kcore")
+
# Test deferred mount
- subtest "mount", sub {
- $machine->fail("mountpoint -q /efi"); # was deferred
- $machine->execute("mkdir -p /efi");
- $machine->succeed("mount /dev/disk/by-label/EFISYS /efi");
- $machine->succeed("mountpoint -q /efi"); # now mounted
- };
+ with subtest("Deferred mounts work"):
+ machine.fail("mountpoint -q /efi") # was deferred
+ machine.execute("mkdir -p /efi")
+ machine.succeed("mount /dev/disk/by-label/EFISYS /efi")
+ machine.succeed("mountpoint -q /efi") # now mounted
+
# Test Nix dæmon usage
- subtest "nix-daemon", sub {
- $machine->fail("su -l nobody -s /bin/sh -c 'nix ping-store'");
- $machine->succeed("su -l alice -c 'nix ping-store'") =~ "OK";
- };
+ with subtest("nix-daemon cannot be used by all users"):
+ machine.fail("su -l nobody -s /bin/sh -c 'nix ping-store'")
+ machine.succeed("su -l alice -c 'nix ping-store'")
+
# Test kernel image protection
- subtest "kernelimage", sub {
- $machine->fail("systemctl hibernate");
- $machine->fail("systemctl kexec");
- };
+ with subtest("The kernel image is protected"):
+ machine.fail("systemctl hibernate")
+ machine.fail("systemctl kexec")
- # Test hardened memory allocator
- sub runMallocTestProg {
- my ($progName, $errorText) = @_;
- my $text = "fatal allocator error: " . $errorText;
- $machine->fail("${hardened-malloc-tests}/bin/" . $progName) =~ $text;
- };
- subtest "hardenedmalloc", sub {
- runMallocTestProg("double_free_large", "invalid free");
- runMallocTestProg("unaligned_free_small", "invalid unaligned free");
- runMallocTestProg("write_after_free_small", "detected write after free");
- };
+ # Test hardened memory allocator
+ def runMallocTestProg(prog_name, error_text):
+ text = "fatal allocator error: " + error_text
+ if not text in machine.fail(
+ "${hardened-malloc-tests}/bin/"
+ + prog_name
+ + " 2>&1"
+ ):
+ raise Exception("Hardened malloc does not work for {}".format(error_text))
+
+
+ with subtest("The hardened memory allocator works"):
+ runMallocTestProg("double_free_large", "invalid free")
+ runMallocTestProg("unaligned_free_small", "invalid unaligned free")
+ runMallocTestProg("write_after_free_small", "detected write after free")
'';
})
diff --git a/nixos/tests/hocker-fetchdocker/default.nix b/nixos/tests/hocker-fetchdocker/default.nix
index 4f30f01e40322..978dbf310b122 100644
--- a/nixos/tests/hocker-fetchdocker/default.nix
+++ b/nixos/tests/hocker-fetchdocker/default.nix
@@ -1,15 +1,16 @@
-import ../make-test.nix ({ pkgs, ...} : {
+import ../make-test-python.nix ({ pkgs, ...} : {
name = "test-hocker-fetchdocker";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ixmatus ];
+ broken = true; # tries to download from registry-1.docker.io - how did this ever work?
};
machine = import ./machine.nix;
testScript = ''
- startAll;
+ start_all()
- $machine->waitForUnit("sockets.target");
- $machine->waitUntilSucceeds("docker run registry-1.docker.io/v2/library/hello-world:latest");
+ machine.wait_for_unit("sockets.target")
+ machine.wait_until_succeeds("docker run registry-1.docker.io/v2/library/hello-world:latest")
'';
})
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 02b839fee3f56..f64e4101d45b8 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -74,7 +74,7 @@ let
throw "Non-EFI boot methods are only supported on i686 / x86_64"
else ''
def assemble_qemu_flags():
- flags = "-cpu host"
+ flags = "-cpu max"
${if system == "x86_64-linux"
then ''flags += " -m 768"''
else ''flags += " -m 512 -enable-kvm -machine virt,gic-version=host"''
@@ -317,6 +317,7 @@ let
texinfo
unionfs-fuse
xorg.lndir
+ (lvm2.override { udev = null; }) # for initrd (extra-utils)
# add curl so that rather than seeing the test attempt to download
# curl's tarball, we see what it's trying to download
@@ -799,7 +800,7 @@ in {
"btrfs subvol create /mnt/badpath/boot",
"btrfs subvol create /mnt/nixos",
"btrfs subvol set-default "
- + "$(btrfs subvol list /mnt | grep 'nixos' | awk '{print \$2}') /mnt",
+ + "$(btrfs subvol list /mnt | grep 'nixos' | awk '{print $2}') /mnt",
"umount /mnt",
"mount -o defaults LABEL=root /mnt",
"mkdir -p /mnt/badpath/boot", # Help ensure the detection mechanism
diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix
index be195b5139352..e2e10a9fda892 100644
--- a/nixos/tests/krb5/example-config.nix
+++ b/nixos/tests/krb5/example-config.nix
@@ -18,7 +18,10 @@ import ../make-test-python.nix ({ pkgs, ...} : {
realms = {
"ATHENA.MIT.EDU" = {
admin_server = "athena.mit.edu";
- kdc = "athena.mit.edu";
+ kdc = [
+ "athena01.mit.edu"
+ "athena02.mit.edu"
+ ];
};
};
domain_realm = {
@@ -65,7 +68,8 @@ import ../make-test-python.nix ({ pkgs, ...} : {
[realms]
ATHENA.MIT.EDU = {
admin_server = athena.mit.edu
- kdc = athena.mit.edu
+ kdc = athena01.mit.edu
+ kdc = athena02.mit.edu
}
[domain_realm]
diff --git a/nixos/tests/make-test.nix b/nixos/tests/make-test.nix
deleted file mode 100644
index cee5da93454a1..0000000000000
--- a/nixos/tests/make-test.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-f: {
- system ? builtins.currentSystem,
- pkgs ? import ../.. { inherit system; config = {}; },
- ...
-} @ args:
-
-with import ../lib/testing.nix { inherit system pkgs; };
-
-makeTest (if pkgs.lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f)
diff --git a/nixos/tests/mathics.nix b/nixos/tests/mathics.nix
deleted file mode 100644
index fcbeeb18a7271..0000000000000
--- a/nixos/tests/mathics.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-import ./make-test.nix ({ pkgs, ... }: {
- name = "mathics";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ benley ];
- };
-
- nodes = {
- machine = { ... }: {
- services.mathics.enable = true;
- services.mathics.port = 8888;
- };
- };
-
- testScript = ''
- startAll;
- $machine->waitForUnit("mathics.service");
- $machine->waitForOpenPort(8888);
- $machine->succeed("curl http://localhost:8888/");
- '';
-})
diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix
deleted file mode 100644
index 2e6dc0eda063c..0000000000000
--- a/nixos/tests/mesos.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : rec {
- name = "mesos";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ offline kamilchm cstrahan ];
- };
-
- nodes = {
- master = { ... }: {
- networking.firewall.enable = false;
- services.zookeeper.enable = true;
- services.mesos.master = {
- enable = true;
- zk = "zk://master:2181/mesos";
- };
- };
-
- slave = { ... }: {
- networking.firewall.enable = false;
- networking.nat.enable = true;
- virtualisation.docker.enable = true;
- services.mesos = {
- slave = {
- enable = true;
- master = "master:5050";
- dockerRegistry = registry;
- executorEnvironmentVariables = {
- PATH = "/run/current-system/sw/bin";
- };
- };
- };
- };
- };
-
- simpleDocker = pkgs.dockerTools.buildImage {
- name = "echo";
- tag = "latest";
- contents = [ pkgs.stdenv.shellPackage pkgs.coreutils ];
- config = {
- Env = [
- # When shell=true, mesos invokes "sh -c ''", so make sure "sh" is
- # on the PATH.
- "PATH=${pkgs.stdenv.shellPackage}/bin:${pkgs.coreutils}/bin"
- ];
- Entrypoint = [ "echo" ];
- };
- };
-
- registry = pkgs.runCommand "registry" { } ''
- mkdir -p $out
- cp ${simpleDocker} $out/echo:latest.tar
- '';
-
- testFramework = pkgs.pythonPackages.buildPythonPackage {
- name = "mesos-tests";
- propagatedBuildInputs = [ pkgs.mesos ];
- catchConflicts = false;
- src = ./mesos_test.py;
- phases = [ "installPhase" "fixupPhase" ];
- installPhase = ''
- install -Dvm 0755 $src $out/bin/mesos_test.py
-
- echo "done" > test.result
- tar czf $out/test.tar.gz test.result
- '';
- };
-
- testScript =
- ''
- startAll;
- $master->waitForUnit("zookeeper.service");
- $master->waitForUnit("mesos-master.service");
- $slave->waitForUnit("docker.service");
- $slave->waitForUnit("mesos-slave.service");
- $master->waitForOpenPort(2181);
- $master->waitForOpenPort(5050);
- $slave->waitForOpenPort(5051);
-
- # is slave registered?
- $master->waitUntilSucceeds("curl -s --fail http://master:5050/master/slaves".
- " | grep -q \"\\\"hostname\\\":\\\"slave\\\"\"");
-
- # try to run docker image
- $master->succeed("${pkgs.mesos}/bin/mesos-execute --master=master:5050".
- " --resources=\"cpus:0.1;mem:32\" --name=simple-docker".
- " --containerizer=mesos --docker_image=echo:latest".
- " --shell=true --command=\"echo done\" | grep -q TASK_FINISHED");
-
- # simple command with .tar.gz uri
- $master->succeed("${testFramework}/bin/mesos_test.py master ".
- "${testFramework}/test.tar.gz");
- '';
-})
diff --git a/nixos/tests/mesos_test.py b/nixos/tests/mesos_test.py
deleted file mode 100644
index be8bb32e49a7e..0000000000000
--- a/nixos/tests/mesos_test.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-import uuid
-import time
-import subprocess
-import os
-
-import sys
-
-from mesos.interface import Scheduler
-from mesos.native import MesosSchedulerDriver
-from mesos.interface import mesos_pb2
-
-def log(msg):
- process = subprocess.Popen("systemd-cat", stdin=subprocess.PIPE)
- (out,err) = process.communicate(msg)
-
-class NixosTestScheduler(Scheduler):
- def __init__(self):
- self.master_ip = sys.argv[1]
- self.download_uri = sys.argv[2]
-
- def resourceOffers(self, driver, offers):
- log("XXX got resource offer")
-
- offer = offers[0]
- task = self.new_task(offer)
- uri = task.command.uris.add()
- uri.value = self.download_uri
- task.command.value = "cat test.result"
- driver.launchTasks(offer.id, [task])
-
- def statusUpdate(self, driver, update):
- log("XXX status update")
- if update.state == mesos_pb2.TASK_FAILED:
- log("XXX test task failed with message: " + update.message)
- driver.stop()
- sys.exit(1)
- elif update.state == mesos_pb2.TASK_FINISHED:
- driver.stop()
- sys.exit(0)
-
- def new_task(self, offer):
- task = mesos_pb2.TaskInfo()
- id = uuid.uuid4()
- task.task_id.value = str(id)
- task.slave_id.value = offer.slave_id.value
- task.name = "task {}".format(str(id))
-
- cpus = task.resources.add()
- cpus.name = "cpus"
- cpus.type = mesos_pb2.Value.SCALAR
- cpus.scalar.value = 0.1
-
- mem = task.resources.add()
- mem.name = "mem"
- mem.type = mesos_pb2.Value.SCALAR
- mem.scalar.value = 32
-
- return task
-
-if __name__ == '__main__':
- log("XXX framework started")
-
- framework = mesos_pb2.FrameworkInfo()
- framework.user = "root"
- framework.name = "nixos-test-framework"
- driver = MesosSchedulerDriver(
- NixosTestScheduler(),
- framework,
- sys.argv[1] + ":5050"
- )
- driver.run()
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 17260ce640676..ae15055327343 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -20,12 +20,24 @@ import ./make-test-python.nix ({ pkgs, ...} : rec {
{ fsType = "tmpfs";
options = [ "mode=1777" "noauto" ];
};
+ # Tests https://discourse.nixos.org/t/how-to-make-a-derivations-executables-have-the-s-permission/8555
+ "/user-mount/point" = {
+ device = "/user-mount/source";
+ fsType = "none";
+ options = [ "bind" "rw" "user" "noauto" ];
+ };
+ "/user-mount/denied-point" = {
+ device = "/user-mount/denied-source";
+ fsType = "none";
+ options = [ "bind" "rw" "noauto" ];
+ };
};
systemd.automounts = singleton
{ wantedBy = [ "multi-user.target" ];
where = "/tmp2";
};
users.users.sybil = { isNormalUser = true; group = "wheel"; };
+ users.users.alice = { isNormalUser = true; };
security.sudo = { enable = true; wheelNeedsPassword = false; };
boot.kernel.sysctl."vm.swappiness" = 1;
boot.kernelParams = [ "vsyscall=emulate" ];
@@ -112,6 +124,26 @@ import ./make-test-python.nix ({ pkgs, ...} : rec {
machine.succeed("touch /tmp2/x")
machine.succeed("grep '/tmp2 tmpfs' /proc/mounts")
+ with subtest(
+ "Whether mounting by a user is possible with the `user` option in fstab (#95444)"
+ ):
+ machine.succeed("mkdir -p /user-mount/source")
+ machine.succeed("touch /user-mount/source/file")
+ machine.succeed("chmod -R a+Xr /user-mount/source")
+ machine.succeed("mkdir /user-mount/point")
+ machine.succeed("chown alice:users /user-mount/point")
+ machine.succeed("su - alice -c 'mount /user-mount/point'")
+ machine.succeed("su - alice -c 'ls /user-mount/point/file'")
+ with subtest(
+ "Whether mounting by a user is denied without the `user` option in fstab"
+ ):
+ machine.succeed("mkdir -p /user-mount/denied-source")
+ machine.succeed("touch /user-mount/denied-source/file")
+ machine.succeed("chmod -R a+Xr /user-mount/denied-source")
+ machine.succeed("mkdir /user-mount/denied-point")
+ machine.succeed("chown alice:users /user-mount/denied-point")
+ machine.fail("su - alice -c 'mount /user-mount/denied-point'")
+
with subtest("shell-vars"):
machine.succeed('[ -n "$NIX_PATH" ]')
diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix
index 50e1c76e9fd0e..5437a2860437e 100644
--- a/nixos/tests/mysql/mysql.nix
+++ b/nixos/tests/mysql/mysql.nix
@@ -172,32 +172,32 @@ import ./../make-test-python.nix ({ pkgs, ...} : {
"echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 42"
)
- # Check if TokuDB plugin works
+ # Check if RocksDB plugin works
mariadb.succeed(
- "echo 'use testdb; create table tokudb (test_id INT, PRIMARY KEY (test_id)) ENGINE = TokuDB;' | sudo -u testuser mysql -u testuser"
+ "echo 'use testdb; create table rocksdb (test_id INT, PRIMARY KEY (test_id)) ENGINE = RocksDB;' | sudo -u testuser mysql -u testuser"
)
mariadb.succeed(
- "echo 'use testdb; insert into tokudb values (25);' | sudo -u testuser mysql -u testuser"
+ "echo 'use testdb; insert into rocksdb values (28);' | sudo -u testuser mysql -u testuser"
)
mariadb.succeed(
- "echo 'use testdb; select test_id from tokudb;' | sudo -u testuser mysql -u testuser -N | grep 25"
+ "echo 'use testdb; select test_id from rocksdb;' | sudo -u testuser mysql -u testuser -N | grep 28"
)
mariadb.succeed(
- "echo 'use testdb; drop table tokudb;' | sudo -u testuser mysql -u testuser"
+ "echo 'use testdb; drop table rocksdb;' | sudo -u testuser mysql -u testuser"
)
-
- # Check if RocksDB plugin works
+ '' + pkgs.stdenv.lib.optionalString pkgs.stdenv.isx86_64 ''
+ # Check if TokuDB plugin works
mariadb.succeed(
- "echo 'use testdb; create table rocksdb (test_id INT, PRIMARY KEY (test_id)) ENGINE = RocksDB;' | sudo -u testuser mysql -u testuser"
+ "echo 'use testdb; create table tokudb (test_id INT, PRIMARY KEY (test_id)) ENGINE = TokuDB;' | sudo -u testuser mysql -u testuser"
)
mariadb.succeed(
- "echo 'use testdb; insert into rocksdb values (28);' | sudo -u testuser mysql -u testuser"
+ "echo 'use testdb; insert into tokudb values (25);' | sudo -u testuser mysql -u testuser"
)
mariadb.succeed(
- "echo 'use testdb; select test_id from rocksdb;' | sudo -u testuser mysql -u testuser -N | grep 28"
+ "echo 'use testdb; select test_id from tokudb;' | sudo -u testuser mysql -u testuser -N | grep 25"
)
mariadb.succeed(
- "echo 'use testdb; drop table rocksdb;' | sudo -u testuser mysql -u testuser"
+ "echo 'use testdb; drop table tokudb;' | sudo -u testuser mysql -u testuser"
)
'';
})
diff --git a/nixos/tests/openstack-image.nix b/nixos/tests/openstack-image.nix
index 97c9137fe1d67..0b57dfb8e7eb5 100644
--- a/nixos/tests/openstack-image.nix
+++ b/nixos/tests/openstack-image.nix
@@ -3,30 +3,30 @@
pkgs ? import ../.. { inherit system config; }
}:
-with import ../lib/testing.nix { inherit system pkgs; };
+with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
with import common/ec2.nix { inherit makeTest pkgs; };
let
- image =
- (import ../lib/eval-config.nix {
- inherit system;
- modules = [
- ../maintainers/scripts/openstack/openstack-image.nix
- ../modules/testing/test-instrumentation.nix
- ../modules/profiles/qemu-guest.nix
- {
- # Needed by nixos-rebuild due to lack of network access.
- system.extraDependencies = with pkgs; [
- stdenv
- ];
- }
- ];
- }).config.system.build.openstackImage + "/nixos.qcow2";
+ image = (import ../lib/eval-config.nix {
+ inherit system;
+ modules = [
+ ../maintainers/scripts/openstack/openstack-image.nix
+ ../modules/testing/test-instrumentation.nix
+ ../modules/profiles/qemu-guest.nix
+ {
+ # Needed by nixos-rebuild due to lack of network access.
+ system.extraDependencies = with pkgs; [
+ stdenv
+ ];
+ }
+ ];
+ }).config.system.build.openstackImage + "/nixos.qcow2";
sshKeys = import ./ssh-keys.nix pkgs;
snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text;
+ snakeOilPrivateKeyFile = pkgs.writeText "private-key" snakeOilPrivateKey;
snakeOilPublicKey = sshKeys.snakeOilPublicKey;
in {
@@ -39,32 +39,36 @@ in {
SSH_HOST_ED25519_KEY:${replaceStrings ["\n"] ["|"] snakeOilPrivateKey}
'';
script = ''
- $machine->start;
- $machine->waitForFile("/etc/ec2-metadata/user-data");
- $machine->waitForUnit("sshd.service");
+ machine.start()
+ machine.wait_for_file("/etc/ec2-metadata/user-data")
+ machine.wait_for_unit("sshd.service")
- $machine->succeed("grep unknown /etc/ec2-metadata/ami-manifest-path");
+ machine.succeed("grep unknown /etc/ec2-metadata/ami-manifest-path")
# We have no keys configured on the client side yet, so this should fail
- $machine->fail("ssh -o BatchMode=yes localhost exit");
+ machine.fail("ssh -o BatchMode=yes localhost exit")
# Let's install our client private key
- $machine->succeed("mkdir -p ~/.ssh");
+ machine.succeed("mkdir -p ~/.ssh")
- $machine->succeed("echo '${snakeOilPrivateKey}' > ~/.ssh/id_ed25519");
- $machine->succeed("chmod 600 ~/.ssh/id_ed25519");
+ machine.copy_from_host_via_shell(
+ "${snakeOilPrivateKeyFile}", "~/.ssh/id_ed25519"
+ )
+ machine.succeed("chmod 600 ~/.ssh/id_ed25519")
# We haven't configured the host key yet, so this should still fail
- $machine->fail("ssh -o BatchMode=yes localhost exit");
+ machine.fail("ssh -o BatchMode=yes localhost exit")
# Add the host key; ssh should finally succeed
- $machine->succeed("echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts");
- $machine->succeed("ssh -o BatchMode=yes localhost exit");
+ machine.succeed(
+ "echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts"
+ )
+ machine.succeed("ssh -o BatchMode=yes localhost exit")
# Just to make sure resizing is idempotent.
- $machine->shutdown;
- $machine->start;
- $machine->waitForFile("/etc/ec2-metadata/user-data");
+ machine.shutdown()
+ machine.start()
+ machine.wait_for_file("/etc/ec2-metadata/user-data")
'';
};
@@ -86,9 +90,9 @@ in {
}
'';
script = ''
- $machine->start;
- $machine->waitForFile("/etc/testFile");
- $machine->succeed("cat /etc/testFile | grep -q 'whoa'");
+ machine.start()
+ machine.wait_for_file("/etc/testFile")
+ assert "whoa" in machine.succeed("cat /etc/testFile")
'';
};
}
diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix
index 6a38f5ca531c5..be0235a417536 100644
--- a/nixos/tests/os-prober.nix
+++ b/nixos/tests/os-prober.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({pkgs, lib, ...}:
+import ./make-test-python.nix ({pkgs, lib, ...}:
let
# A filesystem image with a (presumably) bootable debian
debianImage = pkgs.vmTools.diskImageFuns.debian9i386 {
@@ -34,9 +34,6 @@ let
'';
};
- # options to add the disk to the test vm
- QEMU_OPTS = "-drive index=2,file=${debianImage}/disk-image.qcow2,read-only,if=virtio";
-
# a part of the configuration of the test vm
simpleConfig = {
boot.loader.grub = {
@@ -71,7 +68,7 @@ in {
machine = { config, pkgs, ... }: (simpleConfig // {
imports = [ ../modules/profiles/installation-device.nix
../modules/profiles/base.nix ];
- virtualisation.memorySize = 1024;
+ virtualisation.memorySize = 1300;
# The test cannot access the network, so any packages
# nixos-rebuild needs must be included in the VM.
system.extraDependencies = with pkgs;
@@ -99,22 +96,28 @@ in {
testScript = ''
# hack to add the secondary disk
- $machine->{startCommand} = "QEMU_OPTS=\"\$QEMU_OPTS \"${lib.escapeShellArg QEMU_OPTS} ".$machine->{startCommand};
+ os.environ[
+ "QEMU_OPTS"
+ ] = "-drive index=2,file=${debianImage}/disk-image.qcow2,read-only,if=virtio"
- $machine->start;
- $machine->succeed("udevadm settle");
- $machine->waitForUnit("multi-user.target");
+ machine.start()
+ machine.succeed("udevadm settle")
+ machine.wait_for_unit("multi-user.target")
+ print(machine.succeed("lsblk"))
# check that os-prober works standalone
- $machine->succeed("${pkgs.os-prober}/bin/os-prober | grep /dev/vdb1");
+ machine.succeed(
+ "${pkgs.os-prober}/bin/os-prober | grep /dev/vdb1"
+ )
# rebuild and test that debian is available in the grub menu
- $machine->succeed("nixos-generate-config");
- $machine->copyFileFromHost(
+ machine.succeed("nixos-generate-config")
+ machine.copy_from_host(
"${configFile}",
- "/etc/nixos/configuration.nix");
- $machine->succeed("nixos-rebuild boot >&2");
+ "/etc/nixos/configuration.nix",
+ )
+ machine.succeed("nixos-rebuild boot >&2")
- $machine->succeed("egrep 'menuentry.*debian' /boot/grub/grub.cfg");
+ machine.succeed("egrep 'menuentry.*debian' /boot/grub/grub.cfg")
'';
})
diff --git a/nixos/tests/pinnwand.nix b/nixos/tests/pinnwand.nix
new file mode 100644
index 0000000000000..2204e74b2c286
--- /dev/null
+++ b/nixos/tests/pinnwand.nix
@@ -0,0 +1,86 @@
+import ./make-test-python.nix ({ pkgs, ...}:
+let
+ pythonEnv = pkgs.python3.withPackages (py: with py; [ appdirs toml ]);
+
+ port = 8000;
+ baseUrl = "http://server:${toString port}";
+
+ configureSteck = pkgs.writeScript "configure.py" ''
+ #!${pythonEnv.interpreter}
+ import appdirs
+ import toml
+ import os
+
+ CONFIG = {
+ "base": "${baseUrl}/",
+ "confirm": False,
+ "magic": True,
+ "ignore": True
+ }
+
+ os.makedirs(appdirs.user_config_dir('steck'))
+ with open(os.path.join(appdirs.user_config_dir('steck'), 'steck.toml'), "w") as fd:
+ toml.dump(CONFIG, fd)
+ '';
+in
+{
+ name = "pinnwand";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers =[ hexa ];
+ };
+
+ nodes = {
+ server = { config, ... }:
+ {
+ networking.firewall.allowedTCPPorts = [
+ port
+ ];
+
+ services.pinnwand = {
+ enable = true;
+ port = port;
+ };
+ };
+
+ client = { pkgs, ... }:
+ {
+ environment.systemPackages = [ pkgs.steck ];
+ };
+ };
+
+ testScript = ''
+ start_all()
+
+ server.wait_for_unit("pinnwand.service")
+ client.wait_for_unit("network.target")
+
+ # create steck.toml config file
+ client.succeed("${configureSteck}")
+
+ # wait until the server running pinnwand is reachable
+ client.wait_until_succeeds("ping -c1 server")
+
+ # make sure pinnwand is listening
+ server.wait_until_succeeds("ss -lnp | grep ${toString port}")
+
+ # send the contents of /etc/machine-id
+ response = client.succeed("steck paste /etc/machine-id")
+
+ # parse the steck response
+ raw_url = None
+ removal_link = None
+ for line in response.split("\n"):
+ if line.startswith("View link:"):
+ raw_url = f"${baseUrl}/raw/{line.split('/')[-1]}"
+ if line.startswith("Removal link:"):
+ removal_link = line.split(":", 1)[1]
+
+ # check whether paste matches what we sent
+ client.succeed(f"curl {raw_url} > /tmp/machine-id")
+ client.succeed("diff /tmp/machine-id /etc/machine-id")
+
+ # remove paste and check that it's not available any more
+ client.succeed(f"curl {removal_link}")
+ client.fail(f"curl --fail {raw_url}")
+ '';
+})
diff --git a/nixos/tests/postgresql-wal-receiver.nix b/nixos/tests/postgresql-wal-receiver.nix
index c50746aa838e4..432b46234f9c1 100644
--- a/nixos/tests/postgresql-wal-receiver.nix
+++ b/nixos/tests/postgresql-wal-receiver.nix
@@ -1,103 +1,111 @@
-{ system ? builtins.currentSystem
-, config ? { }
-, pkgs ? import ../.. { inherit system config; } }:
-
-with import ../lib/testing.nix { inherit system pkgs; };
-with pkgs.lib;
-
let
- makePostgresqlWalReceiverTest = subTestName: postgresqlPackage: let
+ # Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`.
+ makePostgresqlWalReceiverTest = postgresqlPackage:
+ {
+ name = postgresqlPackage;
+ value =
+ import ./make-test-python.nix ({ pkgs, lib, ... }: let
- postgresqlDataDir = "/var/db/postgresql/test";
- replicationUser = "wal_receiver_user";
- replicationSlot = "wal_receiver_slot";
- replicationConn = "postgresql://${replicationUser}@localhost";
- baseBackupDir = "/tmp/pg_basebackup";
- walBackupDir = "/tmp/pg_wal";
- atLeast12 = versionAtLeast postgresqlPackage.version "12.0";
- restoreCommand = ''
- restore_command = 'cp ${walBackupDir}/%f %p'
- '';
+ pkg = pkgs."${postgresqlPackage}";
+ postgresqlDataDir = "/var/lib/postgresql/${pkg.psqlSchema}";
+ replicationUser = "wal_receiver_user";
+ replicationSlot = "wal_receiver_slot";
+ replicationConn = "postgresql://${replicationUser}@localhost";
+ baseBackupDir = "/tmp/pg_basebackup";
+ walBackupDir = "/tmp/pg_wal";
+ atLeast12 = lib.versionAtLeast pkg.version "12.0";
- recoveryFile = if atLeast12
- then pkgs.writeTextDir "recovery.signal" ""
- else pkgs.writeTextDir "recovery.conf" "${restoreCommand}";
+ recoveryFile = if atLeast12
+ then pkgs.writeTextDir "recovery.signal" ""
+ else pkgs.writeTextDir "recovery.conf" "restore_command = 'cp ${walBackupDir}/%f %p'";
- in makeTest {
- name = "postgresql-wal-receiver-${subTestName}";
- meta.maintainers = with maintainers; [ pacien ];
+ in {
+ name = "postgresql-wal-receiver-${postgresqlPackage}";
+ meta.maintainers = with lib.maintainers; [ pacien ];
- machine = { ... }: {
- # Needed because this test uses a non-default 'services.postgresql.dataDir'.
- systemd.tmpfiles.rules = [
- "d /var/db/postgresql 0700 postgres postgres"
- ];
- services.postgresql = {
- package = postgresqlPackage;
- enable = true;
- dataDir = postgresqlDataDir;
- extraConfig = ''
- wal_level = archive # alias for replica on pg >= 9.6
- max_wal_senders = 10
- max_replication_slots = 10
- '' + optionalString atLeast12 ''
- ${restoreCommand}
- recovery_end_command = 'touch recovery.done'
- '';
- authentication = ''
- host replication ${replicationUser} all trust
- '';
- initialScript = pkgs.writeText "init.sql" ''
- create user ${replicationUser} replication;
- select * from pg_create_physical_replication_slot('${replicationSlot}');
- '';
- };
+ machine = { ... }: {
+ services.postgresql = {
+ package = pkg;
+ enable = true;
+ settings = lib.mkMerge [
+ {
+ wal_level = "archive"; # alias for replica on pg >= 9.6
+ max_wal_senders = 10;
+ max_replication_slots = 10;
+ }
+ (lib.mkIf atLeast12 {
+ restore_command = "cp ${walBackupDir}/%f %p";
+ recovery_end_command = "touch recovery.done";
+ })
+ ];
+ authentication = ''
+ host replication ${replicationUser} all trust
+ '';
+ initialScript = pkgs.writeText "init.sql" ''
+ create user ${replicationUser} replication;
+ select * from pg_create_physical_replication_slot('${replicationSlot}');
+ '';
+ };
- services.postgresqlWalReceiver.receivers.main = {
- inherit postgresqlPackage;
- connection = replicationConn;
- slot = replicationSlot;
- directory = walBackupDir;
- };
- # This is only to speedup test, it isn't time racing. Service is set to autorestart always,
- # default 60sec is fine for real system, but is too much for a test
- systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = mkForce 5;
- };
+ services.postgresqlWalReceiver.receivers.main = {
+ postgresqlPackage = pkg;
+ connection = replicationConn;
+ slot = replicationSlot;
+ directory = walBackupDir;
+ };
+ # This is only to speedup test, it isn't time racing. Service is set to autorestart always,
+ # default 60sec is fine for real system, but is too much for a test
+ systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = lib.mkForce 5;
+ };
- testScript = ''
- # make an initial base backup
- $machine->waitForUnit('postgresql');
- $machine->waitForUnit('postgresql-wal-receiver-main');
- # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other
- # required only for 9.4
- $machine->sleep(5);
- $machine->succeed('${postgresqlPackage}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}');
+ testScript = ''
+ # make an initial base backup
+ machine.wait_for_unit("postgresql")
+ machine.wait_for_unit("postgresql-wal-receiver-main")
+ # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other
+ # required only for 9.4
+ machine.sleep(5)
+ machine.succeed(
+ "${pkg}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}"
+ )
- # create a dummy table with 100 records
- $machine->succeed('sudo -u postgres psql --command="create table dummy as select * from generate_series(1, 100) as val;"');
+ # create a dummy table with 100 records
+ machine.succeed(
+ "sudo -u postgres psql --command='create table dummy as select * from generate_series(1, 100) as val;'"
+ )
- # stop postgres and destroy data
- $machine->systemctl('stop postgresql');
- $machine->systemctl('stop postgresql-wal-receiver-main');
- $machine->succeed('rm -r ${postgresqlDataDir}/{base,global,pg_*}');
+ # stop postgres and destroy data
+ machine.systemctl("stop postgresql")
+ machine.systemctl("stop postgresql-wal-receiver-main")
+ machine.succeed("rm -r ${postgresqlDataDir}/{base,global,pg_*}")
- # restore the base backup
- $machine->succeed('cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}');
+ # restore the base backup
+ machine.succeed(
+ "cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}"
+ )
- # prepare WAL and recovery
- $machine->succeed('chmod a+rX -R ${walBackupDir}');
- $machine->execute('for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done'); # make use of partial segments too
- $machine->succeed('cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*');
+ # prepare WAL and recovery
+ machine.succeed("chmod a+rX -R ${walBackupDir}")
+ machine.execute(
+ "for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done"
+ ) # make use of partial segments too
+ machine.succeed(
+ "cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*"
+ )
- # replay WAL
- $machine->systemctl('start postgresql');
- $machine->waitForFile('${postgresqlDataDir}/recovery.done');
- $machine->systemctl('restart postgresql');
- $machine->waitForUnit('postgresql');
+ # replay WAL
+ machine.systemctl("start postgresql")
+ machine.wait_for_file("${postgresqlDataDir}/recovery.done")
+ machine.systemctl("restart postgresql")
+ machine.wait_for_unit("postgresql")
- # check that our records have been restored
- $machine->succeed('test $(sudo -u postgres psql --pset="pager=off" --tuples-only --command="select count(distinct val) from dummy;") -eq 100');
- '';
- };
+ # check that our records have been restored
+ machine.succeed(
+ "test $(sudo -u postgres psql --pset='pager=off' --tuples-only --command='select count(distinct val) from dummy;') -eq 100"
+ )
+ '';
+ });
+ };
-in mapAttrs makePostgresqlWalReceiverTest (import ../../pkgs/servers/sql/postgresql pkgs)
+# Maps the generic function over all attributes of PostgreSQL packages
+in builtins.listToAttrs (map makePostgresqlWalReceiverTest (builtins.attrNames (import ../../pkgs/servers/sql/postgresql { })))
diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix
index bce489168f9ff..af2aa66a55266 100644
--- a/nixos/tests/prometheus.nix
+++ b/nixos/tests/prometheus.nix
@@ -158,7 +158,10 @@ in import ./make-test-python.nix {
s3 = { pkgs, ... } : {
# Minio requires at least 1GiB of free disk space to run.
- virtualisation.diskSize = 2 * 1024;
+ virtualisation = {
+ diskSize = 2 * 1024;
+ memorySize = 1024;
+ };
networking.firewall.allowedTCPPorts = [ minioPort ];
services.minio = {
@@ -235,7 +238,7 @@ in import ./make-test-python.nix {
# Test if the Thanos bucket command is able to retrieve blocks from the S3 bucket
# and check if the blocks have the correct labels:
store.succeed(
- "thanos bucket ls "
+ "thanos tools bucket ls "
+ "--objstore.config-file=${nodes.store.config.services.thanos.store.objstore.config-file} "
+ "--output=json | "
+ "jq .thanos.labels.some_label | "
diff --git a/nixos/tests/robustirc-bridge.nix b/nixos/tests/robustirc-bridge.nix
new file mode 100644
index 0000000000000..a5c22d73a34f3
--- /dev/null
+++ b/nixos/tests/robustirc-bridge.nix
@@ -0,0 +1,29 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+{
+ name = "robustirc-bridge";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ hax404 ];
+ };
+
+ nodes =
+ { bridge =
+ { services.robustirc-bridge = {
+ enable = true;
+ extraFlags = [
+ "-listen localhost:6667"
+ "-network example.com"
+ ];
+ };
+ };
+ };
+
+ testScript =
+ ''
+ start_all()
+
+ bridge.wait_for_unit("robustirc-bridge.service")
+ bridge.wait_for_open_port(1080)
+ bridge.wait_for_open_port(6667)
+ '';
+})
diff --git a/nixos/tests/shadowsocks.nix b/nixos/tests/shadowsocks.nix
new file mode 100644
index 0000000000000..6cb288f761186
--- /dev/null
+++ b/nixos/tests/shadowsocks.nix
@@ -0,0 +1,80 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
+ name = "shadowsocks";
+ meta = {
+ maintainers = with lib.maintainers; [ hmenke ];
+ };
+
+ nodes = {
+ server = {
+ boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
+ networking.useDHCP = false;
+ networking.interfaces.eth1.ipv4.addresses = [
+ { address = "192.168.0.1"; prefixLength = 24; }
+ ];
+ networking.firewall.rejectPackets = true;
+ networking.firewall.allowedTCPPorts = [ 8488 ];
+ networking.firewall.allowedUDPPorts = [ 8488 ];
+ services.shadowsocks = {
+ enable = true;
+ encryptionMethod = "chacha20-ietf-poly1305";
+ password = "pa$$w0rd";
+ localAddress = [ "0.0.0.0" ];
+ port = 8488;
+ fastOpen = false;
+ mode = "tcp_and_udp";
+ plugin = "${pkgs.shadowsocks-v2ray-plugin}/bin/v2ray-plugin";
+ pluginOpts = "server;host=nixos.org";
+ };
+ services.nginx = {
+ enable = true;
+ virtualHosts.server = {
+ locations."/".root = pkgs.writeTextDir "index.html" "It works!";
+ };
+ };
+ };
+
+ client = {
+ networking.useDHCP = false;
+ networking.interfaces.eth1.ipv4.addresses = [
+ { address = "192.168.0.2"; prefixLength = 24; }
+ ];
+ systemd.services.shadowsocks-client = {
+ description = "connect to shadowsocks";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ path = with pkgs; [
+ shadowsocks-libev
+ shadowsocks-v2ray-plugin
+ ];
+ script = ''
+ exec ss-local \
+ -s 192.168.0.1 \
+ -p 8488 \
+ -l 1080 \
+ -k 'pa$$w0rd' \
+ -m chacha20-ietf-poly1305 \
+ -a nobody \
+ --plugin "${pkgs.shadowsocks-v2ray-plugin}/bin/v2ray-plugin" \
+ --plugin-opts "host=nixos.org"
+ '';
+ };
+ };
+ };
+
+ testScript = ''
+ start_all()
+
+ server.wait_for_unit("shadowsocks-libev.service")
+ client.wait_for_unit("shadowsocks-client.service")
+
+ client.fail(
+ "${pkgs.curl}/bin/curl 192.168.0.1:80"
+ )
+
+ msg = client.succeed(
+ "${pkgs.curl}/bin/curl --socks5 localhost:1080 192.168.0.1:80"
+ )
+ assert msg == "It works!", "Could not connect through shadowsocks"
+ '';
+ }
+)
diff --git a/nixos/tests/shattered-pixel-dungeon.nix b/nixos/tests/shattered-pixel-dungeon.nix
new file mode 100644
index 0000000000000..cf6ee8db80b22
--- /dev/null
+++ b/nixos/tests/shattered-pixel-dungeon.nix
@@ -0,0 +1,29 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+ name = "shattered-pixel-dungeon";
+ meta = with pkgs.lib.maintainers; {
+ maintainers = [ fgaz ];
+ };
+
+ machine = { config, pkgs, ... }: {
+ imports = [
+ ./common/x11.nix
+ ];
+
+ services.xserver.enable = true;
+ environment.systemPackages = [ pkgs.shattered-pixel-dungeon ];
+ };
+
+ enableOCR = true;
+
+ testScript =
+ ''
+ machine.wait_for_x()
+ machine.execute("shattered-pixel-dungeon &")
+ machine.wait_for_window(r"Shattered Pixel Dungeon")
+ machine.sleep(5)
+ if "Enter" not in machine.get_screen_text():
+ raise Exception("Program did not start successfully")
+ machine.screenshot("screen")
+ '';
+})
+
diff --git a/nixos/tests/sssd.nix b/nixos/tests/sssd.nix
new file mode 100644
index 0000000000000..4c6ca86c74c8f
--- /dev/null
+++ b/nixos/tests/sssd.nix
@@ -0,0 +1,17 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+{
+ name = "sssd";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ bbigras ];
+ };
+ machine = { pkgs, ... }: {
+ services.sssd.enable = true;
+ };
+
+ testScript = ''
+ start_all()
+ machine.wait_for_unit("multi-user.target")
+ machine.wait_for_unit("sssd.service")
+ '';
+})
diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
index 99cd341eec15e..99395fe3023f3 100644
--- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
+++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
@@ -31,7 +31,7 @@ import ./make-test-python.nix ({pkgs, ...}: {
firewall.enable = false;
interfaces.eth1.ipv4.addresses = lib.mkForce []; # no need for legacy IP
interfaces.eth1.ipv6.addresses = lib.mkForce [
- { address = "2001:DB8::"; prefixLength = 64; }
+ { address = "2001:DB8::1"; prefixLength = 64; }
];
};
@@ -260,7 +260,7 @@ import ./make-test-python.nix ({pkgs, ...}: {
client.wait_until_succeeds("ping -6 -c 1 FD42::1")
# the global IP of the ISP router should still not be a reachable
- router.fail("ping -6 -c 1 2001:DB8::")
+ router.fail("ping -6 -c 1 2001:DB8::1")
# Once we have internal connectivity boot up the ISP
isp.start()
@@ -273,11 +273,11 @@ import ./make-test-python.nix ({pkgs, ...}: {
# wait until the uplink interface has a good status
router.wait_for_unit("network-online.target")
- router.wait_until_succeeds("ping -6 -c1 2001:DB8::")
+ router.wait_until_succeeds("ping -6 -c1 2001:DB8::1")
# shortly after that the client should have received it's global IPv6
# address and thus be able to ping the ISP
- client.wait_until_succeeds("ping -6 -c1 2001:DB8::")
+ client.wait_until_succeeds("ping -6 -c1 2001:DB8::1")
# verify that we got a globally scoped address in eth1 from the
# documentation prefix
diff --git a/nixos/tests/systemd-networkd.nix b/nixos/tests/systemd-networkd.nix
index 319e5e94eceb1..d5fb2431dbad5 100644
--- a/nixos/tests/systemd-networkd.nix
+++ b/nixos/tests/systemd-networkd.nix
@@ -7,18 +7,19 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: {
virtualisation.vlans = [ 1 ];
environment.systemPackages = with pkgs; [ wireguard-tools ];
boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];
- systemd.tmpfiles.rules = [
- "f /run/wg_priv 0640 root systemd-network - ${privk}"
- ];
systemd.network = {
enable = true;
netdevs = {
"90-wg0" = {
netdevConfig = { Kind = "wireguard"; Name = "wg0"; };
wireguardConfig = {
- PrivateKeyFile = "/run/wg_priv";
+ # NOTE: we're storing the wireguard private key in the
+ # store for this test. Do not do this in the real
+ # world. Keep in mind the nix store is
+ # world-readable.
+ PrivateKeyFile = pkgs.writeText "wg0-priv" privk;
ListenPort = 51820;
- FwMark = 42;
+ FirewallMark = 42;
};
wireguardPeers = [ {wireguardPeerConfig={
Endpoint = "192.168.1.${peerId}:51820";
diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
index a653932fb37c7..dfa16eecfad21 100644
--- a/nixos/tests/systemd.nix
+++ b/nixos/tests/systemd.nix
@@ -4,7 +4,10 @@ import ./make-test-python.nix ({ pkgs, ... }: {
machine = { lib, ... }: {
imports = [ common/user-account.nix common/x11.nix ];
- virtualisation.emptyDiskImages = [ 512 ];
+ virtualisation.emptyDiskImages = [ 512 512 ];
+ virtualisation.memorySize = 1024;
+
+ environment.systemPackages = [ pkgs.cryptsetup ];
fileSystems = lib.mkVMOverride {
"/test-x-initrd-mount" = {
@@ -141,8 +144,29 @@ import ./make-test-python.nix ({ pkgs, ... }: {
)
output = machine.succeed("systemctl show | grep Watchdog")
- assert "RuntimeWatchdogUSec=30s" in output
- assert "RebootWatchdogUSec=10m" in output
- assert "KExecWatchdogUSec=5m" in output
+ # assert "RuntimeWatchdogUSec=30s" in output
+ # for some reason RuntimeWatchdogUSec, doesn't seem to be updated in here.
+ assert "RebootWatchdogUSec=10min" in output
+ assert "KExecWatchdogUSec=5min" in output
+
+ # Test systemd cryptsetup support
+ with subtest("systemd successfully reads /etc/crypttab and unlocks volumes"):
+ # create a luks volume and put a filesystem on it
+ machine.succeed(
+ "echo -n supersecret | cryptsetup luksFormat -q /dev/vdc -",
+ "echo -n supersecret | cryptsetup luksOpen --key-file - /dev/vdc foo",
+ "mkfs.ext3 /dev/mapper/foo",
+ )
+
+ # create a keyfile and /etc/crypttab
+ machine.succeed("echo -n supersecret > /var/lib/luks-keyfile")
+ machine.succeed("chmod 600 /var/lib/luks-keyfile")
+ machine.succeed("echo 'luks1 /dev/vdc /var/lib/luks-keyfile luks' > /etc/crypttab")
+
+ # after a reboot, systemd should unlock the volume and we should be able to mount it
+ machine.shutdown()
+ machine.succeed("systemctl status systemd-cryptsetup@luks1.service")
+ machine.succeed("mkdir -p /tmp/luks1")
+ machine.succeed("mount /dev/mapper/luks1 /tmp/luks1")
'';
})
diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix
index f4f2186be1fff..37c0352dcfb8f 100644
--- a/nixos/tests/transmission.nix
+++ b/nixos/tests/transmission.nix
@@ -9,6 +9,8 @@ import ./make-test-python.nix ({ pkgs, ...} : {
networking.firewall.allowedTCPPorts = [ 9091 ];
+ security.apparmor.enable = true;
+
services.transmission.enable = true;
};
diff --git a/nixos/tests/trezord.nix b/nixos/tests/trezord.nix
index 67646496ff97c..b7b3dd31942bb 100644
--- a/nixos/tests/trezord.nix
+++ b/nixos/tests/trezord.nix
@@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "trezord";
meta = with pkgs.stdenv.lib; {
- maintainers = with maintainers; [ mmahut maintainers."1000101" ];
+ maintainers = with maintainers; [ mmahut _1000101 ];
};
nodes = {
machine = { ... }: {
diff --git a/nixos/tests/trickster.nix b/nixos/tests/trickster.nix
index c65160f81e38a..713ac8f0b2fae 100644
--- a/nixos/tests/trickster.nix
+++ b/nixos/tests/trickster.nix
@@ -1,7 +1,7 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "trickster";
meta = with pkgs.stdenv.lib; {
- maintainers = with maintainers; [ maintainers."1000101" ];
+ maintainers = with maintainers; [ _1000101 ];
};
nodes = {
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index aec8da6a2af3c..0d9eafa4a20f3 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -15,7 +15,7 @@
assert use64bitGuest -> useKvmNestedVirt;
-with import ../lib/testing.nix { inherit system pkgs; };
+with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
let
@@ -91,13 +91,15 @@ let
(isYes "SERIAL_8250_CONSOLE")
(isYes "SERIAL_8250")
];
+
+ networking.usePredictableInterfaceNames = false;
};
mkLog = logfile: tag: let
rotated = map (i: "${logfile}.${toString i}") (range 1 9);
all = concatMapStringsSep " " (f: "\"${f}\"") ([logfile] ++ rotated);
logcmd = "tail -F ${all} 2> /dev/null | logger -t \"${tag}\"";
- in optionalString debug "$machine->execute(ru '${logcmd} & disown');";
+ in if debug then "machine.execute(ru('${logcmd} & disown'))" else "pass";
testVM = vmName: vmScript: let
cfg = (import ../lib/eval-config.nix {
@@ -198,103 +200,111 @@ let
systemd.services."vboxtestlog-${name}@" = {
description = "VirtualBox Test Machine Log For ${name}";
serviceConfig.StandardInput = "socket";
- serviceConfig.StandardOutput = "syslog";
serviceConfig.SyslogIdentifier = "GUEST-${name}";
serviceConfig.ExecStart = "${pkgs.coreutils}/bin/cat";
};
};
testSubs = ''
- my ${"$" + name}_sharepath = '${sharePath}';
-
- sub checkRunning_${name} {
- my $cmd = 'VBoxManage list runningvms | grep -q "^\"${name}\""';
- my ($status, $out) = $machine->execute(ru $cmd);
- return $status == 0;
- }
-
- sub cleanup_${name} {
- $machine->execute(ru "VBoxManage controlvm ${name} poweroff")
- if checkRunning_${name};
- $machine->succeed("rm -rf ${sharePath}");
- $machine->succeed("mkdir -p ${sharePath}");
- $machine->succeed("chown alice.users ${sharePath}");
- }
-
- sub createVM_${name} {
- vbm("createvm --name ${name} ${createFlags}");
- vbm("modifyvm ${name} ${vmFlags}");
- vbm("setextradata ${name} VBoxInternal/PDM/HaltOnReset 1");
- vbm("storagectl ${name} ${controllerFlags}");
- vbm("storageattach ${name} ${diskFlags}");
- vbm("sharedfolder add ${name} ${sharedFlags}");
- vbm("sharedfolder add ${name} ${nixstoreFlags}");
- cleanup_${name};
-
- ${mkLog "$HOME/VirtualBox VMs/${name}/Logs/VBox.log" "HOST-${name}"}
- }
-
- sub destroyVM_${name} {
- cleanup_${name};
- vbm("unregistervm ${name} --delete");
- }
-
- sub waitForVMBoot_${name} {
- $machine->execute(ru(
- 'set -e; i=0; '.
- 'while ! test -e ${sharePath}/boot-done; do '.
- 'sleep 10; i=$(($i + 10)); [ $i -le 3600 ]; '.
- 'VBoxManage list runningvms | grep -q "^\"${name}\""; '.
- 'done'
- ));
- }
-
- sub waitForIP_${name} ($) {
- my $property = "/VirtualBox/GuestInfo/Net/$_[0]/V4/IP";
- my $getip = "VBoxManage guestproperty get ${name} $property | ".
- "sed -n -e 's/^Value: //p'";
- my $ip = $machine->succeed(ru(
- 'for i in $(seq 1000); do '.
- 'if ipaddr="$('.$getip.')" && [ -n "$ipaddr" ]; then '.
- 'echo "$ipaddr"; exit 0; '.
- 'fi; '.
- 'sleep 1; '.
- 'done; '.
- 'echo "Could not get IPv4 address for ${name}!" >&2; '.
- 'exit 1'
- ));
- chomp $ip;
- return $ip;
- }
-
- sub waitForStartup_${name} {
- for (my $i = 0; $i <= 120; $i += 10) {
- $machine->sleep(10);
- return if checkRunning_${name};
- eval { $_[0]->() } if defined $_[0];
- }
- die "VirtualBox VM didn't start up within 2 minutes";
- }
-
- sub waitForShutdown_${name} {
- for (my $i = 0; $i <= 120; $i += 10) {
- $machine->sleep(10);
- return unless checkRunning_${name};
- }
- die "VirtualBox VM didn't shut down within 2 minutes";
- }
-
- sub shutdownVM_${name} {
- $machine->succeed(ru "touch ${sharePath}/shutdown");
- $machine->execute(
- 'set -e; i=0; '.
- 'while test -e ${sharePath}/shutdown '.
- ' -o -e ${sharePath}/boot-done; do '.
- 'sleep 1; i=$(($i + 1)); [ $i -le 3600 ]; '.
- 'done'
- );
- waitForShutdown_${name};
- }
+
+
+ ${name}_sharepath = "${sharePath}"
+
+
+ def check_running_${name}():
+ cmd = "VBoxManage list runningvms | grep -q '^\"${name}\"'"
+ (status, _) = machine.execute(ru(cmd))
+ return status == 0
+
+
+ def cleanup_${name}():
+ if check_running_${name}():
+ machine.execute(ru("VBoxManage controlvm ${name} poweroff"))
+ machine.succeed("rm -rf ${sharePath}")
+ machine.succeed("mkdir -p ${sharePath}")
+ machine.succeed("chown alice.users ${sharePath}")
+
+
+ def create_vm_${name}():
+ # fmt: off
+ vbm(f"createvm --name ${name} ${createFlags}")
+ vbm(f"modifyvm ${name} ${vmFlags}")
+ vbm(f"setextradata ${name} VBoxInternal/PDM/HaltOnReset 1")
+ vbm(f"storagectl ${name} ${controllerFlags}")
+ vbm(f"storageattach ${name} ${diskFlags}")
+ vbm(f"sharedfolder add ${name} ${sharedFlags}")
+ vbm(f"sharedfolder add ${name} ${nixstoreFlags}")
+ cleanup_${name}()
+
+ ${mkLog "$HOME/VirtualBox VMs/${name}/Logs/VBox.log" "HOST-${name}"}
+ # fmt: on
+
+
+ def destroy_vm_${name}():
+ cleanup_${name}()
+ vbm("unregistervm ${name} --delete")
+
+
+ def wait_for_vm_boot_${name}():
+ machine.execute(
+ ru(
+ "set -e; i=0; "
+ "while ! test -e ${sharePath}/boot-done; do "
+ "sleep 10; i=$(($i + 10)); [ $i -le 3600 ]; "
+ "VBoxManage list runningvms | grep -q '^\"${name}\"'; "
+ "done"
+ )
+ )
+
+
+ def wait_for_ip_${name}(interface):
+ property = f"/VirtualBox/GuestInfo/Net/{interface}/V4/IP"
+ # fmt: off
+ getip = f"VBoxManage guestproperty get ${name} {property} | sed -n -e 's/^Value: //p'"
+ # fmt: on
+
+ ip = machine.succeed(
+ ru(
+ "for i in $(seq 1000); do "
+ f'if ipaddr="$({getip})" && [ -n "$ipaddr" ]; then '
+ 'echo "$ipaddr"; exit 0; '
+ "fi; "
+ "sleep 1; "
+ "done; "
+ "echo 'Could not get IPv4 address for ${name}!' >&2; "
+ "exit 1"
+ )
+ ).strip()
+ return ip
+
+
+ def wait_for_startup_${name}(nudge=lambda: None):
+ for _ in range(0, 130, 10):
+ machine.sleep(10)
+ if check_running_${name}():
+ return
+ nudge()
+ raise Exception("VirtualBox VM didn't start up within 2 minutes")
+
+
+ def wait_for_shutdown_${name}():
+ for _ in range(0, 130, 10):
+ machine.sleep(10)
+ if not check_running_${name}():
+ return
+ raise Exception("VirtualBox VM didn't shut down within 2 minutes")
+
+
+ def shutdown_vm_${name}():
+ machine.succeed(ru("touch ${sharePath}/shutdown"))
+ machine.execute(
+ "set -e; i=0; "
+ "while test -e ${sharePath}/shutdown "
+ " -o -e ${sharePath}/boot-done; do "
+ "sleep 1; i=$(($i + 1)); [ $i -le 3600 ]; "
+ "done"
+ )
+ wait_for_shutdown_${name}()
'';
};
@@ -365,26 +375,31 @@ let
};
testScript = ''
- sub ru ($) {
- my $esc = $_[0] =~ s/'/'\\${"'"}'/gr;
- return "su - alice -c '$esc'";
- }
+ from shlex import quote
+ ${concatStrings (mapAttrsToList (_: getAttr "testSubs") vms)}
- sub vbm {
- $machine->succeed(ru("VBoxManage ".$_[0]));
- };
+ def ru(cmd: str) -> str:
+ return f"su - alice -c {quote(cmd)}"
- sub removeUUIDs {
- return join("\n", grep { $_ !~ /^UUID:/ } split(/\n/, $_[0]))."\n";
- }
- ${concatStrings (mapAttrsToList (_: getAttr "testSubs") vms)}
+ def vbm(cmd: str) -> str:
+ return machine.succeed(ru(f"VBoxManage {cmd}"))
+
+
+ def remove_uuids(output: str) -> str:
+ return "\n".join(
+ [line for line in (output or "").splitlines() if not line.startswith("UUID:")]
+ )
+
- $machine->waitForX;
+ machine.wait_for_x()
+ # fmt: off
${mkLog "$HOME/.config/VirtualBox/VBoxSVC.log" "HOST-SVC"}
+ # fmt: on
${testScript}
+ # (keep black happy)
'';
meta = with pkgs.stdenv.lib.maintainers; {
@@ -394,133 +409,129 @@ let
unfreeTests = mapAttrs (mkVBoxTest true vboxVMsWithExtpack) {
enable-extension-pack = ''
- createVM_testExtensionPack;
- vbm("startvm testExtensionPack");
- waitForStartup_testExtensionPack;
- $machine->screenshot("cli_started");
- waitForVMBoot_testExtensionPack;
- $machine->screenshot("cli_booted");
-
- $machine->nest("Checking for privilege escalation", sub {
- $machine->fail("test -e '/root/VirtualBox VMs'");
- $machine->fail("test -e '/root/.config/VirtualBox'");
- $machine->succeed("test -e '/home/alice/VirtualBox VMs'");
- });
-
- shutdownVM_testExtensionPack;
- destroyVM_testExtensionPack;
+ create_vm_testExtensionPack()
+ vbm("startvm testExtensionPack")
+ wait_for_startup_testExtensionPack()
+ machine.screenshot("cli_started")
+ wait_for_vm_boot_testExtensionPack()
+ machine.screenshot("cli_booted")
+
+ with machine.nested("Checking for privilege escalation"):
+ machine.fail("test -e '/root/VirtualBox VMs'")
+ machine.fail("test -e '/root/.config/VirtualBox'")
+ machine.succeed("test -e '/home/alice/VirtualBox VMs'")
+
+ shutdown_vm_testExtensionPack()
+ destroy_vm_testExtensionPack()
'';
};
in mapAttrs (mkVBoxTest false vboxVMs) {
simple-gui = ''
- createVM_simple;
- $machine->succeed(ru "VirtualBox &");
- $machine->waitUntilSucceeds(
- ru "xprop -name 'Oracle VM VirtualBox Manager'"
- );
- $machine->sleep(5);
- $machine->screenshot("gui_manager_started");
# Home to select Tools, down to move to the VM, enter to start it.
- $machine->sendKeys("home");
- $machine->sendKeys("down");
- $machine->sendKeys("ret");
- $machine->screenshot("gui_manager_sent_startup");
- waitForStartup_simple (sub {
- $machine->sendKeys("home");
- $machine->sendKeys("down");
- $machine->sendKeys("ret");
- });
- $machine->screenshot("gui_started");
- waitForVMBoot_simple;
- $machine->screenshot("gui_booted");
- shutdownVM_simple;
- $machine->sleep(5);
- $machine->screenshot("gui_stopped");
- $machine->sendKeys("ctrl-q");
- $machine->sleep(5);
- $machine->screenshot("gui_manager_stopped");
- destroyVM_simple;
+ def send_vm_startup():
+ machine.send_key("home")
+ machine.send_key("down")
+ machine.send_key("ret")
+
+
+ create_vm_simple()
+ machine.succeed(ru("VirtualBox &"))
+ machine.wait_until_succeeds(ru("xprop -name 'Oracle VM VirtualBox Manager'"))
+ machine.sleep(5)
+ machine.screenshot("gui_manager_started")
+ send_vm_startup()
+ machine.screenshot("gui_manager_sent_startup")
+ wait_for_startup_simple(send_vm_startup)
+ machine.screenshot("gui_started")
+ wait_for_vm_boot_simple()
+ machine.screenshot("gui_booted")
+ shutdown_vm_simple()
+ machine.sleep(5)
+ machine.screenshot("gui_stopped")
+ machine.send_key("ctrl-q")
+ machine.sleep(5)
+ machine.screenshot("gui_manager_stopped")
+ destroy_vm_simple()
'';
simple-cli = ''
- createVM_simple;
- vbm("startvm simple");
- waitForStartup_simple;
- $machine->screenshot("cli_started");
- waitForVMBoot_simple;
- $machine->screenshot("cli_booted");
-
- $machine->nest("Checking for privilege escalation", sub {
- $machine->fail("test -e '/root/VirtualBox VMs'");
- $machine->fail("test -e '/root/.config/VirtualBox'");
- $machine->succeed("test -e '/home/alice/VirtualBox VMs'");
- });
-
- shutdownVM_simple;
- destroyVM_simple;
+ create_vm_simple()
+ vbm("startvm simple")
+ wait_for_startup_simple()
+ machine.screenshot("cli_started")
+ wait_for_vm_boot_simple()
+ machine.screenshot("cli_booted")
+
+ with machine.nested("Checking for privilege escalation"):
+ machine.fail("test -e '/root/VirtualBox VMs'")
+ machine.fail("test -e '/root/.config/VirtualBox'")
+ machine.succeed("test -e '/home/alice/VirtualBox VMs'")
+
+ shutdown_vm_simple()
+ destroy_vm_simple()
'';
headless = ''
- createVM_headless;
- $machine->succeed(ru("VBoxHeadless --startvm headless & disown %1"));
- waitForStartup_headless;
- waitForVMBoot_headless;
- shutdownVM_headless;
- destroyVM_headless;
+ create_vm_headless()
+ machine.succeed(ru("VBoxHeadless --startvm headless & disown %1"))
+ wait_for_startup_headless()
+ wait_for_vm_boot_headless()
+ shutdown_vm_headless()
+ destroy_vm_headless()
'';
host-usb-permissions = ''
- my $userUSB = removeUUIDs vbm("list usbhost");
- print STDERR $userUSB;
- my $rootUSB = removeUUIDs $machine->succeed("VBoxManage list usbhost");
- print STDERR $rootUSB;
-
- die "USB host devices differ for root and normal user"
- if $userUSB ne $rootUSB;
- die "No USB host devices found" if $userUSB =~ //;
+ user_usb = remove_uuids(vbm("list usbhost"))
+ print(user_usb, file=sys.stderr)
+ root_usb = remove_uuids(machine.succeed("VBoxManage list usbhost"))
+ print(root_usb, file=sys.stderr)
+
+ if user_usb != root_usb:
+ raise Exception("USB host devices differ for root and normal user")
+ if "" in user_usb:
+ raise Exception("No USB host devices found")
'';
systemd-detect-virt = ''
- createVM_detectvirt;
- vbm("startvm detectvirt");
- waitForStartup_detectvirt;
- waitForVMBoot_detectvirt;
- shutdownVM_detectvirt;
- my $result = $machine->succeed("cat '$detectvirt_sharepath/result'");
- chomp $result;
- destroyVM_detectvirt;
- die "systemd-detect-virt returned \"$result\" instead of \"oracle\""
- if $result ne "oracle";
+ create_vm_detectvirt()
+ vbm("startvm detectvirt")
+ wait_for_startup_detectvirt()
+ wait_for_vm_boot_detectvirt()
+ shutdown_vm_detectvirt()
+ result = machine.succeed(f"cat '{detectvirt_sharepath}/result'").strip()
+ destroy_vm_detectvirt()
+ if result != "oracle":
+ raise Exception(f'systemd-detect-virt returned "{result}" instead of "oracle"')
'';
net-hostonlyif = ''
- createVM_test1;
- createVM_test2;
+ create_vm_test1()
+ create_vm_test2()
- vbm("startvm test1");
- waitForStartup_test1;
- waitForVMBoot_test1;
+ vbm("startvm test1")
+ wait_for_startup_test1()
+ wait_for_vm_boot_test1()
- vbm("startvm test2");
- waitForStartup_test2;
- waitForVMBoot_test2;
+ vbm("startvm test2")
+ wait_for_startup_test2()
+ wait_for_vm_boot_test2()
- $machine->screenshot("net_booted");
+ machine.screenshot("net_booted")
- my $test1IP = waitForIP_test1 1;
- my $test2IP = waitForIP_test2 1;
+ test1_ip = wait_for_ip_test1(1)
+ test2_ip = wait_for_ip_test2(1)
- $machine->succeed("echo '$test2IP' | nc -N '$test1IP' 1234");
- $machine->succeed("echo '$test1IP' | nc -N '$test2IP' 1234");
+ machine.succeed(f"echo '{test2_ip}' | nc -N '{test1_ip}' 1234")
+ machine.succeed(f"echo '{test1_ip}' | nc -N '{test2_ip}' 1234")
- $machine->waitUntilSucceeds("nc -N '$test1IP' 5678 < /dev/null >&2");
- $machine->waitUntilSucceeds("nc -N '$test2IP' 5678 < /dev/null >&2");
+ machine.wait_until_succeeds(f"nc -N '{test1_ip}' 5678 < /dev/null >&2")
+ machine.wait_until_succeeds(f"nc -N '{test2_ip}' 5678 < /dev/null >&2")
- shutdownVM_test1;
- shutdownVM_test2;
+ shutdown_vm_test1()
+ shutdown_vm_test2()
- destroyVM_test1;
- destroyVM_test2;
+ destroy_vm_test1()
+ destroy_vm_test2()
'';
} // (if enableUnfree then unfreeTests else {})
diff --git a/nixos/tests/xandikos.nix b/nixos/tests/xandikos.nix
index 886c3e0082f74..48c770a3d168d 100644
--- a/nixos/tests/xandikos.nix
+++ b/nixos/tests/xandikos.nix
@@ -4,7 +4,7 @@ import ./make-test-python.nix (
{
name = "xandikos";
- meta.maintainers = [ lib.maintainers."0x4A6F" ];
+ meta.maintainers = with lib.maintainers; [ _0x4A6F ];
nodes = {
xandikos_client = {};
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index 7ba60ee9806c5..87e6c900c98e0 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -46,6 +46,17 @@ let
"zpool destroy rpool",
"udevadm settle",
)
+
+ machine.succeed(
+ 'echo password | zpool create -o altroot="/tmp/mnt" '
+ + "-O encryption=aes-256-gcm -O keyformat=passphrase rpool /dev/vdb1",
+ "zfs create -o mountpoint=legacy rpool/root",
+ "mount -t zfs rpool/root /tmp/mnt",
+ "udevadm settle",
+ "umount /tmp/mnt",
+ "zpool destroy rpool",
+ "udevadm settle",
+ )
'' + extraTest;
};
@@ -57,18 +68,6 @@ in {
unstable = makeZfsTest "unstable" {
enableUnstable = true;
- extraTest = ''
- machine.succeed(
- 'echo password | zpool create -o altroot="/tmp/mnt" '
- + "-O encryption=aes-256-gcm -O keyformat=passphrase rpool /dev/vdb1",
- "zfs create -o mountpoint=legacy rpool/root",
- "mount -t zfs rpool/root /tmp/mnt",
- "udevadm settle",
- "umount /tmp/mnt",
- "zpool destroy rpool",
- "udevadm settle",
- )
- '';
};
installer = (import ./installer.nix { }).zfsroot;
diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix
new file mode 100644
index 0000000000000..6bb21b5edaabd
--- /dev/null
+++ b/pkgs/applications/audio/ashuffle/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, meson, ninja }:
+
+stdenv.mkDerivation rec {
+ pname = "ashuffle";
+ version = "3.4.0";
+
+ src = fetchFromGitHub {
+ owner = "joshkunz";
+ repo = "ashuffle";
+ rev = "v${version}";
+ sha256 = "09q6lwgc1dc8bg1mb9js9qz3xcsxph3548nxzvyb4v8111gixrp7";
+ fetchSubmodules = true;
+ };
+
+ dontUseCmakeConfigure = true;
+ nativeBuildInputs = [ cmake pkg-config meson ninja ];
+ buildInputs = [ mpd_clientlib ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/joshkunz/ashuffle";
+ description = "Automatic library-wide shuffle for mpd";
+ maintainers = [ maintainers.tcbravo ];
+ platforms = platforms.unix;
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 18f2b4f67cdba..20526c8c6c564 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Sound editor with graphical UI";
- homepage = "http://audacityteam.org/";
+ homepage = "https://www.audacityteam.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ lheckemann ];
platforms = intersectLists platforms.linux platforms.x86; # fails on ARM
diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix
index 49b788f66537c..255cf3f5e3bfc 100644
--- a/pkgs/applications/audio/axoloti/libusb1.nix
+++ b/pkgs/applications/audio/axoloti/libusb1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }:
+{ stdenv, lib, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }:
stdenv.mkDerivation rec {
name = "libusb-1.0.19";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
preFixup = stdenv.lib.optionalString stdenv.isLinux ''
- sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la
+ sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix
index c74c0ca4eff05..a26431a82edff 100644
--- a/pkgs/applications/audio/bambootracker/default.nix
+++ b/pkgs/applications/audio/bambootracker/default.nix
@@ -1,8 +1,6 @@
{ mkDerivation
, stdenv
, fetchFromGitHub
-, fetchpatch
-, installShellFiles
, qmake
, qtbase
, qtmultimedia
@@ -21,26 +19,18 @@ let
in
mkDerivation rec {
pname = "bambootracker";
- version = "0.4.3";
+ version = "0.4.4";
src = fetchFromGitHub {
owner = "rerrahkr";
repo = "BambooTracker";
rev = "v${version}";
- sha256 = "0gq40qmsdavsyl2d6a71rwp4mjlwvp1c8bry32srn4hliwfnvqa6";
+ sha256 = "0d0f4jqzknsiq725pvfndarfjg183f92rb0lim3wzshnsixr5vdc";
};
- # Fix macOS build until new release
- patches = [
- (fetchpatch {
- url = "https://github.com/rerrahkr/BambooTracker/commit/45346ed99559d44c2e32a5c6138a0835b212e875.patch";
- sha256 = "1xkiqira1kpcqkacycy0y7qm1brhf89amliv42byijl4palmykh2";
- })
- ];
+ sourceRoot = "source/BambooTracker";
- preConfigure = "cd BambooTracker";
-
- nativeBuildInputs = [ qmake qttools installShellFiles ];
+ nativeBuildInputs = [ qmake qttools ];
buildInputs = [ qtbase qtmultimedia ]
++ optional alsaSupport alsaLib
@@ -51,17 +41,6 @@ mkDerivation rec {
++ optional pulseSupport "CONFIG+=use_pulse"
++ optionals jackSupport [ "CONFIG+=use_jack" "CONFIG+=jack_has_rename" ];
- postInstall = ''
- install -Dm644 ../BambooTracker.desktop $out/share/applications/BambooTracker.desktop
- installManPage ../BambooTracker*.1
-
- cp -r ../{demos,licenses,skins,LICENSE} $out/share/BambooTracker/
-
- for size in 16x16 256x256; do
- install -Dm644 res/icon/icon_$size.png $out/share/icons/hicolor/$size/apps/BambooTracker.png
- done
- '';
-
meta = with stdenv.lib; {
description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers";
homepage = "https://github.com/rerrahkr/BambooTracker";
diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix
new file mode 100644
index 0000000000000..7d4d53408d282
--- /dev/null
+++ b/pkgs/applications/audio/bchoppr/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, pkg-config, cairo, libX11, lv2 }:
+
+stdenv.mkDerivation rec {
+ pname = "bchoppr";
+ version = "1.8.0";
+
+ src = fetchFromGitHub {
+ owner = "sjaehn";
+ repo = pname;
+ rev = "${version}";
+ sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ cairo libX11 lv2 ];
+
+ installFlags = [ "PREFIX=$(out)" ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/sjaehn/BChoppr;
+ description = "An audio stream chopping LV2 plugin";
+ maintainers = [ maintainers.magnetophon ];
+ platforms = platforms.linux;
+ license = licenses.gpl3Plus;
+ };
+}
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
index 0ca556a16ef9c..ee060602c8206 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
@@ -2,11 +2,11 @@
bitwig-studio1.overrideAttrs (oldAttrs: rec {
name = "bitwig-studio-${version}";
- version = "3.2.2";
+ version = "3.2.6";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
- sha256 = "10zb78n75nbriyjah0m3syv3rv7qwbmj590z24hss7lifa3rs784";
+ sha256 = "00hrbgnjns3s8lbjbabwwqvbwz4dlrg33cs3d1qlpzgi3y72h3nn";
};
buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ];
diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/applications/audio/bjumblr/default.nix
index 458fe20937a63..e1a5bee64b305 100644
--- a/pkgs/applications/audio/bjumblr/default.nix
+++ b/pkgs/applications/audio/bjumblr/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "BJumblr";
- version = "1.4.0";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = version;
- sha256 = "03x1gvri9yk000fvvc8zvvywf38cc41vkyhhp9xby71b23n5wbn0";
+ sha256 = "0kl6hrxmqrdf0195bfnzsa2h1073fgiqrfhg2276fm1954sm994v";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix
index 47de14ecb25c6..76a789356193b 100644
--- a/pkgs/applications/audio/bs1770gain/default.nix
+++ b/pkgs/applications/audio/bs1770gain/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ffmpeg_3, sox }:
+{ stdenv, fetchurl, ffmpeg, sox }:
stdenv.mkDerivation rec {
pname = "bs1770gain";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk";
};
- buildInputs = [ ffmpeg_3 sox ];
+ buildInputs = [ ffmpeg sox ];
NIX_CFLAGS_COMPILE = "-Wno-error";
diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/applications/audio/bschaffl/default.nix
new file mode 100644
index 0000000000000..c0d11e1fe5acc
--- /dev/null
+++ b/pkgs/applications/audio/bschaffl/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, pkg-config, cairo, libX11, lv2 }:
+
+stdenv.mkDerivation rec {
+ pname = "bschaffl";
+ version = "1.2.0";
+
+ src = fetchFromGitHub {
+ owner = "sjaehn";
+ repo = pname;
+ rev = version;
+ sha256 = "1c09acqrbd387ba41f8ch1qykdap5h6cg9if5pgd16i4dmjnpghj";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ cairo libX11 lv2 ];
+
+ installFlags = [ "PREFIX=$(out)" ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/sjaehn/BSchaffl";
+ description = "Pattern-controlled MIDI amp & time stretch LV2 plugin";
+ maintainers = [ maintainers.magnetophon ];
+ platforms = platforms.linux;
+ license = licenses.gpl3;
+ };
+}
diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix
index bae2407ec7b99..5a2675187c025 100644
--- a/pkgs/applications/audio/bslizr/default.nix
+++ b/pkgs/applications/audio/bslizr/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "BSlizr";
- version = "1.2.6";
+ version = "1.2.8";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = "${version}";
- sha256 = "1l0znwvvqd2s24c652q54pkizlh86mvmr8h0qqp9xma0i575fcrh";
+ sha256 = "1f7xrljvsy7a1p8c7wln2zhwarl3ara7gbjxkpyh47wfdpigpdb0";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index 4b426609fea47..944a2d189d774 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
# When updating, please check if https://github.com/csound/csound/issues/1078
# has been fixed in the new version so we can use the normal fluidsynth
# version and remove fluidsynth 1.x from nixpkgs again.
- version = "6.13.0";
+ version = "6.14.0";
enableParallelBuilding = true;
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "csound";
repo = "csound";
rev = version;
- sha256 = "14822ybqyp31z18gky2y9zadr9dkbhabg97y139py73w7v3af1bh";
+ sha256 = "1sr9knfhbm2m0wpkjq2l5n471vnl51wy4p6j4m95zqybimzb4s2j";
};
cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp
diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix
index b42929ff20405..e5cbcd4a2e206 100644
--- a/pkgs/applications/audio/dragonfly-reverb/default.nix
+++ b/pkgs/applications/audio/dragonfly-reverb/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dragonfly-reverb";
- version = "3.1.1";
+ version = "3.2.1";
src = fetchFromGitHub {
owner = "michaelwillis";
repo = "dragonfly-reverb";
rev = version;
- sha256 = "188cm45hr0i33m4h2irql1wrsmsfis65s706wjiid0z59q47rf9p";
+ sha256 = "0vfm2510shah67k87mdyar4wr4vqwii59y9lqfhwm6blxparkrqa";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index e65414b2bcab9..515f8a6f9af2a 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -20,13 +20,13 @@ with stdenv.lib.strings;
let
- version = "unstable-2020-06-08";
+ version = "unstable-2020-08-27";
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faust";
- rev = "f0037e289987818b65d3f6fb1ad943aaad2a2b28";
- sha256 = "0h08902rgx7rhzpng4h1qw8i2nzv50f79vrlbzdk5d35wa4zibh4";
+ rev = "c10f316fa90f338e248787ebf55e3795c3a0d70e";
+ sha256 = "068pm04ddafbsj2r8akdpqyzb0m8mp9ql0rgi83hcqs4ndr8v7sb";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix
index 370c25ecd7492..0f703704961ab 100644
--- a/pkgs/applications/audio/faust/faust2jack.nix
+++ b/pkgs/applications/audio/faust/faust2jack.nix
@@ -4,6 +4,7 @@
, alsaLib
, opencv2
, libsndfile
+, which
}:
faust.wrapWithBuildEnv {
@@ -21,6 +22,7 @@ faust.wrapWithBuildEnv {
alsaLib
opencv2
libsndfile
+ which
];
}
diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix
index a2f1c2139a1a8..753208c54c259 100644
--- a/pkgs/applications/audio/faust/faust2jaqt.nix
+++ b/pkgs/applications/audio/faust/faust2jaqt.nix
@@ -3,6 +3,7 @@
, opencv2
, qt4
, libsndfile
+, alsaLib
, which
}:
@@ -20,6 +21,7 @@ faust.wrapWithBuildEnv {
opencv2
qt4
libsndfile
+ alsaLib
which
];
diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix
index 90bd8bc60ad04..03ca4ce8eb0cb 100644
--- a/pkgs/applications/audio/faust/faustlive.nix
+++ b/pkgs/applications/audio/faust/faustlive.nix
@@ -1,26 +1,34 @@
{ stdenv, fetchFromGitHub
, llvm, qt48Full, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl
-, bc, coreutils, which
+, bc, coreutils, which, libsndfile, pkg-config
}:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "faustlive";
- version = "2017-12-05";
+ version = "2.5.4";
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faustlive";
- rev = "281fcb852dcd94f8c57ade1b2a7a3937542e1b2d";
- sha256 = "0sw44yd9928rid9ib0b5mx2x129m7zljrayfm6jz6hrwdc5q3k9a";
+ rev = version;
+ sha256 = "0npn8fvq8iafyamq4wrj1k1bmk4xd0my2sp3gi5jdjfx6hc1sm3n";
+ fetchSubmodules = true;
};
buildInputs = [
llvm qt48Full qrencode libmicrohttpd libjack2 alsaLib faust curl
- bc coreutils which
+ bc coreutils which libsndfile pkg-config
];
makeFlags = [ "PREFIX=$(out)" ];
- preBuild = "patchShebangs Build/Linux/buildversion";
+ postPatch = "cd Build";
+
+ installPhase = ''
+ install -d "$out/bin"
+ install -d "$out/share/applications"
+ install FaustLive/FaustLive "$out/bin"
+ install rsrc/FaustLive.desktop "$out/share/applications"
+ '';
meta = with stdenv.lib; {
description = "A standalone just-in-time Faust compiler";
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 114cf5e192ff8..f173d2fe02b9b 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -11,13 +11,13 @@ with stdenv.lib;
mkDerivation rec {
pname = "fmit";
- version = "1.2.13";
+ version = "1.2.14";
src = fetchFromGitHub {
owner = "gillesdegottex";
repo = "fmit";
rev = "v${version}";
- sha256 = "1qyskam053pvlap1av80rgp12pzhr92rs88vqs6s0ia3ypnixcc6";
+ sha256 = "1q062pfwz2vr9hbfn29fv54ip3jqfd9r99nhpr8w7mn1csy38azx";
};
nativeBuildInputs = [ qmake itstool wrapQtAppsHook ];
diff --git a/pkgs/applications/audio/freqtweak/default.nix b/pkgs/applications/audio/freqtweak/default.nix
new file mode 100644
index 0000000000000..046c8c8aac8a3
--- /dev/null
+++ b/pkgs/applications/audio/freqtweak/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, pkg-config, fftwFloat, libjack2, libsigcxx, libxml2, wxGTK }:
+
+stdenv.mkDerivation rec {
+ pname = "freqtweak";
+ version = "unstable-2019-08-03";
+
+ src = fetchFromGitHub {
+ owner = "essej";
+ repo = pname;
+ rev = "d4205337558d36657a4ee6b3afb29358aa18c0fd";
+ sha256 = "10cq27mdgrrc54a40al9ahi0wqd0p2c1wxbdg518q8pzfxaxs5fi";
+ };
+
+ nativeBuildInputs = [ autoconf automake pkg-config ];
+ buildInputs = [ fftwFloat libjack2 libsigcxx libxml2 wxGTK ];
+
+ preConfigure = ''
+ sh autogen.sh
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = http://essej.net/freqtweak/;
+ description = "Realtime audio frequency spectral manipulation";
+ maintainers = [ maintainers.magnetophon ];
+ platforms = platforms.linux;
+ license = licenses.gpl2Plus;
+ };
+}
diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix
index 60040119d64f6..1db5644fc3221 100644
--- a/pkgs/applications/audio/ft2-clone/default.nix
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "ft2-clone";
- version = "1.26";
+ version = "1.28";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "ft2-clone";
rev = "v${version}";
- sha256 = "0fqb4415qy2nwjz7ahi43nk795ifswb2b37sc7p5n9m4yc8h53wv";
+ sha256 = "1hbcl89cpx9bsafxrjyfx6vrbs4h3lnzmqm12smcvdg8ksfgzj0d";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix
new file mode 100644
index 0000000000000..dcfb54260343e
--- /dev/null
+++ b/pkgs/applications/audio/geonkick/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson, libjack2, lv2, libX11, cairo }:
+
+stdenv.mkDerivation rec {
+ pname = "geonkick";
+ version = "2.3.7";
+
+ src = fetchFromGitLab {
+ owner = "iurie-sw";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1wdcbwiyy6i5agq5lffkyilyc8mv1cc4mp9h0nybn240vb2flqc2";
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+
+ buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ];
+
+ # https://github.com/iurie-sw/geonkick/issues/120
+ cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" "-DCMAKE_INSTALL_LIBDIR=lib" ];
+
+ meta = {
+ homepage = "https://gitlab.com/iurie-sw/geonkick";
+ description = "A free software percussion synthesizer";
+ license = stdenv.lib.licenses.gpl3Plus;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.magnetophon ];
+ };
+}
diff --git a/pkgs/applications/audio/gspeech/default.nix b/pkgs/applications/audio/gspeech/default.nix
index f51eb338d286b..920c06038fe31 100644
--- a/pkgs/applications/audio/gspeech/default.nix
+++ b/pkgs/applications/audio/gspeech/default.nix
@@ -20,13 +20,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "gSpeech";
- version = "0.9.2";
+ version = "0.10.1";
src = fetchFromGitHub {
owner = "mothsart";
repo = pname;
rev = version;
- sha256 = "11pvdpb9jjssp8nmlj21gs7ncgfm89kw26mfc8c2x8w2q4h92ja3";
+ sha256 = "1i0jwgxcn94nsi7c0ad0w77y04g04ka2szijzfqzqfnacdmdyrfc";
};
nativeBuildInputs = [
@@ -56,8 +56,8 @@ python3.pkgs.buildPythonApplication rec {
];
postFixup = ''
- wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts ]}
- wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts ]}
+ wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts sox ]}
+ wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts sox ]}
'';
strictDeps = false;
diff --git a/pkgs/applications/audio/gwc/default.nix b/pkgs/applications/audio/gwc/default.nix
new file mode 100644
index 0000000000000..d9631ac45e6b0
--- /dev/null
+++ b/pkgs/applications/audio/gwc/default.nix
@@ -0,0 +1,47 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, alsaLib
+, libpulseaudio
+, gtk2
+, hicolor-icon-theme
+, libsndfile
+, fftw
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gwc";
+ version = "0.22-04";
+
+ src = fetchFromGitHub {
+ owner = "AlisterH";
+ repo = pname;
+ rev = version;
+ sha256 = "0xvfra32dchnnyf9kj5s5xmqhln8jdrc9f0040hjr2dsb58y206p";
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ ];
+
+ buildInputs = [
+ alsaLib
+ libpulseaudio
+ gtk2
+ hicolor-icon-theme
+ libsndfile
+ fftw
+ ];
+
+ enableParallelBuilding = false; # Fails to generate machine.h in time.
+
+ meta = with stdenv.lib; {
+ description = "GUI application for removing noise (hiss, pops and clicks) from audio files";
+ homepage = "https://github.com/AlisterH/gwc/";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ magnetophon ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix
index 8459967a363c5..145ba68b08b1c 100644
--- a/pkgs/applications/audio/helm/default.nix
+++ b/pkgs/applications/audio/helm/default.nix
@@ -1,5 +1,16 @@
-{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2
-, lv2, pkgconfig, libGLU, libGL }:
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+, xorg
+, freetype
+, alsaLib
+, curl
+, libjack2
+, lv2
+, pkgconfig
+, libGLU
+, libGL
+}:
stdenv.mkDerivation {
version = "0.9.0";
@@ -20,7 +31,15 @@
CXXFLAGS = "-DHAVE_LROUND";
- patchPhase = ''
+ patches = [
+ # gcc9 compatibility https://github.com/mtytel/helm/pull/233
+ (fetchpatch {
+ url = "https://github.com/mtytel/helm/commit/cb611a80bd5a36d31bfc31212ebbf79aa86c6f08.patch";
+ sha256 = "1i2289srcfz17c3zzab6f51aznzdj62kk53l4afr32bkjh9s4ixk";
+ })
+ ];
+
+ prePatch = ''
sed -i 's|usr/||g' Makefile
'';
diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix
index bbf66a74bc503..39f1467138db5 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk3, libjack2, lilv, lv2, pkgconfig, python
+{ stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python
, serd, sord , sratom, suil, wafHook }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [
- gtk3 libjack2 lilv lv2 python serd sord sratom suil
+ gtk2 libjack2 lilv lv2 python serd sord sratom suil
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix
new file mode 100644
index 0000000000000..53b55332f5d9a
--- /dev/null
+++ b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config
+, boost, cairo, fftw, gnome3, ladspa-sdk, libxcb, lv2, xcbutilwm
+, zita-convolver, zita-resampler
+ }:
+
+stdenv.mkDerivation rec {
+ pname = "kapitonov-plugins-pack";
+ version = "1.2.1";
+
+ src = fetchFromGitHub {
+ owner = "olegkapitonov";
+ repo = pname;
+ rev = version;
+ sha256 = "1mxi7b1vrzg25x85lqk8c77iziqrqyz18mqkfjlz09sxp5wfs9w4";
+ };
+
+ nativeBuildInputs = [
+ faust
+ meson
+ ninja
+ pkg-config
+ ];
+
+ buildInputs = [
+ boost
+ cairo
+ fftw
+ ladspa-sdk
+ libxcb
+ lv2
+ xcbutilwm
+ zita-convolver
+ zita-resampler
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Set of LADSPA and LV2 plugins for guitar sound processing";
+ homepage = https://github.com/olegkapitonov/Kapitonov-Plugins-Pack;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ magnetophon ];
+ };
+}
diff --git a/pkgs/applications/audio/librespot/cargo-lock.patch b/pkgs/applications/audio/librespot/cargo-lock.patch
new file mode 100644
index 0000000000000..129ba96987ab2
--- /dev/null
+++ b/pkgs/applications/audio/librespot/cargo-lock.patch
@@ -0,0 +1,137 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 533b47d..9c9c2f6 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -932,7 +932,7 @@ dependencies = [
+
+ [[package]]
+ name = "librespot"
+-version = "0.1.2"
++version = "0.1.3"
+ dependencies = [
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -940,12 +940,12 @@ dependencies = [
+ "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)",
+- "librespot-audio 0.1.2",
+- "librespot-connect 0.1.2",
+- "librespot-core 0.1.2",
+- "librespot-metadata 0.1.2",
+- "librespot-playback 0.1.2",
+- "librespot-protocol 0.1.2",
++ "librespot-audio 0.1.3",
++ "librespot-connect 0.1.3",
++ "librespot-core 0.1.3",
++ "librespot-metadata 0.1.3",
++ "librespot-playback 0.1.3",
++ "librespot-protocol 0.1.3",
+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -961,7 +961,7 @@ dependencies = [
+
+ [[package]]
+ name = "librespot-audio"
+-version = "0.1.2"
++version = "0.1.3"
+ dependencies = [
+ "aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bit-set 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -969,7 +969,7 @@ dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lewton 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "librespot-core 0.1.2",
++ "librespot-core 0.1.3",
+ "librespot-tremor 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -980,7 +980,7 @@ dependencies = [
+
+ [[package]]
+ name = "librespot-connect"
+-version = "0.1.2"
++version = "0.1.3"
+ dependencies = [
+ "aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -990,9 +990,9 @@ dependencies = [
+ "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libmdns 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "librespot-core 0.1.2",
+- "librespot-playback 0.1.2",
+- "librespot-protocol 0.1.2",
++ "librespot-core 0.1.3",
++ "librespot-playback 0.1.3",
++ "librespot-protocol 0.1.3",
+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -1007,7 +1007,7 @@ dependencies = [
+
+ [[package]]
+ name = "librespot-core"
+-version = "0.1.2"
++version = "0.1.3"
+ dependencies = [
+ "aes 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -1020,7 +1020,7 @@ dependencies = [
+ "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper-proxy 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "librespot-protocol 0.1.2",
++ "librespot-protocol 0.1.3",
+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -1043,12 +1043,12 @@ dependencies = [
+
+ [[package]]
+ name = "librespot-metadata"
+-version = "0.1.2"
++version = "0.1.3"
+ dependencies = [
+ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+- "librespot-core 0.1.2",
+- "librespot-protocol 0.1.2",
++ "librespot-core 0.1.3",
++ "librespot-protocol 0.1.3",
+ "linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -1056,7 +1056,7 @@ dependencies = [
+
+ [[package]]
+ name = "librespot-playback"
+-version = "0.1.2"
++version = "0.1.3"
+ dependencies = [
+ "alsa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -1068,9 +1068,9 @@ dependencies = [
+ "jack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libpulse-sys 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "librespot-audio 0.1.2",
+- "librespot-core 0.1.2",
+- "librespot-metadata 0.1.2",
++ "librespot-audio 0.1.3",
++ "librespot-core 0.1.3",
++ "librespot-metadata 0.1.3",
+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "portaudio-rs 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rodio 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -1081,7 +1081,7 @@ dependencies = [
+
+ [[package]]
+ name = "librespot-protocol"
+-version = "0.1.2"
++version = "0.1.3"
+ dependencies = [
+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix
index 468cf57cdcfe8..6061edac02501 100644
--- a/pkgs/applications/audio/librespot/default.nix
+++ b/pkgs/applications/audio/librespot/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl
-, withRodio ? true
-, withALSA ? true, alsaLib ? null
-, withPulseAudio ? false, libpulseaudio ? null
-, withPortAudio ? false, portaudio ? null
-}:
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, withRodio ? true
+, withALSA ? true, alsaLib ? null, withPulseAudio ? false, libpulseaudio ? null
+, withPortAudio ? false, portaudio ? null }:
rustPlatform.buildRustPackage rec {
pname = "librespot";
- version = "0.1.1";
+ version = "0.1.3";
src = fetchFromGitHub {
owner = "librespot-org";
repo = "librespot";
rev = "v${version}";
- sha256 = "1sdbjv8w2mfpv82rx5iy4s532l1767vmlrg9d8khnvh8vrm2lshy";
+ sha256 = "1ixh47yvaamrpzagqsiimc3y6bi4nbym95843d23am55zkrgnmy5";
};
- cargoSha256 = "0zi50imjvalwl6pxl35qrmbg74j5xdfaws8v69am4g9agbfjvlms";
+ cargoSha256 = "1csls8kzzx28ng6w9vdwhnnav5sqp2m5fj430db5z306xh5acg3d";
+
+ cargoPatches = [ ./cargo-lock.patch ];
cargoBuildFlags = with stdenv.lib; [
"--no-default-features"
@@ -32,8 +31,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ openssl ]
- ++ stdenv.lib.optional withALSA alsaLib
+ buildInputs = [ openssl ] ++ stdenv.lib.optional withALSA alsaLib
++ stdenv.lib.optional withPulseAudio libpulseaudio
++ stdenv.lib.optional withPortAudio portaudio;
diff --git a/pkgs/applications/audio/lv2-cpp-tools/default.nix b/pkgs/applications/audio/lv2-cpp-tools/default.nix
new file mode 100644
index 0000000000000..d98135fb0149f
--- /dev/null
+++ b/pkgs/applications/audio/lv2-cpp-tools/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchzip, pkgconfig, lv2, gtkmm2, boost }:
+
+stdenv.mkDerivation rec {
+ pname = "lv2-cpp-tools";
+ version = "1.0.5";
+
+ src = fetchzip {
+ url = "http://deb.debian.org/debian/pool/main/l/lv2-c++-tools/lv2-c++-tools_${version}.orig.tar.bz2";
+ sha256 = "039bq7d7s2bhfcnlsfq0mqxr9a9iqwg5bwcpxfi24c6yl6krydsi";
+ };
+
+ preConfigure = ''
+ sed -r 's,/bin/bash,${stdenv.shell},g' -i ./configure
+ sed -r 's,/sbin/ldconfig,ldconfig,g' -i ./Makefile.template
+ '';
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ lv2 gtkmm2 boost ];
+
+ meta = with stdenv.lib; {
+ homepage = "http://ll-plugins.nongnu.org/hacking.html";
+ description = "Tools and libraries that may come in handy when writing LV2 plugins in C++";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.michalrus ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix
new file mode 100644
index 0000000000000..a3e33471cee85
--- /dev/null
+++ b/pkgs/applications/audio/mamba/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, cairo
+, libX11
+, libjack2
+, liblo
+, libsigcxx
+, libsmf
+}:
+
+stdenv.mkDerivation rec {
+ pname = "mamba";
+ version = "1.3";
+
+ src = fetchFromGitHub {
+ owner = "brummer10";
+ repo = "Mamba";
+ rev = "v${version}";
+ sha256 = "1wa3f9c4l239mpxa7nxx8hajy4icn40vpvaxq5l1qzskl74w072d";
+ fetchSubmodules = true;
+ };
+
+ patches = [ ./fix-build.patch ];
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cairo libX11 libjack2 liblo libsigcxx libsmf ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/brummer10/Mamba";
+ description = "Virtual MIDI keyboard for Jack Audio Connection Kit";
+ license = licenses.bsd0;
+ maintainers = with maintainers; [ magnetophon orivej ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/mamba/fix-build.patch b/pkgs/applications/audio/mamba/fix-build.patch
new file mode 100644
index 0000000000000..ed366963676c3
--- /dev/null
+++ b/pkgs/applications/audio/mamba/fix-build.patch
@@ -0,0 +1,10 @@
+--- a/libxputty/Build/Makefile
++++ b/libxputty/Build/Makefile
+@@ -20,1 +20,1 @@
+- LDFLAGS += -fPIC `pkg-config --static --cflags --libs cairo x11` -lm
++ LDFLAGS += -fPIC `pkg-config --cflags --libs cairo x11` -lm
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -84,1 +83,1 @@ ifneq ("$(wildcard ./$(BUILD_DIR))","")
+- update-desktop-database
++ update-desktop-database || true
diff --git a/pkgs/applications/audio/molot-lite/default.nix b/pkgs/applications/audio/molot-lite/default.nix
new file mode 100644
index 0000000000000..5c5aa50553702
--- /dev/null
+++ b/pkgs/applications/audio/molot-lite/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, unzip, lv2 }:
+
+stdenv.mkDerivation {
+ pname = "molot-lite";
+ version = "unstable-2014-04-23";
+
+ src = fetchurl {
+ # fetchzip does not accept urls that do not end with .zip.
+ url = "https://sourceforge.net/p/molot/code/ci/c4eddc426f8d5821e8ebcf1d67265365e4c8c52a/tree/molot_src.zip?format=raw";
+ sha256 = "1c47dwfgrmn9459px8s5zikcqyr0777v226qzcxlr6azlcjwr51b";
+ };
+
+ nativeBuildInputs = [ unzip ];
+ buildInputs = [ lv2 ];
+
+ unpackPhase = ''
+ unzip $src
+ '';
+
+ buildPhase = ''
+ make -C Molot_Mono_Lite
+ make -C Molot_Stereo_Lite
+ '';
+
+ installPhase = ''
+ make install INSTALL_DIR=$out/lib/lv2 -C Molot_Mono_Lite
+ make install INSTALL_DIR=$out/lib/lv2 -C Molot_Stereo_Lite
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Stereo and mono audio signal dynamic range compressor in LV2 format";
+ homepage = "https://sourceforge.net/projects/molot/";
+ license = licenses.gpl3Plus;
+ maintainers = [ maintainers.magnetophon ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/mooSpace/default.nix b/pkgs/applications/audio/mooSpace/default.nix
new file mode 100644
index 0000000000000..f6958c5e974a9
--- /dev/null
+++ b/pkgs/applications/audio/mooSpace/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
+stdenv.mkDerivation rec {
+ pname = "mooSpace";
+ version = "unstable-2020-06-10";
+
+ src = fetchFromGitHub {
+ owner = "modularev";
+ repo = pname;
+ rev = "e5440407ea6ef9f7fcca838383b2b9a388c22874";
+ sha256 = "10vsbddf6d7i06040850v8xkmqh3bqawczs29kfgakair809wqxl";
+ };
+
+ buildInputs = [ faust2jaqt faust2lv2 ];
+
+ patchPhase = "mv ${pname}_faust.dsp ${pname}.dsp";
+
+ buildPhase = ''
+ faust2jaqt -time -vec -t 0 ${pname}.dsp
+ faust2lv2 -time -vec -t 0 -gui ${pname}.dsp
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp ${pname} $out/bin/
+ mkdir -p $out/lib/lv2
+ cp -r ${pname}.lv2 $out/lib/lv2
+ '';
+
+ meta = {
+ description = "Variable reverb audio effect, jack and lv2";
+ homepage = "https://github.com/modularev/mooSpace";
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = [ stdenv.lib.maintainers.magnetophon ];
+ };
+}
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index 6c2a7d9fe3344..23322ca5663e4 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -40,6 +40,8 @@ let
mopidy-iris = callPackage ./iris.nix { };
+ mopidy-tunein = callPackage ./tunein.nix { };
+
};
in self
diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 796812a9bd0e8..467ba6fe3f707 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
] ++ (with python3Packages; [
configobj
requests
- tornado_4
+ tornado
]);
# no tests implemented
diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix
index ae65d9b2f6ede..28216020b78a9 100644
--- a/pkgs/applications/audio/mopidy/mopidy.nix
+++ b/pkgs/applications/audio/mopidy/mopidy.nix
@@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
];
propagatedBuildInputs = with pythonPackages; [
- gst-python pygobject3 pykka tornado_4 requests setuptools
+ gst-python pygobject3 pykka tornado requests setuptools
] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;
# There are no tests
diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix
new file mode 100644
index 0000000000000..569d08fb4a033
--- /dev/null
+++ b/pkgs/applications/audio/mopidy/tunein.nix
@@ -0,0 +1,28 @@
+{ stdenv, python3Packages, mopidy }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "mopidy-tunein";
+ version = "1.0.0";
+
+ src = python3Packages.fetchPypi {
+ inherit version;
+ pname = "Mopidy-TuneIn";
+ sha256 = "0insasf4w8ajsqjh5zmax7pkzmrk1p245vh4y8ddicldj45p6qfj";
+ };
+
+ propagatedBuildInputs = [
+ mopidy
+ ];
+
+ # tests fail with "ValueError: Namespace Gst not available" in mopidy itself
+ doCheck = false;
+
+ pythonImportsCheck = [ "mopidy_tunein.tunein" ];
+
+ meta = with stdenv.lib; {
+ description = "Mopidy extension for playing music from tunein.";
+ homepage = "https://github.com/kingosticks/mopidy-tunein";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 30f40e226de94..5260cb85a27bc 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "mpg123-1.26.1";
+ name = "mpg123-1.26.2";
src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
- sha256 = "0cp01wdy77ggzqzzasxd5jd9iypcly5m4c89idc9mpgknyd65mkl";
+ sha256 = "1wrgds46wj6xsnqa6bi8kkh3wd29i2nxclbps34w5kjglrzbzxq0";
};
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 0561a0179a613..71c639ca40684 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -7,11 +7,11 @@
mkDerivation rec {
pname = "musescore";
- version = "3.4.2";
+ version = "3.5.0";
src = fetchzip {
- url = "https://github.com/musescore/MuseScore/releases/download/v${version}/MuseScore-${version}.zip";
- sha256 = "1laskvp40dncs12brkgvk7wl0qrvzy52rn7nf3b67ps1vmd130gp";
+ url = "https://github.com/musescore/MuseScore/releases/download/v3.5/MuseScore-${version}.zip";
+ sha256 = "0m598xh0s4f5m4l2ymy7g44bbvc14bcfi4gifhjnrg091rsk57c9";
stripRoot = false;
};
@@ -20,7 +20,14 @@ mkDerivation rec {
];
cmakeFlags = [
- ] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON";
+ "-DUSE_SYSTEM_FREETYPE=ON"
+ ];
+
+ qtWrapperArgs = [
+ # Work around crash on update from 3.4.2 to 3.5.0
+ # https://bugreports.qt.io/browse/QTBUG-85967
+ "--set QML_DISABLE_DISK_CACHE 1"
+ ];
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix
index b1e8822cdcf8b..7ef2b400b7699 100644
--- a/pkgs/applications/audio/musly/default.nix
+++ b/pkgs/applications/audio/musly/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, eigen, libav_all }:
+{ stdenv, fetchFromGitHub, cmake, eigen, libav }:
stdenv.mkDerivation {
pname = "musly";
version = "unstable-2017-04-26";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825";
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ eigen (libav_all.override { vaapiSupport = stdenv.isLinux; }).libav_11 ];
+ buildInputs = [ eigen (libav.override { vaapiSupport = stdenv.isLinux; }) ];
fixupPhase = if stdenv.isDarwin then ''
install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly
install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index aea50d71d75db..ca61aa0cd6f03 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -10,13 +10,13 @@ assert pcreSupport -> pcre != null;
stdenv.mkDerivation rec {
pname = "ncmpc";
- version = "0.38";
+ version = "0.39";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "ncmpc";
rev = "v${version}";
- sha256 = "1kidpd1xrfax3v31q93r9g9b7jd841476q47wgd94h1a86b70gs9";
+ sha256 = "08xrcinfm1a7hjycf8la7gnsxbp3six70ks987dr7j42kd42irfq";
};
buildInputs = [ glib ncurses mpd_clientlib boost ]
diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix
index f284dd3dac1a7..2fcbf82107d60 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/pkgs/applications/audio/ncspot/default.nix
@@ -14,16 +14,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
- version = "0.2.0";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
- sha256 = "0b2g5bd04zh1hcrhkgd2srx9gl94da4gpy9arjcvrldschjxjza1";
+ sha256 = "1i17pidw2hylijwfn96f2bnswfxxwdln2ydsq8b1q4hfzfbxlfk2";
};
- cargoSha256 = "1gbhvmg7jfmx0b694rdr3s2zs33d4s645gw1lrxvwffif4mg8fy9";
+ cargoSha256 = "1cpy4wrj9dz2crva4p18f8hzym73x4m2mcfds4ppri4ir7qg29dr";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
diff --git a/pkgs/applications/audio/netease-cloud-music/default.nix b/pkgs/applications/audio/netease-cloud-music/default.nix
deleted file mode 100644
index c4cc291d026c9..0000000000000
--- a/pkgs/applications/audio/netease-cloud-music/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{ stdenv, lib, fontconfig, zlib, libGL, glib, pango
-, gdk-pixbuf, freetype, atk, cairo, libsForQt5, xorg
-, sqlite, taglib, nss, nspr, cups, dbus, alsaLib
-, libpulseaudio, deepin, qt5, harfbuzz, p11-kit
-, libgpgerror, libudev0-shim, makeWrapper, dpkg, fetchurl }:
-let
- rpath = lib.makeLibraryPath [
- fontconfig.lib
- zlib
- stdenv.cc.cc.lib
- libGL
- glib
- pango
- gdk-pixbuf
- freetype
- atk
- cairo
- libsForQt5.vlc
- sqlite
- taglib
- nss
- nspr
- cups.lib
- dbus.lib
- alsaLib
- libpulseaudio
- xorg.libX11
- xorg.libXext
- xorg.libXtst
- xorg.libXdamage
- xorg.libXScrnSaver
- xorg.libxcb
- xorg.libXi
- deepin.qcef
- qt5.qtwebchannel
- qt5.qtbase
- qt5.qtx11extras
- qt5.qtdeclarative
- harfbuzz
- p11-kit
- libgpgerror
- ];
-
- runtimeLibs = lib.makeLibraryPath [ libudev0-shim ];
-
-in stdenv.mkDerivation rec {
- pname = "netease-cloud-music";
- version = "1.2.0";
- src = fetchurl {
- url = "http://d1.music.126.net/dmusic/netease-cloud-music_1.2.0_amd64_deepin_stable_20190424.deb";
- sha256 = "0hg8jqim77vd0fmk8gfbz2fmlj99byxcm9jn70xf7vk1sy7wp6h1";
- curlOpts = "-A 'Mozilla/5.0'";
- };
- unpackCmd = "${dpkg}/bin/dpkg -x $src .";
- sourceRoot = ".";
-
- nativeBuildInputs = [ qt5.wrapQtAppsHook makeWrapper ];
-
- installPhase = ''
- mkdir -p $out
- cp -r usr/* $out
- '';
-
- preFixup = ''
- local exefile="$out/bin/netease-cloud-music"
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exefile"
- patchelf --set-rpath "$out/libs:$(patchelf --print-rpath "$exefile"):${rpath}" "$exefile"
-
- wrapProgram $out/bin/netease-cloud-music \
- --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
- --set QCEF_INSTALL_PATH "${deepin.qcef}/lib/qcef"
- '';
-
- meta = {
- description = "Client for Netease Cloud Music service";
- homepage = "https://music.163.com";
- platforms = [ "i686-linux" "x86_64-linux" ];
- maintainers = [ stdenv.lib.maintainers.mlatus ];
- license = stdenv.lib.licenses.unfreeRedistributable;
- };
-}
diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix
index 310c0f99b105a..1739d27870a0b 100644
--- a/pkgs/applications/audio/noisetorch/default.nix
+++ b/pkgs/applications/audio/noisetorch/default.nix
@@ -15,6 +15,8 @@ buildGoModule rec {
vendorSha256 = null;
+ doCheck = false;
+
subPackages = [ "." ];
buildInputs = [ rnnoise-plugin ];
diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
index 9d6b7dcf7f1f4..c5d20d965b9fe 100644
--- a/pkgs/applications/audio/padthv1/default.nix
+++ b/pkgs/applications/audio/padthv1/default.nix
@@ -2,11 +2,11 @@
mkDerivation rec {
pname = "padthv1";
- version = "0.9.15";
+ version = "0.9.16";
src = fetchurl {
url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz";
- sha256 = "18ma429kamifcvjmsv0hysxk7qn2r9br4fia929bvfccapck98y1";
+ sha256 = "1f2v60dpja0rnml60g463fjiz0f84v32yjwpvr56z79h1i6fssmv";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix
index e4728b9b9c450..b9babddb800f3 100644
--- a/pkgs/applications/audio/parlatype/default.nix
+++ b/pkgs/applications/audio/parlatype/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "parlatype";
- version = "2.0";
+ version = "2.1";
src = fetchFromGitHub {
owner = "gkarsay";
repo = pname;
rev = "v${version}";
- sha256 = "026i19vkdq35rldbjp1wglamr22a1330iv736mmgbd8fs7vz22nx";
+ sha256 = "1k53q0kbwpnbgyr0lmfzf5sm4f93d8nbjrzdz9pdhzpxgihndg25";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index c080d0a95f3b5..2aeae1f189010 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -12,13 +12,13 @@ let
;
in pythonPackages.buildPythonApplication rec {
pname = "picard";
- version = "2.3.2";
+ version = "2.4.2";
src = fetchFromGitHub {
owner = "metabrainz";
repo = pname;
rev = "release-${version}";
- sha256 = "1785wnxhasp4j8w2a8bgbfp3gyhc7zac18r5fqw5qcndz2hfk5mc";
+ sha256 = "0sbccsisk9w0gnblvhg7wk1c5ydppldjbvaa0zhl3yrid5a363ah";
};
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]
@@ -37,6 +37,7 @@ in pythonPackages.buildPythonApplication rec {
mutagen
chromaprint
discid
+ dateutil
];
prePatch = ''
diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index a0813fa0c8018..47ea078c4b2d2 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -1,37 +1,34 @@
-{ stdenv, fetchFromGitHub, python2Packages, chromaprint }:
+{ stdenv, fetchFromGitHub, python3Packages, chromaprint }:
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "puddletag";
- version = "1.2.0";
+ version = "2.0.1";
src = fetchFromGitHub {
- owner = "keithgg";
- repo = "puddletag";
- rev = "v${version}";
- sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz";
+ owner = "keithgg";
+ repo = "puddletag";
+ rev = version;
+ sha256 = "sha256-9l8Pc77MX5zFkOqU00HFS8//3Bzd2OMnVV1brmWsNAQ=";
};
- setSourceRoot = ''
- sourceRoot=$(echo */source)
- '';
+ sourceRoot = "source/source";
- disabled = python2Packages.isPy3k; # work to support python 3 has not begun
-
- propagatedBuildInputs = [ chromaprint ] ++ (with python2Packages; [
+ propagatedBuildInputs = [ chromaprint ] ++ (with python3Packages; [
configobj
mutagen
pyparsing
- pyqt4
+ pyqt5
]);
doCheck = false; # there are no tests
+
dontStrip = true; # we are not generating any binaries
meta = with stdenv.lib; {
description = "An audio tag editor similar to the Windows program, Mp3tag";
- homepage = "https://docs.puddletag.net";
- license = licenses.gpl3;
+ homepage = "https://docs.puddletag.net";
+ license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
- platforms = platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix
index 75990d593dfe4..c0986880c0942 100644
--- a/pkgs/applications/audio/pulseaudio-dlna/default.nix
+++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix
@@ -4,7 +4,7 @@
, faacSupport ? false, faac ? null
, flacSupport ? true, flac ? null
, soxSupport ? true, sox ? null
-, vorbisSupport ? true, vorbisTools ? null
+, vorbisSupport ? true, vorbis-tools ? null
}:
assert mp3Support -> lame != null;
@@ -12,7 +12,7 @@ assert opusSupport -> opusTools != null;
assert faacSupport -> faac != null;
assert flacSupport -> flac != null;
assert soxSupport -> sox != null;
-assert vorbisSupport -> vorbisTools != null;
+assert vorbisSupport -> vorbis-tools != null;
let
zeroconf = pythonPackages.callPackage ./zeroconf.nix { };
@@ -37,7 +37,7 @@ pythonPackages.buildPythonApplication {
++ stdenv.lib.optional faacSupport faac
++ stdenv.lib.optional flacSupport flac
++ stdenv.lib.optional soxSupport sox
- ++ stdenv.lib.optional vorbisSupport vorbisTools;
+ ++ stdenv.lib.optional vorbisSupport vorbis-tools;
# upstream has no tests
checkPhase = ''
diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index 12ab8ce2e0636..a3ee0e23ec638 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -30,14 +30,12 @@
, zita-convolver
, zam-plugins
, rubberband
-, mda_lv2
, lsp-plugins
}:
let
lv2Plugins = [
calf # limiter, compressor exciter, bass enhancer and others
- mda_lv2 # loudness
lsp-plugins # delay
];
ladspaPlugins = [
@@ -46,13 +44,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "pulseeffects";
- version = "4.7.3";
+ version = "4.8.0";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
- sha256 = "1xsw3v9vapd8q1dxacdgy2wk0xf3adqwbmcqiimdkd34llbdv88f";
+ sha256 = "9dQNYWBx8iAifRTZr2FRlYv4keZt5Cfahwi/w01duFg=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix
index 5da8f4cd46264..af59bb56eb9ab 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/applications/audio/qsynth/default.nix
@@ -4,11 +4,11 @@
mkDerivation rec {
pname = "qsynth";
- version = "0.6.2";
+ version = "0.6.3";
src = fetchurl {
url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz";
- sha256 = "0cp6vrqrj37rv3a7qfvqrg64j7zwpfj60y5b83mlkzvmg1sgjnlv";
+ sha256 = "0xiqmpzpxjvh32vivfj6h33w0ahmyfjzjb41b6fnf92bbg9k6mqv";
};
nativeBuildInputs = [ autoconf pkgconfig ];
diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index f2ee5eac70fa7..2975e6464e1cb 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "qtractor";
- version = "0.9.14";
+ version = "0.9.15";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
- sha256 = "1gh268gdpj7nw19xfh7k2l3aban4yrs1lmx33qswrnngs2izj1fk";
+ sha256 = "0k7a6llwrzs07flr9mvzvay9ygc2x64syg8npyabsw5a4d85fwsx";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 9de70d83ee5ef..e15addd78b1ed 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "reaper";
- version = "6.10";
+ version = "6.12c";
src = fetchurl {
url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
- sha256 = "1p54phmsa6xbqxb5cpgwnz7ny4famb8zi25y3cmxwgr4pfy94b2p";
+ sha256 = "1xnd4qvgwsz1dmgb656i611776dqcb84m1gh30i8jhpwcr9ym46w";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index 1cbd5b3afa28f..0ae65cb8c3737 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -14,7 +14,7 @@ in
stdenv.mkDerivation rec {
pname = "renoise";
- version = "3.2.1";
+ version = "3.2.2";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
"https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz"
"https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz"
];
- sha256 = "0dhcidgnjzd4abw0xw1waj9mazp03nbvjcr2xx09l8gnfrkvny46";
+ sha256 = "1v249kmyidx55kppk3sry7yg6hl1a91ixhnwz36h4y134fs7bkrl";
}
else
releasePath
diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix
index acec8c54e53c3..b4ff5fc56d56e 100644
--- a/pkgs/applications/audio/sfizz/default.nix
+++ b/pkgs/applications/audio/sfizz/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sfizz";
- version = "0.3.2";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "sfztools";
repo = pname;
rev = version;
- sha256 = "1px22x9lb6wyqfbv1jg1sbl1rsnwrzs8sm4dnas1w4ifchiv3ymd";
+ sha256 = "0zpmvmh7n0064rxfqxb7z9rnz493k7yq7nl0vxppqnasg97jn5f3";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 9bc8fcb66946e..76ea4efeace84 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "snd-20.2";
+ name = "snd-20.3";
src = fetchurl {
url = "mirror://sourceforge/snd/${name}.tar.gz";
- sha256 = "0ip4sfyxqlbghlggipmvvqjqs1a7qas0zcmzw8d1nwg6krjkfj0r";
+ sha256 = "016slh34gb6qqb38m8k9yg48rbhc5p12084szcwvanhh5v7fc7mk";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index 68eefadf41108..cf3f173a096e9 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook
-, python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }:
+{ stdenv, fetchFromGitHub, wrapGAppsHook, gettext
+, python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }:
let
inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools;
@@ -16,26 +16,38 @@ in buildPythonApplication rec {
disabled = !isPy3k;
- nativeBuildInputs = [ pkgconfig gettext ];
+ nativeBuildInputs = [
+ gettext
+ gobject-introspection
+ wrapGAppsHook
+ ];
+
buildInputs = [
- intltool wrapGAppsHook
+ glib
gnome3.adwaita-icon-theme
gsettings-desktop-schemas
+ gtk3
+ gdk-pixbuf
+ ];
+
+ # The optional tagpy dependency (for editing metadata) is not yet
+ # included because it's difficult to build.
+ pythonPath = [
+ dbus-python
+ mpd2
+ pygobject3
+ setuptools
];
+ # Otherwise the setup hook for gobject-introspection is not run:
+ # https://github.com/NixOS/nixpkgs/issues/56943
+ strictDeps = false;
+
postPatch = ''
# Remove "Local MPD" tab which is not suitable for NixOS.
sed -i '/localmpd/d' sonata/consts.py
'';
- propagatedBuildInputs = [
- gobject-introspection gtk3 pygobject3 setuptools
- ];
-
- # The optional tagpy dependency (for editing metadata) is not yet
- # included because it's difficult to build.
- pythonPath = [ dbus-python pygobject3 mpd2 ];
-
meta = {
description = "An elegant client for the Music Player Daemon";
longDescription = ''
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index e8b6a4d4313b8..2593bf38d194b 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -1,8 +1,8 @@
# TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
{ stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
-, libmad, libogg, lrdf, librdf_raptor, librdf_rasqal, libsamplerate
-, libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland
+, libmad, lrdf, librdf_raptor, librdf_rasqal, libsamplerate
+, libsndfile, pkg-config, libpulseaudio, qtbase, qtsvg, redland
, rubberband, serd, sord, vamp-plugin-sdk, fftwFloat
, capnproto, liboggz, libfishsound, libid3tag, opusfile
, wrapQtAppsHook
@@ -10,13 +10,14 @@
stdenv.mkDerivation rec {
pname = "sonic-visualiser";
- version = "4.0.1";
+ version = "4.2";
src = fetchurl {
- url = "https://code.soundsoftware.ac.uk/attachments/download/2607/${pname}-${version}.tar.gz";
- sha256 = "14674adzp3chilymna236qyvci3b1zmi3wyz696wk7bcd3ndpsg6";
+ url = "https://code.soundsoftware.ac.uk/attachments/download/2755/${pname}-${version}.tar.gz";
+ sha256 = "1wsvranhvdl21ksbinbgb55qvs3g2d4i57ssj1vx2aln6m01ms9q";
};
+ nativeBuildInputs = [ pkg-config wrapQtAppsHook ];
buildInputs =
[ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband
libsamplerate vamp-plugin-sdk alsaLib librdf_raptor librdf_rasqal redland
@@ -27,7 +28,6 @@ stdenv.mkDerivation rec {
# portaudio
libpulseaudio
libmad
- libogg # ?
libfishsound
liblo
libX11
@@ -37,15 +37,13 @@ stdenv.mkDerivation rec {
opusfile
];
- nativeBuildInputs = [ pkgconfig wrapQtAppsHook ];
-
- enableParallelBuilding = true;
-
# comment out the tests
preConfigure = ''
sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro
'';
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "View and analyse contents of music audio files";
homepage = "https://www.sonicvisualiser.org/";
diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix
index df5806b50b9e1..3e133a0caa15c 100644
--- a/pkgs/applications/audio/soundkonverter/default.nix
+++ b/pkgs/applications/audio/soundkonverter/default.nix
@@ -1,6 +1,6 @@
# currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery
{
- mkDerivation, fetchFromGitHub, lib, makeWrapper,
+ mkDerivation, fetchFromGitHub, fetchpatch, lib, makeWrapper,
cmake, extra-cmake-modules, pkgconfig,
libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui,
qtbase, phonon,
@@ -53,6 +53,15 @@ mkDerivation rec {
rev = "v" + version;
sha256 = "1g2khdsjmsi4zzynkq8chd11cbdhjzmi37r9jhpal0b730nq9x7l";
};
+ patches = [
+ # already merged into master, so it can go during the next release
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/dfaust/soundkonverter/pull/87.patch";
+ sha256 = "sha256-XIpD4ZMTZVcu+F27OtpRy51H+uQgpd5l22IZ6XsD64w=";
+ name = "soundkonverter_taglib.patch";
+ stripLen = 1;
+ })
+ ];
enableParallelBuilding = true;
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ];
propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon];
diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix
index 16c8623bd7bd8..dd063b2d039c2 100644
--- a/pkgs/applications/audio/spotify-tui/default.nix
+++ b/pkgs/applications/audio/spotify-tui/default.nix
@@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/Rigellute/spotify-tui/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ jwijenbergh ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index ba3c9c4de83b7..f278b68b9223d 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -35,13 +35,13 @@
mkDerivation rec {
pname = "strawberry";
- version = "0.6.13";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
- sha256 = "1v0334aivqyqx611cmhgshknzmrgyynbmxcg70qzrs2lyybw2fc1";
+ sha256 = "sha256-YUR9SDiRV/gJKx4H1cgdDnKGulTQPVP7MpHyihUEgqg=";
};
buildInputs = [
diff --git a/pkgs/applications/audio/surge/default.nix b/pkgs/applications/audio/surge/default.nix
new file mode 100644
index 0000000000000..1614bbfae6678
--- /dev/null
+++ b/pkgs/applications/audio/surge/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitHub, cmake, git, pkg-config, python3
+, cairo, libsndfile, libxcb, libxkbcommon, xcbutil, xcbutilcursor, xcbutilkeysyms, zenity
+}:
+
+stdenv.mkDerivation rec {
+ pname = "surge";
+ version = "1.7.1";
+
+ src = fetchFromGitHub {
+ owner = "surge-synthesizer";
+ repo = pname;
+ rev = "release_${version}";
+ sha256 = "1b3ccc78vrpzy18w7070zfa250dnd1bww147xxcnj457vd6n065s";
+ leaveDotGit = true; # for SURGE_VERSION
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ cmake git pkg-config python3 ];
+ buildInputs = [ cairo libsndfile libxcb libxkbcommon xcbutil xcbutilcursor xcbutilkeysyms zenity ];
+
+ postPatch = ''
+ substituteInPlace src/common/SurgeStorage.cpp --replace "/usr/share/Surge" "$out/share/surge"
+ substituteInPlace src/common/gui/PopupEditorDialog.cpp --replace '"zenity' '"${zenity}/bin/zenity'
+ substituteInPlace src/linux/UserInteractionsLinux.cpp --replace '"zenity' '"${zenity}/bin/zenity'
+ substituteInPlace vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp --replace /usr/bin/zenity ${zenity}/bin/zenity
+ '';
+
+ installPhase = ''
+ mkdir -p $out/lib/lv2 $out/lib/vst3 $out/share/surge
+ cp -r surge_products/Surge.lv2 $out/lib/lv2/
+ cp -r surge_products/Surge.vst3 $out/lib/vst3/
+ cp -r ../resources/data/* $out/share/surge/
+ '';
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ cd ..
+ build/surge-headless
+ '';
+
+ meta = with stdenv.lib; {
+ description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)";
+ homepage = "https://surge-synthesizer.github.io";
+ license = licenses.gpl3;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ magnetophon orivej ];
+ };
+}
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index c7e936d28e508..74f68283fd60d 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
mkDerivation rec {
pname = "synthv1";
- version = "0.9.14";
+ version = "0.9.15";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz";
- sha256 = "08n83krkak20924flb9azhm9hn40lyfvn29m63zs3lw3wajf0b40";
+ sha256 = "047y2l7ipzv00ly54f074v6p043xjml7vz0svc7z81bhx74vs0ix";
};
buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ];
diff --git a/pkgs/applications/audio/talentedhack/default.nix b/pkgs/applications/audio/talentedhack/default.nix
new file mode 100644
index 0000000000000..b30cf59f7b30e
--- /dev/null
+++ b/pkgs/applications/audio/talentedhack/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, lv2, fftwFloat, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ pname = "talentedhack";
+ version = "1.86";
+
+ src = fetchFromGitHub {
+ owner = "jeremysalwen";
+ repo = "talentedhack";
+ rev = "v${version}";
+ sha256 = "0kwvayalysmk7y49jq0k16al252md8d45z58hphzsksmyz6148bx";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ lv2 fftwFloat ];
+
+ # To avoid name clashes, plugins should be compiled with symbols hidden, except for `lv2_descriptor`:
+ preConfigure = ''
+ sed -r 's/^CFLAGS.*$/\0 -fvisibility=hidden/' -i Makefile
+ '';
+
+ installPhase = ''
+ d=$out/lib/lv2/talentedhack.lv2
+ mkdir -p $d
+ cp *.so *.ttl $d
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/jeremysalwen/TalentedHack";
+ description = "LV2 port of Autotalent pitch correction plugin";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.michalrus ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/tamgamp.lv2/default.nix b/pkgs/applications/audio/tamgamp.lv2/default.nix
new file mode 100644
index 0000000000000..9f51f9d022d8f
--- /dev/null
+++ b/pkgs/applications/audio/tamgamp.lv2/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchFromGitHub, pkg-config, lv2, zita-resampler }:
+
+stdenv.mkDerivation rec {
+ pname = "tamgamp.lv2";
+ version = "unstable-2020-06-14";
+
+ src = fetchFromGitHub {
+ owner = "sadko4u";
+ repo = pname;
+ rev = "426da74142fcb6b7687a35b2b1dda3392e171b92";
+ sha256 = "0dqsnim7v79rx13bkkh143gqz0xg26cpf6ya3mrwwprpf5hns2bp";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ lv2 zita-resampler ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/sadko4u/tamgamp.lv2";
+ description = "Guitar amplifier simulator";
+ longDescription = ''
+ Tamgamp (Pronouncement: "Damage Amp") is an LV2 guitar amp simulator that provides two plugins:
+
+ - Tamgamp - a plugin based on Guitarix DK Builder simulated chains.
+ - TamgampGX - a plugin based on tuned Guitarix internal amplifiers implementation.
+
+ The reference to the original Guitarix project: https://guitarix.org/
+
+ It simulates the set of the following guitar amplifiers:
+
+ - Fender Princeton Reverb-amp AA1164 (without reverb module)
+ - Fender Twin Reverb-Amp AA769 (Normal channel, bright off)
+ - Fender Twin Reverb-Amp AA769 (Vibrato channel, bright on)
+ - Marshall JCM-800 High-gain input
+ - Marshall JCM-800 Low-gain input
+ - Mesa/Boogie DC3 preamplifier (lead channel)
+ - Mesa/Boogie DC3 preamplifier (rhythm channel)
+ - Mesa Dual Rectifier preamplifier (orange channel, less gain)
+ - Mesa Dual Rectifier preamplifier (red channel, more gain)
+ - Peavey 5150II crunch channel
+ - Peavey 5150II lead channel
+ - VOX AC-30 Brilliant channel
+ - VOX AC-30 normal channel
+ '';
+ maintainers = [ maintainers.magnetophon ];
+ platforms = platforms.linux;
+ license = licenses.lgpl3Plus;
+ };
+}
diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/applications/audio/tunefish/default.nix
new file mode 100644
index 0000000000000..72802c4f87840
--- /dev/null
+++ b/pkgs/applications/audio/tunefish/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, pkg-config, python3
+, alsaLib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk
+}:
+
+stdenv.mkDerivation {
+ pname = "tunefish";
+ version = "unstable-2020-08-13";
+
+ src = fetchFromGitHub {
+ owner = "jpcima";
+ repo = "tunefish";
+ rev = "b3d83cc66201619f6399500f6897fbeb1786d9ed";
+ fetchSubmodules = true;
+ sha256 = "0rjpq3s609fblzkvnc9729glcnfinmxljh0z8ldpzr245h367zxh";
+ };
+
+ nativeBuildInputs = [ pkg-config python3 ];
+ buildInputs = [ alsaLib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ];
+
+ postPatch = ''
+ patchShebangs src/tunefish4/generate-lv2-ttl.py
+ '';
+
+ makeFlags = [
+ "-C" "src/tunefish4/Builds/LinuxMakefile"
+ "CONFIG=Release"
+ ];
+
+ installPhase = ''
+ mkdir -p $out/lib/lv2
+ cp -r src/tunefish4/Builds/LinuxMakefile/build/Tunefish4.lv2 $out/lib/lv2
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = "https://tunefish-synth.com/";
+ description = "Virtual analog synthesizer LV2 plugin";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ orivej ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/audio/uhhyou.lv2/default.nix b/pkgs/applications/audio/uhhyou.lv2/default.nix
new file mode 100644
index 0000000000000..732e9d8433f64
--- /dev/null
+++ b/pkgs/applications/audio/uhhyou.lv2/default.nix
@@ -0,0 +1,67 @@
+{ stdenv
+, fetchFromGitHub
+, pkg-config
+, python3
+, fftw
+, libGL
+, libX11
+, libjack2
+, liblo
+, lv2
+}:
+
+stdenv.mkDerivation rec {
+ # this is what upstream calls the package, see:
+ # https://github.com/ryukau/LV2Plugins#uhhyou-plugins-lv2
+ pname = "uhhyou.lv2";
+ version = "unstable-2020-07-31";
+
+ src = fetchFromGitHub {
+ owner = "ryukau";
+ repo = "LV2Plugins";
+ rev = "6189be67acaeb95452f8adab73a731d94a7b6f47";
+ fetchSubmodules = true;
+ sha256 = "049gigx2s89z8vf17gscs00c150lmcdwya311nbrwa18fz4bx242";
+ };
+
+ nativeBuildInputs = [ pkg-config python3 ];
+
+ buildInputs = [ fftw libGL libX11 libjack2 liblo lv2 ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ prePatch = ''
+ patchShebangs generate-ttl.sh
+ cp patch/NanoVG.cpp lib/DPF/dgl/src/NanoVG.cpp
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Audio plugins for Linux";
+ longDescription = ''
+ Plugin List:
+ - CubicPadSynth
+ - EnvelopedSine
+ - EsPhaser
+ - FDNCymbal
+ - FoldShaper
+ - IterativeSinCluster
+ - L3Reverb
+ - L4Reverb
+ - LatticeReverb
+ - LightPadSynth
+ - ModuloShaper
+ - OddPowShaper
+ - SevenDelay
+ - SoftClipper
+ - SyncSawSynth
+ - TrapezoidSynth
+ - WaveCymbal
+ '';
+ homepage = "https://github.com/ryukau/LV2Plugins/";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.magnetophon ];
+ };
+}
diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix
new file mode 100644
index 0000000000000..24e112aff2b4f
--- /dev/null
+++ b/pkgs/applications/audio/virtual-ans/default.nix
@@ -0,0 +1,89 @@
+{ stdenv
+, fetchzip
+, libX11
+, libXi
+, libGL
+, alsaLib
+, SDL2
+, autoPatchelfHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "virtual-ans";
+ version = "3.0.2c";
+
+ src = fetchzip {
+ url = "https://warmplace.ru/soft/ans/virtual_ans-${version}.zip";
+ sha256 = "03r1v3l7rd59dakr7ndvgsqchv00ppkvi6sslgf1ng07r3rsvb1n";
+ };
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ ];
+
+ buildInputs = [
+ stdenv.cc.cc.lib
+ libX11
+ libXi
+ libGL
+ alsaLib
+ SDL2
+ ];
+
+ installPhase = ''
+ mkdir -p $out
+ cp -R ./* $out/
+
+ # Remove all executables except for current architecture
+ ls -1d $out/START* | grep -v ${startScript} | xargs rm -rf
+ ls -1d $out/bin/pixilang_linux* | grep -v ${linuxExecutable} | xargs rm -rf
+
+ # Start script performs relative search for resources, so it cannot be moved
+ # to bin directory
+ ln -s $out/${startScript} $out/bin/virtual-ans
+ '';
+
+ startScript = if stdenv.isx86_32 then "START_LINUX_X86"
+ else if stdenv.isx86_64 then "START_LINUX_X86_64"
+ #else if stdenv.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin
+ else abort "Unsupported platform: ${stdenv.platform.kernelArch}.";
+
+ linuxExecutable = if stdenv.isx86_32 then "pixilang_linux_x86"
+ else if stdenv.isx86_64 then "pixilang_linux_x86_64"
+ else "";
+
+ meta = with stdenv.lib; {
+ description = "Photoelectronic microtonal/spectral musical instrument";
+ longDescription = ''
+ Virtual ANS is a software simulator of the unique Russian synthesizer ANS
+ - photoelectronic musical instrument created by Evgeny Murzin from 1938 to
+ 1958. The ANS made it possible to draw music in the form of a spectrogram
+ (sonogram), without live instruments and performers. It was used by
+ Stanislav Kreichi, Alfred Schnittke, Edward Artemiev and other Soviet
+ composers in their experimental works. You can also hear the sound of the
+ ANS in Andrei Tarkovsky's movies Solaris, The Mirror, Stalker.
+
+ The simulator extends the capabilities of the original instrument. Now
+ it's a full-featured graphics editor where you can convert sound into an
+ image, load and play pictures, draw microtonal/spectral music and create
+ some unusual deep atmospheric sounds. This app is for everyone who loves
+ experiments and is looking for something new.
+
+ Key features:
+
+ + unlimited number of pure tone generators;
+ + powerful sonogram editor - you can draw the spectrum and play it at the same time;
+ + any sound (from a WAV file or a Microphone/Line-in) can be converted to image (sonogram) and vice versa;
+ + support for MIDI devices;
+ + polyphonic synth mode with MIDI mapping;
+ + supported file formats: WAV, AIFF, PNG, JPEG, GIF;
+ + supported sound systems: ASIO, DirectSound, MME, ALSA, OSS, JACK, Audiobus, IAA.
+ '';
+ homepage = "https://warmplace.ru/soft/ans/";
+ license = licenses.free;
+ # I cannot test the Darwin version, so I'll leave it disabled
+ platforms = [ "x86_64-linux" "i686-linux" ];
+ maintainers = with maintainers; [ jacg ];
+ };
+
+}
diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix
index 2bc40a78af481..62ae1d2c049f0 100644
--- a/pkgs/applications/audio/vmpk/default.nix
+++ b/pkgs/applications/audio/vmpk/default.nix
@@ -1,26 +1,23 @@
-{ stdenv, fetchurl, cmake, pkgconfig
-, qt4, libjack2
-}:
+{ stdenv, fetchurl, cmake, pkgconfig, alsaLib, libjack2, qt4 }:
-let
- version = "0.5.1";
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "vmpk";
- inherit version;
-
- meta = with stdenv.lib; {
- description = "Virtual MIDI Piano Keyboard";
- homepage = "http://vmpk.sourceforge.net/";
- license = licenses.gpl3Plus;
- platforms = platforms.linux;
- };
+ version = "0.5.1";
src = fetchurl {
- url = "mirror://sourceforge/vmpk/${version}/${pname}-${version}.tar.bz2";
+ url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2";
sha256 = "11fqnxgs9hr9255d93n7lazxzjwn8jpmn23nywdksh0pb1ffvfrc";
};
nativeBuildInputs = [ cmake pkgconfig ];
- buildInputs = [ qt4 libjack2 ];
+ buildInputs = [ alsaLib libjack2 qt4 ];
+
+ meta = with stdenv.lib; {
+ description = "Virtual MIDI Piano Keyboard";
+ homepage = "http://vmpk.sourceforge.net/";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ orivej ];
+ platforms = platforms.linux;
+ };
}
diff --git a/pkgs/applications/audio/vocproc/default.nix b/pkgs/applications/audio/vocproc/default.nix
new file mode 100644
index 0000000000000..ddaa5b790e274
--- /dev/null
+++ b/pkgs/applications/audio/vocproc/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchzip, pkgconfig, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }:
+
+stdenv.mkDerivation rec {
+ pname = "vocproc";
+ version = "0.2.1";
+
+ src = fetchzip {
+ url = "https://hyperglitch.com/files/vocproc/${pname}-${version}.default.tar.gz";
+ sha256 = "07a1scyz14mg2jdbw6fpv4qg91zsw61qqii64n9qbnny9d5pn8n2";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ lv2 fftw lv2-cpp-tools gtkmm2 ];
+
+ makeFlags = [
+ "INSTALL_DIR=$(out)/lib/lv2"
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://hyperglitch.com/dev/VocProc";
+ description = "An LV2 plugin for pitch shifting (with or without formant correction), vocoding, automatic pitch correction and harmonizing of singing voice (harmonizer)";
+ license = licenses.gpl2;
+ maintainers = [ maintainers.michalrus ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix
index 420e267aa82a4..1596ed2d35720 100644
--- a/pkgs/applications/blockchains/bitcoin-abc.nix
+++ b/pkgs/applications/blockchains/bitcoin-abc.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
- version = "0.21.12";
+ version = "0.21.13";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
- sha256 = "1mad3aqfwrxi06135nf8hv13d67nilmxpx4dw5vjcy1zi3lljj1j";
+ sha256 = "1x8xcdi1vcskggk9bqkwr3ah4vi9b7sj2h8hf7spac6dvz8lmzav";
};
patches = [ ./fix-bitcoin-qt-build.patch ];
diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix
index f755efaa0e124..fe39b955a2815 100644
--- a/pkgs/applications/blockchains/bitcoin-unlimited.nix
+++ b/pkgs/applications/blockchains/bitcoin-unlimited.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version;
- version = "1.7.0.0";
+ version = "1.8.0.0";
src = fetchFromGitHub {
owner = "bitcoinunlimited";
repo = "bitcoinunlimited";
- rev = "bucash${version}";
- sha256 = "0lil6rivrj4cnr8a7n8zn9rp9f4h2nk88jjxc29m6dwqn5gk6f1i";
+ rev = "BCHunlimited${version}";
+ sha256 = "01qi15li5x9fvhsmvx7ai5fz6yzqqd3r9yv7081h75jn0nxai49q";
};
nativeBuildInputs = [ pkgconfig autoreconfHook python3 ]
diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix
index 7a4386d23866a..65feac9565b2b 100644
--- a/pkgs/applications/blockchains/bitcoin.nix
+++ b/pkgs/applications/blockchains/bitcoin.nix
@@ -20,16 +20,12 @@
with stdenv.lib;
let
- version = "0.20.0";
+ version = "0.20.1";
majorMinorVersion = versions.majorMinor version;
desktop = fetchurl {
url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop";
sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha";
};
- pixmap = fetchurl {
- url = "https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png";
- sha256 = "08p7j7dg50jlj783kkgdw037klmx0spqjikaprmbkzgcb620r25d";
- };
in
stdenv.mkDerivation rec {
pname = if withGui then "bitcoin" else "bitcoind";
@@ -40,7 +36,7 @@ stdenv.mkDerivation rec {
"https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
];
- sha256 = "ec5a2358ee868d845115dc4fc3ed631ff063c57d5e0a713562d083c5c45efb28";
+ sha256 = "4bbd62fd6acfa5e9864ebf37a24a04bc2dcfe3e3222f056056288d854c53b978";
};
nativeBuildInputs =
@@ -53,7 +49,7 @@ stdenv.mkDerivation rec {
postInstall = optional withGui ''
install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop
- install -Dm644 ${pixmap} $out/share/pixmaps/bitcoin128.png
+ install -Dm644 share/pixmaps/bitcoin128.png $out/share/pixmaps/bitcoin128.png
'';
configureFlags = [
diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix
index 9a8db94401cd7..39d2197626a1f 100644
--- a/pkgs/applications/blockchains/btcdeb/default.nix
+++ b/pkgs/applications/blockchains/btcdeb/default.nix
@@ -7,14 +7,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- pname = "btcdeb";
- version = "0.2.19";
+ pname = "btcdeb-unstable";
+ version = "200806";
src = fetchFromGitHub {
- owner = "kallewoof";
- repo = pname;
- rev = "fb2dace4cd115dc9529a81515cee855b8ce94784";
- sha256 = "0l0niamcjxmgyvc6w0wiygfgwsjam3ypv8mvjglgsj50gyv1vnb3";
+ owner = "bitcoin-core";
+ repo = "btcdeb";
+ rev = "f6708c397c64894c9f9e31bea2d22285d9462de7";
+ sha256 = "0qkmf89z2n7s95vhw3n9vh9dbi14zy4vqw3ffdh1w911jwm5ry3z";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix
index 6777e5998cefb..43de23b68fca4 100644
--- a/pkgs/applications/blockchains/clightning.nix
+++ b/pkgs/applications/blockchains/clightning.nix
@@ -4,11 +4,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "clightning";
- version = "0.8.2.1";
+ version = "0.9.0-1";
src = fetchurl {
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
- sha256 = "02incjr59fv75q6hlrln9h4b5gq7ipd778scbz8b8dahj7x1a6i5";
+ sha256 = "01cwcrqysqsrf96bbbj0grm8j5m46a3acgwy0kzxdx05jdzld9sc";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/blockchains/dcrd.nix b/pkgs/applications/blockchains/dcrd.nix
index 0d59eb670171e..e959eca48aeb1 100644
--- a/pkgs/applications/blockchains/dcrd.nix
+++ b/pkgs/applications/blockchains/dcrd.nix
@@ -2,17 +2,19 @@
buildGoModule rec {
pname = "dcrd";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchFromGitHub {
owner = "decred";
repo = "dcrd";
rev = "refs/tags/release-v${version}";
- sha256 = "1ggw289y1f4dqvj3w60q9bahq8bblbfjymn5xy04ldylr3qlxm9x";
+ sha256 = "14pxajc8si90hnddilfm09kmljwxq6i6p53fk0g09jp000cbklkl";
};
vendorSha256 = "03aw6mcvp1vr01ppxy673jf5hdryd5032cxndlkaiwg005mxp1dy";
+ doCheck = false;
+
subPackages = [ "." "cmd/dcrctl" "cmd/promptsecret" ];
meta = {
diff --git a/pkgs/applications/blockchains/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet.nix
index 0fbd5f33e7242..779e7135618a3 100644
--- a/pkgs/applications/blockchains/dcrwallet.nix
+++ b/pkgs/applications/blockchains/dcrwallet.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "0qrrr92cad399xwr64qa9h41wqqaj0dy5mw248g5v53zars541w7";
+ doCheck = false;
+
subPackages = [ "." ];
meta = {
diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix
index e7a83d7496b6f..83a6cfaf05bfb 100644
--- a/pkgs/applications/blockchains/ergo/default.nix
+++ b/pkgs/applications/blockchains/ergo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
- version = "3.2.7";
+ version = "3.3.1";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
- sha256 = "1ng2q9yp03j8p2xh7rlqad5h4p82ks1l00401pq7m0y02q90szr8";
+ sha256 = "1qr1vfb6mhm2hxl2ksydkhadm7phadn93lwm3f9zni01plk56bb5";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index 0edeccf4003c9..5c3f220764340 100644
--- a/pkgs/applications/blockchains/go-ethereum.nix
+++ b/pkgs/applications/blockchains/go-ethereum.nix
@@ -2,18 +2,20 @@
buildGoModule rec {
pname = "go-ethereum";
- version = "1.9.18";
+ version = "1.9.20";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
- sha256 = "0nkzwmrzk0m9662cr18h5i54v07mw8v3fh0csvqx8n50z5fcvb7b";
+ sha256 = "031cbl8yqw5g5yrm5h1x8s5ckdw2xkym46009l579zvafn2vcnj7";
};
runVend = true;
vendorSha256 = "1744df059bjksvih4653nnvb4kb1xvzdhypd0nnz36m1wrihqssv";
+ doCheck = false;
+
subPackages = [
"cmd/abidump"
"cmd/abigen"
@@ -40,6 +42,6 @@ buildGoModule rec {
homepage = "https://geth.ethereum.org/";
description = "Official golang implementation of the Ethereum protocol";
license = with licenses; [ lgpl3 gpl3 ];
- maintainers = with maintainers; [ adisbladis lionello xrelkd ];
+ maintainers = with maintainers; [ adisbladis lionello xrelkd RaghavSood ];
};
}
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index b84e6bd127ec7..323b9936af56b 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.8.0";
+ version = "2.9.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
- sha256 = "1nj7fjbf99zpmq82kci6wp9nzml8ij1bz96zc77gwzsi0dacjrv5";
+ sha256 = "1ajpmsq4h37w3jzcxijg3myp3mvgbrjis6jrz1cl79m78ripb6cy";
};
appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix
index c1f489ff02b28..831195f06f0d0 100644
--- a/pkgs/applications/blockchains/lnd.nix
+++ b/pkgs/applications/blockchains/lnd.nix
@@ -4,16 +4,18 @@
buildGoModule rec {
pname = "lnd";
- version = "0.10.3-beta";
+ version = "0.11.0-beta";
src = fetchFromGitHub {
owner = "lightningnetwork";
repo = "lnd";
rev = "v${version}";
- sha256 = "129vi8z2sk4hagk7axa675nba6sbj9km88zlq8a1g8di7v2k9z6a";
+ sha256 = "1r1hwz8ka5mnmrvj9zcd78kn68g8fg3d4bdx9i0xy4sc2hh1dcpj";
};
- vendorSha256 = "0a4bk2qry0isnrvl0adwikqn6imxwzlaq5j3nglb5rmwwq2cdz0r";
+ vendorSha256 = "090b9sxvdwh787w0rhrcbky9pbx64qgqx1pvk9ysk3886nxdhf7k";
+
+ doCheck = false;
subPackages = ["cmd/lncli" "cmd/lnd"];
diff --git a/pkgs/applications/blockchains/mist.nix b/pkgs/applications/blockchains/mist.nix
deleted file mode 100644
index 9dd564d715cc8..0000000000000
--- a/pkgs/applications/blockchains/mist.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ stdenv, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv, gtk2 }:
-
-let
- version = "0.11.1";
- pname = "mist";
-
- throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
-
- meta = with stdenv.lib; {
- description = "Browse and use Ðapps on the Ethereum network";
- homepage = "https://github.com/ethereum/mist";
- license = licenses.gpl3;
- maintainers = with maintainers; [];
- platforms = [ "x86_64-linux" "i686-linux" ];
- };
-
- urlVersion = builtins.replaceStrings ["."] ["-"] version;
-
- desktopItem = makeDesktopItem rec {
- name = "Mist";
- exec = "mist";
- icon = "mist";
- desktopName = name;
- genericName = "Mist Browser";
- categories = "Network;";
- };
-
- mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation {
- inherit pname version meta;
-
- src = {
- i686-linux = fetchurl {
- url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux32-${urlVersion}.zip";
- sha256 = "1ffzp9aa0g6w3d5pzp69fljk3sd51cbqdgxa1x16vj106sqm0gj7";
- };
- x86_64-linux = fetchurl {
- url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux64-${urlVersion}.zip";
- sha256 = "0yx4x72l8gk68yh9saki48zgqx8k92xnkm79dc651wdpd5c25cz3";
- };
- }.${stdenv.hostPlatform.system} or throwSystem;
-
- buildInputs = [ unzip makeWrapper ];
-
- buildCommand = ''
- mkdir -p $out/lib/mist $out/bin
- unzip -d $out/lib/mist $src
- ln -s $out/lib/mist/mist $out/bin
- fixupPhase
- mkdir -p $out/share/applications
- ln -s ${desktopItem}/share/applications/* $out/share/applications
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "${atomEnv.libPath}:${gtk2}/lib:$out/lib/mist" \
- $out/lib/mist/mist
- '';
- });
-in
-buildFHSUserEnv {
- name = "mist";
- inherit meta;
-
- targetPkgs = pkgs: with pkgs; [
- mist
- ];
-
- extraInstallCommands = ''
- mkdir -p "$out/share/applications"
- cp "${desktopItem}/share/applications/"* $out/share/applications
- '';
-
- runScript = "mist";
-}
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
index e42f0ddc96e24..6ea075e2a369e 100644
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/pkgs/applications/blockchains/monero-gui/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "monero-gui";
- version = "0.16.0.2";
+ version = "0.16.0.3";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
- sha256 = "1b1m8vhs0hdh81ysm8s8vfwqskqsihylb51wz16kc98ba40r9gqg";
+ sha256 = "0iwjp8x5swy8i8pzrlm5v55awhm54cf48pm1vz98lcq361lhfzk6";
};
nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix
index 569a9b17045c7..f1186564119ff 100644
--- a/pkgs/applications/blockchains/monero/default.nix
+++ b/pkgs/applications/blockchains/monero/default.nix
@@ -10,13 +10,13 @@ assert stdenv.isDarwin -> IOKit != null;
stdenv.mkDerivation rec {
pname = "monero";
- version = "0.16.0.1";
+ version = "0.16.0.3";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero";
rev = "v${version}";
- sha256 = "0n2cviqm8radpynx70fc0819k1xknjc58cvb4whlc49ilyvh8ky6";
+ sha256 = "1r9x3712vhb24dxxirfiwj5f9x0h4m7x0ngiiavf5983dfdlgz33";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix
new file mode 100644
index 0000000000000..77e603e8380be
--- /dev/null
+++ b/pkgs/applications/blockchains/mycrypto/default.nix
@@ -0,0 +1,59 @@
+{ lib, appimageTools, fetchurl, makeDesktopItem
+, gsettings-desktop-schemas, gtk2
+}:
+
+let
+ pname = "MyCrypto";
+ version = "1.7.12";
+ sha256 = "0zmdmkli9zxygrcvrd4lbi0xqyq32dqlkxby8lsjknj1nd6l26n3";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/mycryptohq/mycrypto/releases/download/${version}/linux-x86-64_${version}_MyCrypto.AppImage";
+ inherit sha256;
+ };
+
+ appimageContents = appimageTools.extractType2 {
+ inherit name src;
+ };
+
+ desktopItem = makeDesktopItem {
+ name = pname;
+ desktopName = pname;
+ comment = "MyCrypto is a free, open-source interface for interacting with the blockchain";
+ exec = pname;
+ icon = "mycrypto";
+ categories = "Finance;";
+ };
+
+in appimageTools.wrapType2 rec {
+ inherit name src;
+
+ profile = ''
+ export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk2}/share/gsettings-schemas/${gtk2.name}:$XDG_DATA_DIRS
+ '';
+
+ multiPkgs = null; # no p32bit needed
+ extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
+
+ extraInstallCommands = ''
+ mv $out/bin/{${name},${pname}}
+
+ mkdir -p $out/share
+ cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons
+ chmod -R +w $out/share
+ mv $out/share/icons/hicolor/{0x0,256x256}
+ '';
+
+ meta = with lib; {
+ description = "A free, open-source interface for interacting with the blockchain";
+ longDescription = ''
+ MyCrypto is an open-source, client-side tool for generating ether wallets,
+ handling ERC-20 tokens, and interacting with the blockchain more easily.
+ '';
+ homepage = "https://mycrypto.com";
+ license = licenses.mit;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ oxalica ];
+ };
+}
diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix
index d52d87b9571c3..548213a52fdf6 100644
--- a/pkgs/applications/blockchains/namecoin.nix
+++ b/pkgs/applications/blockchains/namecoin.nix
@@ -3,14 +3,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "nc0.20.0";
+ version = "nc0.20.1";
name = "namecoin" + toString (optional (!withGui) "d") + "-" + version;
src = fetchFromGitHub {
owner = "namecoin";
repo = "namecoin-core";
rev = version;
- sha256 = "115nlsq5g169mj4qjmkhxx1bnx740871zqyng9zbm2y4i0xf71c4";
+ sha256 = "1wpfp9y95lmfg2nk1xqzchwck1wk6gwkya1rj07mf5in9jngxk9z";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/blockchains/parity/default.nix b/pkgs/applications/blockchains/openethereum/default.nix
similarity index 69%
rename from pkgs/applications/blockchains/parity/default.nix
rename to pkgs/applications/blockchains/openethereum/default.nix
index a2428ed01ed53..7d5acc62050de 100644
--- a/pkgs/applications/blockchains/parity/default.nix
+++ b/pkgs/applications/blockchains/openethereum/default.nix
@@ -9,17 +9,19 @@
}:
rustPlatform.buildRustPackage rec {
- pname = "parity";
- version = "3.0.0";
+ pname = "openethereum";
+ version = "3.0.1";
src = fetchFromGitHub {
- owner = "paritytech";
- repo = "parity-ethereum";
+ owner = "openethereum";
+ repo = "openethereum";
rev = "v${version}";
- sha256 = "124km8c2d7877yzd885wzlcl3gky15isx0z2l1qg1q3cqdsb5mjf";
+ sha256 = "08dkcrga1x18csh6pw6f54x5xwijppyjhg46cf4p452xc1l3a6ir";
};
- cargoSha256 = "0m4pms7agfyqk6gz6fwxdl8jmcyhphhzh3x4vykbi6186y7a8ihq";
+ cargoSha256 = "1xliragihwjfc5qmfm0ng519bw8a28m1w1yqcl9mpk8zywiybaah";
+
+ cargoPatches = [ ./lock.patch ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
nativeBuildInputs = [
@@ -38,7 +40,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Fast, light, robust Ethereum implementation";
- homepage = "http://parity.io";
+ homepage = "http://parity.io/ethereum";
license = licenses.gpl3;
maintainers = with maintainers; [ akru xrelkd ];
platforms = platforms.linux;
diff --git a/pkgs/applications/blockchains/openethereum/lock.patch b/pkgs/applications/blockchains/openethereum/lock.patch
new file mode 100644
index 0000000000000..66709480bb720
--- /dev/null
+++ b/pkgs/applications/blockchains/openethereum/lock.patch
@@ -0,0 +1,20 @@
+--- /nix/store/hv764a65zmfzw5scjhz5839agv10da6x-source/Cargo.lock 1969-12-31 16:00:01.000000000 -0800
++++ ./Cargo.lock 2020-07-31 21:30:31.146750066 -0700
+@@ -3113,7 +3113,7 @@
+
+ [[package]]
+ name = "openethereum"
+-version = "3.0.0"
++version = "3.0.1"
+ dependencies = [
+ "ansi_term",
+ "atty",
+@@ -3562,7 +3562,7 @@
+
+ [[package]]
+ name = "parity-version"
+-version = "3.0.0"
++version = "3.0.1"
+ dependencies = [
+ "parity-bytes",
+ "rlp",
diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix
index a098f14668e51..3b4ec1c49c4ca 100644
--- a/pkgs/applications/blockchains/wasabiwallet/default.nix
+++ b/pkgs/applications/blockchains/wasabiwallet/default.nix
@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "wasabiwallet";
- version = "1.1.11.1";
+ version = "1.1.12";
src = fetchurl {
- url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz";
- sha256 = "04v8f2h67aqvcb5a8vmzbp2sqnq7g4m0v1ng52ccb4ii668ya8hy";
+ url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
+ sha256 = "0nfd0pwsgrkaxcxfs8wb3i8kslfcqnc91iahw3rmlcxdzb81kjs4";
};
dontBuild = true;
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index f1e680f60e673..605d810b3d9c6 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -200,7 +200,7 @@ in runCommand
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; rec {
stable = [ meutraa ];
- beta = [ galagora ];
+ beta = [ meutraa ];
canary = [ meutraa ];
dev = canary;
}."${channel}";
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index c699f111e1e09..e84d2e9dac1af 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, makeFontsConf, gnome2 }:
+{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv }:
let
mkStudio = opts: callPackage (import ./common.nix opts) {
@@ -6,6 +6,7 @@ let
fontDirectories = [];
};
inherit (gnome2) GConf gnome_vfs;
+ inherit buildFHSUserEnv;
};
stableVersion = {
version = "4.0.1.0"; # "Android Studio 4.0.1"
@@ -13,14 +14,14 @@ let
sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j";
};
betaVersion = {
- version = "4.1.0.14"; # "Android Studio 4.1 Beta 4"
- build = "201.6667167";
- sha256Hash = "11lkwcbzdl86cyz4lci65cx9z5jjhrc4z40maqx2r5hw1xka9290";
+ version = "4.1.0.17"; # "Android Studio 4.1 RC 2"
+ build = "201.6776251";
+ sha256Hash = "sha256-3W+eUcffRk7lZxbvf3X/Np4hkwAUqU51sQ061XR7Ddc=";
};
latestVersion = { # canary & dev
- version = "4.2.0.5"; # "Android Studio 4.2 Canary 5"
- build = "201.6682321";
- sha256Hash = "076q6d7kmi0wcsqak7n6ggp1qns4xj1134xcpdzb92qk3dmg3wrh";
+ version = "4.2.0.8"; # "Android Studio 4.2 Canary 8"
+ build = "202.6787931";
+ sha256Hash = "0y5fzr22dknzxay1bhd1ymhdnmdrpccdw8dswy2z9bxjsvq65n62";
};
in {
# Attributes are named by their corresponding release channels
diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix
index 3e01bcdb0f9d5..9d5978e605ae3 100644
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/pkgs/applications/editors/brackets/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf
+{ stdenv, lib, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf
, cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }:
with stdenv.lib;
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
rmdir $out/usr
ln -sf $out/opt/brackets/brackets $out/bin/brackets
- ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0
+ ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0
substituteInPlace $out/opt/brackets/brackets.desktop \
--replace "Exec=/opt/brackets/brackets" "Exec=brackets"
diff --git a/pkgs/applications/editors/code-browser/default.nix b/pkgs/applications/editors/code-browser/default.nix
new file mode 100644
index 0000000000000..11476cae702e6
--- /dev/null
+++ b/pkgs/applications/editors/code-browser/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, fetchurl
+, copper
+, ruby
+, python3
+, qtbase
+, gtk3
+, pkg-config
+, withQt ? false
+, withGtk ? false, wrapQtAppsHook ? null
+}:
+stdenv.mkDerivation rec {
+ pname = "code-browser";
+ version = "7.1.20";
+ src = fetchurl {
+ url = "https://tibleiz.net/download/code-browser-${version}-src.tar.gz";
+ sha256 = "1svi0v3h42h2lrb8c7pjvqc8019v1p20ibsnl48pfhl8d96mmdnz";
+ };
+ postPatch = ''
+ substituteInPlace Makefile --replace "LFLAGS=-no-pie" "LFLAGS=-no-pie -L."
+ substituteInPlace libs/copper-ui/Makefile --replace "moc -o" "${qtbase.dev}/bin/moc -o"
+ patchShebangs .
+ '';
+ nativeBuildInputs = [ copper
+ python3
+ ruby
+ qtbase
+ gtk3
+ pkg-config
+ ]
+ ++ stdenv.lib.optionals withQt [ wrapQtAppsHook ];
+ buildInputs = stdenv.lib.optionals withQt [ qtbase ]
+ ++ stdenv.lib.optionals withGtk [ gtk3 ];
+ makeFlags = [
+ "prefix=$(out)"
+ "COPPER=${copper}/bin/copper-elf64"
+ "with-local-libs"
+ "QINC=${qtbase.dev}/include"
+ ]
+ ++ stdenv.lib.optionals withQt [ "UI=qt" ]
+ ++ stdenv.lib.optionals withGtk [ "UI=gtk" ];
+ meta = with stdenv.lib; {
+ description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code.";
+ homepage = "https://tibleiz.net/code-browser/";
+ license = licenses.gpl2;
+ platforms = platforms.x86_64;
+ };
+}
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index b1b33dc9354b4..a56cb73fb2457 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -19,10 +19,10 @@
elpaBuild {
pname = "ack";
ename = "ack";
- version = "1.8";
+ version = "1.10";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ack-1.8.tar";
- sha256 = "1d4218km7j1bx1fsna29j3gi3k2ak2fzbk1gyki327pnnlma6bav";
+ url = "https://elpa.gnu.org/packages/ack-1.10.tar";
+ sha256 = "0jz8badhjpzjlrprpzgcm1z6ask1ykc7ab62ixjrj9wcgfjif5qw";
};
packageRequires = [];
meta = {
@@ -39,10 +39,10 @@
elpaBuild {
pname = "ada-mode";
ename = "ada-mode";
- version = "7.1.1";
+ version = "7.1.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ada-mode-7.1.1.tar";
- sha256 = "11ch0dn478ddzkcjcyqf2rjim7w0fjb8xfijqxxi07847w4gkklp";
+ url = "https://elpa.gnu.org/packages/ada-mode-7.1.4.tar";
+ sha256 = "13zcs7kn7rca82c80qshbdpmmmgkf5phr88hf7p5nwxqhkazy9cd";
};
packageRequires = [ emacs uniquify-files wisi ];
meta = {
@@ -54,10 +54,10 @@
elpaBuild {
pname = "ada-ref-man";
ename = "ada-ref-man";
- version = "2012.5";
+ version = "2020.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ada-ref-man-2012.5.tar";
- sha256 = "0n7izqc44i3l6fxbzkq9gwwlcf04rr9g1whrk8biz84jhbyh23x8";
+ url = "https://elpa.gnu.org/packages/ada-ref-man-2020.1.tar";
+ sha256 = "1g4brb9g2spd55issyqldfc4azwilbrz8kh8sl0lka2kn42l3qqc";
};
packageRequires = [];
meta = {
@@ -223,10 +223,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
- version = "12.2.1";
+ version = "12.2.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/auctex-12.2.1.tar";
- sha256 = "14y0kdri2zvz81qwpncsr3ly4ciqab6g8yxl956k3ddn36b3a56s";
+ url = "https://elpa.gnu.org/packages/auctex-12.2.4.tar";
+ sha256 = "1yz2h692mr35zgqwlxdq8rzv8n0jixhpaqmbiki00hlysm4zh9py";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -557,10 +557,10 @@
elpaBuild {
pname = "company";
ename = "company";
- version = "0.9.12";
+ version = "0.9.13";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/company-0.9.12.tar";
- sha256 = "1vcgfccdc06alba3jl6dg7ms20wdzdhaqikh7id5lbawb00hc10j";
+ url = "https://elpa.gnu.org/packages/company-0.9.13.tar";
+ sha256 = "1c9x9wlzzsn7vrsm57l2l44nqx455saa6wrm853szzg09qn8dlnw";
};
packageRequires = [ emacs ];
meta = {
@@ -636,6 +636,36 @@
license = lib.licenses.free;
};
}) {};
+ counsel = callPackage ({ elpaBuild, emacs, fetchurl, lib, swiper }:
+ elpaBuild {
+ pname = "counsel";
+ ename = "counsel";
+ version = "0.13.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/counsel-0.13.1.el";
+ sha256 = "1y3hr3j5bh5mbyh1cqzxx04181qpvj4xyv1gym2gxcjd30nfllli";
+ };
+ packageRequires = [ emacs swiper ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/counsel.html";
+ license = lib.licenses.free;
+ };
+ }) {};
+ cpio-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "cpio-mode";
+ ename = "cpio-mode";
+ version = "0.16";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/cpio-mode-0.16.tar";
+ sha256 = "06xdifgx45aghfppz5dws3v6w37q84lwgxp1pc51p2jjflqbqy5q";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/cpio-mode.html";
+ license = lib.licenses.free;
+ };
+ }) {};
crisp = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "crisp";
@@ -730,10 +760,10 @@
elpaBuild {
pname = "debbugs";
ename = "debbugs";
- version = "0.22";
+ version = "0.25";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/debbugs-0.22.tar";
- sha256 = "05ik9qv539b5c1nzxkk3lk23bqj4vqgmfmd8x367abhb7c9gix2z";
+ url = "https://elpa.gnu.org/packages/debbugs-0.25.tar";
+ sha256 = "0h0pxav170yzfpjf4vb8simiw67x9dkcjx9m4ghdk6wia25y8jni";
};
packageRequires = [ emacs soap-client ];
meta = {
@@ -745,10 +775,10 @@
elpaBuild {
pname = "delight";
ename = "delight";
- version = "1.5";
+ version = "1.7";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/delight-1.5.el";
- sha256 = "0kzlvzwmn6zj0874086q2xw0pclyi7wlkq48zh2lkd2796xm8vw7";
+ url = "https://elpa.gnu.org/packages/delight-1.7.el";
+ sha256 = "0pihsghrf9xnd1kqlq48qmjcmp5ra95wwwgrb3l8m1wagmmc0bi1";
};
packageRequires = [ cl-lib nadvice ];
meta = {
@@ -925,10 +955,10 @@
elpaBuild {
pname = "ebdb";
ename = "ebdb";
- version = "0.6.17";
+ version = "0.6.18";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ebdb-0.6.17.tar";
- sha256 = "07335pcqvvj1apzbwy4dc4i6pc6w21hr7v9fvgkc9c2x7fqlqg24";
+ url = "https://elpa.gnu.org/packages/ebdb-0.6.18.tar";
+ sha256 = "0znbv3c7wdgak1f1zb051vg4r29fksqh53k1j77jfmqcvwkpz2mw";
};
packageRequires = [ cl-lib emacs seq ];
meta = {
@@ -970,10 +1000,10 @@
elpaBuild {
pname = "ediprolog";
ename = "ediprolog";
- version = "1.2";
+ version = "2.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ediprolog-1.2.el";
- sha256 = "039ffvp7c810mjyargmgw1i87g0z8qs8qicq826sd9aiz9hprfaz";
+ url = "https://elpa.gnu.org/packages/ediprolog-2.1.el";
+ sha256 = "1piimsmzpirw8plrpy79xbpnvynzzhcxi31g6lg6is8gridiv3md";
};
packageRequires = [];
meta = {
@@ -1040,10 +1070,10 @@
elpaBuild {
pname = "eldoc";
ename = "eldoc";
- version = "1.0.0";
+ version = "1.8.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/eldoc-1.0.0.el";
- sha256 = "0jdqnndvpz929rbfgrm2bgw3z2vp7dvvgk3wnhvlhf63mdiza89m";
+ url = "https://elpa.gnu.org/packages/eldoc-1.8.0.el";
+ sha256 = "1zxy9x9a0yqwdi572jj04x9lyj3d87mpyfbn3092a5nqwc864k9w";
};
packageRequires = [ emacs ];
meta = {
@@ -1085,10 +1115,10 @@
elpaBuild {
pname = "elisp-benchmarks";
ename = "elisp-benchmarks";
- version = "1.4";
+ version = "1.7";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.4.tar";
- sha256 = "18ia04aq4pqa8374x60g3g66jqmm17c6n904naa0jhqphlgam8pb";
+ url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.7.tar";
+ sha256 = "1ps28bvh87d98k84ygx374a1kbwvnqm4w8jpkgzic01as78hgkiz";
};
packageRequires = [];
meta = {
@@ -1096,6 +1126,21 @@
license = lib.licenses.free;
};
}) {};
+ emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+ elpaBuild {
+ pname = "emms";
+ ename = "emms";
+ version = "5.42";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/emms-5.42.tar";
+ sha256 = "1khx1fvllrs6w9kxk12mp1hj309c90mc7lkq1vvlqlr7vd6zmnpj";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/emms.html";
+ license = lib.licenses.free;
+ };
+ }) {};
enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "enwc";
@@ -1187,10 +1232,10 @@
elpaBuild {
pname = "exwm";
ename = "exwm";
- version = "0.23";
+ version = "0.24";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/exwm-0.23.tar";
- sha256 = "05w1v3wrp1lzz20zd9lcvr5nhk809kgy6svvkbs15xhnr6x55ad5";
+ url = "https://elpa.gnu.org/packages/exwm-0.24.tar";
+ sha256 = "0lj1a3cmbpf4h6x8k6x8cdm1qb51ca6filydnvi5zcda8zpl060s";
};
packageRequires = [ xelb ];
meta = {
@@ -1243,16 +1288,16 @@
license = lib.licenses.free;
};
}) {};
- flymake = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "flymake";
ename = "flymake";
- version = "1.0.8";
+ version = "1.0.9";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/flymake-1.0.8.el";
- sha256 = "1hqxrqb227v4ncjjqx8im3c4mhg8w5yjbz9hpfcm5x8xnr2yd6bp";
+ url = "https://elpa.gnu.org/packages/flymake-1.0.9.el";
+ sha256 = "0xm1crhjcs14iqkf481igbf40wj2ib3hjzinw1gn8w1n0462ymp6";
};
- packageRequires = [ emacs ];
+ packageRequires = [ eldoc emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/flymake.html";
license = lib.licenses.free;
@@ -1292,10 +1337,10 @@
elpaBuild {
pname = "frog-menu";
ename = "frog-menu";
- version = "0.2.10";
+ version = "0.2.11";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/frog-menu-0.2.10.el";
- sha256 = "050qikvgh9v7kgvhznjsfrpyhs7iq1x63bryqdkrwlf668yhzi1m";
+ url = "https://elpa.gnu.org/packages/frog-menu-0.2.11.el";
+ sha256 = "06iw11z61fd0g4w3562k3smcmzaq3nivvvc6gzm8y8k5pcrqzdff";
};
packageRequires = [ avy emacs posframe ];
meta = {
@@ -1591,10 +1636,10 @@
elpaBuild {
pname = "hyperbole";
ename = "hyperbole";
- version = "7.0.6";
+ version = "7.1.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/hyperbole-7.0.6.tar";
- sha256 = "08gi4v76s53nfmn3s0qcxc3zii0pspjfd6ry7jq1kgm3z34x8hab";
+ url = "https://elpa.gnu.org/packages/hyperbole-7.1.2.tar";
+ sha256 = "1bspmqnbniwr9385wh823dsr5fgch5qnlkf45s4vi0nvg8jdccp1";
};
packageRequires = [ emacs ];
meta = {
@@ -1636,10 +1681,10 @@
elpaBuild {
pname = "ivy";
ename = "ivy";
- version = "0.13.0";
+ version = "0.13.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ivy-0.13.0.tar";
- sha256 = "18r9vb9v7hvdkylchn436sgh7ji9avhry1whjip8zrn0c1bnqmk8";
+ url = "https://elpa.gnu.org/packages/ivy-0.13.1.tar";
+ sha256 = "0n0ixhdykbdpis4krkqq6zncbby28p34742q96n0l91w0p19slcx";
};
packageRequires = [ emacs ];
meta = {
@@ -1726,10 +1771,10 @@
elpaBuild {
pname = "jsonrpc";
ename = "jsonrpc";
- version = "1.0.11";
+ version = "1.0.12";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/jsonrpc-1.0.11.el";
- sha256 = "04cy1mqd6y8k5lcpg076szjk9av9345mmsnzzh6vgbcw3dcgbr23";
+ url = "https://elpa.gnu.org/packages/jsonrpc-1.0.12.el";
+ sha256 = "0cqp05awikbrn88ifld3vwnv6cxgmr83wlnsvxw8bqb96djz70ad";
};
packageRequires = [ emacs ];
meta = {
@@ -1782,6 +1827,21 @@
license = lib.licenses.free;
};
}) {};
+ leaf = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "leaf";
+ ename = "leaf";
+ version = "4.2.5";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/leaf-4.2.5.tar";
+ sha256 = "0y78mp4c2gcwp7dc87wlx3r4hfmap14vvx8gkjc9nkf99qavpnkw";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/leaf.html";
+ license = lib.licenses.free;
+ };
+ }) {};
let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "let-alist";
@@ -2026,10 +2086,10 @@
elpaBuild {
pname = "mmm-mode";
ename = "mmm-mode";
- version = "0.5.7";
+ version = "0.5.8";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/mmm-mode-0.5.7.tar";
- sha256 = "0c4azrkgagyfm9znh7hmw93gkvddpsxlr0dwjp96winymih7mahf";
+ url = "https://elpa.gnu.org/packages/mmm-mode-0.5.8.tar";
+ sha256 = "05ckf4zapdpvnd3sqpw6kxaa567zh536a36m9qzx3sqyjbyn5fb4";
};
packageRequires = [ cl-lib ];
meta = {
@@ -2041,10 +2101,10 @@
elpaBuild {
pname = "modus-operandi-theme";
ename = "modus-operandi-theme";
- version = "0.8.1";
+ version = "0.11.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.8.1.el";
- sha256 = "0i8s6blkhx53m1jk1bblqs7fwlbn57xkxxhsp9famcj5m0xyfimb";
+ url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.11.0.el";
+ sha256 = "11sq105vpp8rmyayfb7h8gz099kfdr7nb8n4pg81iby4fllj1kgd";
};
packageRequires = [ emacs ];
meta = {
@@ -2056,10 +2116,10 @@
elpaBuild {
pname = "modus-vivendi-theme";
ename = "modus-vivendi-theme";
- version = "0.8.1";
+ version = "0.11.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.8.1.el";
- sha256 = "121nlr5w58j4q47rh9xjjf9wzb97yl2m1n2l6g58ck4vnarwndl1";
+ url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.11.0.el";
+ sha256 = "14ky9cxg9cpvhgg24ra0xla2dapqjlf948470q7v0m402x1r2iif";
};
packageRequires = [ emacs ];
meta = {
@@ -2485,10 +2545,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
- version = "0.3.48";
+ version = "0.3.52";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/phps-mode-0.3.48.tar";
- sha256 = "1mnbrsgh6lx7kgkfsfq5zk78a97iwh8mxgxzyf1zq4jj6ziwd6bv";
+ url = "https://elpa.gnu.org/packages/phps-mode-0.3.52.tar";
+ sha256 = "11783i4raw6z326bqin9g37ig2szbqsma1r0fsdckyn2q6w7nn92";
};
packageRequires = [ emacs ];
meta = {
@@ -2530,10 +2590,10 @@
elpaBuild {
pname = "posframe";
ename = "posframe";
- version = "0.7.0";
+ version = "0.8.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/posframe-0.7.0.el";
- sha256 = "1kwl83jb5k1hnx0s2qw972v0gjqbbvk4sdcdb1qbdxsyw36sylc9";
+ url = "https://elpa.gnu.org/packages/posframe-0.8.0.el";
+ sha256 = "1vzaiiw2pxa0zrc2bkaxljpr4035xrh3d8z3l5f0jvp72cnq49kp";
};
packageRequires = [ emacs ];
meta = {
@@ -2541,16 +2601,16 @@
license = lib.licenses.free;
};
}) {};
- project = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ project = callPackage ({ elpaBuild, emacs, fetchurl, lib, xref }:
elpaBuild {
pname = "project";
ename = "project";
- version = "0.1.2";
+ version = "0.5.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/project-0.1.2.el";
- sha256 = "0713hwim1chf6lxpg1rb234aa1gj92c153fjlc4jddp6dzzgn50d";
+ url = "https://elpa.gnu.org/packages/project-0.5.1.el";
+ sha256 = "1i15hlrfipsfrdmgh6xzkr6aszgvik3y8j9363qkj654dl04pmz4";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs xref ];
meta = {
homepage = "https://elpa.gnu.org/packages/project.html";
license = lib.licenses.free;
@@ -2571,6 +2631,21 @@
license = lib.licenses.free;
};
}) {};
+ pspp-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+ elpaBuild {
+ pname = "pspp-mode";
+ ename = "pspp-mode";
+ version = "1.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/pspp-mode-1.1.el";
+ sha256 = "1qnwj7r367qs0ykw71c6s96ximgg2wb3hxg5fwsl9q2vfhbh35ca";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/pspp-mode.html";
+ license = lib.licenses.free;
+ };
+ }) {};
python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "python";
@@ -2620,10 +2695,10 @@
elpaBuild {
pname = "rainbow-mode";
ename = "rainbow-mode";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.4.el";
- sha256 = "0rp76gix1ph1wrmdax6y2m3i9y1dmgv7ikjz8xsl5lizkygsy9cg";
+ url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.5.el";
+ sha256 = "159fps843k5pap9k04a7ll1k3gw6d9c6w08lq4bbc3lqg78aa2l9";
};
packageRequires = [];
meta = {
@@ -2840,10 +2915,10 @@
elpaBuild {
pname = "relint";
ename = "relint";
- version = "1.17";
+ version = "1.18";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/relint-1.17.tar";
- sha256 = "1nv13dqdhf72c1jgk1ml4k6jqb8wsyphcx2vhsyhig5198lg4kd7";
+ url = "https://elpa.gnu.org/packages/relint-1.18.tar";
+ sha256 = "0zfislsksrkn6qs0w26yaff5xr7xqy2x235dcdpz8s2v35b6dhci";
};
packageRequires = [ emacs xr ];
meta = {
@@ -2881,6 +2956,21 @@
license = lib.licenses.free;
};
}) {};
+ rt-liberation = callPackage ({ elpaBuild, fetchurl, lib }:
+ elpaBuild {
+ pname = "rt-liberation";
+ ename = "rt-liberation";
+ version = "1.31";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/rt-liberation-1.31.tar";
+ sha256 = "0qqqqwdkb0h8137rqsr08179skl1475cg4hl7a987rmccys0j83c";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/rt-liberation.html";
+ license = lib.licenses.free;
+ };
+ }) {};
rudel = callPackage ({ cl-generic
, cl-lib ? null
, cl-print
@@ -3067,6 +3157,21 @@
license = lib.licenses.free;
};
}) {};
+ so-long = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "so-long";
+ ename = "so-long";
+ version = "1.0";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/so-long-1.0.el";
+ sha256 = "00z9gnxz32rakd0k7lqaj050fwmqzq5vr9d6rb7ji3fn01rjp7kj";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/so-long.html";
+ license = lib.licenses.free;
+ };
+ }) {};
soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "soap-client";
@@ -3191,10 +3296,10 @@
elpaBuild {
pname = "svg-clock";
ename = "svg-clock";
- version = "1.1";
+ version = "1.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/svg-clock-1.1.el";
- sha256 = "12wf4dd3vgbq1v3363cil4wr2skx60xy546jc69ycyk0jq7plcq3";
+ url = "https://elpa.gnu.org/packages/svg-clock-1.2.el";
+ sha256 = "15pmj07wnlcpv78av9qpnbfwdjlkf237vib8smpa7nvyikdfszfr";
};
packageRequires = [ emacs svg ];
meta = {
@@ -3202,6 +3307,21 @@
license = lib.licenses.free;
};
}) {};
+ swiper = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }:
+ elpaBuild {
+ pname = "swiper";
+ ename = "swiper";
+ version = "0.13.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/swiper-0.13.1.el";
+ sha256 = "06ild7kck0x5ry8bf0al24nh04q01q3jhj6jjl4xz8n2s6jnn70y";
+ };
+ packageRequires = [ emacs ivy ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/swiper.html";
+ license = lib.licenses.free;
+ };
+ }) {};
system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "system-packages";
@@ -3300,10 +3420,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
- version = "2.4.3.4";
+ version = "2.4.4.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/tramp-2.4.3.4.tar";
- sha256 = "01il42xb6s38qnb7bhn9d7gscc5p5y4da5a4dp1i1cyi823sfp8f";
+ url = "https://elpa.gnu.org/packages/tramp-2.4.4.1.tar";
+ sha256 = "0jayd75yscaqvg6y0m6g2mgbjswyj5gqdij2az9g0j18vm5vbqy3";
};
packageRequires = [ emacs ];
meta = {
@@ -3491,10 +3611,10 @@
elpaBuild {
pname = "verilog-mode";
ename = "verilog-mode";
- version = "2020.2.23.232634261";
+ version = "2020.6.27.14326051";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/verilog-mode-2020.2.23.232634261.el";
- sha256 = "07r2nzyfwmpv1299q1v768ai14rdgq7y4bvz5xsnp4qj3g06p0f6";
+ url = "https://elpa.gnu.org/packages/verilog-mode-2020.6.27.14326051.el";
+ sha256 = "194gn8cj01jb9xcl0qq3gq6mzxfdyn459ysb35fnib7pcnafm188";
};
packageRequires = [];
meta = {
@@ -3704,10 +3824,10 @@
elpaBuild {
pname = "wisi";
ename = "wisi";
- version = "3.1.1";
+ version = "3.1.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/wisi-3.1.1.tar";
- sha256 = "0abm9xfyk2izi0w9172sfhdq83abcxgbngngbh2gby54df0ycn0q";
+ url = "https://elpa.gnu.org/packages/wisi-3.1.3.tar";
+ sha256 = "0cbjcm35lp164wd06mn3clikga07qxfsfnkvadswsapsd0cn2b4k";
};
packageRequires = [ emacs seq ];
meta = {
@@ -3724,10 +3844,10 @@
elpaBuild {
pname = "wisitoken-grammar-mode";
ename = "wisitoken-grammar-mode";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.1.0.tar";
- sha256 = "123z9j76cm0p22d9n4kqvn2477fdkgp5jarw564nd71cxrrb52ms";
+ url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.2.0.tar";
+ sha256 = "0isxmpwys148djjymszdm5nisqjp9xff8kad45l4cpb3c717vsjw";
};
packageRequires = [ emacs mmm-mode wisi ];
meta = {
@@ -3810,16 +3930,16 @@
license = lib.licenses.free;
};
}) {};
- xref = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
+ xref = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "xref";
ename = "xref";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/xref-1.0.1.el";
- sha256 = "17wlwilm2d1gvin8mkkqnpw2skjx0klxfs1pqpy8rrzdfpsb55li";
+ url = "https://elpa.gnu.org/packages/xref-1.0.2.el";
+ sha256 = "156rfwdihb3vz31iszbmby16spqswyf69nhl3r2cp6jzkgwzc1d8";
};
- packageRequires = [ emacs project ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/xref.html";
license = lib.licenses.free;
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index f228d34a654ef..c48e342977e30 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -531,6 +531,12 @@ let
(attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
}));
+ orgit-forge = super.orgit-forge.overrideAttrs (attrs: {
+ # searches for Git at build time
+ nativeBuildInputs =
+ (attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
+ });
+
# tries to write to $HOME
php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: {
HOME = "/tmp";
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 4beb5750166dc..b0eccbd888133 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
- version = "20200511";
+ version = "20200817";
src = fetchurl {
- url = "https://orgmode.org/elpa/org-20200511.tar";
- sha256 = "147k6nmq00milw5knyhw01z481rcdl6s30vk4fkjidw508nkmg9c";
+ url = "https://orgmode.org/elpa/org-20200817.tar";
+ sha256 = "159hch9zls3apxq11c5rjpmci1avyl7q3cgsrqxwgnzy8c61104d";
};
packageRequires = [];
meta = {
@@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
- version = "20200511";
+ version = "20200817";
src = fetchurl {
- url = "https://orgmode.org/elpa/org-plus-contrib-20200511.tar";
- sha256 = "1hsdp7n985404zdqj6gyfw1bxxbs0p3bf4fyizvgji21zxwnf63f";
+ url = "https://orgmode.org/elpa/org-plus-contrib-20200817.tar";
+ sha256 = "0n3fhcxjsk2w78p7djna4nlppa7ypjxzpq3r5dmzc8jpl71mipba";
};
packageRequires = [];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index a10df7791039f..98346d4d82ada 100644
--- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
@@ -31,20 +31,20 @@
"url": "https://git.sr.ht/~zge/nullpointer-emacs",
"unstable": {
"version": [
- 20200411,
- 1227
+ 20200521,
+ 1352
],
- "commit": "59136313132c08ab5fddaa875f6abeb22916a04b",
- "sha256": "0acdh1r28v6xcsh39r13xppzqb6m00jgxgsxl17779isw98w9a3y"
+ "commit": "16581d94a1e32677091f3721506a48177cc49e68",
+ "sha256": "08gdycsi5mjz7ak8x71i3zs7xnr23b384bdlf1bspa325k8v2klq"
},
"stable": {
"version": [
0,
3,
- 0
+ 1
],
- "commit": "1d29192a3c28ba088d93410bfcdd4bee0abb6610",
- "sha256": "02kmfzkrl35y599w5yal5d7rjb3xi02zhvb8q0m3iw4mbm16sw28"
+ "commit": "16581d94a1e32677091f3721506a48177cc49e68",
+ "sha256": "08gdycsi5mjz7ak8x71i3zs7xnr23b384bdlf1bspa325k8v2klq"
}
},
{
@@ -322,14 +322,14 @@
"repo": "zk-phi/ac-c-headers",
"unstable": {
"version": [
- 20151021,
- 834
+ 20200816,
+ 1007
],
"deps": [
"auto-complete"
],
- "commit": "de13a1d35b311e6601556d8ef163de102057deea",
- "sha256": "1z6rj15p5gjv0jwnnck8789n9csf1pwxfvsz37graihgfy2khj0y"
+ "commit": "67e1e86a48c9bed57bc7ce5ce2553ad203f5752e",
+ "sha256": "1yk0a4p1pi7jwv48rvzn4i2733kg5ffp0q5vgcq22f98pmzyk77f"
}
},
{
@@ -966,16 +966,16 @@
"stable": {
"version": [
2,
- 2,
- 2
+ 3,
+ 0
],
"deps": [
"ac-php-core",
"auto-complete",
"yasnippet"
],
- "commit": "4490d168778a61a4ee8623defe760164cd9745b8",
- "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m"
+ "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41",
+ "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj"
}
},
{
@@ -1003,8 +1003,8 @@
"stable": {
"version": [
2,
- 2,
- 2
+ 3,
+ 0
],
"deps": [
"dash",
@@ -1014,8 +1014,8 @@
"s",
"xcscope"
],
- "commit": "4490d168778a61a4ee8623defe760164cd9745b8",
- "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m"
+ "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41",
+ "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj"
}
},
{
@@ -1064,8 +1064,8 @@
"auto-complete",
"rtags"
],
- "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710",
- "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr"
+ "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824",
+ "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b"
},
"stable": {
"version": [
@@ -1360,14 +1360,14 @@
"repo": "abo-abo/ace-link",
"unstable": {
"version": [
- 20200515,
- 1854
+ 20200518,
+ 957
],
"deps": [
"avy"
],
- "commit": "b610dcb99510328d07ab1e1ea67b2f87ecb1cc5b",
- "sha256": "0r7cyvrkbqq0dsm5963wn2i1wqgq0md5r8b2afjbr3m9b6v5lnq4"
+ "commit": "298f02f7dd117f9ec01f6aa2a2ddfecae0efb7f4",
+ "sha256": "1i243wfwrbxn00sh96248lpqfb7cvxqqwlc78nf8kim4ymylpp41"
},
"stable": {
"version": [
@@ -1449,8 +1449,8 @@
"deps": [
"avy-menu"
],
- "commit": "02b22bdb40a5828dbd0a2af290034adb761743f0",
- "sha256": "12b6s99d0wzs4q827kn5zr56vrp3x1kf2pxp4cr8z5hikylfswcs"
+ "commit": "390f0711d2a42675980d8b531fd5dc396b85f24b",
+ "sha256": "00va4glq9iibrfrnhinv8a7f5q0z7xvfyxnjf1rl4z770drz9j4n"
},
"stable": {
"version": [
@@ -1473,14 +1473,14 @@
"repo": "abo-abo/ace-window",
"unstable": {
"version": [
- 20200311,
- 1025
+ 20200606,
+ 1259
],
"deps": [
"avy"
],
- "commit": "7003c88cd9cad58dc35c7cd13ebc61c355fb5be7",
- "sha256": "0f3r40d5yxp2pm2j0nn86s29nqj8py0jxjbj50v4ci3hsd92d8jl"
+ "commit": "c7cb315c14e36fded5ac4096e158497ae974bec9",
+ "sha256": "06zkb5v6h0gwrqx7xiz2vlzf13kzf3z79xc5jhv2j73rqcajjy9v"
},
"stable": {
"version": [
@@ -1531,6 +1531,30 @@
"sha256": "02ba4d8qkvgy52g0zcbyfvsnhr9685gq569nkwa2as30xdcq3khm"
}
},
+ {
+ "ename": "acme-theme",
+ "commit": "0bf14d91ff89556671b175d5f7e71066f27cb73d",
+ "sha256": "0zsrqvhly3si2qkvc4rhki89r2z185l684wf7j9kx32fgaaqanac",
+ "fetcher": "github",
+ "repo": "ianpan870102/acme-emacs-theme",
+ "unstable": {
+ "version": [
+ 20200724,
+ 1833
+ ],
+ "commit": "e416ec678be72eb1aed3de3d88a8a9e3ee7315ca",
+ "sha256": "0y98il3gsnhm586hr1qdmif4r6v1987fzl82wgx75g8kiy5shbrj"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "commit": "680b2022445861e3e9030a96d9fe587188d778c8",
+ "sha256": "1mww6x8gwhkrqcylxxm25xhcvam52nhj7q3f3bvaxhyfdc7jw9yq"
+ }
+ },
{
"ename": "actionscript-mode",
"commit": "2c11e74f2156f109b713380cebf83022d7159d4a",
@@ -1847,11 +1871,11 @@
"repo": "vietor/agtags",
"unstable": {
"version": [
- 20191112,
- 142
+ 20200730,
+ 116
],
- "commit": "8813eb055dfd3faf1021c7d02fed0dabd8e518c1",
- "sha256": "0xj394fiqsyh32g21mcp64srs8dlf0ixaildyla1gm27v8cgiakb"
+ "commit": "d80c6f61dee74040c07b7010d48cab1df13a3abf",
+ "sha256": "05jkkh7m126j24ayh85bk10s4z3lsy1s6n217qb7hlgfl8y5fqdj"
}
},
{
@@ -1865,8 +1889,8 @@
20191212,
652
],
- "commit": "938c78327aad94d5f8e8d86ffd9808a687f3e953",
- "sha256": "1zzhy5ajr6ivmj4jbbmaznxfqgxl4xy21s2r4wip668w8kw02h4m"
+ "commit": "3ca848bcf1fc4c18b4a5329d1439c5effb7dcb97",
+ "sha256": "1lgxwhq5359qrn3zv5m9sssz93vbqa6bp49z526pck1bkf80s3vx"
}
},
{
@@ -1940,11 +1964,11 @@
"repo": "skeeto/emacs-aio",
"unstable": {
"version": [
- 20200410,
- 1409
+ 20200610,
+ 1904
],
- "commit": "9367005c44c42c46c8ca1e7d3f780731c7d123dd",
- "sha256": "063avjlizpjc53myjzvkqsp64gkxwcc7w7shjdf1xgjb9b58pbc1"
+ "commit": "da93523e235529fa97d6f251319d9e1d6fc24a41",
+ "sha256": "0hnxbz5pxlrgxhjr5gnhf06qwg67g5pd87xkp0smmagsh18pnf76"
},
"stable": {
"version": [
@@ -2006,21 +2030,21 @@
},
{
"ename": "alan-mode",
- "commit": "6e52314db81dad3517ab400099b032260c3e3e6f",
- "sha256": "1528rh26kr9zj43djbrfb7vmq78spfay3k3ps5apc580ipx1a4hg",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "1i3vhqdrp8zdmkzgyri5z7vh1j0mykcp7mkjxjc7293ncsj310d8",
"fetcher": "github",
- "repo": "M-industries/AlanForEmacs",
+ "repo": "alan-platform/AlanForEmacs",
"unstable": {
"version": [
- 20190407,
- 555
+ 20200723,
+ 1405
],
"deps": [
"flycheck",
"s"
],
- "commit": "a5a705b64230bb14ad1d19bcc0613e3261e8cbe5",
- "sha256": "1jhsrb26fpm9yykp974rx77ika76zq3gq7pcjgixw4d4ga737d95"
+ "commit": "fc1fc0312b3e7f868f95b917a66719afb96f0c9a",
+ "sha256": "1cadc2v8mdlz5di7cwhc9qqhrkwgl3gxyw5v4il895r44rcdifgq"
},
"stable": {
"version": [
@@ -2133,11 +2157,11 @@
"repo": "alezost/alect-themes",
"unstable": {
"version": [
- 20190506,
- 1440
+ 20200801,
+ 2041
],
- "commit": "da7305075d292cc1909bf26dc5634bc3cc8d2603",
- "sha256": "06nsfmydlcdqi4fp3nn6yz4xys38f3q196pf3bmmdqgg7pbcm259"
+ "commit": "684249b83d711145865ec31650e66ed9aa6e691b",
+ "sha256": "1cyd327shiwgdxf7bx542pfw6d6ilsq51n65lz3bfs8fzm5mib8v"
},
"stable": {
"version": [
@@ -2240,14 +2264,14 @@
"repo": "domtronn/all-the-icons.el",
"unstable": {
"version": [
- 20200508,
- 1157
+ 20200730,
+ 1545
],
"deps": [
"memoize"
],
- "commit": "d6cb6d4a779eaa3570d8e451fd4d38b2b4554860",
- "sha256": "0pnzsnklqjlks6ipaj242vlrk5skmwflpn1sdd00xw9gmb5mxb3m"
+ "commit": "8c0228053dd6693d926970d89270094be52b0f75",
+ "sha256": "08p2x6da4dp6imw6dg501kw68m4rhjfdbc6yn5ld29mazvv923zl"
},
"stable": {
"version": [
@@ -2307,14 +2331,14 @@
"repo": "seagle0128/all-the-icons-ibuffer",
"unstable": {
"version": [
- 20200319,
- 1625
+ 20200612,
+ 1642
],
"deps": [
"all-the-icons"
],
- "commit": "3ee9e32f480329e94e45f86538343b0ddc7ddd4f",
- "sha256": "1cs9027q26nfm5k3182mbmmhj8s8y2nv47gsyamwpjqdma0sbl73"
+ "commit": "8bb1a893e826e39ad4d7abc0add5dd6c33b18f29",
+ "sha256": "02sbddvjys6bf8pcbg3pv5fc1f8b48vmx0bnfyqw1x04dyb8cdm7"
},
"stable": {
"version": [
@@ -2369,28 +2393,28 @@
"repo": "seagle0128/all-the-icons-ivy-rich",
"unstable": {
"version": [
- 20200324,
- 550
+ 20200811,
+ 838
],
"deps": [
"all-the-icons",
"ivy-rich"
],
- "commit": "a9a4389c1930a5a071857b4d450eaecb21f4d6b9",
- "sha256": "133vl3awl3qxxd2ka8zdr33v6s8hrjpsv4bv2db5j8jz35m0hx9d"
+ "commit": "e918b23d55313a7464d8cb5d45eb917249638e32",
+ "sha256": "1wz3dgn8cggdkijzm7qf13g3s9gmz6v895bjck7sdhmr5mbr28a4"
},
"stable": {
"version": [
1,
- 2,
- 0
+ 4,
+ 1
],
"deps": [
"all-the-icons",
"ivy-rich"
],
- "commit": "3e02da9a166df7ebea25aae476efd7b8d74d63e0",
- "sha256": "0p91yvpqy7xjkz2mcpq6c8kjfxqfw9byxprqg2qqnzg421c5yv6x"
+ "commit": "e918b23d55313a7464d8cb5d45eb917249638e32",
+ "sha256": "1wz3dgn8cggdkijzm7qf13g3s9gmz6v895bjck7sdhmr5mbr28a4"
}
},
{
@@ -2440,20 +2464,20 @@
"repo": "jcs-elpa/alt-codes",
"unstable": {
"version": [
- 20190701,
- 1246
+ 20200723,
+ 1037
],
- "commit": "ded8cbff05f4f2fc4d023c5ee08ebe8b1bdb9ca9",
- "sha256": "1v8sir3c0akv5sb8yg01zh0n6qqd4hp95sahbx01z1200g0phcaw"
+ "commit": "b36c2b2bccc628da1579016381d5c3195c9e12b2",
+ "sha256": "19nqpg91in65gj59zndhncx6c1005k0wh05rprv1z6465j5gd40g"
},
"stable": {
"version": [
0,
0,
- 4
+ 5
],
- "commit": "7dcd9cdcc41cfb991801ea1e2f5b3c925a5309ee",
- "sha256": "19xg4ng3p49zvn1y7vagrfiiwvc2fynwibr6cmj7qam1y64lw90c"
+ "commit": "b36c2b2bccc628da1579016381d5c3195c9e12b2",
+ "sha256": "19nqpg91in65gj59zndhncx6c1005k0wh05rprv1z6465j5gd40g"
}
},
{
@@ -2593,14 +2617,14 @@
"repo": "stardiviner/amread-mode",
"unstable": {
"version": [
- 20200404,
- 1143
+ 20200623,
+ 1544
],
"deps": [
"cl-lib"
],
- "commit": "a595828fcc2257f765139b576beb6c33b4fc3bce",
- "sha256": "1mwlj48hjp59mcafia612qqzmqxh30k0jshzrnzsnwlfbbsdxjwj"
+ "commit": "7b1ed6c8aea409e2dce4a3b59f304d716a8efab7",
+ "sha256": "12hcgkznf1l4db8y0q33v735b5iin8iycc5s0di46ichxcjr0b7x"
}
},
{
@@ -2611,14 +2635,14 @@
"repo": "DarwinAwardWinner/amx",
"unstable": {
"version": [
- 20200417,
- 1513
+ 20200701,
+ 2108
],
"deps": [
"s"
],
- "commit": "7fb7b874291e0cdeb1f0acb18564a686ec86788d",
- "sha256": "0yc2b814zcl3c6lgamrr63cl4r3ayzlyfqql8875fzflc541nnnc"
+ "commit": "ccfc92c600df681df5e8b5fecec328c462ceb71e",
+ "sha256": "0pdgicknrph4lfyjxwdqh7xwcfsnqnrx1l4xpd972ivy1n8s7783"
},
"stable": {
"version": [
@@ -2640,8 +2664,8 @@
"repo": "pythonic-emacs/anaconda-mode",
"unstable": {
"version": [
- 20200129,
- 1718
+ 20200806,
+ 436
],
"deps": [
"dash",
@@ -2649,8 +2673,8 @@
"pythonic",
"s"
],
- "commit": "10299bd9ff38c4f0da1d892905d02ef828e7fdce",
- "sha256": "0s5pxfjcsmyrqc5pa2lqx6mxzwy3g8mc3iaxbj313sn1nly26vjw"
+ "commit": "73266a48fa964d44268c3f3478597e553b9843f1",
+ "sha256": "0b4zzkr73hmjg92vr348294xymrynw4j0x89jzklh2plizp0alcr"
},
"stable": {
"version": [
@@ -2730,11 +2754,11 @@
"repo": "fernando-jascovich/android-env.el",
"unstable": {
"version": [
- 20190720,
- 1927
+ 20200722,
+ 1403
],
- "commit": "dcb0bff0e77257266201cf1ccf17e7ca94e67fb1",
- "sha256": "132fshzb4f0miqn3ijvwfdigldrvx7dsx06dczr9z9v9xw61ar8j"
+ "commit": "5c6a6d9449f300eec4f374a5410edc1cbab02e40",
+ "sha256": "182b3fd85q3x5ynnfnjb01phhq1glf1wxj5rz8zx43ddnzz9ahmn"
}
},
{
@@ -2778,21 +2802,17 @@
},
{
"ename": "angular-mode",
- "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4",
- "sha256": "0pq4lyhppzi806n1k07n0gdhr8z8z71ri12my0pl81rl5j2z69l2",
+ "commit": "54d86ad963ca7357ccb62a2e4aa124ed44bc0ebf",
+ "sha256": "04c07flrfnfr6jsqm76xdl5gw79rh18ys4cmqjmgv55rrs0w4rws",
"fetcher": "github",
- "repo": "rudolfolah/angularjs-mode",
+ "repo": "emacsattic/angular-mode",
"unstable": {
"version": [
20200510,
1729
],
"commit": "b24020768217f16b1b86aa236e9729b3d40e17b3",
- "error": [
- "exited abnormally with code 1\n",
- "",
- "error: unable to download 'https://github.com/rudolfolah/angularjs-mode/archive/b24020768217f16b1b86aa236e9729b3d40e17b3.tar.gz': HTTP error 404\n"
- ]
+ "sha256": "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377"
},
"stable": {
"version": [
@@ -2877,8 +2897,8 @@
"repo": "davidshepherd7/anki-mode",
"unstable": {
"version": [
- 20200413,
- 1019
+ 20200703,
+ 736
],
"deps": [
"dash",
@@ -2886,8 +2906,8 @@
"request",
"s"
],
- "commit": "fcbcfa7cd7fb5c282e1138322e61242942729e3d",
- "sha256": "06ab3zdaz5wf30zbci7cav3dvvnknnbzq18zfzzfi4xjcsi0zkvr"
+ "commit": "3918e4f7b2f14e485cc3acc927abe6563695963f",
+ "sha256": "16fx2w1nz6jxsrc9naykah3valab46xnwsmjz5lm9zl38g4ypyna"
},
"stable": {
"version": [
@@ -2962,20 +2982,20 @@
"repo": "bastibe/annotate.el",
"unstable": {
"version": [
- 20200330,
- 1640
+ 20200812,
+ 1439
],
- "commit": "f0a71bb14806c79f09cb6aacb5ef98a852ef66e2",
- "sha256": "1v2rbrhqg4kipk4l901xzfdc4wm5fkvvx4j3l8mfp7nvc2x8gcbw"
+ "commit": "2bf7a7c1acb6768a590954c9bfef5f72ae8cc452",
+ "sha256": "05zwfflsx69904jxlayalh3n3n9msl92zw2rk5kk17p9psjpv9yw"
},
"stable": {
"version": [
0,
- 4,
- 7
+ 7,
+ 0
],
- "commit": "e6af7f8ef7d241fdc9f866d57dce24beb4bb6b87",
- "sha256": "19a419rnqqsmvrcl2vwy3gl7mvbfg669vyin2h2xpm56rxsinvy1"
+ "commit": "99c45f553e7caef693506498d11e4b664b6f2946",
+ "sha256": "154655p54xxsbr06lbbdpzzx4hif6542a4cf767qnichsz9cj75j"
}
},
{
@@ -3028,15 +3048,16 @@
"repo": "rejeep/ansi.el",
"unstable": {
"version": [
- 20150703,
- 826
+ 20200611,
+ 944
],
"deps": [
+ "cl-lib",
"dash",
"s"
],
- "commit": "12b4c5d91b3da1902838f421e5af6d40e2cd57dd",
- "sha256": "19k71dj83kvc8mks6zhl45vsrsb61via53dqxjv9bny1ybh2av85"
+ "commit": "a41d5cc719297515d85bb5256980cd1204a71b88",
+ "sha256": "051v8dmji90chwbsyqsqry7h35mksal2j6rgw1kpmjsni86d79y1"
},
"stable": {
"version": [
@@ -3060,28 +3081,28 @@
"repo": "k1LoW/emacs-ansible",
"unstable": {
"version": [
- 20191003,
- 1430
+ 20200704,
+ 1354
],
"deps": [
"f",
"s"
],
- "commit": "c6532e52161a381ed3dddfeaa7c92ae636d3f052",
- "sha256": "16i0r019lj9fdkxcga2jb8ha0r2lf1mz7jywg44hnj7r3lzdcmwp"
+ "commit": "b5ef59406604bc5027f4d816d90e633feef0149c",
+ "sha256": "1v56mz39vlszprd6m6virbv87qvsnb38n0h0yhqzcy85c2l0jzx3"
},
"stable": {
"version": [
0,
3,
- 0
+ 1
],
"deps": [
"f",
"s"
],
- "commit": "c6532e52161a381ed3dddfeaa7c92ae636d3f052",
- "sha256": "16i0r019lj9fdkxcga2jb8ha0r2lf1mz7jywg44hnj7r3lzdcmwp"
+ "commit": "b5ef59406604bc5027f4d816d90e633feef0149c",
+ "sha256": "1v56mz39vlszprd6m6virbv87qvsnb38n0h0yhqzcy85c2l0jzx3"
}
},
{
@@ -3576,6 +3597,21 @@
"sha256": "11ssqaax4jl7r3z5agzmc74sjsfvl0m3xvp015ncqzpzysla47g3"
}
},
+ {
+ "ename": "arduino-cli-mode",
+ "commit": "613b2f82b1fd035e725e574c750da408e8386cde",
+ "sha256": "1h49bfn4gn1h2xdb6axhbg6wm74h4fmiylcm55lwg9ri57rcdqkl",
+ "fetcher": "github",
+ "repo": "motform/arduino-cli-mode",
+ "unstable": {
+ "version": [
+ 20200812,
+ 935
+ ],
+ "commit": "80c5aa6a29a192f9a9d3ba3d7fb7446b1281051a",
+ "sha256": "1bj4vlvryk2k3920zc9pg9jca9385hji76nrx7avhd6jsjjm79mf"
+ }
+ },
{
"ename": "arduino-mode",
"commit": "2db785f52c2facc55459e945ccb4d4b088506747",
@@ -3584,15 +3620,15 @@
"repo": "stardiviner/arduino-mode",
"unstable": {
"version": [
- 20180509,
- 36
+ 20200819,
+ 103
],
"deps": [
"cl-lib",
"spinner"
],
- "commit": "23ae47c9f28f559e70b790b471f20310e163a39b",
- "sha256": "08vnbz9gpah1l93fzfd87aawrhcnh2v1kyfxgsn88pdwg8awz8rx"
+ "commit": "16955f579c5caca223c0ba825075e3573dcf2288",
+ "sha256": "1vf3ahvs81i0fa3rbwz3i67ahf3x169pv879p5igxk93xf6whqnp"
}
},
{
@@ -3826,11 +3862,11 @@
"repo": "jwiegley/emacs-async",
"unstable": {
"version": [
- 20200113,
- 1745
+ 20200809,
+ 501
],
- "commit": "86aef2c38e7d35e8509b7feeee3e989d825eba91",
- "sha256": "1slxlpxjggyg5q8xppn9csh54j93b2hc4v8lcn85ymw2hp3rsib9"
+ "commit": "36a10151e70e956e2f766ed9e65f4a9cfc8479b2",
+ "sha256": "08glbksm13kgxvy17x0kg01x9cgnkz01yqqnlwzfaan0zbf6brdl"
},
"stable": {
"version": [
@@ -3905,6 +3941,30 @@
"sha256": "1pvnwzp0i1s19cyyzrkcannhx1jizvylxsr7qcipfiy2kmf8sbhz"
}
},
+ {
+ "ename": "atl-markup",
+ "commit": "42025212ccfe998023f7eb563588be76282d53de",
+ "sha256": "1123lbnc6hlycm6bg5f7292z7cdnp2iv0wb8mg0n0ydma524s6bm",
+ "fetcher": "github",
+ "repo": "jcs-elpa/atl-markup",
+ "unstable": {
+ "version": [
+ 20200810,
+ 845
+ ],
+ "commit": "79adac0149bb6083ad3a327c6bbdf56537282ee9",
+ "sha256": "1kd9fk1f3aaw0ikkbf9n6w5b2sy7v0xzsch688h8ac9rp6s2yws8"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 5
+ ],
+ "commit": "876d8a31d5e233d5234231f1428f8edb013e30eb",
+ "sha256": "1czqi0l1jzhlb47n0grlrnx421wi9mdqb41abcfd33k4mjavv0iz"
+ }
+ },
{
"ename": "atom-dark-theme",
"commit": "d1f565871559d6ea4ca4bb2fbaebce58f2f383eb",
@@ -4019,14 +4079,14 @@
"repo": "tsuu32/auctex-cluttex",
"unstable": {
"version": [
- 20200311,
- 1453
+ 20200531,
+ 402
],
"deps": [
"auctex"
],
- "commit": "76fba4a1a918ce8a276fa0e22f026ad9a45a47dc",
- "sha256": "1rd92s2c08z3l2r2wxcs46bbri4rj0d0aym36v89pwq0fcqqx2ry"
+ "commit": "7e36dcb88c0021e48e7a095257e63e2913f75789",
+ "sha256": "1wfsd7kcjm8inbhacsilngjqcwfn5alr02m4bcpv5w8gjyc0qwgx"
},
"stable": {
"version": [
@@ -4192,11 +4252,11 @@
"repo": "ccrusius/auth-source-xoauth2",
"unstable": {
"version": [
- 20200509,
- 2304
+ 20200817,
+ 1604
],
- "commit": "5e646a32c9ba31a015a09fce1ad711b85717119a",
- "sha256": "0nl859csl8xcd6ybpjj15ph8l8fxwkwf45kbylss68alkyf1rl3v"
+ "commit": "b0386d4a12a88c5635b26eaa4c9e355fc84fb3f6",
+ "sha256": "11i184s36ddxs06d8gq15nd0q59im8vfqnww3mvy35q12y6r8gpq"
},
"stable": {
"version": [
@@ -4286,8 +4346,8 @@
"cl-lib",
"popup"
],
- "commit": "2f11a4e6ff7f5d4939c3e1724158411a7efed057",
- "sha256": "067ymm5swi9yq3sndzghqxlyyywzk434ip68nf6fxbj51raxzzq8"
+ "commit": "c0836fa0662095071e3c40237db611063e3c3ceb",
+ "sha256": "1269k2q1hv1yixn7w32ani7g0zspiiwfmbywxi8lvh9hj0asbrsc"
},
"stable": {
"version": [
@@ -4532,10 +4592,10 @@
},
{
"ename": "auto-complete-sage",
- "commit": "f1cd78dcd58d559c47873f8fcfcab089a8493dd6",
- "sha256": "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "0ic60b9jnzgidpwxriwamicimyqa8y4hqfbkxmwcrp0snk4nf4hn",
"fetcher": "github",
- "repo": "stakemori/auto-complete-sage",
+ "repo": "sagemath/auto-complete-sage",
"unstable": {
"version": [
20160514,
@@ -4593,11 +4653,11 @@
"repo": "mina86/auto-dim-other-buffers.el",
"unstable": {
"version": [
- 20200516,
- 1608
+ 20200801,
+ 2029
],
- "commit": "f712de72d4618ce6c5d55ba20c848c83a87c5f32",
- "sha256": "17dsdfs9l3g4jnna5b2pzifvxv13rr5rja76frl5wwp2brfmq8qv"
+ "commit": "cad370fb6c9fc7186c2af221932e097af5900a2d",
+ "sha256": "0hjxadi8245zwwsp0kdz0c6i1j25drbky5cvksdnc8xw2l91kpbs"
}
},
{
@@ -4729,14 +4789,14 @@
"repo": "zonuexe/auto-read-only.el",
"unstable": {
"version": [
- 20170306,
- 443
+ 20200726,
+ 1356
],
"deps": [
"cl-lib"
],
- "commit": "79654f8fc024f383ae7af05487c1345738236500",
- "sha256": "123822s9xkzw25swn1h1szxmmajnn9rq85vasygvy5cn2l6lar3l"
+ "commit": "a6c493c5279d484c00ce7fe75dfd2e60101b97db",
+ "sha256": "0wg6pl69k1hy69hgsqry5zahycr1n13avjfrw7g3sva71rqzkzrn"
}
},
{
@@ -4747,20 +4807,20 @@
"repo": "jcs-elpa/auto-rename-tag",
"unstable": {
"version": [
- 20190525,
- 628
+ 20200717,
+ 814
],
- "commit": "27ca700cb2f61a1040013600c5744d68a27cbd8d",
- "sha256": "1hydigzi82zana6ivcj4nxqvdnh3973594ag6zlgw9nijilih64r"
+ "commit": "7227c93e58a2c1837aa35ca35b6325c6f734d0f9",
+ "sha256": "1q029xy4ssb6lvd199yl1p63ir142q9waw31v2zagxlyn9rs9qx9"
},
"stable": {
"version": [
0,
- 0,
- 2
+ 2,
+ 9
],
- "commit": "4bd41b3107d3971c9533f9d0c8718c299669cb78",
- "sha256": "1g6kllnl625h6vmnps15a7ivpxq3k6s4vdxj50dj2i76g19wi2cn"
+ "commit": "7227c93e58a2c1837aa35ca35b6325c6f734d0f9",
+ "sha256": "1q029xy4ssb6lvd199yl1p63ir142q9waw31v2zagxlyn9rs9qx9"
}
},
{
@@ -4778,24 +4838,6 @@
"sha256": "0ckjijjpqpbv9yrqfnl3x9hcdwwdgvm5r2vyx1a9nk4d3i0hd9i5"
}
},
- {
- "ename": "auto-scroll-mode",
- "commit": "195041c70d2807184d4d8c711bcd3f54b8dfc73a",
- "sha256": "1hvnhszn1cqzw42wn7w0hrq7wn161alg2w6xpd53ydg61g31i68n",
- "fetcher": "github",
- "repo": "stardiviner/auto-scroll-mode",
- "unstable": {
- "version": [
- 20200316,
- 134
- ],
- "deps": [
- "cl-lib"
- ],
- "commit": "a23669a8747e71ca5b1003b923f7a3d3834740e3",
- "sha256": "033msm39fdhm6iqd7khjsqvxrv4314h8klsq3g06zsrgpmjki1xr"
- }
- },
{
"ename": "auto-shell-command",
"commit": "ea710bfa77fee7c2688eea8258ca9d2105d1896e",
@@ -4866,16 +4908,16 @@
"repo": "marcwebbie/auto-virtualenv",
"unstable": {
"version": [
- 20170125,
- 1917
+ 20200729,
+ 2204
],
"deps": [
"cl-lib",
"pyvenv",
"s"
],
- "commit": "3826db66b417788e2b2eb138717255b1f52a55c3",
- "sha256": "12691m4z0zr3prmdhmjlpcx0ajj1ddrbj9gy827xmgr0vaqbr7b2"
+ "commit": "214604ebd3366078d03814a344c3249268d1f15a",
+ "sha256": "14waa4v6nr0ybyncgfjg96r43ma4lw57iyma0chvpqifmbs6ski0"
}
},
{
@@ -4955,14 +4997,14 @@
"repo": "erjoalgo/autobuild",
"unstable": {
"version": [
- 20200209,
- 2005
+ 20200713,
+ 227
],
"deps": [
"cl-lib"
],
- "commit": "9e7a101e1563eaf6f5d671e5877d652079cea78b",
- "sha256": "0khhmhh5fv004xhs3v8v8y3m8i1ibi19w74sv4shpy0ixd5zq1bj"
+ "commit": "6c10b13c285cc4180dc64c1f89ead264e6786f53",
+ "sha256": "02zjfv5365misiivjgjwwrp6bly7z81vnndkyrn6xzv88d2l2byv"
}
},
{
@@ -5026,21 +5068,6 @@
"sha256": "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85"
}
},
- {
- "ename": "automargin",
- "commit": "0937e63ec686cc3e183bddb029a514c64934fc81",
- "sha256": "0llqz01wmacc0f8j3h7r0j57vkmzksl9vj1h0igfxzpm347mm9q8",
- "fetcher": "github",
- "repo": "zk-phi/automargin",
- "unstable": {
- "version": [
- 20131112,
- 814
- ],
- "commit": "4901d969ad69f5244e6300baab4ba04efed800c3",
- "sha256": "02nnyncfh6g0xizy7wa8721ahpnwk451kngd6n0y0249f50p3962"
- }
- },
{
"ename": "autopair",
"commit": "4150455d424326667390f72f6edd22b274d9fa01",
@@ -5082,8 +5109,8 @@
20190331,
2230
],
- "commit": "bcd3d76a47b4f0e7c382fb680b14f40208dae568",
- "sha256": "0sgzjddd34icbbm4pc7v1662k6288pkr70ki4p2j3q4mh9qqc8q7"
+ "commit": "fc9ec563430e3beaefc00b26da179f4b4ca9855b",
+ "sha256": "1m4v56yy73gvycsvpc36h7yh6yhn3fgp90rk5m248hz89gjf9kxv"
}
},
{
@@ -5189,14 +5216,14 @@
"repo": "abo-abo/avy",
"unstable": {
"version": [
- 20200422,
- 1153
+ 20200624,
+ 1148
],
"deps": [
"cl-lib"
],
- "commit": "509471bad0e8094b8639729ec39ca141fae7d4bd",
- "sha256": "0kj4nbp8g22xyvjdy8vh54v6zgd4f3z6srrw5pd55gbczm5csnbj"
+ "commit": "bbf1e7339eba06784dfe86643bb0fbddf5bb0342",
+ "sha256": "0jmjjckrmivfy2r527vynq9x0mzwcgcyclydar9fa2xb1wn669pd"
},
"stable": {
"version": [
@@ -5245,8 +5272,8 @@
"deps": [
"avy"
],
- "commit": "aee6878a8c2f18c3ac3bd34d608783b52cd708e0",
- "sha256": "1526a6cqaa16x5gi2fsdi9brqa54n3m0dvrnkd85w6sgaz33cpiz"
+ "commit": "970204989bcd4a4f8223c2fe980a08dc58441045",
+ "sha256": "196pwh83p0yrnagpiig8h2mq9xxm7wk9q8x832ffwizip4yni80b"
},
"stable": {
"version": [
@@ -5390,6 +5417,21 @@
"sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6"
}
},
+ {
+ "ename": "ayu-theme",
+ "commit": "22bdc35d5c432c5d58d751c0fc3f2e5d0fafe583",
+ "sha256": "1ygg6dwzg0kjxxd8c6w5j174jcjkc7f4hljgd70vkh4k7817kxj8",
+ "fetcher": "github",
+ "repo": "vutran1710/Ayu-Theme-Emacs",
+ "unstable": {
+ "version": [
+ 20200521,
+ 1157
+ ],
+ "commit": "ed98a9f41d9f0e08458ee71cc1038f66c50e1979",
+ "sha256": "1qdw9pq1daydky0b94x248q27sjzaxpfw9d027xk6ygi9hksvcsk"
+ }
+ },
{
"ename": "babel",
"commit": "b0d748fa06b3cbe336cb01a7e3ed7b0421d885cc",
@@ -5475,11 +5517,11 @@
"repo": "mschuldt/backlight.el",
"unstable": {
"version": [
- 20190905,
- 519
+ 20200813,
+ 1839
],
- "commit": "3e5b971b4ee89299240a89614db92d2c4034e954",
- "sha256": "0hsb1vd1mk4mcgr4l93b81hz2bq7cpd7b3kdhabv9z489mxiy3fa"
+ "commit": "38fcb9256c3bf7300a41332fa7f9feffc4e2db9a",
+ "sha256": "0982il82v10yclm87b06ghwv4cglw03ia0zs4m838ag6zg8a08jg"
}
},
{
@@ -5633,20 +5675,20 @@
"url": "https://git.sr.ht/~zge/bang",
"unstable": {
"version": [
- 20200510,
- 1107
+ 20200811,
+ 1008
],
- "commit": "f80c7c394b57057499db6409f386ade9ac32f763",
- "sha256": "0mj2kr13gpvy4kpzxvy1jmz0c9cdnikazlsb9j0dx94f9777sy04"
+ "commit": "e02338331463461a85144c0ce6b9b877bd3a7567",
+ "sha256": "1rvgmkl950zrakczk9libws29c9l2hklw49m3xb4swa14kz1r639"
},
"stable": {
"version": [
1,
0,
- 2
+ 3
],
- "commit": "1fb0162ffd2115080d4e1ddf65935277cf3c75db",
- "sha256": "12nr5la6y5dnh46rfij3p1srgpwdc3fiaf4ckfx6f9kl0n1zyrls"
+ "commit": "e02338331463461a85144c0ce6b9b877bd3a7567",
+ "sha256": "1rvgmkl950zrakczk9libws29c9l2hklw49m3xb4swa14kz1r639"
}
},
{
@@ -5674,10 +5716,10 @@
},
{
"ename": "bap-mode",
- "commit": "05b1b5885a9d5e3bda38bc8a2f987bffd9353cc0",
- "sha256": "1n0sv6d6vnv40iks18vws16psbv83v401pdd8w2d2cfhhsmmi4ii",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "0w82dzhahp9zc1dhkfwc77irpqbq0fdp14cjfkk3g5cmvyzz5s1a",
"fetcher": "github",
- "repo": "fkie-cad/bap-mode",
+ "repo": "BinaryAnalysisPlatform/bap-mode",
"unstable": {
"version": [
20200128,
@@ -5748,20 +5790,20 @@
"repo": "szermatt/emacs-bash-completion",
"unstable": {
"version": [
- 20191126,
- 1824
+ 20200806,
+ 1743
],
- "commit": "96ce14af9674f3e605bacca87abc0c23b8f13cd5",
- "sha256": "1w3yvpcdjq9a6m2q2lz23dib2ijmfgn4w2z2g5y9wkpdmx48k655"
+ "commit": "d47edb9d4142a22746009c1f680df93a4fefd107",
+ "sha256": "11j2k3irixp47r2iglxdmjphahqhgnxg98n2xwagwzyq99lsamj4"
},
"stable": {
"version": [
- 2,
+ 3,
1,
0
],
- "commit": "6aedd690006e07199b2fcd319b9b840a527650e5",
- "sha256": "1a1wxcqzh0javjmxwi3lng5i99xiylm8lm04kv4q1lh9bli6vmv0"
+ "commit": "d47edb9d4142a22746009c1f680df93a4fefd107",
+ "sha256": "11j2k3irixp47r2iglxdmjphahqhgnxg98n2xwagwzyq99lsamj4"
}
},
{
@@ -5902,11 +5944,11 @@
"repo": "bazelbuild/emacs-bazel-mode",
"unstable": {
"version": [
- 20200515,
- 1408
+ 20200627,
+ 1625
],
- "commit": "39d4649f4a179e22fabbef1166afe1725c8dbea6",
- "sha256": "0n5kqjcmwfbr58my3yisgfigh77rhy5b18jr4kh2b327r76ssqwl"
+ "commit": "2cf143b616df3de4b199538341d674c58386719e",
+ "sha256": "1p9pxxdx39jmf8sav660ps6mqwbsgcl4v1i9xb8xsd5qdxmwjqli"
},
"stable": {
"version": [
@@ -6118,21 +6160,6 @@
"sha256": "0q0i1j8ljfd61rk6d5fys7wvdbym9pz5nhwyfvmm0ijmy19d1ppz"
}
},
- {
- "ename": "bdo",
- "commit": "855ea20024b606314f8590129259747cac0bcc97",
- "sha256": "1n2kpaps6992nxl0v1003czcbw1k4xq906an56694wkh05az505j",
- "fetcher": "github",
- "repo": "chrisdone/bdo",
- "unstable": {
- "version": [
- 20140126,
- 901
- ],
- "commit": "c96cb6aa9e97fa3491185c50dee0f77a13241010",
- "sha256": "0d5b7zyl2vg621w1ll2lw3kjz5hx6lqxc0jivh0i449gckk5pzkm"
- }
- },
{
"ename": "beacon",
"commit": "d09cfab21be800831644218e9c8c4433087951c0",
@@ -6171,14 +6198,14 @@
"repo": "Sodaware/beeminder.el",
"unstable": {
"version": [
- 20180413,
- 1929
+ 20200610,
+ 2311
],
"deps": [
"org"
],
- "commit": "3fcee7a7003a37171ddb59171c7f4b5dd4b34349",
- "sha256": "0phiyv4n5y052fgxngl3yy74akb378sr6manx21s360gnxzcblwd"
+ "commit": "8f86ae34ebd17324d98146a2b3a532d56dd1cdd0",
+ "sha256": "0jw62l1nnnnz4gr7jrk10jlf8ayjngyx9wm97fd339spiygld5pr"
},
"stable": {
"version": [
@@ -6201,11 +6228,11 @@
"repo": "DamienCassou/beginend",
"unstable": {
"version": [
- 20200415,
- 1752
+ 20200526,
+ 2005
],
- "commit": "bb51f7ee9229ff0b6ec5ba4a730f7360246fb9ea",
- "sha256": "0l7lbmn6ljh8yv7ch2fax47mr7kxly5b5ps5vg61ra15nv8v5vfr"
+ "commit": "9c7a92779d75f6fd985cf707ff5241bc98ccea6c",
+ "sha256": "1r9033zlx2q2dk3bjz004flxdiw79qiswq0zqdjnlzwassvk0f35"
},
"stable": {
"version": [
@@ -6257,10 +6284,10 @@
},
{
"ename": "benchstat",
- "commit": "d9180fbedf95f9b1f5810bbf4929dfee513f89e3",
- "sha256": "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "1pcwgvln6dhyqk52021hqs5gpgnj1a07ddbb7xs1qclgyyk72y85",
"fetcher": "github",
- "repo": "Quasilyte/benchstat.el",
+ "repo": "quasilyte/benchstat.el",
"unstable": {
"version": [
20171014,
@@ -6364,11 +6391,11 @@
"repo": "technomancy/better-defaults",
"unstable": {
"version": [
- 20200209,
- 1717
+ 20200717,
+ 2012
],
- "commit": "fc9a03138c959f0d24301c6401f800eb6e7d3af9",
- "sha256": "1hi1xxc99z0pkbj8w63fx3qsy4sq5b3gdc2ccyk0gnbzw2sfc93j"
+ "commit": "293237a22a4f24171dd9910d6517a0eccf526fdf",
+ "sha256": "0f3alik361d81kdwpigcgkj9rxww23prqfhjfdh97fnycp3r1nyb"
},
"stable": {
"version": [
@@ -6442,14 +6469,14 @@
"repo": "zk-phi/bfbuilder",
"unstable": {
"version": [
- 20150924,
- 1650
+ 20200816,
+ 519
],
"deps": [
"cl-lib"
],
- "commit": "49560bdef131fa5672dab660e0c62376dbdcd906",
- "sha256": "1y9fxs1nbf0xsn8mw45m9ghmji3h64wdbfnyr1npmf5fb27rmd17"
+ "commit": "00cbf1010dc3fee5a0b8e7c0e0b6041bb6251bdf",
+ "sha256": "1n1aq3kwsjc3hlgas73bs22pvrn69hfba1wcbqs2j28j2j9j00b2"
}
},
{
@@ -6680,20 +6707,20 @@
"repo": "tarsius/bicycle",
"unstable": {
"version": [
- 20200429,
- 1021
+ 20200723,
+ 2222
],
- "commit": "1bd8836171cf8da0be836fc407f2f140f52bdeb1",
- "sha256": "0zd8ls2qyxgdzkmhl7mxlh7wbkp627kync8zg95kvrh3qymf5vys"
+ "commit": "799969a66192b27c6464fc2e0025f4089d70493b",
+ "sha256": "13179nlhjkdsgpjp2lbx8fqx76ka79hjkhip6im6afv9icr3j3ba"
},
"stable": {
"version": [
0,
- 3,
- 1
+ 4,
+ 2
],
- "commit": "91d9f946690df0a1ed866f2cd1eab1b2e7c7480a",
- "sha256": "0pkn99srwyvyibz5zxkh58csbf598x26f31mpizacx3bs4nys0qb"
+ "commit": "799969a66192b27c6464fc2e0025f4089d70493b",
+ "sha256": "13179nlhjkdsgpjp2lbx8fqx76ka79hjkhip6im6afv9icr3j3ba"
}
},
{
@@ -6764,8 +6791,8 @@
"bind-key",
"key-chord"
],
- "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2",
- "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531"
+ "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1",
+ "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip"
},
"stable": {
"version": [
@@ -6788,11 +6815,11 @@
"repo": "jwiegley/use-package",
"unstable": {
"version": [
- 20191110,
- 416
+ 20200805,
+ 1727
],
- "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2",
- "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531"
+ "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1",
+ "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip"
},
"stable": {
"version": [
@@ -6993,11 +7020,11 @@
"repo": "pythonic-emacs/blacken",
"unstable": {
"version": [
- 20191123,
- 1547
+ 20200626,
+ 2018
],
- "commit": "a09f8e2564739792a1b86bc8a6ce41039db3bbf8",
- "sha256": "0cs9nmi30dknrw6p2xvx9np1zmzpsn3bs93lhfiqy2a4ylf96brl"
+ "commit": "784da60033fe3743336d1da0f33239f1bf514266",
+ "sha256": "1s7isvih1xl4l6say8xa69r9lf3prq9sd6d9fmn1n8g8p3w09cnq"
}
},
{
@@ -7276,26 +7303,26 @@
"repo": "kyleam/bog",
"unstable": {
"version": [
- 20180815,
- 2213
+ 20200720,
+ 244
],
"deps": [
"cl-lib"
],
- "commit": "6c8fa1b4961e279ae63130902996c5f71a2e64e4",
- "sha256": "0kph9898s2m086p8gj97bbzr7mba9y7hmyxh1z4mgpv5808zvd05"
+ "commit": "14241d308d15410bfaafcf607a8a4a7ff3d7254c",
+ "sha256": "1k9ww9in54v0bmw8l6azx67wbb18r2q6fdwl1j931gaz9pngk3k0"
},
"stable": {
"version": [
1,
3,
- 1
+ 2
],
"deps": [
"cl-lib"
],
- "commit": "6ed4d3edbe771e586d873b826330f3ef23aa1611",
- "sha256": "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j"
+ "commit": "14241d308d15410bfaafcf607a8a4a7ff3d7254c",
+ "sha256": "1k9ww9in54v0bmw8l6azx67wbb18r2q6fdwl1j931gaz9pngk3k0"
}
},
{
@@ -7444,15 +7471,15 @@
"repo": "emacscollective/borg",
"unstable": {
"version": [
- 20200513,
- 1954
+ 20200805,
+ 1131
],
"deps": [
"epkg",
"magit"
],
- "commit": "f6a2e0cb8c3db5840c717114caba93793f2e9661",
- "sha256": "1sa0wk7xj3qsk9fr4z2av80gp8n0804zylx3d27pdwm8bjyfzf7b"
+ "commit": "1fe1d2b7a574dd560740a55d87d9a5fb3a989dbc",
+ "sha256": "19rxqh6qagznsm5hqal65cv03k9gg1cfvb0j5saaqfc4nxkhkv7v"
},
"stable": {
"version": [
@@ -7507,25 +7534,25 @@
"repo": "davep/boxquote.el",
"unstable": {
"version": [
- 20170802,
- 1117
+ 20200727,
+ 1203
],
"deps": [
"cl-lib"
],
- "commit": "7e47e0e2853bc1215739b2e28f260e9eed93b2c5",
- "sha256": "1aqhg24gajvllbqxb0zxrnx6sddas37k2ldfinqyszd856sjhsg3"
+ "commit": "bdc6c84b9274b228dbc383a14abf9694157e869c",
+ "sha256": "0wwjawgylaaifdsszqxcfsyhfzgxbjkzqhzrnxnr9b16wghb7xf7"
},
"stable": {
"version": [
2,
- 1
+ 2
],
"deps": [
"cl-lib"
],
- "commit": "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883",
- "sha256": "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm"
+ "commit": "bdc6c84b9274b228dbc383a14abf9694157e869c",
+ "sha256": "0wwjawgylaaifdsszqxcfsyhfzgxbjkzqhzrnxnr9b16wghb7xf7"
}
},
{
@@ -7638,14 +7665,25 @@
"url": "https://bitbucket.org/MikeWoolley/brf-mode",
"unstable": {
"version": [
- 20200329,
- 1531
+ 20200811,
+ 1622
+ ],
+ "deps": [
+ "fringe-helper"
+ ],
+ "commit": "4e12ec16d6b896402f8bcdc1cd468d4064a2df6f",
+ "sha256": "1pdrpvff6hvhjv512z1vkivd848ar5li4p63jnbvl90hp7kpy7c3"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 19
],
"deps": [
"fringe-helper"
],
- "commit": "f1ae0c5eb74f62af109ebaf18e8663d6f51270cb",
- "sha256": "1pzxz5irx6ysa8nhl9x50v8l5r2cvd6pafj71q4i5lrxv9a1dkl1"
+ "commit": "0024b1a276c43fde0d85011b51b5aaf1f201da64",
+ "sha256": "1nnhb0vyx5f3f7h2fsg2p7656kcsk7ahrndxrhs7a77svnr426lb"
}
},
{
@@ -8098,20 +8136,20 @@
"repo": "jcs-elpa/buffer-wrap",
"unstable": {
"version": [
- 20200223,
- 605
+ 20200724,
+ 906
],
- "commit": "460f90bc024b6c287ed8afac3ff1bed2a147c777",
- "sha256": "07r50iiiyhbqbia9c8c3kz1hvqjs6dkb8rkqpq4yyv3vd1kc9qnb"
+ "commit": "ef0fcb38b23246cfea1721570acc266764cef0a4",
+ "sha256": "029vq5hfknp5l8b9lmxw4hskq9bmv56kqysdfka0636hp7bvc63p"
},
"stable": {
"version": [
0,
1,
- 1
+ 3
],
- "commit": "813a3dab3007a34fa27cf0a1ae687dc0eae98240",
- "sha256": "0m2ryic16083ab0x6qwfrxrpsgq84s518vn0cbfcxycblpdh89al"
+ "commit": "c24eb1f251baecfb0bbfa750904e6b15cc977a6c",
+ "sha256": "1bzr5bf4rm1wm0xdhhdprlv7z60ijwrp1lq9h572iw6giyl0hgc3"
}
},
{
@@ -8452,19 +8490,19 @@
"repo": "jorgenschaefer/emacs-buttercup",
"unstable": {
"version": [
- 20200509,
- 2224
+ 20200817,
+ 2001
],
- "commit": "e71a40f1ffef4847df28c9d4ad7edc1e360ee52a",
- "sha256": "0avmxbxxsazd14h5avsrqh2yyfnp8jan64sbp5ih2c9hm7xv5p1k"
+ "commit": "0e5eae0766a33b5c8997e1477e3914d5c8ba3d29",
+ "sha256": "0qn3i26g119h14jv9q0vha55s4g154djp3f68d2g7i0f46wm54hz"
},
"stable": {
"version": [
1,
- 21
+ 23
],
- "commit": "0dbd474460e4c314bf8bc6e4d3dec647081538c9",
- "sha256": "1ra5r56k539q6l98msxdn4vfd7k6jm00g8cdhs6hpwvb1blj8di2"
+ "commit": "a9647cbb566eb488b7bbde44c4cdaf51b7915851",
+ "sha256": "0ym1hajy47n5f1rxic8qfxrwd8zc1r7csz1v4hrwhwm4qld4krfr"
}
},
{
@@ -8909,6 +8947,42 @@
"sha256": "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"
}
},
+ {
+ "ename": "calibredb",
+ "commit": "774ebbd69372ffba6fd16107762957b8ea3713a5",
+ "sha256": "1bdkxzs18c8krw28vfnzirx0pq13yf8pgkmjy8ks5j8zbih4dhqm",
+ "fetcher": "github",
+ "repo": "chenyanming/calibredb.el",
+ "unstable": {
+ "version": [
+ 20200809,
+ 1128
+ ],
+ "deps": [
+ "dash",
+ "org",
+ "s",
+ "transient"
+ ],
+ "commit": "a53d3c3d87fb7cd756f73fcd813aca0480ada5f7",
+ "sha256": "11m9d015fnjf89qg6wpy0vs1vhvak5q753m4dzqrdw3jgm9zsnmv"
+ },
+ "stable": {
+ "version": [
+ 2,
+ 5,
+ 0
+ ],
+ "deps": [
+ "dash",
+ "org",
+ "s",
+ "transient"
+ ],
+ "commit": "a53d3c3d87fb7cd756f73fcd813aca0480ada5f7",
+ "sha256": "11m9d015fnjf89qg6wpy0vs1vhvak5q753m4dzqrdw3jgm9zsnmv"
+ }
+ },
{
"ename": "call-graph",
"commit": "a6acf099e2510c82b4b03e2f35051afc3d28af45",
@@ -9013,11 +9087,7 @@
1
],
"commit": "9803cf37ac52bbfa5130fde0f228dc51c4590c2d",
- "error": [
- "exited abnormally with code 1\n",
- "",
- "error: unable to download 'https://github.com/ocaml/caml-mode/archive/9803cf37ac52bbfa5130fde0f228dc51c4590c2d.tar.gz': HTTP error 404\n"
- ]
+ "sha256": "13gz0s7bnjsnab7wn8mk0zva7756hf68izqp9agd8vqnm0c75nlp"
}
},
{
@@ -9028,16 +9098,16 @@
"repo": "kisaragi-hiu/cangjie.el",
"unstable": {
"version": [
- 20190929,
- 1221
+ 20200808,
+ 828
],
"deps": [
"dash",
"f",
"s"
],
- "commit": "0a703f4d1162259d77bfb3f862d13c1b1f11a711",
- "sha256": "19f7xzc1204zdv8bbd5vfzxqrinhk8m9mw911dc77jab2in22348"
+ "commit": "0cbf706890df06b9e0d541692c579ed213da8252",
+ "sha256": "0a3mwgbza09rfiswmk4kh699mqc5746k16jc6rgy9q24jbjgradf"
},
"stable": {
"version": [
@@ -9149,8 +9219,8 @@
"dash",
"s"
],
- "commit": "92a31f6a7cae0b4e2af106cd6f2b0abe6c2d8921",
- "sha256": "1cp9i69npvyn72fqv0w8q1hlkcawkhbah4jblc341ycxwxb48mkl"
+ "commit": "75ddb9c64eeb78b46d9e1db99bef8d0fb1e46b99",
+ "sha256": "06briiapv2pfll8zc0wl55sad8cjgxkb8j8d4bvc8w5li3d52xa9"
},
"stable": {
"version": [
@@ -9175,8 +9245,8 @@
"repo": "cask/cask",
"unstable": {
"version": [
- 20191004,
- 1155
+ 20200814,
+ 913
],
"deps": [
"ansi",
@@ -9188,8 +9258,8 @@
"s",
"shut-up"
],
- "commit": "a4715f7c6c9797639c3636399cb21c2b0332b354",
- "sha256": "1zjz3mp8hgnsfyapq7qdfysj31g9f6syvrik2w057r3w3bxp8vkf"
+ "commit": "c69822a1a3168d43caebb7afaa13249429419ae0",
+ "sha256": "0w7q16y2r54rann07lk4gwi7jkqnb5xc8cbjnx2avgpsk7kawi8w"
},
"stable": {
"version": [
@@ -9368,11 +9438,11 @@
"repo": "xuchunyang/cc-cedict.el",
"unstable": {
"version": [
- 20181217,
- 1112
+ 20200705,
+ 443
],
- "commit": "0dd9bcd5337c8f16fc9c8d27daba4a9362695c99",
- "sha256": "16qp0r413lqrym2xh2vpx0hg295g8mr428fg6q07w1hnzz10dpc2"
+ "commit": "6bb9481e48b889503626b4e3cb7cfec8d14cbf4b",
+ "sha256": "0nxq8p7hafpl1xq9daf5lcyk8ragdgnwsfxxd2d0rnzmyflgw5wi"
}
},
{
@@ -9386,8 +9456,8 @@
20200314,
1557
],
- "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b",
- "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji"
+ "commit": "275a831be77573470309a78967734d2b6d10f218",
+ "sha256": "1a25aybavi6p7ijc4rbd8zyzgiim1m2xwm7yqfmsvrfzwgb29xal"
}
},
{
@@ -9398,16 +9468,15 @@
"repo": "MaskRay/emacs-ccls",
"unstable": {
"version": [
- 20200327,
- 1915
+ 20200819,
+ 106
],
"deps": [
"dash",
- "lsp-mode",
- "projectile"
+ "lsp-mode"
],
- "commit": "17ec7bb4cf362b7268c24e070e841f0dfac1c919",
- "sha256": "08pndwbw6wcpysnvhkqfvrw91ac0np31swiq0yv3dr2x0sq70cp5"
+ "commit": "44f1fb38786cb6159e03e930876239a215d3feee",
+ "sha256": "0adw1gfp8a6cfyh7s1bchdpak7z32jlnliq35ynhakwwx3ixzmfv"
}
},
{
@@ -9433,11 +9502,11 @@
"repo": "skk-dev/ddskk",
"unstable": {
"version": [
- 20200314,
- 1557
+ 20200803,
+ 2138
],
- "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b",
- "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji"
+ "commit": "275a831be77573470309a78967734d2b6d10f218",
+ "sha256": "1a25aybavi6p7ijc4rbd8zyzgiim1m2xwm7yqfmsvrfzwgb29xal"
}
},
{
@@ -9507,11 +9576,11 @@
"repo": "zk-phi/cedit",
"unstable": {
"version": [
- 20141231,
- 1614
+ 20200816,
+ 526
],
- "commit": "0878d851b6307c162bfbddd2bb02789e5e27bc2c",
- "sha256": "1f8gdj3p54q3410c66716y3l7i7nnkmq6hqz0dg1a1sc6jwdij3v"
+ "commit": "cb38316903e6cfa8b8c978defa7e1dafcd4e0c12",
+ "sha256": "1m5n0rwh97g3vl4x0akclgc8flh9vpdavp82q3i1yraigvzqzfc9"
}
},
{
@@ -9571,15 +9640,15 @@
"repo": "ema2159/centaur-tabs",
"unstable": {
"version": [
- 20200511,
- 1242
+ 20200722,
+ 27
],
"deps": [
"cl-lib",
"powerline"
],
- "commit": "57afd81c7fd6449239af7adcda4cd2192976dbb8",
- "sha256": "1sa4anfqvhidn7kxqnchk0d8kc2v0l3cxbf0bnwwx7nk04gjvshg"
+ "commit": "7e0332b138f836b9d0b6d2134310f53369598cfd",
+ "sha256": "1fjs1l79wsyiyi4nrdkxg2hhfkngm7g0zpdq5ca3c1zi4fsv084i"
},
"stable": {
"version": [
@@ -9706,17 +9775,17 @@
20171115,
2108
],
- "commit": "dc0e180cbaf73e86d22f1d2996c7582dd0eb07b5",
- "sha256": "0n9f87syrj30dn5k4vq1l7i02hzwfnadanfjbwv4a9wfjl77xy53"
+ "commit": "ec47889f4bef53c6c5a15add60d34c44c6ef1634",
+ "sha256": "16lndmhm0ad23g0pa4rl7dyrwmdv22xmscnpqnd49sg88356fyd2"
},
"stable": {
"version": [
3,
- 15,
- 1
+ 16,
+ 0
],
- "commit": "e766ee2484f9a7609688ac1832ff2ca7528624c5",
- "sha256": "18iv6s2g7gz2dmqhipn6ln6g4qngywcj7fm4gqwrph04bx5dfqac"
+ "commit": "ee2c1fd898a8219e81fea4f753648070e50ebc2e",
+ "sha256": "1jcvh67kxx5isqb78zjbca51px21cyjcwy1cbfkx47y1rmgsqzaw"
}
},
{
@@ -9866,17 +9935,20 @@
},
{
"ename": "chapel-mode",
- "commit": "ff32db72ad55a7191b5105192480e17535c7edde",
- "sha256": "0hmnsv8xf85fc4jqkaqz5j3sf56hgib4jp530vvyc2dl2sps6vzz",
+ "commit": "f84c693e9e90069b028be6149dd730f2ba5f4aff",
+ "sha256": "0yi1xjm1myxywjdb3n1505mz7vnylrvpd067aibjc4vgq0gqvq6f",
"fetcher": "github",
- "repo": "russel/Emacs-Chapel-Mode",
+ "repo": "damon-kwok/chapel-mode",
"unstable": {
"version": [
- 20160504,
- 808
+ 20200814,
+ 759
+ ],
+ "deps": [
+ "hydra"
],
- "commit": "6e095edd7639f5f0a81e14d6412410b49466697e",
- "sha256": "0r3yja2ak3z62lav2s8vimmjyi4rd5s82fbs8r6p2k0shm6lj7hz"
+ "commit": "0855d6ea5e74da7b02e7307066da912c242084c8",
+ "sha256": "08bgjwkm6bhm5s73pdx62bjm58z18q21fhj02zdp0q8dds5babf9"
},
"stable": {
"version": [
@@ -9902,8 +9974,8 @@
"deps": [
"avy-menu"
],
- "commit": "22d0e061f170d59d7cf6bcd948c11fa0266b7771",
- "sha256": "1m29vg4cispsd8nl8lpmv5fify1208nrf8h7nkl17pplrk7hqhwb"
+ "commit": "a1ccf5ed786af6e2441037964668d817b9c7362f",
+ "sha256": "19yl7gmzalhrhr3spi8vs6wpxpv6m3m1d9564naznswxx19sjcjy"
},
"stable": {
"version": [
@@ -9926,11 +9998,11 @@
"repo": "lateau/charmap",
"unstable": {
"version": [
- 20160309,
- 946
+ 20200616,
+ 1418
],
- "commit": "bd4b3e466d7a9433cf35167e3a68ec74fe631bb2",
- "sha256": "0vqsfk83lg3gvcv62jsgxxwz7icpkpswgg30hmcq0qfg0dfwwcl9"
+ "commit": "feac50b87d2a596c5e5b7b82b79ddd65b6dedd8c",
+ "sha256": "1pms4s1qnf60d3amhx1lfa255ln5wypq0q6w918whhzi4l7mdyz4"
},
"stable": {
"version": [
@@ -10291,36 +10363,71 @@
},
{
"ename": "chronometrist",
- "commit": "35d03fe9c066e7388d5ff4adad1afa1e30145995",
- "sha256": "09dil46qjn7y55y7qax92l7mcw8g1bsb1mjqc92zgln96asi25kj",
- "fetcher": "git",
- "url": "https://framagit.org/contrapunctus/chronometrist/",
+ "commit": "9031f880b8646bf9a4be61f3057dc6a3c50393e8",
+ "sha256": "1xjxq257iwjd3zzwqicjqs3mdrkg9x299sm7wfx53dac14d7sa9g",
+ "fetcher": "github",
+ "repo": "contrapunctus-1/chronometrist",
"unstable": {
"version": [
- 20200503,
- 633
+ 20200816,
+ 1947
],
"deps": [
+ "anaphora",
"dash",
"s",
- "seq"
+ "seq",
+ "ts"
],
- "commit": "16f2ca86540001b40725c4099d04154aab0a6ba5",
- "sha256": "19z8wmhsqbm12h0vvzfgjmzj7g3mcpa9qgcz3cnmrr4hgkx4b9a5"
+ "commit": "c886dbb1ec8d1e22f7e9891ce9794d373b3b4e9b",
+ "sha256": "0f94w039ibqyysldgs0rdzjczhpgd1dq6ll85gdb4av7vw6mp3hy"
},
"stable": {
"version": [
0,
- 4,
+ 5,
3
],
"deps": [
"dash",
"s",
- "seq"
+ "seq",
+ "ts"
+ ],
+ "commit": "0445b5187293a927f505633e851ca871bb89d8df",
+ "sha256": "0jz35972m372kx9x8mgf42zhzdw2w9wv2ri52chfb2fin4bh1biy"
+ }
+ },
+ {
+ "ename": "chronometrist-goal",
+ "commit": "61031b9ab0c0dedf88e6947ae2ad8d4ad0351210",
+ "sha256": "0hcww5qy167fiwwkj33pj8fdc89b61mb767gz85ya5r6d5nd4si3",
+ "fetcher": "github",
+ "repo": "contrapunctus-1/chronometrist-goal",
+ "unstable": {
+ "version": [
+ 20200706,
+ 1306
+ ],
+ "deps": [
+ "alert",
+ "chronometrist"
+ ],
+ "commit": "a9c4410f25f875c55b9237ef6544e82f4a805af6",
+ "sha256": "0wydrc4x19rp6nn1hyhaa5zxr4br51aamrv0ky5yppr17rnyygsy"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2,
+ 1
+ ],
+ "deps": [
+ "alert",
+ "chronometrist"
],
- "commit": "282c338c21d01932049392f271f66e1725562efd",
- "sha256": "1ljjqzghcap4admv0hvw6asm148b80mfgjgxjjcw6qc95fkjjjlr"
+ "commit": "e651821d0f64830235232082a8295e86a173574b",
+ "sha256": "02q9bksjs24hxl1lz93f16rvqyn6ah10acjg2yw7kx0nj3qxff8v"
}
},
{
@@ -10379,8 +10486,8 @@
"repo": "clojure-emacs/cider",
"unstable": {
"version": [
- 20200511,
- 1025
+ 20200814,
+ 1540
],
"deps": [
"clojure-mode",
@@ -10391,14 +10498,14 @@
"sesman",
"spinner"
],
- "commit": "25fb15d915117310069254016391c9d76abcebcc",
- "sha256": "1hz2l2ryllwyv1zk0la376klg7yndz9q32pd1vypwymwnac93c0y"
+ "commit": "a89b694cc3cec0294d84bf9dbe1163ad2373e8db",
+ "sha256": "0m77jbxl380dp1wyj12m82bb06r80js8yxl530ryp1mwvy74f00d"
},
"stable": {
"version": [
0,
- 24,
- 0
+ 26,
+ 1
],
"deps": [
"clojure-mode",
@@ -10409,8 +10516,8 @@
"sesman",
"spinner"
],
- "commit": "bfcf9157a970c9423fe27c5021f445b509e71280",
- "sha256": "1y7fngd47c5dz6sdf4b5w5lxdw5jmm4wa98l4h48badl8cn6m1vl"
+ "commit": "a89b694cc3cec0294d84bf9dbe1163ad2373e8db",
+ "sha256": "0m77jbxl380dp1wyj12m82bb06r80js8yxl530ryp1mwvy74f00d"
}
},
{
@@ -10583,14 +10690,14 @@
"repo": "jorgenschaefer/circe",
"unstable": {
"version": [
- 20200125,
- 2110
+ 20200815,
+ 1410
],
"deps": [
"cl-lib"
],
- "commit": "e5bf5f89741a9c43aa406491e94dd8d58c302fb4",
- "sha256": "104l0b9n9ia7zrha20yaxp6c09wg1h5l5a8b988k6mhyj9a1w1aw"
+ "commit": "89aac22259e5d09ae1183e0df163338fe491e9e7",
+ "sha256": "16hfahyhl1vv3r0amyvc514sw6x9x56b319lkp7bwcy8mxicc3cy"
},
"stable": {
"version": [
@@ -10643,8 +10750,8 @@
"repo": "andras-simonyi/citeproc-el",
"unstable": {
"version": [
- 20200305,
- 2126
+ 20200705,
+ 1155
],
"deps": [
"dash",
@@ -10654,24 +10761,63 @@
"s",
"string-inflection"
],
- "commit": "1884b5c88ad4eb35450a7acf053594369ccb1b22",
- "sha256": "0dr4fx14kmahg533ij92ycn1a8kagbadfml9iyziisllxypmjrzf"
+ "commit": "0ad1f975a095156d02dd7f9adc0fecbc57b1e751",
+ "sha256": "1xhkicffmdiy4c22m9qilm09nq9zqfsi9gawq3gflla79avblh4r"
},
"stable": {
"version": [
0,
1,
- 1
+ 2
],
"deps": [
"dash",
"f",
+ "org",
"queue",
"s",
"string-inflection"
],
- "commit": "6d68f52ebd150e035b33dcaa59d9e2aceab69b84",
- "sha256": "04xz3y3j8k1pv5v6v9wqscqlpmgqi85fs3igrv8c9y0xagild29k"
+ "commit": "80b395b8a0c7fc92290f0d1bfd1b5520ffd415fd",
+ "sha256": "1b918gjzds9jzs0ywfr41wd069l234pshpa9rn8srkzlpj5lac4d"
+ }
+ },
+ {
+ "ename": "citeproc-org",
+ "commit": "2055da5d0628ca3c35b111b5ded56c0f635ca690",
+ "sha256": "06kr5qg0l2389n72vyxmh86sc376hjg4npzkrh42cgb1c2m4psj8",
+ "fetcher": "github",
+ "repo": "andras-simonyi/citeproc-org",
+ "unstable": {
+ "version": [
+ 20200615,
+ 947
+ ],
+ "deps": [
+ "citeproc",
+ "dash",
+ "f",
+ "org",
+ "org-ref"
+ ],
+ "commit": "342f6531b08f5d789a1ae222f9707f636b1f5e2f",
+ "sha256": "1dc5qkwmfi2jm12297yy14fqbc335qjsdfi2mfgiz8wvs84hyci8"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2,
+ 4
+ ],
+ "deps": [
+ "citeproc",
+ "dash",
+ "f",
+ "org",
+ "org-ref"
+ ],
+ "commit": "a35655c55bbdc3f8c0571c8a8f14a33f9eac330b",
+ "sha256": "1n9k25qsxjv50nkk0v7cfqwdb0y89bid8lprfzzn8zi9b7gyly6x"
}
},
{
@@ -10750,6 +10896,30 @@
"sha256": "1xp0zajp4rsnxkfzrmz0m5bihk0n1hgwc1cm9q163b2azsvixxmw"
}
},
+ {
+ "ename": "clang-capf",
+ "commit": "c47e1fd9d5a4b85f08676742a9b36b74a2ac8fb6",
+ "sha256": "11qfh8c2kjcy715yyp0sywla74z92qn5j1z9wp4fv5p45w6b6112",
+ "fetcher": "git",
+ "url": "https://git.sr.ht/~zge/clang-capf",
+ "unstable": {
+ "version": [
+ 20200813,
+ 2056
+ ],
+ "commit": "630ab057ed614d142ac08bb3a44a869a81cb591a",
+ "sha256": "0xrxk4b903ayymrngf2swk8d7ic8np1dy8zp9hg3wjlibsmagak0"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 2,
+ 0
+ ],
+ "commit": "630ab057ed614d142ac08bb3a44a869a81cb591a",
+ "sha256": "0xrxk4b903ayymrngf2swk8d7ic8np1dy8zp9hg3wjlibsmagak0"
+ }
+ },
{
"ename": "clang-format",
"commit": "be27e728327016b819535ef8cae10020e5a07c2e",
@@ -11004,8 +11174,8 @@
"seq",
"yasnippet"
],
- "commit": "8259791e054382457b87d1f78061b5e3ce948907",
- "sha256": "0vn32b8vhlp75vj4schy8blmiddc6dn92jl4f935yd4sg7pm04cj"
+ "commit": "97095682580bbc5bfebcbc5349f03f5bd7121c96",
+ "sha256": "1dgksqzdln8cv0hyq273ikfk2bmk16rwvkiyscqsxzi8jdv8cdck"
},
"stable": {
"version": [
@@ -11061,6 +11231,26 @@
"sha256": "0jy6hkz8sr1bplymwxnjg4q408cw2dgfrv70chlw3y5ddc4cingj"
}
},
+ {
+ "ename": "cljr-ivy",
+ "commit": "c34d8d2edc5e5d213aef33255a9214ff87ece1bf",
+ "sha256": "03afriiwswaw0canv4wphqr4kfrrpkclcczcx5ab0w3pm4bax1zl",
+ "fetcher": "github",
+ "repo": "wandersoncferreira/cljr-ivy",
+ "unstable": {
+ "version": [
+ 20200602,
+ 1607
+ ],
+ "deps": [
+ "cl-lib",
+ "clj-refactor",
+ "ivy"
+ ],
+ "commit": "921ba65d0db7cda4edcd690c708946125b874a70",
+ "sha256": "12g74sfjw6siix8hvfbb0a7y8cxzxi1mb22sw8wih56bcv1987wl"
+ }
+ },
{
"ename": "cljsbuild-mode",
"commit": "d801a2e0ba5ae7c65b5d312fbf41261278a8b1ba",
@@ -11160,6 +11350,70 @@
"sha256": "0qkkdlifii6wkfxaj95zphiw3psmf9qnds3whmp6jq2lq9wpd74f"
}
},
+ {
+ "ename": "clojure-essential-ref",
+ "commit": "8ecff309816256bdc09163aee6ca06b4292d98b7",
+ "sha256": "0vl4lz9wmymkai7yhv0gqiky5czmzd7yz9g9czfp7lhfh1hpgbkg",
+ "fetcher": "github",
+ "repo": "p3r7/clojure-essential-ref",
+ "unstable": {
+ "version": [
+ 20200619,
+ 1653
+ ],
+ "deps": [
+ "cider"
+ ],
+ "commit": "3787300a2f6100d1a20b1259b488256f3a840fa6",
+ "sha256": "08r5whs39r2fscicjzvmdfj7s7f49afhiz4i2i05ps1f1545569d"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 1
+ ],
+ "deps": [
+ "cider"
+ ],
+ "commit": "e05d61b96f6469a93f52015b7ad5deadf616139e",
+ "sha256": "118zkdx118p1mzgq1szschl40qmb2cb5vw9jb9fhpimqdrlq53md"
+ }
+ },
+ {
+ "ename": "clojure-essential-ref-nov",
+ "commit": "11341af9478acdaec9d5e0b5011269ac7c0ada86",
+ "sha256": "1740mmv8qh8gsnzvvvfdxsp676ss8b6filidbxq6b6qz2jyb7fzw",
+ "fetcher": "github",
+ "repo": "p3r7/clojure-essential-ref",
+ "unstable": {
+ "version": [
+ 20200719,
+ 608
+ ],
+ "deps": [
+ "clojure-essential-ref",
+ "dash",
+ "nov"
+ ],
+ "commit": "3787300a2f6100d1a20b1259b488256f3a840fa6",
+ "sha256": "08r5whs39r2fscicjzvmdfj7s7f49afhiz4i2i05ps1f1545569d"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 1
+ ],
+ "deps": [
+ "clojure-essential-ref",
+ "dash",
+ "nov"
+ ],
+ "commit": "e05d61b96f6469a93f52015b7ad5deadf616139e",
+ "sha256": "118zkdx118p1mzgq1szschl40qmb2cb5vw9jb9fhpimqdrlq53md"
+ }
+ },
{
"ename": "clojure-mode",
"commit": "5e3cd2e6ee52692dc7b2a04245137130a9f521c7",
@@ -11168,20 +11422,20 @@
"repo": "clojure-emacs/clojure-mode",
"unstable": {
"version": [
- 20200419,
- 559
+ 20200813,
+ 639
],
- "commit": "da9f1ec717dac1194404b4a4562dba6bd9a4ee3a",
- "sha256": "0v4q031rvy34llbxhksqlzf3ign4q5xcwf6b3fzblb9k5nz2b3hr"
+ "commit": "84ed16c5ddb6561620886485e20669d0c81f88a1",
+ "sha256": "1kdm9dfj3qifwylj9j2x12xwxzrkmyp4pvph7bvwfrv65jp4r58j"
},
"stable": {
"version": [
5,
- 11,
+ 12,
0
],
- "commit": "721287c7a756678d5fe8fa0dcb2d8dc846d239a2",
- "sha256": "1x1yszp6waa778ki6sw66w1pzcz389wd01gkcldfxxnd7z89ad5d"
+ "commit": "3dc12d3a54ab17dee2db36c8fc48eb9598a17c5e",
+ "sha256": "14ipfy9ji39pnb9x7bzjp8lyqyxk168fx017m823j7a2g9i0sgp3"
}
},
{
@@ -11198,20 +11452,20 @@
"deps": [
"clojure-mode"
],
- "commit": "da9f1ec717dac1194404b4a4562dba6bd9a4ee3a",
- "sha256": "0v4q031rvy34llbxhksqlzf3ign4q5xcwf6b3fzblb9k5nz2b3hr"
+ "commit": "84ed16c5ddb6561620886485e20669d0c81f88a1",
+ "sha256": "1kdm9dfj3qifwylj9j2x12xwxzrkmyp4pvph7bvwfrv65jp4r58j"
},
"stable": {
"version": [
5,
- 11,
+ 12,
0
],
"deps": [
"clojure-mode"
],
- "commit": "721287c7a756678d5fe8fa0dcb2d8dc846d239a2",
- "sha256": "1x1yszp6waa778ki6sw66w1pzcz389wd01gkcldfxxnd7z89ad5d"
+ "commit": "3dc12d3a54ab17dee2db36c8fc48eb9598a17c5e",
+ "sha256": "14ipfy9ji39pnb9x7bzjp8lyqyxk168fx017m823j7a2g9i0sgp3"
}
},
{
@@ -11284,30 +11538,30 @@
"repo": "clojure-emacs/clomacs",
"unstable": {
"version": [
- 20191201,
- 200
+ 20200808,
+ 2347
],
"deps": [
"cider",
"s",
"simple-httpd"
],
- "commit": "88b8fc6d1b7105adae009578ef24fedaf157f341",
- "sha256": "13rhnncqj8666g2v7493i8xh79mczjrmg24p12knzhkslxdnv9hp"
+ "commit": "ada167954911bf1631ea73537b4b496f35f99a73",
+ "sha256": "0gc4c97s6y7al1777zmzvq1n30i532b4v8k2p7i71bzzijr97fml"
},
"stable": {
"version": [
0,
0,
- 4
+ 5
],
"deps": [
"cider",
"s",
"simple-httpd"
],
- "commit": "292c8f5370a2c74094da46ede990b5e7cc8b55b8",
- "sha256": "1rv57wqr09vl0caz4wjr0kqvhgvl5y1x6818v8m55rm2z8rim11i"
+ "commit": "ada167954911bf1631ea73537b4b496f35f99a73",
+ "sha256": "0gc4c97s6y7al1777zmzvq1n30i532b4v8k2p7i71bzzijr97fml"
}
},
{
@@ -11318,26 +11572,26 @@
"repo": "emacscollective/closql",
"unstable": {
"version": [
- 20191229,
- 1814
+ 20200704,
+ 2124
],
"deps": [
"emacsql-sqlite"
],
- "commit": "1e78f96dc976badb59067c986f7766cce89405cc",
- "sha256": "03nknirj5jd3yf842amb274269fyiinr325g1x2snf1zgqfm3csn"
+ "commit": "c864c1fadfea4a05fff29cb60891b7a32ac88c78",
+ "sha256": "06j0sc6dx8f34wc8i7dzkp8jwvwnrpnl8i93vpc1qw0ih0jwa2zh"
},
"stable": {
"version": [
1,
0,
- 1
+ 4
],
"deps": [
"emacsql-sqlite"
],
- "commit": "92f8f2dba684b7c9cc60821aa5668d336544ab99",
- "sha256": "0q8val0v4hryr0miliqjf38y4aybrihzncr0p1mwba861jlpy86n"
+ "commit": "c864c1fadfea4a05fff29cb60891b7a32ac88c78",
+ "sha256": "06j0sc6dx8f34wc8i7dzkp8jwvwnrpnl8i93vpc1qw0ih0jwa2zh"
}
},
{
@@ -11501,17 +11755,17 @@
20190710,
1319
],
- "commit": "135b5835a42d6e3c7efb85f80f3fe0885d45d644",
- "sha256": "18mgkn5cy14f5l4qajhdphxvw66hhhw2yf12qfvpd2n5bx3b8dcs"
+ "commit": "92d724903192b98e42cc1048ca587207aa20043f",
+ "sha256": "1ig5wjiq31rgf57gkf37d2rzx4qkkif997w1dfllwc4w3svwykp0"
},
"stable": {
"version": [
3,
- 17,
- 2
+ 18,
+ 1
],
- "commit": "615129f3ebd308abeaaee7f5f0689e7fc4616c28",
- "sha256": "1akclhrc9gx0asvmwcsbvw90wgazlyqd044wql7qj6vibv47cdjd"
+ "commit": "63a65baf4c343c73b2142078ef0045d3711dea1d",
+ "sha256": "1a3r119qca4sg83zchnsnmmq9k7ad8pljl5s24k00xbyyfs1wm7k"
}
},
{
@@ -11525,8 +11779,8 @@
20171121,
1115
],
- "commit": "d3f408f226eff3f77f7e00dd519f4efc78fd292d",
- "sha256": "1r8a3arpkkn91k619z4b6ywnq15glc4n1ji33l0q2m59f5sfk8mp"
+ "commit": "a7cf9e4c01c4683e14b6942cc5cc5e8cddc98721",
+ "sha256": "0zff8705vllkmm112qm58q1af0x1rcra5yw4fi8m5q97kh0n77vn"
},
"stable": {
"version": [
@@ -11579,11 +11833,11 @@
"repo": "tumashu/cnfonts",
"unstable": {
"version": [
- 20200327,
- 101
+ 20200819,
+ 543
],
- "commit": "d741332ad4bcd9a136d5dc4974a050da8ca28888",
- "sha256": "1f2nrklzvm0b09d1s5rxvzahc32rs5qdqx910a45fj95hlw2w2wc"
+ "commit": "d4d303b0045b682b9e699e63fa3af4dd00daf878",
+ "sha256": "06gcm7wc1ayz0z2fqz3bqyfxqlgbx31z95gwbwjd9x2mqgkp02mh"
},
"stable": {
"version": [
@@ -11868,14 +12122,14 @@
"repo": "ankurdave/color-identifiers-mode",
"unstable": {
"version": [
- 20200129,
- 144
+ 20200705,
+ 2145
],
"deps": [
"dash"
],
- "commit": "923ed4789c5ab66369ac4dda7eedb910951684a6",
- "sha256": "1d502n6bpdscgpqfanax1h0iirgpq8x56vh6bbpzg9i042i3z7ls"
+ "commit": "dfca97595094fc192a04172d86cb4ba68cab984f",
+ "sha256": "1w9biijvqr7ig7l3j6axbnmdn44xvyj3m8yinx0d6qqyys98hgyj"
},
"stable": {
"version": [
@@ -11961,11 +12215,11 @@
"repo": "emacs-jp/replace-colorthemes",
"unstable": {
"version": [
- 20200315,
- 929
+ 20200729,
+ 921
],
- "commit": "40464198e7bf2121694a7e6d87588342140a84ff",
- "sha256": "0fhr0rvfrb9fmbh9zgzxx2c2zl28v16hxmn9jx6k73nsfwpy498j"
+ "commit": "a996eca37f4df726eec95406deb76b538320771a",
+ "sha256": "1fgcd6vdqknqb1s1hwqqspk84a8xnxmrcnlic1j0x558i2yj4l2x"
},
"stable": {
"version": [
@@ -11985,14 +12239,14 @@
"repo": "purcell/color-theme-sanityinc-solarized",
"unstable": {
"version": [
- 20200304,
- 2156
+ 20200805,
+ 603
],
"deps": [
"cl-lib"
],
- "commit": "c688337aaae9f47128a841479e4191858ac147f6",
- "sha256": "0a16fn7h0yljlgg1scy82w5r6awd7gk6xf1qd83cx8kj2cg7k7vb"
+ "commit": "7ef39ac9d99bfb699903cfc3623521c0ceec7b86",
+ "sha256": "18x1hhq5v9agv2gvragwvxgzxfixfqy8pcbqhi63yqxmx30zlqj1"
},
"stable": {
"version": [
@@ -12011,11 +12265,11 @@
"repo": "purcell/color-theme-sanityinc-tomorrow",
"unstable": {
"version": [
- 20200507,
- 608
+ 20200813,
+ 333
],
- "commit": "e4e577c24db6ad7f6940a13e1d58418d42ff0c81",
- "sha256": "0363fi2q4wprnkrdlvvbsib42czsf4fwhy61c6b9bbj8fvmflzj8"
+ "commit": "b7e33d1ccb10a93d6a0393c43400435b70a48689",
+ "sha256": "1qg5wz04d7kq63zsjbhdcxn96j6x84hsbj7vbx6d051yql6l3m8s"
},
"stable": {
"version": [
@@ -12052,11 +12306,11 @@
"url": "https://git.sr.ht/~lthms/colorless-themes.el",
"unstable": {
"version": [
- 20200325,
- 1307
+ 20200812,
+ 656
],
- "commit": "2b4c341640c8191a39e4bc28d6cd04c7d6dcbb37",
- "sha256": "0ni9cnrv464fk840i1ll241kzkiy1zc6nfrbdv3ciixxdxbshxbn"
+ "commit": "736f7a105535901b4783d19534e7855920e25115",
+ "sha256": "1wi7wxiyk0g3k0l60hdmcyvvxr1kaapbkxvkknwd9qvdsji0ng73"
},
"stable": {
"version": [
@@ -12099,11 +12353,11 @@
"repo": "jordonbiondo/column-enforce-mode",
"unstable": {
"version": [
- 20171030,
- 1900
+ 20200605,
+ 1933
],
- "commit": "2341a2b6a33d4b8b74c35062ec9cfe1bffd61944",
- "sha256": "0rcxb7daxxrp5f1i5cbv25viwawbbsn4ij1mnlclp5wz7ilcy2rs"
+ "commit": "14a7622f2268890e33536ccd29510024d51ee96f",
+ "sha256": "1vxra5vk78yns2sw89m41bggczqg1akq6xvzfs9kylhkg5yz3g7g"
}
},
{
@@ -12114,28 +12368,26 @@
"repo": "jcs-elpa/com-css-sort",
"unstable": {
"version": [
- 20190723,
- 1714
+ 20200717,
+ 338
],
"deps": [
- "cl-lib",
"s"
],
- "commit": "b0491d5340c5f5c516b44aa7bfef6f6cf2998484",
- "sha256": "0d6pxwi5mbb98zzx3j55w221541674d69pxmf55yji6hly8yqavv"
+ "commit": "e12f77ad3a17a0d599ca802497086cd9155d451b",
+ "sha256": "1i0pg3hzw87drvfivr1355h3rfp409ak57bff9la8qlx1llynv5y"
},
"stable": {
"version": [
0,
0,
- 5
+ 6
],
"deps": [
- "cl-lib",
"s"
],
- "commit": "e3c6a3a88c8f7e3ce7a5c6756b47a7aba7ffe149",
- "sha256": "0c3pcgr95nhf2yx66hxiwwl6k2fqz8cpmr0y0fxzahkmvc4c9zi6"
+ "commit": "e12f77ad3a17a0d599ca802497086cd9155d451b",
+ "sha256": "1i0pg3hzw87drvfivr1355h3rfp409ak57bff9la8qlx1llynv5y"
}
},
{
@@ -12162,6 +12414,21 @@
"sha256": "1hh1lkan1ch5xyzrpfgzibf8dxmvaa1jfwlxyyhpnfs5h69h3245"
}
},
+ {
+ "ename": "comby",
+ "commit": "1173462e86ec0518cd6bab241fea3fe0342c4b41",
+ "sha256": "0wipqvdsmjhg4kvqcgarix955m9v8fs1lccs002f03rz4ckfdpxf",
+ "fetcher": "github",
+ "repo": "s-kostyaev/comby.el",
+ "unstable": {
+ "version": [
+ 20200629,
+ 140
+ ],
+ "commit": "928b8b8959a2556aba5526f2a25801341eb59dc3",
+ "sha256": "1f0155fyvh1m20ahl6wqask4qx6jp3lfwxj894cda9j4y8gnr5iq"
+ }
+ },
{
"ename": "comint-hyperlink",
"commit": "3c3bc7c897bfc5fafcda33d9837e6f3ff4da3692",
@@ -12248,8 +12515,8 @@
"f",
"s"
],
- "commit": "c93985dc318fe89e5a29abc21d19fb41e2fd14d2",
- "sha256": "0mlabiraagqwl17payils5589fr2mivvkzrfic6ndsipryab6rfc"
+ "commit": "9ba1456b0a389a2f7b42b6f42a4208ddd87ce609",
+ "sha256": "1kj7w8akrybr1y30lbhax8dnk5m4fg365ifxlyw766v69g5x7zd2"
},
"stable": {
"version": [
@@ -12394,14 +12661,14 @@
"repo": "ddoherty03/commify",
"unstable": {
"version": [
- 20161106,
- 2334
+ 20200812,
+ 1241
],
"deps": [
"s"
],
- "commit": "78732c2fa6c1a10288b7436d7c561ec9ebdd41be",
- "sha256": "1kb3cbjp69niq8ravh273dma0mnkf1v2ja372ahxfsq1janrkkm6"
+ "commit": "92514f071c667653f146629c0aec0ab4d3b78226",
+ "sha256": "1n6jpkhq0kncsszkkpfi923zq75h3d032vwmlz7pp8szs93w2308"
}
},
{
@@ -12442,20 +12709,20 @@
"repo": "company-mode/company-mode",
"unstable": {
"version": [
- 20200510,
- 1614
+ 20200818,
+ 1753
],
- "commit": "1c7a87283146f429c5076e8ea0a559556a4d4272",
- "sha256": "0dvvdyg8fc6jzcl1hgrh0cr3nz4vyw5i9xz5w3mc3mn7fixbdcr3"
+ "commit": "54f60ef523878c4d332f29df380f36cf2f165935",
+ "sha256": "08lbjvm97fh1bm5201ncbnr5b1456y9mwf6yhrrhg1rjqvcca74q"
},
"stable": {
"version": [
0,
9,
- 12
+ 13
],
- "commit": "490d3e4e7ef3fbc90fb3e8747f902bf839a924cc",
- "sha256": "0c31amc6gyfkmb1ii6mm56c75za1yxkj2iyhrjc45nn2mrh7yj7a"
+ "commit": "656ad10670512e135a0a5881f127bb7a789ef8ca",
+ "sha256": "1j5f8kqv36r18pg09a6139q7a0a39xdnc5nf6sv3c0pw3yfw1szn"
}
},
{
@@ -12557,16 +12824,16 @@
"repo": "alexeyr/company-auctex",
"unstable": {
"version": [
- 20180725,
- 1912
+ 20200529,
+ 1835
],
"deps": [
"auctex",
"company",
"yasnippet"
],
- "commit": "48c42c58ce2f0e693301b0cb2d085055410c1b25",
- "sha256": "10qn7frn5wcmrlci3v6iliqzj7r9dls87h9zp3xkgrgn4bqprfp8"
+ "commit": "9400a2ec7459dde8cbf1a5d50dfee4e300ed7e18",
+ "sha256": "0x8qc63zn126hspcblwlihxfzs8kvcjb6cpj28ahsb0117j2i789"
}
},
{
@@ -12616,16 +12883,16 @@
"repo": "sebastiencs/company-box",
"unstable": {
"version": [
- 20200511,
- 401
+ 20200818,
+ 738
],
"deps": [
"company",
"dash",
"dash-functional"
],
- "commit": "452f083f6c11793a3723224bce42898a2bedc0e1",
- "sha256": "07il7z52ywvkqy5zpkvzsaxsjqx8dqgd91cpba05vywpsl3lis30"
+ "commit": "20384f0e382c063173b9d863344b1b23bc1e4954",
+ "sha256": "0l66ajzh1x0gazmv9nzgcsy72kyja3yq4gmzgzpkgin5dxms33k0"
}
},
{
@@ -12686,8 +12953,8 @@
"repo": "cpitclaudel/company-coq",
"unstable": {
"version": [
- 20200130,
- 2058
+ 20200729,
+ 401
],
"deps": [
"cl-lib",
@@ -12696,8 +12963,8 @@
"dash",
"yasnippet"
],
- "commit": "f9dba9ddff7da99a93d8a6e26d9b1d813bc96b2f",
- "sha256": "1hl8gr8afx2i5bia7vq3vn4shbaz8fps3h30ldvq141kfvmcp8jm"
+ "commit": "b096cb528de1e0bb31cc1059d0bd698b98a6cc6a",
+ "sha256": "0m70w4f0kpvk97nnnp1bfk191dhipv418fmcfqjw90sajknyhq6m"
},
"stable": {
"version": [
@@ -12724,26 +12991,26 @@
"repo": "redguardtoo/company-ctags",
"unstable": {
"version": [
- 20200407,
- 803
+ 20200603,
+ 438
],
"deps": [
"company"
],
- "commit": "b159e45b38226e046cf6fb7d08a0cf864ebbf772",
- "sha256": "0h0k06c9fabyz6akka1bpwkz69wzl7ajcm0p108xdf5lymc75v5h"
+ "commit": "ba4d2577fbbe5ad7bb978838e3e3177f8a56e8f8",
+ "sha256": "0cy48my9d02v7wa40dw5x6djyjjacddj9p0pgdvr1rg70lqxii45"
},
"stable": {
"version": [
0,
0,
- 3
+ 4
],
"deps": [
"company"
],
- "commit": "3d21eaa511b5f0ca55205f203d28fd10ea1d3b39",
- "sha256": "0lj5gkj2dl0c7sva8bi3bng2gm90sjq15g7w8r9nz70666szdr1i"
+ "commit": "ba4d2577fbbe5ad7bb978838e3e3177f8a56e8f8",
+ "sha256": "0cy48my9d02v7wa40dw5x6djyjjacddj9p0pgdvr1rg70lqxii45"
}
},
{
@@ -12860,15 +13127,15 @@
"repo": "dunn/company-emoji",
"unstable": {
"version": [
- 20191226,
- 1915
+ 20200612,
+ 1902
],
"deps": [
"cl-lib",
"company"
],
- "commit": "fc45b56f3e2081d794f243bce705e77d4e29fc06",
- "sha256": "0r9zcbm3nb3zw5cwrkl098v5b49jbga5404bj7j55g6k4rwkjar2"
+ "commit": "5f2d10623c1e9f547d852cb13c7a391afbda09fb",
+ "sha256": "0b7hfcgmrkmbi138hjfc9jsgh84slw4fcizxss55b9j60xrzsc75"
},
"stable": {
"version": [
@@ -12962,28 +13229,28 @@
"repo": "jcs-elpa/company-fuzzy",
"unstable": {
"version": [
- 20190812,
- 204
+ 20200712,
+ 49
],
"deps": [
"company",
"s"
],
- "commit": "2af24f053465ab370566a49c231d541ca9509850",
- "sha256": "0ki049jpd4xymagaxd4zvnj3bm7d7d797xa1bm8lfi701m2jjlgg"
+ "commit": "af017d00f4576fddee1d386f41c9ccebd7038d9a",
+ "sha256": "1a3317wzilp7z01j34rqg5khr77hqz9nxm930d16225gki98g9q3"
},
"stable": {
"version": [
0,
- 5,
- 3
+ 6,
+ 0
],
"deps": [
"company",
"s"
],
- "commit": "a97f55b60f427e536e637898d12792154d134aab",
- "sha256": "1iw1vk1pgdacvfh17n45kk98rxml3f6kxnijmpp7fzz4q07yiv7w"
+ "commit": "af017d00f4576fddee1d386f41c9ccebd7038d9a",
+ "sha256": "1a3317wzilp7z01j34rqg5khr77hqz9nxm930d16225gki98g9q3"
}
},
{
@@ -13226,8 +13493,26 @@
"lean-mode",
"s"
],
- "commit": "65b55b1711fb61129312044d5ac7e6a2c2ee245c",
- "sha256": "1zmw8950qhry2ixk2ng0pg4j0vwx11nvjlrpab9jg6x47ys9j65n"
+ "commit": "6b4377686128d5c2fb55d8fe61b92a9991d40fbd",
+ "sha256": "1zb3igic1i30mfbsx4k2sabhdpl58fsrl5c3fjvqrpn92ixi9vws"
+ }
+ },
+ {
+ "ename": "company-ledger",
+ "commit": "546bc62530136a7fdf3886731e4316c6c8081ead",
+ "sha256": "0y54wbky6jq9r3h4ghpkjywj78hw8k83ri6szph6s8w5m6dkji82",
+ "fetcher": "github",
+ "repo": "debanjum/company-ledger",
+ "unstable": {
+ "version": [
+ 20200726,
+ 1825
+ ],
+ "deps": [
+ "company"
+ ],
+ "commit": "9fe9e3b809d6d2bc13c601953f696f43b09ea296",
+ "sha256": "08cs8vd2vzpzk71wzcrghn48mzvbk6w2fzlb3if63klhfcfpngc8"
}
},
{
@@ -13287,6 +13572,25 @@
"sha256": "0ny2dcc7c585p7v3j6q0rpkbj1qmf2ismy8a5020jpr585xvz0hh"
}
},
+ {
+ "ename": "company-manually",
+ "commit": "a7cdcad45efa0ecb807645c597b6fc3be22899d3",
+ "sha256": "1ws4kgvjz8ff600rw4grgjq7s34233s9616jnyykjfdh18skssmi",
+ "fetcher": "github",
+ "repo": "yanghaoxie/company-manually",
+ "unstable": {
+ "version": [
+ 20200709,
+ 913
+ ],
+ "deps": [
+ "company",
+ "ivy"
+ ],
+ "commit": "b922318da821fc3cf1d3155f21d543ea8470c881",
+ "sha256": "1s2bv040gg22qzjca39r32cz3qhairnvppk9wdp1hl52i6by57v9"
+ }
+ },
{
"ename": "company-math",
"commit": "fadff01600d57f5b9ea9c0c47ed109e058114998",
@@ -13353,8 +13657,8 @@
"company",
"native-complete"
],
- "commit": "0f290514564d3733b35e4b48d70446c1a6eb4b41",
- "sha256": "0i8bss7ipwsjfrgfri7d3f9pbpkdbfh8aqz8cawr2wvf4yayk8q5"
+ "commit": "be7ced29c5a86e29c364f19d248634b8b54d0e52",
+ "sha256": "1lyad89byq54fva58njf7wiq2rw3767fxif1ykijirzx7q14ahxd"
}
},
{
@@ -13446,16 +13750,16 @@
"repo": "org-roam/company-org-roam",
"unstable": {
"version": [
- 20200511,
- 743
+ 20200711,
+ 355
],
"deps": [
"company",
"dash",
"org-roam"
],
- "commit": "674c2bd493f571c5323d69279557a6c18ccbd14e",
- "sha256": "1x88kvxawbpg4sagi0kh4y7inyhy05dxcg8hl0ih4x40cwxyxrs5"
+ "commit": "1132663bd68022aa7ea005ff53c7c7571890769d",
+ "sha256": "1xk53lyf5sn16cs2gv874sajs5jlsxbxpksbjx9nk8glzrq7r6r3"
},
"stable": {
"version": [
@@ -13492,16 +13796,16 @@
"stable": {
"version": [
2,
- 2,
- 2
+ 3,
+ 0
],
"deps": [
"ac-php-core",
"cl-lib",
"company"
],
- "commit": "4490d168778a61a4ee8623defe760164cd9745b8",
- "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m"
+ "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41",
+ "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj"
}
},
{
@@ -13519,8 +13823,8 @@
"company",
"phpactor"
],
- "commit": "860d7e8784b261ee71deba354d01c3038cd777ab",
- "sha256": "1d3fijh11g70xhx3a47l75mrp64bvkk7hh9lg83nl30qhn2vrbn3"
+ "commit": "62d2372ea55c0c5fb4e77076988472ebb5d85f24",
+ "sha256": "1sfrdap157zc7lk9vwsy91p813ip8dmazgfjwh7jwzyvcj7dsimc"
},
"stable": {
"version": [
@@ -13536,6 +13840,42 @@
"sha256": "0dsa1mygb96nlz5gppf0sny3lxaacvmvnkg84c0cs6x223s6zfx8"
}
},
+ {
+ "ename": "company-plisp",
+ "commit": "bdd486fdb97b4954a881b6099704704829eb0058",
+ "sha256": "071h99nv6q3lrc6navii0dhzak28j3fqx4mwajyapzlcrrsdpp4i",
+ "fetcher": "gitlab",
+ "repo": "sasanidas/company-plisp",
+ "unstable": {
+ "version": [
+ 20200531,
+ 1927
+ ],
+ "deps": [
+ "cl-lib",
+ "company",
+ "dash",
+ "s"
+ ],
+ "commit": "fc0b56d2a711340ca3e63119bfe692bb3e8620fb",
+ "sha256": "0xw475spfwq32nn5qz3gk22cggj1f5y245da9030vzi2jfb9vvid"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
+ 1
+ ],
+ "deps": [
+ "cl-lib",
+ "company",
+ "dash",
+ "s"
+ ],
+ "commit": "0e6941e1832faafb2176238339667edd482acd95",
+ "sha256": "1ri022shrwiw10gdydm66c2xya1qxl449r5f8qadals7m4crczp2"
+ }
+ },
{
"ename": "company-plsense",
"commit": "9cf9d671d81e07c704676c557a9f0d686067ce5c",
@@ -13584,15 +13924,15 @@
"repo": "tumashu/company-posframe",
"unstable": {
"version": [
- 20200514,
- 2116
+ 20200812,
+ 410
],
"deps": [
"company",
"posframe"
],
- "commit": "4e506d661ed9cd2e4cf16281f3a11009210e9c30",
- "sha256": "1h6pls6vg593cbmvq2kh5z67jvcyljvwbdxypqqsls5d22hvvbh5"
+ "commit": "4bfb8bccef4b64479f4147de6bf6fbd05df2a67e",
+ "sha256": "0k19gkh8xbap4j1jjqw6lnkp1v2q76fz3ryrns7kvbzmca3y5599"
},
"stable": {
"version": [
@@ -13616,27 +13956,27 @@
"repo": "raxod502/prescient.el",
"unstable": {
"version": [
- 20200404,
- 1550
+ 20200716,
+ 1414
],
"deps": [
"company",
"prescient"
],
- "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7",
- "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv"
+ "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530",
+ "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p"
},
"stable": {
"version": [
- 4,
- 1
+ 5,
+ 0
],
"deps": [
"company",
"prescient"
],
- "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0",
- "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3"
+ "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc",
+ "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix"
}
},
{
@@ -13666,15 +14006,15 @@
"repo": "company-mode/company-quickhelp",
"unstable": {
"version": [
- 20180525,
- 1003
+ 20200714,
+ 1611
],
"deps": [
"company",
"pos-tip"
],
- "commit": "479676cade80a9f03802ca3d956591820ed5c537",
- "sha256": "0hbqpnaf4hnin3nmdzmfj3v22kk9a97b6zssqs96ns36d9h52xcp"
+ "commit": "5a86731de461142db3b7ca26b4681756edb4b773",
+ "sha256": "0n0pdcgql8hcipwacc60hk4ymp8ry6z9lm4p4wn8gmnb7km023qb"
},
"stable": {
"version": [
@@ -13698,36 +14038,36 @@
"repo": "jcs-elpa/company-quickhelp-terminal",
"unstable": {
"version": [
- 20200309,
- 245
+ 20200627,
+ 908
],
"deps": [
"company-quickhelp",
"popup"
],
- "commit": "0a7c86258b3069adbeb0889e21c6977390d00f4f",
- "sha256": "0zbzbm4hchp1a8m0bdcp9d97i0yx3kkhp5vbs0m5pr2h13xdc7vj"
+ "commit": "e18b4cf309e2bbc63995ebc3c1230c8c865dd00e",
+ "sha256": "1ixl54wgynq0zzqr7cxphblwmxx5a9gs28rfyq5c2l499ja4r1k7"
},
"stable": {
"version": [
0,
- 0,
- 2
+ 1,
+ 0
],
"deps": [
"company-quickhelp",
"popup"
],
- "commit": "344e30202fb38e1947b8b17f403bb7b2208936fe",
- "sha256": "1gzmx8zz93261m9kks2hdgdhfs9vz8gsdxx5xkldbnz4g1wbmh2a"
+ "commit": "e18b4cf309e2bbc63995ebc3c1230c8c865dd00e",
+ "sha256": "1ixl54wgynq0zzqr7cxphblwmxx5a9gs28rfyq5c2l499ja4r1k7"
}
},
{
"ename": "company-racer",
- "commit": "c4671a674dbc1620a41e0ff99508892a25eec2ad",
- "sha256": "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4",
+ "commit": "b38908bc1b759b14173ffb49ddeb040a9892cc0d",
+ "sha256": "180851z4ngpfvib2rhr9dvc1kbqjn4flsibc9r382na8wnmmcx5j",
"fetcher": "github",
- "repo": "emacs-pe/company-racer",
+ "repo": "emacsattic/company-racer",
"unstable": {
"version": [
20171205,
@@ -13812,8 +14152,8 @@
"company",
"rtags"
],
- "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710",
- "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr"
+ "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824",
+ "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b"
},
"stable": {
"version": [
@@ -13878,8 +14218,8 @@
"company",
"solidity-mode"
],
- "commit": "022b3159832384a7dcdc2168809e698600826047",
- "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69"
+ "commit": "d166a86b83907e0cfd64c191e9dfce4b44a9843e",
+ "sha256": "19hgvsrqch2vp49ag6m76bi5qxd20v95z0ib838rib9as15b17wq"
},
"stable": {
"version": [
@@ -13947,8 +14287,8 @@
"company",
"stan-mode"
],
- "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
- "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
+ "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e",
+ "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0"
},
"stable": {
"version": [
@@ -14002,14 +14342,14 @@
"repo": "juergenhoetzel/company-suggest",
"unstable": {
"version": [
- 20180527,
- 1631
+ 20200804,
+ 1127
],
"deps": [
"company"
],
- "commit": "e1fa663b48639c76d91d1f5ac3b23215aa3dabc3",
- "sha256": "0jn7rx4m3121lx6hhabvnfq73vd0rj2364hbvza2myylw4f4qav9"
+ "commit": "7f4efb0e2577b7b34928db3dc71758ab6852f66b",
+ "sha256": "0hlvg11p4xkafqys322ablbld2v7fks924cpc3bs3wcipjjxl3cf"
}
},
{
@@ -14246,11 +14586,11 @@
"repo": "paldepind/composable.el",
"unstable": {
"version": [
- 20190904,
- 701
+ 20200604,
+ 1156
],
- "commit": "46f82d86c285ceba3e0e46adf993a98cd8816390",
- "sha256": "14n5sckdaxx291wmj7mnsn06sprpdxf6s44hgxdksv0pvln2m0wx"
+ "commit": "f6262e6d7380ce9d4eacd7127fe0d968325f347d",
+ "sha256": "0a2xfnd54pclh3qm1hwv867dpkhk6wck94092yyzapj7zxnfnr15"
},
"stable": {
"version": [
@@ -14270,35 +14610,32 @@
"repo": "emacs-php/composer.el",
"unstable": {
"version": [
- 20200214,
- 1119
+ 20200616,
+ 1717
],
"deps": [
- "cl-lib",
"f",
"php-runtime",
- "request",
"s",
"seq"
],
- "commit": "8b4867e30efcdf10c6d9a74822aa281404377818",
- "sha256": "1605fk7nkzjshn6faxw0ycn45a1wbivpmlmyaxcqzjhmawavky6b"
+ "commit": "7c7f89df226cac69664d7eca5e913b544dc475c5",
+ "sha256": "0iyajdlp95mii462xqy6fqbv5q7vai3ya4jip8433zwwr2pkdbsr"
},
"stable": {
"version": [
0,
- 1,
- 1
+ 2,
+ 0
],
"deps": [
"f",
"php-runtime",
- "request",
"s",
"seq"
],
- "commit": "d88741009cf7cae0a75e3cc7a19dd9143fcc92f9",
- "sha256": "0iqm8997pl3pni7a49igj8q6sp37bjdshjwl6d95bqrjkjf9ll08"
+ "commit": "db65d874d762f70558449a01bdac5361bf067c15",
+ "sha256": "1krfdc8xrkxl7mhldxhbf2lddyskvvrykrspkzvvwivc29dl0vmm"
}
},
{
@@ -14357,8 +14694,8 @@
"repo": "necaris/conda.el",
"unstable": {
"version": [
- 20200509,
- 1836
+ 20200818,
+ 1614
],
"deps": [
"dash",
@@ -14366,14 +14703,14 @@
"pythonic",
"s"
],
- "commit": "8dad784b75a42d1cb6f7a6b8a2c2e39f589727f9",
- "sha256": "1k1hsargcqciyz48zkdsnhinv8h4fr9786x8s7c63864fbxxby3v"
+ "commit": "9f7eea16e9ad3eb34fe3d1cbd9d6162b8046c2f8",
+ "sha256": "1151bk1fx8y8yql1sg9qqagxcbq57rz85gwnx0z2acfpljb2i7r7"
},
"stable": {
"version": [
0,
0,
- 10
+ 11
],
"deps": [
"dash",
@@ -14381,8 +14718,8 @@
"pythonic",
"s"
],
- "commit": "8dad784b75a42d1cb6f7a6b8a2c2e39f589727f9",
- "sha256": "1k1hsargcqciyz48zkdsnhinv8h4fr9786x8s7c63864fbxxby3v"
+ "commit": "78e1aad076f6cefc6aa7cc77d08e174b13050994",
+ "sha256": "02l9m5wx0z865w3cdwbw7c22fmdjbsw4svivqg72nbl7yrq7rv5v"
}
},
{
@@ -14658,16 +14995,16 @@
"repo": "emacs-php/emacs-auto-deployment",
"unstable": {
"version": [
- 20180604,
- 1419
+ 20200616,
+ 518
],
"deps": [
"cl-lib",
"f",
"s"
],
- "commit": "5af6d5fcc35ddf9050eada96fd5f334bf0661b62",
- "sha256": "1q9liby1dmwwmg2jz13gx2ld47bpcqb9c7vx4qgky75wb5c2q1xz"
+ "commit": "811c8fe638c5616b6471525421e61a4470be3b52",
+ "sha256": "0j205ky9djlzhgrgjw4562lz2gnpi48las66w7ll8z20zkk4ylnm"
},
"stable": {
"version": [
@@ -14798,20 +15135,27 @@
"repo": "conao3/cort.el",
"unstable": {
"version": [
- 20200330,
- 1641
+ 20200812,
+ 910
],
- "commit": "eb94d2a5b3a048a495fb0218b2df9021f8c864f4",
- "sha256": "0rc1jfqkc05ml41cp8dc8akrxx3ifziyjy1w4vvgpbb5z49m83ky"
+ "deps": [
+ "ansi",
+ "cl-lib"
+ ],
+ "commit": "28c8422e84fd545f7a166f1904277b6b3f98398c",
+ "sha256": "06fcwadrn32i19qp30xw65976wplsw3xh2jm0zzsp9g0pir1snxb"
},
"stable": {
"version": [
- 3,
- 0,
- 5
+ 7,
+ 1,
+ 0
+ ],
+ "deps": [
+ "ansi"
],
- "commit": "1df178e296feaf4465967567b1cfdce1dda5a09b",
- "sha256": "0y23w34dcifk6cxw2kcgwydqdc8hn0mj5129z560fm6iwxd6cgkx"
+ "commit": "a2d5ac5639e43dd73b5dbfa5bd011b7760b126fd",
+ "sha256": "03c223nczpbdkjmq69panhbsq2a0zj20w329jgj4c0zsj8m1a32a"
}
},
{
@@ -14837,14 +15181,14 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20200512,
- 1130
+ 20200818,
+ 1428
],
"deps": [
"swiper"
],
- "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851",
- "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3"
+ "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44",
+ "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l"
},
"stable": {
"version": [
@@ -14943,10 +15287,10 @@
},
{
"ename": "counsel-dash",
- "commit": "0f8af4d854f972bfed3d2122b4c089f72d8b5f2a",
- "sha256": "0pzh8ww1p2jb859gdjr5ypya3rwhiyg3c79xhx8filxrqxgjv5fk",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "1ya7mnxlgb1rwr8xlg17mqh25dbkr0v04wccg9l8hwl63m7bfzpv",
"fetcher": "github",
- "repo": "nathankot/counsel-dash",
+ "repo": "dash-docs-el/counsel-dash",
"unstable": {
"version": [
20200103,
@@ -14984,26 +15328,26 @@
"repo": "redguardtoo/counsel-etags",
"unstable": {
"version": [
- 20200514,
- 1224
+ 20200814,
+ 716
],
"deps": [
"counsel"
],
- "commit": "362fc857a271e509d05fa190212629dc6b0778f2",
- "sha256": "0c9p6pfnzdbxaib1vgm1npp8lgyw0hpczi210c26x8p9d8xx19lw"
+ "commit": "5ec1e422b47163e17d0d5c1cf732068f93ffc39c",
+ "sha256": "0zwyff7lamlpqd52ifspf6bb78cpanlsy5gccp7ms7mnj82zhfxm"
},
"stable": {
"version": [
1,
9,
- 8
+ 12
],
"deps": [
"counsel"
],
- "commit": "362fc857a271e509d05fa190212629dc6b0778f2",
- "sha256": "0c9p6pfnzdbxaib1vgm1npp8lgyw0hpczi210c26x8p9d8xx19lw"
+ "commit": "9436bdbddc0deba88d97b5f31d62a2c95a52c400",
+ "sha256": "08glszh5y8y078vjrnmasxdfmxiics88hkva4nqq6spl0a0hrn9f"
}
},
{
@@ -15132,14 +15476,14 @@
"repo": "akirak/counsel-org-capture-string",
"unstable": {
"version": [
- 20180816,
- 724
+ 20200810,
+ 1114
],
"deps": [
"ivy"
],
- "commit": "0fd5d72397a9268a89dd26de2a6c355f127453ac",
- "sha256": "19ijjiidxxysvkz9vnsgiymxd7w7zcs5bazn7dmahp5yaprlsjld"
+ "commit": "dbb7d95f99d7910d76ffc2d024580088a34ec444",
+ "sha256": "1pymgwvjiagsx9dh9678x3i8ds1s7l4s182dr2p9rpjiwya48l6x"
}
},
{
@@ -15150,15 +15494,15 @@
"repo": "akirak/counsel-org-clock",
"unstable": {
"version": [
- 20190407,
- 348
+ 20200810,
+ 1109
],
"deps": [
"dash",
"ivy"
],
- "commit": "ddf6b89652e4dbc0be5e8719213e7673c83959f1",
- "sha256": "1fd8ll7jcfmy2dhhhsqh1l6wqfklma54bqpb4jnxmdn2w9p3ndmn"
+ "commit": "c5f781f241f8b16b7c3b6fb3e56e2938ba1dd87a",
+ "sha256": "10img15z5lfn8ml8d6v5mjf1nr73i8mjn9xy23ydp16n2idshh3d"
}
},
{
@@ -15187,15 +15531,15 @@
"repo": "ericdanan/counsel-projectile",
"unstable": {
"version": [
- 20200430,
- 2133
+ 20200522,
+ 1131
],
"deps": [
"counsel",
"projectile"
],
- "commit": "126e825bbab872b3befd9ef88660571391ebfdc3",
- "sha256": "0shmndgr1plx8kzppn990ybb2144h8p49v4vd37099y5pj6w3zri"
+ "commit": "77392cbbc42e98fc137b43f1db1b111ba6e2dd75",
+ "sha256": "131pww7lf88az5bsnaza8i60p7xcic271wpdr870zan8z1jh69k3"
},
"stable": {
"version": [
@@ -15237,14 +15581,14 @@
"repo": "Lautaro-Garcia/counsel-spotify",
"unstable": {
"version": [
- 20200326,
- 156
+ 20200818,
+ 2055
],
"deps": [
"ivy"
],
- "commit": "5d23a898483de19cb60773492c9846facb8ae281",
- "sha256": "0k9m8xi9p5w2qnpz0zmdf52ip6viws06qq5rssgvb0cr888iqib2"
+ "commit": "2743ad52a9def53534fd505397fbe1ac49e53015",
+ "sha256": "1xrh06w3pszp4gygwsyjz7b5w2ffqmnh6rh891ydbhysp586hk0v"
}
},
{
@@ -15360,16 +15704,16 @@
"repo": "AdamNiederer/cov",
"unstable": {
"version": [
- 20191004,
- 36
+ 20200630,
+ 1942
],
"deps": [
"elquery",
"f",
"s"
],
- "commit": "9e6f4af7a07e281913f9f50f20dbbf6f26807563",
- "sha256": "1w27hi64wcd86pw4ds2w4yldfm0wsk15f9mpcinyb68sj1p7sn9y"
+ "commit": "8b9c7d7f4e53ab3a66cc4d9c88ac07fa57c7a5fe",
+ "sha256": "17msfsl7q78cs065a28z95hgcqvhbddlg9qwgldc1v62lgpqfd7a"
}
},
{
@@ -15393,14 +15737,14 @@
"stable": {
"version": [
0,
- 3
+ 5
],
"deps": [
"cl-lib",
"ov"
],
- "commit": "c73d984168955ca0f47f44b0464aa45282df42b6",
- "sha256": "1kn61j91x4r4kc498y2jas5il4pc4qzhkj8392g2qiq5m3lbv4vl"
+ "commit": "6e3c6f2dcb759a76086adeeb1fdfe83e4f082482",
+ "sha256": "1l2vpyv22f77r2nd1bxf4mggmarb621dl7fnskp5hizhc5sfxi4f"
}
},
{
@@ -15493,30 +15837,6 @@
"sha256": "0yspf51h5b7wbqvi9lbd22chyw799n5d05xdzl5axg0i33lzk7bq"
}
},
- {
- "ename": "cpp-capf",
- "commit": "7a456977e00708d2a0b764553048f3be11d96ebc",
- "sha256": "0gc5grf9viiqsjwydyv3q3qgjwkla4n54d48dc7m6mq6fl8f3p23",
- "fetcher": "git",
- "url": "https://git.sr.ht/~zge/cpp-capf",
- "unstable": {
- "version": [
- 20200405,
- 8
- ],
- "commit": "0a4fd531e9e47369ff29d9f8583efd0bacd6bc50",
- "sha256": "0q6kgh2mdx3pr8ywr3fhn96chvrf6zx6xxs2lyfviwmfq2c3pyph"
- },
- "stable": {
- "version": [
- 1,
- 1,
- 0
- ],
- "commit": "bee4a7d5e9a52d955325396121a901a7679295b2",
- "sha256": "0lk6q8jy53iqn9gzh7nd1qpfn5lmsc1h1qn8b6br82v0i1wd96gb"
- }
- },
{
"ename": "cpputils-cmake",
"commit": "9b84a159e97f7161d0705da5dd5e8c34ae5cb848",
@@ -15789,14 +16109,14 @@
"repo": "bbatsov/crux",
"unstable": {
"version": [
- 20181108,
- 827
+ 20200817,
+ 1534
],
"deps": [
"seq"
],
- "commit": "903db7b1a2052f4959d934cae26ec40a3f323ed4",
- "sha256": "15wq0z9mnx60mi9xfkvgfgsfxdbiigwxr0wqabv3n2091dbzfas4"
+ "commit": "139eb6f1504b6885c86c658fd33c6d59bfac0a8c",
+ "sha256": "1889cn6pb8j55mi606nm1r6yywg64xa89s0hfbiksl4gx03yk2ip"
},
"stable": {
"version": [
@@ -15846,8 +16166,8 @@
20191121,
1447
],
- "commit": "2428b016243e78a0312cf6b3ba6939e7169a1405",
- "sha256": "0al65ldsbmm15h4y79i8avk63qq1y7fqzzad8p327z6d42zfm1qj"
+ "commit": "f9e4db16ff9fdc6a296363aa35d19cfb4926e472",
+ "sha256": "1x0lmb48bza2w52s15288hpbipafs87lj5lv0ldd1q4r9yv0i102"
},
"stable": {
"version": [
@@ -15900,11 +16220,11 @@
"repo": "josteink/csharp-mode",
"unstable": {
"version": [
- 20200402,
- 919
+ 20200728,
+ 1113
],
- "commit": "31124dba6833a4de144ca508edb90d5adfeec209",
- "sha256": "0jrj2ayna8bzhi441hhszhch3na08iciqnd7fsqrm8xbwlrq7l2x"
+ "commit": "48851778e0f01a2b0395e054e418a1d8a1687a06",
+ "sha256": "0nikm2sn59ichbd3ikyhdn696fqj5ikzh79iniylza8gzmhxgddi"
},
"stable": {
"version": [
@@ -15924,8 +16244,8 @@
"repo": "hlolli/csound-mode",
"unstable": {
"version": [
- 20200402,
- 1509
+ 20200518,
+ 1546
],
"deps": [
"dash",
@@ -15933,8 +16253,8 @@
"multi",
"shut-up"
],
- "commit": "81bec1a71934a56f677f442e2c22fb6336b366c4",
- "sha256": "1cxg2c8sz76b3ml8blb4f268xl6ql959p2hi5i4llil4fggw6df2"
+ "commit": "b6e8167c927c400c291daaa46a8aea132834b07c",
+ "sha256": "12k3z7azwbg11gs8sc8j6h0rb3zy3kw19z6l9ynxys4vzm9ln7dm"
},
"stable": {
"version": [
@@ -15959,11 +16279,11 @@
"repo": "omajid/csproj-mode",
"unstable": {
"version": [
- 20191012,
- 49
+ 20200801,
+ 1732
],
- "commit": "95e797af7cc30d4675247b64496c39b77b82e18e",
- "sha256": "08cxkvq7k14lixavv7nwi5kmmxqvkgmqr4i46ihsgv7jcmxyy8gx"
+ "commit": "a7f0f4610c976a28c41b9b8299892f88b5d0336c",
+ "sha256": "0j8m7rhkf98zqkg6zydcks6qs4msw6vz51nbqya23hka2wpz7f81"
}
},
{
@@ -16119,19 +16439,19 @@
"repo": "raxod502/ctrlf",
"unstable": {
"version": [
- 20200417,
- 1549
+ 20200802,
+ 1422
],
- "commit": "0bf26a5688b7f34695310100dc8c28381bfafe34",
- "sha256": "1rknqa4qj3gfhlxfb8fqhdcy936sr0a2vi89rcqh5izl76zynisr"
+ "commit": "5a13161bb2ef2908dd5a00b3b6aa7b8dacfecd8a",
+ "sha256": "09gd2zi3wvg9vhaxz6y1zii0n8nxhffp9qyjsgswyzaa1j7dzv2i"
},
"stable": {
"version": [
1,
- 0
+ 1
],
- "commit": "41eecedf44f2235ce13e021906c4ce92deddefdc",
- "sha256": "10gnhafas54zj3z9173h1g7b519ac4i26afclmw3w1pk6qyyb03z"
+ "commit": "b91f88a24c05408757ae9c9b5ce74d46d6ce20d8",
+ "sha256": "1ffcjf0ff0748gqipkklz6jmcj4f3blgzdcax93ql9ws8bmvlsdc"
}
},
{
@@ -16301,6 +16621,21 @@
"sha256": "1yk5j8sb1li2zh1w5awwn83rhcwr1g492an4ajxkyikj3b7ljyfv"
}
},
+ {
+ "ename": "currency-convert",
+ "commit": "cc9d610a29376bb1c24f77669ee6a05bcf60023d",
+ "sha256": "1i7hs3c7lwfnp7d9ql6bl5l0s9byfnc3n68gkk57zl5imsfhbgg1",
+ "fetcher": "github",
+ "repo": "lassik/emacs-currency-convert",
+ "unstable": {
+ "version": [
+ 20200611,
+ 815
+ ],
+ "commit": "a8bd12654c34380b87ac6ffece32f43b723b6f0f",
+ "sha256": "1np43lwrwfwnnff98230ahaqdifiq2nzd361ypsg8cp8qja4zwwi"
+ }
+ },
{
"ename": "cursor-test",
"commit": "6439f7561cfab4f6f3beb132d2a65e94b3deba9e",
@@ -16369,19 +16704,19 @@
"repo": "n3mo/cyberpunk-theme.el",
"unstable": {
"version": [
- 20200115,
- 1720
+ 20200601,
+ 1632
],
- "commit": "07edefdec3956fba9076fe98cdc33df7bf617afc",
- "sha256": "0swjbc61ii88j4myxfl5inn2j46jpf7giqd1kf0rjdyrc8zmj08h"
+ "commit": "cbd0d7193e69ff9e98262eb06aee3d27667ff5f5",
+ "sha256": "16nd57rwld78brcwx6vjib2v3l9xsiv7bxhbn2kilg1p75m3ngpx"
},
"stable": {
"version": [
1,
- 21
+ 22
],
- "commit": "17f68f8ac70b712d2870ecb6adb3841b992074fa",
- "sha256": "05mfgr9aj7knn7niadv9p6z3qrfpq2lbbi2wxxx62xywim9maw2y"
+ "commit": "81004fc774d373777d426926fc11abcf1e7ab334",
+ "sha256": "06nff38pcy5rgz13svkajsg0jjk73qy4a8m7p9f76yxcywxlgxlc"
}
},
{
@@ -16443,8 +16778,8 @@
20190713,
1339
],
- "commit": "78e3705cca65e1456ce26221690dca74c71735c1",
- "sha256": "1mr0q76p7yw9wv48qwp66nw95c1k3x2yly1vfvdq3phbb8xr6g4q"
+ "commit": "763531d077d02a4a45c58332b8a8b8300c090678",
+ "sha256": "0q0wjybmasrv04r09linnb3n1m7g7qylaynzmmsdrk59fwzda3c2"
},
"stable": {
"version": [
@@ -16482,25 +16817,25 @@
20190111,
2150
],
- "commit": "d6e6de9237bde72e7878f7b1fe0e58fdccd36dd2",
- "sha256": "0lac5lqina90w8mdjkqa9qk4b52lmh6kibcph1xcjghqlw7agjfn"
+ "commit": "fcfd16c7467c31f255287a73f36cf66b32bc096c",
+ "sha256": "1yscd5q1qqw8xx4ds2pifpiyzhdnx0la5n50mxqjb3hlky7p48wh"
},
"stable": {
"version": [
0,
29,
- 17
+ 21
],
- "commit": "b648b65ac39291aa546b58e44c8576869c351b66",
- "sha256": "1kc172hh7nj8vlf781rr8jal4f7nl7dbh6csxj0qz4h4cyxrsl6z"
+ "commit": "976f5483c6df8570f34076ef25af7e7512dd9347",
+ "sha256": "1951kwfnngy2k7m3adqi17rb7f17yrr5n9zpvvmw7vxpfmca66ka"
}
},
{
"ename": "czech-holidays",
- "commit": "7224fd77b3d8a37fac2fe0cf832e3487513afd8c",
- "sha256": "10c0zscbn7pr9xqdqksy4kh0cxjg9bhw8p4qzlk18fd4c8rhqn84",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "0yp04d7czypxd22mvd84n4mgm6f4mfwmbzyfjiiqc7va60bbsis0",
"fetcher": "github",
- "repo": "hydandata/czech-holidays",
+ "repo": "chkhd/czech-holidays",
"unstable": {
"version": [
20160113,
@@ -16634,11 +16969,11 @@
"repo": "rails-to-cosmos/danneskjold-theme",
"unstable": {
"version": [
- 20200507,
- 2144
+ 20200724,
+ 1525
],
- "commit": "06bcd1c00397a528cf8863b08e93e9a4b1032a57",
- "sha256": "1y3xnya33qszxnn2kyzgk339gfxxq485b2fydhc32ayfav6hjfn7"
+ "commit": "5b458ce976acf948aa101a05994b68baf9b01846",
+ "sha256": "16496dr846whv056xq2y994csr55zjd8906brkav2zjhj7qy0w1r"
}
},
{
@@ -16661,8 +16996,8 @@
"lcr",
"s"
],
- "commit": "7411904bfbde25cdb986e001ec682593dcb7c5e3",
- "sha256": "0dhkp9g1cc1vlfk1fjncl3x3s7zd9a633ya85pjyxl70kky2qhnz"
+ "commit": "c516bc9e8f09e0f928de9a93e82acfb382636f5c",
+ "sha256": "16msp36vflq10w0h1hh6fy7z9gmqzhr61w0xali2jkb203v1pi6d"
},
"stable": {
"version": [
@@ -16690,8 +17025,8 @@
"repo": "emacs-lsp/dap-mode",
"unstable": {
"version": [
- 20200514,
- 1655
+ 20200814,
+ 1819
],
"deps": [
"bui",
@@ -16700,15 +17035,16 @@
"f",
"lsp-mode",
"lsp-treemacs",
+ "posframe",
"s"
],
- "commit": "86fc65d525e30c0249e7ec6acac5e4e55cd7c3e2",
- "sha256": "1jfrjrbjscjsa52wjvvmhcl4cqrw43wz4f34z8yzsxmsalgpf0nw"
+ "commit": "0c11dd205152f3b8712362e4bc8919def7f312a4",
+ "sha256": "1j7vxf42icl4nsnza91lp8l3lgrhn6y11xi9ql5lji5vfgj94mk6"
},
"stable": {
"version": [
0,
- 4
+ 6
],
"deps": [
"bui",
@@ -16717,10 +17053,11 @@
"f",
"lsp-mode",
"lsp-treemacs",
+ "posframe",
"s"
],
- "commit": "6cbf83784788dc2bba85a2baa1492b276252680c",
- "sha256": "0w0a9x8lp1z05jv50biidj7vh4yfwkzfkmzwv04il028cy509yh0"
+ "commit": "35db94e81c592246675f300aaca4a70966b8a5fc",
+ "sha256": "1d4hdydfk86d4slibigyhwng8wx3vzyap8hp5iv0h7wr6868m4iv"
}
},
{
@@ -16844,11 +17181,11 @@
"repo": "sjrmanning/darkokai",
"unstable": {
"version": [
- 20190603,
- 1919
+ 20200614,
+ 1452
],
- "commit": "a53815fbfb06604d7f51519c62cc11e507204a70",
- "sha256": "01jd3y3kr4fplvdv32smbaxqa2dafs8vvp967jma7xm7r1frnbdw"
+ "commit": "5820aeddfc8c869ba840cc534eba776936656a66",
+ "sha256": "1bj7l5sh6nzxcw575kjcscjpjqmwlxhvi30qviqg4d6aymzkgr53"
}
},
{
@@ -16955,11 +17292,11 @@
"repo": "magnars/dash.el",
"unstable": {
"version": [
- 20200426,
- 2244
+ 20200803,
+ 1520
],
- "commit": "fe9bbc2414af645d255de68cd59cf0edd5d8548b",
- "sha256": "048yglafray643mbjggcf516rymbckn5ypnkiq390h9bd0hz7qy8"
+ "commit": "b92ab5a39b987e4fe69317b9d9fda452300baf20",
+ "sha256": "0qxjl10883l5xq56d474visrp0m3hapj4qqvrpqnanppx22499mh"
},
"stable": {
"version": [
@@ -17003,21 +17340,21 @@
},
{
"ename": "dash-docs",
- "commit": "2f597ec52f4bf55a748231751b6e51328e8f6f59",
- "sha256": "0vms4yr67l95rybvavd34a9gm57j7524swlf1c0rj8fff1wrmhn0",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "0y5mq4cy9swp0xb51n3h57ra0ln3k0i6q2j7sslmwvaxi9a12zkg",
"fetcher": "github",
- "repo": "gilbertw1/dash-docs",
+ "repo": "dash-docs-el/dash-docs",
"unstable": {
"version": [
- 20190516,
- 1702
+ 20200516,
+ 1943
],
"deps": [
"async",
"cl-lib"
],
- "commit": "111fd9b97001f1ad887b45e5308a14ddd68ce70a",
- "sha256": "0sckb7z0ylflva212bns7iq9mfnffgjghi0qspsbfwra35zb9xng"
+ "commit": "dafc8fc9f1ddb2e4e39e0b8d066c42d5d7ce8d06",
+ "sha256": "0n6d3mm43gj16v8kjjradcfik93wb89dsqnfcbskb28bvcamafid"
}
},
{
@@ -17028,14 +17365,14 @@
"repo": "magnars/dash.el",
"unstable": {
"version": [
- 20191109,
- 1327
+ 20200617,
+ 702
],
"deps": [
"dash"
],
- "commit": "fe9bbc2414af645d255de68cd59cf0edd5d8548b",
- "sha256": "048yglafray643mbjggcf516rymbckn5ypnkiq390h9bd0hz7qy8"
+ "commit": "b92ab5a39b987e4fe69317b9d9fda452300baf20",
+ "sha256": "0qxjl10883l5xq56d474visrp0m3hapj4qqvrpqnanppx22499mh"
},
"stable": {
"version": [
@@ -17245,26 +17582,26 @@
"repo": "doublep/datetime",
"unstable": {
"version": [
- 20200208,
- 1629
+ 20200621,
+ 2103
],
"deps": [
"extmap"
],
- "commit": "0ae7addb2c46133393f59011b2aecc08de49b8d1",
- "sha256": "1df6c5wsn6nwqvfx11d7x3wkjazri3946fwy0m9i6mx18yac38h0"
+ "commit": "c51eeb6df180f6c7d1676d1c0af78255bb0fdf95",
+ "sha256": "11w32jnkc596ybbhqih5d4rbvqk50cc6yyc9759acnzlqfd188xs"
},
"stable": {
"version": [
0,
6,
- 5
+ 6
],
"deps": [
"extmap"
],
- "commit": "4a480b66179f016100a582af170a76cda19c980a",
- "sha256": "0j7k6157fvzl1395ybnrgcz697h6cjk9v445nnfi7q0l8vylbfvm"
+ "commit": "55297bf409f35dbc4bcd26b458b83e349ed11452",
+ "sha256": "0a3q667pybpmsjkbgf6287jwgpnx8brp5314wb8zbczw6ncygnbi"
}
},
{
@@ -17367,15 +17704,15 @@
"repo": "matsievskiysv/display-buffer-control",
"unstable": {
"version": [
- 20200331,
- 1826
+ 20200527,
+ 1040
],
"deps": [
"cl-lib",
"ht"
],
- "commit": "17c6640a409424ec32fdb6bfd6065562e726bf1f",
- "sha256": "18mamp8j3lmmcpcyfrwrqppxvyx7zirn30rwp4wndczpyapkwv4n"
+ "commit": "8aa8982e6afbe3820f60c3defbb3c8037e04eebe",
+ "sha256": "1zwxn76zh0ba5pa821g2aaqa1niz2l0g3wvnngspw04fla2scjb4"
},
"stable": {
"version": [
@@ -17398,15 +17735,15 @@
"repo": "skk-dev/ddskk",
"unstable": {
"version": [
- 20200403,
- 1308
+ 20200816,
+ 1809
],
"deps": [
"ccc",
"cdb"
],
- "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b",
- "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji"
+ "commit": "275a831be77573470309a78967734d2b6d10f218",
+ "sha256": "1a25aybavi6p7ijc4rbd8zyzgiim1m2xwm7yqfmsvrfzwgb29xal"
}
},
{
@@ -17417,15 +17754,15 @@
"repo": "conao3/ddskk-posframe.el",
"unstable": {
"version": [
- 20191123,
- 1632
+ 20200812,
+ 917
],
"deps": [
"ddskk",
"posframe"
],
- "commit": "8a37953b37d397ba406bc308eb908bd966d34af6",
- "sha256": "0qm2hb2m3gqzqblgy3d5krxkjbwyhiivzbjfiq9yygh5v729d3as"
+ "commit": "299493dd951e5a0b43b8213321e3dc0bac10f762",
+ "sha256": "1rsy0wjncxzjhis8jrxpxjh9l9pw0bngg1sb4dj5qvhsgszhawpn"
},
"stable": {
"version": [
@@ -17448,29 +17785,29 @@
"repo": "Wilfred/deadgrep",
"unstable": {
"version": [
- 20200411,
- 652
+ 20200803,
+ 606
],
"deps": [
"dash",
"s",
"spinner"
],
- "commit": "bdcdf138cd71b0a5a80ca64b3bd68b7355084757",
- "sha256": "1f0gbl2s6h945h1d4pg6cms3w2jwppqiddy3ja9b02ckcld1c227"
+ "commit": "9cd79e0d5dd6b77abca3e84e17d3e4e2e9aa5695",
+ "sha256": "1xq06af3lib8i2l0619ggzkzf00pb39pk0pd97i6dv7593y82c94"
},
"stable": {
"version": [
0,
- 8
+ 9
],
"deps": [
"dash",
"s",
"spinner"
],
- "commit": "094ad453e8bc0451a2c062d06db3079f003566d2",
- "sha256": "18prsg8kyngz8f0l9kjhaz23al9fna2naazy324bjj0sn9yiqgd4"
+ "commit": "411a6973580b3503535ba58e405035bde2392903",
+ "sha256": "05xsf2axlxdsv8aivd7qyb0ipf9cp95y9f0sf0kaqpc1rn6i79ps"
}
},
{
@@ -17812,25 +18149,26 @@
"repo": "liblit/demangle-mode",
"unstable": {
"version": [
- 20190528,
- 306
+ 20200621,
+ 2344
],
"deps": [
"cl-lib"
],
- "commit": "06903d731dfde110e10b979dcc7624ef6dbb5ac8",
- "sha256": "1j0fszql941kmbd3sf3rjynm4g01cgpkq20lvy9ayj3f2cy46ad4"
+ "commit": "697c1dbde93f164eac7ea0dc530d7e8b799272d6",
+ "sha256": "1ycbggyljbm5iawhk6i1cm21a3gzz1javab99c3abprkgmldmd5l"
},
"stable": {
"version": [
1,
- 3
+ 3,
+ 2
],
"deps": [
"cl-lib"
],
- "commit": "06903d731dfde110e10b979dcc7624ef6dbb5ac8",
- "sha256": "1j0fszql941kmbd3sf3rjynm4g01cgpkq20lvy9ayj3f2cy46ad4"
+ "commit": "697c1dbde93f164eac7ea0dc530d7e8b799272d6",
+ "sha256": "1ycbggyljbm5iawhk6i1cm21a3gzz1javab99c3abprkgmldmd5l"
}
},
{
@@ -17848,6 +18186,54 @@
"sha256": "1fcmrhm6h0j7jjw6kijrcacv628fy80ssxn6h5bilwmw0r4c7wm6"
}
},
+ {
+ "ename": "deno-fmt",
+ "commit": "d6c3171a30886ecc4427938d847924023d1171ae",
+ "sha256": "15490s5xx58jc0irras3yaczx9s0v93fp7dnd6pba7zq149nqpy7",
+ "fetcher": "github",
+ "repo": "rclarey/deno-emacs",
+ "unstable": {
+ "version": [
+ 20200520,
+ 1838
+ ],
+ "commit": "3b193eef576e2c14fdcf350495955e6e8546dddd",
+ "sha256": "19fl389rgi6k8w84ggin54p9lpngwah96fxa6qf86y4rf9r2s9sh"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 1
+ ],
+ "commit": "ccae334361b9f83b687f040bcdfdc2a58c78059f",
+ "sha256": "1fm2ym36gv4p4i27hln706dnwr6rvrkkfgggbcz9rqfbphrsfqyx"
+ }
+ },
+ {
+ "ename": "describe-hash",
+ "commit": "8c6c5cd96acd3deeb86503341dd9cd729e20185e",
+ "sha256": "0a26d46p46fypq3snh52grnjcgp6isb5k4qv2fm2m6ha2n7jdi5a",
+ "fetcher": "github",
+ "repo": "Junker/describe-hash",
+ "unstable": {
+ "version": [
+ 20200718,
+ 1556
+ ],
+ "commit": "18e69a932d5495c8439571ba8f2d2ee123d434b1",
+ "sha256": "1z2msiqwq7lqvyz6b2szyx1kpb6rv6irvwdcv36519mda0smhjlv"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
+ ],
+ "commit": "20dbbbea630055b2401f13a55fbb21216960dc46",
+ "sha256": "1mz5951yr27jnncz3c080jri7h3pb1k07i6w7wx5aj54kwpsg1d8"
+ }
+ },
{
"ename": "describe-number",
"commit": "d5ed9063f7e9f540bc90c1df4e3604d4af9bcfe5",
@@ -18010,14 +18396,14 @@
"repo": "psibi/dhall-mode",
"unstable": {
"version": [
- 20191006,
- 2324
+ 20200716,
+ 2147
],
"deps": [
"reformatter"
],
- "commit": "ef4d33debe224c6ba37e51a29b9dc8b74f20f1c2",
- "sha256": "1232y2k4l3bsz90pgis78zxmrw7jv09dfaip21yc1w4vpxfyr384"
+ "commit": "484bcf8f78f1183ef45c3b04a362bb73690c6b9b",
+ "sha256": "1wggg8jlzg9rph4jhxp6yiri178rnasbv38838i973kjgqjxrl76"
}
},
{
@@ -18197,14 +18583,14 @@
"repo": "dgutov/diff-hl",
"unstable": {
"version": [
- 20200510,
- 1540
+ 20200701,
+ 2141
],
"deps": [
"cl-lib"
],
- "commit": "ab2f4f0db9b0c3484db837252ce2dc75f4696b1d",
- "sha256": "1pb1hp79b3r0nn7dclk3x0d0yrvx6nasgzwi1f918k9n7kzz7n4g"
+ "commit": "2281a89a3ddc6616073da6f190dda08d23b18ba6",
+ "sha256": "0lyx0hnc45k2f154p81dyjxrv5r53bwb6nfyhmy5avmp9cqdjd4d"
},
"stable": {
"version": [
@@ -18299,20 +18685,20 @@
"repo": "retroj/digistar-mode",
"unstable": {
"version": [
- 20200322,
- 2109
+ 20200819,
+ 1316
],
- "commit": "567fff3933f80f00f53610e7b08f75bb636b12c0",
- "sha256": "0252lhkv2r8gy4512frhdh381xrf64nspvfm2hp7bkhz47dlrs7y"
+ "commit": "7f89372f27eff9e4db55bcf39f9cce3693d95bb2",
+ "sha256": "0s9q9f9bqr4w9ll0im65h95hxki3svanlikwxgq6m7p493s1q5j0"
},
"stable": {
"version": [
0,
- 6,
- 1
+ 9,
+ 0
],
- "commit": "8b350b7a143219b3f927cb3a1aeb16a299363f05",
- "sha256": "1sxfzirl8kgzmq8l9l868yl92mz1r8yk58fnxf7p6z4y0pdlcqfg"
+ "commit": "343de0e0fe408f422a32e1bda22cafc2cc9900bb",
+ "sha256": "1cg38x7zd1n9zqsyg47famss91nqs7giqpgsi5qy10zp8y3i3l2c"
}
},
{
@@ -18448,20 +18834,20 @@
"repo": "jcs-elpa/diminish-buffer",
"unstable": {
"version": [
- 20190921,
- 1647
+ 20200712,
+ 1355
],
- "commit": "0b1262f947b3ce03dca17879caec808a7d091bf4",
- "sha256": "0yrzp7jdw04hj3ag3379l6kb9vpd1vcvqqf4z5yb3i28b5d7s136"
+ "commit": "2ef1e03458b9528a737814546aaee66067db649e",
+ "sha256": "0xlbgxl44iyffpg5r7md3a3l1b7gdj1vsfajww8g3rsna7d7n2wp"
},
"stable": {
"version": [
0,
0,
- 3
+ 7
],
- "commit": "e137baa5e258a7938c713253fc9cc63f8674f841",
- "sha256": "03068nyfb3cz0lz8z3qcwjlsvqaw9dfg3g8w13gmpwsmxaxlbv3i"
+ "commit": "cef452767c16c564dabc819b234fd3236fa97a51",
+ "sha256": "1hz3b44pbsy6ybicjs6i1fm2lai1ccxk46dk6fyd5bcb66s2lxzy"
}
},
{
@@ -18554,8 +18940,8 @@
20181228,
1422
],
- "commit": "09dbb769fe02f546da470369a12468ab4a0cceb2",
- "sha256": "0j2dz4vy4i22185hhlwg2kprpis97xb12qvfdhvdcnz2vwy61sxa"
+ "commit": "52ce4ac88fa39a0ebdf732435fd831ea9a8d0764",
+ "sha256": "00br8f8rw0rrzmi3nvacwn14d122jw243z1izlsm8h8q95hh8f6l"
},
"stable": {
"version": [
@@ -18741,8 +19127,8 @@
"repo": "conao3/dired-git.el",
"unstable": {
"version": [
- 20200130,
- 743
+ 20200527,
+ 732
],
"deps": [
"all-the-icons",
@@ -18750,8 +19136,8 @@
"async-await",
"ppp"
],
- "commit": "11938721f7202aa784cc493027e3a0ec2c0d39b5",
- "sha256": "1b5vc9hc26cs1dq7lmvm5gly4h6ahpp0dnlbxi8p4mza12yhnrwi"
+ "commit": "82c93bdb2fe392b122f79d2e425c632f1c69ede3",
+ "sha256": "134f97zk7q2fvqphfgbjdbwlgrrnq51v0zrv6aw8c8n7fln5ap93"
}
},
{
@@ -18880,6 +19266,30 @@
"sha256": "0rz8d9lj2zbipz6cwrlw2a3z9y4rybbmz73h73l1i7fjg9q1kqm4"
}
},
+ {
+ "ename": "dired-lsi",
+ "commit": "b38502c7c37658b369ae004e1ce8a21c16d9e6de",
+ "sha256": "1q84krip2814b726ni4q2c8mhqqhr39wgvi6881mg96h624v9bxm",
+ "fetcher": "github",
+ "repo": "conao3/dired-lsi.el",
+ "unstable": {
+ "version": [
+ 20200812,
+ 929
+ ],
+ "commit": "0f4038c8b47f6cfc70f82062800700c14c9912c2",
+ "sha256": "1bb46cla9pa4697njyqlycjjxf63i0nsxppg9sb0762xsashyz9s"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "commit": "8170d7711254af18cbf1397d681fd331363a17d8",
+ "sha256": "1wgvd229cirfgn2vkjqwam4gnhs7jnp05c73vh8sckrzs3z51zc9"
+ }
+ },
{
"ename": "dired-narrow",
"commit": "8994330f90a925df17ae425ccdc87865df8e19cd",
@@ -18918,6 +19328,36 @@
"sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs"
}
},
+ {
+ "ename": "dired-posframe",
+ "commit": "33ce7b7ad21c774ce7f1222af5a7d87219072fc1",
+ "sha256": "0jzbkafv0hv107412szs777ni3zxpn8fwlr5xm8pb89q3q5v7bcx",
+ "fetcher": "github",
+ "repo": "conao3/dired-posframe.el",
+ "unstable": {
+ "version": [
+ 20200817,
+ 420
+ ],
+ "deps": [
+ "posframe"
+ ],
+ "commit": "1a21eb9ad956a0371dd3c9e1bec53407d685f705",
+ "sha256": "0k633fz5gccza5l3dydn55yg4r1a50bgcmxwxn89qc7cd8dck75v"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "deps": [
+ "posframe"
+ ],
+ "commit": "1a21eb9ad956a0371dd3c9e1bec53407d685f705",
+ "sha256": "0k633fz5gccza5l3dydn55yg4r1a50bgcmxwxn89qc7cd8dck75v"
+ }
+ },
{
"ename": "dired-quick-sort",
"commit": "4d278178128deb03a7b1d2e586dc38da2c7af857",
@@ -18993,11 +19433,11 @@
"repo": "Vifon/dired-recent.el",
"unstable": {
"version": [
- 20191004,
- 1500
+ 20200712,
+ 716
],
- "commit": "5c799f96da08a0a3200cb5f609baf6c184f558ea",
- "sha256": "0kc97v80rh10ksfw49pp551ay0b1apwi6ba66rwbyix50d7drimw"
+ "commit": "860e70b15983ac7164648de8148a529bdcdb8833",
+ "sha256": "1558cdinig8kx2hx2hkl3zxk001ijx53n5rjdm3367wllp0icyzf"
}
},
{
@@ -19077,14 +19517,14 @@
"repo": "jojojames/dired-sidebar",
"unstable": {
"version": [
- 20200409,
- 801
+ 20200711,
+ 2031
],
"deps": [
"dired-subtree"
],
- "commit": "6e569c851418890c21fd37d03a62f85343aa0900",
- "sha256": "0jxljpmzncbh9xb22y4xr9bzcxwijy68pn8chqsvqmivss5py7n9"
+ "commit": "da77919081d9a4e73c2df63542353319381e4f89",
+ "sha256": "05h56wdl2xvc8davnx83ypg20fl7wlks97cafa4r2yf141xjc05h"
},
"stable": {
"version": [
@@ -19200,8 +19640,8 @@
20191227,
2028
],
- "commit": "83567d00affce66a4e501563eddd0bd436ac48d0",
- "sha256": "11xkvywcfv27gr0dpgprmmnjqfxmxdmcpa2kq0vqnxrblg6ijwbr"
+ "commit": "cd052dfef602fe79d8dfbcf9f06e6da74412218b",
+ "sha256": "1zhnr4wkb0gifhf1gfssipanifaiixvz6wqlmscxyp7hdm8xjvad"
},
"stable": {
"version": [
@@ -19243,14 +19683,14 @@
"repo": "wbolster/emacs-direnv",
"unstable": {
"version": [
- 20200319,
- 2357
+ 20200529,
+ 1305
],
"deps": [
"dash"
],
- "commit": "1daf479b9b7600ce9681f2a980deae7fcb2f3d59",
- "sha256": "08hwjd1xmq6hxab537zm11kwqhwnc1dfznfqzy66c4agl9z9a7vx"
+ "commit": "f5484b0fc33d4e5116612626294efb362ff9ecd4",
+ "sha256": "0772z4v2jjinqlqhrdcsvk912gdi0dkxag7q5nm0rnkx2pyk7ynw"
},
"stable": {
"version": [
@@ -19922,6 +20362,24 @@
"sha256": "1nz71g8pb19aqjcb4s94hhn6j30cc04q05kmwvcbxpjb11qqrv49"
}
},
+ {
+ "ename": "dmacro",
+ "commit": "26d2f0ed0013dc0c03db5bae3119ae3522181ed2",
+ "sha256": "1n2gsml4ypasakxvq9q3h54kj5pl87m796si73700n5m4pgpp4hq",
+ "fetcher": "github",
+ "repo": "emacs-jp/dmacro",
+ "unstable": {
+ "version": [
+ 20200803,
+ 633
+ ],
+ "deps": [
+ "cl-lib"
+ ],
+ "commit": "3480b97aaad9e65fa03c6a9d1a0a8111be1179f8",
+ "sha256": "1vb2jz4z4z9bhw76b1l08jf8gd3kq6c8zsxxvmlan87nwkj211wz"
+ }
+ },
{
"ename": "dmenu",
"commit": "98bcdd71a160b9c04f83cc5b939031c9e7b5eb59",
@@ -19975,10 +20433,10 @@
},
{
"ename": "docean",
- "commit": "d4827fa337d7d25f2aaf67aca3081fbdaeacbcbf",
- "sha256": "1mqmn2i9axnv5vnkg9gwfdjpzr6gxx4ia9mcdpm200ix297dg7x9",
+ "commit": "b38908bc1b759b14173ffb49ddeb040a9892cc0d",
+ "sha256": "0y45gk3jvjqpzk51098qbnrvhbvg0rzsdhd3fnw7pblsgzzqn9w6",
"fetcher": "github",
- "repo": "emacs-pe/docean.el",
+ "repo": "emacsorphanage/docean",
"unstable": {
"version": [
20180605,
@@ -20000,8 +20458,8 @@
"repo": "Silex/docker.el",
"unstable": {
"version": [
- 20200508,
- 1956
+ 20200610,
+ 715
],
"deps": [
"dash",
@@ -20011,8 +20469,8 @@
"tablist",
"transient"
],
- "commit": "01a04d0a295f3396833d0b6fa60cf24d52e1a89f",
- "sha256": "0gh0h64dwn8v67q5569gifdjhzz5g4hfnsiqmg1nyq0nhvpp2b1c"
+ "commit": "3773112eea3fc99704b5ca50c1e9a3db2cb8e4f3",
+ "sha256": "0gi86ggjyfmfas7pswj7wirn5n7zs6rvb5b95nchnf4xf0nzwia1"
},
"stable": {
"version": [
@@ -20084,15 +20542,15 @@
"repo": "meqif/docker-compose-mode",
"unstable": {
"version": [
- 20180324,
- 1752
+ 20200730,
+ 1258
],
"deps": [
"dash",
"yaml-mode"
],
- "commit": "c9f131d2c90d652435d407fd36c40feebfed1dad",
- "sha256": "0d5d46i6hplmy7q2ihbvcrnk9jrwa2mswgbf8yca3m4k44wgk6la"
+ "commit": "4c0c897fb0572e6b026b2a5ab9f2c76174be7a14",
+ "sha256": "01fj856511qjn5zw370axyz4imdnq3j5sqvbm8nkd71z1mz3dyv1"
},
"stable": {
"version": [
@@ -20171,11 +20629,11 @@
"repo": "progfolio/doct",
"unstable": {
"version": [
- 20200514,
- 2215
+ 20200815,
+ 2139
],
- "commit": "1bcec209e12200c9b93b0d95f61b964b5de4439c",
- "sha256": "03lbsww77vq1wrpj94jdx62zmjjhir9i50g85l8yadlp9696zh3s"
+ "commit": "89eb2e6f1c2630c980bdf4c0430ba54722c9ee00",
+ "sha256": "0210jwk19b59hx7gi2ddy5ja9jndvmwmip8bh16g35qiscn2jwml"
}
},
{
@@ -20290,16 +20748,16 @@
"repo": "seagle0128/doom-modeline",
"unstable": {
"version": [
- 20200513,
- 1103
+ 20200819,
+ 117
],
"deps": [
"all-the-icons",
"dash",
"shrink-path"
],
- "commit": "2b308857677e983ca4eaedc36438ed94aadf9e65",
- "sha256": "1c7mk26drz9yldy3kvcxxnabg8ph900pj1g029xhd1407x417vqc"
+ "commit": "ffbaaee832f1c97ff608bc4959b408997d959b7d",
+ "sha256": "0gvdlwa4w7s1igy8hqapng2s1k9ca6f76g68m5wzrfnx1z0zf7xl"
},
"stable": {
"version": [
@@ -20324,14 +20782,14 @@
"repo": "hlissner/emacs-doom-themes",
"unstable": {
"version": [
- 20200514,
- 2115
+ 20200816,
+ 2044
],
"deps": [
"cl-lib"
],
- "commit": "95463eac68fe88535d9342c7b4c2cbaae3c80950",
- "sha256": "0ccq6gzahpsxsgmmd9dl16mfnz1n9sgn0ns62n03s3xgmf4ay3ap"
+ "commit": "24023de3c80c9f3afc3d012762d1ef0f8dbd326e",
+ "sha256": "0dwwpdwi0722xyap3xnm7034syb2fssfm4c6k5868k0344rvdkr8"
},
"stable": {
"version": [
@@ -20394,11 +20852,11 @@
"repo": "julienXX/dotnet.el",
"unstable": {
"version": [
- 20190415,
- 1237
+ 20200803,
+ 1032
],
- "commit": "932d776ed739d20d57dbd6ba49f61d1b450571fc",
- "sha256": "1h7y9vz64bv4slz9mpd7cjyyaxgqk92jn11y5ycfyncq70wyd3j4"
+ "commit": "83ba1305d7895b03f3dffb2d3458b7ec75e6909f",
+ "sha256": "0x3kaq06wbrhqanfzj0m6yb5x1mvcjz3xg52kk7a7d4mr1h9xlip"
}
},
{
@@ -20433,14 +20891,14 @@
"repo": "zk-phi/download-region",
"unstable": {
"version": [
- 20180124,
- 133
+ 20200816,
+ 1009
],
"deps": [
"cl-lib"
],
- "commit": "bbba3ecd80818d5d940d41fe89a6e2ec5dd2c53c",
- "sha256": "1cwlbdmdils5rzhjpc3fqjmd3dhalk6i7bxskpahbrr9xxfq0iw4"
+ "commit": "0dca3b224649bba80a7e9ecbf1d1b6f6be962455",
+ "sha256": "1yka864dzz8nxskcllqyxk04313hlyfc9a4p0apmk56q19fcpwgn"
}
},
{
@@ -20466,6 +20924,21 @@
"sha256": "13czcxmmvy4g9ysfjr6lb91c0fqv1xv8ppd27wbfsrgxm3aaqimb"
}
},
+ {
+ "ename": "doxy-graph-mode",
+ "commit": "4727d492a4867fc58bfdb8f57fff9313710bada8",
+ "sha256": "170r39cq25qkbng4i1rlpj3y7cvdqc0wxxr1rcxy15szjf7qw2dl",
+ "fetcher": "github",
+ "repo": "gustavopuche/doxy-graph-mode",
+ "unstable": {
+ "version": [
+ 20200807,
+ 646
+ ],
+ "commit": "2685c28e7a725614c23345195c3b85e505be2a1b",
+ "sha256": "0a4kil5v88wkki3r4jjc9ackv2z7ik0qgn4bdv75baskig8f8qjy"
+ }
+ },
{
"ename": "dpaste",
"commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -20560,11 +21033,11 @@
"repo": "dracula/emacs",
"unstable": {
"version": [
- 20200514,
- 1527
+ 20200814,
+ 1717
],
- "commit": "c162aff5025a7e9f55785d7177d59f4a3aa60183",
- "sha256": "11wlrvrz3q054nqkdbd4525kh50cspszrgmqd74plah6jc95wpa3"
+ "commit": "3b7c2905d249f47bc9c09d304c16f72f217df2e0",
+ "sha256": "031c2md9zxk8bhb8v6s6i5s3qmlfxf5ks0nl7n6kyw1w31h6pww9"
},
"stable": {
"version": [
@@ -20772,8 +21245,8 @@
"repo": "dtk01/dtk",
"unstable": {
"version": [
- 20200315,
- 1931
+ 20200816,
+ 2055
],
"deps": [
"cl-lib",
@@ -20781,8 +21254,8 @@
"s",
"seq"
],
- "commit": "d21a5b7958da058bb53d36fe9234089409f62c5e",
- "sha256": "0w46yr5d108z2pipvh449p15qnm6mnix21pbnq3alczilzxzf9lw"
+ "commit": "a0e789919f71ff4ab752432fe9e295f9f44c7b12",
+ "sha256": "029xsdasbrvkg8w2ykgy6iq618cdjkr4gkp4l094na35jpv96yca"
}
},
{
@@ -20890,16 +21363,16 @@
"repo": "jacktasia/dumb-jump",
"unstable": {
"version": [
- 20200513,
- 2014
+ 20200815,
+ 1537
],
"deps": [
"dash",
"popup",
"s"
],
- "commit": "194bfdbe305e21d8e6d29893d449686c85273207",
- "sha256": "0lz5kajhkqh18xyg07bshvl0v5j5g5xj4q8p6min1mapm8shnv2i"
+ "commit": "0d74b2f2aa834b602e91d99e9cb23197a389f042",
+ "sha256": "01jwyridywbihspan8zrrfpxl4gl275z8l23swhczg0bcjq1x8g8"
},
"stable": {
"version": [
@@ -20943,17 +21416,17 @@
20191016,
1241
],
- "commit": "e5bec1a57fd4ebeedc848e76e0cf991db7e22fd0",
- "sha256": "091z6p93sv3aqf7bcw41nwh4kvvpsfncjny2fwcv3vv7zlyj2px2"
+ "commit": "26078df94ea16e2fc9221a84c5d42f2fe024074b",
+ "sha256": "1pvqrijx5bmnbvwk4pz6j1ldir5zi95ixbfrqki284qcgq28krd1"
},
"stable": {
"version": [
2,
- 5,
- 1
+ 7,
+ 0
],
- "commit": "4d1ef91df8c732d516ddea4a953f5956e99692b2",
- "sha256": "1ljhwsyl277lvmii4v439dafyc0y2l2jf2ds5zivpbrh168851di"
+ "commit": "85b4e16bd6c310811fcc206d3d0cbb391eb8b81c",
+ "sha256": "19fn7ywx13j1hc600pccyghz2izjy26bzwaqjynn7swlbkc96ymz"
}
},
{
@@ -20994,14 +21467,14 @@
"repo": "harsman/dyalog-mode",
"unstable": {
"version": [
- 20200301,
- 1149
+ 20200817,
+ 737
],
"deps": [
"cl-lib"
],
- "commit": "5dceeefaed6fbedb680bb6cc9aba14fb5f890310",
- "sha256": "137kgixsdkw2rqj1402gc31gd6hdbna7bx5j1xxhyiig2x2b3aqx"
+ "commit": "5d703d91f90ddebdfb4cae1b45c476aec5976313",
+ "sha256": "1vf88vywb4cjfndc4jd185fdqjydd7ckbf1n2qsi9w3k8940q2pq"
}
},
{
@@ -21012,11 +21485,11 @@
"repo": "dylan-lang/dylan-mode",
"unstable": {
"version": [
- 20200425,
- 1347
+ 20200607,
+ 1911
],
- "commit": "64f3aed546315c766331c69be3c7e78c7da6c333",
- "sha256": "1r63gxy1hlij1ck570agvj39rynby6kna5kcfhrr0imi7hl98mzz"
+ "commit": "bdccb252dffa99a3a55dce446cc4a7ff4a8dc089",
+ "sha256": "09dgjwdsni936chj2b8r607bqa2vcav66mb49j5vi2lxiw60sg8m"
}
},
{
@@ -21053,6 +21526,21 @@
"sha256": "1ppwlill1z4vqd566h9zi6zx5jb7hggmnmqrga84j5n7fwqvgz7f"
}
},
+ {
+ "ename": "dynamic-graphs",
+ "commit": "8c0101a98dcddd7135478a218f4b0a5fd6d4fe0c",
+ "sha256": "188w7srdrfzri1l7y68b6vhrwn0yxx8578v6p234p8bsgmlwzan9",
+ "fetcher": "github",
+ "repo": "zellerin/dynamic-graphs",
+ "unstable": {
+ "version": [
+ 20200818,
+ 442
+ ],
+ "commit": "10dffcbc4011647c16e8d65d05856e043de1865d",
+ "sha256": "08f3f4bwryyhvj8yp2y2v3fppl6drd4rq3wyx48mxwkiw6z1db4r"
+ }
+ },
{
"ename": "dynamic-ruler",
"commit": "926c43867120db429807ff5aaacc8af65a1738c8",
@@ -21196,28 +21684,28 @@
"repo": "aki2o/e2wm-direx",
"unstable": {
"version": [
- 20170509,
- 1301
+ 20200805,
+ 1414
],
"deps": [
"direx",
"e2wm"
],
- "commit": "b47f19d15436cc28233a812a1150689f61d11046",
- "sha256": "0lihc02b0792kk61vcmhi0jwb7c4w2hi19g6a0q1598b3rci82nf"
+ "commit": "5672bc44d8e5cea6bc3b84c3b58e522050ffae0e",
+ "sha256": "18fj8qn4b6f13vb3n6j5cwcgdh2ypnvaqyjszmh321zmwxq08nd5"
},
"stable": {
"version": [
0,
0,
- 5
+ 7
],
"deps": [
"direx",
"e2wm"
],
- "commit": "f319625b56c44e601af7c17fc6dbb88e5d70ebae",
- "sha256": "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia"
+ "commit": "5672bc44d8e5cea6bc3b84c3b58e522050ffae0e",
+ "sha256": "18fj8qn4b6f13vb3n6j5cwcgdh2ypnvaqyjszmh321zmwxq08nd5"
}
},
{
@@ -21279,26 +21767,26 @@
"repo": "aki2o/e2wm-sww",
"unstable": {
"version": [
- 20140524,
- 858
+ 20200805,
+ 1339
],
"deps": [
"e2wm"
],
- "commit": "1063f9854bd34db5ac771cd1036cecc89834729d",
- "sha256": "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g"
+ "commit": "8926d0c70be05c7b4ef821e22e411e8813973687",
+ "sha256": "0941mfz6a398jq5cb8kgr5cikzkzrpjnfbbx2f9c1yy9wj1awklk"
},
"stable": {
"version": [
0,
0,
- 2
+ 3
],
"deps": [
"e2wm"
],
- "commit": "1063f9854bd34db5ac771cd1036cecc89834729d",
- "sha256": "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g"
+ "commit": "8926d0c70be05c7b4ef821e22e411e8813973687",
+ "sha256": "0941mfz6a398jq5cb8kgr5cikzkzrpjnfbbx2f9c1yy9wj1awklk"
}
},
{
@@ -21343,26 +21831,26 @@
"repo": "redguardtoo/eacl",
"unstable": {
"version": [
- 20200407,
- 756
+ 20200612,
+ 736
],
"deps": [
"ivy"
],
- "commit": "47b839f305e63e119b6a554497cd4b99512e8e00",
- "sha256": "1gdppgjdapjx25ns5ja1lnnypq26m8w9s5vbnfg7p0j64kd2mdwh"
+ "commit": "0517e60d8d36838df1a90498f2d75ded814d75e4",
+ "sha256": "0vri0dmq6w58crjwhpi9r1r2i6nqr2q69arqagbwvs4hrxm79z1k"
},
"stable": {
"version": [
2,
0,
- 2
+ 3
],
"deps": [
"ivy"
],
- "commit": "e074682aa18bed4fd68068a48ccaa970ae6d4e33",
- "sha256": "1kb14p8004kaqxq765nv5rn8xniw53g4zafcy9wkv9b88bixb7q9"
+ "commit": "0517e60d8d36838df1a90498f2d75ded814d75e4",
+ "sha256": "0vri0dmq6w58crjwhpi9r1r2i6nqr2q69arqagbwvs4hrxm79z1k"
}
},
{
@@ -21403,28 +21891,28 @@
"repo": "masasam/emacs-easy-hugo",
"unstable": {
"version": [
- 20200427,
- 1901
+ 20200811,
+ 842
],
"deps": [
"popup",
"request"
],
- "commit": "2dfdcdbcd8eb81c3fd631372d7dceb4f432d5f1e",
- "sha256": "19j7r14qxh2cl4zi4vssbbqjhp6r53gjavnwyihk52llxcgrxrr7"
+ "commit": "cc4ba71c07dd8b3a66c996e7b31fa7e3e9870ce2",
+ "sha256": "1haias0k1gia0jfjiviy222jmbv4zf1ddsv00z9h476g8h303w7b"
},
"stable": {
"version": [
3,
9,
- 46
+ 47
],
"deps": [
"popup",
"request"
],
- "commit": "9e923e32f21134bb89196a169f5a3f2aecfe45cb",
- "sha256": "1r8s83dc3ibp687fywfsgs2kc95j2s153ncrgxldqvsp24k1wm8x"
+ "commit": "cc4ba71c07dd8b3a66c996e7b31fa7e3e9870ce2",
+ "sha256": "1haias0k1gia0jfjiviy222jmbv4zf1ddsv00z9h476g8h303w7b"
}
},
{
@@ -21435,26 +21923,26 @@
"repo": "masasam/emacs-easy-jekyll",
"unstable": {
"version": [
- 20200506,
- 117
+ 20200811,
+ 859
],
"deps": [
"request"
],
- "commit": "d114ed4ef4470ea429d2dd291a409bc406d0dda0",
- "sha256": "11wkvrl19c0z2icig2a7i6ccplzgx7j4jjlx97lq41vx679xxiwp"
+ "commit": "8ecdb70a4f957fbd0b81dc0c5726edc136513b34",
+ "sha256": "15ps0b8ik3bsxv96jb0cbbgiwx0z601m56cj83yp7r5zyphbm2n5"
},
"stable": {
"version": [
2,
4,
- 26
+ 27
],
"deps": [
"request"
],
- "commit": "d114ed4ef4470ea429d2dd291a409bc406d0dda0",
- "sha256": "11wkvrl19c0z2icig2a7i6ccplzgx7j4jjlx97lq41vx679xxiwp"
+ "commit": "8ecdb70a4f957fbd0b81dc0c5726edc136513b34",
+ "sha256": "15ps0b8ik3bsxv96jb0cbbgiwx0z601m56cj83yp7r5zyphbm2n5"
}
},
{
@@ -21540,36 +22028,6 @@
"sha256": "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq"
}
},
- {
- "ename": "ebal",
- "commit": "629aa451162a0085488caad4052a56366b7ce392",
- "sha256": "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg",
- "fetcher": "github",
- "repo": "mrkkrp/ebal",
- "unstable": {
- "version": [
- 20180101,
- 616
- ],
- "deps": [
- "f"
- ],
- "commit": "1740118125ae7aa6ba82d36e1fe0e69065a6fcaa",
- "sha256": "1i5r8m34zf7ya1kzgm8hsx707phq5smf2x6y2a1ykbnfkk39gmbf"
- },
- "stable": {
- "version": [
- 0,
- 3,
- 1
- ],
- "deps": [
- "f"
- ],
- "commit": "4d19565516785348894c4911e757e33a270b3efd",
- "sha256": "1wj9h8ypi70az387c7pcrpc59lpf89dkp2q4df2ighxw3l648mb7"
- }
- },
{
"ename": "ebf",
"commit": "22e2f6383f2a7a01778c0524af19a68af57796ae",
@@ -21612,26 +22070,26 @@
"repo": "joostkremers/ebib",
"unstable": {
"version": [
- 20200513,
- 2326
+ 20200628,
+ 2157
],
"deps": [
"parsebib"
],
- "commit": "6499e4a67f2772a29128864a8f7606a78fb73b45",
- "sha256": "0css7pfyqz834f8awc632mwlfcph3mrsqwbxvrlaw59bc3hgxjdv"
+ "commit": "805c2e30e30f9f211f4aa443263d1c3971935295",
+ "sha256": "0kgw049wph40kk0kin7zxj44ghd1s1pr8zpl1gli4zic02vzcaga"
},
"stable": {
"version": [
2,
- 23,
+ 25,
1
],
"deps": [
"parsebib"
],
- "commit": "6499e4a67f2772a29128864a8f7606a78fb73b45",
- "sha256": "0css7pfyqz834f8awc632mwlfcph3mrsqwbxvrlaw59bc3hgxjdv"
+ "commit": "bd258c1f364a8c96b0026fdc3de75117ca4e324a",
+ "sha256": "1mvsa2a761va74ybxprdvmhkzhjl6axn1ngjfhrrljqgsvqgyjwk"
}
},
{
@@ -21979,20 +22437,20 @@
"repo": "Fanael/edit-indirect",
"unstable": {
"version": [
- 20191103,
- 1013
+ 20200805,
+ 1840
],
- "commit": "935ded353b9ed3da67bc61abf245c21b58d88864",
- "sha256": "0yghm0l4wickhqc29ykjjg98xb91djr1f6n6ihc7ymsv0yhw5wc4"
+ "commit": "bdc8f542fe8430ba55f9a24a7910639d4c434422",
+ "sha256": "189nvmlkki1jfszm9i0crbb1p4nzgmbly0wpvpg0i8vmw7vrpl40"
},
"stable": {
"version": [
0,
1,
- 5
+ 6
],
- "commit": "032ac0ec690d4999d564fd882588c7a197efe8dd",
- "sha256": "0by1x53pji39fjrj5bd446kz831nv0vdgw2jqasbym4pc1p2947r"
+ "commit": "bdc8f542fe8430ba55f9a24a7910639d4c434422",
+ "sha256": "189nvmlkki1jfszm9i0crbb1p4nzgmbly0wpvpg0i8vmw7vrpl40"
}
},
{
@@ -22048,8 +22506,8 @@
20181016,
1125
],
- "commit": "43f180809fcbc7e104f96f95608a97c4c2a2c8b3",
- "sha256": "0v9nn85pw7lll516p8bb9y6dk44rj2h88ky4zz9wgkrppjs7qdb0"
+ "commit": "5f6352f98f9795ea0423cb46e9b01dc54e523ab1",
+ "sha256": "0khf51sbjkqij36l00lby004ca9nb67xvksjnbafzp2bvwcs356j"
},
"stable": {
"version": [
@@ -22086,14 +22544,14 @@
"repo": "editorconfig/editorconfig-emacs",
"unstable": {
"version": [
- 20200212,
- 739
+ 20200730,
+ 1329
],
"deps": [
"cl-lib"
],
- "commit": "19de0ec1bac67c5a76a4dd3d8ffe6c5411ace1af",
- "sha256": "187vcflpbv4zpbzdsxw5i6c9j6dva7v3d3skh3b6wybjzh6ib4jf"
+ "commit": "9bc1343ce8bd2cc84bf04b58a053b7ec700244c0",
+ "sha256": "10zaxq356fq6y4h1g9gxj8sja4k4g5z9g2xggw0yy4dbx1mmw7n1"
},
"stable": {
"version": [
@@ -22232,8 +22690,8 @@
"repo": "sebastiw/edts",
"unstable": {
"version": [
- 20200413,
- 1929
+ 20200710,
+ 1424
],
"deps": [
"auto-complete",
@@ -22244,8 +22702,8 @@
"popup",
"s"
],
- "commit": "e797eb57ede8332205b3abd7d7adeccbb319ad29",
- "sha256": "1101yx1dg82msw0bbji9hpnzq029ghh9ca4a6588fik8sn3v786j"
+ "commit": "eda93f89c198db6aa3590d8e812ed797c9b3e305",
+ "sha256": "0vpvil86j6ahfq9f123ampba93h7pgnlvg14y9a9fpwig1hvqm60"
},
"stable": {
"version": [
@@ -22408,17 +22866,17 @@
20200107,
2333
],
- "commit": "1809fd4c001a4ae2fa5e2b721b67c1059fb8e9b8",
- "sha256": "0ssh0chavas524jwj3r9bywkd8rgnbjz4xcgxhbnjfcl786pmyw7"
+ "commit": "54b0f51a103e4c12515cd814e3bc6be67c3da966",
+ "sha256": "1yvf4qns69smcg6vbb6l25g8dnai5da827qpd8f6pg3qp8w1q5wc"
},
"stable": {
"version": [
4,
0,
- 0
+ 3
],
- "commit": "400465de0ece5b03607895bd1c83b1cfae34079a",
- "sha256": "196jn2cmyjvjai3nbij5kk64djz908ch4kddi4qdpkighwslkh2i"
+ "commit": "64665dba315f5b70b3ce2045a42f6059d7b858de",
+ "sha256": "0z41p0aqz4bqvx885vy7hqny8ni8q2nrk7bhwazwymnhnzq52bjp"
}
},
{
@@ -22429,18 +22887,18 @@
"repo": "joaotavora/eglot",
"unstable": {
"version": [
- 20200516,
- 1013
+ 20200816,
+ 1810
],
"deps": [
"eldoc",
"flymake",
"jsonrpc",
- "package",
+ "project",
"xref"
],
- "commit": "bf75312b8e7ea5136905d7a55a6d705b51b2b6c9",
- "sha256": "1xbisdraj04jns0vcpcvnqqiwib3b8jpbian1nnmllvscfdz6c7l"
+ "commit": "5f873d288e1c5434c1640bef03555ed056cb0d35",
+ "sha256": "1rdfrw6qcbkl7bnjsfrzz6ndbr6lk0s4ldyqwv48k1nvlk9jc796"
},
"stable": {
"version": [
@@ -22463,28 +22921,28 @@
"repo": "non-Jedi/eglot-jl",
"unstable": {
"version": [
- 20200514,
- 2034
+ 20200726,
+ 741
],
"deps": [
"eglot",
"julia-mode"
],
- "commit": "844f12d881a3305d319e959b032e01501be1e8ae",
- "sha256": "0na70zn0s09nihzki6kfnb5hc2j2wqfffj50kwdzjfs53m4sl1s7"
+ "commit": "84cff9d6ef1643f3eac6c9d620cc1e380a9847d9",
+ "sha256": "1g3k3ym0hx97dk3sv1kz3vq0p1s1zw6r34ynhwm31y954miwyvm4"
},
"stable": {
"version": [
2,
- 0,
+ 1,
0
],
"deps": [
"eglot",
"julia-mode"
],
- "commit": "844f12d881a3305d319e959b032e01501be1e8ae",
- "sha256": "0na70zn0s09nihzki6kfnb5hc2j2wqfffj50kwdzjfs53m4sl1s7"
+ "commit": "84cff9d6ef1643f3eac6c9d620cc1e380a9847d9",
+ "sha256": "1g3k3ym0hx97dk3sv1kz3vq0p1s1zw6r34ynhwm31y954miwyvm4"
}
},
{
@@ -22495,19 +22953,18 @@
"repo": "emacs-china/EGO",
"unstable": {
"version": [
- 20180301,
- 104
+ 20200803,
+ 1101
],
"deps": [
"dash",
"ht",
"htmlize",
"mustache",
- "org",
- "simple-httpd"
+ "org"
],
- "commit": "719809679c1a60887735db41abae53b61f08ef59",
- "sha256": "10f179kl53la4dyikzl1xysccx4gk04skzwaw3w1pgr8f5fjppxc"
+ "commit": "211c4cb2af2582849d9df984fb2346deecaf79be",
+ "sha256": "0sk3mn1gxb826x69s6hlkrzgj8irs9sh3anfazryibw7i61p9cbj"
}
},
{
@@ -22518,11 +22975,11 @@
"url": "https://forge.tedomum.net/eide/eide.git",
"unstable": {
"version": [
- 20200507,
- 2238
+ 20200702,
+ 2009
],
- "commit": "f5f858e238c279a134d34a4ff334428dd811ca07",
- "sha256": "1y87cbzngn29svx94mqvsk74j7vk912fx29b4fi26hj6myvki1nx"
+ "commit": "b1dfdaf06b00409250135cb1000beac60c7f659b",
+ "sha256": "17wzffhqnd65c94qcxlwmb4qyw44kq39hvkqlwpxx8g4wj0lql3j"
},
"stable": {
"version": [
@@ -22557,8 +23014,8 @@
"repo": "millejoh/emacs-ipython-notebook",
"unstable": {
"version": [
- 20200514,
- 2040
+ 20200812,
+ 230
],
"deps": [
"anaphora",
@@ -22567,10 +23024,11 @@
"exec-path-from-shell",
"polymode",
"request",
- "websocket"
+ "websocket",
+ "with-editor"
],
- "commit": "ec3aa36bf37a78e99723563e38f81ee24b855524",
- "sha256": "0pr14dv4bbxgpki8kd1z9i07x1khb0v2wr82483qf3hhqafv6lrm"
+ "commit": "99a4718f50538a439a2a3f2011d1aa97246e259b",
+ "sha256": "0qi012pbyj1zdj7h0y3r26ijf80046827ln079v1q9hgkz9ipaam"
},
"stable": {
"version": [
@@ -22644,34 +23102,32 @@
"repo": "kostafey/ejc-sql",
"unstable": {
"version": [
- 20200516,
- 1604
+ 20200809,
+ 1221
],
"deps": [
- "auto-complete",
"clomacs",
"dash",
"direx",
"spinner"
],
- "commit": "b02e0bbc6df08a4ae44d16ac57886e56cfb8095d",
- "sha256": "0vs4kcdval7klzbs21jq2rcxs013r7rskpxgjc7lrq1qrsgyyq9d"
+ "commit": "c99825ce67c142b38a8d3edec444593e29d48b44",
+ "sha256": "0fwkaz5cacfmgchl0xyb82bqc20fbvl1kk14m5mvydhjqaam7r45"
},
"stable": {
"version": [
0,
- 3,
- 3
+ 4,
+ 1
],
"deps": [
- "auto-complete",
"clomacs",
"dash",
"direx",
"spinner"
],
- "commit": "ad6473ba40bcc0b300baa83eda13523b9cd2cd2c",
- "sha256": "18ik1r18yc904048l1yalqm9m7ll4vln73q483yqqywda9hm8saq"
+ "commit": "ddbae7be2aed9c273d9d570c542936f1faa3088f",
+ "sha256": "1gvbw4iqnsbs6fj713gjd9s0l1xxqmvq98ixsh59p0wh68a1nhhl"
}
},
{
@@ -22738,8 +23194,8 @@
20181006,
225
],
- "commit": "3f746410a9024af60a1368d02c2c0d9edd93ab66",
- "sha256": "03zvxdbqjzkr6js8g21dzdiqsbmbhphij8jz98ian7gvzi8ady23"
+ "commit": "3b5e48ba4a4dca5c91610e2eb607a8bbb725a6ab",
+ "sha256": "1kx0c3wgij66hhryb9ggf8c975406vb9a9m6z4yrsrrisyc2ljgk"
},
"stable": {
"version": [
@@ -22765,8 +23221,8 @@
"anaphora",
"cl-lib"
],
- "commit": "65c48ec47fea84d16ff2d1ef7015b4d220fcf5ff",
- "sha256": "0awx7ry9xnzw7n9aqiy7i2lfj453jkj15wfy38nlgw9qxv9bri9j"
+ "commit": "747acd434aa6f50a599efe5f6e96dea2dfed79d6",
+ "sha256": "0nyllimsrghwd1vkmal1c58g1nx4djyvjfmylhqidx4h79gkryxm"
},
"stable": {
"version": [
@@ -22800,8 +23256,8 @@
"dash",
"el-init"
],
- "commit": "8a2ab457586962bde0da2a1c56a37ce6363ae690",
- "sha256": "08ni8hmszryf75h1c13q3yrrxgh41as6r8r4vq4gih0jbiz0wx8w"
+ "commit": "7c0169d356d6c007317e253e5776e1e48a60d6ad",
+ "sha256": "0w2mxppkx6306kyxaw00fzv8q745iklcm41iswmflr2585h2adnq"
},
"stable": {
"version": [
@@ -22852,37 +23308,20 @@
"repo": "raxod502/el-patch",
"unstable": {
"version": [
- 20200404,
- 1548
+ 20200716,
+ 1428
],
- "commit": "46d22e7dfc7f9d8e9cbf5042d365f60b1fc7da0f",
- "sha256": "1xjnzy7gp4sqd0mj3zkw741bj7kbpbdgcqxs6ppvlmr5i0adx2hh"
+ "commit": "ff1951d776f80d2fd4a0cd9a0c930182fbb57b3c",
+ "sha256": "1f783xapqa6zigg0gqayxsf8lfkldng8r4ns9x04rqg9vmhkxmk0"
},
"stable": {
"version": [
2,
- 3
- ],
- "commit": "278a27477a4d7032fe06bb56ab01701cb10df808",
- "sha256": "15bwjl6377ngg3qwn1g8wc2wi61pcm6xlhjzj28ap5vz7y7zxps2"
- }
- },
- {
- "ename": "el-pocket",
- "commit": "ef362a76a3881c7596dcc2639df588227b3713c0",
- "sha256": "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw",
- "fetcher": "github",
- "repo": "pterygota/el-pocket",
- "unstable": {
- "version": [
- 20170922,
- 1249
- ],
- "deps": [
- "web"
+ 3,
+ 1
],
- "commit": "a80abfb67efe68ada1d7d0a73aecee57e763baaa",
- "sha256": "0q4nsgqpjmmxml5pcb6im1askk6q7c3ykzv6fgf1w8jgkvdifa6f"
+ "commit": "ff1951d776f80d2fd4a0cd9a0c930182fbb57b3c",
+ "sha256": "1f783xapqa6zigg0gqayxsf8lfkldng8r4ns9x04rqg9vmhkxmk0"
}
},
{
@@ -23080,11 +23519,11 @@
"repo": "Mstrodl/elcord",
"unstable": {
"version": [
- 20200322,
- 2027
+ 20200611,
+ 2314
],
- "commit": "94b0afb9bac32fa72354517347646166d6bec986",
- "sha256": "11gj67d83hx9wfjf4j277jy8jxf97i6bd9r8r057v4i8301qh91p"
+ "commit": "01b26d1af2f33a7c7c5a1c24d8bfb6d40115a7b0",
+ "sha256": "1lj87zfcvmzm34rlq5s4y4x2nwckwg5qxlhlgl4qry3bf16bmkcf"
}
},
{
@@ -23128,20 +23567,20 @@
"repo": "doublep/eldev",
"unstable": {
"version": [
- 20200515,
- 1905
+ 20200815,
+ 2332
],
- "commit": "a76712621a4851fdb0bc3d76f454898afefedf6e",
- "sha256": "1jc6l0pcsyv9wgp58ij9wvjj4x4a3zz4svsna2aq86pf8bbbyng9"
+ "commit": "ae353301c15b15930b0a83807275ed58a3be82e6",
+ "sha256": "0l1ac2ll2127wn6nlrpvxzk38xb74rb8bmp6c5sjh79hnjr04zh5"
},
"stable": {
"version": [
0,
- 3,
- 2
+ 6,
+ 1
],
- "commit": "f345065592b4bc9a5173b44e12a74400335d4e49",
- "sha256": "0gf7sfdrnyndgbkpm2pz3056y0d06iy6pwhr63sbm7g4x79j9yjd"
+ "commit": "8440e797f0dcaf7bf6da2a7573a7b07c4ea9da82",
+ "sha256": "16g68lgd5lp3rdskym4xnkvsm6953xgx48yah8zs5fpk4qny212r"
}
},
{
@@ -23214,15 +23653,15 @@
"repo": "stardiviner/eldoc-overlay",
"unstable": {
"version": [
- 20200328,
- 619
+ 20200715,
+ 1214
],
"deps": [
"inline-docs",
"quick-peek"
],
- "commit": "ec318acb564ac5679285b51b7d979410d393fac9",
- "sha256": "0dx1b9d7zyqcwsnhl18hyrkmrc0zy68zwhp81d43fw84gjb4jcx8"
+ "commit": "563ca285a510d1cbd5129cc3a8f8a3cdded065de",
+ "sha256": "1llh93rlvzsl9m2f7gprb5rbbf2ghysyn1balb8clb64hq98gjyb"
}
},
{
@@ -23239,8 +23678,8 @@
"deps": [
"stan-mode"
],
- "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
- "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
+ "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e",
+ "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0"
},
"stable": {
"version": [
@@ -23309,11 +23748,11 @@
"repo": "xwl/electric-spacing",
"unstable": {
"version": [
- 20200223,
- 838
+ 20200607,
+ 1405
],
- "commit": "83568a7f2f0e2f0983e348b6e4adc0fc75b98adf",
- "sha256": "03710cr8jvr22c9j3c266460aln26j7y9vqj6qm3mmzhsr3v7q2c"
+ "commit": "f039011edb922cdc56c1d2bd0e49bb4575c35ab3",
+ "sha256": "1qfjk928y8bnx2ksciv0f0ackahj78x3qsr84m9qcvsvlg9cql5p"
}
},
{
@@ -23363,11 +23802,11 @@
"repo": "skeeto/elfeed",
"unstable": {
"version": [
- 20200209,
- 1942
+ 20200716,
+ 1921
],
- "commit": "af31f80552f7d081b985d729143a804ad47c0734",
- "sha256": "13n0yhw9si1cp31m15andwkqan7vmmny5mxzj09cykjd1bk2rpan"
+ "commit": "8fb09ad75f2ff7d6f7d8b8d1ac65b9be873cc31d",
+ "sha256": "0rs32xvpwky37y18wr6maqbkncijia7yvmbrsngbhgdpzdvijp7v"
},
"stable": {
"version": [
@@ -23432,28 +23871,28 @@
"repo": "fasheng/elfeed-protocol",
"unstable": {
"version": [
- 20200503,
- 304
+ 20200526,
+ 341
],
"deps": [
"cl-lib",
"elfeed"
],
- "commit": "2df5237dfa8c51a151bcf9d8fb6746447a8aa3d0",
- "sha256": "0n4f621787v3gqfyqg7f37z6nxjqxl0bxxnl5j3gxqrif0ml2725"
+ "commit": "c5a928d4217060a49444d80d2fd54282d32a12a5",
+ "sha256": "0zky2iqkpckaq8c1fyhw9drdnmnyapix8jw46p6jvspljb9vwzkb"
},
"stable": {
"version": [
0,
7,
- 6
+ 8
],
"deps": [
"cl-lib",
"elfeed"
],
- "commit": "fc0beb392386b8ed387e52e7e100354b8549fd7e",
- "sha256": "1kh524fkhsq3l9w0dv12b8shdyqfvnkhdr19xzfbhzw10hfdl5js"
+ "commit": "c5a928d4217060a49444d80d2fd54282d32a12a5",
+ "sha256": "0zky2iqkpckaq8c1fyhw9drdnmnyapix8jw46p6jvspljb9vwzkb"
}
},
{
@@ -23464,15 +23903,15 @@
"repo": "sp1ff/elfeed-score",
"unstable": {
"version": [
- 20200328,
- 1855
+ 20200810,
+ 1547
],
"deps": [
"cl-lib",
"elfeed"
],
- "commit": "916c47b3590b2ff3c5075dcc1def4b36a4b14947",
- "sha256": "1vhchbyy3c79cgvdz12wnryklr5g1bwh02d604zj2wca3b0199w4"
+ "commit": "0551993338c5d41386eccd47cc2f1b382a1b29c3",
+ "sha256": "0hgdsvi4l9k978kcx8gmbqkdi7q3qj70cg697fqky0cmcpykhcbq"
},
"stable": {
"version": [
@@ -23503,8 +23942,8 @@
"elfeed",
"simple-httpd"
],
- "commit": "af31f80552f7d081b985d729143a804ad47c0734",
- "sha256": "13n0yhw9si1cp31m15andwkqan7vmmny5mxzj09cykjd1bk2rpan"
+ "commit": "8fb09ad75f2ff7d6f7d8b8d1ac65b9be873cc31d",
+ "sha256": "0rs32xvpwky37y18wr6maqbkncijia7yvmbrsngbhgdpzdvijp7v"
},
"stable": {
"version": [
@@ -23573,16 +24012,16 @@
"repo": "Wilfred/elisp-def",
"unstable": {
"version": [
- 20180806,
- 723
+ 20200528,
+ 633
],
"deps": [
"dash",
"f",
"s"
],
- "commit": "368b04da68783601b52e3169312183381871cf9e",
- "sha256": "0l1kj7xd4332xk821z24c14lhkpcmca5gmivpb8shlk10cvjvxjw"
+ "commit": "da1f76391ac0d277e3c5758203e0150f6bae0beb",
+ "sha256": "17zpil3zgi2j7a63lv5vas3ad6bvh45d9vnf2nb37z3id62rjdkd"
},
"stable": {
"version": [
@@ -23606,11 +24045,11 @@
"repo": "xuchunyang/elisp-demos",
"unstable": {
"version": [
- 20200427,
- 151
+ 20200606,
+ 949
],
- "commit": "4cd55a30d5dbd8d36a0e6f87261c4fef17fc6db0",
- "sha256": "0g1wnx37pdl3zxmym4fnqvhlw9hj6aw51vpxa18fpsh7fadfjjdp"
+ "commit": "8c9748134f7c017ae1536dbd0b76434afb52e64d",
+ "sha256": "15gyhqnlppsswmmcknc3yfm6p7s2y06r2py656vh5vwhah7pcqxj"
},
"stable": {
"version": [
@@ -23645,14 +24084,14 @@
"repo": "mtekman/elisp-depmap.el",
"unstable": {
"version": [
- 20200413,
- 1215
+ 20200714,
+ 1630
],
"deps": [
"dash"
],
- "commit": "e47616c968dd82e30cb10961452e2b46c7900163",
- "sha256": "1jpqdi15lvyd48jsbndlallnjc8bkmv0mxwyf51m483vz9v8nn2i"
+ "commit": "98676e6ffcc4efb70cc991e659c79cb599b01bc7",
+ "sha256": "0ybqbyv1jnjk25z6ys90d5lddd4qxqspn2xppkzvby21x634s2ry"
}
},
{
@@ -23725,16 +24164,15 @@
"repo": "Wilfred/elisp-refs",
"unstable": {
"version": [
- 20200428,
- 1707
+ 20200815,
+ 2357
],
"deps": [
"dash",
- "loop",
"s"
],
- "commit": "0e7ea1574717108ddc2eda5e1bc883d44cd28257",
- "sha256": "0qkgsac3g02p4w8rkkmwv0p0brmi3rb1yijq45nvyy8kkf331g0g"
+ "commit": "b3634a4567c655a1cda51b217629849cba0ac6a7",
+ "sha256": "1zy629gavyrwx5gmpz7l1a86hbrxjrfqik398v3ja8vg8bj9d6nq"
},
"stable": {
"version": [
@@ -23802,14 +24240,14 @@
"repo": "elixir-editors/emacs-elixir",
"unstable": {
"version": [
- 20200121,
- 623
+ 20200723,
+ 1750
],
"deps": [
"pkg-info"
],
- "commit": "231291ecadc479295d83fee619049030940bfbe5",
- "sha256": "0lzzgdd1fkswij0d9rh6gyyvhf6z5m0az1hhvyighi45al3mj78s"
+ "commit": "01b332495d3f44addeb236428041c4ffa0c2ca3b",
+ "sha256": "0qzzrvzpzj8vpdm8fw3sagp7bfps28l615hi67vnwp2car9a7f2y"
},
"stable": {
"version": [
@@ -23881,8 +24319,8 @@
"repo": "jcollard/elm-mode",
"unstable": {
"version": [
- 20200406,
- 214
+ 20200602,
+ 500
],
"deps": [
"dash",
@@ -23890,8 +24328,8 @@
"reformatter",
"s"
],
- "commit": "7782be0814b52f7c35a09b21a4839c1502a4707f",
- "sha256": "0g3mxp80hfjwf3adaslwykk01w5fh5y6nwj4687wbm5dldvhr42i"
+ "commit": "363da4b47c9de1ff091a8caf95fccc34188d59a3",
+ "sha256": "0nmhf4vql0nkc4igd9mp9v77cb0rsxfawb160f9mcgkdd6ahn3xj"
},
"stable": {
"version": [
@@ -23982,14 +24420,14 @@
"repo": "leoc/elmine",
"unstable": {
"version": [
- 20190212,
- 1740
+ 20200520,
+ 1237
],
"deps": [
"s"
],
- "commit": "2f020e41940b182deeca39786a3092a2d68b5eb7",
- "sha256": "0x2av6zjd4kkyzxm2hcwjx9x8j2fzqg85pka57hqpk2fhfhsmy3s"
+ "commit": "c78cc8705c2dffbf649b858f02b5028225943482",
+ "sha256": "05z9v3lcc0mm40k0y08v8mhnlxb4krlgj6zghfavwwz6nhxn61g3"
},
"stable": {
"version": [
@@ -24180,20 +24618,20 @@
"url": "git://thelambdalab.xyz/elpher.git",
"unstable": {
"version": [
- 20200516,
- 1232
+ 20200628,
+ 2255
],
- "commit": "bea10793f68037947b6fec30a86316ca2123bbfa",
- "sha256": "0n5z9vf5yzmdccmzfvs7xb6gxvlvgsfcdfw8m25zi1lajpjajhq6"
+ "commit": "b4450244a5e23605f80b2179ce7d4dbaff56d927",
+ "sha256": "0fjqdp4xh9q50rdxg20il1y6wwn5l1af7139f4613z4j5ha3zxxg"
},
"stable": {
"version": [
2,
- 7,
- 1
+ 10,
+ 0
],
- "commit": "bea10793f68037947b6fec30a86316ca2123bbfa",
- "sha256": "0n5z9vf5yzmdccmzfvs7xb6gxvlvgsfcdfw8m25zi1lajpjajhq6"
+ "commit": "b4450244a5e23605f80b2179ce7d4dbaff56d927",
+ "sha256": "0fjqdp4xh9q50rdxg20il1y6wwn5l1af7139f4613z4j5ha3zxxg"
}
},
{
@@ -24219,8 +24657,8 @@
"repo": "jorgenschaefer/elpy",
"unstable": {
"version": [
- 20200510,
- 1559
+ 20200805,
+ 1736
],
"deps": [
"company",
@@ -24229,13 +24667,13 @@
"s",
"yasnippet"
],
- "commit": "6b7db2f23a9f248fd756e0bc537fd8d53d98eb96",
- "sha256": "044qm7kgdnsh4yipxklyfvkrvzgw4abn6gjawkkvgniii2pf39hj"
+ "commit": "c766feb5c34dd17b7afba480ae9e90a08d75012c",
+ "sha256": "13z21jfvinjxyyi37xvx12gbr28fbr0g43x0nsip270dz797ls0v"
},
"stable": {
"version": [
1,
- 33,
+ 34,
0
],
"deps": [
@@ -24245,8 +24683,8 @@
"s",
"yasnippet"
],
- "commit": "b69ae7652e5efdda2e3dc650cd425b987ddd65ad",
- "sha256": "1g9x67dvg5al6i9hnjcyi0zjsz71iv2jbinpzj7gcx77d0dn3cpk"
+ "commit": "980705c0b23aead72d7d6711008b1fb1706a45c2",
+ "sha256": "1x1z298axbh4xalssnq9nkf2z1sdgmx839vb01xz18kr9lfavx1x"
}
},
{
@@ -24275,15 +24713,15 @@
"repo": "AdamNiederer/elquery",
"unstable": {
"version": [
- 20180917,
- 2217
+ 20200628,
+ 1756
],
"deps": [
"dash",
"s"
],
- "commit": "eac429d8550fbf1582c57d5e16fed9f320d6eb30",
- "sha256": "1jkbrv5r5vzqjhadb4dcgks47gaj7aavzdkzc5gjn5zv5fmm1in2"
+ "commit": "cba7629ad886c4e51d66f8b509aad48bdfe100cc",
+ "sha256": "119g9ca40rg0aam7i2n4jhjzjzm8r7bg6q0yjaw5x1j7ywks5af6"
}
},
{
@@ -24437,14 +24875,14 @@
"repo": "wamei/elscreen-separate-buffer-list",
"unstable": {
"version": [
- 20161107,
- 358
+ 20200807,
+ 1324
],
"deps": [
"elscreen"
],
- "commit": "7652d827aa1b8c1b04303c5b4b0bda5e8f85565e",
- "sha256": "1cpmpms3r9lywmxgciz4xq7vjw2c1mxmpd89shssqck16563zwxf"
+ "commit": "88d8850108947949431425a2d938a09d941454e8",
+ "sha256": "0c18w11wy3bnxhf109dbr01fcv3y9fg4jx5nkjx2gaf0kl0d7nfi"
}
},
{
@@ -24532,20 +24970,20 @@
"repo": "emacscollective/elx",
"unstable": {
"version": [
- 20200422,
- 1352
+ 20200728,
+ 819
],
- "commit": "d5ebd8ab6439fea3dcae0bcaece6e914f4ee1f6c",
- "sha256": "1h1dx6dpwr4cml2a57mz3lq4f746cja007ckrpk3vii9ap413hf8"
+ "commit": "f9f810ffcd3cce7ed15848c72ce299609ec09414",
+ "sha256": "1p3zpg4p4a1cn13sg3hsa33gs1bdra1mlmxkagx883p3808i5qha"
},
"stable": {
"version": [
1,
3,
- 0
+ 2
],
- "commit": "4cbdcd79524db4a71abbf761a3945617086f5d09",
- "sha256": "1gb2sh2mcx8va8lgyc46pch9fswfm761935806myi9fl1v67ayk6"
+ "commit": "f9f810ffcd3cce7ed15848c72ce299609ec09414",
+ "sha256": "1p3zpg4p4a1cn13sg3hsa33gs1bdra1mlmxkagx883p3808i5qha"
}
},
{
@@ -24595,11 +25033,11 @@
"repo": "skeeto/emacsql",
"unstable": {
"version": [
- 20190625,
- 1859
+ 20200714,
+ 28
],
- "commit": "a118b6c95af1306f0288a383d274b5dd93efbbda",
- "sha256": "1qz74rk2pskpc1k6kdpqv823i5zc39i885rww05n8lrqw456cpn0"
+ "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60",
+ "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk"
},
"stable": {
"version": [
@@ -24625,8 +25063,8 @@
"deps": [
"emacsql"
],
- "commit": "a118b6c95af1306f0288a383d274b5dd93efbbda",
- "sha256": "1qz74rk2pskpc1k6kdpqv823i5zc39i885rww05n8lrqw456cpn0"
+ "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60",
+ "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk"
},
"stable": {
"version": [
@@ -24655,8 +25093,8 @@
"deps": [
"emacsql"
],
- "commit": "a118b6c95af1306f0288a383d274b5dd93efbbda",
- "sha256": "1qz74rk2pskpc1k6kdpqv823i5zc39i885rww05n8lrqw456cpn0"
+ "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60",
+ "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk"
},
"stable": {
"version": [
@@ -24685,8 +25123,8 @@
"deps": [
"emacsql"
],
- "commit": "a118b6c95af1306f0288a383d274b5dd93efbbda",
- "sha256": "1qz74rk2pskpc1k6kdpqv823i5zc39i885rww05n8lrqw456cpn0"
+ "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60",
+ "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk"
},
"stable": {
"version": [
@@ -24709,14 +25147,26 @@
"repo": "cireu/emacsql-sqlite3",
"unstable": {
"version": [
- 20200117,
- 1922
+ 20200718,
+ 614
],
"deps": [
"emacsql"
],
- "commit": "82b90d493dba404473b515ffd670e0dd0dba1248",
- "sha256": "1azv9mllvyjzqjkjw9n5rmdj79fa8srbpmx61w6vm25bl9f62vpf"
+ "commit": "e920671872cd8e0ef9c3646e6f0fae331bf8a7df",
+ "sha256": "1yy9y27rckm776jnl2rh1fz3bh09690xwzq7102vlw7xkb9s7jhj"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 1
+ ],
+ "deps": [
+ "emacsql"
+ ],
+ "commit": "e920671872cd8e0ef9c3646e6f0fae331bf8a7df",
+ "sha256": "1yy9y27rckm776jnl2rh1fz3bh09690xwzq7102vlw7xkb9s7jhj"
}
},
{
@@ -24961,20 +25411,20 @@
},
{
"ename": "emms",
- "commit": "caaa21f235c4864f6008fb454d0a970a2fd22a86",
- "sha256": "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94",
+ "commit": "4caa7403144670c07e326ed3a7d982c427d4a254",
+ "sha256": "0ml66fgzxl4wsk5g7d78mqhr9gqmbld6qh31nfc6z19c8107jrd5",
"fetcher": "git",
"url": "https://git.savannah.gnu.org/git/emms.git",
"unstable": {
"version": [
- 20200508,
- 1955
+ 20200716,
+ 1815
],
"deps": [
"cl-lib"
],
- "commit": "64b9ee9c86067118b2d0055f467e60bc211aa59d",
- "sha256": "16h9hb6d621mfi7805p2iaw814n2pm2g659wcjqxpvm5x5hpn55v"
+ "commit": "36d760e2bd7e5376aff3f03456fa6445833242ad",
+ "sha256": "0xgshxdd5zmy1c7sxvrmw0wkqwhwaccqf93zwz98gb9gsfabyxd8"
},
"stable": {
"version": [
@@ -25296,15 +25746,15 @@
"repo": "iqbalansari/emacs-emojify",
"unstable": {
"version": [
- 20200513,
- 1627
+ 20200812,
+ 628
],
"deps": [
"ht",
"seq"
],
- "commit": "dfa3c6d060914c6082d6837da32df0c337330ee4",
- "sha256": "0m963cn916m0xa8cb1yslkcla86a34dchwy3ism62a2r9swa7p6s"
+ "commit": "d886069974d05c8c15654204f9afeaee962f3e7d",
+ "sha256": "00s6vzziiym4bqh91c1k55qjihpmqs7w6kcxnwms8mx92w40hlw2"
},
"stable": {
"version": [
@@ -25435,14 +25885,14 @@
"repo": "hrs/engine-mode",
"unstable": {
"version": [
- 20191105,
- 750
+ 20200611,
+ 1825
],
"deps": [
"cl-lib"
],
- "commit": "96b3488a6de2f50b8ba3a101e04ebcbe9821a989",
- "sha256": "1xka8i4cdvp5r2v2mkli1zz17x1sdsnmszbhqav2rf94v656d91i"
+ "commit": "e0910f141f2d37c28936c51c3c8bb8a9ca0c01d1",
+ "sha256": "15zx4a8gvgk077pnj7wr78nfjrzrj2i9ma6cj6jj6i8ikz6wyvjz"
},
"stable": {
"version": [
@@ -25465,11 +25915,11 @@
"repo": "zenspider/enhanced-ruby-mode",
"unstable": {
"version": [
- 20191111,
- 2243
+ 20200729,
+ 634
],
- "commit": "732331b99a0884dd7fc0149658d4090886857656",
- "sha256": "12wip0l6xyqgvxvjvid1rh61yizk1r9y7xl1jz2sjds7kv6aw0kf"
+ "commit": "f0bffbe4b32bb59680f897731169442cce5a1eec",
+ "sha256": "0zjx6mz8kql9d09rzqircbqd9rcpfsn1k7nz9vwijp59m6mnjw1h"
},
"stable": {
"version": [
@@ -25546,6 +25996,35 @@
"sha256": "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5"
}
},
+ {
+ "ename": "envrc",
+ "commit": "f66883b0d6a49decde7d438d9d4bdfa107a3554e",
+ "sha256": "1hkz0a7rs2yqapv3asmqr9pb8r8jk5hlmrpp8ab5l7qsdjm7xn63",
+ "fetcher": "github",
+ "repo": "purcell/envrc",
+ "unstable": {
+ "version": [
+ 20200714,
+ 201
+ ],
+ "deps": [
+ "seq"
+ ],
+ "commit": "1dc5aad14d2c27211c7c288d2d9dffeb2e27cb2d",
+ "sha256": "11ad4i1cyz6cfsckm4jf10w0570sd2fcrji87sf5052csl4ril2h"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1
+ ],
+ "deps": [
+ "seq"
+ ],
+ "commit": "a15003d6b540b1b07847310d5ed4c39046336a7d",
+ "sha256": "1sspy227b733dxx6czml5lmx9g7nsxwgnazk1b9ip81q0cm0dv55"
+ }
+ },
{
"ename": "eopengrok",
"commit": "2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545",
@@ -25640,14 +26119,14 @@
"repo": "emacscollective/epkg",
"unstable": {
"version": [
- 20200503,
- 1214
+ 20200817,
+ 1145
],
"deps": [
"closql"
],
- "commit": "d987af46d9d763946fbf2930cacc9d6906df4382",
- "sha256": "1jyb9m6nx91dn4isai36v1yc7shrpgnk76kpkamavrvwqdzvw6nv"
+ "commit": "ac6e85e11f0e071911279f3f0a4ea7bff35b68cf",
+ "sha256": "1g5g8rs4zpwlxmkmnml34hy0arbhq8fsmyxqjq0h1l1xxbwscdl4"
},
"stable": {
"version": [
@@ -25781,15 +26260,45 @@
"repo": "emacsomancer/equake",
"unstable": {
"version": [
- 20200429,
- 209
+ 20200805,
+ 2110
],
"deps": [
"dash",
"tco"
],
- "commit": "7e8ef8627151748156e7a4a384b6e8c6c344261b",
- "sha256": "1ds89jk4d7j89mgfkqqc92lizh6fwwr338imzvby1lb8i17nww40"
+ "commit": "85fe1033e3aa64986d297bf1fde2d172827309cc",
+ "sha256": "0w3yp9ixdwcm3fl8104yb3rxp1h8z6i6msd95b48jia52dbajzcj"
+ }
+ },
+ {
+ "ename": "eradio",
+ "commit": "b5c8621acac2bfb7859bf0b830994fc867ecdaa2",
+ "sha256": "0kan4ia1g9xsb53gkj43c6sn2009a9cm49x2c30ccj2gl999szq2",
+ "fetcher": "github",
+ "repo": "olav35/eradio",
+ "unstable": {
+ "version": [
+ 20200729,
+ 1817
+ ],
+ "commit": "5e257849113b70b2b42a999994d89ec8abadf253",
+ "sha256": "1nni4yyvhqg4dscgn1xlbgh073lwjff5mqw8zxwyiahfsdi0z9ca"
+ }
+ },
+ {
+ "ename": "erblint",
+ "commit": "5c65941ad1afd57d633f8586e9034c5e14acfa18",
+ "sha256": "1m2w8krg59x5pvbmdnnf9iglx2191hhdpxmfd0ww4bgnf1pf0gn4",
+ "fetcher": "github",
+ "repo": "leodcs/erblint-emacs",
+ "unstable": {
+ "version": [
+ 20200622,
+ 5
+ ],
+ "commit": "89af42f776d8dc656104322edaace2ede7499932",
+ "sha256": "1s3fcic42wlab3vnwdakvy7268cr19j5rd2ajr18qkr0vibj7xxj"
}
},
{
@@ -25815,14 +26324,14 @@
"repo": "atomontage/erc-crypt",
"unstable": {
"version": [
- 20200511,
- 2235
+ 20200516,
+ 2054
],
"deps": [
"cl-lib"
],
- "commit": "6d158b39ea2833b753858153eb110da9b8a40fc4",
- "sha256": "0pj330x5j9rnwcv2la2yc6w3vsg53c9ij0f3q9zi2psxbr268xi0"
+ "commit": "be87248435509f83c56a7f08ac9bcbbd3b20d780",
+ "sha256": "1d8wfa4rgwv41kmw1kpp90r8371n1l7lfx3k79k2psppvrf72xbf"
},
"stable": {
"version": [
@@ -25928,14 +26437,14 @@
"repo": "drewbarbs/erc-status-sidebar",
"unstable": {
"version": [
- 20171223,
- 2124
+ 20200811,
+ 136
],
"deps": [
"seq"
],
- "commit": "ea4189a1dbfe60117359c36e681ad7c389e2968c",
- "sha256": "1hwlhzgx03z8891sblz56zdp8zj0izh72kxykgcnz5rrkyc3vfi3"
+ "commit": "b589b74245591257c9e666bd5cd25812e04b7a34",
+ "sha256": "08fvr5ba6gb3y52sypbdj236nxr5rl95zgz1b120scz6xal7mysy"
}
},
{
@@ -26182,15 +26691,15 @@
"repo": "ergoemacs/ergoemacs-mode",
"unstable": {
"version": [
- 20200319,
- 1250
+ 20200526,
+ 18
],
"deps": [
"cl-lib",
"undo-tree"
],
- "commit": "4a6ba06d9c618e9380d059fa25ed677b45d134a7",
- "sha256": "0wgdzxla6kz1zfc3vfd8wc2j40kq023z7b83m2k435hcqdffark8"
+ "commit": "6a3214e1a892a45f575604f0bc4bb83175142aa4",
+ "sha256": "1n0ki4214c53ax3r54gg303kawyqivwcciyhvrgqa1y0kk093982"
},
"stable": {
"version": [
@@ -26234,19 +26743,20 @@
"repo": "erlang/otp",
"unstable": {
"version": [
- 20200313,
- 1030
+ 20200519,
+ 530
],
- "commit": "e5d476b5f22927d341caf1774355d9e69e390cfa",
- "sha256": "1kcdl56qybvq4m5dp65n3nbg6xijb793xi25yckk5nc17n1nwrzb"
+ "commit": "d9bc7858e985143a433953ba286422511b466a0c",
+ "sha256": "0ik1hhmw4xsmny9j5gbz7lr73jsvdd79xb3ygcsi8jkwz7lxi3v1"
},
"stable": {
"version": [
23,
- 0
+ 0,
+ 3
],
- "commit": "7a8d04dbcb388a5d837a213ad249c1b96e19e998",
- "sha256": "0hw0js0man58m5mdrzrig5q1agifp92wxphnbxk1qxxbl6ccs6ls"
+ "commit": "44b6531bc575bac4eccab7eea2b27167f0d324aa",
+ "sha256": "133aw1ffkxdf38na3smmvn5qwwlalh4r4a51793h1wkhdzkyl6mv"
}
},
{
@@ -26388,8 +26898,8 @@
"repo": "rejeep/ert-runner.el",
"unstable": {
"version": [
- 20200321,
- 2158
+ 20200704,
+ 1048
],
"deps": [
"ansi",
@@ -26399,8 +26909,8 @@
"s",
"shut-up"
],
- "commit": "1829f05c46b0baaae160d900f89c8881f4fcdbcc",
- "sha256": "08gygn9fjank5gpi4v6ynrkn0jbknxbwsn7md4p9ndygdbmnkf98"
+ "commit": "59a0f07f4f6b7c4757768309e8a47cec983e862a",
+ "sha256": "198bc526s6sw8qqsbmw4wgz5m97n6kf9002f2bgg9phms7a8if4s"
},
"stable": {
"version": [
@@ -26467,8 +26977,8 @@
"s",
"spark"
],
- "commit": "9e5bcb290b38d5bd143e0ee480ed49147cfd3504",
- "sha256": "13f7s8hk5d3psxp4qzzsqnwawsjj59cmjhmg1zi2c90qhvna78vn"
+ "commit": "3aacf72daf6a2b4104914dd40e5f33e78fb084ac",
+ "sha256": "1ki839cfsn2xr2d8a2j89llbl452d45x3y5jiaiwkcmfhf7xadcb"
},
"stable": {
"version": [
@@ -26791,14 +27301,14 @@
"repo": "4DA/eshell-toggle",
"unstable": {
"version": [
- 20200107,
- 2230
+ 20200528,
+ 1124
],
"deps": [
"dash"
],
- "commit": "ddfbe0a693497c4d4bc5494a19970ba4f6ab9033",
- "sha256": "0xqrp8pwbmfxjdqipgpw5nw633mvhjjjm3k3j9sh9xdpmw05hhws"
+ "commit": "aeb7c121e4518c0edd1d2972851502303a299984",
+ "sha256": "12w38h438bg2vm8najsqizcdfyr1px5h1gba68x4mzyv2bcll2qx"
}
},
{
@@ -27036,14 +27546,11 @@
"repo": "emacs-ess/ESS",
"unstable": {
"version": [
- 20200516,
- 522
- ],
- "deps": [
- "julia-mode"
+ 20200819,
+ 1030
],
- "commit": "8f04fa92a11cdb4a3777755fdbaaa65e076f04ef",
- "sha256": "10cg90aqlr5y3vmp94zhkwj3l178l9f32igpl38bzxm9hmdgikfr"
+ "commit": "1baf8bf1403fe5956a25475b03be0d8f02b3f3ca",
+ "sha256": "0asyd67krsq3xx7kk770x1f70j33bga8w0i7l4089a1jqzmpn3kx"
},
"stable": {
"version": [
@@ -27178,14 +27685,15 @@
"repo": "jschaf/esup",
"unstable": {
"version": [
- 20200318,
- 2256
+ 20200814,
+ 1400
],
"deps": [
- "cl-lib"
+ "cl-lib",
+ "s"
],
- "commit": "c9c95e245068d15d8e2732098af9a5d2bc8ec931",
- "sha256": "0i4cwwvs5zs8g2ajrrkqgrpxzywsa255rc1g7a6bxzvg9hk77f4k"
+ "commit": "0de8af8233d9ce1b67f05a50f25c481c4f1118d8",
+ "sha256": "01khb3xyj0ylwib6ryzzvqmkh5wvzxiq2n3l0s3h9zv7wx849bzv"
},
"stable": {
"version": [
@@ -27243,6 +27751,30 @@
"sha256": "0k0g58qzkkzall715k0864v3b7p5jnfwxqgmkj087x34frcf388k"
}
},
+ {
+ "ename": "etc-sudoers-mode",
+ "commit": "e665f3b7fd75544c174ac3da9e0a498ceb694f5a",
+ "sha256": "01sn1pd6s4blf6dk3vvi70sr1mgcfsigb1qvxk3dsggf1ng2rhsk",
+ "fetcher": "gitlab",
+ "repo": "mavit/etc-sudoers-mode",
+ "unstable": {
+ "version": [
+ 20200608,
+ 1555
+ ],
+ "commit": "52d5be9214185cfbba56e0b39bc4af474fc95f45",
+ "sha256": "1ff4dpwr0127mziwafxry5a9iyw8lbm4z8bdlim81p4pyyll7vx6"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "commit": "8d3805d8b8e016278204d727f6b97913ea0e5079",
+ "sha256": "0cg0l8ksqrxy0clzj5x8l891873zcxwwzziv1mvwf8i618w2sjss"
+ }
+ },
{
"ename": "eterm-256color",
"commit": "e556383f7e18c0215111aa720d4653465e91eff6",
@@ -27492,16 +28024,16 @@
"repo": "emacs-evil/evil",
"unstable": {
"version": [
- 20200516,
- 1740
+ 20200816,
+ 737
],
"deps": [
"cl-lib",
"goto-chg",
"undo-tree"
],
- "commit": "3f3b2fea87172f155e5f91d75f0fb69d8648acf2",
- "sha256": "0ihb42v513c9jrh8d0v5a76ykhqi408cdnfpilrwq9499qr22jdg"
+ "commit": "1e7aa5bfbd86feff0ed5982e487070352d326b90",
+ "sha256": "1vb7np6yzv8iqblxg0yi1ac080k2bn7n8wz6wj8vkm080zmfwfb0"
},
"stable": {
"version": [
@@ -27645,15 +28177,15 @@
"repo": "wbolster/evil-colemak-basics",
"unstable": {
"version": [
- 20170425,
- 1209
+ 20200630,
+ 1936
],
"deps": [
"evil",
"evil-snipe"
],
- "commit": "7844079b47f47bb1dc24c885b0ac2e67524fa960",
- "sha256": "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2"
+ "commit": "dcdf5c3e844f6eef2bf9d6a502cf8c81b3edaff2",
+ "sha256": "1g9li89kg3wgpm39prz9xra12vw7mhrnjl9wqqkvj98fx6dxsdr7"
},
"stable": {
"version": [
@@ -27695,16 +28227,15 @@
"repo": "emacs-evil/evil-collection",
"unstable": {
"version": [
- 20200513,
- 804
+ 20200808,
+ 850
],
"deps": [
"annalist",
- "cl-lib",
"evil"
],
- "commit": "e998952dfe73d296259905e1bd8f96659bfe2661",
- "sha256": "1r896jbshniaxxh15iw87yklnr2hq5as3a8w6xb202gxz5pvc4ym"
+ "commit": "c136589d9584e5d01a4b3f2e4cf8ac5f5a23be63",
+ "sha256": "0kbv4p4v5mgjk2hbrg0c5p29yd74s4xaa8z6c8f2h6l5p28dsk4j"
},
"stable": {
"version": [
@@ -28229,15 +28760,15 @@
"repo": "emacs-evil/evil-magit",
"unstable": {
"version": [
- 20200409,
- 1909
+ 20200604,
+ 110
],
"deps": [
"evil",
"magit"
],
- "commit": "253c644807013fe92429acdef418748794b8f254",
- "sha256": "08mh7phxsdb9w4dfs0pmr4l4fdzzr2rm88z2s8karfi5j5ik2ag5"
+ "commit": "88dc26ce59dbf4acb4e2891c79c4bd329553ba56",
+ "sha256": "0vh872rpxfwqj7m77l12czknddmz7aijk30vwb1l08yi9309cdsf"
},
"stable": {
"version": [
@@ -28261,26 +28792,26 @@
"repo": "redguardtoo/evil-mark-replace",
"unstable": {
"version": [
- 20150424,
- 718
+ 20200630,
+ 940
],
"deps": [
"evil"
],
- "commit": "56cf191724a3e82239ca47a17b071c20aedb0617",
- "sha256": "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv"
+ "commit": "d4fec7b10e93cca149163324cd2b2b2dcc211047",
+ "sha256": "0v08jwb92igd8cxbb1nxjdzwymppcaar9mf89dmbk7jkqif2q72z"
},
"stable": {
"version": [
0,
0,
- 4
+ 5
],
"deps": [
"evil"
],
- "commit": "56cf191724a3e82239ca47a17b071c20aedb0617",
- "sha256": "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv"
+ "commit": "d4fec7b10e93cca149163324cd2b2b2dcc211047",
+ "sha256": "0v08jwb92igd8cxbb1nxjdzwymppcaar9mf89dmbk7jkqif2q72z"
}
},
{
@@ -28291,26 +28822,26 @@
"repo": "redguardtoo/evil-matchit",
"unstable": {
"version": [
- 20200502,
- 1140
+ 20200812,
+ 1050
],
"deps": [
"evil"
],
- "commit": "943bf5fb2b04e077a797cf192fd7650b41e3c3e4",
- "sha256": "0iryzs12nn20pj5zcyhdk4mpgyrlah0pzbjawmj0l91clmhwbvhb"
+ "commit": "574d3c4e4517d3bb10bf652cacf459376ae401fe",
+ "sha256": "12c7y8dmkpqlak733cak6274fxzrk1hpywj7ky6nkfspqdvc2xz8"
},
"stable": {
"version": [
2,
3,
- 4
+ 8
],
"deps": [
"evil"
],
- "commit": "5e92e374e6b46176d46323b884c25c44063331da",
- "sha256": "1nflkmx08n3ya5vaipy1xg19hnqcp6f7ddsx9xjh5gl6ix2iz0az"
+ "commit": "8fba4f12e1bbfdbf25a8ed2a5308840f104bc7c0",
+ "sha256": "04s650hz6aa4ld3xqa272a2jsw9j1scnn5qkhpgis0w2d3gpwvpa"
}
},
{
@@ -28426,11 +28957,11 @@
"repo": "redguardtoo/evil-nerd-commenter",
"unstable": {
"version": [
- 20200417,
- 59
+ 20200630,
+ 911
],
- "commit": "1bd2de52011c39777a3e8779b14cee2790dc873b",
- "sha256": "0h8hzqjh6qq4fj0imrb5ic5m4zn3ig6s3b7b2x9r6ig9m15jpg6n"
+ "commit": "87734b9c7fcd047f73a072b9d03ec05f786eeb03",
+ "sha256": "15dahrvary0ahyzg83jxdhf00pd2231rr628nq9fl0dl54laixsd"
},
"stable": {
"version": [
@@ -28520,14 +29051,14 @@
"repo": "Somelauw/evil-org-mode",
"unstable": {
"version": [
- 20200101,
- 2017
+ 20200601,
+ 1855
],
"deps": [
"evil"
],
- "commit": "2d70c981587187f4fb7d72b9c5b368e6f7c1460f",
- "sha256": "1v20iba2b6dwr01zm69ix23xrlkm1ig8n9zn13nkna9iawafqrq9"
+ "commit": "4b23116a6ecfa687819050e5a9a419cf08d5ba90",
+ "sha256": "0r3b6j0ywkz8wggzyfnvqwwrd7ir317njdwldcdncirfwy603337"
},
"stable": {
"version": [
@@ -28591,6 +29122,25 @@
"sha256": "0b08y4spapl4g2292j3l4cr84gjlvm3rpma3gqld4yb1sxd7v78p"
}
},
+ {
+ "ename": "evil-pinyin",
+ "commit": "640f1cd1b05d7a806404ffbc2c1a95a10ed63a55",
+ "sha256": "1gd9fdmm0fdscc3cw5c8sc1sg8yhsvrlnj3kyyj6jjbrz6s96xni",
+ "fetcher": "github",
+ "repo": "laishulu/evil-pinyin",
+ "unstable": {
+ "version": [
+ 20200726,
+ 546
+ ],
+ "deps": [
+ "evil",
+ "names"
+ ],
+ "commit": "ee4ea5a297fb8a445e0c886f9d20bbd4e94c00df",
+ "sha256": "1g1v0513ypq4kax56rmq5dvf8yf9absvfls6zadhniwjzmdh68ii"
+ }
+ },
{
"ename": "evil-python-movement",
"commit": "130e6d17735ff86b962859528d7e50869f683251",
@@ -28838,15 +29388,15 @@
"repo": "hlissner/evil-snipe",
"unstable": {
"version": [
- 20200422,
- 519
+ 20200531,
+ 1008
],
"deps": [
"cl-lib",
"evil"
],
- "commit": "2ba6353bb9253dbbc4193f1d35403e7dcc1317b1",
- "sha256": "1sqbwg41by88qq7npsw7w9q3zmfk5adzqpqh2m84zk6fd64mc6h2"
+ "commit": "6dcac7f2516c6137a2de532fc2c052f242559ee3",
+ "sha256": "1faimkch2s08kbrwh3j77y0n5inrjr7vphy0xdl402bv0d20h8nq"
},
"stable": {
"version": [
@@ -28907,21 +29457,21 @@
"evil",
"string-inflection"
],
- "commit": "6913de02a210487c063cd63ecf27b17a24797870",
- "sha256": "1wyd903yvp8lxbhavsr4grn79hkxcsz71mcvy3hrvnf7ifhw514a"
+ "commit": "d22a90ab807afa7f27f3815b5b5ea47d52d05218",
+ "sha256": "1vwch4kwwh82k1rlc9qsg74zbghn6vkgch5xb1wz0dmbv4id06l5"
},
"stable": {
"version": [
1,
0,
- 0
+ 1
],
"deps": [
"evil",
"string-inflection"
],
- "commit": "f6a3eca0f0fa8e56e6938e1dd48537eef1fae05f",
- "sha256": "1akk0yylwcw4f91hprrrsijhbdcmrx1nnpgfyzpl4k5d4b30y8d5"
+ "commit": "d22a90ab807afa7f27f3815b5b5ea47d52d05218",
+ "sha256": "1vwch4kwwh82k1rlc9qsg74zbghn6vkgch5xb1wz0dmbv4id06l5"
}
},
{
@@ -28932,26 +29482,26 @@
"repo": "emacs-evil/evil-surround",
"unstable": {
"version": [
- 20191217,
- 1131
+ 20200603,
+ 2216
],
"deps": [
"evil"
],
- "commit": "9b0b17f06cef9bac81ee4800d121265e54718a17",
- "sha256": "15v2spg5rhddr97pxjfvxj36sh7knp753a9qpw8v5zjnp65kf2kn"
+ "commit": "346d4d85fcf1f9517e9c4991c1efe68b4130f93a",
+ "sha256": "1gfgmr4909m36gknprcam6q4rkcqfbi6w43ky7x6jnlmgb6mxggg"
},
"stable": {
"version": [
1,
1,
- 0
+ 1
],
"deps": [
"evil"
],
- "commit": "9b0b17f06cef9bac81ee4800d121265e54718a17",
- "sha256": "15v2spg5rhddr97pxjfvxj36sh7knp753a9qpw8v5zjnp65kf2kn"
+ "commit": "346d4d85fcf1f9517e9c4991c1efe68b4130f93a",
+ "sha256": "1gfgmr4909m36gknprcam6q4rkcqfbi6w43ky7x6jnlmgb6mxggg"
}
},
{
@@ -29023,14 +29573,14 @@
"repo": "emacs-evil/evil",
"unstable": {
"version": [
- 20200304,
- 911
+ 20200816,
+ 737
],
"deps": [
"evil"
],
- "commit": "3f3b2fea87172f155e5f91d75f0fb69d8648acf2",
- "sha256": "0ihb42v513c9jrh8d0v5a76ykhqi408cdnfpilrwq9499qr22jdg"
+ "commit": "1e7aa5bfbd86feff0ed5982e487070352d326b90",
+ "sha256": "1vb7np6yzv8iqblxg0yi1ac080k2bn7n8wz6wj8vkm080zmfwfb0"
},
"stable": {
"version": [
@@ -29045,6 +29595,38 @@
"sha256": "17xrn3s6a4afmls8fw8nnxa1jq9dmj2qqrxa2vngh50hxpz8840p"
}
},
+ {
+ "ename": "evil-tex",
+ "commit": "2b8ead8c7b1b7cdaefd35e9622fbb99307715e08",
+ "sha256": "1aph898q7mkw5vgwd1c7fh8vrgmarrbbkglgdfnawg8jycxac6sp",
+ "fetcher": "github",
+ "repo": "iyefrat/evil-tex",
+ "unstable": {
+ "version": [
+ 20200818,
+ 1628
+ ],
+ "deps": [
+ "auctex",
+ "evil"
+ ],
+ "commit": "03c014d63373c21c511506f36763a355e566eb01",
+ "sha256": "096im6yld0bqkdrb3ywxiabv55l8qdvg10887iwq86zprj89igmf"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 1
+ ],
+ "deps": [
+ "auctex",
+ "evil"
+ ],
+ "commit": "bb01576e4cf9cc10c529621ced3ef3a7eb5ab376",
+ "sha256": "1d4s9f0p8bmch3kv7zh5fcv1y6nxza9kfcrjrdvmflz1nb96sy6g"
+ }
+ },
{
"ename": "evil-text-object-python",
"commit": "0d0893b07bc4a057561a1c1a85b7520c50f31e12",
@@ -29569,20 +30151,20 @@
"deps": [
"evil"
],
- "commit": "d5daea30176d48e74c9d063ac9bfc240ebeb97d0",
- "sha256": "18mb7ik15yygfyjr5y2awbn5lrr3b9z1f31gnfslvrlav2nl1m7d"
+ "commit": "aee7af7b7a0e7551478f453d1de7d5b9cb2e06c4",
+ "sha256": "0m98bwj8dy90ifck8rsda6zfgbjrv5z0166pp7qzvwls9rqa695m"
},
"stable": {
"version": [
+ 1,
0,
- 0,
- 6
+ 0
],
"deps": [
"evil"
],
- "commit": "70f7ca2a4c6de0392e5e54ac4f16c96daa106be6",
- "sha256": "0ns43whqcq3cv9vh8wbakj5fgs0lsn8f3q1rgl4rw4mfgbvv85pm"
+ "commit": "5e7b5721bf48aa49c6cdb5d41b908ef7d513b2a8",
+ "sha256": "0xia8dvpz294pqc3zdr0knhdlw251dhkdm69v1005674kd15259w"
}
},
{
@@ -29593,11 +30175,11 @@
"repo": "purcell/exec-path-from-shell",
"unstable": {
"version": [
- 20191229,
- 112
+ 20200526,
+ 324
],
- "commit": "2d152d17814c6d551d525d83201da72c4047c1de",
- "sha256": "129iccdddpz0hhb25v63a8pk76ayx67jn47rwd3x6wzsnhsg3pp6"
+ "commit": "e5647b910900972bc59acea7b74e932ba0a94ce2",
+ "sha256": "18awpmyrvcw6yckms8wfgyh5kfyva1w7vpvclqa655l22brbvpph"
},
"stable": {
"version": [
@@ -29783,11 +30365,11 @@
"repo": "extemporelang/extempore-emacs-mode",
"unstable": {
"version": [
- 20200408,
- 2253
+ 20200518,
+ 1043
],
- "commit": "09518ae6650d7be33a4633a4c0f31b7130d04c6e",
- "sha256": "0hfza9lzdsz94gxhmzyp9fwviscv19rmnjgd0q613faayn11sjsp"
+ "commit": "7d0ca861e6b483be1f4a08e63c5ade9cd07b4799",
+ "sha256": "0mw041jccyn8s1n3wpas397k2vrp9ryq9lfj16ipk9iqs4la6hlx"
}
},
{
@@ -29821,19 +30403,20 @@
"repo": "doublep/extmap",
"unstable": {
"version": [
- 20181028,
- 1645
+ 20200617,
+ 1905
],
- "commit": "187f621cb2d9413595cb47917641e5692e3b37cd",
- "sha256": "1h9d7fgvy9xz9rw6kf5q606j2k54xqmvva028d929h8aibb6pch2"
+ "commit": "2a6373d4fad1a5ac95272cabb6f5e4af89233d67",
+ "sha256": "0n0hz93x7mbf95mf8vvc6cam7qbzwj4kskbbws07km2av7jsi166"
},
"stable": {
"version": [
+ 1,
1,
1
],
- "commit": "1139b57d8f4276fe56b8416fdaf4745f2cdfe7c3",
- "sha256": "0jgyscjfparnby0whrmbgvsab2a7qkaqhysmh3s3jh635fndm253"
+ "commit": "341e3e16e217da5a006c0859cb3a59cbc40cfb84",
+ "sha256": "09kia3mr4si8kn46kyiza9nl669b22vmgc70ng3mqz742lph5siw"
}
},
{
@@ -29863,11 +30446,11 @@
"repo": "agzam/exwm-edit",
"unstable": {
"version": [
- 20200126,
- 27
+ 20200728,
+ 8
],
- "commit": "bc25ba094b383be3c650ca0b7e1534efe2bb154f",
- "sha256": "1z1ya9xgknka3dy3b3x8zzfkxdx5jqsi8q5aqkvxjxa6n7mmqdwv"
+ "commit": "2fd9426922c8394ec8d21c50dcc20b7d03af21e4",
+ "sha256": "1gwqwj50ch8iib5yqbyvski7vxiwid6s49lj2xcy5kksnx1a2410"
}
},
{
@@ -29916,14 +30499,14 @@
"repo": "ieure/exwm-mff",
"unstable": {
"version": [
- 20190810,
- 1744
+ 20200516,
+ 2335
],
"deps": [
"exwm"
],
- "commit": "a6a4b3dda01cbcf411fc2824981eaa9e85199a52",
- "sha256": "1f4yr4q5dayxmyvrdxbbviks6l02amqhgfa97k7cz9rwscsavg6c"
+ "commit": "81fbbea495e32aef2e2d86c097cb586422d8822c",
+ "sha256": "0c3k2cs57iahm5dc1i3h05kiz4fjh7l2675im8kh91jx7lk27vb5"
},
"stable": {
"version": [
@@ -30623,11 +31206,11 @@
"repo": "yqrashawn/fd-dired",
"unstable": {
"version": [
- 20200428,
- 332
+ 20200713,
+ 243
],
- "commit": "001cc95effdd5c4d9974b3f2c40b2ddf1f0e3de2",
- "sha256": "1ab03jn1kg4bq97d7dzinpxlyg3wcx4cha0a7ibqdbqrci3znigc"
+ "commit": "5622041068d5fa2f299dbc8aa91fece0ba260086",
+ "sha256": "028qm0snna2w8wrgx988nhw3sdid5n3nr01hvavnzyhadha1j6fc"
},
"stable": {
"version": [
@@ -30656,8 +31239,8 @@
"page-break-lines",
"ppp"
],
- "commit": "529b7ec69f1694d7dc8aacb5066cf4ddcf24cc58",
- "sha256": "0flph6yv5fj5ladksjqfpj9j8p2jcc102kbc833bvx1cnmjx7qk4"
+ "commit": "3f19293dada8bf368e9f86f783610e7ca0a51ecb",
+ "sha256": "11ml9n4bkm0150ifyx3igx55hnnrhbg04q8sb15v734xi29swp6z"
},
"stable": {
"version": [
@@ -30677,11 +31260,11 @@
"repo": "michaelklishin/cucumber.el",
"unstable": {
"version": [
- 20190801,
- 1137
+ 20200815,
+ 1617
],
- "commit": "11ae1671629bfedaa553c7b819676d64eb320992",
- "sha256": "0yd4gkxz9xcbgibfgr8apsid3f83nmg5jgqk5nql0linj5gymc28"
+ "commit": "8e1464113b489b54067294cd988ff6a11a423fdb",
+ "sha256": "1lmfksx49ig4b7nqg0mmaalz08b280iaqgsc0x9i471m9kvbisp7"
},
"stable": {
"version": [
@@ -30707,6 +31290,36 @@
"sha256": "0f2nynx9sib29qi3zkfkgxlcfrwz607pgg6qvvk4nnads033p1yn"
}
},
+ {
+ "ename": "feed-discovery",
+ "commit": "eaea977d51dd55a0dd2bfdc2f7cff822ed4053d7",
+ "sha256": "0yd8hsc6dqipmqh7ahbmr16gj5p4lh8a55652x1lic3q4ssah1ql",
+ "fetcher": "github",
+ "repo": "HKey/feed-discovery",
+ "unstable": {
+ "version": [
+ 20200714,
+ 1118
+ ],
+ "deps": [
+ "dash"
+ ],
+ "commit": "47692787326a14c06dab6815bb18caced59a5bf0",
+ "sha256": "1mj86p4zw73c1n6nqv35zhgsqrmcmgvi07q60dahs016bwdzc6jb"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "deps": [
+ "dash"
+ ],
+ "commit": "3812439c845c184eaf164d3ac8935de135259855",
+ "sha256": "0v0xcy81a0kysycm3p8rl64vrsc9ph3d4yqzxp7kik9rmkgrp89w"
+ }
+ },
{
"ename": "fennel-mode",
"commit": "cda0732050a17b2dc70b80afd6fc6bb9cf8bb60f",
@@ -30715,11 +31328,20 @@
"repo": "technomancy/fennel-mode",
"unstable": {
"version": [
- 20200405,
- 1935
+ 20200714,
+ 237
+ ],
+ "commit": "a39543750ba337b9327108ba17ffb0cdb18c7f9b",
+ "sha256": "0p9n0plb1ry6r8i09if6mzhhk4gs1saxm05msq8sgwdjs6r1ra61"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2,
+ 0
],
- "commit": "7fadf2580c3afcae3f6ebc54dad0e519b7600f1d",
- "sha256": "1qpfpfdm2d8bdqm7h62y3hgbip67yqmblhg66zlmfxfdnsad5ls6"
+ "commit": "ae4634bef12f66a1d4721ab74c5bf8dd29d710d2",
+ "sha256": "15b5zb66dzszpdiqkwgxqv434kqgpk1l065ic4lbj3y3krm2snbg"
}
},
{
@@ -30745,28 +31367,28 @@
"repo": "jcs-elpa/ffmpeg-player",
"unstable": {
"version": [
- 20200224,
- 554
+ 20200720,
+ 1028
],
"deps": [
"f",
"s"
],
- "commit": "9a80e1d42a4b01879a7585485384af6431b34651",
- "sha256": "129mfslbp15d9z83r38lcqxnfx3n5jldaja5qbdgrmlw14irgx0r"
+ "commit": "164fb15d70adbc186eb2d987f5c5143aa7336659",
+ "sha256": "0i6r2mlpahrnszr9vk476iqvc1c8cpp6wn6fhlnz6vw4dybpw5p5"
},
"stable": {
"version": [
0,
2,
- 0
+ 1
],
"deps": [
"f",
"s"
],
- "commit": "214c08b362daa138d2e17883a6b4d096f22f5ebb",
- "sha256": "0w2afgdd3pasrqi9apnmp0qqg4qvd0skizybrnyi9abnc0bp9v7x"
+ "commit": "164fb15d70adbc186eb2d987f5c5143aa7336659",
+ "sha256": "0i6r2mlpahrnszr9vk476iqvc1c8cpp6wn6fhlnz6vw4dybpw5p5"
}
},
{
@@ -30850,17 +31472,17 @@
},
{
"ename": "fill-column-indicator",
- "commit": "4ea0c00a7784621fcca0391a9c8ea85e9dd43852",
- "sha256": "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "1fd9l7idzn9vwcy3v80fnn2d8g4c9g3rc505sapc5wgkn8in0p6d",
"fetcher": "github",
- "repo": "alpaker/Fill-Column-Indicator",
+ "repo": "alpaker/fill-column-indicator",
"unstable": {
"version": [
- 20191109,
- 10
+ 20200806,
+ 2239
],
- "commit": "3d88b8a4a3eeabb8d1c9ef27d3c6f5d98517be77",
- "sha256": "1rklnjsqz8krqjll35xd5xwg79xqwh0sldwbcnymkjwywbky8yhh"
+ "commit": "c35f9de072c241699b57bcb46da84bed5af29cfe",
+ "sha256": "1q682bn6wgvga8arv4xfmr4nnw8nhw7qkjrlp5crpyv42x9yqr73"
},
"stable": {
"version": [
@@ -30902,11 +31524,11 @@
"repo": "snarfed/fillcode",
"unstable": {
"version": [
- 20171029,
- 1625
+ 20200524,
+ 2226
],
- "commit": "d0a9e20f5fcc24a786d09ea19bfb9237681ba823",
- "sha256": "1mf2gfcjaqbw523vkfbzs2nl1y9bn9gbgmbvn2phbyj78gzq18za"
+ "commit": "501468082e46bd0975ef4d8765363fd564338099",
+ "sha256": "0z18x3gxh004nd648hwqdlb60a6ss61pkkqg30xpdmsrj8darf5q"
}
},
{
@@ -30987,8 +31609,8 @@
"deps": [
"ivy"
],
- "commit": "acedab403f69f242fa41012c20078500d46aa9e8",
- "sha256": "0p21vm6xz6093nic2wwgly18a85xki3wp0a2vy4hgy0dl7qici86"
+ "commit": "506f35e91e06463cca7390da6ebffc411b8c220f",
+ "sha256": "1iwfhymbmlmakbga1jlp7w6jlnj0jbb0zs1yxxg8mmj7k9ss2xjr"
},
"stable": {
"version": [
@@ -31128,8 +31750,8 @@
20200415,
2356
],
- "commit": "a61d7fce35eadba39236a6a3e9aa301e161d147b",
- "sha256": "1bn81qwkvhznc5pi6bq08kp83208pj09vknfszx152r72sv5fpmz"
+ "commit": "c6945a005b9a581c81e2f3560eab4bd629967364",
+ "sha256": "1ylndx5n433zy9y7n79xhl7p0g1f4c0y97ha50d8fqm451jm0569"
}
},
{
@@ -31298,20 +31920,20 @@
"repo": "marcowahl/fit-text-scale",
"unstable": {
"version": [
- 20200315,
- 2120
+ 20200701,
+ 2239
],
- "commit": "387acab18f9f4064c051771cf666b8550718dc27",
- "sha256": "0mrl112vjsl6ddjv0j2pg97s6zk8c2qb92wqsq775ahr1cbhvbw7"
+ "commit": "a87341d4fb2077076eb83af0fb510112900aaebe",
+ "sha256": "1ayswmb99mimsg6b05nnvm15yg8w2512sv1mjk1nbifz627vgq2x"
},
"stable": {
"version": [
1,
1,
- 3
+ 4
],
- "commit": "75f74aa14bb38ab00f184ae0a51262eaab07a27c",
- "sha256": "1nc1p4qbpvnqq2vi7pck3zygahhippvy2xgqmha4lpq5f996lmyx"
+ "commit": "ba63f0591c3be1644ee7ee972430c74b5d346579",
+ "sha256": "014vbzxz1jmm83a5mg4zsyxm8nw96n8s2l7h3myhrn880d9xnqgg"
}
},
{
@@ -31325,8 +31947,8 @@
20190713,
1349
],
- "commit": "d3e17161d137fb75baf1449741ccaadb949e127a",
- "sha256": "18yk3vs4v7n8zmxv80ss7bd94zmr14nring0d5bavax65b4wqk59"
+ "commit": "7aef6fb29840a2f3c7e3c01eeeb7838a0e702050",
+ "sha256": "0hf4x16fr5z5l2ypp41sw78dz5qpi14pphpbh8zdg4ky5sa8d4fd"
},
"stable": {
"version": [
@@ -31375,8 +31997,8 @@
"deps": [
"cl-lib"
],
- "commit": "8d023f13710a90ae4da644d5485bf2be2646b6a1",
- "sha256": "0pb5sd5cpz4173xi9kzgl9jx69169aymk94kdr6xgzhqda7iwy7p"
+ "commit": "46487e5279a3079730e2d7146ace7c8ad42371ac",
+ "sha256": "0ij0bjrb446h07lyhflfk06sk802jylgdl11ib00r89zai8sq8r7"
},
"stable": {
"version": [
@@ -31499,11 +32121,11 @@
"repo": "seblemaguer/flatfluc-theme",
"unstable": {
"version": [
- 20200419,
- 1033
+ 20200707,
+ 630
],
- "commit": "f81bb130be69e9f321e2085b627387074d23a253",
- "sha256": "17z5bmcd2c4k26w9xd8npaqwk9wwr2nf0d6vikzj0mxg0pdlbaz2"
+ "commit": "5a30b1cd344ac0d3c3bf9dab017805ab96897b54",
+ "sha256": "0vcinly3lrrkbihafgxcv084zn8fhw94wc8qjjq2lwcc1db7lfjc"
}
},
{
@@ -31662,11 +32284,11 @@
"repo": "IvanMalison/flimenu",
"unstable": {
"version": [
- 20200415,
- 2353
+ 20200810,
+ 1510
],
- "commit": "f110bc77415a7594742f3b12551571c4069c9157",
- "sha256": "1y832w4n10k9lfi90lhq8l9s56zcg24j9j8jklkzby1vf34vq0ql"
+ "commit": "4c0ff37cf3bd6c836bd136b5f6c450560a6c92b9",
+ "sha256": "1z57vm8pgxfhklzz4gpyqy8wwv3dzl76dzgilx5pfkd69m2jrijg"
}
},
{
@@ -31796,11 +32418,11 @@
"repo": "MetroWind/flucui-theme",
"unstable": {
"version": [
- 20200204,
- 1930
+ 20200815,
+ 2103
],
- "commit": "01a3df3530474da7b4303e4eea2ed1fae00d1776",
- "sha256": "1bfnpligs32mpizrz9fb1pyp1zxq2rmympcg9pqrgpkdlxvs6xrf"
+ "commit": "6591b5093e6e8f0e720e3995a16a91835b2e7a48",
+ "sha256": "1lrpx1y103655xwaqkvn7i2zvkzbsf5bm7zndaj31rpm917xcm3i"
}
},
{
@@ -31811,11 +32433,11 @@
"repo": "amake/flutter.el",
"unstable": {
"version": [
- 20200508,
- 1252
+ 20200718,
+ 1434
],
- "commit": "8818bc07727fe748edf4aea629b510b7ada680b3",
- "sha256": "05pl4w3zmfg24fk1pj053r0f8sx3m1zacfymvpya022y1ggpvnh6"
+ "commit": "78b3c572584c95220a40934bd67fd5e3fb096f96",
+ "sha256": "1vmm1d5sviwwvhm6cbr3sirfhqxa04d0s62a8vsiydb1q7868g2s"
}
},
{
@@ -31833,8 +32455,8 @@
"flutter",
"flycheck"
],
- "commit": "8818bc07727fe748edf4aea629b510b7ada680b3",
- "sha256": "05pl4w3zmfg24fk1pj053r0f8sx3m1zacfymvpya022y1ggpvnh6"
+ "commit": "78b3c572584c95220a40934bd67fd5e3fb096f96",
+ "sha256": "1vmm1d5sviwwvhm6cbr3sirfhqxa04d0s62a8vsiydb1q7868g2s"
}
},
{
@@ -31944,8 +32566,8 @@
"repo": "flycheck/flycheck",
"unstable": {
"version": [
- 20200516,
- 1719
+ 20200610,
+ 1809
],
"deps": [
"dash",
@@ -31953,8 +32575,8 @@
"pkg-info",
"seq"
],
- "commit": "309d37286729994094b931344c9a664dd7c6c08d",
- "sha256": "1gsa4lik5f0dzn897lh369nmcn7n61if80ll5jc5qiymm1fx16cr"
+ "commit": "c02cd773dded0215f9417ec04dfe8dabda63ef43",
+ "sha256": "15w2b98zylppbfvy653i3a5jrxqvbrz8lqs4pzb39w2mbf8nxibx"
},
"stable": {
"version": [
@@ -32056,14 +32678,14 @@
"repo": "alexmurray/flycheck-bashate",
"unstable": {
"version": [
- 20160630,
- 440
+ 20200625,
+ 642
],
"deps": [
"flycheck"
],
- "commit": "77fa03dbc578c34fe71ca44926bac2aff8f2b021",
- "sha256": "1jcay4gncpr0fap6qlm6k4r5b94s18zj8j56w462hvxydaxxiql6"
+ "commit": "5e673c591d017329d0a07a61dc1223fa98639ee2",
+ "sha256": "1gaih50mkyby0r4qnmc03dy111ik4and5p6r3lvsflpvd3hcxjn3"
}
},
{
@@ -32313,15 +32935,15 @@
"repo": "flycheck/flycheck-color-mode-line",
"unstable": {
"version": [
- 20171122,
- 707
+ 20200528,
+ 416
],
"deps": [
"dash",
"flycheck"
],
- "commit": "cc474804d4e8088a627485faaf4217a5781aec7d",
- "sha256": "0lk8p0wb7g9lvxjv9rl59hd9f0m0ksw9rgspis8qshpz8pj5785f"
+ "commit": "575b604cfe21f65fb07c134392c382c163c87739",
+ "sha256": "04wc61my2p6zbq22nh6yvap5aww9lfr5zgd7mf0l1chbvi9scdn0"
},
"stable": {
"version": [
@@ -32381,14 +33003,14 @@
"repo": "crystal-lang-tools/emacs-crystal-mode",
"unstable": {
"version": [
- 20180627,
- 242
+ 20200805,
+ 2344
],
"deps": [
"flycheck"
],
- "commit": "2428b016243e78a0312cf6b3ba6939e7169a1405",
- "sha256": "0al65ldsbmm15h4y79i8avk63qq1y7fqzzad8p327z6d42zfm1qj"
+ "commit": "f9e4db16ff9fdc6a296363aa35d19cfb4926e472",
+ "sha256": "1x0lmb48bza2w52s15288hpbipafs87lj5lv0ldd1q4r9yv0i102"
},
"stable": {
"version": [
@@ -32495,24 +33117,6 @@
"sha256": "1ffpxnwl3wx244n44mbw81g00nhnykd0lnid29f4aw1av7w6nw8l"
}
},
- {
- "ename": "flycheck-demjsonlint",
- "commit": "9a15a17a5aa78aed72958b2a1bde53f0c0ab5be7",
- "sha256": "0bcfkc9fch1h6gva64j71kb9l8fc9rz6wk0s9w1c1chx1z4nlill",
- "fetcher": "github",
- "repo": "uqix/flycheck-demjsonlint",
- "unstable": {
- "version": [
- 20161115,
- 718
- ],
- "deps": [
- "flycheck"
- ],
- "commit": "a3dfe1df8ecdea76c076c0849901427567356228",
- "sha256": "0zra3rl0kn70kn30wx1lqh9218k06mq3j8jadax61nnynw7bzsa5"
- }
- },
{
"ename": "flycheck-dialyxir",
"commit": "fa49551b8f726c235e03ea377bb09a8be37b9f32",
@@ -32635,6 +33239,37 @@
"sha256": "1qkzir3lzz4lc5kn55qb52cm5y7iy8w1ljq6xxzcjxfbk9980y0y"
}
},
+ {
+ "ename": "flycheck-eldev",
+ "commit": "170b59e0f97ea8a27910efc1de3c82ee188a3fe5",
+ "sha256": "0z83w4gd34g4kgdfc46c5zkhm0awa1hhi9p600k3sd4n8ac2ms4m",
+ "fetcher": "github",
+ "repo": "flycheck/flycheck-eldev",
+ "unstable": {
+ "version": [
+ 20200614,
+ 1904
+ ],
+ "deps": [
+ "dash",
+ "flycheck"
+ ],
+ "commit": "c2e2bea1e69fe5f50a9629dec1d9b468ee92de54",
+ "sha256": "0rkzjzghfgypplnsx4w4ih9dh8xyysy9wb0jqmbg13zvc3jcb600"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0
+ ],
+ "deps": [
+ "dash",
+ "flycheck"
+ ],
+ "commit": "1bddbfaa1de22879ea2b900c9f8d6f16940ee9fb",
+ "sha256": "0ma26gk9a3lw60i172wcwdsyfa19j7fj579b4yb7gf9ibca2hs5m"
+ }
+ },
{
"ename": "flycheck-elixir",
"commit": "da2ab73ab1426f71ea2b2bea2b418941856b3454",
@@ -32850,30 +33485,59 @@
"repo": "jcs-elpa/flycheck-grammarly",
"unstable": {
"version": [
- 20200203,
- 446
+ 20200720,
+ 951
],
"deps": [
- "cl-lib",
"flycheck",
"grammarly"
],
- "commit": "72425743364f4fd9516f94546a7432457e1e7df0",
- "sha256": "17dl0g9f58gc9rkk87kg1bqy6qqz225ng7ymdg2ikhd8i2pd2zkw"
+ "commit": "698b82936f6b592591f7ed9cc3e3cdf0099e8d96",
+ "sha256": "14lp2js3vlwj2wd8l38bkg4q3dgp4n51smfi70isg3rpi8i0csxy"
},
"stable": {
"version": [
0,
1,
- 4
+ 5
],
"deps": [
- "cl-lib",
"flycheck",
"grammarly"
],
- "commit": "1bcb11c3c7878c1b0d73318399e572e9a15587b1",
- "sha256": "1daw5mmif1nzg4yr5zm42bzzfg1n4qxps3pkcisga11mbp9g553r"
+ "commit": "698b82936f6b592591f7ed9cc3e3cdf0099e8d96",
+ "sha256": "14lp2js3vlwj2wd8l38bkg4q3dgp4n51smfi70isg3rpi8i0csxy"
+ }
+ },
+ {
+ "ename": "flycheck-guile",
+ "commit": "e94519d09e86af65778a7b81877e21d139c9a529",
+ "sha256": "1jxdqn3smpd9vf26y24m35yg60xjkqcazlj18q0vrf4ib188d36c",
+ "fetcher": "github",
+ "repo": "flatwhatson/flycheck-guile",
+ "unstable": {
+ "version": [
+ 20200721,
+ 103
+ ],
+ "deps": [
+ "flycheck",
+ "geiser"
+ ],
+ "commit": "2940f1622fa352e7ca95a9e4ad65958c5575da02",
+ "sha256": "0cs5r0ik6a3bl1k3imjl0r8y1i69kx9x9m9cgxj470qk34brwyj5"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2
+ ],
+ "deps": [
+ "flycheck",
+ "geiser"
+ ],
+ "commit": "2940f1622fa352e7ca95a9e4ad65958c5575da02",
+ "sha256": "0cs5r0ik6a3bl1k3imjl0r8y1i69kx9x9m9cgxj470qk34brwyj5"
}
},
{
@@ -32958,8 +33622,8 @@
"flycheck",
"indent-lint"
],
- "commit": "23ef4bab5509e2e7fb1f4a194895a9510fa7c797",
- "sha256": "00ipp87hjiymraiv6xy0lqzhn9h3wcrw7z4dkzb2934d7bd08j29"
+ "commit": "c55f4ded11e8e50a96f43675a071354a8fb501c3",
+ "sha256": "0d7vkgzsx6ka4zliscsg6drqhg2bj16i911ryzmsp4v6hj294jrc"
},
"stable": {
"version": [
@@ -33042,14 +33706,14 @@
"repo": "flycheck/flycheck-inline",
"unstable": {
"version": [
- 20190320,
- 1611
+ 20200808,
+ 1019
],
"deps": [
"flycheck"
],
- "commit": "cf9eceabff8370f3b834b943a5777b9f914583f9",
- "sha256": "1sk8r90iqxpzrg0lpq4vd8ywdi08i0bbmgdivmr510jw2bpi3wp4"
+ "commit": "0662c314bd819f9b46f8b2b13f0c650445b3a8c5",
+ "sha256": "1wlvwi8y5pb3gy3j061v7krxfb1766yw5iika5ymk4zjg9g057vn"
}
},
{
@@ -33162,6 +33826,25 @@
"sha256": "0wk8mc8j67dmc3mxzrhypgxmyywwrjh5q5llj4m2mgf0j7yp2576"
}
},
+ {
+ "ename": "flycheck-keg",
+ "commit": "bbf222afada736c149ec91d148c25aad5e077c95",
+ "sha256": "1kyf3fimdi3kbg9simkn0gqmqd8i5la26p7xrhhg34am5n6wm3g6",
+ "fetcher": "github",
+ "repo": "conao3/keg.el",
+ "unstable": {
+ "version": [
+ 20200726,
+ 218
+ ],
+ "deps": [
+ "flycheck",
+ "keg"
+ ],
+ "commit": "fea2f831d84d7642c35820bb63250487e46683e5",
+ "sha256": "062lnv7g9ixs6d0qzp6py9ajd2rbrk7l2yrz3dn5zz8lx06hbaga"
+ }
+ },
{
"ename": "flycheck-kotlin",
"commit": "f158727cc8892aadba0a613dd08e65e2fc791b48",
@@ -33228,14 +33911,14 @@
"repo": "hinrik/flycheck-lilypond",
"unstable": {
"version": [
- 20171203,
- 1332
+ 20200614,
+ 2104
],
"deps": [
"flycheck"
],
- "commit": "cc1b7677a932c42e5dab1661ad7b923d4aae744c",
- "sha256": "1yfsg52z4nhbh33fbsig24c9s0mc4xm72ll36h6ibld9fvqsgv6k"
+ "commit": "17133911b519be76365103dec8c10cb2f3729f1a",
+ "sha256": "01486ch8vsq7kcfdpggvykbdangv2pvq2v4g9npr9izlja2kwpar"
}
},
{
@@ -33276,38 +33959,6 @@
"sha256": "15pjqglpcwm4wy0cxk1man3ar0n56qi1bjrr1fxfjq2xwsgsfagh"
}
},
- {
- "ename": "flycheck-mix",
- "commit": "fd2a4d71b7f4c0082b687a23fd367d55186625a9",
- "sha256": "1wp8lp45lc519w3xsws2c91jlbfmc0pc8764kxsifk74akwcizfl",
- "fetcher": "github",
- "repo": "tomekowal/flycheck-mix",
- "unstable": {
- "version": [
- 20200211,
- 1414
- ],
- "deps": [
- "elixir-mode",
- "flycheck"
- ],
- "commit": "d3c075f61ace6695919e90239cee6567cce09638",
- "sha256": "19bvnryfxz4idw1dgp90mpjbp3512423m3xqgczskv4csns4hw1q"
- },
- "stable": {
- "version": [
- 1,
- 0,
- 0
- ],
- "deps": [
- "elixir-mode",
- "flycheck"
- ],
- "commit": "c565ebb12a48fcd49cc65656d79295c3288fcb84",
- "sha256": "1yncail979sfljmib7b1m9aw376xd4b76apz4d50hj83lrfy169c"
- }
- },
{
"ename": "flycheck-mmark",
"commit": "2fd10423ab80e32245bb494005c8f87a8987fffb",
@@ -33322,8 +33973,8 @@
"deps": [
"flycheck"
],
- "commit": "f8fdd59ccb9ddc7d81efbf3dde096dc66e3f9fa1",
- "sha256": "08rwmvddla2h0wjiljl8qab87chsyc42hzap2mqih2n7finvzj4f"
+ "commit": "a285d849e6e227b79bef98f575ecfa43a70661da",
+ "sha256": "1wdv7iv3lmrpxxdas1p3grkpi08c4ipjfg170nfd2fy9nhr8iy38"
},
"stable": {
"version": [
@@ -33484,8 +34135,8 @@
"flycheck",
"package-lint"
],
- "commit": "caea75f77dc7668c7aa0ebcd48f677e3522b5d77",
- "sha256": "1x63rwpyzcn99jzhyxh91l3hp2j55wspxdv5rhvnpbar5nlqlbz1"
+ "commit": "64cf27d69051e02a32e3c517cbfea23f9d2d7557",
+ "sha256": "0m2bmdwrj7ccf6ndv089qbbrz1msbcgls0ckbbhzpxxq39as2rpv"
},
"stable": {
"version": [
@@ -33552,8 +34203,21 @@
"flycheck",
"pest-mode"
],
- "commit": "4ae88a9c81d499bbe99978ff0216b645fed70023",
- "sha256": "1zc7dmgp3s9q33wkvw6i7zzlcaa65ixx3hxb78m62lk2a7fzb3ih"
+ "commit": "43447a2c70f98edd1139005e32f437d3f142442b",
+ "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
+ ],
+ "deps": [
+ "flycheck",
+ "pest-mode"
+ ],
+ "commit": "43447a2c70f98edd1139005e32f437d3f142442b",
+ "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a"
}
},
{
@@ -33571,8 +34235,8 @@
"flycheck",
"phpstan"
],
- "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101",
- "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w"
+ "commit": "e675cf0881408e10b76f2e70c6158237cb94671e",
+ "sha256": "11qd0mpcvc56hghwv60a57d5pap19s7yvlvi6827wnrq35cyzh7f"
},
"stable": {
"version": [
@@ -33728,15 +34392,15 @@
"repo": "alexmurray/flycheck-posframe",
"unstable": {
"version": [
- 20191214,
- 1109
+ 20200817,
+ 412
],
"deps": [
"flycheck",
"posframe"
],
- "commit": "2b3e94c2e427ec9831c513007460c5ea9e2225a3",
- "sha256": "1hmplb61xvz6p2b2pv6pg5bv7q7mirmgr0n1by1hj1w479g8rps3"
+ "commit": "c928b5b5424fe84a0b346e28bd7d461c80b27482",
+ "sha256": "1prjqqhzzaznbsysdipgvcinl3zkbgf19rb061h5mrqbgjw1l8f4"
}
},
{
@@ -33757,6 +34421,38 @@
"sha256": "00jlw18y68yq0fyvfzhvw89a4nmv1ah4c8h4d6g79rl5djnb48hk"
}
},
+ {
+ "ename": "flycheck-psalm",
+ "commit": "148d9b28e683a6602bb18eecaaf3cbc8dede65b1",
+ "sha256": "1a8mvf268bbfg6f557xdmhwa8ihi2misy8ps30kkia9asb176smz",
+ "fetcher": "github",
+ "repo": "emacs-php/psalm.el",
+ "unstable": {
+ "version": [
+ 20200510,
+ 1540
+ ],
+ "deps": [
+ "flycheck",
+ "psalm"
+ ],
+ "commit": "b2a1e8a9524b0004e62996c70da5536f86e56182",
+ "sha256": "0r0qz5bdznzdj7zxq6a6fz7fwn2c978bq57yywj3fcy8f5vh8jcf"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 6,
+ 0
+ ],
+ "deps": [
+ "flycheck",
+ "psalm"
+ ],
+ "commit": "aaa77b4ceb61d41a520baa0b84b9b236c99c4156",
+ "sha256": "1fnr8sbx74c4mdz91y6b4m0n6njjb0qa01r4i9975q197vwzni48"
+ }
+ },
{
"ename": "flycheck-pycheckers",
"commit": "af36dca316b318d25d65c9e842f15f736e19ea63",
@@ -33765,25 +34461,25 @@
"repo": "msherry/flycheck-pycheckers",
"unstable": {
"version": [
- 20200428,
- 40
+ 20200807,
+ 610
],
"deps": [
"flycheck"
],
- "commit": "dcf5b097b7c1206f6325547f5cf37b867a6a5ffb",
- "sha256": "16fwk1prq7gyhs0yk4bmr9j3wxnznjj9ppbxwidnmpbhdis2f0sv"
+ "commit": "055830b67cd0f0d7196a5b71bd5cce3197a557a7",
+ "sha256": "1zw6993a8l7yf3j8dbagmj051m1z8cdax2pzm0l2p2dxvkm0h4s2"
},
"stable": {
"version": [
0,
- 14
+ 15
],
"deps": [
"flycheck"
],
- "commit": "c5349c0fb3b719469b7e66dbdfbe58d0813f6a74",
- "sha256": "02886xggdb09880jp57cah3fmf1nm77gvb0aaws8j4abl278g7x5"
+ "commit": "44b11b51c97fd334ecdce74169c0e65123ef5991",
+ "sha256": "08wsr0hrmbh24bzsd2ghc82mp4m31ms3aykv0x68vpspzm06yyi3"
}
},
{
@@ -33831,27 +34527,27 @@
"repo": "purcell/flycheck-relint",
"unstable": {
"version": [
- 20200320,
- 2223
+ 20200721,
+ 2217
],
"deps": [
"flycheck",
"relint"
],
- "commit": "296cf8e2f9e85ab0c1c591816b50ecd7c766060c",
- "sha256": "148xh1alng4s3ydnhwjjrcmq1390pn6ymjszaamrzljwfqzh85ky"
+ "commit": "86ebb4dac919eda01341b15b9c896742b9d17c30",
+ "sha256": "1k638y125xyb0bc5i2zrkypwb770jn1ndky6qak31n4ws41xynbd"
},
"stable": {
"version": [
0,
- 5
+ 6
],
"deps": [
"flycheck",
"relint"
],
- "commit": "296cf8e2f9e85ab0c1c591816b50ecd7c766060c",
- "sha256": "148xh1alng4s3ydnhwjjrcmq1390pn6ymjszaamrzljwfqzh85ky"
+ "commit": "d1e54d4bfdb12d0b60a1b9a8c2b11799426ddc57",
+ "sha256": "095vxjy6aacvmav86sg8b43svlnad7h8a83nl830v4nynpmx3183"
}
},
{
@@ -33869,8 +34565,8 @@
"flycheck",
"rtags"
],
- "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710",
- "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr"
+ "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824",
+ "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b"
},
"stable": {
"version": [
@@ -33920,25 +34616,6 @@
"sha256": "1fh6j5w2387nh2fwwjphkhq17cgj5m2q5k0fhidvgc2w65lzbr1r"
}
},
- {
- "ename": "flycheck-stack",
- "commit": "b77f55989d11d1efacbad0fd3876dd27006f2679",
- "sha256": "1r9zppqmp1i5i06jhkrgvwy1p3yc8kmcvgibricydqsij26lhpmf",
- "fetcher": "github",
- "repo": "chrisdone/flycheck-stack",
- "unstable": {
- "version": [
- 20160520,
- 944
- ],
- "deps": [
- "flycheck",
- "haskell-mode"
- ],
- "commit": "f04235e00998000ee2c305f5a3ee72bb5dbbc926",
- "sha256": "139q43ldvymfxns8zv7gxasn3sg0rn4i9yz08wgk50psg5zq5mjr"
- }
- },
{
"ename": "flycheck-stan",
"commit": "e1d19cd6b80080aad5eff159c1bc7f7585bcd655",
@@ -33954,8 +34631,8 @@
"flycheck",
"stan-mode"
],
- "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
- "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
+ "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e",
+ "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0"
},
"stable": {
"version": [
@@ -34089,15 +34766,15 @@
"repo": "nhojb/flycheck-swiftx",
"unstable": {
"version": [
- 20200504,
- 1345
+ 20200814,
+ 845
],
"deps": [
"flycheck",
"xcode-project"
],
- "commit": "1b9174fb37498dc3a3cf8bbbfbb4f0470e8ef139",
- "sha256": "1qiddgrrf2d0sjmikd9yy53v5vxfh13j1m9qq40ap9vz7x4661va"
+ "commit": "84f42393dea362d3bdfc9253a205a17ec7a12a76",
+ "sha256": "0v5km3hf58xysal526l4l2jpyibh0l6f367vwmn4zi64cl5hvf3p"
}
},
{
@@ -34813,6 +35490,24 @@
"sha256": "0rzlw80mi39147yqnpzcvw9wvr5svksd3kn6s3w8191f2kc6xzzv"
}
},
+ {
+ "ename": "flymake-kondor",
+ "commit": "ca065538aa80cd33b08092d7787c6b4a1754fb31",
+ "sha256": "1wgd42g3rfdrf93isfk0z5r6naxibripad3ds08iv20qqcdryasd",
+ "fetcher": "github",
+ "repo": "turbo-cafe/flymake-kondor",
+ "unstable": {
+ "version": [
+ 20200714,
+ 646
+ ],
+ "deps": [
+ "flymake-quickdef"
+ ],
+ "commit": "530bf3e6c401d17f6b4f784a1f2524d5ba2d3414",
+ "sha256": "06adysd3q1gh92y0cdsnlmb588gdax85ad7pkmi324bixck5ggqx"
+ }
+ },
{
"ename": "flymake-ktlint",
"commit": "7b2e630e5e16044fb8ffe251f4fa58fb8f3d6bb9",
@@ -34917,8 +35612,20 @@
"deps": [
"pest-mode"
],
- "commit": "4ae88a9c81d499bbe99978ff0216b645fed70023",
- "sha256": "1zc7dmgp3s9q33wkvw6i7zzlcaa65ixx3hxb78m62lk2a7fzb3ih"
+ "commit": "43447a2c70f98edd1139005e32f437d3f142442b",
+ "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
+ ],
+ "deps": [
+ "pest-mode"
+ ],
+ "commit": "43447a2c70f98edd1139005e32f437d3f142442b",
+ "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a"
}
},
{
@@ -34982,8 +35689,8 @@
"deps": [
"phpstan"
],
- "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101",
- "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w"
+ "commit": "e675cf0881408e10b76f2e70c6158237cb94671e",
+ "sha256": "11qd0mpcvc56hghwv60a57d5pap19s7yvlvi6827wnrq35cyzh7f"
},
"stable": {
"version": [
@@ -35314,11 +36021,11 @@
"repo": "d12frosted/flyspell-correct",
"unstable": {
"version": [
- 20200215,
- 1408
+ 20200601,
+ 944
],
- "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13",
- "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf"
+ "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83",
+ "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x"
},
"stable": {
"version": [
@@ -35345,8 +36052,8 @@
"avy-menu",
"flyspell-correct"
],
- "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13",
- "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf"
+ "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83",
+ "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x"
},
"stable": {
"version": [
@@ -35377,8 +36084,8 @@
"flyspell-correct",
"helm"
],
- "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13",
- "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf"
+ "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83",
+ "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x"
},
"stable": {
"version": [
@@ -35409,8 +36116,8 @@
"flyspell-correct",
"ivy"
],
- "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13",
- "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf"
+ "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83",
+ "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x"
},
"stable": {
"version": [
@@ -35441,8 +36148,8 @@
"flyspell-correct",
"popup"
],
- "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13",
- "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf"
+ "commit": "dea1290a371c540dde7b8d0eef7a12d92f7a0b83",
+ "sha256": "0b15w96hihdblw71xvaysf8p1bmwvjp0qzrqwcij9qz72kd1w72x"
},
"stable": {
"version": [
@@ -35714,21 +36421,6 @@
"sha256": "0ghj0nw2zlrppsgl6x2nda9fj4w04rz6647v9823wxhfirrgnd5z"
}
},
- {
- "ename": "font-lock-cl",
- "commit": "b7a2635ceb34f49f84f35e11c14521592a9d330f",
- "sha256": "1d8r3d558ipk324hpgfm4fv4kxk6mhvkka3aqd4kcv8zv0k79iq3",
- "fetcher": "github",
- "repo": "font-lock-cl/font-lock-cl",
- "unstable": {
- "version": [
- 20200321,
- 533
- ],
- "commit": "9f82d31f9f0fb06bbc2ce18e21e79d1eabbe6c5e",
- "sha256": "0b6g36frvp1i92qn8rv3dcm8sxiw5yvbvhl7j58x2xwvawn79nfd"
- }
- },
{
"ename": "font-lock-profiler",
"commit": "b372892a29376bc3f0101ea5865efead41e1df26",
@@ -35930,8 +36622,8 @@
"repo": "magit/forge",
"unstable": {
"version": [
- 20200425,
- 2225
+ 20200725,
+ 1419
],
"deps": [
"closql",
@@ -35943,8 +36635,8 @@
"markdown-mode",
"transient"
],
- "commit": "e2da80660a0550f613400ce3b238025589800417",
- "sha256": "0m80w0qh6icj365pcg9d0kb2nvmv48c3874wy15mjcilzb6i97av"
+ "commit": "feee7e2fce3f87f7aa113c5edcb1896127ee9d12",
+ "sha256": "1nn73hxhp7rziwdnnvz6avn1gkax531f4l72sk0v4ywdwjhnnlgs"
},
"stable": {
"version": [
@@ -35975,11 +36667,11 @@
"url": "https://depp.brause.cc/form-feed.git",
"unstable": {
"version": [
- 20200506,
- 1300
+ 20200527,
+ 2152
],
- "commit": "b5dbfd8b90e72de84ae7b6667947264fe655c163",
- "sha256": "0n2k0ki6k1pgni907fvz09z3hbfbchnv1q80j42w23qam2hp7a3f"
+ "commit": "fc06255e185d32b1616bd86b69b55c1daabbe378",
+ "sha256": "05yqyp20bvfk5n1nqyffv1k8l1zl1bpz8q32kzqarm9fim2wv23n"
},
"stable": {
"version": [
@@ -35999,15 +36691,15 @@
"repo": "lassik/emacs-format-all-the-code",
"unstable": {
"version": [
- 20200513,
- 1930
+ 20200804,
+ 1822
],
"deps": [
"cl-lib",
"language-id"
],
- "commit": "0227e1aadeb18db397f03368d54cbefe4afd6112",
- "sha256": "0p04xgswp269a17jpiwpj8qfj3c2zvkmr4vn0wa1dfrw5f5bfj2x"
+ "commit": "ccfff41a200e16e3644c2531e984959392e3341a",
+ "sha256": "0wqq86gfilrg9jf9yls9wcxy926j44lvzafj92kdmmyzbas1nm9k"
},
"stable": {
"version": [
@@ -36144,26 +36836,26 @@
"repo": "rnkn/fountain-mode",
"unstable": {
"version": [
- 20200516,
- 624
+ 20200811,
+ 652
],
"deps": [
"seq"
],
- "commit": "83d308b6fd26662bc8fb204c4d634616e03dca44",
- "sha256": "0a068qfc969bvxyynrk2yakv2l3y31snnvcpdsbxd4m4m6drv3lw"
+ "commit": "55be196ef20cdc276b3bde1a39444df1cc599f9b",
+ "sha256": "14baj9ldssdb5vrc3fl7c7nhc2iff6gxa7v2flcjjnazfg87r3b2"
},
"stable": {
"version": [
3,
- 1,
- 0
+ 2,
+ 2
],
"deps": [
"seq"
],
- "commit": "9027c6f2b2a2d7d64501e55ff3531cdef26c463d",
- "sha256": "08giwg0jwk8zzj2i4cm08322qr6znrnv9a49za7c6j47bykpwj6s"
+ "commit": "1405217e69d055b869e804d33feca23cb602f759",
+ "sha256": "0rwdwbw9cq8ljvbmgmz9izank8dqjki79l1bw127lli69fs72gyi"
}
},
{
@@ -36274,15 +36966,15 @@
"repo": "davidshepherd7/frames-only-mode",
"unstable": {
"version": [
- 20190524,
- 1439
+ 20200728,
+ 740
],
"deps": [
"dash",
"s"
],
- "commit": "ce55b3ad3b3cb4c4253a0172bb8e9461814b2d64",
- "sha256": "1sw1s2k4wch32h5r0z6bfyiw4qcwjz93lq36ix17r968r505djc2"
+ "commit": "3cd98cbf80b04ae2ebca1c67c52ba756116f6784",
+ "sha256": "0smyic3x3b98ipwhb9pw47nnymccy4w7k3dbng2g2zhgwi5pyc1k"
},
"stable": {
"version": [
@@ -36366,15 +37058,15 @@
"url": "https://git.launchpad.net/frecentf.el",
"unstable": {
"version": [
- 20191204,
- 312
+ 20200624,
+ 1534
],
"deps": [
"frecency",
"persist"
],
- "commit": "1d5d641fdd93480db2374276e85ec652af0565c5",
- "sha256": "01l92rz4hll2v5k0xppmszcpy0r6lxgm4cql0zxkcj5yhgzjmrln"
+ "commit": "d9d093365ffe12c46e81d16ee81850abd86a2177",
+ "sha256": "06w17km8hmlr2mrxi26g51mnfvcvilw91b17y52pmx09jgnqa9ac"
}
},
{
@@ -36454,8 +37146,8 @@
"repo": "p3r7/friendly-shell",
"unstable": {
"version": [
- 20200510,
- 1438
+ 20200527,
+ 830
],
"deps": [
"cl-lib",
@@ -36463,14 +37155,14 @@
"friendly-tramp-path",
"with-shell-interpreter"
],
- "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf",
- "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8"
+ "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6",
+ "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16"
},
"stable": {
"version": [
0,
2,
- 2
+ 3
],
"deps": [
"cl-lib",
@@ -36478,8 +37170,8 @@
"friendly-tramp-path",
"with-shell-interpreter"
],
- "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf",
- "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8"
+ "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6",
+ "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16"
}
},
{
@@ -36490,28 +37182,28 @@
"repo": "p3r7/friendly-shell",
"unstable": {
"version": [
- 20200510,
- 1438
+ 20200527,
+ 830
],
"deps": [
"cl-lib",
"with-shell-interpreter"
],
- "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf",
- "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8"
+ "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6",
+ "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16"
},
"stable": {
"version": [
0,
2,
- 2
+ 3
],
"deps": [
"cl-lib",
"with-shell-interpreter"
],
- "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf",
- "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8"
+ "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6",
+ "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16"
}
},
{
@@ -36522,30 +37214,30 @@
"repo": "p3r7/friendly-shell",
"unstable": {
"version": [
- 20200510,
- 1438
+ 20200527,
+ 830
],
"deps": [
"cl-lib",
"dash",
"with-shell-interpreter"
],
- "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf",
- "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8"
+ "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6",
+ "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16"
},
"stable": {
"version": [
0,
2,
- 2
+ 3
],
"deps": [
"cl-lib",
"dash",
"with-shell-interpreter"
],
- "commit": "d9cef2599f4edf425b257d65a88008d916dabfbf",
- "sha256": "15kla2haji0b32sx0xij7h4h35w0r33dy5jirxa9ych6gqyznbk8"
+ "commit": "5c0eda312d8da6de0848d56abca1b0f5840e81e6",
+ "sha256": "0zmrqxbclq0630sw96shf8alql21w70879flbbk26b837j8vyw16"
}
},
{
@@ -36668,16 +37360,16 @@
"repo": "fsharp/emacs-fsharp-mode",
"unstable": {
"version": [
- 20191130,
- 1857
+ 20200520,
+ 1842
],
"deps": [
"dash",
"eglot",
"s"
],
- "commit": "8c86e38b93aac55f57d5baf3a9575b45b54cd16a",
- "sha256": "08c8v5wnb7fi4pbi5ivkhi3l4nf8mhn9b9829nkpz1l5q9lmz263"
+ "commit": "3e41fe1391b64eefa66a8a02fce27a12a04e1e01",
+ "sha256": "03ln0dmjkg4bnpabnw27vby3jqf40wzvs3znynqqqx7cn53vy5fp"
},
"stable": {
"version": [
@@ -36701,8 +37393,8 @@
"repo": "FStarLang/fstar-mode.el",
"unstable": {
"version": [
- 20200424,
- 2235
+ 20200624,
+ 2201
],
"deps": [
"company",
@@ -36712,8 +37404,8 @@
"quick-peek",
"yasnippet"
],
- "commit": "d8b586518f32d4acde049852d81902670d1ee277",
- "sha256": "0av315lf58nwgvix100bj279mq2pm175vwc5dip19gn73bq4d9vi"
+ "commit": "bd28cb8f25538e26287c76efbbc5ef7378d1fbc6",
+ "sha256": "1jvvasin29bwxq7cmviv0431jb7p2gq3yh12pyf6f5zinsax97cp"
},
"stable": {
"version": [
@@ -36743,8 +37435,8 @@
"deps": [
"cl-lib"
],
- "commit": "68f6eeb3adbc7d9f71d24761600bf8538775c969",
- "sha256": "16iz2wf8bn4mjcgbc5vj50snlgiqqdc495kxbd9mcld5rjhfs45q"
+ "commit": "3fdb0325ca2a6d80e4111af43b1b166808022020",
+ "sha256": "0kid3a0qq2qvzndbs1c69z30f2in7q7fzpv6yas84f8y5kkmk220"
},
"stable": {
"version": [
@@ -36861,10 +37553,10 @@
},
{
"ename": "fuo",
- "commit": "25fb625becf7f582d2a8d53726d6f01d9ea89ecc",
- "sha256": "02mvgz2cxrdn5kp5dw0c57rl5nfavqli5yqbxczmbsih164ljdxf",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "1aaqa7lih9gh4rz51jy577l95rgmyhna2h9ci1h4baini19mxi26",
"fetcher": "github",
- "repo": "cosven/emacs-fuo",
+ "repo": "feeluown/emacs-fuo",
"unstable": {
"version": [
20190812,
@@ -36897,14 +37589,14 @@
"repo": "diku-dk/futhark-mode",
"unstable": {
"version": [
- 20200415,
- 1228
+ 20200627,
+ 732
],
"deps": [
"cl-lib"
],
- "commit": "2befd490ce7d78a43d001b4bb0bd4300d086d645",
- "sha256": "0p4ii7mbspx1fsmzx9n8z2siq9n8ixpisxs388ndd2ccp7x3k6nm"
+ "commit": "9db9fb81e08b6ded43a4eede5220644ce354060d",
+ "sha256": "0hcwqsq65hlznsq2k5bviwzyh82sddfb28v5xna0016yphbdng2h"
}
},
{
@@ -36918,8 +37610,8 @@
20200104,
524
],
- "commit": "0b6b64cebde5675be3a28520ee16234db48d3b8b",
- "sha256": "1bddjr3rpmvkrljq5ipjm42d59m2897cpfhmiah3rcb4c6ra40m1"
+ "commit": "fee874aa35d2ee6b12b836290b5c8eaa44175a28",
+ "sha256": "1xswm8my29i4fddy64k21b1vclbr5fjb0pisb4hs8ynkk5w1kw2a"
},
"stable": {
"version": [
@@ -37069,6 +37761,21 @@
"sha256": "14drm6b6rxbcdilcms1jlqyrqbipcqbdil6q06ni9pgafi7xp8hz"
}
},
+ {
+ "ename": "gameoflife",
+ "commit": "bdfc00fe567155ae98fbf1a44d0bb4fa3a8e5786",
+ "sha256": "0vjlbpf9672442lzcw1p39vldywy4a1yj2mcwmbsqhpjlnzalw4l",
+ "fetcher": "github",
+ "repo": "Lindydancer/gameoflife",
+ "unstable": {
+ "version": [
+ 20200614,
+ 1814
+ ],
+ "commit": "2483f3d98dbcf7f1633f551cc3691f5659b4b942",
+ "sha256": "1a57fc8ylrdlqlywp81b71jd93hiwkxy6gxpi8358d6d4czslvq7"
+ }
+ },
{
"ename": "gams-ac",
"commit": "ca2681b39ac5a985c2f70b4b84ee3c10af1a7ca4",
@@ -37188,20 +37895,20 @@
"repo": "GDQuest/emacs-gdscript-mode",
"unstable": {
"version": [
- 20200427,
- 1514
+ 20200726,
+ 1721
],
- "commit": "0718ca9b090780bd28d02ef5c79cd0e7c5a84d5e",
- "sha256": "0wdsfakx50x60lxb6d46h9rhb1vrisch71fmdl1c8jiwf57q5kpn"
+ "commit": "7aea87bd7b3cd14b1a767e7d835cee896722cd29",
+ "sha256": "1cq2k054ngqwanayy7fgkqdb5fq6xcqdglpyxngqmh765lyb7nrb"
},
"stable": {
"version": [
1,
- 1,
+ 2,
0
],
- "commit": "86577f81dc2640d5388565d0430b4df241bdd38e",
- "sha256": "0cpfdbza3gh1s6y5igs51b1m7g7dfa7jszjfawz3v2g49p4a5m2d"
+ "commit": "36c92dff1587d7c3c7ff2cd02d8e158cbed55215",
+ "sha256": "02by4bvdayldbjlz6jkp36m5rgcy2h5bwhqx2cj7wma6xf6cw3lf"
}
},
{
@@ -37289,20 +37996,49 @@
"repo": "jaor/geiser",
"unstable": {
"version": [
- 20200513,
- 1219
+ 20200714,
+ 1210
],
- "commit": "7a39c8eb7ca2a0a4fe0ad307ea55578e11e6dfdd",
- "sha256": "09lv9ixgrkb351nb67nas5yfa8vk0rz4ljhc1hxxn4g451hbd14f"
+ "commit": "adc5c4ab5ff33cf94cb3fcd892bb9503b5fa2aa2",
+ "sha256": "0n718xpys7v94zaf9lpmsx97qgn6qxif1acr718wyvpmfr4hiv08"
},
"stable": {
"version": [
0,
- 11,
+ 12
+ ],
+ "commit": "adc5c4ab5ff33cf94cb3fcd892bb9503b5fa2aa2",
+ "sha256": "0n718xpys7v94zaf9lpmsx97qgn6qxif1acr718wyvpmfr4hiv08"
+ }
+ },
+ {
+ "ename": "geiser-gauche",
+ "commit": "1cb02b836748f31be26013d2e43ada6d68f35c90",
+ "sha256": "1fbhfaz304bfzq7m75kifpfxb69zx4ymnvanfv7lnmbx6fqqfrqp",
+ "fetcher": "gitlab",
+ "repo": "emacs-geiser/gauche",
+ "unstable": {
+ "version": [
+ 20200802,
+ 1300
+ ],
+ "deps": [
+ "geiser"
+ ],
+ "commit": "66e51430bded0f0e2037f474818a7bbaafb2906c",
+ "sha256": "1gsvl0r6r385lkv0z4gkxirz9as6k0ghmk402zsyz8gvdpl0f3jw"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
2
],
- "commit": "51252bcb35d6afe006487b73c1e2276210b4ed83",
- "sha256": "1khi1bghsjx6cs5acizmlbw9z19s4qycnji9krdbn42cbpv0rysv"
+ "deps": [
+ "geiser"
+ ],
+ "commit": "9e7ed54e5629f759660569bc7efc3d75dbabbc5f",
+ "sha256": "0rxncnzx7qgcpvc8nz0sd8r0hwrplazzraahdwhbpq0q6z8ywqgg"
}
},
{
@@ -37323,6 +38059,21 @@
"sha256": "0j2djjgfd4hd2k60ymgxzpsy52ks6hxpd4rr81z5nh9fdg9axhrs"
}
},
+ {
+ "ename": "gemini-mode",
+ "commit": "2cc0e9039171064cd0fb37b3eb5324c91a88ef7a",
+ "sha256": "1mbhv034jk4bwi58z6jc2r4d828v0ir3jwqpgi2mfjnjxk5x5ga5",
+ "fetcher": "git",
+ "url": "http://git.carcosa.net/jmcbray/gemini.el.git",
+ "unstable": {
+ "version": [
+ 20200813,
+ 1424
+ ],
+ "commit": "d114bacfb12f9e66821254ff0a1fb85443700b24",
+ "sha256": "0m7jricw40h4r30kcg60dl2ybgrdbiglnb55lz3n70bc5nsx8dcd"
+ }
+ },
{
"ename": "general",
"commit": "d86383b443622d78f6d8ff7b8ac74c8d72879d26",
@@ -37456,8 +38207,8 @@
"repo": "thisch/gerrit.el",
"unstable": {
"version": [
- 20200226,
- 2137
+ 20200727,
+ 2006
],
"deps": [
"dash",
@@ -37465,8 +38216,8 @@
"magit",
"s"
],
- "commit": "36870fd34ad681f907a57a2d82b2002735878614",
- "sha256": "0h9v4ajp50wpg3zz0p7klyi705ynfy2mka0hpzz81kgpq8q8f46z"
+ "commit": "eb4b182e493a6d5d3e94c9ff5abe0a0206b03c7c",
+ "sha256": "16v043avd9sm0rq7951x7045zfxhiadq2q056grkjgcpy2id45lw"
}
},
{
@@ -37603,10 +38354,10 @@
},
{
"ename": "gh-md",
- "commit": "2794e59d5fea812ce5b376d3d9609f50f6bca40e",
- "sha256": "0b72fl1hj7gkqlqrr8hklq0w3ryqqqfn5qpb7a9i6q0vh98652xm",
+ "commit": "b38908bc1b759b14173ffb49ddeb040a9892cc0d",
+ "sha256": "11bbicmv15qfh4s5bpgvbnc6v9v1hdh6y0clii5k8jv4p1nxfix4",
"fetcher": "github",
- "repo": "emacs-pe/gh-md.el",
+ "repo": "emacsorphanage/gh-md",
"unstable": {
"version": [
20151207,
@@ -37754,28 +38505,28 @@
"repo": "magit/ghub",
"unstable": {
"version": [
- 20200425,
- 2233
+ 20200801,
+ 815
],
"deps": [
"let-alist",
"treepy"
],
- "commit": "206f2b5b2ab622efda8da85feaa3bc2a1e0f3da3",
- "sha256": "132y2yi9c91p25cwnvb9w6jj7la6fdc0xlvnxmbnfnxaic4jyhs3"
+ "commit": "942e7bdabc4b938a0535530c26eb6548504fca24",
+ "sha256": "07iy4203ppvzkh67sb0v968hnypnvy4dpfy0qpqrp8zmc455dxq5"
},
"stable": {
"version": [
3,
- 3,
- 0
+ 4,
+ 1
],
"deps": [
"let-alist",
"treepy"
],
- "commit": "eec071aa9e2810c8ce2f2522e6be8d78f579069d",
- "sha256": "1229g0d9f4ywwjndx32x4z5jdr0kzyi44hjxmy0sifwfmg9nn251"
+ "commit": "942e7bdabc4b938a0535530c26eb6548504fca24",
+ "sha256": "07iy4203ppvzkh67sb0v968hnypnvy4dpfy0qpqrp8zmc455dxq5"
}
},
{
@@ -37984,11 +38735,11 @@
"repo": "ryuslash/git-auto-commit-mode",
"unstable": {
"version": [
- 20200322,
- 2007
+ 20200801,
+ 748
],
- "commit": "dd0c2441de0f5ff8c69c8260d9450d0b607e3e55",
- "sha256": "0r7jry1sbqsp7c1vxf7fchc7ivmnccfrflg52379v3gmpvd8s0kn"
+ "commit": "d4fd94320610100f23de083493d12de3324304b5",
+ "sha256": "180rzh53hrd374nf96cz8n6brxvi68fgss21ic5r623hkczhi73b"
},
"stable": {
"version": [
@@ -38038,15 +38789,15 @@
"repo": "walseb/git-backup-ivy",
"unstable": {
"version": [
- 20200424,
- 1049
+ 20200709,
+ 818
],
"deps": [
"git-backup",
"ivy"
],
- "commit": "d9361c9ad903e0d58f25ccebad99d9a753f1937a",
- "sha256": "0jkkajv0scbp91al18fqqyvvcda2z6wkkbz0p1rcwzap5g96b7ag"
+ "commit": "0a5c52e64d0062f77ffefc9213e75690c6d7b111",
+ "sha256": "060x20c4q7cr5zrfsa28z2zgr6isfb2y2ys450h46a9yi3w9h60f"
}
},
{
@@ -38105,16 +38856,16 @@
"repo": "magit/magit",
"unstable": {
"version": [
- 20200207,
- 1819
+ 20200701,
+ 2112
],
"deps": [
"dash",
"transient",
"with-editor"
],
- "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc",
- "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg"
+ "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe",
+ "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n"
},
"stable": {
"version": [
@@ -38312,16 +39063,16 @@
"repo": "akirak/git-identity.el",
"unstable": {
"version": [
- 20200124,
- 1856
+ 20200810,
+ 1106
],
"deps": [
"dash",
"f",
"hydra"
],
- "commit": "8471e6f8ef6c502dc999e513b552d6b23974d40d",
- "sha256": "1w4dnrc0dq0brdq0dpk5lj7ji50v5b7q32f1ghkvx50i7a3dslvq"
+ "commit": "6bf8b2cd72061eac5a4d247ba2fabdd8deafdea7",
+ "sha256": "1p6if6fvz6m7nnd7fl1j2dxg830ax06ln9wvm5anpsdky0lqwqyr"
},
"stable": {
"version": [
@@ -38385,20 +39136,20 @@
"repo": "sshaw/git-link",
"unstable": {
"version": [
- 20200331,
- 2329
+ 20200721,
+ 2250
],
- "commit": "7142ec898f0cb97aa5d1a68da7957b4710bbfa87",
- "sha256": "0xcgzhlxd7ycfxmbgkwm04pdfjysygkka3jis4p45zy6mrackn4c"
+ "commit": "cbaf7033edad8d4712b6e7dc11cad979c6a002de",
+ "sha256": "074xqp1apcrmnh2cb9m60gaq78hzybyg5sr09n37ka0sw447rp15"
},
"stable": {
"version": [
0,
- 7,
- 5
+ 8,
+ 0
],
- "commit": "267bd81c228bdab434172dbef896f3f3b82713fa",
- "sha256": "04xa6lp8wkjb6zs096bf4sz124grcjj15xv1h009bmn2j95rggj6"
+ "commit": "2f61413bec5d94b068140a764ba8c2a732ac8d58",
+ "sha256": "1cj04nzqxwvi1f97y36n311nayj31y3iy7kysb31nlfn19y2g4wj"
}
},
{
@@ -38496,14 +39247,14 @@
"repo": "pidu/git-timemachine",
"unstable": {
"version": [
- 20190730,
- 849
+ 20200603,
+ 701
],
"deps": [
"transient"
],
- "commit": "391eb61050de321101e631fcf373fc70ec6e7700",
- "sha256": "1pz4l1xnq6s67w5yq9107vm8dg7rqf8n9dmbn90jys97c722g70n"
+ "commit": "8d675750e921a047707fcdc36d84f8439b19a907",
+ "sha256": "1ppids836gdk5j8cli8wkzkjb85f4s1s550v5xpxyyq75rj1bnsr"
},
"stable": {
"version": [
@@ -38753,11 +39504,20 @@
"repo": "TxGVNN/github-explorer",
"unstable": {
"version": [
- 20190701,
- 630
+ 20200803,
+ 1445
+ ],
+ "commit": "e6bdc500dd9b580ed12a54d18600f5db541b38b8",
+ "sha256": "1a9hnmx1q7fxyyxn0ji2mcam6wz8rwxi7a71f5542l65ah20gg1r"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
],
- "commit": "e3a410dd1113bdff382a745465ea48d9b1fe860b",
- "sha256": "1yq9bsy2qry49q1asdxnfyhahsp499b37l2yabwhpbxjlb7mmnp6"
+ "commit": "e6bdc500dd9b580ed12a54d18600f5db541b38b8",
+ "sha256": "1a9hnmx1q7fxyyxn0ji2mcam6wz8rwxi7a71f5542l65ah20gg1r"
}
},
{
@@ -38850,8 +39610,8 @@
"ghub",
"s"
],
- "commit": "50c6bcc7cf4d7193577b3f74eea4dd72f2b7795b",
- "sha256": "0khsxsqzx81y5krj06i8v84qsb3z86b1z17knyr1xizrd2lmraqp"
+ "commit": "fab440aeae4fbf6a8192fd11795052e9eb5d27d1",
+ "sha256": "19kk55r0qixmvw1q80x3rnvcssrq64k5b5ixp8wjzpg6h65s9vk9"
}
},
{
@@ -39078,7 +39838,7 @@
"dash",
"helm"
],
- "commit": "a0ba22ae7098b1a57af626fe5b6e9d663e8e2fc3",
+ "commit": "782df679e33646db29e07508311bc8e8624b484e",
"sha256": "1mxkcnjgazc1pyjbqqfnhc9phpyrgah960avm2fmi7m9n5v8cf0w"
},
"stable": {
@@ -39198,11 +39958,11 @@
"url": "https://git.launchpad.net/global-tags.el",
"unstable": {
"version": [
- 20200511,
- 2146
+ 20200520,
+ 1816
],
- "commit": "5239c1ba873eb907d5665964820b4a7ddbf75b5c",
- "sha256": "0yp1hq849drkkbypaaak36i5s1q9ff549w21qswmi60nmiikabsg"
+ "commit": "f3c93828ab08895bf7eac8a2d3bfd949303a6d1f",
+ "sha256": "1ar9pgc31mfv2x26qpvsmiv2lnczfjliplnzjxnrmiccqiabp1y8"
}
},
{
@@ -39514,8 +40274,8 @@
"repo": "deusmax/gnus-notes",
"unstable": {
"version": [
- 20200509,
- 1942
+ 20200605,
+ 1421
],
"deps": [
"async",
@@ -39526,17 +40286,26 @@
"org",
"s"
],
- "commit": "c5c057263ecc86f60b62a1e811e63cfb1c394c15",
- "sha256": "1rfkc6pp2kkin87hbjz1192hb6hf24ygiyd6zigs3bfaxja313rp"
+ "commit": "2b587ac2e428fe3805443df5306e67d78bdf8ec2",
+ "sha256": "0r08dhc6w2zk8is738qd6rkpq03n1fnfr398lsqgn2jaizgsik0l"
},
"stable": {
"version": [
0,
3,
- 1
+ 2
+ ],
+ "deps": [
+ "async",
+ "bbdb",
+ "helm",
+ "hydra",
+ "lv",
+ "org",
+ "s"
],
- "commit": "8373615b1b5945db485ab18205fdd1077ee0a506",
- "sha256": "10ddsw1idyn1w2w92gs6i7a14hq347qib521vk7yqb9s4qyxg1fg"
+ "commit": "56403ee22242fd479c2aff85f4cf4133e32ca90a",
+ "sha256": "0g26ygcmbcmxbafvyw04xcqzg2dlava2rqa5m2lv0cxyi6rnvdhj"
}
},
{
@@ -39729,11 +40498,11 @@
"url": "https://git.sr.ht/~zge/go-capf",
"unstable": {
"version": [
- 20200216,
- 936
+ 20200814,
+ 1046
],
- "commit": "9e66ce4ef4307e9f0e73e65f6bb2f287ed2c940b",
- "sha256": "1sgsxd511xw1g707c0d58j3xzxfbay7k5b7hyamd2fnh30pw2hb3"
+ "commit": "acc353135f390245453f0d90f5846f67b0a84952",
+ "sha256": "1hb8glprzpm94bsyx2mnv9w6b825y451agpqh2ry8ngydbc1llhi"
},
"stable": {
"version": [
@@ -39803,26 +40572,26 @@
"repo": "benma/go-dlv.el",
"unstable": {
"version": [
- 20191005,
- 829
+ 20200713,
+ 1202
],
"deps": [
"go-mode"
],
- "commit": "d3cca689e76b71e0ef0ab827c7e01cd9042d2095",
- "sha256": "0qdbfg9ihxwywjyir3lj1azwsaw425f90gp3182q7165j5v43k9w"
+ "commit": "69b86c1bdb73d78fb3404f2f1eefbc9a93b1aba6",
+ "sha256": "1ww91sw15qnwrglz9q37vxm5qxxa43ccpyczz7kkjp66qs6746wh"
},
"stable": {
"version": [
0,
- 3,
+ 4,
0
],
"deps": [
"go-mode"
],
- "commit": "d3cca689e76b71e0ef0ab827c7e01cd9042d2095",
- "sha256": "0qdbfg9ihxwywjyir3lj1azwsaw425f90gp3182q7165j5v43k9w"
+ "commit": "69b86c1bdb73d78fb3404f2f1eefbc9a93b1aba6",
+ "sha256": "1ww91sw15qnwrglz9q37vxm5qxxa43ccpyczz7kkjp66qs6746wh"
}
},
{
@@ -39878,6 +40647,21 @@
"sha256": "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3"
}
},
+ {
+ "ename": "go-expr-completion",
+ "commit": "8d09efb2e93fefd5158685084691ccf20178fe78",
+ "sha256": "1fhcwwv377zahg6nh9v9vigb7pqnm6r0fwvfa6fd5j81vffivaww",
+ "fetcher": "github",
+ "repo": "fujimisakari/emacs-go-expr-completion",
+ "unstable": {
+ "version": [
+ 20200817,
+ 1750
+ ],
+ "commit": "66bba78f52a732b978848e3a4c99fa2afeb6c25f",
+ "sha256": "0gbxgf36p24gjh9n5swmvyzl4h518lx63zyf0b80xnrvb7d5qi46"
+ }
+ },
{
"ename": "go-fill-struct",
"commit": "0c03d2382efd20e248b27b5505cdeed67d000f73",
@@ -40084,28 +40868,27 @@
"repo": "grafov/go-playground",
"unstable": {
"version": [
- 20190625,
- 1855
+ 20200818,
+ 2215
],
"deps": [
"go-mode",
"gotest"
],
- "commit": "508294fbc22b22b37f587b2dbc8f3a48a16a07a6",
- "sha256": "18vsrckkazfzksjpyx1lbwg5hdgd43ndaj3csy3i3hk7p26x98lm"
+ "commit": "ede417a52c0eea1a69658f4c6c6c12d6165e64a4",
+ "sha256": "1zzdkp6zqh03gfiirmvwv5c8s9m4511zcaya9cp5sjzmh0g5wjip"
},
"stable": {
"version": [
1,
- 6,
- 1
+ 7
],
"deps": [
"go-mode",
"gotest"
],
- "commit": "508294fbc22b22b37f587b2dbc8f3a48a16a07a6",
- "sha256": "18vsrckkazfzksjpyx1lbwg5hdgd43ndaj3csy3i3hk7p26x98lm"
+ "commit": "ede417a52c0eea1a69658f4c6c6c12d6165e64a4",
+ "sha256": "1zzdkp6zqh03gfiirmvwv5c8s9m4511zcaya9cp5sjzmh0g5wjip"
}
},
{
@@ -40140,18 +40923,19 @@
"repo": "dougm/go-projectile",
"unstable": {
"version": [
- 20181023,
- 2144
+ 20200609,
+ 131
],
"deps": [
+ "dash",
"go-eldoc",
"go-guru",
"go-mode",
"go-rename",
"projectile"
],
- "commit": "7910884b4de560f3fc70b53752f658ef9cdc02cd",
- "sha256": "03bh8k95qrc3q1sja05bbv3jszh6rgdv56jpi8g06yxk53457a1n"
+ "commit": "ad4ca3b5695a0e31e95e3cc4ccab498f87d68303",
+ "sha256": "1ai34z7n56cczz6qb0vbcrqbjrkmxwv9r928pjbw58812nycj1mh"
}
},
{
@@ -40300,20 +41084,20 @@
"repo": "emacsorphanage/god-mode",
"unstable": {
"version": [
- 20200413,
- 2144
+ 20200708,
+ 2200
],
- "commit": "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7",
- "sha256": "0kqw6w72prhxbqvxccbrc80q82yfif0y99nfgqd60rfk9mpl369k"
+ "commit": "ad2e6745294843462f78768b5a1cd3b0d3563951",
+ "sha256": "00v69c76737yfmy3injhf6l1khj67rr0xvpq0yyjxg4hh9dv4j90"
},
"stable": {
"version": [
2,
- 16,
+ 17,
2
],
- "commit": "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7",
- "sha256": "0kqw6w72prhxbqvxccbrc80q82yfif0y99nfgqd60rfk9mpl369k"
+ "commit": "2e519312fdef36dea523aa530d134a703d3032a6",
+ "sha256": "1gnwl81immxdq72hsxgic2631r4jsq9pv5jqh0jzji0q320m9xcl"
}
},
{
@@ -40404,14 +41188,14 @@
"repo": "stardiviner/goldendict.el",
"unstable": {
"version": [
- 20180121,
- 920
+ 20200731,
+ 1119
],
"deps": [
"cl-lib"
],
- "commit": "1aac19daaec811deb9afe45eea4929309c09ac8b",
- "sha256": "1il432f6ayj2whl4s804n5wykgs51jhbx4xkcbfgqra58cbjrjhi"
+ "commit": "ad5212f6ade58c193287851a46c3f9378fe2f059",
+ "sha256": "0lgdrrch9rn23jd90rpcs5zxrv279ds3g9rzq5whl19410dbjamm"
}
},
{
@@ -40488,8 +41272,8 @@
20180130,
1736
],
- "commit": "7a59e424c8e641605e30eed68197859533ea6aaf",
- "sha256": "1w9hf7bcdd5ddjavhj0ggnxipf5f5w3cfj52n9i46jmm6g2x2b5g"
+ "commit": "25e977d641fc204a38263a2272f92307c545121b",
+ "sha256": "1dgna85s3gwb0a2504min4ch0xih4ygnv8ia2jvx3wyxgn436z1x"
}
},
{
@@ -40566,20 +41350,20 @@
"repo": "atykhonov/google-translate",
"unstable": {
"version": [
- 20190620,
- 1416
+ 20200809,
+ 1430
],
- "commit": "dc118de511c433750d4c98b9dd67350118c04fd6",
- "sha256": "1kbiqisqyk31l94gxsirhnrdkj51ylgcb16fk2wf7zigmf13jqzp"
+ "commit": "0ab218f9e1a620af7b4b22d9c82b8d83ff5f4606",
+ "sha256": "1z0jbjgjnb36cj14l6khnxmrcfvbmlw89sc9dbkw6j7a3k51nlc0"
},
"stable": {
"version": [
0,
- 11,
- 18
+ 12,
+ 0
],
- "commit": "dc118de511c433750d4c98b9dd67350118c04fd6",
- "sha256": "1kbiqisqyk31l94gxsirhnrdkj51ylgcb16fk2wf7zigmf13jqzp"
+ "commit": "ba027ff85352b989abac29b0efba1811b870ebec",
+ "sha256": "0rwpij2bm8d4jq2w5snkp88mfryplw8166dsrjm407n2p6xr48zx"
}
},
{
@@ -40728,20 +41512,20 @@
"repo": "jcs-elpa/goto-char-preview",
"unstable": {
"version": [
- 20190418,
- 829
+ 20200717,
+ 730
],
- "commit": "c0209143fbeafcc9ba93bc2333dd08e72211fa20",
- "sha256": "15plzc33vyhmfm7bxhvnfr25yvjj6fdr1zp2dvsj8jryj4gb6gkz"
+ "commit": "11fb6b8c77c6191f839f86afc8c8ca3341919058",
+ "sha256": "14wcz9azp1c66jz1wz75v0ijbsk5hjmchcm36k7phbn3hjag99ji"
},
"stable": {
"version": [
0,
0,
- 1
+ 2
],
- "commit": "366cf84c30fc8e675e9cbab1091ead6f3cd0d399",
- "sha256": "1y2ay0r0rqayvw8wlbf8advjbhvzz7sa16k272mxszxzp7xmnr71"
+ "commit": "446e5236227d6b3f180be2eb5ef2209aef947553",
+ "sha256": "0dd5iq9xkvqavabipg1iz9zk1rnz830grhzw0z1l89b1vvgzpd62"
}
},
{
@@ -40752,14 +41536,14 @@
"repo": "emacs-evil/goto-chg",
"unstable": {
"version": [
- 20190110,
- 2114
+ 20200603,
+ 1911
],
"deps": [
"undo-tree"
],
- "commit": "1829a13026c597e358f716d2c7793202458120b5",
- "sha256": "1y603maw9xwdj3qiarmf1bp13461f9f5ackzicsbynl0i9la3qki"
+ "commit": "85fca9f7d8b04be3fbb37cc5d42416f3c4d32830",
+ "sha256": "0laq44dfwcdhphrkwsklxa0146sl9y841mmjwn5gc0z4d5npz0ql"
},
"stable": {
"version": [
@@ -40818,20 +41602,20 @@
"repo": "jcs-elpa/goto-line-preview",
"unstable": {
"version": [
- 20190308,
- 736
+ 20200717,
+ 733
],
- "commit": "1f0afb261a4e4a1b0a2fae3959b0ce5d30bce2a1",
- "sha256": "03csbs9mh9jjw21sncvnlmm97waazy0c57jp1jynwhzzsbp0k0rs"
+ "commit": "b1df7fe72b0281704d277a69dfd9e2b8214a328b",
+ "sha256": "00862y6r5xbq5crb581xh1b18dqigc8k42di9mjc6zvslxq8n6qd"
},
"stable": {
"version": [
0,
0,
- 5
+ 6
],
- "commit": "772fb942777a321b4698add1b94cff157f23a93b",
- "sha256": "16zil8kjv7lfmy11g88p1cm24j9db319fgkwzsgf2vzp1m15l0pc"
+ "commit": "a4173abfffda03ad27e695a316adfe560a97f00e",
+ "sha256": "0bh70d2isl3kdzxyidjrxhs7sh8rqr8cmdwil7ksp9a28mz3l55p"
}
},
{
@@ -40851,14 +41635,14 @@
"magit-popup",
"s"
],
- "commit": "0c56c1e833bc9e21b603539a19bdfe4836a197ed",
- "sha256": "0iaa34hh0zpy9alf0d6bad7qwk565l9k5k09ig342pwnmigz1scs"
+ "commit": "609218c5232673cec215d088eb01d043120de385",
+ "sha256": "0wg2sn5zfcsdnv6ymy0a13px7j6pkgmdd9dpss98l70xf3b6g590"
},
"stable": {
"version": [
0,
- 22,
- 2
+ 23,
+ 1
],
"deps": [
"dash",
@@ -40866,8 +41650,8 @@
"magit-popup",
"s"
],
- "commit": "e7df0c1118c15c0b35fe08f183ca084269ea6542",
- "sha256": "0lm1jaw5bpz7z4gibbbhswjr7qdhxkgbawr5bnykprsmp663i3nm"
+ "commit": "cfbe1d59b449be9b5378251bc6e52c65bc5e1cbd",
+ "sha256": "05f6i7v8v9g3w3cmz8c952djl652mj6qcwjx9iyl23h6knd1d9b1"
}
},
{
@@ -40917,19 +41701,19 @@
"repo": "xuchunyang/grab-mac-link.el",
"unstable": {
"version": [
- 20190419,
- 1307
+ 20200712,
+ 428
],
- "commit": "b52d29cd78a60cfe874667a8987ed10e8eb0f172",
- "sha256": "15qznll0358cgqb9m9hpr2if2rsskr29mpsg7h32xb6njqnn741m"
+ "commit": "9b47cbe126a0735fa447a3c5e1e8ba80a7ef8d26",
+ "sha256": "1hx3a6sfc3ah3xgwii0l0jvshgbw0fjwsyrmb4sri0k8cla7fwin"
},
"stable": {
"version": [
0,
- 2
+ 3
],
- "commit": "8bf05a69758fd10a4303c5c458cd91a49ab8b1b2",
- "sha256": "12x47k3mm5hvhgn7fmfi7bqfa3naz8w1sx6fl3rmnbzvldb89i1k"
+ "commit": "9b47cbe126a0735fa447a3c5e1e8ba80a7ef8d26",
+ "sha256": "1hx3a6sfc3ah3xgwii0l0jvshgbw0fjwsyrmb4sri0k8cla7fwin"
}
},
{
@@ -40999,20 +41783,20 @@
"repo": "lifeisfoo/emacs-grails",
"unstable": {
"version": [
- 20160417,
- 636
+ 20200519,
+ 1909
],
- "commit": "fa638abe5c37f3f8af4fcd32f212453185ce50b1",
- "sha256": "1npsjniazaq20vz3kvwr8p30ivc6x24r9a16rfcwhr5wjx3nn91b"
+ "commit": "d47273a619d6731683afe60636259b02e2c78a2e",
+ "sha256": "1j2sd51bnn6ngz5sd01akmrnh9938g7v1fh6mxq4lbzjwgnzbvgy"
},
"stable": {
"version": [
0,
4,
- 1
+ 2
],
- "commit": "fa638abe5c37f3f8af4fcd32f212453185ce50b1",
- "sha256": "1npsjniazaq20vz3kvwr8p30ivc6x24r9a16rfcwhr5wjx3nn91b"
+ "commit": "d47273a619d6731683afe60636259b02e2c78a2e",
+ "sha256": "1j2sd51bnn6ngz5sd01akmrnh9938g7v1fh6mxq4lbzjwgnzbvgy"
}
},
{
@@ -41026,8 +41810,8 @@
20160504,
911
],
- "commit": "cafdd98e06a3bbff213f3ccb163de2c42d412b66",
- "sha256": "07809alyxind4n0rb1h3x19hgq7ihpn128xljlz38d9xvp0r48z3"
+ "commit": "26da902d1158c0312628d57578109be54eca2415",
+ "sha256": "113s9znqrdi9zm045hi3ws5ixrd0bzxfy3wr8lzxq9r3jbv67iz2"
},
"stable": {
"version": [
@@ -41078,32 +41862,30 @@
"repo": "jcs-elpa/grammarly",
"unstable": {
"version": [
- 20200126,
- 420
+ 20200720,
+ 948
],
"deps": [
- "cl-lib",
"request",
"s",
"websocket"
],
- "commit": "709bf3124b6e130efcede8b38fc2fed38699e19b",
- "sha256": "1lz74qqzznv5c6pnsnnp0x0k16q663pkqakvwpg69lavcg68ysxh"
+ "commit": "d597c5d71bc64f5a91e96c707d7471bceaa84075",
+ "sha256": "073rv64m14llav59b2y73qcw7z5p0b537aa46chxf2bxq93lb4vf"
},
"stable": {
"version": [
0,
1,
- 2
+ 3
],
"deps": [
- "cl-lib",
"request",
"s",
"websocket"
],
- "commit": "cd2e75f21989a586c9cc71540fc6e3b5df8a5ce0",
- "sha256": "1v7lwwx9iyksh5aaav97vd5pm07k93fkv5v4h96s8i3hyrbcgd74"
+ "commit": "d597c5d71bc64f5a91e96c707d7471bceaa84075",
+ "sha256": "073rv64m14llav59b2y73qcw7z5p0b537aa46chxf2bxq93lb4vf"
}
},
{
@@ -41358,20 +42140,20 @@
"repo": "fredcamps/green-is-the-new-black-emacs",
"unstable": {
"version": [
- 20190724,
- 1252
+ 20200529,
+ 242
],
- "commit": "34f0372878a07a23bf1d9418aa380c403d272457",
- "sha256": "1gfp5n4lknbw2p5wik0kq5i80p90x9gwd1zif7sjz5g3ximmgg04"
+ "commit": "9b682c0000bc732e4c55e876ac968877eada0402",
+ "sha256": "0yilp68qw2a4z8b8mmr2yl2lmwkd3ibk6j5ix6x3vlcmfmrfl3bj"
},
"stable": {
"version": [
+ 1,
0,
- 5,
0
],
- "commit": "34f0372878a07a23bf1d9418aa380c403d272457",
- "sha256": "1gfp5n4lknbw2p5wik0kq5i80p90x9gwd1zif7sjz5g3ximmgg04"
+ "commit": "9b682c0000bc732e4c55e876ac968877eada0402",
+ "sha256": "0yilp68qw2a4z8b8mmr2yl2lmwkd3ibk6j5ix6x3vlcmfmrfl3bj"
}
},
{
@@ -41443,38 +42225,6 @@
"sha256": "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw"
}
},
- {
- "ename": "grep-context",
- "commit": "41dbaf627ae4ef86c222d2b6b5d3523fdb9a4637",
- "sha256": "175s9asbnk2wlgpzc5izcd3vlfvdj064n38myy9qf4awn12c2y1g",
- "fetcher": "github",
- "repo": "mkcms/grep-context",
- "unstable": {
- "version": [
- 20181002,
- 1654
- ],
- "deps": [
- "cl-lib",
- "dash"
- ],
- "commit": "58f6edc18510d871e4f5ef63ef60665cbc204e96",
- "sha256": "04mk5wi2i4mx58mfzl4zk10lm58yliczsw5vpxqmikz8gbripqqx"
- },
- "stable": {
- "version": [
- 0,
- 1,
- 0
- ],
- "deps": [
- "cl-lib",
- "dash"
- ],
- "commit": "4c63d0f2654dee1e249c2054d118d674a757bd45",
- "sha256": "0n2bc9q6bvbfpaqivp3ajy9ad1wr7hfdd98qhnspsap67p73kfn4"
- }
- },
{
"ename": "greymatters-theme",
"commit": "d13621f3033b180d06852d90bd3ebe03276031f5",
@@ -41498,11 +42248,11 @@
"repo": "seagle0128/grip-mode",
"unstable": {
"version": [
- 20200312,
- 1136
+ 20200725,
+ 725
],
- "commit": "9615c4774727a719d38313a679d70f2a2c6aca68",
- "sha256": "01imyi1l33ng78m6c5g4pma5gy4j7jy7dwmqwsqgwbws08qdbwgr"
+ "commit": "281ada2c93bac7043c6f665fac065a17d4247bdc",
+ "sha256": "14gsmxpp8znk2w2yszdpwb8dx0hxbpy2rjr7rshs3bvqjib8rzyp"
},
"stable": {
"version": [
@@ -41587,8 +42337,8 @@
"dash",
"s"
],
- "commit": "cafdd98e06a3bbff213f3ccb163de2c42d412b66",
- "sha256": "07809alyxind4n0rb1h3x19hgq7ihpn128xljlz38d9xvp0r48z3"
+ "commit": "26da902d1158c0312628d57578109be54eca2415",
+ "sha256": "113s9znqrdi9zm045hi3ws5ixrd0bzxfy3wr8lzxq9r3jbv67iz2"
},
"stable": {
"version": [
@@ -41625,6 +42375,30 @@
"sha256": "14h0rcd3nkw3pmx8jwip20p6rzl9qdkip5g52gfjjbqfvaffsrkd"
}
},
+ {
+ "ename": "grugru",
+ "commit": "eb55452f19b8f33605ca1b0cb5d93e00ff4cf3f5",
+ "sha256": "0zrcx6097hjdrr3b5fagm77h6fl5ys0djk8h70gkzvc2cc4sdim2",
+ "fetcher": "github",
+ "repo": "ROCKTAKEY/grugru",
+ "unstable": {
+ "version": [
+ 20200810,
+ 1411
+ ],
+ "commit": "2f304daa39df10ebe9e4cb982af5343bca252c6d",
+ "sha256": "1bry2iqab6shyhlmka7334yqc5k4c9hl1qrigz2p9km9hv45r7hw"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 10,
+ 0
+ ],
+ "commit": "d71007802389028a70d0ccbf5c57330241add7cc",
+ "sha256": "1gr8jdm8g7cxysf1f83mkfwp3la6bcd08r8gw5v9ms4k217nx2is"
+ }
+ },
{
"ename": "grunt",
"commit": "acc9b816796b9f142c53f90593952b43c962d2d8",
@@ -41665,14 +42439,14 @@
"repo": "greduan/emacs-theme-gruvbox",
"unstable": {
"version": [
- 20200514,
- 740
+ 20200807,
+ 855
],
"deps": [
"autothemer"
],
- "commit": "f1dfcd8bd50e4885cab71b174bbc6a620c2b9d7f",
- "sha256": "106vkpm75s3s52bkmcnjlw8gx3qlh5hffwvj2bvkmqfcgnxpzgx0"
+ "commit": "746a5f36cf4ff3959f2d007598d5cb248cfc1879",
+ "sha256": "1j66ffg1xl37nggckm38fmapxm0v7bycvpggxdx0s8q7hqlikk9f"
},
"stable": {
"version": [
@@ -41807,14 +42581,14 @@
"repo": "tmalsburg/guess-language.el",
"unstable": {
"version": [
- 20200326,
- 1725
+ 20200707,
+ 1058
],
"deps": [
"cl-lib"
],
- "commit": "f4ce91eba3c479d08fedf0a3ced6c1265a7838ca",
- "sha256": "0z7agqi5sgjjidhmnrv7615737xk7p1s6pdhr6swjcr117dq44fm"
+ "commit": "256230072f4f828e07db6ab17b6b7e90891b7308",
+ "sha256": "0yqvrd7b43ibzszzcw8zg0ifqz7v4ply5wdgq1zclk3xgsn9n3pr"
}
},
{
@@ -41889,8 +42663,8 @@
"repo": "alezost/guix.el",
"unstable": {
"version": [
- 20200510,
- 1613
+ 20200730,
+ 930
],
"deps": [
"bui",
@@ -41899,8 +42673,8 @@
"geiser",
"magit-popup"
],
- "commit": "0b8f75124372266bfab32e8d1fa114f33ea24e6f",
- "sha256": "17i0rivgixkg18qiqw5a47ahli9vpc9p5yhd9s9j3jmf1jlzq4bf"
+ "commit": "58a840d0671091e3064e36244790ef8839da87d6",
+ "sha256": "1qnr5sixmvrhr9rinrhfy7sy20mikjvvwbdixwkbx30qpcdwgwj1"
},
"stable": {
"version": [
@@ -41942,19 +42716,19 @@
"repo": "bbatsov/guru-mode",
"unstable": {
"version": [
- 20170730,
- 731
+ 20200708,
+ 728
],
- "commit": "c180e05ebc1484764aad245c85b69de779826e4e",
- "sha256": "0qb6yr6vbic0rh8ayrpbz5byq7jxmwm1fc9l4alpz7dhyb11z07v"
+ "commit": "9d0aff6cda6d3d78d5102f07f813b9fca6f0ab7b",
+ "sha256": "1ja98di2iwjp0l4ndh22pwm7s56753kmz255xlv6vni2ai4rf8sm"
},
"stable": {
"version": [
- 0,
- 2
+ 1,
+ 0
],
- "commit": "62a9a0025249f2f8866b94683c4114c39f48e1fa",
- "sha256": "1y46qd9cgkfb0wp2cvksjncyp77hd2jnr4bm4zafqirc3qhbysx0"
+ "commit": "9d0aff6cda6d3d78d5102f07f813b9fca6f0ab7b",
+ "sha256": "1ja98di2iwjp0l4ndh22pwm7s56753kmz255xlv6vni2ai4rf8sm"
}
},
{
@@ -42066,14 +42840,14 @@
"repo": "hhvm/hack-mode",
"unstable": {
"version": [
- 20200421,
- 157
+ 20200526,
+ 2210
],
"deps": [
"s"
],
- "commit": "330df61f7297344cff9cf9e2d802a4d041279de3",
- "sha256": "00g9h96kb9d3qg544x9143hx4nc5crw67cq93ip4mrh3d86rkpc1"
+ "commit": "572c3b41bed91ea543434c04914a7a0c45fec7c7",
+ "sha256": "12r14846dpgn03h1gn58aff3p8swlp0zlajhzpqpzp2s7kvl0f6f"
},
"stable": {
"version": [
@@ -42119,23 +42893,20 @@
"repo": "clarete/hackernews.el",
"unstable": {
"version": [
- 20190529,
- 1120
+ 20200604,
+ 1557
],
- "commit": "2362d7b00e59da7caddc8c0adc24dccb42fddef9",
- "sha256": "1hcc5b173yzcvvd2ls3jxrmsw2w9bi21m9hcpcirkn0nh93ywadv"
+ "commit": "019a727b41e2726516841048a2b5b04f2ed2301a",
+ "sha256": "1b4vlk3l1mm8jz0kkyjbddfnx963vzsq4gprci8aw203fjnxhbdx"
},
"stable": {
"version": [
0,
- 5,
+ 6,
0
],
- "deps": [
- "json"
- ],
- "commit": "916c3da8da45c757f5ec2faeed57fa370513d4ac",
- "sha256": "09bxaaczana1cfvxyk9aagjvdszkj0j1yldl5r4xa60b59lxihsg"
+ "commit": "aec997970f2c2f8e0077c1f6584e4d1996ae3864",
+ "sha256": "15asarr271p582xbmhvhh9q0lgka25h6k65xh82rqvig4mirhn1l"
}
},
{
@@ -42517,11 +43288,11 @@
"repo": "haskell/haskell-mode",
"unstable": {
"version": [
- 20200408,
- 247
+ 20200531,
+ 2255
],
- "commit": "bbdbc0e9231f49a45ce787ebfb3f2b019615bf61",
- "sha256": "0qln2zc4zx8w4ffplp6b17sksg578x61hyvwv1l79pc8bmpgn0ww"
+ "commit": "41683c0e634bb3f54eac8747919a82132e1714fe",
+ "sha256": "1fxj11in90xvpbqhxx5c3qynkd8yfainpbf8cvdh3gdgpifrc0gg"
},
"stable": {
"version": [
@@ -42574,8 +43345,8 @@
20200513,
1950
],
- "commit": "0482f0de774c58bd7f2e079f5bf01781eed709a3",
- "sha256": "05hgxrmsrmg5i50zxs7pa2xnfn2sja09hdk8xjsalnbbjvn4mmxx"
+ "commit": "3239e814d6999f31ad845cc58df53395ad299059",
+ "sha256": "0319nr4l56p0d2gpybkc2lkkhwi6qmf2gjpgpajpcz11ms9m8x5z"
},
"stable": {
"version": [
@@ -42792,8 +43563,8 @@
20200315,
2129
],
- "commit": "c3d1158ad1a64f06aa8986ab1cdea6b7fbdd4bf7",
- "sha256": "0qza5pgpzcabik3592dk25glsv9zcg84pn1jzm43f9b1j9w5iv4i"
+ "commit": "e12b1df2ca28d2b06c471cd709c038a2dc0bcdbd",
+ "sha256": "05j97g2l4rdx35a435xpdpq1ixgf9j94828fx4yhh4g60fjwwb82"
},
"stable": {
"version": [
@@ -42851,30 +43622,30 @@
"repo": "emacs-helm/helm",
"unstable": {
"version": [
- 20200515,
- 715
+ 20200818,
+ 742
],
"deps": [
"async",
"helm-core",
"popup"
],
- "commit": "202bcb533e2feb25d63c64553afccefd9cfab262",
- "sha256": "0vn6420qjs04cwiq1bry0cj14i53w3zkyib4y6wyrnd709dfyzgp"
+ "commit": "e9a1e53c57478389343ee23ebb962c8b9b4b4bba",
+ "sha256": "1vw6qcpz71sb6xhjzlikr4l1q23sfbphlza4x4ma0gc7mfzyqfh0"
},
"stable": {
"version": [
3,
6,
- 1
+ 4
],
"deps": [
"async",
"helm-core",
"popup"
],
- "commit": "55281e1390bae54310dc880ae3805e0595d5c1bd",
- "sha256": "1sghq7xjd4a9ysh3cywd5rss9y47rwk82y86cwh1g7p0jv89gqaf"
+ "commit": "a3343a370975d9c01df4f1ff42875cc32ae89592",
+ "sha256": "0cl5awhq5py872qx9s30sfgfpfwjivwbsi18mgar8lj6lvs4s8zz"
}
},
{
@@ -42974,25 +43745,25 @@
"repo": "emacsorphanage/helm-ag",
"unstable": {
"version": [
- 20200516,
- 613
+ 20200811,
+ 1304
],
"deps": [
"helm"
],
- "commit": "ae1dbefa151544035272d04e56e0147185a847c5",
- "sha256": "03q29x63v500b3h4mj99h619ayifb12rrqiyyihm84i9lmgp5r28"
+ "commit": "4ee2174c4e27e02c75a487a235de4d80c663aa08",
+ "sha256": "1sc9ksfb3s5p5kqriz5402r785fklw3ykz8fb107xykl9kdjnzy3"
},
"stable": {
"version": [
0,
- 59
+ 62
],
"deps": [
"helm"
],
- "commit": "79373d7f1616d175a5e0730e1e0c3855f04bd945",
- "sha256": "0vsz2b5qw4qahlf74059z4p1grinhfz28f0psw4c3qf4jasv3b9j"
+ "commit": "08aaab53b8876caba619f956945a8152ece47182",
+ "sha256": "0xgbpp8xqdiyvfs64x0q909g77ml28z3irw2lnasvpsg0dfdm2zy"
}
},
{
@@ -43013,6 +43784,24 @@
"sha256": "1rifdkhzvf7xd2npban0i8v3rjcji69063dw9rs1d32w4n7fzlfa"
}
},
+ {
+ "ename": "helm-apt",
+ "commit": "5d3fec3e22c66091f0f71c2c9916755006b290f4",
+ "sha256": "11l35c08zs0ds0k8q8mr63446b0943i9yr85g9i6s1kdcsx96swc",
+ "fetcher": "github",
+ "repo": "emacs-helm/helm-apt",
+ "unstable": {
+ "version": [
+ 20200719,
+ 1131
+ ],
+ "deps": [
+ "helm"
+ ],
+ "commit": "f6204e2333881291b007e4859d9446994e988653",
+ "sha256": "08gxfby2i80nmzlbj39p0nnicg95swzjxc222wksvggfxvvln5f7"
+ }
+ },
{
"ename": "helm-aws",
"commit": "421182006b8af17dae8b5ad453cc11e2d990a053",
@@ -43368,16 +44157,15 @@
"repo": "emacs-jp/helm-c-yasnippet",
"unstable": {
"version": [
- 20170128,
- 1542
+ 20200520,
+ 1519
],
"deps": [
- "cl-lib",
"helm",
"yasnippet"
],
- "commit": "65ca732b510bfc31636708aebcfe4d2d845b59b0",
- "sha256": "1cbafjqlzxbg19xfdqsinsh7afq58gkf44rsg1qxfgm8g6zhr7f8"
+ "commit": "89cc8561e7e57e9d1070ee3641df019c7f49c5dd",
+ "sha256": "1b6wwz7j9alwmxmk3wvf862ynznkdm1jk5r456dn8ykkvfrs7nlv"
},
"stable": {
"version": [
@@ -43733,26 +44521,26 @@
"repo": "emacs-helm/helm",
"unstable": {
"version": [
- 20200514,
- 644
+ 20200803,
+ 1032
],
"deps": [
"async"
],
- "commit": "202bcb533e2feb25d63c64553afccefd9cfab262",
- "sha256": "0vn6420qjs04cwiq1bry0cj14i53w3zkyib4y6wyrnd709dfyzgp"
+ "commit": "e9a1e53c57478389343ee23ebb962c8b9b4b4bba",
+ "sha256": "1vw6qcpz71sb6xhjzlikr4l1q23sfbphlza4x4ma0gc7mfzyqfh0"
},
"stable": {
"version": [
3,
6,
- 1
+ 4
],
"deps": [
"async"
],
- "commit": "55281e1390bae54310dc880ae3805e0595d5c1bd",
- "sha256": "1sghq7xjd4a9ysh3cywd5rss9y47rwk82y86cwh1g7p0jv89gqaf"
+ "commit": "a3343a370975d9c01df4f1ff42875cc32ae89592",
+ "sha256": "0cl5awhq5py872qx9s30sfgfpfwjivwbsi18mgar8lj6lvs4s8zz"
}
},
{
@@ -43829,10 +44617,10 @@
},
{
"ename": "helm-dash",
- "commit": "855ea20024b606314f8590129259747cac0bcc97",
- "sha256": "032hwwq4r72grzls5ww7bjyj39c82wkcgf3k7myfcrqd3lgblrwb",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "0vn9b6v6y1l4v475s69930sf2h8cj9g3vdi1rx5janpcq7w42mq7",
"fetcher": "github",
- "repo": "areina/helm-dash",
+ "repo": "dash-docs-el/helm-dash",
"unstable": {
"version": [
20190527,
@@ -43989,10 +44777,10 @@
},
{
"ename": "helm-dired-recent-dirs",
- "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4",
- "sha256": "1rm47if91hk6hi4xil9vb6rs415s5kvhwc6zkrmcvay9hiw9vrpw",
+ "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8",
+ "sha256": "08dyzsfpzzp279jvzbj7m187gn8rmxzfclrn71n4xsss5g1k7gb1",
"fetcher": "github",
- "repo": "yynozk/helm-dired-recent-dirs",
+ "repo": "zonkyy/helm-dired-recent-dirs",
"unstable": {
"version": [
20131228,
@@ -44230,14 +45018,14 @@
"repo": "cute-jumper/helm-ext",
"unstable": {
"version": [
- 20180526,
- 350
+ 20200722,
+ 107
],
"deps": [
"helm"
],
- "commit": "90b788aced21ec467a234b6b77b5a6ebae6de75f",
- "sha256": "11a27556slh95snzqyvy0rlf6p7f51nx8rxglnv0d34529h72508"
+ "commit": "c30f7772ec577a5ce1de3215f0507826e0725a69",
+ "sha256": "1sb3z1c1p9wal5g6fz8b948pvaarg4yhcmjqmpd2y7b85hzapgp1"
},
"stable": {
"version": [
@@ -44328,8 +45116,20 @@
"deps": [
"helm"
],
- "commit": "6ab26c5fb414a0c1232974fd3f888839b6844203",
- "sha256": "0lsrcn03f4981762l2rq25ps1f2ka86q125jkh6nq7wzfb7pj71f"
+ "commit": "d7e0c1814299fc0e345e159f02733cee5277716e",
+ "sha256": "07767jm0wqnn4qavnvnsf6wzfsvsk5bfba2sm16l5036sj4dyjxn"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 4
+ ],
+ "deps": [
+ "helm"
+ ],
+ "commit": "52dbc68cf7484d66c40593733770c0c61b383ef0",
+ "sha256": "1xrq5481mri9nfdwkn14zjq1zgl31w6aywca6sr1by5cqggqrqr1"
}
},
{
@@ -44359,15 +45159,15 @@
"repo": "emacs-helm/helm-firefox",
"unstable": {
"version": [
- 20200306,
- 1408
+ 20200612,
+ 800
],
"deps": [
"cl-lib",
"helm"
],
- "commit": "7065e01188ed17b86a7b4f01b95ace575a15eef1",
- "sha256": "0kk7d73hcrxcnsrq803zp5lh1hyk30nahb6wdlalqvkczksgpkml"
+ "commit": "8ecf5bcb815d1650bf184deffeef10b1277e0e1e",
+ "sha256": "00is30ijsh2aqvrkk5cxl46mbcj3q2fzc02hb55mj3gq4h6lb1bq"
},
"stable": {
"version": [
@@ -44390,27 +45190,27 @@
"repo": "emacs-helm/helm-fish-completion",
"unstable": {
"version": [
- 20200509,
- 1056
+ 20200622,
+ 1255
],
"deps": [
"fish-completion",
"helm"
],
- "commit": "fd730198afe01f6eecc6c5841358a8eea4cf4b09",
- "sha256": "1iv0hwr74hzgrvrr31nlnswvi87lvpg24rd1rhkr5kjicr2295fq"
+ "commit": "f055dab2f14462ff130841d4ab421f34baab39d5",
+ "sha256": "0hpsm39kx8vpz2zmarjrkvy1capkk5lwpsmdg2xnklsck6xsn922"
},
"stable": {
"version": [
0,
- 3
+ 5
],
"deps": [
"fish-completion",
"helm"
],
- "commit": "fd730198afe01f6eecc6c5841358a8eea4cf4b09",
- "sha256": "1iv0hwr74hzgrvrr31nlnswvi87lvpg24rd1rhkr5kjicr2295fq"
+ "commit": "f055dab2f14462ff130841d4ab421f34baab39d5",
+ "sha256": "0hpsm39kx8vpz2zmarjrkvy1capkk5lwpsmdg2xnklsck6xsn922"
}
},
{
@@ -44524,15 +45324,15 @@
"repo": "rustify-emacs/fuz.el",
"unstable": {
"version": [
- 20200104,
- 524
+ 20200812,
+ 1222
],
"deps": [
"fuz",
"helm"
],
- "commit": "0b6b64cebde5675be3a28520ee16234db48d3b8b",
- "sha256": "1bddjr3rpmvkrljq5ipjm42d59m2897cpfhmiah3rcb4c6ra40m1"
+ "commit": "fee874aa35d2ee6b12b836290b5c8eaa44175a28",
+ "sha256": "1xswm8my29i4fddy64k21b1vclbr5fjb0pisb4hs8ynkk5w1kw2a"
},
"stable": {
"version": [
@@ -44581,6 +45381,19 @@
"flx",
"helm"
],
+ "commit": "152d54bcd7137e4f5df54cf213e578c9d71864bd",
+ "sha256": "1msnagb1mxxi9c64j54j9r95l98jha2n6qdgs236b953lz8d9wwf"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 5
+ ],
+ "deps": [
+ "flx",
+ "helm"
+ ],
"commit": "fc080a0b4be8a68944a64bc4fb5b38cd11a70bc7",
"sha256": "01632zrpl69b034srgsfidf62r1kwc8f4z8i48kz95g5n2ax1xk9"
}
@@ -44895,14 +45708,26 @@
"repo": "kopoli/helm-grepint",
"unstable": {
"version": [
- 20161001,
- 1413
+ 20200811,
+ 1616
+ ],
+ "deps": [
+ "helm"
+ ],
+ "commit": "9aec98428823b749eb14d2c8512b46b59ca9f8ca",
+ "sha256": "1fmpk9ynish20daajnx4c2s8bnlngb8sv3nwspxkk8fvv0c3p39i"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 6,
+ 1
],
"deps": [
"helm"
],
- "commit": "a62ca27515ff6a366b89b420500eb16d380cc653",
- "sha256": "1v87v6a34zv998z1dwwcqx49476pvy9g5zml7w5vzfkms0l8l28w"
+ "commit": "9aec98428823b749eb14d2c8512b46b59ca9f8ca",
+ "sha256": "1fmpk9ynish20daajnx4c2s8bnlngb8sv3nwspxkk8fvv0c3p39i"
}
},
{
@@ -44931,26 +45756,26 @@
"repo": "emacsorphanage/helm-gtags",
"unstable": {
"version": [
- 20200409,
- 1559
+ 20200602,
+ 1610
],
"deps": [
"helm"
],
- "commit": "25b81d7774622911c1e95d9020209ae4ace1542b",
- "sha256": "14k0yrf8p015gsgdgq8ykvrjjhd1brq2gsfx7m3jv0p789yxw7zk"
+ "commit": "a15fe1dd272d252ad933d8129db1dce02fd41adb",
+ "sha256": "1kc1jzk10nfd2v20g8dwnb6a944afrwdwnkzl06w4ba8k4yim7gi"
},
"stable": {
"version": [
1,
5,
- 6
+ 7
],
"deps": [
"helm"
],
- "commit": "dbe0d2d9d08058d469ad2d729bd782515b5b3b62",
- "sha256": "0zyspn9rqfs3hkq8qx0q1w5qiv30ignbmycyv0vn3a6q7a5fsnhx"
+ "commit": "a15fe1dd272d252ad933d8129db1dce02fd41adb",
+ "sha256": "1kc1jzk10nfd2v20g8dwnb6a944afrwdwnkzl06w4ba8k4yim7gi"
}
},
{
@@ -45071,6 +45896,26 @@
"sha256": "1ih2pgyhshv8nl7hhchd4h0pbjgj45irp5dy1fq2gy05v4rn7wi4"
}
},
+ {
+ "ename": "helm-icons",
+ "commit": "388e1c96b251fd68adc08288c9109dad19840bc7",
+ "sha256": "074s4pv0lgvcmvfqv34bsi45cy4rlskc6skmfffkflyf1kddpz1g",
+ "fetcher": "github",
+ "repo": "yyoncho/helm-icons",
+ "unstable": {
+ "version": [
+ 20200719,
+ 1359
+ ],
+ "deps": [
+ "dash",
+ "f",
+ "treemacs"
+ ],
+ "commit": "d8c15dc61c1f321686b447e83abb17e14bc6f1c6",
+ "sha256": "0na4nks6l7917r64rc49b38lwsdj7wvslnnikms92882z5c8c6nn"
+ }
+ },
{
"ename": "helm-idris",
"commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -45295,16 +46140,16 @@
"repo": "leanprover/lean-mode",
"unstable": {
"version": [
- 20171102,
- 1454
+ 20200620,
+ 915
],
"deps": [
"dash",
"helm",
"lean-mode"
],
- "commit": "65b55b1711fb61129312044d5ac7e6a2c2ee245c",
- "sha256": "1zmw8950qhry2ixk2ng0pg4j0vwx11nvjlrpab9jg6x47ys9j65n"
+ "commit": "6b4377686128d5c2fb55d8fe61b92a9991d40fbd",
+ "sha256": "1zb3igic1i30mfbsx4k2sabhdpl58fsrl5c3fjvqrpn92ixi9vws"
}
},
{
@@ -45371,14 +46216,14 @@
"repo": "emacs-helm/helm-ls-git",
"unstable": {
"version": [
- 20191127,
- 510
+ 20200519,
+ 912
],
"deps": [
"helm"
],
- "commit": "18c53b62bc758b9d8ad4e94a94f58d143ccb29db",
- "sha256": "0r4dj6422g2zsbm2kig369j39lw4d68zpcr2xr02p02sfyhg1c0f"
+ "commit": "4da1a53f2f0a078ee2e896a914a1b19c0bf1d5ed",
+ "sha256": "12fi08w20yjsdfkxl1pk9q4w0z9l92va5fa5ghay9w33xlymc8dc"
},
"stable": {
"version": [
@@ -45450,16 +46295,29 @@
"repo": "emacs-lsp/helm-lsp",
"unstable": {
"version": [
- 20200429,
- 1457
+ 20200808,
+ 713
+ ],
+ "deps": [
+ "dash",
+ "helm",
+ "lsp-mode"
+ ],
+ "commit": "4263c967267b0579956b3b12ef32878a9ea80d97",
+ "sha256": "1j0w6391ivw7gyx03vmmhccj25d5p94dnbblhd6vxl8d22azdfq3"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2
],
"deps": [
"dash",
"helm",
"lsp-mode"
],
- "commit": "6b5ce182d7c94c62b55b8f7d0c7e643b2c30e560",
- "sha256": "0f6a26h1n6h0x3dal40180w3vb7gz3h8qwxvr3b0zq4f7byikisb"
+ "commit": "5c960e7800dc8f4432f3a1466a637d484b87dc35",
+ "sha256": "1vq3qpqm3ndqyvf5bk8qhqcr60x9ykc0ipk2a43rr3yjm4z1b6s9"
}
},
{
@@ -45504,11 +46362,11 @@
"repo": "abo-abo/helm-make",
"unstable": {
"version": [
- 20200228,
- 1742
+ 20200620,
+ 27
],
- "commit": "a52b3a34ade00e695a412bc0c5873d4f4d22c323",
- "sha256": "1jqihwh24f190zsc3a2xc7ja6j6q3nl742a0m9d6fiw28aijg34f"
+ "commit": "ebd71e85046d59b37f6a96535e01993b6962c559",
+ "sha256": "14jvhhw4chl94dgfwbyy7yirwchvcz5zrsgr9w6qy4z0fhqba41a"
},
"stable": {
"version": [
@@ -45693,10 +46551,10 @@
},
{
"ename": "helm-notmuch",
- "commit": "98667b3aa43d3e0f6174eeef82acaf71d7019aac",
- "sha256": "1ixdc1ba4ygxl0lpg6ijk06dgj2hfv5p5k6ivq60ss0axyisnnv0",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "1k1kj5n6r32qc139ms5cvj5x5xpbd5v8c64j3jpcrmgg8d396f1m",
"fetcher": "github",
- "repo": "xuchunyang/helm-notmuch",
+ "repo": "emacs-helm/helm-notmuch",
"unstable": {
"version": [
20190320,
@@ -45800,8 +46658,8 @@
"org-multi-wiki",
"org-ql"
],
- "commit": "8b056103d6f5320563e9fd794a008fd4e0719702",
- "sha256": "1xmj2p9hcpf1nld0gsnxq12kaljh0p195fy24v23l8ygykhmqw17"
+ "commit": "2541e1b0798a1c9d4b4b8778e6c97a579ac3fa14",
+ "sha256": "1mcpbq1qylkxpd6nzq04jrji6p1xll5a30dc7dpxpcjrkgvbzf39"
},
"stable": {
"version": [
@@ -45820,10 +46678,10 @@
},
{
"ename": "helm-org-rifle",
- "commit": "f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615",
- "sha256": "0hx764vql2qgw9i8qrr3kkn23lw6jx3x604dm1y33ig6a15gy3a3",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "05arqjadly6qf2slw8109wk828sd4f76spklpnxwjc98x01vacxw",
"fetcher": "github",
- "repo": "alphapapa/helm-org-rifle",
+ "repo": "alphapapa/org-rifle",
"unstable": {
"version": [
20200512,
@@ -46138,31 +46996,30 @@
"repo": "bbatsov/helm-projectile",
"unstable": {
"version": [
- 20190731,
- 1538
+ 20200625,
+ 443
],
"deps": [
"cl-lib",
"helm",
"projectile"
],
- "commit": "5328b74dddcee8d1913803ca8167868831a07463",
- "sha256": "0a811cblrvc8llpv771b8dppgxs6bwjyvjy3qn2xns4nigvn93s0"
+ "commit": "2f3a2a03d6cb9419c25b432637aa11c8d2f9f3b7",
+ "sha256": "0h6r8v2lj6abjz73iv8568ijs7l37j76nf58h4p9r9ldpdigihzz"
},
"stable": {
"version": [
+ 1,
0,
- 14,
0
],
"deps": [
"cl-lib",
- "dash",
"helm",
"projectile"
],
- "commit": "1a90f93732f1a1e8080098d65eadd6a1cd799e31",
- "sha256": "0lph38p112fridighqcizpsyzjbv7qr3d8prbfj6w6q6gfl6cna4"
+ "commit": "5eb861b77d8e6697733def65288039df5be81a0e",
+ "sha256": "05gpg90gg03yalmv9fw1y9k21i2l617iipvs0p9n80aln8nrzs8g"
}
},
{
@@ -46400,14 +47257,14 @@
"repo": "emacs-helm/helm-recoll",
"unstable": {
"version": [
- 20190729,
- 453
+ 20200805,
+ 1235
],
"deps": [
"helm"
],
- "commit": "219e517dd79a7879414ca36e8de28a159a49c78a",
- "sha256": "0yjz8g8v839fs42lmmjbm5l4yzkq9npjlb6jxz6nv5j71xvz5lbf"
+ "commit": "c021a3b5e8c010bdad062cceb80fb49788f89e9f",
+ "sha256": "09aj1hsj81vx761v5ai48hvl17i2i60gx3szk8qcmmpcn00m3ps7"
},
"stable": {
"version": [
@@ -46429,16 +47286,16 @@
"repo": "cosmicexplorer/helm-rg",
"unstable": {
"version": [
- 20190130,
- 1734
+ 20200721,
+ 725
],
"deps": [
"cl-lib",
"dash",
"helm"
],
- "commit": "785a80fe5cc87e27c5ea3d00a70049028d9e2847",
- "sha256": "1cfdnwlgwil7fp228p5sb3jkwrgnhnad4p2m1vl2wn0fjb89dppp"
+ "commit": "ee0a3c09da0c843715344919400ab0a0190cc9dc",
+ "sha256": "0m4l894345n0zkbgl0ar4c93v8pyrhblk9zbrjrdr9cfz40bx2kd"
},
"stable": {
"version": [
@@ -46537,8 +47394,8 @@
"helm",
"rtags"
],
- "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710",
- "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr"
+ "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824",
+ "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b"
},
"stable": {
"version": [
@@ -46623,10 +47480,10 @@
},
{
"ename": "helm-sage",
- "commit": "09760a7f7b3cff6551c394fc7b2298567ca88eb0",
- "sha256": "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "1v1j2ipmzxcflknzmy1asm2ifalj2yb5qiv24wi7a323izlaxy2m",
"fetcher": "github",
- "repo": "stakemori/helm-sage",
+ "repo": "sagemath/helm-sage",
"unstable": {
"version": [
20160514,
@@ -46674,6 +47531,35 @@
"sha256": "1n6sp6bhlz01b1d87cgrgxhap0ch1bkh7fl45dzidx5fjz9lccdf"
}
},
+ {
+ "ename": "helm-selector",
+ "commit": "91193d76993bc65cc71bfa06148ef375b8034bd7",
+ "sha256": "19v1xvrbc9pn6ilbf28g4bjd4psmb34as6cjmksyaw5rn71ps2ay",
+ "fetcher": "github",
+ "repo": "emacs-helm/helm-selector",
+ "unstable": {
+ "version": [
+ 20200808,
+ 858
+ ],
+ "deps": [
+ "helm"
+ ],
+ "commit": "a1920a885830693dd9b1d6af3dd60f1915d976f4",
+ "sha256": "134rxm4zicn565k3q5q15iiqcvcyiq6lsvmsqr53ifjjbq8pd9y6"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 3
+ ],
+ "deps": [
+ "helm"
+ ],
+ "commit": "a1920a885830693dd9b1d6af3dd60f1915d976f4",
+ "sha256": "134rxm4zicn565k3q5q15iiqcvcyiq6lsvmsqr53ifjjbq8pd9y6"
+ }
+ },
{
"ename": "helm-sheet",
"commit": "010c5c5e6ad6e7b05e63936079229739963bf970",
@@ -46886,16 +47772,15 @@
"repo": "jamesnvc/helm-switch-shell",
"unstable": {
"version": [
- 20191223,
- 1418
+ 20200817,
+ 1725
],
"deps": [
"dash",
- "helm",
- "s"
+ "helm"
],
- "commit": "690e20f0d95f81151b34cb424a201f39d93eb430",
- "sha256": "08p9dfjkf1ssnzd8n69a10mkvdvm8w229fy32z95dh9vbxsp7aqv"
+ "commit": "9cab3dfd2f006148e969555bc3bfb6456d1b3f84",
+ "sha256": "0z1785cw5sbcyqs2zbi35b5y6ac9lws1wxp89la7hwdlzwzk1c2a"
}
},
{
@@ -46906,26 +47791,26 @@
"repo": "emacsorphanage/helm-swoop",
"unstable": {
"version": [
- 20200515,
- 417
+ 20200814,
+ 448
],
"deps": [
"helm"
],
- "commit": "2efc552591102ab8b4408ad60a3c4be991bb8e93",
- "sha256": "0fbahbcgdcbmnhv3m2pmxy8n01qab5x0468bikygs80krch84qh5"
+ "commit": "1f7d3cf0d742b199e4ce13fcb8b19c977a44611e",
+ "sha256": "1r03d3ivmi0r5knsrlfx2cq5jljjl36h2l5n0mbs3sc6iad9wz20"
},
"stable": {
"version": [
- 2,
+ 3,
0,
0
],
"deps": [
"helm"
],
- "commit": "c5ec1f3acfb07155273c2de021f3521e198e4a9d",
- "sha256": "0k0ns92g45x8dbymqpl6ylk5mj3wiw2h03f48q5cy1z8in0c4rjd"
+ "commit": "533dcd14198b61fd2fbf8c6f286f65feae5b6bd2",
+ "sha256": "1qjay0fvryxa8n1ws6r1by512p2fylb2nj7ycm1497fcalb0d706"
}
},
{
@@ -46943,8 +47828,8 @@
"helm",
"seq"
],
- "commit": "4e257fc84472d3d85ee2b413ca8a45aa0fd0118c",
- "sha256": "1p89zggsqhif6dadajapq8vr9ffxbzq7v8sv8iaxyn0cg2sn6fdl"
+ "commit": "d6ad2f682d744048ea0ac47c470be5a159a6541b",
+ "sha256": "01zsl1g8r3rkgwpdphgmbljjnrhk6mmk2rjqhykjk5f3bdk02rwk"
},
"stable": {
"version": [
@@ -47181,6 +48066,24 @@
"sha256": "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz"
}
},
+ {
+ "ename": "helm-wikipedia",
+ "commit": "317729c132a993dd14f25876f753c8f1636d7b91",
+ "sha256": "0wnyzqz0q79bl2fmq0wszkhv10wm7ydqvqy4mmi4hi78skqmykq6",
+ "fetcher": "github",
+ "repo": "emacs-helm/helm-wikipedia",
+ "unstable": {
+ "version": [
+ 20200630,
+ 504
+ ],
+ "deps": [
+ "helm"
+ ],
+ "commit": "a6c8b1d1ab5dc0a69cb44bb5f3eb6792ef091147",
+ "sha256": "1him1sqdl15qfjqrkgmnhligwqc6a9liiqndssa1law3bd36c2jb"
+ }
+ },
{
"ename": "helm-wordnet",
"commit": "11626120951afc589beac4cf5a0f49bffa752349",
@@ -47258,10 +48161,10 @@
},
{
"ename": "helm-z",
- "commit": "48c9b83fff8fc428d9d1ecf0005d47f2adb8cb00",
- "sha256": "1m268zsr4z7a9l5wj0i8qpimv0kyl8glgm0yb3f08959538nlmd1",
+ "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8",
+ "sha256": "0vazbn8i0yz59310zq839jr86nwv6hh2mn1a9m8a7jv0l3121hzq",
"fetcher": "github",
- "repo": "yynozk/helm-z",
+ "repo": "zonkyy/helm-z",
"unstable": {
"version": [
20171204,
@@ -47426,21 +48329,6 @@
"sha256": "1rp37rhkj8jm07dwr74vc68dhrbvyvrxjdavpb0h073ps9vl9dsc"
}
},
- {
- "ename": "heroku",
- "commit": "855ea20024b606314f8590129259747cac0bcc97",
- "sha256": "1wavsymviybfcmwdfrffbkdwbiydggx55jqg6ql79wf9bx7agacp",
- "fetcher": "github",
- "repo": "technomancy/heroku.el",
- "unstable": {
- "version": [
- 20120629,
- 1813
- ],
- "commit": "92af1c073b593c4def99c8777c869992aa4d0b3a",
- "sha256": "0c45pib8qpwgyr271g5ddnsn7hzq68mqflv0yyc8803ni06w9vhj"
- }
- },
{
"ename": "heroku-theme",
"commit": "348f0e7aec86c3efd87ab06849a5f1ce90ba23e2",
@@ -47761,11 +48649,11 @@
"repo": "Lindydancer/highlight-doxygen",
"unstable": {
"version": [
- 20180829,
- 1818
+ 20200520,
+ 1713
],
- "commit": "53f2250018725fa19548e1771ee79fcc23641694",
- "sha256": "0l6zh5cmp771h30i16bv3qvcq40pz9fxn3j7a8yx708vanb4d7kc"
+ "commit": "eec4874e2e89d4eb39091aad89a67dff8f8ec84c",
+ "sha256": "0r3rv1px43r265716l3g20c1ss4381h1mc1kjxin22vdmrj6cmxy"
}
},
{
@@ -47806,11 +48694,11 @@
"repo": "DarthFennec/highlight-indent-guides",
"unstable": {
"version": [
- 20200412,
- 2328
+ 20200528,
+ 2128
],
- "commit": "1b12c7b440ff988c7237936187c1375ac4ddc7f4",
- "sha256": "03dpwklrwbkminfds8v129w0i47p5mkwdyhlhv05a22xnmlanyrs"
+ "commit": "a4f771418e4eed1f3f7879a43af28cf97747d41c",
+ "sha256": "0zwp7kh10b0gxwp6128am94fwc5lmn73qar13qzyh3r1jsc8f95y"
}
},
{
@@ -48050,10 +48938,10 @@
},
{
"ename": "hindent",
- "commit": "9a15a17a5aa78aed72958b2a1bde53f0c0ab5be7",
- "sha256": "0az2zhdi73sa3h1q1c0bayqdk22a7ngrvsg9fr8b0i39sn3w8y07",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz",
"fetcher": "github",
- "repo": "commercialhaskell/hindent",
+ "repo": "chrisdone/hindent",
"unstable": {
"version": [
20180518,
@@ -48062,8 +48950,8 @@
"deps": [
"cl-lib"
],
- "commit": "1583be4a8a01b765841f7306284528ae713abb7b",
- "sha256": "1l8v3vq3yw7zr1yxyscfw8lggcf0klnyszhv18505c6myybp2dkp"
+ "commit": "50242bb64e946555defc9fff11ab32bcb05300b6",
+ "sha256": "0k062mswihnpl1h7r0w37siv57fi5k90956ji2vix9r9qc33zsxc"
},
"stable": {
"version": [
@@ -48283,14 +49171,14 @@
"repo": "laishulu/hl-fill-column",
"unstable": {
"version": [
- 20200404,
- 306
+ 20200607,
+ 757
],
"deps": [
"names"
],
- "commit": "43cb3c35a92c912b7205b8a36f1ad0ec0a5b4a22",
- "sha256": "0pf1hk21xbahccw1cdz95haqvhrf50cwg32qa36v9nammd37752z"
+ "commit": "5782a91ba0182c4e562fa0db6379ff9dd472856b",
+ "sha256": "0sfki2844yjlvnjlaia0n46af3c5y1bi74x91icwxccqwlkyg8jg"
}
},
{
@@ -48341,20 +49229,20 @@
"repo": "tarsius/hl-todo",
"unstable": {
"version": [
- 20200103,
- 1239
+ 20200813,
+ 1419
],
- "commit": "3bba4591c54951d2abab113ec5e58a6319808ca9",
- "sha256": "1i5mdmkbrxqx75grwl01pywbgl8pasr00mq6fidspp0aligsbg6w"
+ "commit": "0598b98f63b623c1778cbd2e2f60b774b7a311b9",
+ "sha256": "1y57q3s6hrjd134mkwzcz5ii2jichvccpvc6bcj1vfl4d7yrxsal"
},
"stable": {
"version": [
3,
1,
- 1
+ 2
],
- "commit": "5d2ea49f83a7e6953f9d71de94dee478d08f9543",
- "sha256": "1v51mlq13wr890ijwcwf0ymmc768cipj7a1nvmbmwh7y4ymlrsgn"
+ "commit": "3bba4591c54951d2abab113ec5e58a6319808ca9",
+ "sha256": "1i5mdmkbrxqx75grwl01pywbgl8pasr00mq6fidspp0aligsbg6w"
}
},
{
@@ -48406,8 +49294,8 @@
"deps": [
"cl-lib"
],
- "commit": "f17360fe93de6df99a05b4b64b0a1ca4ee45abb6",
- "sha256": "01sfba4sd3mjc7bs1y4qdzryfawg1xzg3hbwy9afwfaz0w5czni8"
+ "commit": "5646d9c0b9e7598b20b2004eab5439fdc6dbeda5",
+ "sha256": "1w442h5wzxylrbmqn1blpv2pmvyvq7avsk5h8xxsjfqw5580riri"
}
},
{
@@ -48436,16 +49324,16 @@
"repo": "thanhvg/emacs-hnreader",
"unstable": {
"version": [
- 20200321,
- 1900
+ 20200726,
+ 654
],
"deps": [
"org",
"promise",
"request"
],
- "commit": "5dd287e932e2398aab0f34cb23b99457b81ac370",
- "sha256": "0ynq9dg00frk1sriraglzsszxpx51mpfdkbd1iqdz648rlhzyp3m"
+ "commit": "7ff808d4728ce4e269b6d99a73604063dd9b374a",
+ "sha256": "0kxx8pvl99qdbldsn6lvxj69j1jpmmc33wxcr2aw3h423ibcna3s"
}
},
{
@@ -48456,11 +49344,11 @@
"url": "https://gitlab.lrde.epita.fr/spot/emacs-modes.git",
"unstable": {
"version": [
- 20191010,
- 1132
+ 20200610,
+ 1339
],
- "commit": "558e55429acde26423332a03a3b65b12efdbce5f",
- "sha256": "0a6jagjimr00dvzrbxj078vyranmv14zl2vn4dkcww4swjzpaag9"
+ "commit": "18f5c981e256f867f29a93376ccdc04717b159cd",
+ "sha256": "1814si09xjimmn1a8yp6q13lz1lr6cwnaz7fqfszqcil8lldcwvx"
}
},
{
@@ -48616,11 +49504,11 @@
"repo": "aodhneine/horizon-theme.el",
"unstable": {
"version": [
- 20200129,
- 1957
+ 20200720,
+ 1832
],
- "commit": "040d19abd397d2132508a50e1266e86d324f7c69",
- "sha256": "04impsvfmna1vyssjs2id9hsk9cq7wx317z4h16wr1jvng6m1jig"
+ "commit": "9595549c514a9376c61d5d303405f6a6982e9e46",
+ "sha256": "1m7wwf17p7qa6dmm0qykz0qnqz7rxvxhsmn9287y8f6wahzd8yfb"
}
},
{
@@ -48717,16 +49605,16 @@
"repo": "thanhvg/emacs-howdoyou",
"unstable": {
"version": [
- 20191118,
- 2222
+ 20200805,
+ 1739
],
"deps": [
"org",
"promise",
"request"
],
- "commit": "23407fb7a950f08498b5586062ba69962a20ea24",
- "sha256": "1hcwac7fjsshnjapb1hdh9x0liap4n1i5q6bsar5zanmz1h9i94q"
+ "commit": "6bf4d5964299c5b51a2299869c0402079869343b",
+ "sha256": "0rzyh71w5ccimzy1wm489sj96119bnn86mdfshhyk753h9ldjjgp"
}
},
{
@@ -48893,11 +49781,11 @@
"repo": "hniksic/emacs-htmlize",
"unstable": {
"version": [
- 20191111,
- 2130
+ 20200816,
+ 746
],
- "commit": "86f22f211e9230857197c42a9823d3f05381deed",
- "sha256": "0n117rb4d9dydl01b65d09rp8bmkir3m09zs02dhlmqmljpy25w8"
+ "commit": "49205105898ba8993b5253beec55d8bddd820a70",
+ "sha256": "0caw0wwbscfr4a9ynfabrpkvgibf0hlrkwisib82nhcqcaanf962"
},
"stable": {
"version": [
@@ -49107,11 +49995,11 @@
"repo": "nflath/hungry-delete",
"unstable": {
"version": [
- 20200309,
- 209
+ 20200807,
+ 2257
],
- "commit": "4a341cfa3a19185c5ecb687970e299082e1144e3",
- "sha256": "1gwksvvizz3kdpfzgwp45l1idjbrn8kz4jf0zx4fva20mh6mjz01"
+ "commit": "671d941de0176255b79820a662d5a694607cf28a",
+ "sha256": "1cnbyixm1dihcvvfqx591qcjcrs963d2swn9rbrwkplm4a5fyxhf"
},
"stable": {
"version": [
@@ -49131,16 +50019,16 @@
"repo": "hylang/hy-mode",
"unstable": {
"version": [
- 20200508,
- 502
+ 20200730,
+ 2340
],
"deps": [
"dash",
"dash-functional",
"s"
],
- "commit": "a18b0b8bfcd79a30bfe9ef960244ec6748a9430d",
- "sha256": "0vvwilfj1sv7r1xsv7m6w0qc3077jfaflwxmq54dmrbw6qypqx1f"
+ "commit": "55e84cadbdb63427a8d531992df3990414a26688",
+ "sha256": "0mrml5cy3isgy5mybxm8mrzqcrxrw4nn9yxchyjakkqzvfjk8gm1"
},
"stable": {
"version": [
@@ -49187,6 +50075,21 @@
"sha256": "1b8992vzq5bh01pjlj181nzqjrqs4fbjpwvv8h7gjq42sf8w59sm"
}
},
+ {
+ "ename": "hybrid-reverse-theme",
+ "commit": "efea6a0ea9176f61cb5a97f5fdce22b3ba28894e",
+ "sha256": "1lfssdga5y1h42qqbr1lg4rjb8rn8kkv0yxbqyxfv1w1yybn924l",
+ "fetcher": "github",
+ "repo": "Riyyi/emacs-hybrid-reverse",
+ "unstable": {
+ "version": [
+ 20200819,
+ 240
+ ],
+ "commit": "18b1b786fb4346ad31ec76df75cb672ef5cc7cbf",
+ "sha256": "03wgxhly8n3j05l9k3pzixczj4xzqd499k0l3d4nngsxps2v67w3"
+ }
+ },
{
"ename": "hydandata-light-theme",
"commit": "51edfd2eed17b79058bbef836bc3edff50defa6e",
@@ -49242,15 +50145,15 @@
"repo": "abo-abo/hydra",
"unstable": {
"version": [
- 20200504,
- 1747
+ 20200711,
+ 1210
],
"deps": [
"cl-lib",
"lv"
],
- "commit": "87873d788891029d9e44fa5458321d6a05849b94",
- "sha256": "1b6davg1jqcxqzf9aqv8av8c78fgdri97m9q44xzvr1xfbmvkl8g"
+ "commit": "112e689f75b59398d8eca79ac6562dca12b8a959",
+ "sha256": "0famsjgsgd61fm3l5m9mqg4szf8lcgcb57paxlg8rxnsmxmwga7d"
},
"stable": {
"version": [
@@ -49266,6 +50169,21 @@
"sha256": "0fapvhmhgc9kppf3bvkgry0cd7gyilg7sfvlscfrfjxpx4xvwsfy"
}
},
+ {
+ "ename": "hyperlist-mode",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "0c3jdwbarxvnczfx2g3g1m53kiyjls7l48s6l4bzxl2w4x8axvsw",
+ "fetcher": "github",
+ "repo": "Vifon/hyperlist-mode",
+ "unstable": {
+ "version": [
+ 20200515,
+ 2209
+ ],
+ "commit": "374cdc04761df23e7a50ca276319ba9745cda9d7",
+ "sha256": "11940wmzhnj6yxgdkadkwak4k9gad4y1bbf0k39sca13j10j48n7"
+ }
+ },
{
"ename": "hyperspace",
"commit": "0696a12acba676015640de63fc6e011128bca71c",
@@ -49334,11 +50252,11 @@
"repo": "mkcms/interactive-align",
"unstable": {
"version": [
- 20181202,
- 1146
+ 20200711,
+ 1117
],
- "commit": "e1308c8f6aea05ad6dbcaa33b9bee4eb7e05ee39",
- "sha256": "0b7a2z4v1nyyaw0lvql9xrakpsi1a6kflqr74k56ndm3ivmqwx09"
+ "commit": "eca40b8b59ea713dba21b18f5b047a6c086b91dc",
+ "sha256": "1nvj47d62dffgry0dy08m8rz5fqsrn1yhmkmp5jn57fyhbk6nfal"
},
"stable": {
"version": [
@@ -49411,14 +50329,14 @@
"repo": "purcell/ibuffer-projectile",
"unstable": {
"version": [
- 20200304,
- 2205
+ 20200805,
+ 604
],
"deps": [
"projectile"
],
- "commit": "504b0edaa0d937ce60ccc8fdf09f2dae0a90fbaf",
- "sha256": "18cqxnwzzbkcj9jcaw89b210432yzhrl1dwsv48p0jbhfnr17k41"
+ "commit": "ecbe482804a217b1471593f6c7a8b3d64f3cdc47",
+ "sha256": "0gcars1zmfrysq1n3bv40nwqsk821bz3pffrsjw14fg2mwjpmaxq"
},
"stable": {
"version": [
@@ -49497,14 +50415,14 @@
"repo": "purcell/ibuffer-vc",
"unstable": {
"version": [
- 20200304,
- 2207
+ 20200805,
+ 604
],
"deps": [
"cl-lib"
],
- "commit": "1249c1e30cf11badfe032ac3b1058f24ba510ace",
- "sha256": "1mgn7b786j4hwq1ks012hxxgvrfn5rz90adi2j190gmjz60rc5g5"
+ "commit": "5fa6aea09bc67f71ea743302d609f459967b1e81",
+ "sha256": "03xkhr8vq741pgbv0b184j5ksqhhdvb7pzwa1arpymsarc6hjwsy"
},
"stable": {
"version": [
@@ -49526,14 +50444,26 @@
"repo": "conao3/iceberg-theme.el",
"unstable": {
"version": [
- 20200515,
- 934
+ 20200812,
+ 943
],
"deps": [
"solarized-theme"
],
- "commit": "9615307cbd37e698d6939a04128162ef893313cb",
- "sha256": "02lsbzk5215z1rdvs6idnv2yff2487i4pqi1ljdjfn3g43ly5lr2"
+ "commit": "183b41eae07d94d4a8f299306078410bddc41d34",
+ "sha256": "1sxadaip63mhfjvgkax45jlv3c8cnbjnq653qbvw98vb8xsrmjc4"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "deps": [
+ "solarized-theme"
+ ],
+ "commit": "04b8d04c30276a471b37ff93d73409508e88d295",
+ "sha256": "13m6sq3ld8cm28jq7kxmv4ygrvyi7pjh1lsxwzvgaj6ncjqdi87v"
}
},
{
@@ -49544,19 +50474,19 @@
"repo": "oantolin/icomplete-vertical",
"unstable": {
"version": [
- 20200504,
- 1916
+ 20200616,
+ 2322
],
- "commit": "fe835acce91b0f088c8d27801bf42e24bb2dbab5",
- "sha256": "1az3m6zwrggj4w2lh5qhnbh09dvxpyj5m2a85yhcha2p7g1hpym1"
+ "commit": "a5871d39c5850ac4d9aac48350eaa1d31f3aaef7",
+ "sha256": "00sp2n8kb38nrkgs11m3jpijj9qnsdmy3sp37c1v6p7lgnzly80i"
},
"stable": {
"version": [
0,
- 1
+ 2
],
- "commit": "a2ee9254085431ec9e5c88d522e2c700355003ef",
- "sha256": "1bqnlvv1gvrjriazvzd3bq98r8ii6fqax0zznhvkl1ij5pf55a90"
+ "commit": "2c328a19f617b538986977a897d3af051ae7f355",
+ "sha256": "1bm02qd71r3j35b861rgbxkv3kcmg2458c70vwfaw9sjjba0ssng"
}
},
{
@@ -49747,24 +50677,6 @@
"sha256": "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp"
}
},
- {
- "ename": "ido-clever-match",
- "commit": "add68b4815cdfe83402b217595a4a46068f83a2a",
- "sha256": "081i6cjvqyfpgj0nvzc94zrl2v3l6nv6mhfda4zf7c8qqbvx1m8m",
- "fetcher": "github",
- "repo": "Bogdanp/ido-clever-match",
- "unstable": {
- "version": [
- 20151011,
- 1726
- ],
- "deps": [
- "cl-lib"
- ],
- "commit": "f173473e99c8b0756f12e4cc8f67e68fa59eadd3",
- "sha256": "14nmldahr0pj2x4vkzpnpx0bsxafmiihgjylk5j5linqvy8q6wk6"
- }
- },
{
"ename": "ido-complete-space-or-hyphen",
"commit": "59e11094068d3a0c0e4edc1f82158c43d3b15e0e",
@@ -49796,16 +50708,16 @@
"repo": "DarwinAwardWinner/ido-completing-read-plus",
"unstable": {
"version": [
- 20200310,
- 25
+ 20200520,
+ 1535
],
"deps": [
"cl-lib",
"memoize",
"seq"
],
- "commit": "98d3a6e56b1d3652da7b47f49f76d77f82ea80ba",
- "sha256": "0rmqyxb0cr3avm6lzz26r2d9fmja2csrh3whmky8h2giz79mjf7d"
+ "commit": "b9ca2566b867464c25b720e2148d240961c110e7",
+ "sha256": "1vkk311wghhnkmybv3h5a6hf3vxlgy03iqzwl6xyxdw3hgip8in5"
},
"stable": {
"version": [
@@ -49821,36 +50733,6 @@
"sha256": "088b50iajgj602wsm1280gn5pqirycazndhs27r1li5d84fm1nvj"
}
},
- {
- "ename": "ido-describe-bindings",
- "commit": "31b8e255630f1348a5b5730f7b624ad550d219ad",
- "sha256": "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2",
- "fetcher": "github",
- "repo": "danil/ido-describe-bindings",
- "unstable": {
- "version": [
- 20161023,
- 1102
- ],
- "deps": [
- "dash"
- ],
- "commit": "a814e25cb272401bdfee94cb98d915119d307414",
- "sha256": "040mpwwldivyapmj0pjxsk8drgi113k7rpx8ym4jqz1hah5n33s1"
- },
- "stable": {
- "version": [
- 0,
- 0,
- 11
- ],
- "deps": [
- "dash"
- ],
- "commit": "a142ff1c33df23ed9665497d0dcae2943b3c706a",
- "sha256": "0967709jyp9s04i6gi90axgqzhz03cdf1j1w39yrkds6q1b6v7jw"
- }
- },
{
"ename": "ido-exit-target",
"commit": "b815e7492eb0bd39c5d1be5a95784f9fe5612b62",
@@ -50007,36 +50889,6 @@
"sha256": "0zlkq29wxd3a4vg0w6ds2jad5h1pja7ccd3l6ppl0kz1b1517qlr"
}
},
- {
- "ename": "ido-occur",
- "commit": "8a576d8569bf82be01e7d50defcc99a90aab1436",
- "sha256": "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji",
- "fetcher": "github",
- "repo": "danil/ido-occur",
- "unstable": {
- "version": [
- 20160820,
- 1440
- ],
- "deps": [
- "dash"
- ],
- "commit": "6a0bfeaca2e334b47b4f38ab80d63f53535b189e",
- "sha256": "0q4w0akmnwk42ldbzqxbr7swz026q8wr1g27bl4i4k25bidqlx9q"
- },
- "stable": {
- "version": [
- 0,
- 2,
- 0
- ],
- "deps": [
- "dash"
- ],
- "commit": "b0e67fe4835c162cbcf8a982bdf377955b9ac5ae",
- "sha256": "13f21vx3q1qbnl13n3lx1rnr8dhq3zwch22pvy53h8q6sdf7r73a"
- }
- },
{
"ename": "ido-select-window",
"commit": "775c8361322c2ba9026130dd60083e0255170b8f",
@@ -50184,28 +51036,27 @@
"repo": "idris-hackers/idris-mode",
"unstable": {
"version": [
- 20190427,
- 1539
+ 20200522,
+ 808
],
"deps": [
"cl-lib",
"prop-menu"
],
- "commit": "acc8835449475d7cd205aba213fdd3d41c38ba40",
- "sha256": "0n9xbknc68id0mf8hbfmawi8qpvrs47ix807sk9ffv2g3ik32kk6"
+ "commit": "b77eadd8ac2048d5c882b4464bd9673e45dd6a59",
+ "sha256": "1v8av6jza1j00ln75zjwaca0vmmv0fhhhi94p84rlfzgzykyb9g1"
},
"stable": {
"version": [
- 0,
- 9,
- 19
+ 1,
+ 0
],
"deps": [
"cl-lib",
"prop-menu"
],
- "commit": "314a0baea5752069de08e814bb134a9643fb675d",
- "sha256": "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92"
+ "commit": "b77eadd8ac2048d5c882b4464bd9673e45dd6a59",
+ "sha256": "1v8av6jza1j00ln75zjwaca0vmmv0fhhhi94p84rlfzgzykyb9g1"
}
},
{
@@ -50231,11 +51082,11 @@
"repo": "victorhge/iedit",
"unstable": {
"version": [
- 20200412,
- 756
+ 20200807,
+ 853
],
- "commit": "0fb3d380866664c3ab543acede606d343c257406",
- "sha256": "0fz3p41j6d6bwk95v626j7w1z4rvbdxms6a4azy9dfncplnbnih0"
+ "commit": "59430e8c11c1fa9a294a070a3b1d571bd3887806",
+ "sha256": "1phm9n25hdg7v7gjjb5l173hrsgb64rc5frmdpchkd7li4ka4g91"
},
"stable": {
"version": [
@@ -50271,19 +51122,19 @@
"repo": "jrosdahl/iflipb",
"unstable": {
"version": [
- 20190817,
- 547
+ 20200731,
+ 1655
],
- "commit": "aeeb85633566ed3c13dbe94a6a4925d8930b7b85",
- "sha256": "07010alf6ymhs0nyj3arafksba0rdvgzjw9wqqhayzw6qqannbb2"
+ "commit": "d48884212499cd128d103c5ceba3173a90ebd2b4",
+ "sha256": "0qbdaf41zpm846jjkr9sgarb7iivpvb1qj5izsd5v4w1sz6igwf4"
},
"stable": {
"version": [
1,
- 4
+ 5
],
- "commit": "a5ad1fbd1173cff5228dab265515c92c0778f86a",
- "sha256": "0gyxd5d57j0x93mqnfwwdf28plp102xh0ag2d2iws7y1d5m99wm2"
+ "commit": "83e698f312a6e621f6d2c87b27d1e4acce96b4bf",
+ "sha256": "1nnkxzf35gx6a7a2xjf73wc5jzzpg4x0hj96jb3j6rim19yrfs8f"
}
},
{
@@ -50545,14 +51396,14 @@
"repo": "alezost/imenus.el",
"unstable": {
"version": [
- 20180505,
- 1717
+ 20200730,
+ 855
],
"deps": [
"cl-lib"
],
- "commit": "149cfa579ee231014d3341a0e05add69759757a5",
- "sha256": "00licvs457wzqq06a8cx7vw22kyqky20i7yq7a2nzf3cfl7vaya7"
+ "commit": "90200f5f22377903b405082eabe185447968f3e2",
+ "sha256": "04zhyn69bihxqddzsn9j0l6lxjpqkgdvbslh77cfdb4fp02cxsp1"
},
"stable": {
"version": [
@@ -50592,20 +51443,20 @@
"repo": "petergardfjall/emacs-immaterial-theme",
"unstable": {
"version": [
- 20200308,
- 1330
+ 20200818,
+ 638
],
- "commit": "19c46859e041a0c0e7f40a9157a6c4d0d660f441",
- "sha256": "0nx1g7caypnkid7bzhm4gg44cmpikpz1qz1cp11y6rlq1lwrb1d9"
+ "commit": "d7f18842f5e97977684c3dbb550c418b7625b343",
+ "sha256": "0gfw8fdl1wh7m2p449qxs2kfixqbhl4lc4zgmx1l3llv1kdq9qkw"
},
"stable": {
"version": [
0,
- 4,
- 2
+ 5,
+ 5
],
- "commit": "19c46859e041a0c0e7f40a9157a6c4d0d660f441",
- "sha256": "0nx1g7caypnkid7bzhm4gg44cmpikpz1qz1cp11y6rlq1lwrb1d9"
+ "commit": "d7f18842f5e97977684c3dbb550c418b7625b343",
+ "sha256": "0gfw8fdl1wh7m2p449qxs2kfixqbhl4lc4zgmx1l3llv1kdq9qkw"
}
},
{
@@ -50655,15 +51506,15 @@
"repo": "skeeto/impatient-mode",
"unstable": {
"version": [
- 20200327,
- 1619
+ 20200723,
+ 2117
],
"deps": [
"htmlize",
"simple-httpd"
],
- "commit": "fc84f4a333d47ca853842570cf35e659753a3ebe",
- "sha256": "14zycqky7xkmbfacmfdqbmq1qs3sj2r41nfmg09dv0hl97pavir8"
+ "commit": "cbddfd54242210df3e1c3b590fada5bb5423f5ed",
+ "sha256": "14jnni828ndl1sj92cy49r0aa6y8qwqbm2rrxc87j0yfn5sdckc7"
},
"stable": {
"version": [
@@ -50753,8 +51604,8 @@
"epc",
"f"
],
- "commit": "86f17856db194c5f18b30f35df40fb029d5544b5",
- "sha256": "0cak79lnlbfigl6lh3c5wzphxssq78vyd9xxj3zi7ln5q9ijl6pp"
+ "commit": "701dfcca5f3ab42be0f26a8d381d7116c79be850",
+ "sha256": "035830aizamh4c8hpnmfrbz9v9gy23d3nx0dv366l3q8mrh36l44"
},
"stable": {
"version": [
@@ -50823,15 +51674,15 @@
"repo": "conao3/indent-lint.el",
"unstable": {
"version": [
- 20200129,
- 2046
+ 20200812,
+ 949
],
"deps": [
"async",
"async-await"
],
- "commit": "23ef4bab5509e2e7fb1f4a194895a9510fa7c797",
- "sha256": "00ipp87hjiymraiv6xy0lqzhn9h3wcrw7z4dkzb2934d7bd08j29"
+ "commit": "c55f4ded11e8e50a96f43675a071354a8fb501c3",
+ "sha256": "0d7vkgzsx6ka4zliscsg6drqhg2bj16i911ryzmsp4v6hj294jrc"
},
"stable": {
"version": [
@@ -50962,26 +51813,26 @@
"repo": "clojure-emacs/inf-clojure",
"unstable": {
"version": [
- 20200425,
- 1648
+ 20200801,
+ 1128
],
"deps": [
"clojure-mode"
],
- "commit": "f29861204ddbb032b425c7d693e8c006b7b027c6",
- "sha256": "127kl64hqdy04qdbqr1xfzky3d8fzgbmp7z4hv6mjsc0p4s19azw"
+ "commit": "2c8e46b584be71fe1a585c9072da86382710dc59",
+ "sha256": "13rk3g58vaizp67c1plhfc80vsshdvvsz81wsf3076xp35p05w9b"
},
"stable": {
"version": [
- 2,
- 2,
+ 3,
+ 0,
0
],
"deps": [
"clojure-mode"
],
- "commit": "ff72d667c2709166d19ac15a36f7aac3423cefa1",
- "sha256": "07l8wkm0j6y2cj7bbb24x4rkjgf4q6ag0c1kcjs0sfmf1kaf14bk"
+ "commit": "2c8e46b584be71fe1a585c9072da86382710dc59",
+ "sha256": "13rk3g58vaizp67c1plhfc80vsshdvvsz81wsf3076xp35p05w9b"
}
},
{
@@ -51037,11 +51888,11 @@
"repo": "nonsequitur/inf-ruby",
"unstable": {
"version": [
- 20200327,
- 1418
+ 20200730,
+ 1456
],
- "commit": "41e5ed3a886fca56990486f1987bb3bae0dbd54b",
- "sha256": "12qgd2p664rh0ks5kq6sxaqi5nlmxrzj5p0kpqrx40caicj6jfpl"
+ "commit": "9f0f79ff459c7c417e8931ca020db121e24b45b5",
+ "sha256": "0h0kxgihjrabklnwfphaf86b67q0wmfjywffrydhdmlidi56rbis"
},
"stable": {
"version": [
@@ -51177,11 +52028,11 @@
"repo": "dieter-wilhelm/inform",
"unstable": {
"version": [
- 20200512,
- 1351
+ 20200723,
+ 500
],
- "commit": "54e0c51960c7f50de31a6831c034ea6adc5a8892",
- "sha256": "0j3hc3f7yx9dklbvvwpcq0d2n3lp0z47l5066ngvmm52aihhhiyd"
+ "commit": "8ff0a19a9f40cfa8283da8ed73de94c35a327423",
+ "sha256": "1rg3v554zjx1mrw1wz2agfrr9317fzj1bqkn82m9r4ys91gx1qh4"
},
"stable": {
"version": [
@@ -51269,11 +52120,11 @@
"repo": "emacs-jp/init-loader",
"unstable": {
"version": [
- 20160528,
- 1315
+ 20200520,
+ 2345
],
- "commit": "5d3cea1004c11ff96b33020e337b03b925c67c42",
- "sha256": "17bg4s8yz7yz28m04fp2ff6ld0y01yl99wkn2k5rkg4j441xg3n2"
+ "commit": "44829fa70f5c4cba03d36db5fa2c969001325b91",
+ "sha256": "1863s0qvnh7hcy2f86d86zajkqldvnz71q16dd9b4wvgnnicwk8s"
},
"stable": {
"version": [
@@ -51333,17 +52184,26 @@
},
{
"ename": "ink-mode",
- "commit": "855ea20024b606314f8590129259747cac0bcc97",
- "sha256": "02q95xay6z56i4l0j24dszxnfpjbxijlj4150nsadbv55m7nnjcf",
+ "commit": "8e5ed03afe02f3a53150c6046b8d6bfc12c9eea0",
+ "sha256": "027k27w9yjzmf6rm9ax2njf9aq4j1y4fa4i5388lf1mf8za9sv2s",
"fetcher": "github",
"repo": "Kungsgeten/ink-mode",
"unstable": {
"version": [
- 20160814,
- 1116
+ 20200611,
+ 1807
+ ],
+ "commit": "f610a2e7a5a5b176bdc831c66e52f85dc0e7e450",
+ "sha256": "0bssmf9nsg58xavf55wz1y7akw90bacxqd2czhmj4fnmykqd7cnz"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 3,
+ 0
],
- "commit": "e35f26abbaf8ea23c5aa0a0c7ef15334cdfb7b48",
- "sha256": "0ixqgk101gnm2q6f2bjk2pnqlrj41krqz56lss6fmf81xhxavmpp"
+ "commit": "f883fefb739d62e75a3f7247ea5c6ba8a0895c23",
+ "sha256": "1hr1n0xzjs84a2rgz4mfhhz3d2a7ibgn3wx4kg3qbjlwlwz17x0d"
}
},
{
@@ -51354,11 +52214,11 @@
"repo": "ideasman42/emacs-inkpot-theme",
"unstable": {
"version": [
- 20200515,
- 421
+ 20200616,
+ 434
],
- "commit": "0f289a3f465728ed41d532674166eef09ac7209b",
- "sha256": "1bchvrmmcbw8ird7i1klz0ds2xkfmwccz2pp59ixgys0j8cxnq4b"
+ "commit": "0a5f50c3aa590404ae81cdb08eb869ffc04da625",
+ "sha256": "0hnhq51r0rrl2i3hiwzqzax6cwm3j480w1w2nn8hy61x5p37wn06"
}
},
{
@@ -51423,6 +52283,33 @@
"sha256": "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q"
}
},
+ {
+ "ename": "insert-esv",
+ "commit": "de7f7ac1b8e67da50a1bce7f23a0805f8b8dfc06",
+ "sha256": "02s0jikma4qp38pf46jw0l6mqlx9kkfl7ny9zxzr6w2jmi8nc9nr",
+ "fetcher": "github",
+ "repo": "sam030820/insert-esv",
+ "unstable": {
+ "version": [
+ 20200808,
+ 1832
+ ],
+ "deps": [
+ "request"
+ ],
+ "commit": "cf23d1d7e230c0b9212f8eeceff398f86c991b07",
+ "sha256": "0jqz6krd8b606nqr4q169qcg7dbbwa86gi2rcxvnx5i3jhfhrmab"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
+ ],
+ "commit": "8a09629bfafa87f8cd75e92fee6655cfa8be67f2",
+ "sha256": "00w9k2r07nyzqrbqp9q77jgx1h976d1gmiq2nv6zxm36sqfvr0xl"
+ }
+ },
{
"ename": "insert-kaomoji",
"commit": "216fcef758036cf466fa5b52599394709eed48b3",
@@ -51601,10 +52488,10 @@
},
{
"ename": "intero",
- "commit": "1b56ca344ad944e03b669a9974e9b734b5b445bb",
- "sha256": "15n7ipsq8ylmq4blsycpszkx034j9sb92vqvaz30j5v307fmvs99",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "1a25lsm1psjvn9az3vd0an46p9qwrrmn09r16dqnhsjcaiabinxi",
"fetcher": "github",
- "repo": "commercialhaskell/intero",
+ "repo": "chrisdone/intero",
"unstable": {
"version": [
20200125,
@@ -51760,14 +52647,14 @@
"repo": "dotemacs/ipcalc.el",
"unstable": {
"version": [
- 20170926,
- 805
+ 20200809,
+ 1444
],
"deps": [
"cl-lib"
],
- "commit": "2720f7e3e662e04e195f8338b81a499cf321296a",
- "sha256": "1kmqbb9ca3sca59462ha21grbgxkl4wynz2lr4yqb4qk7cijgd6g"
+ "commit": "58b2b6c90af93ae46c5445b33ee4d1ef4bac1efb",
+ "sha256": "0v6ahhixp57p94m0sagidvq95m45bf4lfwszjzsn7a2wcrvap7r9"
}
},
{
@@ -51840,11 +52727,11 @@
"repo": "a13/iqa.el",
"unstable": {
"version": [
- 20181024,
- 2253
+ 20200520,
+ 1137
],
- "commit": "b45614f5204ed851de0abe93907aa94de5e37379",
- "sha256": "11wrmiwlp91x59cn9k2j2pqgvzbrnzvf81dqgm9l5ph5fym0jqsd"
+ "commit": "c1077aca6553cb2011f21b178e10271a17fe4f58",
+ "sha256": "0rr8m477hma3aaqxzmsayms6qgpf3ff1vx5bgcvbz27ddri375hh"
}
},
{
@@ -51901,8 +52788,8 @@
"cl-lib",
"json"
],
- "commit": "5f75fc0c9274f4622470e2324e2f4457087aa643",
- "sha256": "107ry1jxl7qiqa0ackn03whygndkabg20s7szl5xm1l87vx5xghc"
+ "commit": "1e1aabaa686a08767ab33e5cd43ce8f0ebf8d020",
+ "sha256": "1v3q0k93sviv2nn6qsi8f0537w2g0g6c3wamaidlcb019a5rj4vn"
},
"stable": {
"version": [
@@ -51926,15 +52813,15 @@
"repo": "ikirill/irony-eldoc",
"unstable": {
"version": [
- 20170502,
- 1908
+ 20200622,
+ 2214
],
"deps": [
"cl-lib",
"irony"
],
- "commit": "0df5831eaae264a25422b061eb2792aadde8b3f2",
- "sha256": "1l5qpr66v1l12fb50yh73grb2rr85xxmbj19mm33b5rdrq2bqmmd"
+ "commit": "73e79a89fad982a2ba072f2fcc1b4e41f0aa2978",
+ "sha256": "0nwwghsdv11bxqar4ppraxxmm6i076s7nmi9l2c53m708xn4p6pi"
}
},
{
@@ -51963,26 +52850,26 @@
"repo": "jcs-elpa/isearch-project",
"unstable": {
"version": [
- 20190505,
- 819
+ 20200717,
+ 807
],
"deps": [
- "cl-lib"
+ "f"
],
- "commit": "4d660afa365c82c3ed00f685b53f0d2358972d36",
- "sha256": "0klngpw69kdh3l9jrvjq63xlgpqd86j8rrvivrzipddmplppz9gy"
+ "commit": "9113d9452a9a879dc0e503f35e8c1fb4d44d9b64",
+ "sha256": "0gvr758kbfxcvrcwkvf8msibwbfqfp44zl99s7ls0gi81pgzwryj"
},
"stable": {
"version": [
0,
- 0,
- 7
+ 2,
+ 4
],
"deps": [
- "cl-lib"
+ "f"
],
- "commit": "462b8100451b947367aed2970c2669ea6d15edbd",
- "sha256": "0b8ncpi6kps7fx3fmgfwd2czaal52laf2k6pn46yh110sz6dl30m"
+ "commit": "9113d9452a9a879dc0e503f35e8c1fb4d44d9b64",
+ "sha256": "0gvr758kbfxcvrcwkvf8msibwbfqfp44zl99s7ls0gi81pgzwryj"
}
},
{
@@ -52132,20 +53019,19 @@
"repo": "doublep/iter2",
"unstable": {
"version": [
- 20200512,
- 2111
+ 20200517,
+ 1623
],
- "commit": "b87c1e8ac50f728e8d33b5b69bf4124ef90b88ba",
- "sha256": "09yasj1vfakryjvs22a3gd27wwa866b2pkvajwp8hlngk11sc3p3"
+ "commit": "987045585d60700b4b9e617313c1a73618a144c9",
+ "sha256": "0gaq3z2v1q4r9mkyq71dzmqakhi0p8g7ph4z0n3a11rvyc3z9ykx"
},
"stable": {
"version": [
- 0,
- 9,
- 11
+ 1,
+ 0
],
- "commit": "a6e228eefed8dd6a405c235c15e7a4ea726cae02",
- "sha256": "1n65202ap7qf44mv8f3ly5msp9fn12ap3cckhqb62ib3yw46ilwk"
+ "commit": "987045585d60700b4b9e617313c1a73618a144c9",
+ "sha256": "0gaq3z2v1q4r9mkyq71dzmqakhi0p8g7ph4z0n3a11rvyc3z9ykx"
}
},
{
@@ -52205,17 +53091,17 @@
},
{
"ename": "ivy",
- "commit": "06c24112a5e17c423a4d92607356b25eb90a9a7b",
- "sha256": "0xf5p91r2ljl93wbr5wbgnb4hzhs00wkaf4fmdlf31la8xwwp5ci",
+ "commit": "de5b4f40470cdfb4d2b4b3078436a7457f5703af",
+ "sha256": "0lrf3xxxi3b78z80sg6jkaz07gzqrv242ajiiy0rvly6da17i06z",
"fetcher": "github",
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20200515,
- 1845
+ 20200818,
+ 1250
],
- "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851",
- "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3"
+ "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44",
+ "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l"
},
"stable": {
"version": [
@@ -52227,6 +53113,25 @@
"sha256": "0ghcwrg8a6r5q6fw2x8s08cwlmnz2d8qjhisnjwbnc2l4cgqpd9p"
}
},
+ {
+ "ename": "ivy-avy",
+ "commit": "d820ccd91bcd265539276baedb656ab63d4a9c75",
+ "sha256": "1zanwbf0jcbi0v07n2j058r814dh0qs2qxmwlqrv12j7d1w72kd4",
+ "fetcher": "github",
+ "repo": "abo-abo/swiper",
+ "unstable": {
+ "version": [
+ 20200615,
+ 938
+ ],
+ "deps": [
+ "avy",
+ "ivy"
+ ],
+ "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44",
+ "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l"
+ }
+ },
{
"ename": "ivy-bibtex",
"commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3",
@@ -52294,15 +53199,15 @@
"repo": "wandersoncferreira/ivy-clojuredocs",
"unstable": {
"version": [
- 20190907,
- 2053
+ 20200714,
+ 1111
],
"deps": [
"edn",
"ivy"
],
- "commit": "dd33a25f1de4339f75f05689ed60fe1b1c97f554",
- "sha256": "0km1par5jhhbdbn1sccpsz0drqvmmjg1905xyc2bbfc2xx38cg1i"
+ "commit": "0ea57b70a144ecfa80fbd2ec383ebabedb524c37",
+ "sha256": "1hqs45573651jw248zcyczby4fwp4pdgil2n9rk4lvgb89531qlz"
}
},
{
@@ -52338,12 +53243,31 @@
"sha256": "0slisbnfcdx8jv0p67ag6s4l0m0jmrwcpm5a2jm6sai9x67ayn4l"
}
},
+ {
+ "ename": "ivy-emms",
+ "commit": "12b434e4c78b3428ee144559cb57ea41df8fb4c5",
+ "sha256": "1kqjdw94f2mg5m0zcnah1xk59dp152dm4si2rd9c66jn79s2ai4a",
+ "fetcher": "github",
+ "repo": "franburstall/ivy-emms",
+ "unstable": {
+ "version": [
+ 20200629,
+ 801
+ ],
+ "deps": [
+ "emms",
+ "ivy"
+ ],
+ "commit": "6f547f9f3dcbf0d5b88595760b3505c7195dc96b",
+ "sha256": "0bqn0hqdrw8psc8r6xcx6dxrjy7llkfpm0fd1k6ra4ybncgaznfg"
+ }
+ },
{
"ename": "ivy-emoji",
- "commit": "f1121a85321a3184d1fa990ae86f5d1f3b04f145",
- "sha256": "0sp8z7r1kffgfm4jrn5cqfi335vaynn27hs9345ybrxi3r4a3c0g",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "037r1j2s632a1v05gynlclh6slnhp6mxn55fyx02qw1507l5ap74",
"fetcher": "github",
- "repo": "sbozzolo/ivy-emoji",
+ "repo": "Sbozzolo/ivy-emoji",
"unstable": {
"version": [
20200316,
@@ -52518,15 +53442,15 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20200421,
- 1120
+ 20200608,
+ 1010
],
"deps": [
"hydra",
"ivy"
],
- "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851",
- "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3"
+ "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44",
+ "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l"
},
"stable": {
"version": [
@@ -52550,15 +53474,15 @@
"repo": "julienXX/ivy-lobsters",
"unstable": {
"version": [
- 20171202,
- 2041
+ 20200818,
+ 1406
],
"deps": [
"cl-lib",
"ivy"
],
- "commit": "4364df4b3685fd1b50865ac9360fb948c0288dd1",
- "sha256": "1cfcy2ks0kb04crwlfp02052zcwg384cgz7xjyafwqynm77d35l0"
+ "commit": "3f7f90751d15ebcf91253ef3cda18c0aa7d856ff",
+ "sha256": "034ln7r1fgsgpxgmk4iv08pkjkxmdc0c0q44hqv2ryb1zkbwija1"
}
},
{
@@ -52603,45 +53527,15 @@
"repo": "akirak/ivy-omni-org",
"unstable": {
"version": [
- 20200125,
- 807
+ 20200810,
+ 1050
],
"deps": [
"dash",
"ivy"
],
- "commit": "113477ae46ec857c5794fc0a031c1e579615f0a9",
- "sha256": "1j9gwl3azh6y24yiy2s9p9yh6vhs2rmydv2496ivwxqnq9md5b49"
- }
- },
- {
- "ename": "ivy-pages",
- "commit": "93f1183beb74aa4a96de8cd043a2a8eefdd7ad7e",
- "sha256": "0zz8nbjma8r6r7xxbg7xfz13202d77k1ybzpib41slmljzh7xgwv",
- "fetcher": "github",
- "repo": "igorepst/ivy-pages",
- "unstable": {
- "version": [
- 20160728,
- 1920
- ],
- "deps": [
- "ivy"
- ],
- "commit": "47b03a1f9384502cf22369ff31a2898c863d3aff",
- "sha256": "0jv74s8jn1sdwdhxkx11gnaqcc49369gld1g6a1hl62521j897rc"
- },
- "stable": {
- "version": [
- 0,
- 1,
- 1
- ],
- "deps": [
- "ivy"
- ],
- "commit": "428a901f94c9625c8407fd2bf76f9d7714d40d87",
- "sha256": "11lcv8dqlmfqvhn7n3wfp9idr5hf30312p213y5pvs4m70lbc9k2"
+ "commit": "a6b284f65b229d9b118b4316c2f6377de93400b1",
+ "sha256": "028c51z4glxxrni1vjdzs9l1475jmcjagpgwaryiqdwx6clia59x"
}
},
{
@@ -52690,15 +53584,15 @@
"repo": "tumashu/ivy-posframe",
"unstable": {
"version": [
- 20200331,
- 536
+ 20200528,
+ 553
],
"deps": [
"ivy",
"posframe"
],
- "commit": "ae9bafe94fe6b77b6fe45766ae6172646f6a5d50",
- "sha256": "1j6yns5d7lh2v1nfcznrirl7qicdli9csciqvfgj4gkh72a97pw1"
+ "commit": "44749562a9e68bd43ccaa225b31311476fab1251",
+ "sha256": "12wj8v483jjnpjvcgkhlm0p971s06c58c3fd73pgnzzppf0fn7xd"
}
},
{
@@ -52709,27 +53603,27 @@
"repo": "raxod502/prescient.el",
"unstable": {
"version": [
- 20200415,
- 1457
+ 20200716,
+ 1414
],
"deps": [
"ivy",
"prescient"
],
- "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7",
- "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv"
+ "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530",
+ "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p"
},
"stable": {
"version": [
- 4,
- 1
+ 5,
+ 0
],
"deps": [
"ivy",
"prescient"
],
- "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0",
- "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3"
+ "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc",
+ "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix"
}
},
{
@@ -52771,14 +53665,14 @@
"repo": "Yevgnen/ivy-rich",
"unstable": {
"version": [
- 20200428,
- 110
+ 20200601,
+ 104
],
"deps": [
"ivy"
],
- "commit": "3f818b201769bc13cc75aa73645217e374136aca",
- "sha256": "19w1mmqg15xy963f2h50i0cz0gmii75yarkmv2ssfh164pkyvhdk"
+ "commit": "10970130b41c6ef9570893cdab8dfbe720e2b1a9",
+ "sha256": "0zpkgj2q16hncafpbap32ypm3666j2vvcrwsn78mca9i82j7xg7l"
},
"stable": {
"version": [
@@ -52808,8 +53702,8 @@
"ivy",
"rtags"
],
- "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710",
- "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr"
+ "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824",
+ "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b"
},
"stable": {
"version": [
@@ -52886,8 +53780,8 @@
"repo": "mkcms/ivy-yasnippet",
"unstable": {
"version": [
- 20181002,
- 1655
+ 20200704,
+ 700
],
"deps": [
"cl-lib",
@@ -52895,8 +53789,8 @@
"ivy",
"yasnippet"
],
- "commit": "ebf05761cd890bccd8072051f988dae7ab11c9ce",
- "sha256": "01dc8hv464r3q3d6whix76sqwfkjcvhdg55jmw0ck9jwmhwsvc7x"
+ "commit": "83402d91b4eba5307f71884a72df8e11cc6a994e",
+ "sha256": "07a4bk3hva41qzz8x4qyswa2f89psxhih89k0slhngw5d8iidx3i"
}
},
{
@@ -53075,11 +53969,11 @@
"url": "https://bitbucket.org/sbarbit/jack-connect",
"unstable": {
"version": [
- 20200325,
- 1639
+ 20200519,
+ 1027
],
- "commit": "c227d1ed3016960c8666a60e4215bbb029436bc7",
- "sha256": "1w66dpn0cmdqwgjd1528cd2739ijxhsr62zyx2arlr9ldrnqy5f6"
+ "commit": "fae8c5f9b383f7606f3883badfd1294e8affb0db",
+ "sha256": "0r6dihw5dar7w6h5xvif25fv9alwarb74mmaxq2ld8rbhv4il66c"
}
},
{
@@ -53163,33 +54057,6 @@
"sha256": "041rww8ngvjmgkiviqwq6wci8wgh4bs0wjjc8v8lqpwqhbzf65jy"
}
},
- {
- "ename": "japanlaw",
- "commit": "6192e1db76f017c3b1315453144cffc47cdd495d",
- "sha256": "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa",
- "fetcher": "github",
- "repo": "mhayashi1120/japanlaw.el",
- "unstable": {
- "version": [
- 20160615,
- 643
- ],
- "deps": [
- "cl-lib"
- ],
- "commit": "1bbdef942f28c61a0adb89d1b3c2cca5b10ca2dc",
- "sha256": "1vj5b551383acp77lawvlw5cfvnqidjhd52sig3kz8v4bzz73cch"
- },
- "stable": {
- "version": [
- 0,
- 9,
- 1
- ],
- "commit": "d90b204b018893d5d75286c92948c0bddf94cce2",
- "sha256": "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h"
- }
- },
{
"ename": "jape-mode",
"commit": "b034024bd31c4be96c478a951b0ef63d8f89a1b7",
@@ -53353,14 +54220,14 @@
"repo": "zk-phi/jaword",
"unstable": {
"version": [
- 20170426,
- 627
+ 20200816,
+ 647
],
"deps": [
"tinysegmenter"
],
- "commit": "ac062b0e5ab4bd3270497e80aa0f3ac033a0493f",
- "sha256": "05kbscympb59njfrs94w4b2lwkc3057wzib65kq0l93bx4pcw2iy"
+ "commit": "45e350895fc55f087a2102fded5b306811089a7d",
+ "sha256": "02ncm22wldx8g3iibdw92gk4hdig0209f7bmhxrhgdv8xp544c2h"
}
},
{
@@ -53594,15 +54461,15 @@
"repo": "rmuslimov/jenkins.el",
"unstable": {
"version": [
- 20200115,
- 2133
+ 20200524,
+ 2016
],
"deps": [
"dash",
"json"
],
- "commit": "29e27a685ec971b518251ce0e66a0b67d78ea395",
- "sha256": "0ms9i4dww801q09n4wzjpaqd6k89xdkn5vx3i565p748kp9lqhz6"
+ "commit": "bd06cdc57c0cb9217d773eeba06ecc998f10033b",
+ "sha256": "0g99bi3i27ay8xhz409k9ska9yy77j3k687l817k1fyhlyy5lpjk"
}
},
{
@@ -53620,16 +54487,34 @@
"sha256": "0jayhv8j7b527dimhvcs0d7ax25x7v50dk0k6apisqc23psvkq66"
}
},
+ {
+ "ename": "jenkinsfile-mode",
+ "commit": "a579d11271a8f46a65cf557b74f84db36a7b8bb4",
+ "sha256": "1j70gp8w5f3nli5m08s9ysl3k7pys6n4bzdzmbq0r9yzl02i6m8r",
+ "fetcher": "github",
+ "repo": "john2x/jenkinsfile-mode",
+ "unstable": {
+ "version": [
+ 20200725,
+ 2325
+ ],
+ "deps": [
+ "groovy-mode"
+ ],
+ "commit": "00d259ff9b870d234540e00e1d7c83cccdb063b8",
+ "sha256": "0srf6xdjnrd4v4ks9pal7i48wmkcl4q5ry7d0yzfx1c9pz2qg9zx"
+ }
+ },
{
"ename": "jest",
- "commit": "a656c058c423ea6396b831d45c6dbb9bce6c4881",
- "sha256": "10xsqcjskh2s6mlh07vf10whaas3aqm18hk3w309r3n1qmqihf75",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "1x9dqyrpri2giqzzlcg0nnq6wjfdfmy9fqqrq159qvw8rshvfzcz",
"fetcher": "github",
- "repo": "emiller88/emacs-jest",
+ "repo": "Emiller88/emacs-jest",
"unstable": {
"version": [
- 20200318,
- 237
+ 20200625,
+ 1611
],
"deps": [
"cl-lib",
@@ -53640,8 +54525,8 @@
"projectile",
"s"
],
- "commit": "b51be19c1de9e82ee1dc62921be2222fc5685eed",
- "sha256": "1jdphlhp9vxvkj51cswqfgka910216snyjhql700x4dgpmvkcv56"
+ "commit": "4c6ddd3304e199211f0fbdc8a5b83ccbfe1f7fcc",
+ "sha256": "1v940c6p77dhs3rf016qqzhaniifkfsspbkpknf7vdssxgk9g1a5"
}
},
{
@@ -53718,11 +54603,11 @@
"repo": "paradoxxxzero/jinja2-mode",
"unstable": {
"version": [
- 20141128,
- 1007
+ 20200718,
+ 730
],
- "commit": "cfaa7bbe7bb290cc500440124ce89686f3e26f86",
- "sha256": "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381"
+ "commit": "ecd19a40b7832bb00f0a2244e3b0713d0bf3850d",
+ "sha256": "05z380d8ln53mx1gqa7awnv4wpqdhv7ggc91dds57681wzsqgz15"
},
"stable": {
"version": [
@@ -53756,15 +54641,15 @@
"repo": "nyyManni/jiralib2",
"unstable": {
"version": [
- 20200331,
- 1940
+ 20200520,
+ 2031
],
"deps": [
"dash",
"request"
],
- "commit": "ccf69e417911e091ec4c28d47d178ee63196c626",
- "sha256": "170fjz7k9bk17qk7wrd56xw484xp8zckx635360pm0lfg4dvycpc"
+ "commit": "c21c4e759eff549dbda11099f2f680b78d7f5a01",
+ "sha256": "0yrcc9yfz9gxkhizy03bpysl1wcdbk0m6fj9hkqw3kbgnsk25h4p"
}
},
{
@@ -53823,6 +54708,29 @@
"sha256": "0v4xiq3xf7c52rmyymw8a4ws85ij0xy7pr7625gf15359cs5chs9"
}
},
+ {
+ "ename": "journalctl-mode",
+ "commit": "38710d44fba3c886431d1acb7477ae4035cf00c1",
+ "sha256": "126gj6rh6j0j6lbygx15lg5qxfaz4bpspbzd1hv3h05nvnnykv3h",
+ "fetcher": "github",
+ "repo": "SebastianMeisel/journalctl-mode",
+ "unstable": {
+ "version": [
+ 20200607,
+ 754
+ ],
+ "commit": "e8e057f387266d1c11f8fb68023ceb9607404948",
+ "sha256": "1l9z0w8kb15vsfpwcl9rfhflmvy8illsssfqjxkcwl8d7pzfhm8n"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 8
+ ],
+ "commit": "457e38af67427e92d6217abbb362ca9673b33ed5",
+ "sha256": "1lnjgpbvs3b7h1m1lnd4g3965pjn1sw4vyjd3f4106s10llmkd8x"
+ }
+ },
{
"ename": "jpop",
"commit": "2a52a3cf909d12201196b92685435f9fa338b7ba",
@@ -53892,11 +54800,11 @@
"repo": "ljos/jq-mode",
"unstable": {
"version": [
- 20200516,
- 1606
+ 20200604,
+ 833
],
- "commit": "85214664a9f20faab7c45087b28bedd0feabb560",
- "sha256": "0kvi1cqn4hdcs2mc4lsddy01yyixvm2ykqq6j4yb9h07lixrxih6"
+ "commit": "42ad0a99f0114233e2cb317585cb9af494d18a2f",
+ "sha256": "1n4w45yv1k7979j42dahhp9356p9bmk6ldybqa0z65k9gz4abkxl"
},
"stable": {
"version": [
@@ -53953,8 +54861,8 @@
20180807,
1352
],
- "commit": "306abcfb9f6e46962061a34b68d4f6baa8c7aba4",
- "sha256": "1pifplr4qr9667bbbqgqg39v8dyglvg6ljglkjga0d2n39am7r2q"
+ "commit": "9d9460b17f59e4e7a4e5cc34576ba72b2ca56524",
+ "sha256": "0hil53mzvxz71l908wm6804migvm7hm0nwm8qpyy2dgnfzl996hg"
},
"stable": {
"version": [
@@ -54144,14 +55052,14 @@
"repo": "mooz/js2-mode",
"unstable": {
"version": [
- 20200427,
- 33
+ 20200725,
+ 112
],
"deps": [
"cl-lib"
],
- "commit": "515d876c6ae45a61cf67a7bd5723fe4c9e518756",
- "sha256": "05pgyisb2szbrfbv6wjhfi8c00gakv51jxb8j73pji30v2a9rapn"
+ "commit": "40aab27581279d0fdbfeb9afeb85f39d401a927f",
+ "sha256": "0ysd0ji3vvk2zpjcg1wl7b2hva8471vq0ypib4h6spnpjdr43vzk"
},
"stable": {
"version": [
@@ -54202,6 +55110,24 @@
"sha256": "1iwblf5i7k1i1ax9pjv7n8zv9q157krirdn0gwcib6dwza2i30jp"
}
},
+ {
+ "ename": "js2hl",
+ "commit": "7c7f441e411427ed570f0aa0b04e46d088debecc",
+ "sha256": "09jp7cy5jgcmhrpa2x48q39shpcgw1xm3g73aqmlhcw7wfn6q1b5",
+ "fetcher": "github",
+ "repo": "redguardtoo/js2hl",
+ "unstable": {
+ "version": [
+ 20200729,
+ 146
+ ],
+ "deps": [
+ "js2-mode"
+ ],
+ "commit": "0255339dbb9fdfb009c94beefdc60e78baae11a7",
+ "sha256": "19vw96z28zgkkb93zq6ndslc20yg3qip44fqzvnsf8qr9wxxl3g1"
+ }
+ },
{
"ename": "js3-mode",
"commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228",
@@ -54479,11 +55405,11 @@
"repo": "mgyucht/jsonnet-mode",
"unstable": {
"version": [
- 20200218,
- 2217
+ 20200812,
+ 1558
],
- "commit": "d8b486c8376a4785a7f2dc8a16fe1f2d82c6bfae",
- "sha256": "0xpy699jh6ia46brd7i2qrfi0zrcdrhj3dc8d275va9w8a78paks"
+ "commit": "c8422a617438c79ade98f8d9eeb2086dacb0378c",
+ "sha256": "1r2ic7gbngbwmjjcigphj8jamaff42s7bsn6xz7yfzrci0gm8jrd"
},
"stable": {
"version": [
@@ -54558,11 +55484,11 @@
"repo": "JuliaEditorSupport/julia-emacs",
"unstable": {
"version": [
- 20200504,
- 1726
+ 20200717,
+ 1915
],
- "commit": "839726af374991223ffe56f7e7d10bef81033d09",
- "sha256": "0lspmp519py7adippfmz70zcd9dpz46x8a3wlda71a5pdjs5szfq"
+ "commit": "b5f5983d2b232c8bba4c5eff75cccdb787c19d98",
+ "sha256": "0pxaga920bab6n5byag6h0wql2akiybhsh9nlinfx708i9dzmvv6"
},
"stable": {
"version": [
@@ -54581,14 +55507,14 @@
"repo": "tpapp/julia-repl",
"unstable": {
"version": [
- 20200310,
- 1145
+ 20200625,
+ 924
],
"deps": [
"s"
],
- "commit": "5fa04de4e76e10d5ee37d4244f48ddae4503faa1",
- "sha256": "1xnb3r5999ipkkvh7fl2kr0yy0j3vmnw7a6n23m9ps4fvy6hpl9n"
+ "commit": "d073acb6339e99edf77833f82277afd9a076f16a",
+ "sha256": "1p2d92mcbdl8j22qz04iwdlpkbv2qn9p8ds8n2vpf4m9mgzjplzi"
},
"stable": {
"version": [
@@ -54620,14 +55546,14 @@
},
{
"ename": "julia-snail",
- "commit": "4b80da8bdccaa0992deb07cef7ea4a582d9707ae",
- "sha256": "0yljiqgamm5gjr1dbzjfqvnrijhgrpjd7gj8and1w33s1d2qh8gd",
+ "commit": "5510bd5788fc1dab3049100f9a993d89fcd10601",
+ "sha256": "0bbz4r0xygx9hcddk5r64w9hycvxqvl7y6z53smlwns1pj7n9wvp",
"fetcher": "github",
"repo": "gcv/julia-snail",
"unstable": {
"version": [
- 20200515,
- 2010
+ 20200810,
+ 1941
],
"deps": [
"cl-lib",
@@ -54638,8 +55564,8 @@
"spinner",
"vterm"
],
- "commit": "c9aff5ffe6df951dd5343f05d6e4170203a7032a",
- "sha256": "065ix3jycsx3wvkq7a6060i93caxisdvgxgqb1l6rq15n4qln78y"
+ "commit": "44d06e18cf9ded6c05936ce10aca0a73f768f457",
+ "sha256": "0hpypirqc2hd1zga5qjcx2i7vp3h2vif76npd0j10hiimxal1kxz"
},
"stable": {
"version": [
@@ -54803,8 +55729,8 @@
"websocket",
"zmq"
],
- "commit": "785edbbff65abb0c929dc2fbd8b8305c77fd529e",
- "sha256": "1l1fd062dmig3mgkwixr4ly8x12z9skh5wj18hkyc84n7rwdar47"
+ "commit": "360cae2c70ab28c7a7848c0c56473d984f0243e5",
+ "sha256": "1bn0jwpigpl5n45vpz73vv12g078151vyhkkhkwy5xqx627swxf9"
},
"stable": {
"version": [
@@ -54860,14 +55786,26 @@
"repo": "TxGVNN/emacs-k8s-mode",
"unstable": {
"version": [
- 20191006,
- 849
+ 20200803,
+ 1549
+ ],
+ "deps": [
+ "yaml-mode"
+ ],
+ "commit": "9364cdbbae00055c4efa1eeb80503e0b0a215743",
+ "sha256": "1ap8nwlv9ha5a03gc10sva12sc6qzq1vig8hibg1igbsc1qmfkad"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
],
"deps": [
"yaml-mode"
],
- "commit": "5984acee6f3891afa78acfd1d08c44a24953a233",
- "sha256": "11x602pmqa3833azkzph1ghm354nypv6rr1y53k6kdrkwviwkcpm"
+ "commit": "9364cdbbae00055c4efa1eeb80503e0b0a215743",
+ "sha256": "1ap8nwlv9ha5a03gc10sva12sc6qzq1vig8hibg1igbsc1qmfkad"
}
},
{
@@ -54999,16 +55937,16 @@
"repo": "jmorag/kakoune.el",
"unstable": {
"version": [
- 20191017,
- 1502
+ 20200621,
+ 1818
],
"deps": [
"expand-region",
"multiple-cursors",
"ryo-modal"
],
- "commit": "d73d14e69ea38076af50cc69f846808383ff539d",
- "sha256": "0nk6jdy1y5mc3ryd0smiqghrk6iv34d5grc7f7migmshlbq0np92"
+ "commit": "ea8dde5dfe59c54d7729b141024976535b472573",
+ "sha256": "04ixj4cpw5iayxxwly5sr19lfnyss5cac0vsd0q1x3ys57y9v9im"
}
},
{
@@ -55121,28 +56059,28 @@
"repo": "ogdenwebb/emacs-kaolin-themes",
"unstable": {
"version": [
- 20200508,
- 1621
+ 20200817,
+ 1844
],
"deps": [
"autothemer",
"cl-lib"
],
- "commit": "15e2612eba2eeb223f6b4e5ac4a55dc5da09b14a",
- "sha256": "0qay924qz5ab7a4d7cnancfnb7ivra33dr6knwqmy3wf089jl6kk"
+ "commit": "380bcb745c9bbf7328b7f190680a0e51231e3c3e",
+ "sha256": "1yw1c97ynjjr3md2shrhviiqycaggcmzhkb0i5y49b2w2mdvp1fa"
},
"stable": {
"version": [
1,
- 5,
- 4
+ 6,
+ 0
],
"deps": [
"autothemer",
"cl-lib"
],
- "commit": "db1c43915fe68f31fffa00159b4198c32e87c8ed",
- "sha256": "038bqg66m5cpg1w70la3jr57rq9fngmb1g67z27lpqcf3xf416xc"
+ "commit": "3e2c700aa1cf9f0ee17486ef9a7a68f77fb9946a",
+ "sha256": "07lydl1b8fz4g4q22ffrl6li9kc3zp9zq5rpqghzr9b8f56ddfqj"
}
},
{
@@ -55217,11 +56155,11 @@
"repo": "delaanthonio/kconfig-mode",
"unstable": {
"version": [
- 20190818,
- 2030
+ 20200628,
+ 1721
],
- "commit": "02bb919596cf673828e95872dc329f2424a99864",
- "sha256": "1h0v9528d2ssjgqa8813l3anhz15aggsmf8yln0qpphhrlrkfmpz"
+ "commit": "d9fdf751646abe2b75b7bbeb46e7552e0f36f290",
+ "sha256": "0dhkggvni5k4rnj2m6lva99hj1925b4w24dh9nv3m9w0x7b49263"
}
},
{
@@ -55263,6 +56201,39 @@
"sha256": "0kyzcws47ch3pkw9ijb4gjr7l933c3mrxc9bsy16ddkc8dvl7yng"
}
},
+ {
+ "ename": "keg",
+ "commit": "78d46bbc822f5df56aa83b986a4f283949533d5b",
+ "sha256": "1cmbpak0rn6xz0ccpn1629qp0wn7rpv40js4jr958a2z89448g3g",
+ "fetcher": "github",
+ "repo": "conao3/keg.el",
+ "unstable": {
+ "version": [
+ 20200726,
+ 228
+ ],
+ "deps": [
+ "cl-lib"
+ ],
+ "commit": "fea2f831d84d7642c35820bb63250487e46683e5",
+ "sha256": "062lnv7g9ixs6d0qzp6py9ajd2rbrk7l2yrz3dn5zz8lx06hbaga"
+ }
+ },
+ {
+ "ename": "keg-mode",
+ "commit": "bb72a113cefcc1e42a1fe9ea00404fbc6ee8d917",
+ "sha256": "13g43mfja6b84bkfzinr2f39viyrix5xf4xwg7kg66zpy12bshiv",
+ "fetcher": "github",
+ "repo": "conao3/keg.el",
+ "unstable": {
+ "version": [
+ 20200601,
+ 333
+ ],
+ "commit": "fea2f831d84d7642c35820bb63250487e46683e5",
+ "sha256": "062lnv7g9ixs6d0qzp6py9ajd2rbrk7l2yrz3dn5zz8lx06hbaga"
+ }
+ },
{
"ename": "kerl",
"commit": "166afdc776689b0da93576dbeaa71ff6dfb627db",
@@ -55407,20 +56378,20 @@
"repo": "tarsius/keycast",
"unstable": {
"version": [
- 20200418,
- 2028
+ 20200612,
+ 2247
],
- "commit": "a912c4db1b88390f76b14e3b47ded314fdc8f48c",
- "sha256": "07gfldj9y4jfvna1rqlr7w6y6daqdsvc1fb2m7acjn37bpmfrc3b"
+ "commit": "038475c178e90c7bad64d113db26d42cad60e149",
+ "sha256": "1926khkdak2d1wgrgrfzhsv9l5f0rrl1rws78c3zw8ikwl8k7wbl"
},
"stable": {
"version": [
1,
0,
- 1
+ 3
],
- "commit": "adb55497c0f16e90069d6e5e86b4f9f65f13624b",
- "sha256": "1sprdfx0gvyqmq0fkf4bf56q3d8xxig2vxi38nzjx90llzvka35q"
+ "commit": "038475c178e90c7bad64d113db26d42cad60e149",
+ "sha256": "1926khkdak2d1wgrgrfzhsv9l5f0rrl1rws78c3zw8ikwl8k7wbl"
}
},
{
@@ -55517,13 +56488,13 @@
"version": [
3,
0,
- 2
+ 3
],
"deps": [
"cl-lib"
],
- "commit": "0b9bb7f4959ca54f0827b202f513ec7508c11e0e",
- "sha256": "11y1vdrj2isn00mh428ynzqnfxjsg0138wx0bs619j0pv6d3j09g"
+ "commit": "195e0ca5b1b9967faf94a3e5a634d8975b796705",
+ "sha256": "0ckv9mbqb1f2lp17sv3nxjwww4ph9v3bhlxwvchvkkdlbcg87i5n"
}
},
{
@@ -55549,11 +56520,11 @@
"repo": "chuntaro/emacs-keypression",
"unstable": {
"version": [
- 20200514,
- 822
+ 20200819,
+ 534
],
- "commit": "1e00bbdb451fd88bde9917526fd0b13b2a1bd26c",
- "sha256": "06j8pqss8izhyahf0nw95mg34lbclhzk4f5vzfg35qcmjmbmqzg6"
+ "commit": "9427241f3fa539e4b5ad7581a05eb7e49f2cf518",
+ "sha256": "0p2pag2hzxswsf5hzjfm0nf4wpp40lsmxf1x6n9vfwfrpfk5b9ar"
}
},
{
@@ -55571,8 +56542,8 @@
"cl-lib",
"dash"
],
- "commit": "41bbfc4dbed5de6ecf3ec1dba634c7c26241ca84",
- "sha256": "0cm6naqlwk65xy9lwnn5r7m6nc1l7ims2ckydmyzny5ak8y5jbws"
+ "commit": "45ce83c4b56f064874256db37e697a63b2c69e65",
+ "sha256": "0fcz1qw3mw4m8albs1ybixrcz8yqgwip69fr99cd5bxfyr6zqj6d"
},
"stable": {
"version": [
@@ -55730,8 +56701,8 @@
"deps": [
"cl-lib"
],
- "commit": "e77fcf46284afa1fd13499db695745112f41c8cd",
- "sha256": "0c65qnsibcppyrf3bqp4blv2bfamisfwgxqy90z0gkbxzw9q4lxw"
+ "commit": "7db85a3f3004ff400e24105d1875f4e3a6eec7a6",
+ "sha256": "02nv6hzzr60gn24ra88smrwmkfjcb33c987dcgxqv7rzjpdjagnx"
},
"stable": {
"version": [
@@ -55842,8 +56813,8 @@
20180702,
2029
],
- "commit": "c0227c5ce4011033b5f0cf2815c352d123a13305",
- "sha256": "1l3fjljm7abk29ibbbvds7nq72yqrgcsy5bv42s1czbffw62zcn6"
+ "commit": "f34c43f235f35767ed04765a90d68b23807436ba",
+ "sha256": "06pgjd79kvkpznniw90hrsb7fvc0y3hhnxs6pyay869d50vbyw53"
},
"stable": {
"version": [
@@ -55851,10 +56822,10 @@
0,
0,
-1,
- 2
+ 3
],
- "commit": "78fb93b88f9941c22be02d36a786db8ca7639c59",
- "sha256": "1z59fi9q32xql1w7pjh4w1jzfz1n63a0lr5x38kwjj79dpz3ccal"
+ "commit": "20c14b2a2bac73288a4c2808843910364565f66a",
+ "sha256": "1mf3if96cvxc8sqy22h4j2aq320ngw6q2286psvpq9v1mhv0wna4"
}
},
{
@@ -55865,15 +56836,15 @@
"repo": "stardiviner/kiwix.el",
"unstable": {
"version": [
- 20200512,
- 1321
+ 20200714,
+ 1357
],
"deps": [
"cl-lib",
"request"
],
- "commit": "dd02284149027694e4cf16d6f4daf1f6dd011249",
- "sha256": "0zhg9467id0jd516hnz4c6aqmjp5q1s95fkhjxbk3g9j11cnfjf0"
+ "commit": "cb3e2531a55b896b9b41f38f97a597c26433da8e",
+ "sha256": "077bng1mwnd1m8ji4a44aqly94d07k09grwk0j52kgxlhvv3p3di"
},
"stable": {
"version": [
@@ -56130,16 +57101,16 @@
"repo": "abrochard/kubel",
"unstable": {
"version": [
- 20200429,
- 1454
+ 20200812,
+ 2143
],
"deps": [
"dash",
"s",
"transient"
],
- "commit": "7a0f095992cc135babfbf9706b6eb927e0d0c883",
- "sha256": "0g6sr8ndbig0vgqy7791hkzn89m5lj7qfq36inh5ci9q9r343ggg"
+ "commit": "55099f130803b56eb1f7595ba34a313df4ec138a",
+ "sha256": "1sly3fgdrynazaab0nb7hbxs0vb42g0r00m7zr162kqw7n57gxaw"
},
"stable": {
"version": [
@@ -56165,8 +57136,8 @@
"evil",
"kubel"
],
- "commit": "7a0f095992cc135babfbf9706b6eb927e0d0c883",
- "sha256": "0g6sr8ndbig0vgqy7791hkzn89m5lj7qfq36inh5ci9q9r343ggg"
+ "commit": "55099f130803b56eb1f7595ba34a313df4ec138a",
+ "sha256": "1sly3fgdrynazaab0nb7hbxs0vb42g0r00m7zr162kqw7n57gxaw"
},
"stable": {
"version": [
@@ -56351,11 +57322,11 @@
"repo": "MetroWind/lab-theme",
"unstable": {
"version": [
- 20200204,
- 1931
+ 20200815,
+ 2104
],
- "commit": "2cd61072d2b4c563d961f80918fc6b1dc45f7ba4",
- "sha256": "0jwslzxjyclr4iw8ir0glcj5iasgx2z9i16qn7705sdmdmbzkdwz"
+ "commit": "9d7deb9635959d3a50ccb1082eb1207275f4b3e8",
+ "sha256": "0ifpg3vz84x87a1xsx0db79v14bfdnbaha6p4hcvaj67hi58qa81"
}
},
{
@@ -56405,15 +57376,15 @@
"repo": "Deducteam/lambdapi",
"unstable": {
"version": [
- 20200513,
- 1043
+ 20200706,
+ 1546
],
"deps": [
"eglot",
"math-symbol-lists"
],
- "commit": "a3d4ae8863e268c88664ce869e9469c8a42d2e05",
- "sha256": "1v8w70x1jnald6k22ipa7d9z1ggcf2imr97wbw3i48dp4iv21zqd"
+ "commit": "665cb18e484b8e41b0314fc442422b671cda2962",
+ "sha256": "0qsd30xnhzcvfdk0p2adzrbzl6hw4z5is0wwirzr79qx025zm4gf"
}
},
{
@@ -56472,26 +57443,26 @@
"repo": "mhayashi1120/Emacs-langtool",
"unstable": {
"version": [
- 20200117,
- 441
+ 20200529,
+ 230
],
"deps": [
"cl-lib"
],
- "commit": "a71ed02ce06920ae3cafd6708de1c21811ce14c3",
- "sha256": "1ars70nx8gxb8szlp6jyqjll9gr7j9z5cd9ip1izqv00si6p1fvn"
+ "commit": "8276eccc5587bc12fd205ee58a7a982f0a136e41",
+ "sha256": "1pkfazn6qy6n4rg1rvw7b79b7nsp7xqdadhpah4xjvqxd6apqasz"
},
"stable": {
"version": [
2,
- 0,
- 4
+ 2,
+ 1
],
"deps": [
"cl-lib"
],
- "commit": "adb80f55665db65a46fc552d364386d3cc703d94",
- "sha256": "15bbyc0fqdn7d0k8zrn71jljkq9cc8a5rcllywvph46lnfnqy3p6"
+ "commit": "0fe79567244ca719448c55a89082505596a2359a",
+ "sha256": "1pkfazn6qy6n4rg1rvw7b79b7nsp7xqdadhpah4xjvqxd6apqasz"
}
},
{
@@ -56520,26 +57491,26 @@
"repo": "lassik/emacs-language-id",
"unstable": {
"version": [
- 20200409,
- 607
+ 20200726,
+ 1813
],
"deps": [
"cl-lib"
],
- "commit": "bf17d80b6c4b58fb66cddc2b2914f57d48468e97",
- "sha256": "1p21smbm3z6xfq0zk8pv62wppbbxx8mh994ax8b00kh16j7yhh2c"
+ "commit": "aa541a4461a07add17374fd56aef6e2fd1a61c60",
+ "sha256": "0mxwch6692mb5d9l5hzbscrg61a3sxf2wjbn66q06b5a2r2wkqvn"
},
"stable": {
"version": [
0,
- 5,
+ 7,
1
],
"deps": [
"cl-lib"
],
- "commit": "bf17d80b6c4b58fb66cddc2b2914f57d48468e97",
- "sha256": "1p21smbm3z6xfq0zk8pv62wppbbxx8mh994ax8b00kh16j7yhh2c"
+ "commit": "aa541a4461a07add17374fd56aef6e2fd1a61c60",
+ "sha256": "0mxwch6692mb5d9l5hzbscrg61a3sxf2wjbn66q06b5a2r2wkqvn"
}
},
{
@@ -56574,8 +57545,8 @@
"repo": "mihaiolteanu/lastfm.el",
"unstable": {
"version": [
- 20200320,
- 1839
+ 20200701,
+ 715
],
"deps": [
"anaphora",
@@ -56584,8 +57555,8 @@
"request",
"s"
],
- "commit": "54636059512adec0176950e8fce3b9bf7423619d",
- "sha256": "1ffvh71vgsdv118hhz0x2xfmqb2bayk7i3mdxc1ybs2vrdggnim4"
+ "commit": "cfa5e9b0b1f54884dc36ae5d8f35e3c6b841ef74",
+ "sha256": "1m1qf5f7kq7d720inkks6wwwn4hf40lrz4755gwnnn6d5zf0b1ix"
},
"stable": {
"version": [
@@ -56784,11 +57755,11 @@
"repo": "pekingduck/launchctl-el",
"unstable": {
"version": [
- 20150518,
- 1309
+ 20200531,
+ 1043
],
- "commit": "73f8f52a5aa9a0be9bdcf68c29ad0fa2b4a115a4",
- "sha256": "154z7bhb7qagvl3dlgrlsxdg4chz2863ijglg47xs3yhjp5ypanj"
+ "commit": "96886b7e64d15ffd3319c8b4b04310ccdc648576",
+ "sha256": "0mw1c14ysh186lbgmmyp01hszdgjm605diqfq6a17a7dd7fn549a"
}
},
{
@@ -56820,8 +57791,8 @@
"deps": [
"colorless-themes"
],
- "commit": "2b4c341640c8191a39e4bc28d6cd04c7d6dcbb37",
- "sha256": "0ni9cnrv464fk840i1ll241kzkiy1zc6nfrbdv3ciixxdxbshxbn"
+ "commit": "736f7a105535901b4783d19534e7855920e25115",
+ "sha256": "1wi7wxiyk0g3k0l60hdmcyvvxr1kaapbkxvkknwd9qvdsji0ng73"
},
"stable": {
"version": [
@@ -56896,11 +57867,11 @@
"repo": "conao3/leaf.el",
"unstable": {
"version": [
- 20200511,
- 821
+ 20200817,
+ 1226
],
- "commit": "59c85a53385a3c55ce6b3b0e62a4fca1556389eb",
- "sha256": "0scmdb99i20xk8rvlv2xjg54lqqvfp9gv8q9kpqa8jpcq21nbav0"
+ "commit": "7d2f13a103ff275f64086f4ad12308266d1fb48a",
+ "sha256": "1ggcbnpahxxjm4h21z9pl9164jwv7mhq4n6k5zagna863a9hlrbw"
},
"stable": {
"version": [
@@ -56920,16 +57891,16 @@
"repo": "conao3/leaf-convert.el",
"unstable": {
"version": [
- 20200415,
- 1725
+ 20200812,
+ 1306
],
"deps": [
"leaf",
"leaf-keywords",
"ppp"
],
- "commit": "2a8ec045d5d36e85e7deb2a46aefacaecf4bfafe",
- "sha256": "133id4zd9dnx962r71m0irxvqs9dwaqnv5l4b8bjd3gigijah1dp"
+ "commit": "d716e0bc3be91a79c791e7a4cb8335132a69d195",
+ "sha256": "0a2rqylqzvvfs62rrqkigga9jaxs89b2l8sdzkfb30vwp0y3d0sb"
}
},
{
@@ -56940,14 +57911,14 @@
"repo": "conao3/leaf-keywords.el",
"unstable": {
"version": [
- 20200428,
- 1803
+ 20200812,
+ 1025
],
"deps": [
"leaf"
],
- "commit": "bdf225b2b2cc76b87f5bf55dfa09c3a020ac1e7d",
- "sha256": "0wdxxwh64l013vpkb7xpjqzyy4c0qy7h9l6l5cr4pncp7nx3bcns"
+ "commit": "c38d9d0d8cdb5a95df788af784e4eb989b674622",
+ "sha256": "19a1wrzikbzn2lswf5xwy8145a60mrj9ndj7cx29qrbr8fjcz431"
},
"stable": {
"version": [
@@ -56967,8 +57938,22 @@
"repo": "conao3/leaf-manager.el",
"unstable": {
"version": [
- 20200414,
- 543
+ 20200812,
+ 1004
+ ],
+ "deps": [
+ "leaf",
+ "leaf-convert",
+ "ppp"
+ ],
+ "commit": "baea372b3cfc7e1ad6d341d2f06e2932dcebf801",
+ "sha256": "031qgwc3pdxxqzkbdkaxd9lq4chngjba1s6q01wm98i5bdj4n4r0"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
],
"deps": [
"leaf",
@@ -57017,8 +58002,8 @@
"repo": "leanprover/lean-mode",
"unstable": {
"version": [
- 20200319,
- 838
+ 20200620,
+ 919
],
"deps": [
"dash",
@@ -57027,8 +58012,8 @@
"flycheck",
"s"
],
- "commit": "65b55b1711fb61129312044d5ac7e6a2c2ee245c",
- "sha256": "1zmw8950qhry2ixk2ng0pg4j0vwx11nvjlrpab9jg6x47ys9j65n"
+ "commit": "6b4377686128d5c2fb55d8fe61b92a9991d40fbd",
+ "sha256": "1zb3igic1i30mfbsx4k2sabhdpl58fsrl5c3fjvqrpn92ixi9vws"
}
},
{
@@ -57082,8 +58067,8 @@
20200224,
2229
],
- "commit": "e3424b3ae3f7d85ef020d030c2fa58df86ed8955",
- "sha256": "0a8x2c0lxa0xihpbc9i1dvn1l00nsmawl1nv3i06r6iq5486pqdn"
+ "commit": "86505672be0aabc9fa1048bc453ab2fc855b27e1",
+ "sha256": "00j6j2n0z616r9p78wp8hk62d9s2dpzlmflfm7ilrx40dnd4nlgj"
}
},
{
@@ -57094,14 +58079,14 @@
"repo": "DamienCassou/ledger-import",
"unstable": {
"version": [
- 20200302,
- 943
+ 20200522,
+ 853
],
"deps": [
"ledger-mode"
],
- "commit": "955e915fef9d46c968ef9101f7770870e2d2d80f",
- "sha256": "018f7k4j8q1ka36winv2higjp8vmm90vss7vwyck9hg4w708m85p"
+ "commit": "027a6caf173948feacd2f416a7995d82f82165e7",
+ "sha256": "08aqqhbrcgn72wjw4c9wq5pyxdswbhly2c2izmy316bjh3cqvbhf"
},
"stable": {
"version": [
@@ -57124,11 +58109,11 @@
"repo": "ledger/ledger-mode",
"unstable": {
"version": [
- 20200509,
- 1136
+ 20200530,
+ 1710
],
- "commit": "5a517cee3dfedfd1b90c2f01d6d8e01198a198d1",
- "sha256": "1gldvp2gp8vh97skrkxbcxh1qvjpndankjckm1q1h7jpkznjvc2v"
+ "commit": "805507fd6c14839be4efc7aee2017f9c03e36834",
+ "sha256": "1sil9kdkcb0r165qm8vpxll0ikfnm0cqjd3gmj8vi6k8n6awv9zv"
},
"stable": {
"version": [
@@ -57163,32 +58148,34 @@
"repo": "kaiwk/leetcode.el",
"unstable": {
"version": [
- 20200101,
- 1111
+ 20200730,
+ 1433
],
"deps": [
"aio",
"dash",
"graphql",
+ "log4e",
"spinner"
],
- "commit": "28b78c45c86570cb1e3538f275eb4de1cf28cd04",
- "sha256": "1c9zsh4ikflgqjrkjbilfqjjb0g698mqy2g5b210ssbivvkvncb5"
+ "commit": "153a3a6a9ffb64ffce37b3d203c13a85cc1884ab",
+ "sha256": "0600njpn3dvd8xrj21r5p69mc1r76ri1bjcxy2krp53dnsy3nvfb"
},
"stable": {
"version": [
0,
1,
- 10
+ 18
],
"deps": [
"aio",
"dash",
"graphql",
+ "log4e",
"spinner"
],
- "commit": "28b78c45c86570cb1e3538f275eb4de1cf28cd04",
- "sha256": "1c9zsh4ikflgqjrkjbilfqjjb0g698mqy2g5b210ssbivvkvncb5"
+ "commit": "ef59344158ae4b7842ca2531ec77c439ed6e6997",
+ "sha256": "0sxrzr34x43dcxw9l3ib982rz4327fpwnjmj3hi17bc5gk6zzfq2"
}
},
{
@@ -57362,11 +58349,11 @@
"repo": "fniessen/emacs-leuven-theme",
"unstable": {
"version": [
- 20200513,
- 1742
+ 20200707,
+ 1143
],
- "commit": "afda2d80b0bc98d431a3ac7c1563c76b8ace3a65",
- "sha256": "0fapzkjnm3w4fgc5464a9bz2sld3m81zzls7sy4h0yxq9rpb284d"
+ "commit": "a116202c82613c087440d2e8a6a504b08f1862ce",
+ "sha256": "1pqv4idkbqbxxvdfqxwf5rq2isl1jikba5nd0z8d7fr09wv48pv7"
}
},
{
@@ -57410,8 +58397,8 @@
20170121,
1254
],
- "commit": "a6c9922f31f59686bb48db1b8d5b75e74e79757a",
- "sha256": "0wvk341hx0fsv4hihlr508grqzgzza0w3gfqh4c1f88mdpmm62if"
+ "commit": "9d15bc75a34052f7f2749bd38b3d0297ed60b29a",
+ "sha256": "07ysaihl24fiqz8n6hvdvaj53nyalk68dsn073zb8q88sdmzf33w"
},
"stable": {
"version": [
@@ -57490,11 +58477,11 @@
"repo": "merrickluo/liberime",
"unstable": {
"version": [
- 20200511,
- 46
+ 20200804,
+ 147
],
- "commit": "a631d3d575b5ffa2dc9a3a950c53f425c21380c1",
- "sha256": "1gx3nxxcw5xz2n85xqgnghw04gaakhcnqcs9bnxx2fh4qpwkqggp"
+ "commit": "2a6f1bca1aff64a9136368c4afa15c0ea1042893",
+ "sha256": "1nvpy2mclcyi75clcnic7ap5rihccvgf7yn10an4y50sas8g2jiv"
},
"stable": {
"version": [
@@ -57568,11 +58555,11 @@
"repo": "buzztaiki/lice-el",
"unstable": {
"version": [
- 20191011,
- 631
+ 20200607,
+ 103
],
- "commit": "3ff90745cd43d1cc41216a01f55f871a00692ffe",
- "sha256": "08aiwyd0cxwd37jdy1m78l1r35h7fiq7wygpys2yrms6mdl8063b"
+ "commit": "482e58ab83fff86ed754b00be27b62a219597e7c",
+ "sha256": "0yxkjyhfk8kpr8yqz54gdx6xwkj4s8bnbz60162jh12crj0bs5n7"
},
"stable": {
"version": [
@@ -57606,26 +58593,26 @@
"repo": "jcs-elpa/line-reminder",
"unstable": {
"version": [
- 20191016,
- 1528
+ 20200816,
+ 1151
],
"deps": [
- "cl-lib"
+ "indicators"
],
- "commit": "f50f8474db7c9b26ab3cf56d08e5184209f25cec",
- "sha256": "1frf77ilyadrzil8sjp3rpr6v7j1nmmk1dz84d0kf8yr2cl48d9h"
+ "commit": "4eafedb1f4f9b0fb9c6268ac6c72fea4b786233e",
+ "sha256": "1vygzd7gw9a4cwg554hdvpy4h6ywjk4gg6iffcgwxhvdwg2vmrvs"
},
"stable": {
"version": [
0,
- 2,
+ 4,
3
],
"deps": [
- "cl-lib"
+ "indicators"
],
- "commit": "ea7fc43210b5293beac4ac453b1bdde415f5183e",
- "sha256": "13vspm2c53ph25li4xd77q2v7rqwsszsy8a842ivcgn0k3qn6w0r"
+ "commit": "4eafedb1f4f9b0fb9c6268ac6c72fea4b786233e",
+ "sha256": "1vygzd7gw9a4cwg554hdvpy4h6ywjk4gg6iffcgwxhvdwg2vmrvs"
}
},
{
@@ -57639,8 +58626,8 @@
20180219,
1024
],
- "commit": "d083a9f0c74830bd77b794babb09fe0f0fdb3854",
- "sha256": "1fgd2kfwh7gl4yxrmvv8yrv6wvvwy6y0nwibqqsy55698a1qb2fm"
+ "commit": "ffa07b82102945f18efb4430a6554835c450f6bf",
+ "sha256": "1zpqydk8s01f1qmk8aycn67pw48mll0rvrnrjd9q41p2aklhncms"
},
"stable": {
"version": [
@@ -57744,15 +58731,30 @@
"repo": "noctuid/link-hint.el",
"unstable": {
"version": [
- 20200405,
- 1607
+ 20200718,
+ 1737
],
"deps": [
"avy",
"cl-lib"
],
- "commit": "7440704cacb5c0fab35fff8ec59d30fbea17f44a",
- "sha256": "0j609j69lxyfvr2g89gdkjrk1vy0c1qq6m0p0ay468bh7l6crs7v"
+ "commit": "be735e5b57dfad891a7394c116b584bf005fe3b4",
+ "sha256": "0vg0pmvyya3gncih6rj83zx6qjm5gh9qs4svxb8f3wd053ppnvk9"
+ }
+ },
+ {
+ "ename": "linkode",
+ "commit": "8c03a8d88fa65f1ebc0b335b27be896232e8277d",
+ "sha256": "0wp55j17zms6zn90win35g203jzc4hjsj27500sq6iihci9gyfjk",
+ "fetcher": "github",
+ "repo": "erickgnavar/linkode.el",
+ "unstable": {
+ "version": [
+ 20200607,
+ 2152
+ ],
+ "commit": "675e612e30b74764c57de4117d950ea803b15f74",
+ "sha256": "1iqgii1zdv1q2gcknszxfgs09gvylr2l1yvyp104jriyy8qlsakg"
}
},
{
@@ -57854,20 +58856,20 @@
"repo": "marcowahl/lisp-butt-mode",
"unstable": {
"version": [
- 20191128,
- 835
+ 20200727,
+ 1441
],
- "commit": "9eca319bdbb96dac4d44d19cd21937ed82a67268",
- "sha256": "1biyvcwrqgyy7dmrv6i972lrcr5xhsyjq5nwc035c341jcxkp0g5"
+ "commit": "1b178fec96cb200574a17cb26ac0742d9df571a9",
+ "sha256": "01hj2kzy1mrzqc806jvgvkiyf7mkjacg944l3dblblyl7zgx8plx"
},
"stable": {
"version": [
- 1,
+ 2,
0,
- 4
+ 2
],
- "commit": "1ad373fd18d9db62b236d9d85603cd923f62f084",
- "sha256": "0nhikhnqnxyxx6s14vafhfwd4ph2bwvxz0m7mn0arrf6hjqzw7ws"
+ "commit": "008d2093608ee8fac184a6682e4ccf7b461dcaa1",
+ "sha256": "1kxvwd9y9q5ax9509b3xy3qqjpamfxzljyvbm1fc89qy50pdjxyr"
}
},
{
@@ -57937,8 +58939,8 @@
"repo": "abo-abo/lispy",
"unstable": {
"version": [
- 20200510,
- 1533
+ 20200818,
+ 1151
],
"deps": [
"ace-window",
@@ -57947,8 +58949,8 @@
"iedit",
"zoutline"
],
- "commit": "3660a8a6acf9a7faee4af4bf5249ceb85a5d8bbb",
- "sha256": "0s20wrdqf51mxfnnpll38nzp5ira59l83yz9dg0svz0vj5mrrwr5"
+ "commit": "0a9dcfdfbc20cadbb9cb29b224dc64b8efdd7b70",
+ "sha256": "13hzkh0rij40d58v6h232s784p40q1qv24n6bycd89lacn8xrcsr"
},
"stable": {
"version": [
@@ -57999,16 +59001,16 @@
"repo": "noctuid/lispyville",
"unstable": {
"version": [
- 20200129,
- 243
+ 20200808,
+ 2240
],
"deps": [
"cl-lib",
"evil",
"lispy"
],
- "commit": "25a70126ea807653e0a8c512d4128c90ed673d7a",
- "sha256": "0h4zz3k5chipswpp7abmd9agwacrss1dd5981x70wblpabdxm39m"
+ "commit": "0f13f26cd6aa71f9fd852186ad4a00c4294661cd",
+ "sha256": "0ah59s9c24addlx1rxgm11jihn7w45xrf0wrmrb7mbmqf3rj3izc"
}
},
{
@@ -58230,6 +59232,24 @@
"sha256": "0nh14f3fv0b4i3rlx120s9a0s8gsaip0r15ki38446igl1macbq2"
}
},
+ {
+ "ename": "literate-calc-mode",
+ "commit": "3b6b9d96bb894744f61d65ebd3a813b3c3493f42",
+ "sha256": "1ck61af2lg2rk0r8rlqjsh1am9xw71lk99i3sb71vi2ipd9dq9nb",
+ "fetcher": "github",
+ "repo": "sulami/literate-calc-mode.el",
+ "unstable": {
+ "version": [
+ 20200703,
+ 723
+ ],
+ "deps": [
+ "s"
+ ],
+ "commit": "e855bd718fa7d0d70b8f43264e10664369dd3a37",
+ "sha256": "0mk4cig8g8ibz97mvyan79fkypyanh7r0h7h20ibafq09nb0mw01"
+ }
+ },
{
"ename": "literate-coffee-mode",
"commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
@@ -58267,14 +59287,14 @@
"repo": "jingtaozf/literate-elisp",
"unstable": {
"version": [
- 20200327,
- 620
+ 20200708,
+ 803
],
"deps": [
"cl-lib"
],
- "commit": "732d649136051a4b6d43c2fabeb5233c3e5f16d7",
- "sha256": "1d4p6s9dj5368ywfpp46pysxvcqwsiacih3n1hia9c4y7p0xx4cz"
+ "commit": "722b7b3988336642167e0e0db12800a23410ab07",
+ "sha256": "19fckshqp1dxf7msjjk6cd506i0ydzqb1fqz879pfbbvhg6iclva"
},
"stable": {
"version": [
@@ -58343,11 +59363,11 @@
"repo": "lassik/emacs-live-preview",
"unstable": {
"version": [
- 20200419,
- 2143
+ 20200730,
+ 1517
],
- "commit": "7af1c74e0479c5b91d6368a4a3ff1342b83ef477",
- "sha256": "0ifk0k6lfjzb0x0mgzh69jx0m166ljdg3ad69p51jw3m85c0wc6b"
+ "commit": "b099cd4d9d4b30d432ffd2ca76f8db1b4c13cd08",
+ "sha256": "1sgl9152f16wlafpd1d2sik044h3dplx0ins3b9kwkm0hxgncdfj"
},
"stable": {
"version": [
@@ -58367,20 +59387,20 @@
"repo": "donkirkby/live-py-plugin",
"unstable": {
"version": [
- 20200510,
- 1939
+ 20200709,
+ 422
],
- "commit": "38a3cf447fd7d9c4e6014b71134e178b0d8a01de",
- "sha256": "0yah03sblz9i510cq6q2bj0mkz6sqdifpwhzxhs4kn8zdircr0f4"
+ "commit": "fdc85e5f2ddc72934be704ac90d5436d379c3381",
+ "sha256": "1g74m9v5818v8wg2zsm4zb74lzw28zfvlpv98b2dkqzikpxgz362"
},
"stable": {
"version": [
4,
- 1,
+ 2,
0
],
- "commit": "0a0d881d8ff30a6007b998e9bb9dddb999cca16e",
- "sha256": "1mdnbbd0kr5y4vr2xbay80v4n07gg5jkkn0k3ywypsin7fz5ihhl"
+ "commit": "de3ce16dbb054b6d1b14f3274935bbdccadd9790",
+ "sha256": "1vl6v8lsid4p82clvp62079jnxhmibza3p5hb1frdlsycyc9d1bv"
}
},
{
@@ -58466,11 +59486,11 @@
"url": "https://hg.serna.eu/emacs/lms",
"unstable": {
"version": [
- 20191102,
- 3
+ 20200616,
+ 1814
],
- "commit": "0967d3bada2ab70784a944d56c81691b8e87dbd8",
- "sha256": "15ksvdf2cfa8hwvazdza56iln244xlv1l65gydhjw8388hr7gbr0"
+ "commit": "8090ba32866033c3ab580190cc79cac61463a180",
+ "sha256": "0l97i08k9qqr76xniac912id0hx5f56psf3v3l4mprs5k8myihj6"
}
},
{
@@ -58514,11 +59534,11 @@
"repo": "rocky/emacs-load-relative",
"unstable": {
"version": [
- 20190601,
- 1221
+ 20200722,
+ 1109
],
- "commit": "dbcd7cbcca6503ef93f4b8d19bf7a9efd7f6bf9b",
- "sha256": "010f2mhvlzkxarw298850khqc6srzb01l2vay0jsp46dh3jfmdhf"
+ "commit": "85b88d6fbf472381dfdaf0a762215b7e35ceee9b",
+ "sha256": "0jajdk2685d1jdw72hp4g0pq9xwbwbnls79nizkydamwhnj8sfcp"
},
"stable": {
"version": [
@@ -58553,11 +59573,11 @@
"repo": "rocky/emacs-loc-changes",
"unstable": {
"version": [
- 20160801,
- 1708
+ 20200722,
+ 1111
],
- "commit": "4d1dcdf7631c23b1259ad4f72bf9686cf95fb46c",
- "sha256": "0a81933l3rrsbi9vkvfb1g94vkhl5n3fkffpy4icis97q7qh08mc"
+ "commit": "0a55bcba684f78417e831eef2cc32da24a207f29",
+ "sha256": "1fywhx8jk25mxrv0i446r519x4vjdsgvm1rzwdd0mcnjbwpv90b4"
},
"stable": {
"version": [
@@ -58748,11 +59768,19 @@
"repo": "Wilfred/logstash-conf.el",
"unstable": {
"version": [
- 20170524,
- 1929
+ 20200725,
+ 1843
+ ],
+ "commit": "131565042f8f12b9b88bd477959246dd034fa7d6",
+ "sha256": "1cyrmhnc38piw8q6d8j8xwyk0vl0a00mzjhmswkwd76w06adr9md"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 4
],
- "commit": "4e127f9aec190786613445aa88efa307ff7c6748",
- "sha256": "119yb1wk1n5ycfzgpffcwy7yx8ar8k1gza0gvbq3r61ha5a9qijs"
+ "commit": "652dddecf19f3e39a36055823e44fcffc5b44aeb",
+ "sha256": "0xdqfkcpv1677xfp54j2rwc9wjl3mfs9542jjcs0ym2063r6fzla"
}
},
{
@@ -58795,11 +59823,11 @@
"repo": "xuchunyang/lol-data-dragon.el",
"unstable": {
"version": [
- 20200321,
- 2142
+ 20200705,
+ 1822
],
- "commit": "6f53bb3971daad60bd0529d1e3889d5f9fedf235",
- "sha256": "0xblv8l6krp3581m0xava95pm6wcsjm3rsl47dsvzpgns1kyz8lx"
+ "commit": "0deec9867bd7ba96220ee2968a9b2a94fd474431",
+ "sha256": "136x1yqdzjh6a2vhyd73yhgg6kmwl00c5c14ny5davlghwd5g7aw"
}
},
{
@@ -58932,6 +59960,29 @@
"sha256": "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh"
}
},
+ {
+ "ename": "lox-mode",
+ "commit": "8a4f385fd128097781b563ad91d4aa8301167f5e",
+ "sha256": "14mqn4r2jmz661gyvzm48s9qb98w75sjflmrgqg6sslaca98jrpi",
+ "fetcher": "github",
+ "repo": "timmyjose-projects/lox-mode",
+ "unstable": {
+ "version": [
+ 20200619,
+ 1700
+ ],
+ "commit": "b6935b3f5b131d2c1c7685cf6464274f7cd64943",
+ "sha256": "0yx6j44284zv1ldqk44xfgqbrkcraznr0xfpaxy7797bmn9bajnp"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 3
+ ],
+ "commit": "083a2299e188a516d1e46ef2dd1cbb89db1aec49",
+ "sha256": "0wwx1vs7gw8f3p63ql5mf311iydxlzar7wzbvig14k785rfzq69c"
+ }
+ },
{
"ename": "lpy",
"commit": "e0e7941d9efc303b8cd5d3e7b29606316307fd8b",
@@ -58940,14 +59991,14 @@
"repo": "abo-abo/lpy",
"unstable": {
"version": [
- 20200504,
- 1918
+ 20200722,
+ 1159
],
"deps": [
"lispy"
],
- "commit": "39d05463939398168dd8c8dca22d76af93aa87ae",
- "sha256": "03wa94wn9a1lzdmi5fj5r446cvpqk7km9r9h8sq1hmwpr6qwymw7"
+ "commit": "c6744639ee313ee6dd4bc1e14b651d944b2ee1fd",
+ "sha256": "1vypwkx3020wx95cg34zi03pgarbjdhxpchbfvsj6bkd5v4bq6mc"
}
},
{
@@ -58958,40 +60009,38 @@
"repo": "emacs-lsp/lsp-dart",
"unstable": {
"version": [
- 20200515,
- 2152
+ 20200814,
+ 1405
],
"deps": [
"dap-mode",
"dart-mode",
"dash",
"f",
- "ht",
"lsp-mode",
"lsp-treemacs",
"pkg-info"
],
- "commit": "14d11f959dfab22a546525a0076fa3abd0d85c32",
- "sha256": "0mxiy8myvk91b7r5ngidi2665vpqs87f8qraplyl0vcpywb2jm5n"
+ "commit": "437c548d411c9e166b7c658fd45294775235fd5f",
+ "sha256": "1pl7payda8i9cyca2j808inb8pmnyhh1sjc9f4qvxpbwd7b94vlr"
},
"stable": {
"version": [
1,
- 10,
- 5
+ 14,
+ 6
],
"deps": [
"dap-mode",
"dart-mode",
"dash",
"f",
- "ht",
"lsp-mode",
"lsp-treemacs",
"pkg-info"
],
- "commit": "14d11f959dfab22a546525a0076fa3abd0d85c32",
- "sha256": "0mxiy8myvk91b7r5ngidi2665vpqs87f8qraplyl0vcpywb2jm5n"
+ "commit": "437c548d411c9e166b7c658fd45294775235fd5f",
+ "sha256": "1pl7payda8i9cyca2j808inb8pmnyhh1sjc9f4qvxpbwd7b94vlr"
}
},
{
@@ -59009,8 +60058,8 @@
"dash",
"lsp-mode"
],
- "commit": "af56404c383102344f9b99e2e168e69b7d8d50d0",
- "sha256": "16fsyr77bwa7gipsafsacqy1ad51kgm5im0js5yinkg2ipwi75xk"
+ "commit": "5053b697d1541afd436bc4a93f51b6afd8f2b79f",
+ "sha256": "0kxvzhrm8l99bmf3zjig7axkfm5mn0yl4l4yfxpvvfsb04iqj10k"
}
},
{
@@ -59031,6 +60080,38 @@
"sha256": "0m5hxlx0cnx4rdcz5chxqp074z9h1wj1nvg8dzmilsnmg3kmsshx"
}
},
+ {
+ "ename": "lsp-focus",
+ "commit": "a71079ecb60d84bded984d856f52590f64adbd9b",
+ "sha256": "0w0kywrs3pcs4kgdwhh4r9c1hdjblbdfcn66iz0xhrv1qxpv0zqv",
+ "fetcher": "github",
+ "repo": "emacs-lsp/lsp-focus",
+ "unstable": {
+ "version": [
+ 20200809,
+ 1413
+ ],
+ "deps": [
+ "focus",
+ "lsp-mode"
+ ],
+ "commit": "c8270663c1fa8650cf0e248caa6a8e3d8f25d80d",
+ "sha256": "13d7s2pm7nqz06bj6qkibi50f69slqwz6dc0fik97glxnlqqqva5"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 1
+ ],
+ "deps": [
+ "focus",
+ "lsp-mode"
+ ],
+ "commit": "30a19e9d616b341e41469b141e86ff825070cb67",
+ "sha256": "1xzyz59bgsjpvb32x60wk2n6x6pj5pk65sfd677h898rvlxnn1lz"
+ }
+ },
{
"ename": "lsp-haskell",
"commit": "1a7b69312e688211089a23b75910c05efb507e35",
@@ -59039,15 +60120,15 @@
"repo": "emacs-lsp/lsp-haskell",
"unstable": {
"version": [
- 20200510,
- 941
+ 20200527,
+ 2014
],
"deps": [
"haskell-mode",
"lsp-mode"
],
- "commit": "1a541e2459b918012cd655407920600ad35736ef",
- "sha256": "0bmyjgydyr0mppx8c4kv4vrfivyz1lpxxg966danh7rv9c90ps3b"
+ "commit": "17d7d4c6615b5e6c7442828720730bfeda644af8",
+ "sha256": "1kkp63ppmi3p0p6qkfpkr8p5cx8qggmsj73dwphv90mdq0nrfsx8"
}
},
{
@@ -59076,16 +60157,29 @@
"repo": "emacs-lsp/lsp-ivy",
"unstable": {
"version": [
- 20200418,
- 1500
+ 20200701,
+ 2043
+ ],
+ "deps": [
+ "dash",
+ "ivy",
+ "lsp-mode"
+ ],
+ "commit": "4cdb739fc2bc47f7d4dcad824f9240c70c4cb37d",
+ "sha256": "08dpn0vcfdwwysijwdpnnj91m69yw0q464i0wmp51zpj3dyd4kb1"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 4
],
"deps": [
"dash",
"ivy",
"lsp-mode"
],
- "commit": "81e81ced99829358674c5a6bbe2c3e15cecd4ed8",
- "sha256": "011126hz98qzb8zn1628z77j2s5w1hgvmb5saj2fr9wncgv1nax9"
+ "commit": "4cdb739fc2bc47f7d4dcad824f9240c70c4cb37d",
+ "sha256": "08dpn0vcfdwwysijwdpnnj91m69yw0q464i0wmp51zpj3dyd4kb1"
}
},
{
@@ -59096,10 +60190,11 @@
"repo": "emacs-lsp/lsp-java",
"unstable": {
"version": [
- 20200430,
- 1659
+ 20200804,
+ 1609
],
"deps": [
+ "dap-mode",
"dash",
"dash-functional",
"f",
@@ -59109,13 +60204,13 @@
"request",
"treemacs"
],
- "commit": "bbbe4297fd470d0eb9492d011b0b4daf628763f5",
- "sha256": "0qm9hwl88qwm19xwpsnv1rp9ny664440di0rd2lh3h7w1bczf76s"
+ "commit": "260016236fa0520b5b6ec7f51ca2086288524cba",
+ "sha256": "1h0hqgjpk5mbylma1fkva0vx45achf0k7ab2c5y8a2449niww90h"
},
"stable": {
"version": [
- 2,
- 4
+ 3,
+ 0
],
"deps": [
"dash",
@@ -59127,8 +60222,8 @@
"request",
"treemacs"
],
- "commit": "004516ed2f0803e068f50e00d5bc3bad76af45e1",
- "sha256": "1n7prbj3fppl5d2qvjfyfsw280grr3yywvazrhygjrr5920jxarh"
+ "commit": "811760ad89a29939c28f47d0925f58d9eeea9fa3",
+ "sha256": "1grcapmd9k0a128vhgpy2a5dh6iqmf8bdvz0hykl4v7d55vcm423"
}
},
{
@@ -59150,6 +60245,36 @@
"sha256": "0r0ig73hsa0gyx8s6hr1mbdgf9m1n2zh2v7yhq3405l4if08s5m6"
}
},
+ {
+ "ename": "lsp-jedi",
+ "commit": "65d0fa5e46e336e0e93db1bea062e79253861de4",
+ "sha256": "1hxw4nrjds9ir7f6j2zypazf208cc7v2621c11rdxkik8iykqikf",
+ "fetcher": "github",
+ "repo": "fredcamps/lsp-jedi",
+ "unstable": {
+ "version": [
+ 20200812,
+ 1826
+ ],
+ "deps": [
+ "lsp-mode"
+ ],
+ "commit": "10c782261b20ad459f5d2785592c4f46f7088126",
+ "sha256": "0rip6fq5mwk2lsa0wwr573mx4myqvc8a7v4mqalmqxgwzcv9w7vb"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
+ 1
+ ],
+ "deps": [
+ "lsp-mode"
+ ],
+ "commit": "10c782261b20ad459f5d2785592c4f46f7088126",
+ "sha256": "0rip6fq5mwk2lsa0wwr573mx4myqvc8a7v4mqalmqxgwzcv9w7vb"
+ }
+ },
{
"ename": "lsp-julia",
"commit": "ca6a06ed4de499bcccce05163ea3d54e4dca9539",
@@ -59190,26 +60315,69 @@
"repo": "ROCKTAKEY/lsp-latex",
"unstable": {
"version": [
- 20200425,
- 920
+ 20200718,
+ 928
],
"deps": [
"lsp-mode"
],
- "commit": "5cd7b6bb35bc54f3e9341d6a64605a3bb50db0a0",
- "sha256": "0lc3hidi1s993fz432090ab31r5pgb62ivw6y755332bgr359i4p"
+ "commit": "a9a26a21bf16b9444021563d844719ace0c5c3b6",
+ "sha256": "1waysrxhihg099czr2hydsvipdm8kf1zxw725r84lv5363cijw0b"
},
"stable": {
"version": [
1,
- 0,
+ 2,
0
],
"deps": [
"lsp-mode"
],
- "commit": "d016440fe364a016935bd90ae07e22d9012bcf8f",
- "sha256": "0a6nryx7vshh4k0amlw3w3fn4yr8zlqxq5py8vj3pz4zkcndhxks"
+ "commit": "a1376d3f4d4467aaf7fc5750c437e3edc91d2116",
+ "sha256": "044jivz2w6xs2kyjasndy00c0j9f63qf66s5wmkjjxbyamd7viwi"
+ }
+ },
+ {
+ "ename": "lsp-metals",
+ "commit": "ee055cc258692a92f727633306adf7df31267479",
+ "sha256": "1nl9ay741y7qxvgdr6vywavr3aayh6z3a3bvmc4q5g5vsh3inwya",
+ "fetcher": "github",
+ "repo": "emacs-lsp/lsp-metals",
+ "unstable": {
+ "version": [
+ 20200727,
+ 1925
+ ],
+ "deps": [
+ "dap-mode",
+ "dash",
+ "dash-functional",
+ "f",
+ "ht",
+ "lsp-mode",
+ "lsp-treemacs",
+ "treemacs"
+ ],
+ "commit": "039aa72439e3c52cfef4bcde416ba49d88ac0991",
+ "sha256": "12b2f1d07rqnbj27whdkk74c3fkqp7qrsqmwnyv0ysc870w29sb0"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 1,
+ 0
+ ],
+ "deps": [
+ "dap-mode",
+ "dash",
+ "dash-functional",
+ "f",
+ "ht",
+ "lsp-mode",
+ "treemacs"
+ ],
+ "commit": "efefcc0e936ec463f0d19b6cae7c8336dcd186e4",
+ "sha256": "01396r17ipmp0s5k5njm8m4vqw0g1sj9rq6dpkxv7wbad1c4izmx"
}
},
{
@@ -59220,8 +60388,8 @@
"repo": "emacs-lsp/lsp-mode",
"unstable": {
"version": [
- 20200515,
- 2000
+ 20200819,
+ 1349
],
"deps": [
"dash",
@@ -59232,13 +60400,13 @@
"markdown-mode",
"spinner"
],
- "commit": "17614737b6ae881d0e94ad6f0b87a01950062dba",
- "sha256": "0zh2mllm7n3gj0w5rn4y6491kx361mrf6w0fa46jgdck26fkazfw"
+ "commit": "4145a70ce1d4bfb2463606ba34c5965080b080d9",
+ "sha256": "01nji47mh79ip67vagi8yb5dd9kscnvg4070zklnfyp9v0rfl73r"
},
"stable": {
"version": [
- 6,
- 3,
+ 7,
+ 0,
1
],
"deps": [
@@ -59250,8 +60418,8 @@
"markdown-mode",
"spinner"
],
- "commit": "bdbd2d0ccfe02f6721ea942e82e5178f4b216228",
- "sha256": "125rpmhlyd6wmq7p71j54x3rzmk07vn1hdcvvdjjip5481raxcwx"
+ "commit": "4db1151dbf1fe84769433d841e90803448b0b354",
+ "sha256": "1z8zm7qr21hvhl6rnbznv2l9drh1pp5y4zkjrx5ac4x77b8i4aaz"
}
},
{
@@ -59284,15 +60452,15 @@
"repo": "emacs-lsp/lsp-origami",
"unstable": {
"version": [
- 20190331,
- 1723
+ 20200809,
+ 1537
],
"deps": [
"lsp-mode",
"origami"
],
- "commit": "c7653602a2f2396b1a42d6053fd2be55fce8e0a2",
- "sha256": "02qxqjiqfi82j0bqfr22a9ynxnbdw470whfky7405x90nis50k7l"
+ "commit": "110c40eafde81179ec7a78aab94b0b2059689374",
+ "sha256": "0z2z0idzpc8mql3mc0szb81j712ad54kpnxj28j6giid1a540bzd"
}
},
{
@@ -59360,6 +60528,26 @@
"sha256": "0g9vijpq7n38b7rvgbshh4s46m1387d7k2lcvy4md17sak5ivxrg"
}
},
+ {
+ "ename": "lsp-pyright",
+ "commit": "42a1aeef2b84b55e6e683066a3aed83331812476",
+ "sha256": "11dxq3419cq7lq2rnfka9kkkl4la627d0fki99djq6nrzddqf56p",
+ "fetcher": "github",
+ "repo": "emacs-lsp/lsp-pyright",
+ "unstable": {
+ "version": [
+ 20200810,
+ 354
+ ],
+ "deps": [
+ "dash",
+ "ht",
+ "lsp-mode"
+ ],
+ "commit": "9603dda12afaae9c82608c7d3762f98b24b8563f",
+ "sha256": "1xh0q356q7sy68m9syfbclabamdnw5y772inspn5y8640ig4rg21"
+ }
+ },
{
"ename": "lsp-python-ms",
"commit": "dd67aefa5a6df2d1388a7516e529e388615c8fe0",
@@ -59368,28 +60556,26 @@
"repo": "emacs-lsp/lsp-python-ms",
"unstable": {
"version": [
- 20200501,
- 1408
+ 20200811,
+ 1204
],
"deps": [
- "cl-lib",
"lsp-mode"
],
- "commit": "97ad997c6c2e3bc8d12c02b2809960d47ad316b0",
- "sha256": "11jad58shbrxd1r2r4amlvddx0qlx3ikbmq598sfwz2253ndzny1"
+ "commit": "a884a9a4eb1a3acd3d70c776aec5e968bbdc1731",
+ "sha256": "02fws6ph1ikpx86709dswlag180m6b34nchqcsfcvx4zp7qg2wj2"
},
"stable": {
"version": [
0,
- 6,
+ 7,
0
],
"deps": [
- "cl-lib",
"lsp-mode"
],
- "commit": "5d0c799099aa5810858174f390e28fff3894bc06",
- "sha256": "002h0i93blsv092pnfmzsfx0pj98r9glki0ki9n7gxg1z3nb0ybp"
+ "commit": "7a502e6c09456cbe8b5f6c64883c79f5ce08e5a9",
+ "sha256": "0rkxhm9lmvsalyzq96452cgpn5cqljw7b9d9xcxkkl2cwz1745f3"
}
},
{
@@ -59411,6 +60597,40 @@
"sha256": "05l563j1wz01rqwd4r639i88ln3bkn0m4swvj3hs11d70brlw981"
}
},
+ {
+ "ename": "lsp-sonarlint",
+ "commit": "ee843ab9cc6188b4f1b8f31ab4a4e69688fb36df",
+ "sha256": "19a189aaws5i6klzjbplh4wxq7z38399wpmkgcji5cc7anzrkzqn",
+ "fetcher": "github",
+ "repo": "emacs-lsp/lsp-sonarlint",
+ "unstable": {
+ "version": [
+ 20200702,
+ 2351
+ ],
+ "deps": [
+ "dash",
+ "ht",
+ "lsp-mode"
+ ],
+ "commit": "e0a27c07e886a147e2b8750471660af02e142086",
+ "sha256": "1kfgqdxynzpy98j1hc07zsygi0npw4xfm80jx3h30wyvxmgy7flp"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
+ 1
+ ],
+ "deps": [
+ "dash",
+ "ht",
+ "lsp-mode"
+ ],
+ "commit": "5f519612c6a10b189292083b04dcd652b64bc7d1",
+ "sha256": "04xs8n0lxx54hyj1y002ps52cxwb7s79k38q3dqzzbfax1nxwfw3"
+ }
+ },
{
"ename": "lsp-sourcekit",
"commit": "a1e15078916dc053ca2413a6afae51df22321e9e",
@@ -59437,8 +60657,24 @@
"repo": "emacs-lsp/lsp-treemacs",
"unstable": {
"version": [
- 20200503,
- 1640
+ 20200815,
+ 1841
+ ],
+ "deps": [
+ "dash",
+ "dash-functional",
+ "f",
+ "ht",
+ "lsp-mode",
+ "treemacs"
+ ],
+ "commit": "3f8ca910c8e8724f93d8268a91771a51427684ff",
+ "sha256": "0xnbw3j7n10wp6jbzrgrr0xfzilrlhrmmzs4d00y56g1fmqn3jja"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 3
],
"deps": [
"dash",
@@ -59448,8 +60684,8 @@
"lsp-mode",
"treemacs"
],
- "commit": "bd2c3727dd1e46e972477f11ba84999697ed842c",
- "sha256": "03jlwbzkkpqn0a68m991b6zhbnpna1rvjsdjmqqvyng209lgcgph"
+ "commit": "08e256c45d2e95b510a98a8b88b0531e8785e519",
+ "sha256": "1z9cb7i546pbzvxii6lsj31jq8m70xrzscphl5z71vh93sydyhkb"
}
},
{
@@ -59460,8 +60696,8 @@
"repo": "emacs-lsp/lsp-ui",
"unstable": {
"version": [
- 20200503,
- 1650
+ 20200816,
+ 841
],
"deps": [
"dash",
@@ -59469,13 +60705,14 @@
"lsp-mode",
"markdown-mode"
],
- "commit": "271b47cb33f11915295911f7cf8575f8a82a5e1c",
- "sha256": "181j9anm3h5sfallls3sxik6cd7dw1fbi3q9mlfhk979wk6varjk"
+ "commit": "c39ae3713f95a2d86e11fd1f77e89a671d08d18a",
+ "sha256": "033ah4mz3pa6da3xdn6yk3lmkv6lanpj07b0icf30c6bp7rmk3il"
},
"stable": {
"version": [
- 6,
- 2
+ 7,
+ 0,
+ 1
],
"deps": [
"dash",
@@ -59483,8 +60720,8 @@
"lsp-mode",
"markdown-mode"
],
- "commit": "207bc8d61abff7c3024f8a484f63bc60bc4ad58b",
- "sha256": "024753bi0p1jyjhw7wk8k6s16kbwab5ar4cfasvbn8g08acf293b"
+ "commit": "449f3a6b80a60d88c4ed300e69d64eb8e875f1c7",
+ "sha256": "09dmhhxmfjnzdc5kygwsjf8nwqlnq9rbgrca679s2wy93miqj7vc"
}
},
{
@@ -59550,14 +60787,11 @@
"repo": "sjbach/lusty-emacs",
"unstable": {
"version": [
- 20200415,
- 1456
- ],
- "deps": [
- "s"
+ 20200602,
+ 228
],
- "commit": "1b7053b41083666c6805bcaeb55ece6dcc0d77cb",
- "sha256": "1y3nzp6rpg7anv5xscbp4lzmfdvzffcxha9vx3mrclhjg6giz510"
+ "commit": "a746514ccd8df71fc920ba8ad0aa8dca58702631",
+ "sha256": "0sjs3gn7mrmm60v0yi77fha9b6wdqfnydqz9f4dg2fvwj4a9w2rr"
},
"stable": {
"version": [
@@ -59580,8 +60814,8 @@
20200507,
1518
],
- "commit": "87873d788891029d9e44fa5458321d6a05849b94",
- "sha256": "1b6davg1jqcxqzf9aqv8av8c78fgdri97m9q44xzvr1xfbmvkl8g"
+ "commit": "112e689f75b59398d8eca79ac6562dca12b8a959",
+ "sha256": "0famsjgsgd61fm3l5m9mqg4szf8lcgcb57paxlg8rxnsmxmwga7d"
},
"stable": {
"version": [
@@ -59874,14 +61108,14 @@
"repo": "zk-phi/magic-latex-buffer",
"unstable": {
"version": [
- 20191106,
- 241
+ 20200816,
+ 648
],
"deps": [
"cl-lib"
],
- "commit": "8597f4db70732d6e479396e2f2a7e78742387253",
- "sha256": "16zv10rir99wl16d79479204h5fbdx78wpgahlg6kf74001fr3sv"
+ "commit": "8a6e33f79a930d2c1977409f1980afc4cc99b909",
+ "sha256": "1f052yx0fib6vv2kqr21fv1nlsxc1b0mlcxasppxr6kig1jbj2x9"
}
},
{
@@ -59916,8 +61150,8 @@
"repo": "magit/magit",
"unstable": {
"version": [
- 20200514,
- 1330
+ 20200816,
+ 955
],
"deps": [
"async",
@@ -59926,8 +61160,8 @@
"transient",
"with-editor"
],
- "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc",
- "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg"
+ "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe",
+ "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n"
},
"stable": {
"version": [
@@ -59955,15 +61189,15 @@
"repo": "magit/magit-annex",
"unstable": {
"version": [
- 20200428,
- 9
+ 20200516,
+ 2028
],
"deps": [
"cl-lib",
"magit"
],
- "commit": "ef5dce6267e9118a5eca82a22bcad0b67826c23a",
- "sha256": "0vzkydgl889cq173zjl89g2vrddb9abc4a8gljiz3b4a7n5b1nrd"
+ "commit": "c5ecb4b53ea2461e737ea00242ef1e69e35da398",
+ "sha256": "0f1psh03hsb57h3r66zfa0jmwkky12121lhvpynlgj330ryxl5bj"
},
"stable": {
"version": [
@@ -59999,6 +61233,25 @@
"sha256": "10iinizl99aivrf9zihykabb5lyg62kxbmydwaf7swzxf4dgxn2k"
}
},
+ {
+ "ename": "magit-delta",
+ "commit": "6e045d09ceec253bbd033b561ab077d897e9b6b2",
+ "sha256": "0r7g8p7g348cfz31q0mgxxa591n8clwpaack487ycc1nzsqbj726",
+ "fetcher": "github",
+ "repo": "dandavison/magit-delta",
+ "unstable": {
+ "version": [
+ 20200518,
+ 2205
+ ],
+ "deps": [
+ "magit",
+ "xterm-color"
+ ],
+ "commit": "d988abd99882c6b89f21f2746f721a4d7ece6ad4",
+ "sha256": "1dj2kw2wzxnms4z54pk7qngylvy903jwd84x3k5ys3wsydmk4bbf"
+ }
+ },
{
"ename": "magit-diff-flycheck",
"commit": "a5d28982425519157a6116c077fbc4be7cfa53be",
@@ -60185,14 +61438,14 @@
"repo": "magit/magit-imerge",
"unstable": {
"version": [
- 20191105,
- 2245
+ 20200516,
+ 2029
],
"deps": [
"magit"
],
- "commit": "3b588991d30a69d2209dbcbb041777ae8af62bd0",
- "sha256": "19fyrann61k8viak05y0f5v9xr2p531ysrcq05d8pq8qf3vna1y1"
+ "commit": "f4b88f0c127faa154f138907bf4e98b1baf12fb6",
+ "sha256": "10l0z0c0q6sbf3id5dajws30cxzjvi5rgx1hl8jf6nxr5zcmcmm1"
},
"stable": {
"version": [
@@ -60254,8 +61507,8 @@
"libgit",
"magit"
],
- "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc",
- "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg"
+ "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe",
+ "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n"
}
},
{
@@ -60335,26 +61588,26 @@
"repo": "magit/magit-popup",
"unstable": {
"version": [
- 20200306,
- 223
+ 20200719,
+ 1015
],
"deps": [
"dash"
],
- "commit": "b8e886c4f2242d6c58f84d4549af712e86360db1",
- "sha256": "14l989m5pxzxk6164z8lgvshy45aq0ab78mjz5f6zw58h5rvnbdg"
+ "commit": "d8585fa39f88956963d877b921322530257ba9f5",
+ "sha256": "0znp6gx6vpcsybg774ab06mdgxb7sfk3gki1yp2qhkanav13i6q1"
},
"stable": {
"version": [
2,
13,
- 2
+ 3
],
"deps": [
"dash"
],
- "commit": "df9abf1a1bce3fadb5e0657eb8f4c7026efa3c69",
- "sha256": "1ifhph1mj7wjar62d65fjx45qsjwsyslbj7liih3v0r4by5gyxmw"
+ "commit": "d8585fa39f88956963d877b921322530257ba9f5",
+ "sha256": "0znp6gx6vpcsybg774ab06mdgxb7sfk3gki1yp2qhkanav13i6q1"
}
},
{
@@ -60383,16 +61636,16 @@
"repo": "jtamagnan/magit-reviewboard",
"unstable": {
"version": [
- 20190211,
- 2244
+ 20200727,
+ 1748
],
"deps": [
"magit",
"request",
"s"
],
- "commit": "f3d5ed914243e3930f9c06f59021305e7e43e67d",
- "sha256": "0xlhy328h2wxklpy71dhy1fk7zv6hs2v4jrl1mm9x5mnrbrdfvxx"
+ "commit": "aceedff88921f1dfef8a6b2fb18fe316fb7223a8",
+ "sha256": "0agk53san02n49jna6g2ndw4wbqkpr0kfd4ravbs9b4w6l3r30xb"
}
},
{
@@ -60403,14 +61656,14 @@
"repo": "magit/magit",
"unstable": {
"version": [
- 20200513,
- 1503
+ 20200816,
+ 955
],
"deps": [
"dash"
],
- "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc",
- "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg"
+ "commit": "321214c3a2dd10fdf672ba96bd00703a51094bbe",
+ "sha256": "152i5kvkx8hsy9qlhalhjc4sf6ly3rlfymb8daygj428363xx25n"
},
"stable": {
"version": [
@@ -60484,14 +61737,14 @@
"repo": "magit/magit-tbdiff",
"unstable": {
"version": [
- 20190918,
- 6
+ 20200519,
+ 418
],
"deps": [
"magit"
],
- "commit": "0162390581c1165a0c4c68081d8fc5ffae4cf1a9",
- "sha256": "0blwbgr4by0rawzw2hdpc5jcckmj96p0dxvgcml61rg3andsqyyl"
+ "commit": "e52e8ab4906996c410f6c6db890b9bfe0951d4ce",
+ "sha256": "0mp466bnm63pas8z0p6b0684i3rakb6cs5xzkz8jv3z3x34ak12c"
},
"stable": {
"version": [
@@ -60994,26 +62247,26 @@
"repo": "jcs-elpa/manage-minor-mode-table",
"unstable": {
"version": [
- 20200302,
- 1517
+ 20200717,
+ 809
],
"deps": [
"manage-minor-mode"
],
- "commit": "cd126cbeb2e99c8d00b48310938a85448ebc2e1a",
- "sha256": "1lk2rmv0qhzfyg57h461qdxgqciwqjggipl9i146m9bpjp7bjjvx"
+ "commit": "d377094c4ff5e93321e12f53892113083148bdaf",
+ "sha256": "0dpljs8qmpvpb0y2cvcr71ashzrm2ypb8p6anay4sjmiphkb60p5"
},
"stable": {
"version": [
0,
1,
- 1
+ 3
],
"deps": [
"manage-minor-mode"
],
- "commit": "0636f376d9bc169bd1bd20c5847eb9f029b9467c",
- "sha256": "1n4a9msfzspk0dfkr1i515ibrwg5yk3hyap2kym05yqpn4wq5xwp"
+ "commit": "d377094c4ff5e93321e12f53892113083148bdaf",
+ "sha256": "0dpljs8qmpvpb0y2cvcr71ashzrm2ypb8p6anay4sjmiphkb60p5"
}
},
{
@@ -61277,22 +62530,19 @@
"repo": "jrblevin/markdown-mode",
"unstable": {
"version": [
- 20200514,
- 16
+ 20200815,
+ 203
],
- "commit": "705c77b9533970a425b09fb4c2fabf3b406117c7",
- "sha256": "0i40pp0157azw2jkkr08f4cbal9ansp9dbscdbdzmlp9lf27kqjs"
+ "commit": "ef2cb4d94af68908a4963afa492afba876725128",
+ "sha256": "0pi971jgil2wpfnrg7j7i9hh3a418nxf82jkammzry2ijv2q5kj5"
},
"stable": {
"version": [
2,
- 3
- ],
- "deps": [
- "cl-lib"
+ 4
],
- "commit": "cde5c5d2bcce470c494b76e23cfe1364b6291c20",
- "sha256": "1zm1j4w0f3h01bmmpsv4j4mh6i13nnl8fcqlj2hsa1ncy1lgi8q7"
+ "commit": "7b854c8e70b6d6edee12aec4194f4eb239586804",
+ "sha256": "0g0ja4h651yfabm3k6gbw4y8w7wibc9283fyfzb33kjj38ivl5d7"
}
},
{
@@ -61383,30 +62633,30 @@
"repo": "ardumont/markdown-toc",
"unstable": {
"version": [
- 20200502,
- 742
+ 20200517,
+ 1233
],
"deps": [
"dash",
"markdown-mode",
"s"
],
- "commit": "a9f13eecd0c7d8be960055dbc2d6f5d3fe6f40ca",
- "sha256": "01xls8jd6l8c8xiyx8l15j5ca96gsln1m32prnhw4sfmrlw996h6"
+ "commit": "9565eeaa1d26bc0ab83eb65bd30470888f724044",
+ "sha256": "1l49hi4nwralx5kg4aqjj2b592y71ba4i91vmlzk5rrcjmdnc6b0"
},
"stable": {
"version": [
0,
1,
- 4
+ 5
],
"deps": [
"dash",
"markdown-mode",
"s"
],
- "commit": "e6de0f5c4c6dfdb8da37b34a16fe7e8edc88765c",
- "sha256": "1xqrrf4gwcr64xgbyvgplmcrcl7knfsm0v8yzrhscq65pb7zf3zj"
+ "commit": "9565eeaa1d26bc0ab83eb65bd30470888f724044",
+ "sha256": "1l49hi4nwralx5kg4aqjj2b592y71ba4i91vmlzk5rrcjmdnc6b0"
}
},
{
@@ -61426,10 +62676,10 @@
},
{
"ename": "markless",
- "commit": "5542e142d47f6f52839a44b8ee16327f88869f50",
- "sha256": "1a5kp46xj4b5kgcypacxcwhjjwi4m7f6shdda8l8my3s3x8ji5bj",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "1nd7np60h0k1p9pwp3dn8068584h7r7lhfl9j7yn2jrf2r51806h",
"fetcher": "github",
- "repo": "shirakumo/markless.el",
+ "repo": "Shirakumo/markless.el",
"unstable": {
"version": [
20190306,
@@ -61521,20 +62771,20 @@
"repo": "jcs-elpa/marquee-header",
"unstable": {
"version": [
- 20191017,
- 1017
+ 20200720,
+ 1034
],
- "commit": "cb694a9eee79ea807dbc1587c47e209dd7e250fc",
- "sha256": "0h191mip2yjvj1ha6cqvghd45g5ccd3p0qsvh9l2g0gg9d2salxk"
+ "commit": "d8e83b837bacdd45d274be42fe2d172fd1cbbba2",
+ "sha256": "1iy8vg2wlrzb01nc6sx21ijg62ak94k2x2w6gy56krp7frakacrv"
},
"stable": {
"version": [
0,
0,
- 8
+ 9
],
- "commit": "77e4becd8a812377eb219c77641a22a77b4fdfef",
- "sha256": "0a51aw567gkdxz58v7h2vdfs2rmnvyllqhq4a1yy4gslr0xsqk9c"
+ "commit": "d8e83b837bacdd45d274be42fe2d172fd1cbbba2",
+ "sha256": "1iy8vg2wlrzb01nc6sx21ijg62ak94k2x2w6gy56krp7frakacrv"
}
},
{
@@ -61633,19 +62883,19 @@
"repo": "cpaulik/emacs-material-theme",
"unstable": {
"version": [
- 20171123,
- 1840
+ 20200620,
+ 943
],
- "commit": "b66838d220ad380a16da1d8878936974b26f815d",
- "sha256": "128zn4078b2av3vs8vrqa73fb53vrm64lqg0ks6kymnnmyvcz8v2"
+ "commit": "2710e61ecee1bbec943538305c26af4fe4fca68a",
+ "sha256": "1qg59w216iv1yk594xjgazfqx5qhw3jgjqf32pcwwbkcnyj5f6zw"
},
"stable": {
"version": [
1,
- 2
+ 3
],
- "commit": "b66838d220ad380a16da1d8878936974b26f815d",
- "sha256": "128zn4078b2av3vs8vrqa73fb53vrm64lqg0ks6kymnnmyvcz8v2"
+ "commit": "2710e61ecee1bbec943538305c26af4fe4fca68a",
+ "sha256": "1qg59w216iv1yk594xjgazfqx5qhw3jgjqf32pcwwbkcnyj5f6zw"
}
},
{
@@ -61712,11 +62962,11 @@
"repo": "rudi/maude-mode",
"unstable": {
"version": [
- 20160222,
- 1607
+ 20200725,
+ 2035
],
- "commit": "c9543bb8a172fa77af592388e7f520a4a6d38987",
- "sha256": "1sn9bdaq3mf2vss5gzmxhnp9fz43cakxh36qjdgqrvx302nlnv52"
+ "commit": "008f372631a1efe15be033792cfb1686b1736aeb",
+ "sha256": "07a51iwlzj88b6jaxzz8p8r7l9kcbflw8l11h67sx5y0gv23a6vv"
}
},
{
@@ -61760,8 +63010,8 @@
20170120,
1705
],
- "commit": "daeb5c35bb677a23df69336b4843ea59517e57ed",
- "sha256": "1qpzha7j7g5fw1lazw5l6mspgrnsnqybqgpq48icbx2vvil9y3q7"
+ "commit": "f7048ce95443f2c06cb6b140814451e3a037103a",
+ "sha256": "0kjhfc2jlhq9qdwigx1iq8wpvzfr7jlv8jfqa2j2va8h0jp2jnp6"
},
"stable": {
"version": [
@@ -61972,20 +63222,20 @@
"repo": "hexmode/mediawiki-el",
"unstable": {
"version": [
- 20170813,
- 555
+ 20200718,
+ 1529
],
- "commit": "8473e12d1839f5287a4227586bf117dad820f867",
- "sha256": "03rpj3yrk3i1l9yjnamnx38idn6y4zi9zg53bc83sx3g2b4m5v04"
+ "commit": "932497604fd417964e4f04614e28d96f4eee028e",
+ "sha256": "1446vihy9cpg0hbvqjrp82ya1k889gpvgbsmw9bk7kyd983jhfar"
},
"stable": {
"version": [
2,
- 2,
- 9
+ 3,
+ 1
],
- "commit": "8473e12d1839f5287a4227586bf117dad820f867",
- "sha256": "03rpj3yrk3i1l9yjnamnx38idn6y4zi9zg53bc83sx3g2b4m5v04"
+ "commit": "5178a1a1dbe37a144d9c82622eb683bd3c61bef1",
+ "sha256": "1d05jw2sa19rgzskvavh21bfmbh07yza1drfbgypsvay3nkjfd2z"
}
},
{
@@ -61996,30 +63246,30 @@
"repo": "mopemope/meghanada-emacs",
"unstable": {
"version": [
- 20200506,
- 743
+ 20200628,
+ 247
],
"deps": [
"company",
"flycheck",
"yasnippet"
],
- "commit": "e119c7b3271281d60892b80a0cc6488503baf38f",
- "sha256": "11nvhvxm39pcxjknzik6n07l309x9r5maf24pnlgk2wxkr28xmzs"
+ "commit": "1e41f7f2c7a172e9699f3557c97c3f39a149bfc2",
+ "sha256": "1cplw3x94xc2yqvvimkjgppbb36mnj8n3gcx0k2gy7zwzdvzg4c6"
},
"stable": {
"version": [
1,
3,
- 0
+ 1
],
"deps": [
"company",
"flycheck",
"yasnippet"
],
- "commit": "83ee6c6520a8cf063742e1b16fef3efebbcf8b73",
- "sha256": "1hk4953dk93pa7srlgnjh9pskpl67f90gm9g0iv9zffwsxw4kwaw"
+ "commit": "1e41f7f2c7a172e9699f3557c97c3f39a149bfc2",
+ "sha256": "1cplw3x94xc2yqvvimkjgppbb36mnj8n3gcx0k2gy7zwzdvzg4c6"
}
},
{
@@ -62186,15 +63436,15 @@
"repo": "DogLooksGood/meow",
"unstable": {
"version": [
- 20200510,
- 154
+ 20200727,
+ 851
],
"deps": [
"cl-lib",
"dash"
],
- "commit": "56e7ba100eb0ae92a37bcd0fcce77affa26d2fb8",
- "sha256": "1jz0jpdr4imzs7rr21q19j59y04kw518qpisrrsmyw6fywi8k22g"
+ "commit": "c9296491e923a678ac9a42a2743f21ce1e0552c4",
+ "sha256": "00636in9cgcnij1sz6vj5y5vijdd13g5akwj1facf0v4lrlvacpn"
}
},
{
@@ -62208,17 +63458,17 @@
20191025,
851
],
- "commit": "db957668fa2be7b9d076f0c066178a65c48dd085",
- "sha256": "0abg2c0lcdiwmf1jlybrjw0n17hwqfmj29r7gbvrsm16snf27rag"
+ "commit": "3751cbfff75022c396c4ff4dc1729048f80daa4f",
+ "sha256": "0vbzbjajm0ww864cl7aaj70s3fkgg79cq8srdf5dmw1vwdrqq6ld"
},
"stable": {
"version": [
3,
3,
- 4
+ 6
],
- "commit": "21f4ba18acd9ca3dc5c8263acfc46042a6aa557e",
- "sha256": "1sp1g70wy8qp34641hlpk5xaf7vv359xgwc7z8cw7yvj39mn98va"
+ "commit": "464df1a60775fd2bb70f4efff4f8603eaf834b74",
+ "sha256": "0yw3a8mhjsjh9359cvk7kr5ch6dhwvhv9zilk12fgyii9iw08mlz"
}
},
{
@@ -62258,14 +63508,14 @@
"repo": "abrochard/mermaid-mode",
"unstable": {
"version": [
- 20200420,
- 2258
+ 20200804,
+ 2107
],
"deps": [
"f"
],
- "commit": "b8673381ff8bbfbdf3f165ae928e7c775a3117e9",
- "sha256": "14w2mwqiksmng8pzm4l0c458q0i2m3p4wcfvvmagyqk6mfl05m4l"
+ "commit": "795bcf830d9345474fad864602180408891b292d",
+ "sha256": "0qdpbayxar0vkan0m83k4jir8saqy47nq2240608l8h9bjv48hz2"
}
},
{
@@ -62276,11 +63526,11 @@
"repo": "wentasah/meson-mode",
"unstable": {
"version": [
- 20200216,
- 2254
+ 20200806,
+ 1325
],
- "commit": "bc6c09136c7f7de6f4b6ce9294e9b998e24b93c7",
- "sha256": "113vj7z8zk80653ldq4sfxkk3pja8yjscywb0cwpkaq0088n5jf7"
+ "commit": "b471b9282724d6f324dbd6fa25d083635fc4293a",
+ "sha256": "0y5a1sfk4h4szv4v6693i3ylrf3xiwf8khrahdaz0bx210h2qmpg"
},
"stable": {
"version": [
@@ -62302,8 +63552,8 @@
20200428,
124
],
- "commit": "a8b761d665c17694a04eccf1c2bc135d35bdf482",
- "sha256": "0rg34w1nsvmwxn9z3aipj32fk26fykzqxkr0x7am7icigg02dsbn"
+ "commit": "ce506b27b15cc39a47c58ff795026eaea8632e2f",
+ "sha256": "0wpj3ich8wisq0jy304fngj0nkkvdqzfkfcx0s8ib6l04v29ypa5"
}
},
{
@@ -62401,17 +63651,17 @@
20191018,
242
],
- "commit": "60eae1c8a7f82fbcc2660d785b33601daaa29f4b",
- "sha256": "06ia4ba6c1yph259wr4y5sdkl1ry6pzbwhx807ia675rp0clp9hz"
+ "commit": "a56346bf1517118b2a960eaadbf138ae1695ddd1",
+ "sha256": "09iycpdj6dkvz5axfx85bkrrf5128ws7clg1jn9yli06rjsw36ba"
},
"stable": {
"version": [
1,
1,
- 8
+ 10
],
- "commit": "0177fc4e7edd705db59b82c83a24db51dc405890",
- "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1"
+ "commit": "19aa8a17428d6ee42f54e464c26eeab17a6478ab",
+ "sha256": "198ahgxji0kh6ynygrrdvllj9fwcqrnma4sd8msj2aq18xij9glr"
}
},
{
@@ -62422,20 +63672,20 @@
"repo": "ianxm/emacs-tracker",
"unstable": {
"version": [
- 20200503,
- 1425
+ 20200602,
+ 1032
],
"deps": [
"seq"
],
- "commit": "6d68118eee409a2b671537129eae1154421ba82c",
- "sha256": "1i7fzla9i3s4439ckkny09fq3r2q0q2153qzyhxsfbcxb47vbx26"
+ "commit": "6283e1fc5ddb65323513eb77638181551bda967b",
+ "sha256": "12sw627rhvqldbg8cvgg4fim91h3r9qlki5ni1fi0y5sa9iqh20j"
}
},
{
"ename": "metronome",
- "commit": "2f77239fecb41487a6aa03e6fc219cba96dee18d",
- "sha256": "1kkm7s6hiyk3h1bnf9pfnsikmfpp998041wg0bwqnpzhzzlq6fy4",
+ "commit": "123d2788dc05d53862ebbf31476cfd3a43f2f348",
+ "sha256": "0arsx39lrbwp3a4krjn8pggqrqm250c8sk3c6z37q8d2g3sazp11",
"fetcher": "gitlab",
"repo": "jagrg/metronome",
"unstable": {
@@ -62478,11 +63728,11 @@
"repo": "sggutier/mexican-holidays",
"unstable": {
"version": [
- 20190506,
- 245
+ 20200622,
+ 132
],
- "commit": "663633be1d693f6081d7d000e05d15ddbf71aa10",
- "sha256": "09b0292d87xm5mrhfhv7j11ljl4j9hv8h5dibzrrlh1b3vsg2xkj"
+ "commit": "5b5dd6e71505e8938bac9e9733b30bd394631923",
+ "sha256": "04d4148nq3lmrpkxvzzkn88j30iv2l2466ps035x7v8hc83wxnjw"
}
},
{
@@ -62745,14 +63995,14 @@
"repo": "kiennq/emacs-mini-modeline",
"unstable": {
"version": [
- 20200424,
- 647
+ 20200801,
+ 1554
],
"deps": [
"dash"
],
- "commit": "4f1dce78916cccd2e7066345ae2be3394a675c46",
- "sha256": "0qbd6jdaqfs43i9cgs4n4d8vkv3nbcxcmwkd9xrj1d03rdmyzxh0"
+ "commit": "754a28efdf043e193922a897fc724ad9b9f2e8de",
+ "sha256": "1jx1baw6zskpnfdi02as59736jx4iy0q1n4x5n5ypvr7csrs1nz3"
},
"stable": {
"version": [
@@ -62887,8 +64137,8 @@
20190113,
2132
],
- "commit": "063b4d8ca33d55d04c341f0b2b777ec241a3e201",
- "sha256": "0lvg7iym6sxhgl4ab9a6x8c2mh2d32vkf0033bs3vphx657gra6l"
+ "commit": "221b43aad320d226863892dfe4d85465e8eb81ce",
+ "sha256": "1zsabgn5mi63ry8jg1li866jcix9mf588ypdfajk8747a6127qd0"
}
},
{
@@ -62899,26 +64149,26 @@
"repo": "tarsius/minions",
"unstable": {
"version": [
- 20200204,
- 1950
+ 20200522,
+ 1052
],
"deps": [
"dash"
],
- "commit": "bc1edab09d3fc1b248c17775ae2eb7d35b96be40",
- "sha256": "09z5wynw3xaxx2jr55ymlnhczryp5c5zgb1g9nr99k2rksq2j980"
+ "commit": "36d39bd25ae58d1359d17f99142520339bea5974",
+ "sha256": "1rvsfg9aabvyzzxd38kvjwkm9675zcmrfhzj5x6wj0ba3n0k34q5"
},
"stable": {
"version": [
0,
3,
- 3
+ 4
],
"deps": [
"dash"
],
- "commit": "c331c1516111b9d2136e632a218c1d7707215356",
- "sha256": "095yx8zg61nka6f7biyj1binbp8g872vq275ycwgmd2ix462zyf4"
+ "commit": "36d39bd25ae58d1359d17f99142520339bea5974",
+ "sha256": "1rvsfg9aabvyzzxd38kvjwkm9675zcmrfhzj5x6wj0ba3n0k34q5"
}
},
{
@@ -62992,8 +64242,8 @@
20200306,
1220
],
- "commit": "d1e04ca03aadb942dc4bee82f44848c3ce52b25c",
- "sha256": "1yrjmyh8a0xqijyg16v20iqh13s7j4pf410f0214a4m9lp07pxpx"
+ "commit": "e4dcdec3a4472a507d6b249ae2194dacaa885ecb",
+ "sha256": "03m4rnfdfsbs44cfqjy8j2z6nbxs2yzhzgizlpsvg64441hdkfa0"
}
},
{
@@ -63137,21 +64387,33 @@
}
},
{
- "ename": "mmm-mako",
- "commit": "5b7972602399f9df9139cff177e38653bb0f43ed",
- "sha256": "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn",
- "fetcher": "bitbucket",
- "repo": "pjenvey/mmm-mako",
+ "ename": "mmm-mode",
+ "commit": "ddf7604d914273aef49e75ae1d45c2a9a4bbbedc",
+ "sha256": "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw",
+ "fetcher": "github",
+ "repo": "purcell/mmm-mode",
"unstable": {
"version": [
- 20121020,
- 651
+ 20200714,
+ 1714
],
"deps": [
- "mmm-mode"
+ "cl-lib"
+ ],
+ "commit": "9ffe364f3a31c7a771fe3401b8924642609953e8",
+ "sha256": "1yr7nd6kmvy3mc5k6vvwaikzy9cvly4617l4s9zrfrbnldpsyjk7"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 5,
+ 7
],
- "commit": "5c9ff92137b547569264eeca1ab2a86e4ba12f55",
- "sha256": "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr"
+ "deps": [
+ "cl-lib"
+ ],
+ "commit": "ff0b214f27d5dddeb856acb4216e77a864dcc0b2",
+ "sha256": "0lxd55yhz0ag7v1ydff55bg4h8snq5lbk8cjwxqpyq6gh4v7md1h"
}
},
{
@@ -63168,8 +64430,8 @@
"deps": [
"cl-lib"
],
- "commit": "6d3eedf4fae3c88dee33691aa2856514122adc8c",
- "sha256": "0fykf7svgsbcjfcsbp1r571mgjhxwkdvmmhhl2clyi5z3mwg0s1g"
+ "commit": "d7729563e656a3e8adef6bce60348861ba183c09",
+ "sha256": "05f218f0lncgx2bbipjz7db09rrka8fq0qf5qkvbgssagxyl7rav"
},
"stable": {
"version": [
@@ -63240,15 +64502,15 @@
"repo": "scottaj/mocha.el",
"unstable": {
"version": [
- 20180321,
- 2322
+ 20200729,
+ 1130
],
"deps": [
"f",
"js2-mode"
],
- "commit": "cfd5b1a8a32162575f1c30b82e17b74efb67cf1c",
- "sha256": "015pinqd2bxac372dvmcxnc7z9qayq4xpa254sp31bdzn4r5xns4"
+ "commit": "6a72fa20e7be6e55c09b1bc9887ee09c5df28e45",
+ "sha256": "0xp0xps5xvamp7jdxq6hkmyp63ww9ca7imf0nz35xivwwkk17ri6"
},
"stable": {
"version": [
@@ -63335,8 +64597,8 @@
20190713,
1335
],
- "commit": "8f71e0a85c2f6039111663e65d9a13f3310f12ed",
- "sha256": "0vz58nk044jm97wh77v02h24571nwg57j1vx2v4rx9wmwrnifwid"
+ "commit": "4b2b92b14ed0b64fb0a0fa80a374ec9f87fbfeb6",
+ "sha256": "18dbnicaqryq4xhv4d7hds61k85kj3bnpcqv7rippvlyrqm2r6wx"
},
"stable": {
"version": [
@@ -63433,11 +64695,11 @@
"repo": "ludwigpacifici/modern-cpp-font-lock",
"unstable": {
"version": [
- 20190331,
- 1528
+ 20200530,
+ 1010
],
- "commit": "02f104701bc34c146d22e3143ae59ef362999098",
- "sha256": "14vxxvvm12jnq4llb759h8y4w3cv71d3xic1mbp0jmyd0j4dkqzp"
+ "commit": "865955d0035382a17a7f03add0d00d0bd812b103",
+ "sha256": "1x04jgc94gpdci24rahb1awvkjii1vdv7bdr9gyiksbry75dsxi1"
},
"stable": {
"version": [
@@ -63451,10 +64713,10 @@
},
{
"ename": "modern-fringes",
- "commit": "c765214f003426ac7a0e98c5764b14dd61ccce52",
- "sha256": "0acp18v97k2iahbd5kp240g46wqdmrk4ddrsgvckzm0chsmjmm8q",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "0rkcpjhcw4nfsmsr83zng941cf1mpdparbmqn5ps3qwifiw19m5f",
"fetcher": "github",
- "repo": "specialbomb/emacs-modern-fringes",
+ "repo": "SpecialBomb/emacs-modern-fringes",
"unstable": {
"version": [
20200321,
@@ -63495,20 +64757,20 @@
"repo": "protesilaos/modus-themes",
"unstable": {
"version": [
- 20200513,
- 601
+ 20200819,
+ 628
],
- "commit": "4b3f6a383642fb81a3407dde5d887e2d937ec471",
- "sha256": "0adbyyfpwzcc1y2vlbdf5kxwxsspm1cnxpd21rjnvcc06pvxzq4s"
+ "commit": "26a211835b6e62e4ad29b2feee75472e02046fa8",
+ "sha256": "12rqgyrnk6x2a7b635wg4c5ihyh9s8ig7s1431xqj91pdx7756kx"
},
"stable": {
"version": [
0,
- 8,
- 1
+ 11,
+ 0
],
- "commit": "89a31f6242dac52071ee6be18feadcb604b548d7",
- "sha256": "0kax2pl2x37yvn9zg3vnr9vp39sfgm7650lz2svp535srhki80il"
+ "commit": "c376b08059028737390f41fb82f64d748c42970c",
+ "sha256": "08alhr6d7shmm1fcvca0a0ipi9mvnaqp5klvqdb1d171h457fcv3"
}
},
{
@@ -63519,20 +64781,20 @@
"repo": "protesilaos/modus-themes",
"unstable": {
"version": [
- 20200513,
- 601
+ 20200819,
+ 628
],
- "commit": "4b3f6a383642fb81a3407dde5d887e2d937ec471",
- "sha256": "0adbyyfpwzcc1y2vlbdf5kxwxsspm1cnxpd21rjnvcc06pvxzq4s"
+ "commit": "26a211835b6e62e4ad29b2feee75472e02046fa8",
+ "sha256": "12rqgyrnk6x2a7b635wg4c5ihyh9s8ig7s1431xqj91pdx7756kx"
},
"stable": {
"version": [
0,
- 8,
- 1
+ 11,
+ 0
],
- "commit": "89a31f6242dac52071ee6be18feadcb604b548d7",
- "sha256": "0kax2pl2x37yvn9zg3vnr9vp39sfgm7650lz2svp535srhki80il"
+ "commit": "c376b08059028737390f41fb82f64d748c42970c",
+ "sha256": "08alhr6d7shmm1fcvca0a0ipi9mvnaqp5klvqdb1d171h457fcv3"
}
},
{
@@ -63695,11 +64957,11 @@
"repo": "belak/emacs-monokai-pro-theme",
"unstable": {
"version": [
- 20200504,
- 237
+ 20200525,
+ 1430
],
- "commit": "06f907e4a954688ec2096420fea1c9935d819e07",
- "sha256": "1k73bnwyjnmgvx4664pqrk1ig0rr0rwxzlf165dh5fspzqkmrjqh"
+ "commit": "d1bc669200bf5753cf1963e5e65269e0d60648d5",
+ "sha256": "0zqrn1pvlrgbf0yc34bycahvrl8sl67jmc0436yx3lgjwpkvhf0f"
}
},
{
@@ -63749,11 +65011,11 @@
"repo": "sanel/monroe",
"unstable": {
"version": [
- 20190912,
- 1624
+ 20200703,
+ 1254
],
- "commit": "508f5ed0f88b0b5e01a37d456186ea437f44d93c",
- "sha256": "01dwnb7f6c49q8vr3qb9m5h1wh9h119axxalqa71wahi1ygrcydc"
+ "commit": "b540e13cf767055086c37b2878e551fd3eddf5c5",
+ "sha256": "0sfj0b7j3385la01d8vq1s8ynpl5vzwdx7vdpyhbi3hrh02xkcqh"
},
"stable": {
"version": [
@@ -63773,20 +65035,20 @@
"repo": "jessieh/mood-line",
"unstable": {
"version": [
- 20200429,
- 309
+ 20200722,
+ 2327
],
- "commit": "5ff7cb514d7842901b592fa5132b75bc2b0df2e8",
- "sha256": "135cl8fksl0hyh7jxmdmwng1ppcv3lc3i39v7vslkwi2xp7b0xfk"
+ "commit": "64cbd61c3d9ebf8eb7e1b6366279e32382405f90",
+ "sha256": "0fh9j9fkgl433nykfzjnzap5labi4sdndfk1nv4f904ij69pmvxb"
},
"stable": {
"version": [
1,
2,
- 2
+ 4
],
- "commit": "5ff7cb514d7842901b592fa5132b75bc2b0df2e8",
- "sha256": "135cl8fksl0hyh7jxmdmwng1ppcv3lc3i39v7vslkwi2xp7b0xfk"
+ "commit": "64cbd61c3d9ebf8eb7e1b6366279e32382405f90",
+ "sha256": "0fh9j9fkgl433nykfzjnzap5labi4sdndfk1nv4f904ij69pmvxb"
}
},
{
@@ -63797,20 +65059,20 @@
"repo": "jessieh/mood-one-theme",
"unstable": {
"version": [
- 20191029,
- 743
+ 20200730,
+ 18
],
- "commit": "77ff4bfd954d46bc7580175ef443a9168938f9cd",
- "sha256": "02aqp3na2401n0mc6fbqvlwrfvbq283kyn9fhan4d0i6mrgvdblx"
+ "commit": "00e2d3797a271c0b3ecb0bab56dc705558015311",
+ "sha256": "0cq5y5fcx581vv8fzbxn5k71r95ss92yvddw4nk85h3710scclds"
},
"stable": {
"version": [
1,
0,
- 4
+ 6
],
- "commit": "98c2f3ca27dce87cec1bd7ffd322b48129213588",
- "sha256": "1rs9az5d4279jqldvx963qx0plbxp49c3crksmcq6si0x1iwg86x"
+ "commit": "00e2d3797a271c0b3ecb0bab56dc705558015311",
+ "sha256": "0cq5y5fcx581vv8fzbxn5k71r95ss92yvddw4nk85h3710scclds"
}
},
{
@@ -63831,10 +65093,10 @@
"version": [
0,
5,
- 3
+ 4
],
- "commit": "2751d36152abcc2ac1479225392182b53f1e02dd",
- "sha256": "1xyw4l42053595r76lj8safsx6pj25as0107wd96by3h7dg9m586"
+ "commit": "f6bebfe6fe51b728ebd013b7084becad23cabad3",
+ "sha256": "0n8p864yj5m3n7f9qiq9hy24dwfvv0a0wchx2818rppff6vfq3hf"
}
},
{
@@ -63845,20 +65107,20 @@
"repo": "takaxp/moom",
"unstable": {
"version": [
- 20191118,
- 902
+ 20200725,
+ 126
],
- "commit": "f16c8c509990932f3db7570a838a441d5c22dec3",
- "sha256": "172ih3wa3n6q46i7hcjddvnpy4h3vjldj42wvid4lpny0ibjazfy"
+ "commit": "d6dc1f42ccf0d53c8f5d5a327442ae52b2de7aed",
+ "sha256": "0s0liwc9sriv2ar6905n2vsdf9x8l85mwfyw05kr6vmxh9w08wbx"
},
"stable": {
"version": [
1,
- 2,
+ 3,
0
],
- "commit": "536eac1dd2b187f65ed85ad8efc95f7e2bcaadb2",
- "sha256": "12v2m66dlvnggmraxgmcfq4ycv6wdc56dv63gggrcy7zhlxwi9vp"
+ "commit": "1d8344cec018a417cb5845c0717c7400c281caa1",
+ "sha256": "0ig5j4dzb0vxx145yv4ly93hndc2hkbx6dfng2zy7agf124ygh37"
}
},
{
@@ -63966,6 +65228,29 @@
"sha256": "1yxy6m5igvsy37vn93ijs0b479v50vsnsyp8zi548iy2ribr0qr5"
}
},
+ {
+ "ename": "most-used-words",
+ "commit": "5c240664b29e0e455d3d2503381b9db1ed0ea20f",
+ "sha256": "1129wbn7myzqijzcs1bsy3fh6iizijfpkpa1mw6j9s618anj282p",
+ "fetcher": "git",
+ "url": "https://github.com/udyantw/most-used-words.git",
+ "unstable": {
+ "version": [
+ 20200808,
+ 931
+ ],
+ "commit": "f712879493660c3c3ee3793470b8f8939b79c2b0",
+ "sha256": "0aim8kzs95xjf6ldc4qy9xma1crxybmafs40sqaq35cbfszg0mf0"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2
+ ],
+ "commit": "90c09da92b30c6497e9141f0edfe7842440c4d53",
+ "sha256": "0bcqg5p7v6wi3g68c9qpv3rvi9lh6427dd0gmmnwvs1qysz28f1b"
+ }
+ },
{
"ename": "mote-mode",
"commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -64029,20 +65314,20 @@
"repo": "wyuenho/move-dup",
"unstable": {
"version": [
- 20200506,
- 2305
+ 20200819,
+ 940
],
- "commit": "fa9be365fcd6a2b89388b4d27dec93928d506678",
- "sha256": "0pb5xfzk5lfdz613hqsr9x1f0i5ls61xc0np43kqaxnr4xjz2fld"
+ "commit": "c5a346d3058011b8152cceeb45858f9b4cef1b69",
+ "sha256": "1dfsfxy7v85qc2gl14gxhngnvkcdbq9gadnsabs1fq56qdgmq814"
},
"stable": {
"version": [
1,
- 0,
- 0
+ 1,
+ 2
],
- "commit": "dae61de7aa5e2bf56a7bab1fa36fa3a39520a3c0",
- "sha256": "1mrrxx2slxi1qgf483nnxv3y8scfsc844sfnzn4b7hjpfpali0r8"
+ "commit": "c5a346d3058011b8152cceeb45858f9b4cef1b69",
+ "sha256": "1dfsfxy7v85qc2gl14gxhngnvkcdbq9gadnsabs1fq56qdgmq814"
}
},
{
@@ -64233,8 +65518,8 @@
"dash",
"mozc"
],
- "commit": "01f09b6c0b308e9f7057fb2aa80171e2ce328bb8",
- "sha256": "0vgyx7v79224mg3ci8i5kjasnh1w0c48jzwgxbjj270lrra3gfsr"
+ "commit": "90a6eb1db8fa1283b944432cfb83739286b37f92",
+ "sha256": "03pqqzzca9z3a1nbrfdkvfczzi7nr3bn75x7m4mdww9z3wxxda2c"
},
"stable": {
"version": [
@@ -64611,20 +65896,20 @@
"repo": "mkcms/mu4e-overview",
"unstable": {
"version": [
- 20200218,
- 546
+ 20200817,
+ 2046
],
- "commit": "151d5d9e0dd5e8e8c775035203d3e17538151f33",
- "sha256": "1gvlh306pcn1g4b7j5pk5m2n2wa72bl9vscfsp0gqr4fwrfnm3r6"
+ "commit": "467a7dfda4e534783469a137545193ded8a66723",
+ "sha256": "08lwvgwfsxmvm5bnw0sl96dry57h4wcjsi2fr2mmfq190kdjrizy"
},
"stable": {
"version": [
0,
- 1,
+ 2,
0
],
- "commit": "c34f45b3ab9cce892835e14c6701b531a4f54cce",
- "sha256": "1jc291xwym2ddiqvn83s2b2jw6a08dd63x0f6526qv8g3yr1jl1s"
+ "commit": "467a7dfda4e534783469a137545193ded8a66723",
+ "sha256": "08lwvgwfsxmvm5bnw0sl96dry57h4wcjsi2fr2mmfq190kdjrizy"
}
},
{
@@ -64657,6 +65942,25 @@
"sha256": "1wpcv4wdk735w701d9bm9qqji98mmzg7l7qkq1jmjw1hbpqhnwl2"
}
},
+ {
+ "ename": "mugur",
+ "commit": "7f218af9e4a50c53d0cacdd3fbbfc514d2f98e8d",
+ "sha256": "05qn7b3jsprdcyc4p6h70qvaydgq3b71y2hb4jfqx19prcbcly7k",
+ "fetcher": "github",
+ "repo": "mihaiolteanu/mugur",
+ "unstable": {
+ "version": [
+ 20200602,
+ 642
+ ],
+ "deps": [
+ "anaphora",
+ "s"
+ ],
+ "commit": "5333d0ff56cb4d1448e4cdf48278abcbc32e96eb",
+ "sha256": "07xglyc05d42inlh4j3nvdyi55pa0cy013c5yk8rv94xs31pjd8k"
+ }
+ },
{
"ename": "multi",
"commit": "c9fea5cf529bcdf412af2926e55b8d77edc07eca",
@@ -64689,14 +65993,14 @@
"repo": "ReanGD/emacs-multi-compile",
"unstable": {
"version": [
- 20160306,
- 2223
+ 20200517,
+ 1747
],
"deps": [
"dash"
],
- "commit": "bd0331854774e7a269ce8a7dd49580cd397c0ec2",
- "sha256": "1aswpv1m02n26620hgkcfd38f06bzmmijlr9rs5krv6snq5gdb8g"
+ "commit": "e3772f7e68968f7fa2c97615115cd3fc0f701229",
+ "sha256": "0r1ahchfhyqjyc0q0xp5x0p34d6hg4ga3cga1l6dlaw1xjflrsq2"
}
},
{
@@ -64809,15 +66113,15 @@
"repo": "suonlight/multi-vterm",
"unstable": {
"version": [
- 20200329,
- 940
+ 20200614,
+ 548
],
"deps": [
"projectile",
"vterm"
],
- "commit": "11f1b0cc97a24aba66fb561a0a94e9a66375b30f",
- "sha256": "0pzcwn13yj21qcga2agcv8as0jyrmw055fr8nbzvkp1jml4l3vwj"
+ "commit": "723658c162d483acc07fccf2dd8ae5b8582616f7",
+ "sha256": "1wgsqrr6jxv8dwf89406m53w1xzsvq45hrcc72x12hxkc1hay2vk"
}
},
{
@@ -64961,16 +66265,16 @@
"repo": "Wilfred/mustache.el",
"unstable": {
"version": [
- 20190905,
- 2214
+ 20200726,
+ 553
],
"deps": [
"dash",
"ht",
"s"
],
- "commit": "6443e1563ddf4eee2236ca1bb1fe87ddfde4b2bb",
- "sha256": "0wbmknx4pjgfw6y1482a3y1fxv054r0k2qj3qzc47xrkdsjw47y8"
+ "commit": "4649a47340b63214c7b8f1dcc178806d96288839",
+ "sha256": "1vwngm8fvfmh6p7p54pf01gqsmcg7f86nbyg18qphny9zsss1zjl"
},
"stable": {
"version": [
@@ -65159,6 +66463,30 @@
"sha256": "0cf0c9g9k2lk1ifi2dlw7c601sh1ycxf3fgl2hy5wliyd6l9rf86"
}
},
+ {
+ "ename": "mybigword",
+ "commit": "77cae5811b20615f356c520e200f771805642976",
+ "sha256": "1v7llcas9hzv2gwjvsxb0i29zcqizg7qgmzx3zyrkbww3ciwwfmp",
+ "fetcher": "github",
+ "repo": "redguardtoo/mybigword",
+ "unstable": {
+ "version": [
+ 20200818,
+ 1059
+ ],
+ "commit": "182a972cc48c30ba73ebf5424cdf27601a77399f",
+ "sha256": "1k3bxxc3fyh5zimwvw1b0fis95x0q9kp0cxdgdy3y2iayavm203r"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
+ 9
+ ],
+ "commit": "182a972cc48c30ba73ebf5424cdf27601a77399f",
+ "sha256": "1k3bxxc3fyh5zimwvw1b0fis95x0q9kp0cxdgdy3y2iayavm203r"
+ }
+ },
{
"ename": "mykie",
"commit": "e10504a19e052c080be2ccc9b1b8fd2e73a852e0",
@@ -65238,14 +66566,14 @@
"repo": "mallt/mysql-to-org-mode",
"unstable": {
"version": [
- 20200503,
- 1239
+ 20200602,
+ 2019
],
"deps": [
"s"
],
- "commit": "7dcd6486f374814908bdb3c6d4c88cd6cece1e2f",
- "sha256": "1jpz68pf8j7f4jin5qk4lrkxfzjwyqs16fn3j9ll21z4lc2mj2a8"
+ "commit": "f3afc506f8b0d037238e49290de4b028c6ad9dd1",
+ "sha256": "19g21zvvamlhy1yrqhqbd1x3km6q2m650xsvl613rpcdqsk8l2ic"
},
"stable": {
"version": [
@@ -65592,10 +66920,10 @@
},
{
"ename": "nash-mode",
- "commit": "c8bd080c81b163a6ddcfffc710316b9711935b4a",
- "sha256": "1d6nfxn7fc2qv78bf5277sdwfqflag2gihgic8vxrbjlpnizxn1p",
+ "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8",
+ "sha256": "1rkqcf8whk6g8ic0vlahf9m0kphd83515cr4yqv21qg2yx8irf2w",
"fetcher": "github",
- "repo": "tiago4orion/nash-mode.el",
+ "repo": "i4ki/nash-mode.el",
"unstable": {
"version": [
20160830,
@@ -65637,11 +66965,11 @@
"repo": "CeleritasCelery/emacs-native-shell-complete",
"unstable": {
"version": [
- 20200424,
- 1635
+ 20200814,
+ 2301
],
- "commit": "0f290514564d3733b35e4b48d70446c1a6eb4b41",
- "sha256": "0i8bss7ipwsjfrgfri7d3f9pbpkdbfh8aqz8cawr2wvf4yayk8q5"
+ "commit": "be7ced29c5a86e29c364f19d248634b8b54d0e52",
+ "sha256": "1lyad89byq54fva58njf7wiq2rw3767fxif1ykijirzx7q14ahxd"
}
},
{
@@ -65869,8 +67197,8 @@
20161029,
2023
],
- "commit": "f5fe5832889d7b6eab7d45724e051f4edbe1983f",
- "sha256": "15ljrcmmpfwqxvci0ilmn3xgjxj19wq638zvij0wh2g0n6nil6xx"
+ "commit": "db4bc9078f1b6238da32df1519c1957e74b6834a",
+ "sha256": "07axi57f4q7rvsk3w15jrbql20fwmxn2rk07cc9ahqkzys66jfv1"
},
"stable": {
"version": [
@@ -66034,16 +67362,17 @@
"repo": "felko/neuron-mode",
"unstable": {
"version": [
- 20200503,
- 930
+ 20200806,
+ 833
],
"deps": [
- "counsel",
+ "company",
"f",
- "markdown-mode"
+ "markdown-mode",
+ "s"
],
- "commit": "4329de608ca14dc67448ad576645eabb084009ef",
- "sha256": "0wk4cjcj98yym1cca2k1wgail9rvxaqs7n9fkccnxv9bddjmymv9"
+ "commit": "18d230ce6b126fe7193db9c20ac93811ccfe779d",
+ "sha256": "18s7phs285jc4whd54x3dvbajqil7yff18xirbvf9pjlzivqwfk5"
}
},
{
@@ -66099,14 +67428,14 @@
"repo": "AdamNiederer/ng2-mode",
"unstable": {
"version": [
- 20190524,
- 1912
+ 20200703,
+ 1610
],
"deps": [
"typescript-mode"
],
- "commit": "52fdfe27247548b46f6171eebaf887a90dd67463",
- "sha256": "1g8za385clky1waba4ggi5bl2q4h26gz00lkzghn3zvxg5nbh47d"
+ "commit": "d9feee65d882723b955483d2b8af01e49df21652",
+ "sha256": "0i0xad3h6rnkrbglmv10vv0zs3nf8kda19n176h6v4zy5bazgrqi"
},
"stable": {
"version": [
@@ -66196,11 +67525,11 @@
"repo": "aaronjensen/night-owl-emacs",
"unstable": {
"version": [
- 20200118,
- 1513
+ 20200622,
+ 1943
],
- "commit": "b52fbf83ffef1ca265c9ea273bf51827532cef67",
- "sha256": "0blgf7wx8i7am943m1jc7q4ndkb7pdczfgigrdnqsaf861m0nhng"
+ "commit": "4b9b5cb4fead9c5f145ba399d172c7e6bf577121",
+ "sha256": "0hkjy8qnpjwqc6c8zczb68s7kg5cx8wq9067rvwx4hraxv1bjqmm"
},
"stable": {
"version": [
@@ -66274,11 +67603,11 @@
"repo": "m-cat/nimbus-theme",
"unstable": {
"version": [
- 20200203,
- 1941
+ 20200812,
+ 915
],
- "commit": "32c5c88502aec1afb6700a798c215b7fc6ce6101",
- "sha256": "1s0f7wgik5383ffkys27376s0gzhhz6m0rap7l8iqq67yz0k6hxw"
+ "commit": "1a828c1fa0574503014afe8dda3229fb76a4bf64",
+ "sha256": "1qapsq7mxayjjr7y376p9vb7k871rwjgmyvmv756xg98lf7vm3fb"
}
},
{
@@ -66292,17 +67621,17 @@
20181024,
1439
],
- "commit": "c6148b0c3377a7d12b679f99f35e09cc7f36e940",
- "sha256": "088znrs8hygsfx0ndqhpfdgra3l3jf6dyfwz2l6h4s7w4kc8mlnk"
+ "commit": "9ddd3c917793bb97eb19d571429cdedf07501c03",
+ "sha256": "0lrj3k5ng748faarz63rspnd4sh38qvkxxcgbmk81h4cqvv529fy"
},
"stable": {
"version": [
1,
10,
- 0
+ 1
],
- "commit": "ed7f67040b370189d989adbd60ff8ea29957231f",
- "sha256": "1fbzl7mrcrwp527sgkc1npfl3k6bbpydpiq98xcf1a1hkrx0z5x4"
+ "commit": "a1f879b29c9aafe6a2bc0ba885701f8f4f19f772",
+ "sha256": "1bmv7zfqwp48ga6vnqvy0gzkclv40xgq19q4ihl58r6cn4swccn3"
}
},
{
@@ -66343,11 +67672,11 @@
"repo": "akirak/nix-env-install",
"unstable": {
"version": [
- 20200113,
- 751
+ 20200812,
+ 1305
],
- "commit": "b343a7e885206e78544da7313b860442abbd7440",
- "sha256": "06sq5biv15pgz8azp1kkbkj6ifi2xpa688gx8hj3xvkms9hy6b29"
+ "commit": "79c34bc117ba1cebeb67fab32c364951d2ec37a0",
+ "sha256": "12f16pfki1jwnw1ghdsqcrb11039njffl9hz3aa7sflwr95g2pbb"
}
},
{
@@ -66391,20 +67720,20 @@
"repo": "NixOS/nix-mode",
"unstable": {
"version": [
- 20200515,
- 410
+ 20200811,
+ 1947
],
- "commit": "e20afb51a48b5d014292d123487f53a678c7c3f7",
- "sha256": "1gbq9pmz1wv6kc128pyzi2hrsv9ax20myjmq02bwc4x5sqg6rdzq"
+ "commit": "0cf1ea1e0ed330b59f47056d927797e625ba8f53",
+ "sha256": "0wsiyvv23jcazh7jrbkg3d0qs1y5i88ahsdi3pp2s8q9h3lyhwnb"
},
"stable": {
"version": [
1,
4,
- 2
+ 4
],
- "commit": "e20afb51a48b5d014292d123487f53a678c7c3f7",
- "sha256": "1gbq9pmz1wv6kc128pyzi2hrsv9ax20myjmq02bwc4x5sqg6rdzq"
+ "commit": "e4e604ae3ac91748c4e7d51a591cb9ee60961b7c",
+ "sha256": "19f36kl00pxm2a18hn4cdsdvxlfsdx1pnnm6s6zxd8nw6y8ynvn0"
}
},
{
@@ -66482,8 +67811,8 @@
"deps": [
"reformatter"
],
- "commit": "cc8ee143d4ef45a8c540901852326ccdf6ff8482",
- "sha256": "0a1ih8w8xk8rdd96k7236v6xh2xr1r6gaiv2b6js95k04igdqxnh"
+ "commit": "213251f82a69edc033766ec96948e83aeb428cd2",
+ "sha256": "1hx13p9rs33j2ajbg0dp6a371hr0dcxbcyzr5xlvkg6gf746lmg8"
},
"stable": {
"version": [
@@ -66575,8 +67904,8 @@
"repo": "dickmao/nndiscourse",
"unstable": {
"version": [
- 20200418,
- 2355
+ 20200524,
+ 1649
],
"deps": [
"anaphora",
@@ -66585,8 +67914,8 @@
"json-rpc",
"rbenv"
],
- "commit": "103eb5c13ad2d154c9386b2aa9dbea532435ee7a",
- "sha256": "04nympxjg1dhahk7m71769c5lzsxxsnd9c62lqrkn22gvfzm0wm5"
+ "commit": "e8d99d132d649e179f7cc81b80d873436b4e8ce1",
+ "sha256": "03iqbb3svidczzci0l8b19zk8yx9xdslf9y0hpn2y8fzhf4gszrp"
}
},
{
@@ -66597,8 +67926,8 @@
"repo": "dickmao/nnhackernews",
"unstable": {
"version": [
- 20200407,
- 1525
+ 20200730,
+ 1052
],
"deps": [
"anaphora",
@@ -66606,8 +67935,8 @@
"dash-functional",
"request"
],
- "commit": "d5e58b373ab6c5f13174e76f5ae62539dc5cfc95",
- "sha256": "0gqqdjmasjs1p6nal9s2yhas1xr2nm99rd3rns2b8cd5j04ccvaz"
+ "commit": "ad20d17f196a1b99c683ad2ffc39a9b4b2fada58",
+ "sha256": "1b5jnprpvlsn7cnxj6pab8kr0kdzm8xqrzhsga6dlaww6max26xp"
}
},
{
@@ -66633,8 +67962,8 @@
"repo": "dickmao/nnreddit",
"unstable": {
"version": [
- 20200417,
- 1757
+ 20200524,
+ 1647
],
"deps": [
"anaphora",
@@ -66643,8 +67972,8 @@
"request",
"virtualenvwrapper"
],
- "commit": "7f6e3bdbfa872af8e92ed339671772b46bc7f7f0",
- "sha256": "1dbb4pm2dvyvgw6lxjhhdqplb1b1jbvnywy8d3abr5dpzfqzij8s"
+ "commit": "4f41473221ea3312085c9f562db59d8f22bf8910",
+ "sha256": "0b42z866igmh8lvykcmac19zb6irdyvaag5dnaa54w2xc9ms52hj"
}
},
{
@@ -66670,26 +67999,26 @@
"repo": "emacscollective/no-littering",
"unstable": {
"version": [
- 20200426,
- 2105
+ 20200817,
+ 1831
],
"deps": [
"cl-lib"
],
- "commit": "e67d7edac513892c5997468899f177a6e7956906",
- "sha256": "0b1f1lxzp2i2liysl8fs1lqcyrz220m232pzk8h6l7iq8y5fp15q"
+ "commit": "85629e5979f2159ab8cc77814dd4cb219e6ba69c",
+ "sha256": "0ii19sbmsl35y1glj2mz309aila8954rmpah7y7mr2b34ami6hdw"
},
"stable": {
"version": [
1,
- 0,
- 3
+ 1,
+ 2
],
"deps": [
"cl-lib"
],
- "commit": "d1d6965c70fc6ce0cfb38a5115d0e112aefac1d7",
- "sha256": "17is06l0w6glppabv2kaclrnqi3dqb6p6alpslpg7lrjd8vd45ir"
+ "commit": "aaa3c36b25e07017595b54e91e190f69f0de0487",
+ "sha256": "0v642qbd65w5jq44zsl4vy525vjmhr948p1jmpq4mpvhfgmxx88c"
}
},
{
@@ -66806,11 +68135,11 @@
"repo": "abicky/nodejs-repl.el",
"unstable": {
"version": [
- 20200320,
- 1645
+ 20200802,
+ 1310
],
- "commit": "6fad7d764fa0d818ba497450bd722ae10cb8efed",
- "sha256": "0saky39n0p8w7lmalg3j4da0crrx40yz0rz1zdjzwpd2bd9v2izg"
+ "commit": "3b841055cad00f442e4a9159b1056f59411b6646",
+ "sha256": "0371lz9378x3vjj2kqir89sjy0l5d5j6ha5yz1381nkh15dcww15"
},
"stable": {
"version": [
@@ -66846,21 +68175,6 @@
"sha256": "1s19sshsm4cdx8kj5prmsq8ryz4843xcqmdayvlfl99jxsp9j4pm"
}
},
- {
- "ename": "nodenv",
- "commit": "272df58a1112c8c082c740d54bd37469af513d4a",
- "sha256": "15wqlpswp4m19widnls21rm5n0ijfhmw3vyx0ch5k2bhi4a5rip6",
- "fetcher": "github",
- "repo": "twlz0ne/nodenv.el",
- "unstable": {
- "version": [
- 20181023,
- 1543
- ],
- "commit": "832fb0cbac4513edde7ebd6d1ab971c54313be36",
- "sha256": "0hn29y8gv9y9646yacnhirx2iz1z7h0p3wrzjn5axbhw0y382qhq"
- }
- },
{
"ename": "noflet",
"commit": "df33a7230e0e4a67ce75e5cce6a436e2a0d205e8",
@@ -66908,11 +68222,11 @@
"repo": "arcticicestudio/nord-emacs",
"unstable": {
"version": [
- 20200108,
- 833
+ 20200620,
+ 1122
],
- "commit": "d828752e270978a56bde19986c98b1bbe8f51386",
- "sha256": "096f8cik4jz89bvkifwp3gm9iraqrd75ljy2q9js724v7yj88711"
+ "commit": "4f5b64605709d5803285953026137e905756c35f",
+ "sha256": "032lgin0pn07ysshsdfdfqd5ck1fhrwdfz64sxwwc4gxlg5p4p98"
},
"stable": {
"version": [
@@ -66938,8 +68252,8 @@
"deps": [
"colorless-themes"
],
- "commit": "2b4c341640c8191a39e4bc28d6cd04c7d6dcbb37",
- "sha256": "0ni9cnrv464fk840i1ll241kzkiy1zc6nfrbdv3ciixxdxbshxbn"
+ "commit": "736f7a105535901b4783d19534e7855920e25115",
+ "sha256": "1wi7wxiyk0g3k0l60hdmcyvvxr1kaapbkxvkknwd9qvdsji0ng73"
},
"stable": {
"version": [
@@ -66968,21 +68282,6 @@
"sha256": "1yin5i38jdp47k6b7mc0jkv9ihl8nk5rpqin4qmwbhb871zxn7ma"
}
},
- {
- "ename": "nose",
- "commit": "855ea20024b606314f8590129259747cac0bcc97",
- "sha256": "1xdqsxq06x2m9rcfn1qh89g0mz1rvzl246d3sfmciwcyl932x682",
- "fetcher": "bitbucket",
- "repo": "durin42/nosemacs",
- "unstable": {
- "version": [
- 20140520,
- 1648
- ],
- "commit": "194d7789bf797f31ea0adc45f08beb66ae9ea98e",
- "sha256": "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm"
- }
- },
{
"ename": "nothing-theme",
"commit": "8f69a676e9adfb45f8fbd4467e86a4cb0fbf6ae8",
@@ -67006,20 +68305,21 @@
"url": "https://git.notmuchmail.org/git/notmuch",
"unstable": {
"version": [
- 20200427,
- 1036
+ 20200816,
+ 1342
],
- "commit": "627460d7bbbb6b95a07084c2b6fc7f647a5547e1",
- "sha256": "07fm4ndg42c0fw2dhj2rl32yrdnyprhidgkrwyckghwj02gjfwrj"
+ "commit": "8776faf6d5118e8152ecfacf94accf35ccebf1d2",
+ "sha256": "0r4f12m2xbwzl0fhqcz2vv7dcr0psnhy8ahhv6b5gsdfdfd2w4w3"
},
"stable": {
"version": [
0,
- 29,
- 3
+ 31,
+ -1,
+ 1
],
- "commit": "a59ef7d02cb229c2ec3569024918024003568aea",
- "sha256": "0w9k7jfhcp34inkqciisrjfgflrx8h5q4svfa6bij9p93g1hig0b"
+ "commit": "75ec89dfb4c254ba0b88ddb479e6ede6bfb7d0c7",
+ "sha256": "1pc4nkbhxmx1qlamnjzd1arzr3sgp0m95vn1jmmfivgddy3xh8b0"
}
},
{
@@ -67089,28 +68389,28 @@
"url": "https://depp.brause.cc/nov.el.git",
"unstable": {
"version": [
- 20200506,
- 1245
+ 20200813,
+ 821
],
"deps": [
"dash",
"esxml"
],
- "commit": "55a3b41aa71740826a1cd410fa8d24a313f27b7c",
- "sha256": "0zw6iq2iwv06jixb5cv73b832y576v0vs51l0j80d8w5d09zpfz3"
+ "commit": "6cfd80124038504038bcb5d4cf2e8b037c36841a",
+ "sha256": "1zr8q9kl3i1900vp08c52ywx2lpwp4iyqs8vm3kb8a7dsc4hpggf"
},
"stable": {
"version": [
0,
3,
- 0
+ 1
],
"deps": [
"dash",
"esxml"
],
- "commit": "ea0c835c1b5e6e70293f4bd64e9c89bdc42f8596",
- "sha256": "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz"
+ "commit": "3d32aac0f895c8605e254c8b7f246537816744f5",
+ "sha256": "13r7lvyyyv62m57m4s4xjs4qz2ckhqk6ib514px7qzc7mdzcz9i9"
}
},
{
@@ -67160,14 +68460,26 @@
"repo": "shaneikennedy/npm.el",
"unstable": {
"version": [
- 20200406,
- 1429
+ 20200812,
+ 1850
+ ],
+ "deps": [
+ "jest",
+ "transient"
+ ],
+ "commit": "26d5cf79dfd1a2a74a66c44de129483d26354345",
+ "sha256": "0akjjb5xqpzg784qi6hbjfjm335mixqszzrxwz69ggl50iy9s6rk"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1
],
"deps": [
"transient"
],
- "commit": "187ddd2732deb49df1e87fbaace153afb8a3e7e1",
- "sha256": "0kh8y0izab3rra5vb1229h77ykz704wh28m7vv0bsfn5lg02ridx"
+ "commit": "a699cba6a8798af709b2576f2df54abd7eb1701b",
+ "sha256": "1w9a9pjpp3lchl4k8y1zhdpdnmd090s8vp7vbfb89xawp1gavhxg"
}
},
{
@@ -67255,8 +68567,8 @@
20181022,
2154
],
- "commit": "1efc30d38509647b417f05587fd7003457719256",
- "sha256": "0px64jsdps477s9xiw96mhcf1fmgxf0gsp30gzhqfb1b1k4f306j"
+ "commit": "60273e764bf8d95abc40dd2fdc23af87ea9ee33b",
+ "sha256": "0cr0y0mflqr434223rfwlzzp2zdaddqymsrysbsrbv3qhh157sk3"
},
"stable": {
"version": [
@@ -67487,20 +68799,20 @@
"repo": "TeMPOraL/nyan-mode",
"unstable": {
"version": [
- 20170423,
- 740
+ 20200526,
+ 1054
],
- "commit": "a85ac925367ddc542827182a2d9f0133b421c41b",
- "sha256": "1178zinzaq0hj1n57yhbpakgky952jhj7dfwhwvsvfclmk9dlrr1"
+ "commit": "06e67ab2c490756d3eeed4a68aba7c33e508a5d5",
+ "sha256": "0d0hdjliad8afz4br38gwidph9zhmm5s09y45n95kqlazq62jfsx"
},
"stable": {
"version": [
1,
1,
- 2
+ 3
],
- "commit": "4195cd368aca8f05a71cbff4e60cfa9dde10319a",
- "sha256": "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7"
+ "commit": "06e67ab2c490756d3eeed4a68aba7c33e508a5d5",
+ "sha256": "0d0hdjliad8afz4br38gwidph9zhmm5s09y45n95kqlazq62jfsx"
}
},
{
@@ -67797,8 +69109,8 @@
"repo": "zweifisch/ob-cypher",
"unstable": {
"version": [
- 20170725,
- 1420
+ 20200521,
+ 936
],
"deps": [
"cypher-mode",
@@ -67806,8 +69118,8 @@
"dash-functional",
"s"
],
- "commit": "114bdf6db20ee0ade060bb5df379ddee48ff4f26",
- "sha256": "142d91jvf7nr7q2sj61njy5hv6ljhsq2qkvkdbkfqj07rgpwfgn3"
+ "commit": "da9f97339474a48d759fc128cee610c0bc9ae6c0",
+ "sha256": "0r4dsbrdxhyyh708pm8fqn423v21xk7a940nbajw9y07n28y5hgk"
}
},
{
@@ -67884,14 +69196,14 @@
"repo": "BonfaceKilz/ob-elm",
"unstable": {
"version": [
- 20200102,
- 2000
+ 20200528,
+ 1857
],
"deps": [
"org"
],
- "commit": "8b49ca0ecdff9df7c3f428bac22a96ed675ee5dd",
- "sha256": "0prc0bddyppdzckfkjd6h2j5qg9plfzccg2gyn4jkmjhkx0gi09g"
+ "commit": "d3a9fbc2f56416894c9aed65ea9a20cc1d98f15d",
+ "sha256": "1wdlr0cbsb2drdmcn2bnivjkj1f2v52l6yizwsnjgi4xq3w6k56h"
}
},
{
@@ -68075,6 +69387,24 @@
"sha256": "0ganip7077rsi681kdsrmvpjhinhgsrla34mll0daiqid7flnk4g"
}
},
+ {
+ "ename": "ob-latex-as-png",
+ "commit": "5a9c900e82ff9e9726ce9cad98d8067752a53fdf",
+ "sha256": "0r355k7h5nq91dir1rvmq0hbrx6pr9kan6qblls6fzi1r0f4d1ph",
+ "fetcher": "github",
+ "repo": "alhassy/ob-latex-as-png",
+ "unstable": {
+ "version": [
+ 20200629,
+ 1013
+ ],
+ "deps": [
+ "org"
+ ],
+ "commit": "d21d436814e9605cf2a942b709f957695298dc70",
+ "sha256": "0zmckisi9q9kv25jh0jn0ab9xbh2b7d4mzyyi1sdgnkg0ayzvvhb"
+ }
+ },
{
"ename": "ob-lfe",
"commit": "d595d3b93e6b25ece1cdffc9d1502e8a868eb538",
@@ -68150,6 +69480,30 @@
"sha256": "02k4gvh1nqhn0h36h77vvms7xwwak8rdddibbidsrwwspbr4qr1s"
}
},
+ {
+ "ename": "ob-napkin",
+ "commit": "675b76ed3aa7b3bea74ff7103f004589b6cc6b74",
+ "sha256": "1v6s28ahc8xzd4hdl9v4cnigg21978rj6z7xnryv35nzm6kdxn15",
+ "fetcher": "github",
+ "repo": "pinetr2e/ob-napkin",
+ "unstable": {
+ "version": [
+ 20200816,
+ 1245
+ ],
+ "commit": "7af5e8af08da8455c489909afbd9528a61f570e7",
+ "sha256": "1rmfxbnl2y6yx1869sm5203k7hch481wh5dq6lik5bj00cf3knc6"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 9,
+ 1
+ ],
+ "commit": "7af5e8af08da8455c489909afbd9528a61f570e7",
+ "sha256": "1rmfxbnl2y6yx1869sm5203k7hch481wh5dq6lik5bj00cf3knc6"
+ }
+ },
{
"ename": "ob-nim",
"commit": "35763febad20f29320d459394f810668db6c3353",
@@ -68227,10 +69581,10 @@
},
{
"ename": "ob-sagemath",
- "commit": "dc074af316a09906a26ad957a56e3dc272cd813b",
- "sha256": "02ispac1y4g7p7iyscf5p8lvp92ncrn6281jm9igyiny1w6hivy7",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "1xb8s4xm9wzfpdlhj5rym2lh4naz3h13v4sjqh71zxw6hy82gba3",
"fetcher": "github",
- "repo": "stakemori/ob-sagemath",
+ "repo": "sagemath/ob-sagemath",
"unstable": {
"version": [
20191106,
@@ -68515,14 +69869,14 @@
"repo": "clemera/objed",
"unstable": {
"version": [
- 20200403,
- 1500
+ 20200815,
+ 1504
],
"deps": [
"cl-lib"
],
- "commit": "e89d8dae3b2d4331a4455d2a7b203500537d184d",
- "sha256": "1xjcbfqxpda73l8imw1pj9my71qqacri269cv7wnzsfrphqh526x"
+ "commit": "dea5a64a4da32e8947fe5b45de569e293aaa8a96",
+ "sha256": "1jmr14bfs489g0czpmn987gpmmdqx72blkzcnd8sn1sfyk5n18ng"
},
"stable": {
"version": [
@@ -68733,26 +70087,26 @@
"repo": "oer/oer-reveal",
"unstable": {
"version": [
- 20200503,
- 853
+ 20200813,
+ 1540
],
"deps": [
"org-re-reveal"
],
- "commit": "b5ac03800294272d2deba115bcd08c9176580691",
- "sha256": "08rimp8652jy54p7gnhk774gv023wn1bh73zkarxrwqrlvjkh5m5"
+ "commit": "165eaf9d151c589226f7a4e0edc3a3100c0a9efb",
+ "sha256": "06740c4qdpdrim5wj88gw973lbh59h6sx4kzrpl37cqjvdsawbzv"
},
"stable": {
"version": [
+ 3,
2,
- 12,
- 0
+ 1
],
"deps": [
"org-re-reveal"
],
- "commit": "b5ac03800294272d2deba115bcd08c9176580691",
- "sha256": "08rimp8652jy54p7gnhk774gv023wn1bh73zkarxrwqrlvjkh5m5"
+ "commit": "7a99fa342eae234069344893b5bc851280ff2dc9",
+ "sha256": "1fsp6li73dk2272lgj4kxapd1sqw2pqj42rlcbl5hhh35hva714h"
}
},
{
@@ -68777,6 +70131,48 @@
"sha256": "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b"
}
},
+ {
+ "ename": "oj",
+ "commit": "f271f03feaa578e3e8ad9b02e0ca3ac99142fd60",
+ "sha256": "0qzyl7h8rdwyy1d6xralzcxgrc4nwx1hq30n5daa0cy3l5yix5xz",
+ "fetcher": "github",
+ "repo": "conao3/oj.el",
+ "unstable": {
+ "version": [
+ 20200811,
+ 517
+ ],
+ "deps": [
+ "quickrun"
+ ],
+ "commit": "2dd65324ac9833e07eaed5fb04acebafc6d5cbd2",
+ "sha256": "00lxjl1i6kcvj9lym2m59xb5hrx2gcdpvsvq972d8iczp2jmcfxr"
+ }
+ },
+ {
+ "ename": "olc",
+ "commit": "1e21abd021d72c491ed1503146c51761e18c56c4",
+ "sha256": "0kcqwnhhy5wa0r61yqg9gly9jd6b1846q2w43fmhzk3l4nzky32r",
+ "fetcher": "git",
+ "url": "https://gitlab.liu.se/davby02/olc.git",
+ "unstable": {
+ "version": [
+ 20200818,
+ 1221
+ ],
+ "commit": "d2dc62dbc3cf6460cc12bd96857a988bc80ac37e",
+ "sha256": "176w03pybs5rg87cj94s0dy365pxp981mlkbh3zv3d34kpmrzh10"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 5,
+ 1
+ ],
+ "commit": "d2dc62dbc3cf6460cc12bd96857a988bc80ac37e",
+ "sha256": "176w03pybs5rg87cj94s0dy365pxp981mlkbh3zv3d34kpmrzh10"
+ }
+ },
{
"ename": "old-norse-input",
"commit": "84780a6ebd1b2294b86ae8c6df5bd6521cf4e85a",
@@ -68815,20 +70211,20 @@
"repo": "rnkn/olivetti",
"unstable": {
"version": [
- 20200430,
- 519
+ 20200702,
+ 601
],
- "commit": "b23a05f442e3b1230f014e8054ebe3e57d22fc42",
- "sha256": "18ln5i3pjzgakpyqdwd4ii8n49l9kxbdp092bsx9s92miknkl2mp"
+ "commit": "0bc5e98b8456493084d1bd3df35e92a12c5da3b2",
+ "sha256": "121dzm051jivskssfvxs5kxkviqivf1j0fr3q8rkfqii7rxdw84r"
},
"stable": {
"version": [
1,
- 9,
- 5
+ 11,
+ 1
],
- "commit": "b23a05f442e3b1230f014e8054ebe3e57d22fc42",
- "sha256": "18ln5i3pjzgakpyqdwd4ii8n49l9kxbdp092bsx9s92miknkl2mp"
+ "commit": "57ca8e70bc9ee975f0e2a60bfc4121064dadd2e0",
+ "sha256": "0rghxjdzyfykd4qc2zkavvbyf9xc899k1b8hbk890f1y3vakqvqz"
}
},
{
@@ -69122,11 +70518,11 @@
"repo": "balajisivaraman/emacs-one-themes",
"unstable": {
"version": [
- 20190424,
- 740
+ 20200720,
+ 1444
],
- "commit": "e62e4ebef7ef8ccb1e90781d613638d30cf24d7a",
- "sha256": "13vjlgac3ikd5xr6cjqb3aaj8qr201lc3ndvwhj3k617474312jh"
+ "commit": "0e77d31f9fc0cd55f3d92ec0db79513d616b2efd",
+ "sha256": "0dc2xkgnl5x542332cnlilbzy9ps060gjx0hkg8pfhismvavr4mi"
}
},
{
@@ -69380,19 +70776,19 @@
"repo": "oantolin/orderless",
"unstable": {
"version": [
- 20200504,
- 706
+ 20200614,
+ 1920
],
- "commit": "5b292ac136b891d574f0d9827904e6ad527a9c35",
- "sha256": "0973fksap71cya30g3a58jqdd4hxkv4ia603dgl06qgirjvpl820"
+ "commit": "1f1e0380e2a8cd4fc29b8cc2e00cb01b56d86fbc",
+ "sha256": "15an4y0xdaih86p33zmb6r7qx5n0cs54flcnnq50jakkxlg9s8xh"
},
"stable": {
"version": [
0,
- 3
+ 5
],
- "commit": "b69b52289fdb0023a3123b1ddec5b490125345a3",
- "sha256": "0vxpaqsad3x1lqga1ky7sipm8lk8ps66wpcvz52jdqasxmxzvrjm"
+ "commit": "c6432b086f9c8ccb50b3656ba5895750f2a15541",
+ "sha256": "032lfwflkpaxbcxl4jf438vapswsdagipjczcn30sc4dfdh3p42c"
}
},
{
@@ -69587,16 +70983,16 @@
"repo": "diadochos/org-babel-eval-in-repl",
"unstable": {
"version": [
- 20191204,
- 18
+ 20200723,
+ 838
],
"deps": [
"ess",
"eval-in-repl",
"matlab-mode"
],
- "commit": "e111b4b5c6844bb389317354ea172cd96a8bb658",
- "sha256": "0j1z1kp85fvn874l7s8h0cf528khaa38bs5ccx5dwf8mkb68vjgm"
+ "commit": "85136ac7397fcdf0a4700a860de44d7912bb6b4c",
+ "sha256": "0pkp1w8ivgbr7jy90fymws2k9bambayrfq9rcad9qfzl76i412z9"
},
"stable": {
"version": [
@@ -69644,11 +71040,11 @@
"repo": "scallywag/org-board",
"unstable": {
"version": [
- 20190203,
- 1424
+ 20200619,
+ 1016
],
- "commit": "2e01e801abc04b8fb718ca4bc19636242ac0cb52",
- "sha256": "044nqxrg11qk0lnipzvhvdyd37vjkklaksyasrn6k1ifcfdx2qp8"
+ "commit": "1393bd46d11a81328ed4fb8471831415a3efe224",
+ "sha256": "1kryrg988c3sbxyp1sdgc6xdv2iz6kiflpzn2rw4z3l4grzab53b"
},
"stable": {
"version": [
@@ -69693,8 +71089,8 @@
"repo": "lepisma/org-books",
"unstable": {
"version": [
- 20200510,
- 844
+ 20200522,
+ 1800
],
"deps": [
"dash",
@@ -69703,14 +71099,14 @@
"helm-org",
"s"
],
- "commit": "44aec8dcdf4a498e13a80362dff4027cfa4b74a1",
- "sha256": "10ws56ww3hhqx5gghxaygiyi5vkfb5snjf4v0djaam53yn03jl90"
+ "commit": "49617901d087f532d7cae1aa23637671fd153d20",
+ "sha256": "09nq7na9r39pl6aljrf5vpkfih92ms7s081nxdrhxcscaysk08kb"
},
"stable": {
"version": [
0,
2,
- 18
+ 19
],
"deps": [
"dash",
@@ -69719,8 +71115,8 @@
"helm-org",
"s"
],
- "commit": "44aec8dcdf4a498e13a80362dff4027cfa4b74a1",
- "sha256": "10ws56ww3hhqx5gghxaygiyi5vkfb5snjf4v0djaam53yn03jl90"
+ "commit": "4b93bb1e20e2e66b9e64819b21ca75f36c389370",
+ "sha256": "1ksvdl8liqv74am1r7brn8slkwgbc83jv7l92qk9md7s1krcb6y0"
}
},
{
@@ -69731,14 +71127,14 @@
"repo": "Kungsgeten/org-brain",
"unstable": {
"version": [
- 20200516,
- 1343
+ 20200625,
+ 2050
],
"deps": [
"org"
],
- "commit": "3ce2a33b81ce611695ad74bf21cb911ef90d9a1a",
- "sha256": "0br8mqhxfx9pf1nslvlqk4x5rdlpjagixi6il0i0xpxhca7z3fya"
+ "commit": "671db0e08b91c7d2637d765a7afca8b2561275c8",
+ "sha256": "17i0lnp9xyzbky0xh1qi6q7jpnpz950j2zxwv2hg007zziqd21ks"
}
},
{
@@ -69836,14 +71232,14 @@
"repo": "Chobbes/org-chef",
"unstable": {
"version": [
- 20200512,
- 2102
+ 20200729,
+ 2021
],
"deps": [
"org"
],
- "commit": "1dd73fd3db0e9382fa34d3b48c8ec608e65f3bdc",
- "sha256": "0wfl416hd7f42j1fidap0f9zlcm3vhgjs12k99k672fggl0459h1"
+ "commit": "5b461ed7d458cdcbff0af5013fbdbe88cbfb13a4",
+ "sha256": "171ybf5n6a6ab3ycghc2z016qxbgqyj13kkcdsfqy0691wx7dcqb"
}
},
{
@@ -69869,15 +71265,15 @@
"repo": "dfeich/org-clock-convenience",
"unstable": {
"version": [
- 20200123,
- 1029
+ 20200705,
+ 1527
],
"deps": [
"cl-lib",
"org"
],
- "commit": "4e522706a90a504c75d377161005f9543575ea02",
- "sha256": "08d0hv2shpbw01pjh8ks04avyl4zc0zcyqlmn4hbdhwjz7lzp8dv"
+ "commit": "efc9773a8dedf834cf4a78fb6f5f8fffe55ef8eb",
+ "sha256": "0xnzw4p0wvahkfnxpj2ysz9nylzndp4pvy90vlf0l0d2ff5dymbh"
}
},
{
@@ -69888,15 +71284,15 @@
"repo": "atheriel/org-clock-csv",
"unstable": {
"version": [
- 20190418,
- 1505
+ 20200714,
+ 2109
],
"deps": [
"org",
"s"
],
- "commit": "e2fbaa1ad1a1be40fceecde603a600b292b76acc",
- "sha256": "1fpjga40v2wlkvq4ap75hd844m47gm55dkraznqz078k5f8fx8kk"
+ "commit": "499b961f26e1f9a9898bf0b1725b49d783893639",
+ "sha256": "08li6il9rhbm62pcb15cd40b6vjqjlywk07jcs9m85q589v6q2yg"
},
"stable": {
"version": [
@@ -69981,11 +71377,11 @@
"repo": "thisirs/org-context",
"unstable": {
"version": [
- 20200418,
- 1540
+ 20200615,
+ 1554
],
- "commit": "bbef096dc20b206b792b0ef310f2eed7c70ca3a0",
- "sha256": "05s73wn2q3a0mfc14qlgcb1bas9addby0m43id2v8ljvxyigicr8"
+ "commit": "8ef429124c13b1a68f7672cb6e6cb9c8b9d9db93",
+ "sha256": "178hpp3ylafmr2n3ydcqwqjxa8avlb8g1n3swzndc3jjk0gy6vck"
}
},
{
@@ -70056,10 +71452,10 @@
},
{
"ename": "org-doing",
- "commit": "6440f81aed1fcddcaf7afeedb74520e605211986",
- "sha256": "10vg0wl8dsy12r51178qi4rzi94img692z5x3zv8dxa29lmn26xs",
+ "commit": "8377b69021bda729b9e96e59a5d7ce2c120838c5",
+ "sha256": "1hbdyvfqybbgzmcllys6bqip799j79j6h4b28pp6mnlyfqi64msp",
"fetcher": "github",
- "repo": "rudolfolah/org-doing",
+ "repo": "emacsattic/org-doing",
"unstable": {
"version": [
20200510,
@@ -70104,14 +71500,14 @@
"repo": "abo-abo/org-download",
"unstable": {
"version": [
- 20200506,
- 1829
+ 20200818,
+ 1117
],
"deps": [
"async"
],
- "commit": "d248fcb8f2592a40507682e91eed9a31ead4e4a6",
- "sha256": "1m8683hkxs70754kqxxw6sb0wfvjkb9ghf9ny7zsyzvz0yj02gkm"
+ "commit": "67b3c744f94cf0bf50f7052ce428e95af5a6ff3f",
+ "sha256": "0f94drnfkyd1vpdhkr463zv952lk1v895dwrzk1251j8fb9vdf9m"
},
"stable": {
"version": [
@@ -70397,14 +71793,26 @@
"repo": "io12/org-fragtog",
"unstable": {
"version": [
- 20200215,
- 2217
+ 20200703,
+ 229
+ ],
+ "deps": [
+ "org"
+ ],
+ "commit": "92119e3ae7c9a0ae2b5c9d9e4801b5fdc4804ad7",
+ "sha256": "0hyhwbfhb7gj3wjv0722gmz637pd3l0k0gnk4z100v3crnk9rfs6"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2,
+ 0
],
"deps": [
"org"
],
- "commit": "8eca8084cc025c43ce2677b38ed4919218dd9ad9",
- "sha256": "0irr4l40djgmgvg41gx7kqza6zwi2mz69drq7dyrr10pz5hd0ikp"
+ "commit": "92119e3ae7c9a0ae2b5c9d9e4801b5fdc4804ad7",
+ "sha256": "0hyhwbfhb7gj3wjv0722gmz637pd3l0k0gnk4z100v3crnk9rfs6"
}
},
{
@@ -70415,8 +71823,8 @@
"repo": "kidd/org-gcal.el",
"unstable": {
"version": [
- 20200501,
- 24
+ 20200809,
+ 2137
],
"deps": [
"alert",
@@ -70424,8 +71832,8 @@
"request",
"request-deferred"
],
- "commit": "2ee2b31547e6f4e33db70fb812d552e55d612fd6",
- "sha256": "1gwz1avfbvn5pf72qfg3q6v8qhjihs89avzgx4v7mx6x34fgnpby"
+ "commit": "2cad2d8c175975dea42903cd4e3fd8bec423c01a",
+ "sha256": "013h09gdd7zlcrrvwf2i2ipyazvsjg2hwcfracb9bbv4r5bc0syf"
},
"stable": {
"version": [
@@ -70442,6 +71850,38 @@
"sha256": "1pxfcyf447h18220izi8qlnwdr8rlwn5kds8gr5i1v90s6hpa498"
}
},
+ {
+ "ename": "org-generate",
+ "commit": "7bbcd2fe177abe7d823dd5576cce6ba50054e51a",
+ "sha256": "18hlqlzvlgs2gnabsawjxbp9gn6w3b9fgkzg4sp3plxaqayhayas",
+ "fetcher": "github",
+ "repo": "conao3/org-generate.el",
+ "unstable": {
+ "version": [
+ 20200815,
+ 736
+ ],
+ "deps": [
+ "mustache",
+ "org"
+ ],
+ "commit": "98825efb73c4537f05f653ce40e639a220d2ee5d",
+ "sha256": "0p4xc4rznkq0vp0bbm1k69bfbmlp46lap12q75wdpkdrn5k4sr2p"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "deps": [
+ "mustache",
+ "org"
+ ],
+ "commit": "0c25f12cd25d835428dece427f26df53f1d60ce3",
+ "sha256": "0z2frp5mn3lp2xskwanw2rncrwa50x3aphy87vfxmhx4fqlqrzy8"
+ }
+ },
{
"ename": "org-gnome",
"commit": "4f7ebd2d2312954d098fe4afd07c3d02b4df475d",
@@ -70493,6 +71933,42 @@
"sha256": "10jwqzs431mnwz717qdmcn0v8raklw41sbxbnkb36yrgznk8c09c"
}
},
+ {
+ "ename": "org-gtd",
+ "commit": "26f2af3e31a2ddbf8600cb9a625d138c924d8a53",
+ "sha256": "1k264yb9n544zzf8ivzm16vqrklghrhiqs6jfwyx85675088vp6m",
+ "fetcher": "github",
+ "repo": "trevoke/org-gtd.el",
+ "unstable": {
+ "version": [
+ 20200809,
+ 2319
+ ],
+ "deps": [
+ "f",
+ "org",
+ "org-agenda-property",
+ "org-edna"
+ ],
+ "commit": "6837b4b192c850ae45b042a78b79f4e7cca2d56e",
+ "sha256": "1m3na0xswmndhjmgpqh1m5pj9cy5jp3vjmga74x2igrhk40ba8ly"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 1
+ ],
+ "deps": [
+ "f",
+ "org",
+ "org-agenda-property",
+ "org-edna"
+ ],
+ "commit": "ee10b8cb70d27d01280de8f282d9602f3497b8ab",
+ "sha256": "0j555cfi312j0kkpba91np3vwly26y7hyyyaxr2lcg84jd17frjg"
+ }
+ },
{
"ename": "org-id-cleanup",
"commit": "2d59dfe413397ba07a74b7d344e9f9a73c0e3db0",
@@ -70501,15 +71977,15 @@
"repo": "marcIhm/org-id-cleanup",
"unstable": {
"version": [
- 20200516,
- 1339
+ 20200523,
+ 735
],
"deps": [
"dash",
"org"
],
- "commit": "05d57840893d9ae8146ed41d29d1f0571c05ded8",
- "sha256": "1rsw4zgvxp77ncq4z98hcy6qsg6j72glx1y69rwfblg87lz3mj6d"
+ "commit": "e79540b64e0ee5ef11adfeb932a9b04beb905680",
+ "sha256": "0qn85515lzhqhn49byf0vpyhbgfwyibf21f7xl2j7cj306x1f79c"
},
"stable": {
"version": [
@@ -70609,16 +72085,16 @@
"repo": "ahungry/org-jira",
"unstable": {
"version": [
- 20200505,
- 137
+ 20200714,
+ 41
],
"deps": [
"cl-lib",
"dash",
"request"
],
- "commit": "c3c69aaeff743da4be415579444732c2904e9d3b",
- "sha256": "02bl3qgplfn45wqj5gi43cz54j0i3c2nd2yn1ay2wjmdscm6akb0"
+ "commit": "5c90dce918fcb873754bff375e988b17dcc69701",
+ "sha256": "1d38szx1vq4k1pfdisr3czwaasfw7jkwa2vswfcrnk3d65akkgzk"
},
"stable": {
"version": [
@@ -70644,23 +72120,26 @@
"repo": "bastibe/org-journal",
"unstable": {
"version": [
- 20200514,
- 1648
+ 20200815,
+ 1335
],
"deps": [
"org"
],
- "commit": "2c43b10eed0659f8e47797e5e53d2973f939284d",
- "sha256": "1ppzq6hx7nc2iy6pnpgxd39znc701mgqbi2v4v71a0yp8zl6kbgs"
+ "commit": "a2728e25b854af21cea8e8d313714c993eb1c848",
+ "sha256": "1rvlrn0jlw6a3p48zg50vw4nll2cffk9nkng0qvh8ws0a161w2j1"
},
"stable": {
"version": [
2,
- 0,
+ 1,
0
],
- "commit": "8eda1119f561561b993eea72a550a6b1f0ef35e1",
- "sha256": "18dqd0jy2x530lk0h4fcn9cld9qh4w7b3vxa60fpiia628vsv1dg"
+ "deps": [
+ "org"
+ ],
+ "commit": "f7bfc592ec11e9e5d0b0bfa377961167b68bba72",
+ "sha256": "1imrfvzc52l976598df2243s4jdwicznnxs3q91m5vrjsk23zfp2"
}
},
{
@@ -70686,30 +72165,30 @@
"repo": "gizmomogwai/org-kanban",
"unstable": {
"version": [
- 20200329,
- 543
+ 20200729,
+ 2120
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "544aac80f1c7113cfe42cf1a2b89f5ca6bd9ead6",
- "sha256": "0sx4mvr5g2ipj1s1jg82vr1q90jkq9lm0pg5cdab8lrx464lqf2c"
+ "commit": "70b4c9823b32ae299f3da521966b6c5abacf73e2",
+ "sha256": "159g13m1zpc1b2ggs9iw2l51pj0h433y1x00bgznhc9fvamysasd"
},
"stable": {
"version": [
0,
- 4,
- 23
+ 6,
+ 1
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "93f8135f2b7ae2d5ed807cb92954640796bbe273",
- "sha256": "1wxc4y5swldqv3jqdz9gj1gx30r4xzis8g2m572bbsrdfjf04c26"
+ "commit": "fbb27c3983ad735a333c766815642a6615cea2ed",
+ "sha256": "0xclk323hq4lszqmvba4v8785v57bxfxln5n1hy0vaf0f45hfkjw"
}
},
{
@@ -70761,6 +72240,36 @@
"sha256": "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8"
}
},
+ {
+ "ename": "org-linkotron",
+ "commit": "6105d5302a5fdec261f30168f811fa1e277bcb21",
+ "sha256": "10smvy4h178cqrn0d6kj86mqjnj23np1a2z9q8hp0n1dxyisjfhg",
+ "fetcher": "gitlab",
+ "repo": "perweij/org-linkotron",
+ "unstable": {
+ "version": [
+ 20200112,
+ 2235
+ ],
+ "deps": [
+ "org"
+ ],
+ "commit": "d0adc5247b205bc73d2f1a83d4a512d2be541eb5",
+ "sha256": "1w80kwh17b4svw0md7is8ajc732cbkknychsqcp1ia42qxqq4y8r"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 9,
+ 3
+ ],
+ "deps": [
+ "org"
+ ],
+ "commit": "d0adc5247b205bc73d2f1a83d4a512d2be541eb5",
+ "sha256": "1w80kwh17b4svw0md7is8ajc732cbkknychsqcp1ia42qxqq4y8r"
+ }
+ },
{
"ename": "org-listcruncher",
"commit": "5bed5078a3e56a825be61d158ca8321763b92f7c",
@@ -70839,14 +72348,14 @@
"repo": "org-mime/org-mime",
"unstable": {
"version": [
- 20200502,
- 1133
+ 20200520,
+ 1100
],
"deps": [
"cl-lib"
],
- "commit": "484bf3b0b8af461805b9e30d175510c031bcfbc3",
- "sha256": "1shp3xfjifvwcj67mvfiv0dwpwyz846s6xa5zs269fwbvdvmx65q"
+ "commit": "9bb6351b25c62835c7881fc64096028eb8ef83ef",
+ "sha256": "1h9dv1rw42c4yhdxp2cnxpyv49aklxgljhbw1adl4p7sp4zgrqbd"
},
"stable": {
"version": [
@@ -70863,10 +72372,10 @@
},
{
"ename": "org-mind-map",
- "commit": "3c8683ee547a6a99f8d258561c3ae157b1f427f2",
- "sha256": "07wffzf4dzfj8bplwhr9yscm6l9wbz8y01j0jc8cw943z5b8pdgs",
+ "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8",
+ "sha256": "0qgh74dzvpkij8xzdgwyd70wnfmjhjbmvqyw0zgkabw7s059yysk",
"fetcher": "github",
- "repo": "theodorewiles/org-mind-map",
+ "repo": "the-humanities/org-mind-map",
"unstable": {
"version": [
20180826,
@@ -70880,6 +72389,38 @@
"sha256": "0mkmh1ascxhfgbqdzcr6d60k4ldnh3l8dylw4m7wglz15hm3ixbm"
}
},
+ {
+ "ename": "org-ml",
+ "commit": "95cc2843698e2341697a223a463c4d51348aec5e",
+ "sha256": "013rlpq5in8mq02pnlpsl0mbgflv6bwx2cr18j0jcyd4sd1r1srz",
+ "fetcher": "github",
+ "repo": "ndwarshuis/org-ml",
+ "unstable": {
+ "version": [
+ 20200806,
+ 2244
+ ],
+ "deps": [
+ "dash",
+ "s"
+ ],
+ "commit": "e3df332fac6dea0810db0286ef154e917c971c49",
+ "sha256": "1pdl13hmvyznvk1k1096pid628rmhfif09bhryla7xjqkczpv25g"
+ },
+ "stable": {
+ "version": [
+ 2,
+ 0,
+ 1
+ ],
+ "deps": [
+ "dash",
+ "s"
+ ],
+ "commit": "c36f8a7f6b15dddcfa9e270a86d48a5e5f2beea3",
+ "sha256": "0vv8rk1mn7vhwz5riadg1fdjx5nmvm8h578yb9b85a100nq7av2w"
+ }
+ },
{
"ename": "org-mobile-sync",
"commit": "f0a8eb0eefe88b4ea683a4743c0f8393506e014b",
@@ -70930,14 +72471,14 @@
"repo": "jeremy-compostella/org-msg",
"unstable": {
"version": [
- 20200513,
- 1617
+ 20200722,
+ 2238
],
"deps": [
"htmlize"
],
- "commit": "d8a571c720b2b7dec9115fd85b114ae46d4ac4b7",
- "sha256": "094nrd7fy7m7m758gks14kz7yfdcclcwvbz8p90dwg3dv311hii2"
+ "commit": "2db6725c4a4f4342a9c61895b7c3c82795b01fee",
+ "sha256": "0ijll4fbm0231zig9ia3bpm2padjyj9w0c89nv5aqpilx2fk84v8"
}
},
{
@@ -70948,8 +72489,8 @@
"repo": "akirak/org-multi-wiki",
"unstable": {
"version": [
- 20200419,
- 1833
+ 20200810,
+ 1055
],
"deps": [
"dash",
@@ -70957,8 +72498,8 @@
"org-ql",
"s"
],
- "commit": "8b056103d6f5320563e9fd794a008fd4e0719702",
- "sha256": "1xmj2p9hcpf1nld0gsnxq12kaljh0p195fy24v23l8ygykhmqw17"
+ "commit": "2541e1b0798a1c9d4b4b8778e6c97a579ac3fa14",
+ "sha256": "1mcpbq1qylkxpd6nzq04jrji6p1xll5a30dc7dpxpcjrkgvbzf39"
},
"stable": {
"version": [
@@ -71296,8 +72837,8 @@
"repo": "org-pivotal/org-pivotal",
"unstable": {
"version": [
- 20191116,
- 530
+ 20200607,
+ 1505
],
"deps": [
"a",
@@ -71305,8 +72846,8 @@
"dash-functional",
"request"
],
- "commit": "f073f3ed8c2e78f5080c617d01b1f6bb3df63d1c",
- "sha256": "13bqcwlappxz0gsiyvklrf0xv4an6s4id48s3ydi0hki1na9fzzk"
+ "commit": "125e70f9a682751e4ed7c3a350b2794af9600f47",
+ "sha256": "1w91wb6l3vsri015awig1kfs986zf49466x4ni0m24hcg00n2m7n"
}
},
{
@@ -71374,8 +72915,8 @@
"elnode",
"org-present"
],
- "commit": "d66aa2022eea65c83b6e5e5b99a1331284a7ec30",
- "sha256": "1ji1qqhp6hpsmri0lgwzvvn1477njlcv60958xf6akvryk6azqh3"
+ "commit": "ba7e07af3bd1142e310e868893b919286758a007",
+ "sha256": "1vzipij1wy3g1lh13igbmf16p16llgnm90ydjrr6mlb35d141i20"
}
},
{
@@ -71522,8 +73063,8 @@
"repo": "alphapapa/org-ql",
"unstable": {
"version": [
- 20200501,
- 1131
+ 20200713,
+ 309
],
"deps": [
"dash",
@@ -71538,14 +73079,14 @@
"transient",
"ts"
],
- "commit": "c847afe0b538a1a44c73e40b067831cbea132ba7",
- "sha256": "0x1dymh7brhfznr6xkgc2vib4p1s5aqxq9kfjlcvi8q0cfasg9b4"
+ "commit": "6633dbb276d51767c3f401d0f68ef99e7b9364b6",
+ "sha256": "0rqhdf9g6n14v1ixwnb3d6jl85zxlarg28fz0jpzzikj4spiy772"
},
"stable": {
"version": [
0,
4,
- 5
+ 6
],
"deps": [
"dash",
@@ -71558,8 +73099,8 @@
"s",
"ts"
],
- "commit": "5a031bf5c19d274934f80d616d6fde62a6db5786",
- "sha256": "133x49kr7nf7jhi5r7ww5pydgq8wq3g31klirwgkc29698sd6n78"
+ "commit": "00800556907408ee11a23de3a4982061d08d3b85",
+ "sha256": "08xax4fp9rzi8iimkyw2gvp2rd0lgb2f83qrhhnhnc1kgpkdl6y1"
}
},
{
@@ -71638,28 +73179,28 @@
"repo": "oer/org-re-reveal",
"unstable": {
"version": [
- 20200512,
- 1701
+ 20200813,
+ 1104
],
"deps": [
"htmlize",
"org"
],
- "commit": "a9e9d4ef88417b3af7741a8d8f444ece820e7a3b",
- "sha256": "0lkqq5n4dspnpiywaparn95wriwh7ffypdykz0a3mmlnv96rizyi"
+ "commit": "7fe39d5d03ccc75d2811445d25cbbb473b53de76",
+ "sha256": "1cmvqr97vx22lw510z0k2nsy5xfgnz2lvchmx5sdxrqz54pz1wfq"
},
"stable": {
"version": [
- 2,
- 12,
- 2
+ 3,
+ 1,
+ 0
],
"deps": [
"htmlize",
"org"
],
- "commit": "fa6f656f561ebb8377bfd904795aec90b4332bbd",
- "sha256": "19nz77f2r49hqavz50ri222prhrd5890vhvc7jfazbascbcdjbqv"
+ "commit": "7fe39d5d03ccc75d2811445d25cbbb473b53de76",
+ "sha256": "1cmvqr97vx22lw510z0k2nsy5xfgnz2lvchmx5sdxrqz54pz1wfq"
}
},
{
@@ -71670,15 +73211,15 @@
"repo": "oer/org-re-reveal-ref",
"unstable": {
"version": [
- 20191022,
- 1426
+ 20200624,
+ 615
],
"deps": [
"org-re-reveal",
"org-ref"
],
- "commit": "1f56a1fc9a52f3815bb2115ebeca3c355688d722",
- "sha256": "1xrswpkr7hgsb9pj991z4m0820f1nksfad184x0j7kir2xcx0myg"
+ "commit": "d60e7b000e863c60485f866f14f552506317f5b4",
+ "sha256": "03p3fhrllrx42dzx4v2lc4w6bpw5wxgncd8mivg3lqhkm8sb5qwj"
},
"stable": {
"version": [
@@ -71770,8 +73311,8 @@
"repo": "jkitchin/org-ref",
"unstable": {
"version": [
- 20200509,
- 1756
+ 20200814,
+ 1307
],
"deps": [
"dash",
@@ -71785,8 +73326,8 @@
"pdf-tools",
"s"
],
- "commit": "4ce80644377f2369efb475bd58a57cf6950d8c41",
- "sha256": "1j15agy19n0qc4a1750qpyz6wbkwlzasq0cnk16isyq60bszgxx4"
+ "commit": "831fe96c242bf178f0c55b93fd076dfb549f7791",
+ "sha256": "18r9n6vln65czjvk46r5lbr7d2rd2dpcqrzhs37jffz9qj93cpcc"
},
"stable": {
"version": [
@@ -71841,14 +73382,14 @@
"repo": "akirak/org-reverse-datetree",
"unstable": {
"version": [
- 20200325,
- 1003
+ 20200812,
+ 1340
],
"deps": [
"dash"
],
- "commit": "afac070eb64cc24917c0ab0e14686258da4916f6",
- "sha256": "1737r8c5kpb68yb2sixp88fm7fcmr7rvpkpywyxzwgqk30xpsjgq"
+ "commit": "e0b04fe953de43bec51dd867d5fe12498099f2b4",
+ "sha256": "0r5vkx5la5dvw8vbrmmbxfffxjmhjmzdfbwy6c31lr60p55m5m7d"
},
"stable": {
"version": [
@@ -71910,36 +73451,36 @@
"repo": "org-roam/org-roam",
"unstable": {
"version": [
- 20200516,
- 1203
+ 20200818,
+ 816
],
"deps": [
"dash",
"emacsql",
- "emacsql-sqlite",
+ "emacsql-sqlite3",
"f",
"org",
"s"
],
- "commit": "265182a698be6babcbb11718c2821c747b1cff52",
- "sha256": "159zi0a392p1f8bzlxvfkwmx12xm749cia5m0b3paz23mvvhgzgi"
+ "commit": "c33867e6bc282ff0a69d4ef4a020db82604039bb",
+ "sha256": "0nklci9ixnkawa0ryffcnxvj7hm4vhklsv7whdynhr9w6aw6f7kq"
},
"stable": {
"version": [
1,
- 1,
- 0
+ 2,
+ 1
],
"deps": [
"dash",
"emacsql",
- "emacsql-sqlite",
+ "emacsql-sqlite3",
"f",
"org",
"s"
],
- "commit": "27a63b59b176f9d2048de69eb0f525f3c7be8f5f",
- "sha256": "18ljww204kf1pbgrrnx7bn6177lw1bs3npywbx2k1b5j35c3j8xv"
+ "commit": "89e9121f26cf03bb7820d257cd9d9106916cd1e9",
+ "sha256": "10s7mcyshgj6yva4k1j086xm61k9zck3r586f1maar5b2z6hwvsa"
}
},
{
@@ -71950,34 +73491,66 @@
"repo": "org-roam/org-roam-bibtex",
"unstable": {
"version": [
- 20200516,
- 1742
+ 20200803,
+ 1209
],
"deps": [
"bibtex-completion",
- "f",
+ "org-roam"
+ ],
+ "commit": "a92d9e6f523f449314e72911ba300192a42fc4dc",
+ "sha256": "1np029bspw14lcv8qzzgfyqimjz697wx2isasad06qbnhqbyc84m"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 3,
+ 0
+ ],
+ "deps": [
+ "bibtex-completion",
+ "org-roam"
+ ],
+ "commit": "ed148cee7d09538664fd22fc6bdf72adbe225617",
+ "sha256": "0a7jhpmjkb4d66zakgajs5anr4nrhs94l60x62s5qdxh5dn0m7gh"
+ }
+ },
+ {
+ "ename": "org-roam-server",
+ "commit": "40932819ae514a015f998a687d3cf651b30a79a1",
+ "sha256": "1bizzzmi1bx996n9g9rmkvpm229ipmpdacmh2jd3pvn8kx6252bm",
+ "fetcher": "github",
+ "repo": "org-roam/org-roam-server",
+ "unstable": {
+ "version": [
+ 20200816,
+ 819
+ ],
+ "deps": [
+ "dash",
"org",
"org-roam",
- "s"
+ "s",
+ "simple-httpd"
],
- "commit": "4d60c7824e028b4bcdbe5dd589e416ec682a63c8",
- "sha256": "010vgf2dlafx3673dpcpy94273i65pffpn5rz5vqvh0k3wwxhqyn"
+ "commit": "5ea3d1403bd68af49ac0593a8cdff7514595d025",
+ "sha256": "0ajsid9p5znxqz7bq39jbf779s46ymmxwpfki4yxpa9308pwjwgc"
},
"stable": {
"version": [
+ 1,
0,
- 2,
- 3
+ 4
],
"deps": [
- "bibtex-completion",
- "f",
+ "dash",
"org",
"org-roam",
- "s"
+ "s",
+ "simple-httpd"
],
- "commit": "02803c85cb312608172343c2d33bf9684d4bcefe",
- "sha256": "0403ic5zc2sbrg3ryxk55n52ii4qzg1373h4j8bibfal2jv5i3ir"
+ "commit": "fe0364ef63928337f442c1d987d17cfe9619df2d",
+ "sha256": "0a5b625i7gv467xm8p92nvrh2wzgmldm8gzcbrc15al1gvnwpbqm"
}
},
{
@@ -72006,8 +73579,8 @@
"repo": "tyler-dodge/org-runbook",
"unstable": {
"version": [
- 20200504,
- 648
+ 20200523,
+ 2004
],
"deps": [
"dash",
@@ -72017,14 +73590,14 @@
"s",
"seq"
],
- "commit": "fb4026df05b8e05c6aefd9483bec0e8f43d87d7e",
- "sha256": "1qf0hpcscplpxd8xzf0yzkh87chbv3fgsfrr7bxh81g0akjiw03j"
+ "commit": "27dafe2a470d54a2c664164b5f9cbd2a1e5d921e",
+ "sha256": "1bl8f7azkr2657izhcwxy8w8jz7qs2wkk843q2bzzdzixqadlabs"
},
"stable": {
"version": [
1,
- 0,
- 6
+ 1,
+ 2
],
"deps": [
"dash",
@@ -72034,8 +73607,8 @@
"s",
"seq"
],
- "commit": "53e8876a1587190ec4d103f9e94380f34797ce49",
- "sha256": "1cyb956s3vshh2i4gd37m1cjxwq5s0xj55pwysgganwgxxw22c8n"
+ "commit": "27dafe2a470d54a2c664164b5f9cbd2a1e5d921e",
+ "sha256": "1bl8f7azkr2657izhcwxy8w8jz7qs2wkk843q2bzzdzixqadlabs"
}
},
{
@@ -72084,11 +73657,11 @@
"repo": "lordnik22/org-shoplist",
"unstable": {
"version": [
- 20190809,
- 2156
+ 20200603,
+ 1515
],
- "commit": "9591a4747eb2e5cab53203a120f9b854c75e629b",
- "sha256": "1b721xp6dn54x2j73ysnzw9qxd9fxpvnqiy2y0issmz6xmccgzac"
+ "commit": "e1e465ef815500140940c3a247d508b8f7dd09c5",
+ "sha256": "03a39q495ivxn0bc9wsdl61d2qlxs2w618d5f3lkny9567wcrxgx"
}
},
{
@@ -72215,28 +73788,28 @@
"repo": "akirak/org-starter",
"unstable": {
"version": [
- 20191224,
- 1909
+ 20200812,
+ 1341
],
"deps": [
"dash",
"dash-functional"
],
- "commit": "4c0f01a493a6dc9ab3fec50e0b458aa0d35464f9",
- "sha256": "1c2vjxgscngg0k7qxr67ad0cws9yv88yhmdrn9qq4rxzc9fdjkzg"
+ "commit": "dc69138a42745aac79dec9e8de1b6aacde3a4511",
+ "sha256": "0vshlr6kzri4c86yd54g3xccgj6q0vbi920858lg5ij3si4a2z2x"
},
"stable": {
"version": [
0,
2,
- 6
+ 8
],
"deps": [
"dash",
"dash-functional"
],
- "commit": "7ea72ec530a340af61da215327a7fbb66a07ad2a",
- "sha256": "0y1i4zpgmk6i2nj5l6dvdvqkp5a8cww8y4vcpps85blj586xgby3"
+ "commit": "64ed31f7c012f37219f306a4b232de2767c1911e",
+ "sha256": "04zdh6rw07zy6mf69hy754vp8p7kp56ny56dcnsns8ay7dd581zj"
}
},
{
@@ -72254,21 +73827,21 @@
"org-starter",
"swiper"
],
- "commit": "4c0f01a493a6dc9ab3fec50e0b458aa0d35464f9",
- "sha256": "1c2vjxgscngg0k7qxr67ad0cws9yv88yhmdrn9qq4rxzc9fdjkzg"
+ "commit": "dc69138a42745aac79dec9e8de1b6aacde3a4511",
+ "sha256": "0vshlr6kzri4c86yd54g3xccgj6q0vbi920858lg5ij3si4a2z2x"
},
"stable": {
"version": [
0,
2,
- 6
+ 8
],
"deps": [
"org-starter",
"swiper"
],
- "commit": "7ea72ec530a340af61da215327a7fbb66a07ad2a",
- "sha256": "0y1i4zpgmk6i2nj5l6dvdvqkp5a8cww8y4vcpps85blj586xgby3"
+ "commit": "64ed31f7c012f37219f306a4b232de2767c1911e",
+ "sha256": "04zdh6rw07zy6mf69hy754vp8p7kp56ny56dcnsns8ay7dd581zj"
}
},
{
@@ -72279,20 +73852,20 @@
"repo": "bastibe/org-static-blog",
"unstable": {
"version": [
- 20200508,
- 654
+ 20200720,
+ 715
],
- "commit": "38a74456af863e07ab0b838c10830ce796886302",
- "sha256": "1zmmv4izv5na0y29a55df1fa309xj25jdvhpwir879pfa15807bl"
+ "commit": "58019b6dd1ae1323b72d491e65bf9636a9278dd6",
+ "sha256": "00yhgxg87mfaflrkh0i905hr873yd03a7znw5hkrps43zxha9kb9"
},
"stable": {
"version": [
1,
- 3,
+ 4,
0
],
- "commit": "afe250fc43cd1beffd7946b54692d712d9263ff2",
- "sha256": "15iy3z8rglaqbx1fz14inh18ksgjsmq30b8hyv3lgjvcc9ssaiw0"
+ "commit": "58019b6dd1ae1323b72d491e65bf9636a9278dd6",
+ "sha256": "00yhgxg87mfaflrkh0i905hr873yd03a7znw5hkrps43zxha9kb9"
}
},
{
@@ -72370,26 +73943,26 @@
"repo": "integral-dw/org-superstar-mode",
"unstable": {
"version": [
- 20200416,
- 2354
+ 20200818,
+ 2257
],
"deps": [
"org"
],
- "commit": "09ddc28383d363a4b353348a433e24535b4af0e3",
- "sha256": "14w06v76xi4f6hpq6xzicrjjv0b802g5zc9as4mpimfy5gx2xpm0"
+ "commit": "94f35c20f8b84a63defa145e3e6ae735fa33dd5d",
+ "sha256": "1aklp6nk05ghpq7ybsbvn28wrygfwqvq58k1hjll97nbhd7h0gyb"
},
"stable": {
"version": [
1,
- 2,
- 1
+ 4,
+ 0
],
"deps": [
"org"
],
- "commit": "09ddc28383d363a4b353348a433e24535b4af0e3",
- "sha256": "14w06v76xi4f6hpq6xzicrjjv0b802g5zc9as4mpimfy5gx2xpm0"
+ "commit": "94f35c20f8b84a63defa145e3e6ae735fa33dd5d",
+ "sha256": "1aklp6nk05ghpq7ybsbvn28wrygfwqvq58k1hjll97nbhd7h0gyb"
}
},
{
@@ -72512,6 +74085,43 @@
"sha256": "11rfn0byy0k0321w7fjgpa785ik1nrk1j6d0y4j0j4a8gys5hjr5"
}
},
+ {
+ "ename": "org-taskforecast",
+ "commit": "757def05a6104d8aab2dde9977762bdaef63241a",
+ "sha256": "1xbck5kdbfzjw55amjfxsjscmdj7yl3fyrfzgqpdicdih0fas7kz",
+ "fetcher": "github",
+ "repo": "HKey/org-taskforecast",
+ "unstable": {
+ "version": [
+ 20200817,
+ 748
+ ],
+ "deps": [
+ "dash",
+ "dash-functional",
+ "org-ql",
+ "s",
+ "transient"
+ ],
+ "commit": "fc160ce255a98da36c59da4d49a628dd7f742087",
+ "sha256": "063myyg4p2qwbvhb8kcgnz15xp48rv8zhcb86kxh51bm92ifwgb0"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 3,
+ 0
+ ],
+ "deps": [
+ "dash",
+ "dash-functional",
+ "org-ql",
+ "s"
+ ],
+ "commit": "036da7c14e0defb85917293f00a5fa9ac0977da4",
+ "sha256": "0lz6c1hq35qw44fllzsrzv9p4r4sjikciyzvi6nyf0fw189b0c4h"
+ }
+ },
{
"ename": "org-tfl",
"commit": "d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf",
@@ -72582,15 +74192,15 @@
"repo": "leoc/org-time-budgets",
"unstable": {
"version": [
- 20151111,
- 801
+ 20200715,
+ 1016
],
"deps": [
"alert",
"cl-lib"
],
- "commit": "1e81ea29af1ccc7b4ddb42fe4e3fbfc0adf891b0",
- "sha256": "0cqk9q26qby2y1l6x39jfrdrw9x9419mlx2zhndmlb6gv3lv35f9"
+ "commit": "1d6bfc323013bbf725167842d9e097fad805de03",
+ "sha256": "0cny7ck4acj8s2l6hzp48mvz0v0yk7q91mmzxn8vgrggsb02qm5k"
},
"stable": {
"version": [
@@ -72734,11 +74344,11 @@
"repo": "takaxp/org-tree-slide",
"unstable": {
"version": [
- 20200114,
- 2334
+ 20200611,
+ 1143
],
- "commit": "7bf09a02bd2d8f1ccfcb5209bfb18fbe02d1f44e",
- "sha256": "1pzgb1z5k8zsbdqiaa7l94xlrncji1l09zqxvq62fyc0slxcf4ix"
+ "commit": "7126a4365072a32898f169ead8fb59265dabc605",
+ "sha256": "0lbqq3kzh8pd991c3s76parsl49ci5sclfq3sx0aqbcla0qzvh3y"
},
"stable": {
"version": [
@@ -72850,11 +74460,11 @@
"repo": "flexibeast/org-vcard",
"unstable": {
"version": [
- 20191130,
- 703
+ 20200720,
+ 638
],
- "commit": "4f5d71225e946999f45ac9f96996705fee83df5a",
- "sha256": "1w8miq52d2rlyslbss5173gnbv7rmkn2cicd9h272v6ybb585hcd"
+ "commit": "1ae97371b207dabfecaf6b4f7118abafe6cc5e2b",
+ "sha256": "0k9slz20gxcdpvpz8kgvvwff6cif74wybpqgg9x03wqqqda3f37v"
},
"stable": {
"version": [
@@ -72874,11 +74484,11 @@
"repo": "tesujimath/org-wc",
"unstable": {
"version": [
- 20180610,
- 253
+ 20200731,
+ 2244
],
- "commit": "0716c1e8276f6953e139e357e97566e792c8be19",
- "sha256": "0wx4z6y3wn6948bz2pgrpffd4jzwgplvjkh0rnra4gihrapg1bv8"
+ "commit": "dbbf794e4ec6c4080d945f43338185e34a4a582d",
+ "sha256": "0j58591jnj182hps1zc9an692hhnxinlpbw762l7xdc0sa5pjrgb"
}
},
{
@@ -72963,20 +74573,30 @@
"repo": "marcIhm/org-working-set",
"unstable": {
"version": [
- 20200516,
- 1341
+ 20200819,
+ 708
],
- "commit": "c8c66a97e9adf84a4778f68e100259eaba67905b",
- "sha256": "1h5ivbvzj46zkl3rgvcc0l50bn161g2q17miybm1mk70574q9fwn"
+ "deps": [
+ "dash",
+ "org",
+ "s"
+ ],
+ "commit": "d6f2d1ebcfe0b6ccb3a799f04ba6842ca86c9115",
+ "sha256": "1lkf497qpydvw5f7vi0v7yr43j9v03hys16qz6nsqkbizr54b5jh"
},
"stable": {
"version": [
2,
- 2,
- 1
+ 3,
+ 4
+ ],
+ "deps": [
+ "dash",
+ "org",
+ "s"
],
- "commit": "c8c66a97e9adf84a4778f68e100259eaba67905b",
- "sha256": "1h5ivbvzj46zkl3rgvcc0l50bn161g2q17miybm1mk70574q9fwn"
+ "commit": "d6f2d1ebcfe0b6ccb3a799f04ba6842ca86c9115",
+ "sha256": "1lkf497qpydvw5f7vi0v7yr43j9v03hys16qz6nsqkbizr54b5jh"
}
},
{
@@ -73009,8 +74629,8 @@
"repo": "org2blog/org2blog",
"unstable": {
"version": [
- 20200317,
- 2136
+ 20200814,
+ 543
],
"deps": [
"htmlize",
@@ -73018,14 +74638,14 @@
"metaweblog",
"xml-rpc"
],
- "commit": "60eae1c8a7f82fbcc2660d785b33601daaa29f4b",
- "sha256": "06ia4ba6c1yph259wr4y5sdkl1ry6pzbwhx807ia675rp0clp9hz"
+ "commit": "a56346bf1517118b2a960eaadbf138ae1695ddd1",
+ "sha256": "09iycpdj6dkvz5axfx85bkrrf5128ws7clg1jn9yli06rjsw36ba"
},
"stable": {
"version": [
1,
1,
- 8
+ 10
],
"deps": [
"htmlize",
@@ -73033,8 +74653,8 @@
"metaweblog",
"xml-rpc"
],
- "commit": "0177fc4e7edd705db59b82c83a24db51dc405890",
- "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1"
+ "commit": "19aa8a17428d6ee42f54e464c26eeab17a6478ab",
+ "sha256": "198ahgxji0kh6ynygrrdvllj9fwcqrnma4sd8msj2aq18xij9glr"
}
},
{
@@ -73099,32 +74719,28 @@
"repo": "ardumont/org2jekyll",
"unstable": {
"version": [
- 20200516,
- 1727
+ 20200622,
+ 1519
],
"deps": [
"dash-functional",
- "deferred",
- "kv",
"s"
],
- "commit": "36d7789b7b3dfa2f4739a83692d322b601a0f4ea",
- "sha256": "1j1cckvvghz9656bjkdxrc3gsfpz1wjvq3hlh6zblmnlbhhvbsan"
+ "commit": "571249c977e0340edb3ef3af45b7841b62ec8065",
+ "sha256": "1hjqawygbmvdlvzi908b2l4k7ca3g0dg32mpk7vld8xwi49hb1kp"
},
"stable": {
"version": [
0,
2,
- 2
+ 7
],
"deps": [
"dash-functional",
- "deferred",
- "kv",
"s"
],
- "commit": "7be4a71ce55f2fdc7fe7f6414f03d58f19d43410",
- "sha256": "0cxhmbbznvv9d3nmqfn0ggr164fa6yjbfac9wqi3c58vm3zri00k"
+ "commit": "c05ba707190cfab20938afd1b5d4966511ca63b7",
+ "sha256": "03ddrc40qab285i7sj438kicaxxmixkk0b6d8512cn44f42zczyq"
}
},
{
@@ -73179,11 +74795,11 @@
"repo": "kostafey/organic-green-theme",
"unstable": {
"version": [
- 20200510,
- 1645
+ 20200717,
+ 1937
],
- "commit": "2a88a70a5c2a57150c80d306f2475e351a59039c",
- "sha256": "1y3g180q96vx7l8qs0l2jwjv2wbmk6aqzfm2p1h130h05lhgv31w"
+ "commit": "01fe614086e31e166d2a2f1d6b34e301f060458e",
+ "sha256": "1hsidgcyqsbm96gh0nfrdpnm4vq1sw8777d0zslsczr1fp51il6d"
}
},
{
@@ -73194,30 +74810,28 @@
"repo": "jcs-elpa/organize-imports-java",
"unstable": {
"version": [
- 20190922,
- 1520
+ 20200717,
+ 757
],
"deps": [
- "cl-lib",
"f",
"s"
],
- "commit": "8299bdfd65105feb8d7fb85d2951954d73671cd2",
- "sha256": "023gkvhaxx54gcfz6m3pc0yhygf2y43391r1dghivk8420savdjg"
+ "commit": "c431b338d34c94345217b2b904d9c6f331d4015c",
+ "sha256": "1dqvx49lcfi5472aq17nd7y7v7d2ljxcmy5zhks2mfbhhzgdp8n6"
},
"stable": {
"version": [
0,
1,
- 3
+ 4
],
"deps": [
- "cl-lib",
"f",
"s"
],
- "commit": "de094d6d56c85aa9820c77055b54287ae6b46d20",
- "sha256": "0hgdgz1jx292dfxcm1av4v9v6400jpnyp1j21d4fzfi0wj2srfrr"
+ "commit": "c431b338d34c94345217b2b904d9c6f331d4015c",
+ "sha256": "1dqvx49lcfi5472aq17nd7y7v7d2ljxcmy5zhks2mfbhhzgdp8n6"
}
},
{
@@ -73260,29 +74874,64 @@
"repo": "magit/orgit",
"unstable": {
"version": [
- 20200417,
- 1720
+ 20200714,
+ 1943
],
"deps": [
"magit",
"org"
],
- "commit": "e147f055772cc934fe1f1d8619059badeb647c93",
- "sha256": "1q3v22drqbjzzr6d0zdwczz1rq37iyh78k2nk1wirbs5z4ixfyx8"
+ "commit": "ac9b1a42863a864fde9d225890ef5464bffdc646",
+ "sha256": "08amzcvw483dpfq5r34ysn84wzd538qk0jblc94vgcaidspx6481"
},
"stable": {
"version": [
1,
6,
- 0
+ 3
],
"deps": [
- "dash",
"magit",
"org"
],
- "commit": "e7cddf39e301c87c36c7de13e429dee74874d5c8",
- "sha256": "00s3a8i221didw8phlbvdvihj9pxkq9k9j9vh1g1mzd7cz58dm07"
+ "commit": "ac9b1a42863a864fde9d225890ef5464bffdc646",
+ "sha256": "08amzcvw483dpfq5r34ysn84wzd538qk0jblc94vgcaidspx6481"
+ }
+ },
+ {
+ "ename": "orgit-forge",
+ "commit": "d180f7bb9d937d574726326b788f3721266e31a8",
+ "sha256": "1v1a8cz2r84f9y1arzlhpff2fkqyx598pd1lqf81fr6l6l2y9j5n",
+ "fetcher": "github",
+ "repo": "magit/orgit-forge",
+ "unstable": {
+ "version": [
+ 20200621,
+ 2144
+ ],
+ "deps": [
+ "forge",
+ "magit",
+ "org",
+ "orgit"
+ ],
+ "commit": "63a19d1df1434e583aac1329ba4dcfa2ee59d7c1",
+ "sha256": "1vd7wnas53z0985if22sv0wpww2dp0g8b0z9hwlzdhlcrsjay5fz"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
+ ],
+ "deps": [
+ "forge",
+ "magit",
+ "org",
+ "orgit"
+ ],
+ "commit": "63a19d1df1434e583aac1329ba4dcfa2ee59d7c1",
+ "sha256": "1vd7wnas53z0985if22sv0wpww2dp0g8b0z9hwlzdhlcrsjay5fz"
}
},
{
@@ -73293,28 +74942,28 @@
"repo": "tarsius/orglink",
"unstable": {
"version": [
- 20200413,
- 2124
+ 20200719,
+ 917
],
"deps": [
- "dash",
- "org"
+ "org",
+ "seq"
],
- "commit": "a5f5da06174d22dc21bbac167a8c2361fa84bf2b",
- "sha256": "0sxali4vnqzk6mj0m7d82yr2ixvxxj5lzmxffyznpa7j6yndi2mm"
+ "commit": "2f1939488204f67d2a427f224b45596361b402b1",
+ "sha256": "0ipy1p2cr5i0465hchqazmgn9jrgwzbyrb3prfgkl7z2m1gd7fcg"
},
"stable": {
"version": [
1,
1,
- 4
+ 6
],
"deps": [
- "dash",
- "org"
+ "org",
+ "seq"
],
- "commit": "988ad54db45708b0fe835829d512eb6d5f6cf161",
- "sha256": "1mswfbwz7fm9lriab365g7hq8hn85gxcsg8y41by9j0n8hb3hj5q"
+ "commit": "2f1939488204f67d2a427f224b45596361b402b1",
+ "sha256": "0ipy1p2cr5i0465hchqazmgn9jrgwzbyrb3prfgkl7z2m1gd7fcg"
}
},
{
@@ -73364,11 +75013,11 @@
"repo": "tbanel/orgaggregate",
"unstable": {
"version": [
- 20200516,
- 1344
+ 20200708,
+ 2131
],
- "commit": "7426df13512f5eee921c26aa68cfc6e32e3061fc",
- "sha256": "18n2xzwpqq8159qwqy7hy0b93a5qxdb5rjh0ls4jk8lmahk5jrqk"
+ "commit": "99c6bc8c9b72dc9ce886a09540ed24ec83bcc056",
+ "sha256": "03q02cxz76wnx20rhwqiysxnskzs7caw428ij3jj4nsmjkhxdfv0"
}
},
{
@@ -73394,14 +75043,14 @@
"repo": "tbanel/orgtbljoin",
"unstable": {
"version": [
- 20200512,
- 721
+ 20200708,
+ 2127
],
"deps": [
"cl-lib"
],
- "commit": "5bfe2f6d53798d0fe071f9990e03d7428623e4a7",
- "sha256": "16xcps2qlzh5z8c20sl0cnc0mlj8153vk6j1dnfd6l3a6kni88af"
+ "commit": "1aa352a09a2c543352fceb32a505c44e080efcb3",
+ "sha256": "0aczwlssnhn1xpgk3s7l2smrxmhb8af6gg9xjdsfysss4ybbcgy6"
}
},
{
@@ -73448,6 +75097,35 @@
"sha256": "0ycjbsn03cjzx6adabcvi1j7f92yhx3xjzj3xc68m1hw9r2f2gzf"
}
},
+ {
+ "ename": "origami-predef",
+ "commit": "0cda4d6554f8c99928973a0bf718766b7135ffeb",
+ "sha256": "1wr0fs0a2p43yr9fsbdm52z767rbj4j1w3m25w299zf71h263pc9",
+ "fetcher": "github",
+ "repo": "alvarogonzalezsotillo/origami-predef",
+ "unstable": {
+ "version": [
+ 20200615,
+ 1044
+ ],
+ "deps": [
+ "origami"
+ ],
+ "commit": "edcba971ba52a14f69a436ad47888827d7927982",
+ "sha256": "1r3dbnjwmg7y1zsimvqw3bi4168ikwdd5fqkjqd6gm905w32hwc0"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0
+ ],
+ "deps": [
+ "origami"
+ ],
+ "commit": "edcba971ba52a14f69a436ad47888827d7927982",
+ "sha256": "1r3dbnjwmg7y1zsimvqw3bi4168ikwdd5fqkjqd6gm905w32hwc0"
+ }
+ },
{
"ename": "ormolu",
"commit": "ab315f96d9b8d01ffc3b4748d01c70861daf8c1a",
@@ -73466,6 +75144,39 @@
"sha256": "1j7q9rmcn6fkhbcvfh8w4y9dir2y0hhhqmjpsafs8m4zm1rvffbn"
}
},
+ {
+ "ename": "osa",
+ "commit": "df18def95ae792387da2e21f1050cfc25af772fb",
+ "sha256": "1knzkwvdq9wwy2x7kgl1nf0p564247l2y82ms77r0j5vfqhsfd9s",
+ "fetcher": "github",
+ "repo": "atomontage/osa",
+ "unstable": {
+ "version": [
+ 20200522,
+ 2103
+ ],
+ "commit": "615ca9eef4131a23d9971691fa0d0f20fe59d01b",
+ "sha256": "1p651fqivyfyqjs6zz9p4n19r9d23xiswhyjz7r93llmsqs702qi"
+ }
+ },
+ {
+ "ename": "osa-chrome",
+ "commit": "b9c83566892095706033869da370a12e8eccc590",
+ "sha256": "1spihfihcd5iblsl1xp19ayk65mn9ik32jlqn2pg15jwhyfmvyfs",
+ "fetcher": "github",
+ "repo": "atomontage/osa-chrome",
+ "unstable": {
+ "version": [
+ 20200627,
+ 1344
+ ],
+ "deps": [
+ "osa"
+ ],
+ "commit": "07894b9cb40171702b4c89b75542af1f1ac1403c",
+ "sha256": "0brhn6qlminzamwl90ynaik03xvaw3rlkdccdyxfpckjd5npa9wr"
+ }
+ },
{
"ename": "osx-browse",
"commit": "081aa3e1d50c2c9e5a9b9ce0716258a93279f605",
@@ -73729,20 +75440,20 @@
"repo": "tarsius/outline-minor-faces",
"unstable": {
"version": [
- 20200429,
- 2055
+ 20200720,
+ 1954
],
- "commit": "b616b0d90a7c3d7b87bd164f2d213a5e009c39eb",
- "sha256": "1b2mjzym8x42rz3qvmr0va21naw3aycvc2blfxx91i7pwpp8n3qg"
+ "commit": "cb9c529bb992c6f60b054caf4e993b03c7b3ba9e",
+ "sha256": "1s76zfzpwhcql2c4kr5maxc53vznqw6p7hx9n8nihxjgz2rywcas"
},
"stable": {
"version": [
0,
- 1,
- 3
+ 2,
+ 1
],
- "commit": "d6247aaec44f60a9bd161c1d56960f80ab314a49",
- "sha256": "0mscnbbv6cap818zhzz3ig6ychrw0zw84zyl2g1rksir0qj4hznf"
+ "commit": "cb9c529bb992c6f60b054caf4e993b03c7b3ba9e",
+ "sha256": "1s76zfzpwhcql2c4kr5maxc53vznqw6p7hx9n8nihxjgz2rywcas"
}
},
{
@@ -73975,11 +75686,11 @@
"repo": "fishyfriend/owcmd",
"unstable": {
"version": [
- 20200427,
- 633
+ 20200517,
+ 2039
],
- "commit": "cdd2280f34328f65fe470046c928b0018914584a",
- "sha256": "15601vbng2vn45zcdp51vkgycfpcfkaw0xidrq13rg5544x9h7lz"
+ "commit": "05fb8f8f81838b5888fdec8b3947096dd2222e61",
+ "sha256": "0y9ldprxhp6nq8m5bxmhw4iq4n78wvdx2jmr5w9wbd0znvi4cbfz"
}
},
{
@@ -74064,8 +75775,8 @@
"htmlize",
"org"
],
- "commit": "bd36f9fb4e3b1b9e8686b993b02ccd780ff75a96",
- "sha256": "03wj3gx09lbfmsanfhqfbzz61zaszia1mhfvlywhygknpagxr3lp"
+ "commit": "f5eac28734ea33d0b7a3dbe10b777907a91cf9f9",
+ "sha256": "05ndpkqr4kh2942ygjsa1w53056d60qvl0gmp30dxmzc57v0wb2x"
}
},
{
@@ -74175,14 +75886,14 @@
"repo": "kaushalmodi/ox-hugo",
"unstable": {
"version": [
- 20200501,
- 1317
+ 20200722,
+ 1939
],
"deps": [
"org"
],
- "commit": "8f36181977377383cb54803651d93b24e370122d",
- "sha256": "1rxkbkgvylwnh5n6zc6hiqa9zhxwc8j1if7mxribw44xrg3150a1"
+ "commit": "75b849e9561c4a6022babf6eaf0e037310ded7c1",
+ "sha256": "1xsxljf99h2pyvpp9gvma6g42q1n2xmhnwvpmciwj5rajw5xqc5v"
},
"stable": {
"version": [
@@ -74198,10 +75909,10 @@
},
{
"ename": "ox-impress-js",
- "commit": "e5e79b4b897daca80f26440107abaddf0a480db9",
- "sha256": "0p0cc51lmxgl0xv951ybdg5n8gbzv8qf0chfgigijizzjypxc21l",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "1n7g5ykn95565z7kp83pqvm4y8r4p1jmwh0g7pl3kbw48y1521vc",
"fetcher": "github",
- "repo": "kinjo/org-impress-js.el",
+ "repo": "nullpofy/org-impress-js.el",
"unstable": {
"version": [
20150412,
@@ -74271,14 +75982,14 @@
"repo": "stig/ox-jira.el",
"unstable": {
"version": [
- 20200218,
- 2301
+ 20200616,
+ 2310
],
"deps": [
"org"
],
- "commit": "00767df8ba024eb1ef09fe16c3aed30d729d6add",
- "sha256": "0fbic43vzp0dp8wbx12cq22ca192v2jl2w131xcqmbhbww6j5xv2"
+ "commit": "e9a47ef51862f11a5c006cf9e8c5f4ec5517aced",
+ "sha256": "1ws3myl2z6vv3idq28m8q97zlrmsfg5z3i8y3adsbm56ga9jqvdj"
}
},
{
@@ -74340,6 +76051,25 @@
"sha256": "15wxyzsfp4gilnravs2h4h8vwk0rf8ylzsxzdzlqx0i62wbb79l9"
}
},
+ {
+ "ename": "ox-leanpub",
+ "commit": "20e1ea346ac6d912e3fbb597b7c65c98a6785132",
+ "sha256": "10nz3dy7dmy8p70fsglbc0gdfhhvr286wby5yccjfaacjkg77ifj",
+ "fetcher": "gitlab",
+ "repo": "zzamboni/ox-leanpub",
+ "unstable": {
+ "version": [
+ 20200818,
+ 1116
+ ],
+ "deps": [
+ "org",
+ "ox-gfm"
+ ],
+ "commit": "8c8d026aa3a31cb6dcd2530ac5902e551b161343",
+ "sha256": "0i88bzcczvhsylcbk7nwx19gn6ydiw8vrgwl2p5njm10vngrjlny"
+ }
+ },
{
"ename": "ox-mdx-deck",
"commit": "13d1a86dfe682f65daf529f9f62dd494fd860be9",
@@ -74471,14 +76201,14 @@
"repo": "0x60df/ox-qmd",
"unstable": {
"version": [
- 20170402,
- 1657
+ 20200813,
+ 408
],
"deps": [
"org"
],
- "commit": "3a24c7a0b3ec80e494b977e14a3dfb94c9f1d8ec",
- "sha256": "030nay81c49ings96akzzy108a6agg91rvpmg0pf05qmjysfysmf"
+ "commit": "8c3d8ce2a21044fc85e5e4e06be0220900d7ba4f",
+ "sha256": "1j6zmjy3s2l2wj500q9i75xd3hf8wlh04ycmmad45swrkgp70f2s"
}
},
{
@@ -74489,14 +76219,14 @@
"repo": "yjwen/org-reveal",
"unstable": {
"version": [
- 20200429,
- 1533
+ 20200802,
+ 710
],
"deps": [
"org"
],
- "commit": "e8b2801ab2210187ab1cfacad09bb07e4b61ca56",
- "sha256": "0xa34y0v6z78gpida59jc3gzng68n0has5dnkccv4vdxi4yb6ii9"
+ "commit": "553e1a9d678e74c2646e4c19bd9f6c08d8a00486",
+ "sha256": "18khlffdmg88pd50vwg00vz143ysqhkdkvva9h4bkw618inz70wq"
}
},
{
@@ -74525,14 +76255,14 @@
"repo": "msnoigrs/ox-rst",
"unstable": {
"version": [
- 20191013,
- 551
+ 20200815,
+ 1511
],
"deps": [
"org"
],
- "commit": "9158bfd18096c559e0a225ae62ab683f1c98a547",
- "sha256": "11v1h45ipjh95ksk6cdgp0azfmb7y3i8hdd46m7psmda08x8kqm5"
+ "commit": "99fa790da55b57a3f2e9aa187493ba434a64250e",
+ "sha256": "0dxadzbha2fvg42jh4ng8hjb582mv7avlzmpxlzf32qxf6x8r638"
}
},
{
@@ -74683,20 +76413,20 @@
"repo": "marsmining/ox-twbs",
"unstable": {
"version": [
- 20191216,
- 1011
+ 20200628,
+ 1949
],
- "commit": "cf56accf8633f72c741fff19a49c24cc8bdd8974",
- "sha256": "12w58nvpzn0fbica3m679n08hczzikqr1xi1n4k7a6h1l60qykl7"
+ "commit": "e8a27dc78b7be494d9918f26db7a3bbb6b45020b",
+ "sha256": "0nffy7ivs8fw0dj3s66hbsby0riz5wrv7xzm8g9mrfvhki938pqa"
},
"stable": {
"version": [
1,
1,
- 2
+ 4
],
- "commit": "cf56accf8633f72c741fff19a49c24cc8bdd8974",
- "sha256": "12w58nvpzn0fbica3m679n08hczzikqr1xi1n4k7a6h1l60qykl7"
+ "commit": "e8a27dc78b7be494d9918f26db7a3bbb6b45020b",
+ "sha256": "0nffy7ivs8fw0dj3s66hbsby0riz5wrv7xzm8g9mrfvhki938pqa"
}
},
{
@@ -74877,14 +76607,14 @@
"repo": "melpa/package-build",
"unstable": {
"version": [
- 20200426,
- 2253
+ 20200601,
+ 1939
],
"deps": [
"cl-lib"
],
- "commit": "5fe5156491145c667286cb92be4191a348eaa31e",
- "sha256": "1r9ir8jqfi2sqjjx9yxs4phxrpfw8x35nm58xfrqsjw158dspzai"
+ "commit": "4cb0f98a21729f9ef0189f095384555c9d2b6fe4",
+ "sha256": "0ij6p7i5x0fs0yn8zxcx7gf9ldanflh7mj7mblr8snpgbzx3jwnz"
},
"stable": {
"version": [
@@ -74921,27 +76651,27 @@
"repo": "purcell/package-lint",
"unstable": {
"version": [
- 20200419,
- 406
+ 20200816,
+ 24
],
"deps": [
"cl-lib",
"let-alist"
],
- "commit": "495da67557d35acb146ec1f38f7576126aec6bfc",
- "sha256": "0nb83rs2hb097pvv63pkvdlyqx136mrcbzdjkyskwg3rd3rwvimq"
+ "commit": "c4b16a90196d6d83d6ba668923c1ce725e13a5d6",
+ "sha256": "0kz8snjl0802ypxzag2n7552f6ssmj0hxx4lkal4v421pr2cqka6"
},
"stable": {
"version": [
0,
- 12
+ 13
],
"deps": [
"cl-lib",
"let-alist"
],
- "commit": "f86705d0d4ed81ea8ea14e00fe59714f11f7c2ba",
- "sha256": "00inrfla7f824yh10rxlr0xq1cmyqigppsrfspd637d58239l6sw"
+ "commit": "9e28a5cd08e94db0ba4fb8847fa970c98316facc",
+ "sha256": "03pim9ijqmjqyv0qlkap5jw47iv9qsw1d7s2p9vrqjnpf4jxcq70"
}
},
{
@@ -74958,19 +76688,19 @@
"deps": [
"package-lint"
],
- "commit": "495da67557d35acb146ec1f38f7576126aec6bfc",
- "sha256": "0nb83rs2hb097pvv63pkvdlyqx136mrcbzdjkyskwg3rd3rwvimq"
+ "commit": "c4b16a90196d6d83d6ba668923c1ce725e13a5d6",
+ "sha256": "0kz8snjl0802ypxzag2n7552f6ssmj0hxx4lkal4v421pr2cqka6"
},
"stable": {
"version": [
0,
- 12
+ 13
],
"deps": [
"package-lint"
],
- "commit": "f86705d0d4ed81ea8ea14e00fe59714f11f7c2ba",
- "sha256": "00inrfla7f824yh10rxlr0xq1cmyqigppsrfspd637d58239l6sw"
+ "commit": "9e28a5cd08e94db0ba4fb8847fa970c98316facc",
+ "sha256": "03pim9ijqmjqyv0qlkap5jw47iv9qsw1d7s2p9vrqjnpf4jxcq70"
}
},
{
@@ -75128,8 +76858,8 @@
20200305,
244
],
- "commit": "314b397910b3d16bb7cbcc25098696348e678080",
- "sha256": "106w2n01i9d6z2r43lwwrm7hlppi9bkf8g8nsqd91f0f06921plw"
+ "commit": "f8c4cd7fc67638ae4113551dcffdf87fcd252d9b",
+ "sha256": "1jh7mdry3ysgl9dvrrbx7b9f5dh4bm6gccibpcdnm9pgpfj2bm29"
},
"stable": {
"version": [
@@ -75181,11 +76911,11 @@
"repo": "danielsz/Palimpsest",
"unstable": {
"version": [
- 20200211,
- 641
+ 20200804,
+ 2308
],
- "commit": "389ec5b4c5067fa903c543b7fe1d804f30b6ced5",
- "sha256": "1yki1sl2m7fj4m52gmb768h2qkv0j93lmd72jv21n20bnzvjp73v"
+ "commit": "f474b3ad706373d9953abdc401d683a2a023d28e",
+ "sha256": "0wzxl1zcbm3svspjpjzvx92is1k9sz7g0a99r8q066j2364la0zh"
}
},
{
@@ -75252,11 +76982,11 @@
"repo": "sebasmonia/panda",
"unstable": {
"version": [
- 20200424,
- 2206
+ 20200715,
+ 338
],
- "commit": "bdd9f80283d8ae4a69f8789e5f18b1560b94fe43",
- "sha256": "1ld4igmmjk7p7dxm0mnfks3k0cqpqjxrvlmjdi0m7w11ba8dsah9"
+ "commit": "6508ac3228975c39d10a1caa70b9ce34ff3ed21d",
+ "sha256": "019nigy5yh1qrzw0agp2kgjfpfm503fgkj07c9m2xqs9hww781x1"
}
},
{
@@ -75440,14 +77170,14 @@
"repo": "ajgrf/parchment",
"unstable": {
"version": [
- 20200514,
- 2047
+ 20200812,
+ 1259
],
"deps": [
"autothemer"
],
- "commit": "4fa14adbc043497fc942568fdb78505ca549e5b7",
- "sha256": "1ply18yzdf1lxyia8knn6fk8wb4yzwicgdiscr2z87bpk8p5d2pb"
+ "commit": "271ab4b7d023d730e3d684a1505cc77e2d0cc14a",
+ "sha256": "138n4fs33cv2ly89cvs7lkh372kghldhw8pw18zsi39qfvggw6wm"
},
"stable": {
"version": [
@@ -75470,8 +77200,8 @@
20191121,
2328
],
- "commit": "814999bb320e6d5aaa9c8ff663b1933157129571",
- "sha256": "0jb3qwx8bxr7x17cgqbd6v53634i9lmrcnqn847bnnlsvy0j094x"
+ "commit": "8330a41e8188fe18d3fa805bb9aa529f015318e8",
+ "sha256": "10zm5nfs8sx1cmjifjcy6xj3285hx1936xc3kbf6ndzpcqgb9yd5"
},
"stable": {
"version": [
@@ -75622,6 +77352,30 @@
"sha256": "0v97ncb0w1slb0x8861l3yr1kqz6fgw1fwl1z9lz6hh8p2ih34sk"
}
},
+ {
+ "ename": "parinfer-rust-mode",
+ "commit": "b35f28995db0c21ecaadd5504a10aa2ee5ac2070",
+ "sha256": "06003hh19k1087s8lvsbl04as2yph1zw9qr844s4rbyi838d4pc1",
+ "fetcher": "github",
+ "repo": "justinbarclay/parinfer-rust-mode",
+ "unstable": {
+ "version": [
+ 20200802,
+ 2026
+ ],
+ "commit": "9e2e91cf1697582a396a5365f24d74634acfc744",
+ "sha256": "1ii73zlpdvi5fxp6ajyn8h7xvxgc5iz58zr5g4vk0flm1vw6v5kn"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 8,
+ 1
+ ],
+ "commit": "9e2e91cf1697582a396a5365f24d74634acfc744",
+ "sha256": "1ii73zlpdvi5fxp6ajyn8h7xvxgc5iz58zr5g4vk0flm1vw6v5kn"
+ }
+ },
{
"ename": "parrot",
"commit": "b1b393ffb9b7691e8fc99bee5fc676463038a68d",
@@ -75669,28 +77423,26 @@
"repo": "jcs-elpa/parse-it",
"unstable": {
"version": [
- 20191209,
- 549
+ 20200720,
+ 1047
],
"deps": [
- "cl-lib",
"s"
],
- "commit": "ff9f9049ac039473f0ba5d070ac0e6d89cfbf851",
- "sha256": "05ckrhkxffzcz1igqwznbkxc1hpidvsnwv6cxp8n4q6kmniagx4i"
+ "commit": "abf2b7528ea2ec5c45f99664a6ab9509ccd954f3",
+ "sha256": "1v4a07gnaccqnl1r0r8yhw6ka6f8nh0p8j0lr562ik6cbfljf04a"
},
"stable": {
"version": [
0,
1,
- 7
+ 8
],
"deps": [
- "cl-lib",
"s"
],
- "commit": "318cb29153c6ae0032ddceb69bb8c1f2a7df5ef6",
- "sha256": "0f2fjb0a0yj62dy3j820fgxlpg2gsv1awaswwrb2rv7mp44drr4f"
+ "commit": "abf2b7528ea2ec5c45f99664a6ab9509ccd954f3",
+ "sha256": "1v4a07gnaccqnl1r0r8yhw6ka6f8nh0p8j0lr562ik6cbfljf04a"
}
},
{
@@ -75933,8 +77685,8 @@
"s",
"with-editor"
],
- "commit": "07b169ec32ad6961ed8625a0b932a663abcb01d2",
- "sha256": "1dl3bck16zwhpspjrms11dknqgadnmpjqhcplkvv3v4f7vbnij6v"
+ "commit": "06f499994071bb6131244218b25d637103afe1d5",
+ "sha256": "05w0jkl7m55h30szvgknbwg7xayilk4bh3nf70hrsy3czisxmccx"
},
"stable": {
"version": [
@@ -76568,29 +78320,6 @@
"sha256": "1b7csqypqkalkzq6vrbq5ry1gdk0qnhnk43rlj514mph0s1nywdd"
}
},
- {
- "ename": "peg",
- "commit": "9b9b55a02e903ae7e75f8b636fdb1cf907c5db7c",
- "sha256": "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm",
- "fetcher": "github",
- "repo": "ellerh/peg.el",
- "unstable": {
- "version": [
- 20150708,
- 641
- ],
- "commit": "081efeca91d790c7fbc90871ac22c40935f4833b",
- "sha256": "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n"
- },
- "stable": {
- "version": [
- 0,
- 6
- ],
- "commit": "081efeca91d790c7fbc90871ac22c40935f4833b",
- "sha256": "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n"
- }
- },
{
"ename": "pelican-mode",
"commit": "aede5994c2e76c7fd860661c1e3252fb741f9228",
@@ -76639,14 +78368,11 @@
"url": "https://hg.serna.eu/emacs/per-buffer-theme",
"unstable": {
"version": [
- 20191101,
- 2333
- ],
- "deps": [
- "cl-lib"
+ 20200527,
+ 1256
],
- "commit": "7df4d2f4be64dbcf0bf10a2b9ac3db858fbcd9c8",
- "sha256": "04s14x3qi5aa18bfcr3zjbb109nm2pgwgnl36g7fw2crj8mz03v4"
+ "commit": "f29b5c57198ebfedbf142f95129190c6c00b4822",
+ "sha256": "0b39m8zmy4yfj3z93q3gqqqhhmyb10kd76fl7347pm6xgq4sl1g0"
}
},
{
@@ -76793,11 +78519,11 @@
"repo": "Bad-ptr/persp-mode.el",
"unstable": {
"version": [
- 20200222,
- 1106
+ 20200617,
+ 2154
],
- "commit": "391a7dc248c9c04b7ad424c696bdff578e14dd2c",
- "sha256": "0b4y7a6j70s9lvr37riyy9k5kh3yvmx0m6nd9c0c8572ji4ij65g"
+ "commit": "14325c11f7a347717d7c3780f29b24a38c68fbfc",
+ "sha256": "1kb5v7pl2vhx6zdwf9kip38qjk8nkd9xpgdy74q8p3c56ap9lg6g"
},
"stable": {
"version": [
@@ -76871,25 +78597,25 @@
"repo": "nex3/perspective-el",
"unstable": {
"version": [
- 20200513,
- 1416
+ 20200814,
+ 554
],
"deps": [
"cl-lib"
],
- "commit": "1fc13646623f42e1d70cf1f651c4b154e12070ca",
- "sha256": "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g"
+ "commit": "74e811ccbada09dd9a3d90b983e78d146542121b",
+ "sha256": "1xfcm69nd6f9chwlqfz5vd8nnyl5mwharxjrn1m515568dqrk62x"
},
"stable": {
"version": [
2,
- 8
+ 10
],
"deps": [
"cl-lib"
],
- "commit": "1fc13646623f42e1d70cf1f651c4b154e12070ca",
- "sha256": "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g"
+ "commit": "74e811ccbada09dd9a3d90b983e78d146542121b",
+ "sha256": "1xfcm69nd6f9chwlqfz5vd8nnyl5mwharxjrn1m515568dqrk62x"
}
},
{
@@ -76929,8 +78655,17 @@
20200321,
504
],
- "commit": "4ae88a9c81d499bbe99978ff0216b645fed70023",
- "sha256": "1zc7dmgp3s9q33wkvw6i7zzlcaa65ixx3hxb78m62lk2a7fzb3ih"
+ "commit": "43447a2c70f98edd1139005e32f437d3f142442b",
+ "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
+ ],
+ "commit": "43447a2c70f98edd1139005e32f437d3f142442b",
+ "sha256": "1ccpb1jbynlqqzhsm3h7xk2s7n9nbpnnxmixz77kxskdxj5as79a"
}
},
{
@@ -77039,15 +78774,15 @@
"repo": "emacs-php/phan.el",
"unstable": {
"version": [
- 20191125,
- 1408
+ 20200805,
+ 356
],
"deps": [
"composer",
"f"
],
- "commit": "2a6e1b66c2aad25fddb8b4f706a28a1aafaaa4c7",
- "sha256": "1ivkkmjg9drp22l5hvira5m0ialca8kzw6pzj01wm4ykqsaajnlf"
+ "commit": "b7d523630bb072c4dbcfa9995dc734b25b72a69f",
+ "sha256": "0xif2hmlfcnhf716964zmzzldxsyhmpp2y40i9l1cxlcliszwscv"
},
"stable": {
"version": [
@@ -77071,14 +78806,14 @@
"repo": "zk-phi/phi-autopair",
"unstable": {
"version": [
- 20191220,
- 311
+ 20200816,
+ 535
],
"deps": [
"paredit"
],
- "commit": "5685b9541c4c9d4cc8a892743fdf245aceea1682",
- "sha256": "16kib35s7pffcs8kiljydbf5z1qq5l2d04dqqcnbbi0539y979n5"
+ "commit": "3e78793f9c480adf79b12d441fae5571e97b9e5f",
+ "sha256": "003dnixrnn7qcm25dbibc4rc8yrqsj9jci9rxp9l7ci6ya1bi0i2"
}
},
{
@@ -77089,14 +78824,14 @@
"repo": "zk-phi/phi-grep",
"unstable": {
"version": [
- 20190920,
- 908
+ 20200816,
+ 1027
],
"deps": [
"cl-lib"
],
- "commit": "06b740e3fb20074be9bae87530f5616a122c3aca",
- "sha256": "0lwqlz6jp44dq7yhj5yvfrhnjlxlihkpqjil6d2ma20b2946n9ny"
+ "commit": "d9dbf69dcf0e06944dcfb89375b09d0d2b0ef4ee",
+ "sha256": "1lgixvg5668kb1y8a2xxm1nlbppj5a8sswjrcxasqnxmrif6lkls"
}
},
{
@@ -77107,11 +78842,11 @@
"repo": "zk-phi/phi-rectangle",
"unstable": {
"version": [
- 20151208,
- 654
+ 20200816,
+ 650
],
- "commit": "0c12716afc71d803d1f39417469521dc465762d9",
- "sha256": "0d2c579rg8wdfmn94nzaix9332jch4wlr939jszls330s38d0iv4"
+ "commit": "4ea8b40a614c1cc9087b9c0bd924a2d9d6cc0a83",
+ "sha256": "1ajjdpx4xbgig11380lyy10gqfmp23k5zwb77pwdl1rhapsdpjp8"
}
},
{
@@ -77144,14 +78879,14 @@
"repo": "zk-phi/phi-search-dired",
"unstable": {
"version": [
- 20150405,
- 714
+ 20200816,
+ 1542
],
"deps": [
"phi-search"
],
- "commit": "162a5e4507c72512affae22744bb606a906d4193",
- "sha256": "1b44947hncw4q42fxxrz6fm21habzp4pyp0569xdwysrx2rca2fn"
+ "commit": "f014a9fb0b6a94af2df0e22f91ef79ce6996afd7",
+ "sha256": "0ivb7d33qajccvs1sz4fc3h031qkqmz8w93k6di47qyfzd4vrvjm"
}
},
{
@@ -77347,17 +79082,17 @@
},
{
"ename": "php-mode",
- "commit": "2e41dc09413eaa93704e7d9f55bd2bd01f658806",
- "sha256": "1gqmcynz2wx09xjnk70db1a2pbnrh1vfm5vd6mks1s10y59bh0zq",
+ "commit": "5593a586ce7579fd3a136e2416b89721157f98e1",
+ "sha256": "1xa9dmjinm6qm4cbzqanw5njmif71sg3jxnvgvi17jj9j3125d9f",
"fetcher": "github",
"repo": "emacs-php/php-mode",
"unstable": {
"version": [
- 20200507,
- 1755
+ 20200812,
+ 1129
],
- "commit": "a7687e454adc2e6c1e13d90beac122af32169eb8",
- "sha256": "1nlikgyflksdzbd8k2l3f0nmv3gisj145fi45kw971ianihq476x"
+ "commit": "f4c7c6995dadcdc6da5fefadfd362f8418b2eec1",
+ "sha256": "0vg8xzpm4lbahlldgfsc63wfans3wx0nfkm2x2k3qkgp9r7wbh38"
},
"stable": {
"version": [
@@ -77369,6 +79104,30 @@
"sha256": "0wnkcxg6djy4jvxhshiy1iw6b5cf79pjwjhfd1a060cavhfm4v5c"
}
},
+ {
+ "ename": "php-quickhelp",
+ "commit": "955f58195517df08f69dd4c85cba31c94c88d345",
+ "sha256": "0w9r3h5pqbsg88ki3zny6mznmz39w5cq21lzzg2521a4hddi8g44",
+ "fetcher": "github",
+ "repo": "vpxyz/php-quickhelp",
+ "unstable": {
+ "version": [
+ 20200818,
+ 1944
+ ],
+ "commit": "f1d79fbed01b667495f64438687f1fbd6bf486c6",
+ "sha256": "0lnjd0ris288ia6i2wvw30yg57fmh5xgq1dln243s57yvm1wccfd"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 3,
+ 4
+ ],
+ "commit": "325668a47127bee77f094ed2b09171b8656c7429",
+ "sha256": "16cm754r1cg1rb6blfqcja41klr4hy90gkhg6p9p79qgxjrnbbbd"
+ }
+ },
{
"ename": "php-refactor-mode",
"commit": "ad4a9bb43e131e2eb0d8b09b13245bc268c524a5",
@@ -77445,18 +79204,17 @@
"repo": "emacs-php/phpactor.el",
"unstable": {
"version": [
- 20200405,
- 1544
+ 20200618,
+ 1845
],
"deps": [
"async",
- "cl-lib",
"composer",
"f",
"php-runtime"
],
- "commit": "860d7e8784b261ee71deba354d01c3038cd777ab",
- "sha256": "1d3fijh11g70xhx3a47l75mrp64bvkk7hh9lg83nl30qhn2vrbn3"
+ "commit": "62d2372ea55c0c5fb4e77076988472ebb5d85f24",
+ "sha256": "1sfrdap157zc7lk9vwsy91p813ip8dmazgfjwh7jwzyvcj7dsimc"
},
"stable": {
"version": [
@@ -77510,14 +79268,14 @@
"repo": "emacs-php/phpstan.el",
"unstable": {
"version": [
- 20200411,
- 531
+ 20200807,
+ 1101
],
"deps": [
"php-mode"
],
- "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101",
- "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w"
+ "commit": "e675cf0881408e10b76f2e70c6158237cb94671e",
+ "sha256": "11qd0mpcvc56hghwv60a57d5pap19s7yvlvi6827wnrq35cyzh7f"
},
"stable": {
"version": [
@@ -77731,14 +79489,14 @@
"repo": "davep/pinboard.el",
"unstable": {
"version": [
- 20200402,
- 919
+ 20200630,
+ 1544
],
"deps": [
"cl-lib"
],
- "commit": "7c57f20667ead2bb27ab1d0a03307c28ea728bd9",
- "sha256": "0d9z1hr2082sbg4dlmarksh598xd92w7c09xmdjyn1yqm39gsljw"
+ "commit": "d426f9d2ebec5f907c8a89d6b38ccbcb13750d4f",
+ "sha256": "0jganb5ws2qlzyncyhaw1hldqbpxm44ddzzy17hmriy8n5701fyv"
},
"stable": {
"version": [
@@ -78053,11 +79811,11 @@
"repo": "juergenhoetzel/pkgbuild-mode",
"unstable": {
"version": [
- 20200425,
- 616
+ 20200818,
+ 1742
],
- "commit": "bc22301198b3f581d89352510e847454fb1cb9ff",
- "sha256": "11il65myybgfj30psicfgqpjwwpa6hwapf55d497x8kbixx2kpg1"
+ "commit": "887c01cb06420501c7780fb01a8a76bdb0864cca",
+ "sha256": "17v71sd1i7wyvjzz0nir7p28cskzgws4dcpm83ch1khhljh3r7kl"
},
"stable": {
"version": [
@@ -78076,14 +79834,14 @@
"repo": "abo-abo/plain-org-wiki",
"unstable": {
"version": [
- 20200507,
- 2135
+ 20200617,
+ 828
],
"deps": [
"ivy"
],
- "commit": "99cd7f90e5c741cf3327f464852203baee7c488c",
- "sha256": "1s4ida511fi6mbrckn9kvssr4vmiy4w5qkkby7s1jlqvlydnsa8m"
+ "commit": "5e32e7e6216e24d515624008fa0898077403aa7f",
+ "sha256": "0d3nhvkzzharjv54w3rinqcpwhqb61flgvvcngfdxkrgs1yazaqk"
}
},
{
@@ -78291,11 +80049,11 @@
"repo": "akirak/emacs-playground",
"unstable": {
"version": [
- 20180624,
- 326
+ 20200812,
+ 1336
],
- "commit": "9212790026bea9ab5fb4ecf0da1163be8ab00776",
- "sha256": "0g6d7z9sv7fdc918gay7rd71frzqn75mcwnljgmqksfh5890apa6"
+ "commit": "77d2faab0bc3f6e1f2c65c66644c52167304610d",
+ "sha256": "1xl6fp246wk764jkyr7km7lgqfdyvbjxr9ri20dzaadfvwqyfzg5"
}
},
{
@@ -78478,6 +80236,21 @@
"sha256": "0nwrzf7lvimay83k1s4nxz86d1a82v55j23vp2915c307gkwrl8z"
}
},
+ {
+ "ename": "pnpm-mode",
+ "commit": "c12d8b34a72c2ac8b29109492e203e45619116a6",
+ "sha256": "0vwsvadl6z31mzskjaykffv68vb8k4nffccdkb71vmrrbnpii6k5",
+ "fetcher": "github",
+ "repo": "rajasegar/pnpm-mode",
+ "unstable": {
+ "version": [
+ 20200527,
+ 557
+ ],
+ "commit": "391207e6505948b0d0cb57b802ee4885e3292c21",
+ "sha256": "0pgh9fnghj5f6vfkfb2l4jgf5j4lmidnfs949q0xik3b3hz4j4h3"
+ }
+ },
{
"ename": "po-mode",
"commit": "38e855cde9264bff67016d23e7e5e00f113c55bf",
@@ -78486,11 +80259,19 @@
"repo": "emacsmirror/po-mode",
"unstable": {
"version": [
- 20190511,
- 1542
+ 20200610,
+ 1743
+ ],
+ "commit": "3114e245c2ee6208e9b506f3e65e631e1b236019",
+ "sha256": "1f84fziibcc1bjhcmmzvbsvsw2lwabsb70vl4x2jpqsraygzhw0b"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 21
],
- "commit": "1916142f6a817c733d5ec37e3b4fbae3da67e499",
- "sha256": "0nvpr5ry86by1dm7mp2w5p534qg4c9dpdich3x13gbbp9vazc7h6"
+ "commit": "25eb1bdca30ed25d2e5d51b9feeb28a3faff51ec",
+ "sha256": "00ff5njs4aghkhipw5pmha4mj1a5s35g1cxihhbqpn9gr7kmbg02"
}
},
{
@@ -78615,14 +80396,14 @@
"repo": "lujun9972/podcaster",
"unstable": {
"version": [
- 20161020,
- 1535
+ 20200607,
+ 1054
],
"deps": [
"cl-lib"
],
- "commit": "9854517025deb5d556168a68955fb7b662239f5c",
- "sha256": "06ag0idz7cf6i9kg7kqr03js9b6cw6my1jzd1x3wkgazx5slqk4q"
+ "commit": "7a21173da0c57e6aa41dbdc33383047386b35eb5",
+ "sha256": "1b2bhwipsyyydrqdxjsipzy170xdkfamd4mw5pwzjcgdjqz9wvxa"
}
},
{
@@ -78675,11 +80456,11 @@
"repo": "kunalb/poet",
"unstable": {
"version": [
- 20191215,
- 201
+ 20200606,
+ 2343
],
- "commit": "ad998dce8a953eb6101e61bd6bb5ff871535d383",
- "sha256": "030qm41sf4z29f0gghrk6a4lpf775lgg9vvlmcnl678vgy7p9fa5"
+ "commit": "16eb694f0755c04c4db98614d0eca1199fddad70",
+ "sha256": "0zm8jbviddyj7jnyssh77jx43jghbpjwr77n9s3cjp3bmadwkrv5"
}
},
{
@@ -78690,15 +80471,15 @@
"repo": "galaunay/poetry.el",
"unstable": {
"version": [
- 20200326,
- 1328
+ 20200805,
+ 1259
],
"deps": [
"pyvenv",
"transient"
],
- "commit": "6dcc9d22cac6642a861770b5518398d8ee4fcc9a",
- "sha256": "1za8s1k5ni11yqz64rz777lps400jnga151cca2f3l3xx2lcc2c7"
+ "commit": "22a76cdcba180b4689a6b45c97669e3c76cd36ed",
+ "sha256": "099sxca06zxfvlvmsgjicira4r4csqv2m4l0d7icji57qahbp5h2"
},
"stable": {
"version": [
@@ -78768,6 +80549,21 @@
"sha256": "016cjy5pnnqccjqb0njqc9jq6kf6p165nlki83b8c0sj75yxghav"
}
},
+ {
+ "ename": "poke-line",
+ "commit": "e608228443b10d1cd883ed8044b624480647ed17",
+ "sha256": "1j94pzhp1wsaa4nipbfx3bdapvf38h6g352dxakw38jimqyp6cvw",
+ "fetcher": "github",
+ "repo": "RyanMillerC/poke-line",
+ "unstable": {
+ "version": [
+ 20200818,
+ 1403
+ ],
+ "commit": "fe876cd6e8fdf3a68037285eda4ac2eaf977eae4",
+ "sha256": "04dpfg22nqmqrw3rzpyh62kb17iqdadmimrnrvy9cnyd8mla0k5z"
+ }
+ },
{
"ename": "pollen-mode",
"commit": "97bda0616abe3bb632fc4231e5317d9472dfd14f",
@@ -78957,14 +80753,14 @@
"repo": "polymode/poly-org",
"unstable": {
"version": [
- 20200316,
- 1315
+ 20200817,
+ 756
],
"deps": [
"polymode"
],
- "commit": "8f4d11489532be98a291258ca27405aa528fc126",
- "sha256": "1srnwcsn2bh8gqzxixkhffk7gbnk66kd4dgvxbnps5nxqc6v0qhc"
+ "commit": "0793ee5c3565718606c514c3f299c0aa5bb71272",
+ "sha256": "011nacpyxc969qyvbzwhz0hr3bcbkjiwlaqa27sb4hffnl4p1py9"
},
"stable": {
"version": [
@@ -79098,11 +80894,11 @@
"repo": "polymode/polymode",
"unstable": {
"version": [
- 20200411,
- 915
+ 20200606,
+ 1106
],
- "commit": "2a61fb6d3e805bc0e4ca7b6510510a955c6bfb6a",
- "sha256": "0cphikjz9hwij1k41radyar6nh7md8v98qwn2j9lzcbyz69hrvaq"
+ "commit": "3284ff10017d280ba82f27dc20fe5223b0df709c",
+ "sha256": "0756c0fi5msqdsks95bcs0ghhk90b340y4zrkijhaz4b2cnm07h4"
},
"stable": {
"version": [
@@ -79122,22 +80918,20 @@
"repo": "TatriX/pomidor",
"unstable": {
"version": [
- 20200513,
- 1054
+ 20200722,
+ 1402
],
- "commit": "308a438550173685cb852a8aadef75c25701513e",
- "sha256": "1w4sds6h6q80drqzkmiz51nvy942a88s99zfrvmyvfrvwv7wlqqb"
+ "commit": "60da23c97c30e08254a914dca411b2e3fd639c99",
+ "sha256": "19a5155gxz97yqhfxp48d6lnhh0qqai4pd5rg1xy79mq0hxy31p7"
},
"stable": {
"version": [
0,
- 3
- ],
- "deps": [
- "alert"
+ 6,
+ 1
],
- "commit": "590e64d316d9210bd00cb4eb39d2f07ddc16809a",
- "sha256": "0001k4p09il5f20s0jgyi96wzslfcgv3y35wfxj771gixlacnrhi"
+ "commit": "bf3ca99c24a84befe9ed76b9636ec9adb37ab844",
+ "sha256": "1qsgx1vh0xsk1wwpyx8lpnpa4879bzf0gil28v94sncbri2c6f7w"
}
},
{
@@ -79208,26 +81002,40 @@
"repo": "ponylang/ponylang-mode",
"unstable": {
"version": [
- 20200510,
- 200
+ 20200724,
+ 137
],
"deps": [
- "dash"
+ "company-ctags",
+ "dash",
+ "fill-column-indicator",
+ "hl-todo",
+ "hydra",
+ "rainbow-delimiters",
+ "yafolding",
+ "yasnippet"
],
- "commit": "d72e2a53b4b542ad8adf1807d7b94a7788ab00cf",
- "sha256": "1k13fpnd40lpg90vgck28cxfg6i2m5y2pagkw27zaqcd1h8n7d59"
+ "commit": "136cc4f7ab4f2ab549633392a72d55051c8b31ac",
+ "sha256": "0pjjccd145bla2gshs648kwhlw9r4n449g318nw81v2nn10z6qwl"
},
"stable": {
"version": [
0,
- 0,
- 12
+ 5,
+ 3
],
"deps": [
- "dash"
+ "company-ctags",
+ "dash",
+ "fill-column-indicator",
+ "hl-todo",
+ "hydra",
+ "rainbow-delimiters",
+ "yafolding",
+ "yasnippet"
],
- "commit": "d72e2a53b4b542ad8adf1807d7b94a7788ab00cf",
- "sha256": "1k13fpnd40lpg90vgck28cxfg6i2m5y2pagkw27zaqcd1h8n7d59"
+ "commit": "0b876e6a2d602f94cc118e6b76f5f79d18244325",
+ "sha256": "00xn2mhnf5qvn4v6yncmfa9ijrb33zl49mlc7pqn8pzr8nhbxzvc"
}
},
{
@@ -79285,26 +81093,26 @@
"repo": "auto-complete/popup-el",
"unstable": {
"version": [
- 20160709,
- 1429
+ 20200610,
+ 317
],
"deps": [
"cl-lib"
],
- "commit": "4839797cd1db25be6f3f98bc8d401b6c2af01f9f",
- "sha256": "1sxzv4zdmyra6b6nicnng0zpixlpxnczhq0qjyfzxvvhks7jyyf3"
+ "commit": "9d104d4bbbcb37bbc9d9ce762e74d41174683f86",
+ "sha256": "0qrsz4z9q2bfq9xv4n94mvyslm232v2ql9r1fjycx7rnmpqggiwl"
},
"stable": {
"version": [
0,
5,
- 3
+ 8
],
"deps": [
"cl-lib"
],
- "commit": "46632ab9652dacad56fd961cd6def25a015170ae",
- "sha256": "1y538siabcf1n00wr4iz5gbxfndw661kx2mn9w1g4lg7yi4n0h0h"
+ "commit": "9d104d4bbbcb37bbc9d9ce762e74d41174683f86",
+ "sha256": "0qrsz4z9q2bfq9xv4n94mvyslm232v2ql9r1fjycx7rnmpqggiwl"
}
},
{
@@ -79411,15 +81219,15 @@
"repo": "kostafey/popup-switcher",
"unstable": {
"version": [
- 20200201,
- 1913
+ 20200701,
+ 2034
],
"deps": [
"cl-lib",
"popup"
],
- "commit": "e275ec35de3b9cdedf0d6b2a4a78e91c605381be",
- "sha256": "1zm6zk7c2i7gmn5am2d7090j1a71vbis8lbrzrbxdx53q6sklgi7"
+ "commit": "68bbe23f7ceaca889529be95762925ac29515545",
+ "sha256": "18nfrhmdjsgmrpr82qqmxj3rdv85ml2pkssrkrljzzgaxavx5ind"
}
},
{
@@ -79531,20 +81339,20 @@
"repo": "tumashu/posframe",
"unstable": {
"version": [
- 20200426,
- 819
+ 20200818,
+ 606
],
- "commit": "093b29a53cbeda6d637ccc9ef4dfc47123e79b9e",
- "sha256": "0wca1w667h930dyi3hm1kqiqapggnwbgqjbxiwpgj7l773s7xdbw"
+ "commit": "7b92a54e588889a74d36d51167e067676db7be8a",
+ "sha256": "1638qw6m588a1dh8gfic1n2mzacm7rzs99ds8qwdfqs3ids857nj"
},
"stable": {
"version": [
0,
- 7,
+ 8,
0
],
- "commit": "83b4d39fdda34355c01aecc22677f7376ae0f013",
- "sha256": "0cjrl4xgs70hbw1a1mqkdmpcmrxaakw8csrz365c31vj14nii0ax"
+ "commit": "7b92a54e588889a74d36d51167e067676db7be8a",
+ "sha256": "1638qw6m588a1dh8gfic1n2mzacm7rzs99ds8qwdfqs3ids857nj"
}
},
{
@@ -79626,14 +81434,14 @@
"repo": "milkypostman/powerline",
"unstable": {
"version": [
- 20200105,
- 2053
+ 20200817,
+ 1321
],
"deps": [
"cl-lib"
],
- "commit": "edbb464eef680efc9d408730288c716cd4cac404",
- "sha256": "0j1bb9dyr76m68gn94qk6k6bxhdqbiq59fzi4mnx3ivnnkbfz6n7"
+ "commit": "e15e77ab2e589bd73f9e90498747d77d042789ea",
+ "sha256": "1sw9aicv9xbcg0fz6584hfycwibzxx2jxlav0kf83d3wg3lprgps"
},
"stable": {
"version": [
@@ -79697,16 +81505,16 @@
"repo": "SavchenkoValeriy/emacs-powerthesaurus",
"unstable": {
"version": [
- 20190721,
- 805
+ 20200720,
+ 1546
],
"deps": [
"jeison",
"request",
"s"
],
- "commit": "81a262ec0c9294ad377bafc6cc4e6d91b461acb6",
- "sha256": "0ffy2c56difdhgpwvvvgyvifldxlmijcs11hs6hx6gv3hndmym7i"
+ "commit": "93036d3b111925ebc34f747ff846cb0b8669b92e",
+ "sha256": "0l45n12b8jny7g4bfdn3sc7lp9kyxd7pyisr0r9svr9sls7cybv4"
}
},
{
@@ -79749,14 +81557,14 @@
"repo": "conao3/ppp.el",
"unstable": {
"version": [
- 20200418,
- 1551
+ 20200812,
+ 844
],
"deps": [
"leaf"
],
- "commit": "27683aa4a0df67b4539bcaa2e82d865023cf1fae",
- "sha256": "0azqpmlz6r2amklzrgi0wgmy89fbkz0kkpikgf5gccfmks5pij6y"
+ "commit": "86dad69c3a7dae770f6b99285647dff2aad81930",
+ "sha256": "01c82h5j7yggsbhbrlbcwl562mpd79c0i878129r4ivvhka3nha3"
},
"stable": {
"version": [
@@ -79814,19 +81622,19 @@
"repo": "raxod502/prescient.el",
"unstable": {
"version": [
- 20200412,
- 1607
+ 20200818,
+ 1400
],
- "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7",
- "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv"
+ "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530",
+ "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p"
},
"stable": {
"version": [
- 4,
- 1
+ 5,
+ 0
],
- "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0",
- "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3"
+ "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc",
+ "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix"
}
},
{
@@ -79874,6 +81682,38 @@
"sha256": "10pvjdnb48fk663232qvh4gapk2yiz4iawpffzjrbs3amxh50bi7"
}
},
+ {
+ "ename": "prettier",
+ "commit": "e9992d6d5ed3bd677976262d8a887e5c0a4f4914",
+ "sha256": "07zhjbb40jl6xkfdzavqg33z17z8s4nyrv3qjh8c0m3si8abh6zb",
+ "fetcher": "github",
+ "repo": "jscheid/prettier.el",
+ "unstable": {
+ "version": [
+ 20200714,
+ 859
+ ],
+ "deps": [
+ "iter2",
+ "nvm"
+ ],
+ "commit": "000244b82ca9e2118376f6a44506bac8ab225677",
+ "sha256": "1mrxjvx16ixcyqvqvc8lmvh3jdkcriq9djhiak0pg8y6nbrj4dqa"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "deps": [
+ "iter2",
+ "nvm"
+ ],
+ "commit": "d5ccedc7a8ed84aff292bce688c73648dc8f567f",
+ "sha256": "1rk2hwpxvnc1hadvdg86jnzz4nh5kmkwp18iwvsbkgmx47cnyni3"
+ }
+ },
{
"ename": "prettier-js",
"commit": "968ac7bb98b385f8542dc150486982c0ded73187",
@@ -80263,20 +82103,20 @@
"repo": "jcs-elpa/project-abbrev",
"unstable": {
"version": [
- 20190517,
- 521
+ 20200724,
+ 901
],
- "commit": "22830177a0cea19acf29fb9910b784ea5f66f551",
- "sha256": "05ks95j6706rabfh1487nix2cjbxa6pjjr0xm01nhd3vcfr1m2b0"
+ "commit": "7b5749eae33eda576da3293dc386794c1248bb48",
+ "sha256": "0fvfp5hy93ggqspbnishzp0x0j1652ayismb8bpzkf6vra8vjrdw"
},
"stable": {
"version": [
0,
0,
- 2
+ 4
],
- "commit": "fc4e9f774cae42a6fe135833774daaecf2b3dac0",
- "sha256": "07056jd1z9i65db4pcshhdfrk5yb6xc28k3ihq7pixmya71l15pk"
+ "commit": "7b5749eae33eda576da3293dc386794c1248bb48",
+ "sha256": "0fvfp5hy93ggqspbnishzp0x0j1652ayismb8bpzkf6vra8vjrdw"
}
},
{
@@ -80416,26 +82256,26 @@
"repo": "bbatsov/projectile",
"unstable": {
"version": [
- 20200507,
- 650
+ 20200819,
+ 531
],
"deps": [
"pkg-info"
],
- "commit": "f650faecf699e4b4659374cf5a949f6927feff3e",
- "sha256": "142is55cbyya511zp0yl5d1x6i8mvxqjn8zky4gxif15rmmqrk9n"
+ "commit": "46d2010c6a6cccfc4be72317f10ea99fd041ab54",
+ "sha256": "1xd4ag6sypqhfn85vnr8609cl9nip0l5j77226p6apv6yhdippqx"
},
"stable": {
"version": [
2,
- 1,
+ 2,
0
],
"deps": [
"pkg-info"
],
- "commit": "34b2665023f9a29ebd2a415bfb8091db3c804d46",
- "sha256": "16p79m8mkrlczx4b5v28nnlcd1ny49861lax28r7cb9ps9jhdz7d"
+ "commit": "dc0e7a5ba46f92bd224a5e89f0af2ace0ed05ade",
+ "sha256": "1kf34p2jwcjcqniia8bx3kn14ybwcq81x7gcm1vkd9cj7x0mx96n"
}
},
{
@@ -80509,26 +82349,6 @@
"sha256": "01jsj0pv9qqbkdmbykvk4ic40hc1nhaiaqvx17hi7p89hq3nzffr"
}
},
- {
- "ename": "projectile-hanami",
- "commit": "9c0123322baee1e96afd055de3f44827574d2b5f",
- "sha256": "0qi9i4wdggrmihf1j42fqrf38psmb33rlafg3y6da5r7lpn03j1a",
- "fetcher": "github",
- "repo": "avdgaag/projectile-hanami",
- "unstable": {
- "version": [
- 20160505,
- 1311
- ],
- "deps": [
- "inf-ruby",
- "projectile",
- "rake"
- ],
- "commit": "c4b8e7d4dfec789ef8493a7c5d4ce0cf7937e579",
- "sha256": "1pqmyfz0vil30x739r18zpw9n76297ckisimq2g0xl1irhynsvbk"
- }
- },
{
"ename": "projectile-rails",
"commit": "b16532bb8d08f7385bca4b83ab4e030d7b453524",
@@ -80788,11 +82608,11 @@
"repo": "chuntaro/emacs-promise",
"unstable": {
"version": [
- 20200429,
- 440
+ 20200727,
+ 900
],
- "commit": "ed9b073ee5b0975a35ee15bc12e25e02f796d787",
- "sha256": "1mqqsnwkwfg2i6rhx747hcnk725siw6qsxh5yni3l1sfizbyvw03"
+ "commit": "d7b59805e7a8da1f5edea9313b6e2d0f1115fec0",
+ "sha256": "08f30fwwh86mnymbjxr9gswkgvsfdxa1mqajsmsbkk5nvmz1jx0n"
},
"stable": {
"version": [
@@ -80868,11 +82688,11 @@
"repo": "ProofGeneral/PG",
"unstable": {
"version": [
- 20200506,
- 1948
+ 20200623,
+ 1748
],
- "commit": "ea62543527e6c0fcca8bbb70695e25c2f5d89614",
- "sha256": "0jzyj3a3b9b26b2cksrcby39gj9jg77dzj3d4zzbwf33j1vkvfd2"
+ "commit": "03e427a8f19485e12b2f95387ed3e0bff7cc944c",
+ "sha256": "0ykxb4xdsxv2mja620kf61k2l18scs0jdsfsg1kzs2qf4ddjscyn"
},
"stable": {
"version": [
@@ -80972,20 +82792,22 @@
"repo": "google/protobuf",
"unstable": {
"version": [
- 20170526,
- 1650
+ 20200619,
+ 1742
],
- "commit": "63da77bc971e08c2241cc1d9e65ede4bf335c421",
- "sha256": "0b0shac978n6djxid6z9h4mfb2ah4hc1vvb0rg8rf65gs4cxjzlz"
+ "commit": "214c77e1b76e63e512bd675d1c300c80438642b6",
+ "sha256": "1fxf5gydjcfc9gdwv6yfcwv85ww5glqbzlfv9hcnkddwlz6schxa"
},
"stable": {
"version": [
- 3,
- 12,
- 0
+ 4,
+ 0,
+ 0,
+ -1,
+ 2
],
- "commit": "0dd036d675508a4ecf69e61626fd0c88235a661d",
- "sha256": "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a"
+ "commit": "6c61c1e63b9be3c36db6bed19032dfc0d63aadda",
+ "sha256": "1910pnpy0mfzqga4mv52ybjfbxrbdflgb6nsh2vbpbpsv4jl58dq"
}
},
{
@@ -81032,6 +82854,36 @@
"sha256": "1wmj3ahjj1g7sx36fda6fhicvmxkm8qm64zqdk3qqj808jik1pry"
}
},
+ {
+ "ename": "psalm",
+ "commit": "148d9b28e683a6602bb18eecaaf3cbc8dede65b1",
+ "sha256": "0j54gj76xz7hkbbsb3dahxy1yf3y7kfg1ls060cskd6sdds412zq",
+ "fetcher": "github",
+ "repo": "emacs-php/psalm.el",
+ "unstable": {
+ "version": [
+ 20200510,
+ 1157
+ ],
+ "deps": [
+ "php-mode"
+ ],
+ "commit": "b2a1e8a9524b0004e62996c70da5536f86e56182",
+ "sha256": "0r0qz5bdznzdj7zxq6a6fz7fwn2c978bq57yywj3fcy8f5vh8jcf"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 6,
+ 0
+ ],
+ "deps": [
+ "php-mode"
+ ],
+ "commit": "aaa77b4ceb61d41a520baa0b84b9b236c99c4156",
+ "sha256": "1fnr8sbx74c4mdz91y6b4m0n6njjb0qa01r4i9975q197vwzni48"
+ }
+ },
{
"ename": "psc-ide",
"commit": "9eb5ff1de1d207317df052ecbd65dbe0f8766f5d",
@@ -81040,8 +82892,8 @@
"repo": "purescript-emacs/psc-ide-emacs",
"unstable": {
"version": [
- 20200317,
- 1013
+ 20200702,
+ 1540
],
"deps": [
"company",
@@ -81052,8 +82904,8 @@
"s",
"seq"
],
- "commit": "7fc2b841be25f5bc5e1eb7d0634436181c38b3fe",
- "sha256": "0r0fymyai30jimm34z1cmav4wgij8ci6s1d9y7qigygfbbfrdsmj"
+ "commit": "663f4e2cf9cbafdd4b9a60c34346596e2a40c87c",
+ "sha256": "06zgi5inlg244qhabsp4a24kda83i6rdpxf78qb7ygpxwdj4hf44"
}
},
{
@@ -81099,15 +82951,15 @@
"repo": "thierryvolpiatto/psession",
"unstable": {
"version": [
- 20200509,
- 803
+ 20200714,
+ 555
],
"deps": [
"async",
"cl-lib"
],
- "commit": "ddeccf7808cf39fedc41cd33204b0ef5fe4253b5",
- "sha256": "083srsvnv8ks52qsi6hv02v4j4xlm67bld9ynm8cl8fy500ghpzz"
+ "commit": "d2b8f8d8c6acd2f86f3a7774a7079f40b1b75f8e",
+ "sha256": "1pks2xvnampp74d1m7rrq6801bdhcmdsx9gbrcvr8ljxxlzbka1w"
},
"stable": {
"version": [
@@ -81187,8 +83039,8 @@
"repo": "fvdbeek/emacs-pubmed",
"unstable": {
"version": [
- 20200502,
- 2153
+ 20200618,
+ 2203
],
"deps": [
"deferred",
@@ -81196,8 +83048,8 @@
"s",
"unidecode"
],
- "commit": "d781870e2f57e40110e07768289ab81d8554f122",
- "sha256": "17d2v7q6sfafk8j1ish053xsmihi4f1hbk53fkkmhwan6sw9c4sc"
+ "commit": "88aeb71ed4354af0b58354636ee6a9485887213d",
+ "sha256": "154lkpipi5wgcwx4j9w6h3zysciw7hblf03an2irr9xgdhs7xs7q"
},
"stable": {
"version": [
@@ -81365,14 +83217,14 @@
"repo": "purescript-emacs/purescript-mode",
"unstable": {
"version": [
- 20190522,
- 2230
+ 20200708,
+ 827
],
"deps": [
"cl-lib"
],
- "commit": "8db1d0243c03da31adac4d7c5287407a4df6aff2",
- "sha256": "07z5m8h5a1dhqlzf8wqyxqw2mz3kxzjfpb0p7az3bhs3xsxq6q1q"
+ "commit": "154ad16b61fb9dec83a6c863ffaf92638278f00f",
+ "sha256": "14046nryg870s366j6hxqpwza0y057hxaiq3kwlnpf1avlzdwhib"
}
},
{
@@ -81689,21 +83541,6 @@
"sha256": "1m0jb5pk1a1ww5jx2y5nz21by4dh7nlnhdn6bigz53ra449rrxii"
}
},
- {
- "ename": "pydoc-info",
- "commit": "5b7972602399f9df9139cff177e38653bb0f43ed",
- "sha256": "0l80g0rzkk3a1wrw2riiywz9wdyxwr5i64jb2h5r8alp9qq1k7mf",
- "fetcher": "bitbucket",
- "repo": "jonwaltman/pydoc-info",
- "unstable": {
- "version": [
- 20110301,
- 834
- ],
- "commit": "151d877c8fb8e418a573b1e879b1263c18e22776",
- "sha256": "1mzyr6yznkyv99x9q8zx2f270ngjh8s94zvnhcbhidi57inpd1nh"
- }
- },
{
"ename": "pyenv-mode",
"commit": "c756ccbae044bc23131060355532261aa9a12409",
@@ -81712,14 +83549,14 @@
"repo": "pythonic-emacs/pyenv-mode",
"unstable": {
"version": [
- 20170801,
- 2348
+ 20200518,
+ 1521
],
"deps": [
"pythonic"
],
- "commit": "aec6f2aa289f6aed974f053c081143758dd142fb",
- "sha256": "1zmgm24d6s56jc4ix61058p1k0h95vdvdllr7fh1k3bq4mw22qn3"
+ "commit": "d191037fe62ed8d4fee5888845da3e2c386d8e89",
+ "sha256": "0dipwjdkx4887g61gn22wga4pvvkwv6rx7izq73l8b6x1mc17c0h"
},
"stable": {
"version": [
@@ -81754,21 +83591,6 @@
"sha256": "1gz7145jnjcky1751pqrlhh3pq02ybsmz49ngx4ip2589nry7iyv"
}
},
- {
- "ename": "pyfmt",
- "commit": "68d477025ae5af50bf8f7b37f2adfa9159502e13",
- "sha256": "112kjsp763c2plhqlhydpngrabhc58ya7cszvi4119xqw2s699g6",
- "fetcher": "github",
- "repo": "aheaume/pyfmt.el",
- "unstable": {
- "version": [
- 20150521,
- 2056
- ],
- "commit": "cb92be2cf0804cc53142dc5edb36f8e0ef5cec32",
- "sha256": "1rp8zchvclh29rl9a1i82pcqghnhpaqnppaydxc2qx23y9pdgz9i"
- }
- },
{
"ename": "pygen",
"commit": "e761724e52de6fa4d92950751953645dd439d340",
@@ -81929,10 +83751,10 @@
},
{
"ename": "pyimpsort",
- "commit": "97eb7c0934298d393910419fd55d7d5f1b0cfc38",
- "sha256": "0kdk3bmryfzvwf8vshfszbih8mwncf4xlb0n0n0yjn0p1n98q99k",
+ "commit": "b38908bc1b759b14173ffb49ddeb040a9892cc0d",
+ "sha256": "105i63d05hlpwb4n5mn71jjgnav95s8n6xy0gb2smq9ljvxbbgl0",
"fetcher": "github",
- "repo": "emacs-pe/pyimpsort.el",
+ "repo": "emacsorphanage/pyimpsort",
"unstable": {
"version": [
20160130,
@@ -81953,8 +83775,8 @@
20200503,
1624
],
- "commit": "1fc490c0a1d0df5d4d6a64da0ccf2dd711b9bf67",
- "sha256": "0fkcn6dk67ljx73ww1zxxkmqp551xsshhz40z2fh1dxw00b470ga"
+ "commit": "52fd8e17c6aedbc68f58f1169363d6cc216f405b",
+ "sha256": "0nvgv67gq80hriaasck4zrr3v7qqrw6apxhnyixyavabdvvrawqz"
}
},
{
@@ -82049,20 +83871,20 @@
"repo": "poppyschmo/pytest-pdb-break",
"unstable": {
"version": [
- 20200426,
- 2335
+ 20200804,
+ 848
],
- "commit": "22e54796b0522f812423b2fb0ec842e2984ff0f7",
- "sha256": "0gsnbpk14iw4mqxk7c0409dibsb6f3j936hd781ly956mvn0afil"
+ "commit": "05d227493b7b96f3556cba22f215cb85f9282020",
+ "sha256": "0dsvi5scrhk6mypz8wggvy9zlnkbm2fmb5a24jprqh3bihg077xl"
},
"stable": {
"version": [
0,
0,
- 9
+ 10
],
- "commit": "3ff296d14e7350241b22fcbe09325a16bb834d16",
- "sha256": "0pipbp6i0vq3maiwf8cj8g43zk8nq3dpgbgacdk9v2bhcgwl3im3"
+ "commit": "05d227493b7b96f3556cba22f215cb85f9282020",
+ "sha256": "0dsvi5scrhk6mypz8wggvy9zlnkbm2fmb5a24jprqh3bihg077xl"
}
},
{
@@ -82195,11 +84017,11 @@
"repo": "python-mode-devs/python-mode",
"unstable": {
"version": [
- 20200508,
- 1756
+ 20200608,
+ 737
],
- "commit": "a4ee6e9f60ff63f0706661e54308281ed7c900e3",
- "sha256": "02gfr692xr3clrim5l6bqzn1kzcv232ylvd5k33421s21wb9vhzv"
+ "commit": "6658e5d768db0c0d8dbc6fdedff3a85b65327061",
+ "sha256": "1mf6bbx4brwzafxwrv37x14b286vlza9knswhcccvcb3aplvll6h"
},
"stable": {
"version": [
@@ -82219,34 +84041,34 @@
"repo": "wbolster/emacs-python-pytest",
"unstable": {
"version": [
- 20180725,
- 1146
+ 20200812,
+ 737
],
"deps": [
"dash",
"dash-functional",
- "magit-popup",
"projectile",
- "s"
+ "s",
+ "transient"
],
- "commit": "09ad688df207ee9b02c990d3897a9e2841931d97",
- "sha256": "18v7kxdhrayxg2pgbysm0y47xpdvwa15fmazpkfg0q8dfp2j3022"
+ "commit": "fc056faf2757c42641ed94d36a090e56eb13572f",
+ "sha256": "00dwbh549ygnrp98s883v45f5pbb34f2j5qwvw92camhp6daw38y"
},
"stable": {
"version": [
- 0,
3,
- 1
+ 0,
+ 0
],
"deps": [
"dash",
"dash-functional",
- "magit-popup",
"projectile",
- "s"
+ "s",
+ "transient"
],
- "commit": "6772ecfaa86f0f4a1a66bfd3a454c9b11956de70",
- "sha256": "086jjygzdrcjfp7j70xs8jh8nq0xv496kza6iap7lyc3qf16b4kk"
+ "commit": "10ad9afc840ac2d9d5616abf4bd92ab8fee2ce48",
+ "sha256": "1lc5qlsznzw8hdcdwjwn8fcgfmqjvb1wplsr2gaxwvm8rbw22g1l"
}
},
{
@@ -82319,15 +84141,15 @@
"repo": "pythonic-emacs/pythonic",
"unstable": {
"version": [
- 20200304,
- 1901
+ 20200806,
+ 434
],
"deps": [
"f",
"s"
],
- "commit": "f577f155fb0c6e57b3ff82447ac25dcb3ca0080f",
- "sha256": "10faqkfbr7n1zlbrs9c9slm2f7wr2liav8r367s00bw3vb2vm8nb"
+ "commit": "51233ec7ec9fbafd13e2b0479c7b2ee0930ccca5",
+ "sha256": "1v4n6wx0qff2ndlxy11acm21jq5yflk28axs6jc6yh7mdj44js9x"
},
"stable": {
"version": [
@@ -82383,34 +84205,6 @@
"sha256": "0di229ma7jr9jcck36qjrzilkbp428kkx53qs6c9xw9jhv6yklbz"
}
},
- {
- "ename": "qiita",
- "commit": "d8065a58e297c50c031de97d2d80bce5857bd803",
- "sha256": "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl",
- "fetcher": "github",
- "repo": "gongo/qiita-el",
- "unstable": {
- "version": [
- 20140118,
- 844
- ],
- "deps": [
- "helm",
- "markdown-mode"
- ],
- "commit": "93c697b97d540fd1601a13a3d9889fb939b19878",
- "sha256": "0ggivlaj29rbbhkjpf3bf7vr96xjzffas0sf5m54qh6nyz6nnha5"
- },
- "stable": {
- "version": [
- 0,
- 0,
- 1
- ],
- "commit": "33b6d3450bb4b3d0186c2475f6c78269c71fd1ff",
- "sha256": "110z27n3h7p2yalicfhnv832ikfcf7p0hrf5qkryz1sdmz79wb3f"
- }
- },
{
"ename": "ql",
"commit": "475bd8fd66c6d5b5c7e74aa2c4e094d313cc8303",
@@ -82483,10 +84277,10 @@
},
{
"ename": "qtcreator-theme",
- "commit": "bf0caf3c60f4b8c6ed1c126a5feb91c99eea1f60",
- "sha256": "0ic7a9zas8ndrp15xbw4j2987ajfjjq003fcmqhibp0sc66rldfx",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "01w4qxh9d8mkw7k0pawy0hvcdvvrkkhcnszpy5hixi5j6h7l24m0",
"fetcher": "github",
- "repo": "lesleylai/emacs-qtcreator-theme",
+ "repo": "LesleyLai/emacs-qtcreator-theme",
"unstable": {
"version": [
20200203,
@@ -82542,11 +84336,11 @@
"repo": "quelpa/quelpa",
"unstable": {
"version": [
- 20200514,
- 1242
+ 20200617,
+ 2205
],
- "commit": "9ece62efa829c6b89ba61cb674f337764b266482",
- "sha256": "1mvrpyiw53lrz6i7r7zlcfvksh8lsjb4vib6gnj5b849njzcjwhm"
+ "commit": "f1fc228f217be692eaae2d53f51966ce922d6a32",
+ "sha256": "03h30qcixq54q212381cf7mahi2k9q4590vm44pqy9widpigmxz7"
}
},
{
@@ -82576,11 +84370,11 @@
"repo": "renard/quick-buffer-switch",
"unstable": {
"version": [
- 20151007,
- 2208
+ 20200727,
+ 720
],
- "commit": "d5fdd67b4c9f04b7a7122da2215e4ae076a03b1b",
- "sha256": "0kh63nzdzwxksn2ar2i1ds7n96jga2dhhc9gg27p1g2ca66fs6h5"
+ "commit": "ceb5222599b861f9d1133b1509516fcf07a3cd67",
+ "sha256": "09dfw42d5834z8x1c1mri7g61r91i1crr3h6r118nmszhbx9b7iy"
}
},
{
@@ -82655,20 +84449,20 @@
"repo": "emacsorphanage/quickrun",
"unstable": {
"version": [
- 20200514,
- 1506
+ 20200603,
+ 1902
],
- "commit": "a8752887b81fc2f4f4e4bcd3d2cf8abafb85edbb",
- "sha256": "0zjhpgg6zkqx8v0gv7h7z73i64ipzszm9cqs4wwaldlz228316ra"
+ "commit": "ce7383c53215077f7e1d258d389cf8731309fbe9",
+ "sha256": "0dscg35hrywn8qr02q46y0cdclyscz6qxa0dqphkx3bv9xvzmqjl"
},
"stable": {
"version": [
2,
- 2,
- 8
+ 3,
+ 0
],
- "commit": "70e93e06778f44113f405aedec6187b925311d57",
- "sha256": "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw"
+ "commit": "072ec7be93f31e9dd265fb834cd709d0c0d4a8bb",
+ "sha256": "1zx8hpm5wa9ad675py8676071pip6831d4jy2dqyrlxpfvi6q47l"
}
},
{
@@ -82817,15 +84611,15 @@
"repo": "greghendershott/racket-mode",
"unstable": {
"version": [
- 20200513,
- 1519
+ 20200810,
+ 1513
],
"deps": [
"faceup",
"pos-tip"
],
- "commit": "0f1efa4a3cdcd26de1d2b002868ffc851cff25ac",
- "sha256": "1zhn50apdrysm9d6ynv92slah78i39cismj88ym4ahrllwr1jnj4"
+ "commit": "c55fd70c5e9a371f262486f7d5d8837481388b95",
+ "sha256": "13ngnm22h5rzmm9pvgbw9nidv8jkkcsckbypi2mn1k8j8wfjypx0"
}
},
{
@@ -82930,6 +84724,24 @@
"sha256": "1zr2669savnmkc68hiqsq9wccm6bs1j6jbmlac1xqh6nq7xgq36g"
}
},
+ {
+ "ename": "rainbow-fart",
+ "commit": "cdcc8091357c42f5edbc1a13886253130f104242",
+ "sha256": "0zi1r8bgzd3g1dvginlp5nywyjk3lh495j6j3girgjqhsblnhfrx",
+ "fetcher": "github",
+ "repo": "stardiviner/emacs-rainbow-fart",
+ "unstable": {
+ "version": [
+ 20200718,
+ 437
+ ],
+ "deps": [
+ "flycheck"
+ ],
+ "commit": "16759a0aa1b39c43cdedcf6a6c9a5dc3c3895fd2",
+ "sha256": "14dh7bd40jc6vl6933575jivgmm3h6frphmwxspijb7c8pj1wfmv"
+ }
+ },
{
"ename": "rainbow-identifiers",
"commit": "975aadd9fe1faf9ad617ba6200ca77185b87e7c0",
@@ -82996,14 +84808,26 @@
"repo": "Raku/raku-mode",
"unstable": {
"version": [
- 20200510,
- 2005
+ 20200524,
+ 1625
],
"deps": [
"pkg-info"
],
- "commit": "43fd5628254754bee41575a55a7d1c7ad79837fa",
- "sha256": "1c1l0c4pnza3bf0s1262z5r8xmbmhq3qdvgqq28k8raawdqszqfk"
+ "commit": "e0639c89a3a29e9196e298951da6c3a79fb944e8",
+ "sha256": "02zn1sm86srwdzdkhw53ll0h41a9hwh6c8lan72530zysjrm4x1i"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
+ ],
+ "deps": [
+ "pkg-info"
+ ],
+ "commit": "e0639c89a3a29e9196e298951da6c3a79fb944e8",
+ "sha256": "02zn1sm86srwdzdkhw53ll0h41a9hwh6c8lan72530zysjrm4x1i"
}
},
{
@@ -83065,11 +84889,11 @@
"repo": "ralesi/ranger.el",
"unstable": {
"version": [
- 20200218,
- 203
+ 20200607,
+ 2002
],
- "commit": "ae9b3816a6da927cca5beb62c45400103797a2da",
- "sha256": "07fiyw0gw51dxc7r92pj75lbxppg0gixjv9317qx9c3v1lcxaqiv"
+ "commit": "d7c18370981c9e585bc0fb78f7e55033457ca643",
+ "sha256": "0xfg38ginrd0sdn194gpapi67q6i81csddgsf0rqmwihazpgs060"
},
"stable": {
"version": [
@@ -83190,20 +85014,20 @@
"repo": "thiagoa/rbtagger",
"unstable": {
"version": [
- 20191115,
- 1858
+ 20200714,
+ 1658
],
- "commit": "18ef567e65d1437e9a9e03d4f30a02d60e926d85",
- "sha256": "0kr10j3f0dd7q102db4y16yj8yfv06wnqsgnx2l9jyc8qhkbxq6w"
+ "commit": "b3333b9dc9ffdaf5dfb2ea6ef2dd0f74e2f0f03f",
+ "sha256": "04zccf9bis259c13nzljfjajjgkrhhbb3b2v6q6q12c30ikj5b09"
},
"stable": {
"version": [
0,
- 2,
- 0
+ 3,
+ 2
],
- "commit": "e46137e36a3bdba8dd4d27017b194a8524c7375b",
- "sha256": "154y2adh2pgn77ycidkd6ndjg9wjxsjmbkb8cppf9csq31vmc313"
+ "commit": "b3333b9dc9ffdaf5dfb2ea6ef2dd0f74e2f0f03f",
+ "sha256": "04zccf9bis259c13nzljfjajjgkrhhbb3b2v6q6q12c30ikj5b09"
}
},
{
@@ -83446,8 +85270,8 @@
20200505,
1537
],
- "commit": "8e51241e5ba7b07b91d8188c14cf193017640292",
- "sha256": "0yn0ibbda8bjqjhiqhmbvv7p8c52n65mi95v91nkfcj60hwyglnq"
+ "commit": "481a2d1460ab5a9b6df3721dda76ad515923bfd1",
+ "sha256": "1f1sqbqc0ckp7850ahvy0syky7lplwhb05r3cw4fdmz2xbywwg52"
},
"stable": {
"version": [
@@ -83460,22 +85284,22 @@
},
{
"ename": "realgud",
- "commit": "7a21be3673962d5706f12efa5179a5426bdce82b",
- "sha256": "14n6d3jfhpa29nf4ywdg3aw4i51lfkr99b4z8q4833pmpz1jbq2c",
+ "commit": "fd34d2accd92d1473b743e2eee1309d329209cd0",
+ "sha256": "063bqpq05l29cvapp4xnvgbdx6l4p0ax83hhz4dv4cqbh1mi68b0",
"fetcher": "github",
"repo": "realgud/realgud",
"unstable": {
"version": [
- 20200513,
- 418
+ 20200809,
+ 2221
],
"deps": [
"load-relative",
"loc-changes",
"test-simple"
],
- "commit": "1238d8e72945a84bb06cd39d7ded75f37105d4d2",
- "sha256": "0gx5fivzksanyp9a0ijdzrcbgg8nw94mbilhdh1jkra5mw3ndr63"
+ "commit": "332d13673074bee252ae7819b0898ee7c7895d2e",
+ "sha256": "0cnnhxgyrjvr75pin7kis5qzd54hh0qscbnvvm8jflmljzca77lz"
},
"stable": {
"version": [
@@ -83520,15 +85344,15 @@
"repo": "realgud/realgud-ipdb",
"unstable": {
"version": [
- 20191115,
+ 20200722,
1116
],
"deps": [
"load-relative",
"realgud"
],
- "commit": "347090928d7866a9909208c5bbe2cb8fa7b55cd7",
- "sha256": "1m7v8qsqm8b8liyfdfqpcsjnlcbs0lpl6m91ff3449a94l1g99k7"
+ "commit": "f18f907aa4ddd3e59dc19ca296d4ee2dc5e436b0",
+ "sha256": "196zy8xmqkm6nc7074gsy4ymm6h4ikbd01f41karys7dwib3gg5i"
}
},
{
@@ -83539,15 +85363,15 @@
"repo": "realgud/realgud-jdb",
"unstable": {
"version": [
- 20191125,
- 1700
+ 20200722,
+ 1120
],
"deps": [
"load-relative",
"realgud"
],
- "commit": "99b7f08e0fcec9e33dde8dbbe60e42cfec08bc17",
- "sha256": "16q9wxa518f3g54zk3imgj8ml06bn66d9jyyg2k86j94ny7q1azd"
+ "commit": "1c183b2f8aae0de60942ea01444b896bf182c66a",
+ "sha256": "1i80llf9bncd5hkrk0wj3xswd36q1rkv5gaqgfqq4r1f8dkrhrz1"
}
},
{
@@ -83650,16 +85474,16 @@
"repo": "realgud/realgud-pry",
"unstable": {
"version": [
- 20190520,
- 1139
+ 20200620,
+ 1006
],
"deps": [
"cl-lib",
"load-relative",
"realgud"
],
- "commit": "fe04c0e1e1ce33361d12ad6f9bcf493f3fe228e0",
- "sha256": "14b3104wlaxwbg3p2pmnxlap5q4msbhswpiq5cx5q1wwhzkjfp2a"
+ "commit": "7b502b9e802b8594c90da329b9716bcfd2c981b1",
+ "sha256": "1rwqzpcdapfdlf6hvypi16w6z13r1fhv91arbr34jzfzbsnk7sb1"
}
},
{
@@ -83690,15 +85514,15 @@
"repo": "realgud/realgud-trepan-ni",
"unstable": {
"version": [
- 20190912,
- 1418
+ 20200722,
+ 1118
],
"deps": [
"load-relative",
"realgud"
],
- "commit": "6e9cac5e8097018aadf41c88de541168036cc227",
- "sha256": "0xc80mhqk26vm1sv8xz0zw0pmbznvdpb8gla5bh3rnxpadpannc3"
+ "commit": "6e38cf838c7b47b5f1353d00901b939ffa36d707",
+ "sha256": "0qwzvaarl2vr6ca0kd9k195f5nbnkdjsrwrkhxggjqsk7v1hq6x2"
},
"stable": {
"version": [
@@ -84167,11 +85991,11 @@
"repo": "purcell/reformatter.el",
"unstable": {
"version": [
- 20200426,
- 818
+ 20200814,
+ 435
],
- "commit": "dc6278a6b1e3565604346ac41a6ffc3cbab04031",
- "sha256": "147qrqs3ndc4xfbb9wiymjsskccp54qpj8bn3i19n9zwm4kmgdzr"
+ "commit": "45c0add95025f53ca644a6c8b9afa05b2da3c474",
+ "sha256": "1dfn7c3gpavpiwd73v2pasd8wd8b62dczhg9iv1cgh8vaqlsf92x"
},
"stable": {
"version": [
@@ -84259,11 +86083,11 @@
"repo": "alvarogonzalezsotillo/region-occurrences-highlighter",
"unstable": {
"version": [
- 20190905,
- 730
+ 20200815,
+ 1555
],
- "commit": "ee86d6a79342c6e4b3cfad5ec73cb0a40e18ae3d",
- "sha256": "06y1hbqgdw2y0isn26wmwrqjxb1ypwrqhcjg4n69mdn74cwlk4jz"
+ "commit": "07e2201db7a88b246a63e868e711749e1465d3d6",
+ "sha256": "0y9746pqinp0nir2afm181drs2qa63jpb834s3s7pzd2mvjrw0rc"
}
},
{
@@ -84312,11 +86136,11 @@
"url": "https://schlomp.space/tastytea/register-quicknav.git",
"unstable": {
"version": [
- 20200325,
- 1612
+ 20200524,
+ 2006
],
- "commit": "06afa1efc490a6cbc1d814fc6f1e7a80a601ecc7",
- "sha256": "055bffsa81chjpv39p2fn10dwikpzb034k19k0mc1026d8a423kg"
+ "commit": "c15ea92b0946c28b3f14986d42b15b0b534aa6a2",
+ "sha256": "03xm5rxhafzngdqnpl884d0zy9qkpx57zbcnh0psalmvswd4d4fh"
},
"stable": {
"version": [
@@ -84342,8 +86166,8 @@
"deps": [
"reformatter"
],
- "commit": "41c99057d0406c7fb3895a03da777af3961a648d",
- "sha256": "1dw6f60ysyvxgm5gpir37ay8z9csykxj0r7v9h6z38cswicg27sj"
+ "commit": "439a4d5e130e67e9e8c34e813fa1dc6631e7a8d5",
+ "sha256": "0lzlhmz0c4jv65phksh6aya93rlh8rqcffbvz1llcyj8i2gr7hqj"
}
},
{
@@ -84364,56 +86188,6 @@
"sha256": "0kn07wgnz5bkkq66qfq16rvw9l7zgh0hzrsa705j1zbd6vc3wygs"
}
},
- {
- "ename": "relative-buffers",
- "commit": "ab22cea99fbee937bbd6e8fbc8bd27967aeaa8a5",
- "sha256": "131182yb0pr0d6jibqd8aag4w8hywdyi87ldp77b95gw4bqhr96i",
- "fetcher": "github",
- "repo": "proofit404/relative-buffers",
- "unstable": {
- "version": [
- 20191004,
- 1205
- ],
- "deps": [
- "cl-lib",
- "dash",
- "f",
- "s"
- ],
- "commit": "6064cd0b3cbd42c4a46c70fc396f05be71f42bd6",
- "sha256": "0wzxnbbzzjkzrnfdbdn7k172ad6mnhq5y3swcbilnk1w1a1lzyhn"
- }
- },
- {
- "ename": "relax",
- "commit": "67247451b39461db4a5fcff3827a09f53f9fc8ec",
- "sha256": "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk",
- "fetcher": "github",
- "repo": "technomancy/relax.el",
- "unstable": {
- "version": [
- 20131029,
- 2134
- ],
- "deps": [
- "json"
- ],
- "commit": "6e33892623ab87833082262321dc8e1977209626",
- "sha256": "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66"
- },
- "stable": {
- "version": [
- 0,
- 2
- ],
- "deps": [
- "json"
- ],
- "commit": "6e33892623ab87833082262321dc8e1977209626",
- "sha256": "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66"
- }
- },
{
"ename": "remark-mode",
"commit": "083f2070eb27d66f09552bf42a346f41a9b9b4b5",
@@ -84469,17 +86243,17 @@
},
{
"ename": "renpy",
- "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228",
- "sha256": "173391mcv56ljrkhl6hb9fhkl2vic9wj2xmd21hq88m3awpjmill",
+ "commit": "68635e3c52d12c234200680fd393a0b8748d2993",
+ "sha256": "18lnp1920c88j6fvjsrrymqh23amna9qyllh68mf7kssbsh5w2zq",
"fetcher": "github",
- "repo": "treymerkley/renpy-mode",
+ "repo": "Reagankm/renpy-mode",
"unstable": {
"version": [
- 20190419,
- 1749
+ 20200607,
+ 135
],
- "commit": "943e1af71d23128ff100d41d178ccffe28f97944",
- "sha256": "1l2dglkbpb3d6c6cnifhngcjc4yy726mq6yic8x9409c6r0apn2n"
+ "commit": "f2f95a72a8c842f229f80999132e8ea8ee73f6fc",
+ "sha256": "1jka61j6zrc0yzjcplnyg1kp1d45ikwnkmayjg41v9w0pfrzzim3"
}
},
{
@@ -84534,8 +86308,8 @@
"deps": [
"fullframe"
],
- "commit": "a36caac7649fbffbe30f7b06541c9efd723563fc",
- "sha256": "12h3xxja3isnhvrqx7m2g7a5d8h68cc85pbqyhiipfxyafyl1yxd"
+ "commit": "f066782c10226d31ea8c1cc386cfa7fa3a4e3aa7",
+ "sha256": "14kap395xd3d5n7ini5cyif2ygz0db8bv0py5ipwlac2zcwgmfwl"
},
"stable": {
"version": [
@@ -84704,11 +86478,11 @@
"repo": "tkf/emacs-request",
"unstable": {
"version": [
- 20200219,
- 2257
+ 20200517,
+ 1305
],
- "commit": "216d570a58d05ef1307edb63d2539bafa5f688c6",
- "sha256": "11malas5n5g4yxydx8pz8aahr5rkjq256cg5avhd64fvfryz9wj2"
+ "commit": "d02d1347ffdf138cffd380cbeac62ac8732036ef",
+ "sha256": "1rkpakzish2d470ca15yq3k0m1j7a2lrkvvddcyvc2rx0sncsdjs"
},
"stable": {
"version": [
@@ -84735,8 +86509,8 @@
"deferred",
"request"
],
- "commit": "216d570a58d05ef1307edb63d2539bafa5f688c6",
- "sha256": "11malas5n5g4yxydx8pz8aahr5rkjq256cg5avhd64fvfryz9wj2"
+ "commit": "d02d1347ffdf138cffd380cbeac62ac8732036ef",
+ "sha256": "1rkpakzish2d470ca15yq3k0m1j7a2lrkvvddcyvc2rx0sncsdjs"
},
"stable": {
"version": [
@@ -84867,8 +86641,8 @@
20200502,
831
],
- "commit": "edea7b3e3d6110ebe44b9387acad1967e540d2ca",
- "sha256": "1lajb0xil1jpy1hvvmmig1xgil45976yr7m3lrffavp34ma3kcbh"
+ "commit": "ac8aad6c6b9e9d918062fa3c89c22c2f4ec48bc3",
+ "sha256": "1a2c7xzy7rsan1zcdskia6m7n6j29xacfkqjlfdhzk6rr1bpzkwk"
}
},
{
@@ -84886,8 +86660,8 @@
"helm",
"restclient"
],
- "commit": "edea7b3e3d6110ebe44b9387acad1967e540d2ca",
- "sha256": "1lajb0xil1jpy1hvvmmig1xgil45976yr7m3lrffavp34ma3kcbh"
+ "commit": "ac8aad6c6b9e9d918062fa3c89c22c2f4ec48bc3",
+ "sha256": "1a2c7xzy7rsan1zcdskia6m7n6j29xacfkqjlfdhzk6rr1bpzkwk"
}
},
{
@@ -84919,6 +86693,21 @@
"sha256": "1lan49723rpzg1q7w8x3iggazwl4zirq5l8nhpb8m5hmg21a4kih"
}
},
+ {
+ "ename": "retrie",
+ "commit": "12ed1c6d8e2aa4f73b793f9e16e8e13985fae944",
+ "sha256": "1y0zknhc2wkq6kpmz2bylwqla1xd7n7l3650zj2bi8g84ly777af",
+ "fetcher": "github",
+ "repo": "Ailrun/emacs-retrie",
+ "unstable": {
+ "version": [
+ 20200519,
+ 551
+ ],
+ "commit": "976d6f01a3e214917f16b82e750d825cb9bfcc59",
+ "sha256": "08rwhkx2chphrfqd6l2bjr1w4rn394q8w5iy93cdprl5y56axvp6"
+ }
+ },
{
"ename": "reveal-in-folder",
"commit": "26682a1fb2d885168ca922521df7f3d8fbfe43a8",
@@ -84927,26 +86716,28 @@
"repo": "jcs-elpa/reveal-in-folder",
"unstable": {
"version": [
- 20191209,
- 514
+ 20200618,
+ 1211
],
"deps": [
- "f"
+ "f",
+ "s"
],
- "commit": "e3cc73688d8dc3b47ccb1db49519a83b275b1cde",
- "sha256": "0xdpm7r83nd5j4ss530l3srz4qy2z0m7wp084i3v2sfqi3in5qgl"
+ "commit": "cc4f56c8870136aafcdc5afc010e9a73a9bfd707",
+ "sha256": "09byr8lh1agar1mmxs82sg8ica1p9wrjjahpx3k3adfmgq2glzcr"
},
"stable": {
"version": [
0,
0,
- 2
+ 5
],
"deps": [
- "f"
+ "f",
+ "s"
],
- "commit": "715e34b7c4a93840f6188386a13d15231907257b",
- "sha256": "0d75hgaskhc6gwjdcc19nligb4xj2irg33cirrc0wp23k7il1m6f"
+ "commit": "cc4f56c8870136aafcdc5afc010e9a73a9bfd707",
+ "sha256": "09byr8lh1agar1mmxs82sg8ica1p9wrjjahpx3k3adfmgq2glzcr"
}
},
{
@@ -84981,11 +86772,11 @@
"repo": "a13/reverse-im.el",
"unstable": {
"version": [
- 20200324,
- 1113
+ 20200520,
+ 853
],
- "commit": "c42a7a585c7b85bc402f63535ae6261f68c6aa57",
- "sha256": "1lx23y4dzf5ln4ahf5dnnvx3blvjf3s65n3hgfv0qi5hgi8i8f59"
+ "commit": "90add9a1f8c4a3c78029d38087ff4d22fe5372d3",
+ "sha256": "05k2zp2hldzq5h6nl8gx79dd8lvfn507ad4x3naichdqgn2013nn"
}
},
{
@@ -85019,11 +86810,11 @@
"repo": "kmuto/review-el",
"unstable": {
"version": [
- 20200131,
- 122
+ 20200710,
+ 155
],
- "commit": "09e2df58398b392f19642a12c8cb78eae726dbd2",
- "sha256": "13cy7wy2jv1cjncfnayp28w1ka4s0jim2sarcw0dn2iiniqlkbwf"
+ "commit": "343e7155f8238a7a53ef1f753319b8e2f9e8e8b9",
+ "sha256": "13wgrj5qbg2pv6d9yxkbsrrllvd40m4p7911g23wcwnnx211p943"
}
},
{
@@ -85049,26 +86840,26 @@
"repo": "galdor/rfc-mode",
"unstable": {
"version": [
- 20200215,
- 1357
+ 20200719,
+ 1241
],
"deps": [
"helm"
],
- "commit": "88e6577a0e50f523f7da04de9f939b0bc168b514",
- "sha256": "1k8330bgc9m7pnpvz3kjyjpjsmha43v4srnhns85xi0nv328g1iy"
+ "commit": "02546beecf4c495940885e7b7b911d84b12646ef",
+ "sha256": "1v52vbs2zbqv62wcgcrqgjcwcdq0w6hdb14nma4yhqldnqi57875"
},
"stable": {
"version": [
1,
- 2,
+ 3,
0
],
"deps": [
"helm"
],
- "commit": "55d28321b480a095d29e5c6cd03c8dea9ad55553",
- "sha256": "0f9h8vmfn8xi0c3qwigzbbvsck4wwxbflxl06m7ky2h5jnj6n0g3"
+ "commit": "02546beecf4c495940885e7b7b911d84b12646ef",
+ "sha256": "1v52vbs2zbqv62wcgcrqgjcwcdq0w6hdb14nma4yhqldnqi57875"
}
},
{
@@ -85079,16 +86870,16 @@
"repo": "dajva/rg.el",
"unstable": {
"version": [
- 20200516,
- 1412
+ 20200703,
+ 1250
],
"deps": [
"s",
"transient",
"wgrep"
],
- "commit": "f5456e006f22b6bc947e799261b36d55b075c5a2",
- "sha256": "120n4vkw3c1l130932pziz9ivw85wyh6b75836w82dhx9d41h4cr"
+ "commit": "853c1acaf999500d867180b9e71938366c8e1a7c",
+ "sha256": "0lp32mjmbzjbsvzia2zd29yv0i75mqvp1w7c0jcwvyyl6gqbg3k1"
},
"stable": {
"version": [
@@ -85238,8 +87029,8 @@
"repo": "DogLooksGood/emacs-rime",
"unstable": {
"version": [
- 20200502,
- 349
+ 20200816,
+ 827
],
"deps": [
"cl-lib",
@@ -85247,8 +87038,23 @@
"popup",
"posframe"
],
- "commit": "daf956df30d4007f70a4495560d656e517ab69a9",
- "sha256": "0wr1ski9j7m7mwizdgxnnj61z1nqpyjp6gc7dniaac0m6svxf1rf"
+ "commit": "aab21695f1dee0db3ddf0f0c834b94aecec7057c",
+ "sha256": "0rzghfnrdyrqijw76f4vvsn3hsninwp3qyvr1p7r0ddz21xz04np"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 3
+ ],
+ "deps": [
+ "cl-lib",
+ "dash",
+ "popup",
+ "posframe"
+ ],
+ "commit": "2a0b116d56bf54456eb5d6e8e80a7a6cf6944863",
+ "sha256": "08rzkiqwcl8j3i2yyibll5lcsj8720plzm9zfdgmxgkw7vhcyix5"
}
},
{
@@ -85405,14 +87211,14 @@
"stable": {
"version": [
0,
- 4,
+ 5,
0
],
"deps": [
"js2-mode"
],
- "commit": "f7d31589acd8a2dfcf4ca8851d2384e4f90364d0",
- "sha256": "057pgylflzd69ydqz41g8wisvixypdrfn8yv81mfixh3iyq740y8"
+ "commit": "0061587a06cdc2579a8d0e90863498d96bf982d8",
+ "sha256": "08b4hdgq4hc1yfd9pvyir2j3cqqdqa3j5svgaba97x5fzhsz7y8i"
}
},
{
@@ -85438,26 +87244,26 @@
"repo": "dgutov/robe",
"unstable": {
"version": [
- 20190521,
- 58
+ 20200628,
+ 1225
],
"deps": [
"inf-ruby"
],
- "commit": "68503b32bb3a005787ecb7a7fdeb3bb4a2317e2b",
- "sha256": "1v4nbfr3rhdm1733gb88cv0f018iy53cw5hdcwpshrmjj36a2lpn"
+ "commit": "082da38797d247f9c64568ad712a345e041d5c84",
+ "sha256": "1xbj7wi389n6pxfvxrakvhylkdlqg8ll9ad2zmxggcchygwah6nl"
},
"stable": {
"version": [
0,
8,
- 2
+ 3
],
"deps": [
"inf-ruby"
],
- "commit": "1908afd42ce05fc8b8bbf3f38301680264b68d19",
- "sha256": "0qw18wi54yg971n4wnjqkd8lqj5lbs9ra8bvmngif2bzhqlfdsbn"
+ "commit": "082da38797d247f9c64568ad712a345e041d5c84",
+ "sha256": "1xbj7wi389n6pxfvxrakvhylkdlqg8ll9ad2zmxggcchygwah6nl"
}
},
{
@@ -85606,14 +87412,14 @@
"repo": "zk-phi/rpn-calc",
"unstable": {
"version": [
- 20181121,
- 1154
+ 20200816,
+ 545
],
"deps": [
"popup"
],
- "commit": "27279f89c80eb3f28ff9f981eff06502056943e2",
- "sha256": "0klzhscdvzwpcrfkq2v28in5fv01zqabgxdrziyhj666sly1scjq"
+ "commit": "1554be19acc2644898a2175fa277d1159327c8dc",
+ "sha256": "1b4v9x8f9ykz2dqiv7p7c2f6kbl374i2723idmnvm2c9bc0hbpyv"
}
},
{
@@ -85647,15 +87453,15 @@
"repo": "pezra/rspec-mode",
"unstable": {
"version": [
- 20200228,
- 2348
+ 20200615,
+ 1443
],
"deps": [
"cl-lib",
"ruby-mode"
],
- "commit": "9a2a9d2935ae17b8570485bdea7c347533b464f6",
- "sha256": "0plr71dbghzcnbrl9l4g52g59yvlcx1dh41fwcnp0b12x13vslay"
+ "commit": "f1029cad2a8d9fd096e9a0f1ae9e7d7e2c8bd1ec",
+ "sha256": "02818knhbnqqnfmlhzr2ak0i6cv6pmbxw2icns2lg8vfr430c286"
},
"stable": {
"version": [
@@ -85678,11 +87484,11 @@
"repo": "Andersbakken/rtags",
"unstable": {
"version": [
- 20200507,
- 1824
+ 20200810,
+ 2326
],
- "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710",
- "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr"
+ "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824",
+ "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b"
},
"stable": {
"version": [
@@ -85707,8 +87513,8 @@
"deps": [
"rtags"
],
- "commit": "ed229d2e4070cc07ba76e537e8f5f93835ff0710",
- "sha256": "1jf1mg2pib2rsrn280j2ywmnqgkr5jwmiaqf252jsb7ndq7p5gcr"
+ "commit": "b57b36039f6411f23009c4ec0315ca5a7adb6824",
+ "sha256": "1816yxyqkxd895wka9xkxpca59iwjpcv73d25sq03z2gf1ayd56b"
},
"stable": {
"version": [
@@ -85802,26 +87608,26 @@
"repo": "jimeh/rubocopfmt.el",
"unstable": {
"version": [
- 20181009,
- 1703
+ 20200713,
+ 1144
],
"deps": [
"cl-lib"
],
- "commit": "fc96145719a65b2551339d087ddd95b72e14646f",
- "sha256": "12sfzvb5lf20d4kqa1fzhz8s48lgr8w0x7qimjcy5c75yjb123wl"
+ "commit": "b84810105940aa5e0bde20c9a89359c95c9b6917",
+ "sha256": "1w922wl7zab61v6z09rh3xpjnfi97c802ijvv4g92nqds6fhnym1"
},
"stable": {
"version": [
0,
- 3,
+ 5,
0
],
"deps": [
"cl-lib"
],
- "commit": "43ffa9d9c3dcc0574038bebd049102642f50b290",
- "sha256": "0vzpfd9xv80ph9xz8psczz46blhsdnac8zh5i944klkxgqdw7x1x"
+ "commit": "b84810105940aa5e0bde20c9a89359c95c9b6917",
+ "sha256": "1w922wl7zab61v6z09rh3xpjnfi97c802ijvv4g92nqds6fhnym1"
}
},
{
@@ -85998,15 +87804,15 @@
"repo": "ruby-test-mode/ruby-test-mode",
"unstable": {
"version": [
- 20190412,
- 909
+ 20200521,
+ 907
],
"deps": [
"pcre2el",
"ruby-mode"
],
- "commit": "e805a81c3ea787f3c82dbb252c21d747be20bc7a",
- "sha256": "07j74hgq3d4y6m992y98y9n87ivk8a2wb3zlahkj32slkcqfz3kd"
+ "commit": "5bb6b7b7ba0a4c91ba2e029853215e76e5df7772",
+ "sha256": "19sacch06cxj1803m8ac246cl9sp1wsxbp7zgrhmw1gdpsnpxac8"
},
"stable": {
"version": [
@@ -86164,11 +87970,11 @@
"repo": "vmalloc/rust-auto-use.el",
"unstable": {
"version": [
- 20181125,
- 637
+ 20200608,
+ 1359
],
- "commit": "d924505ecd954625dcb2d56dfba97111dc6a17fa",
- "sha256": "1yw9l13dgkfsdv4kgpbvzx12g8bqycclgq2gk4b1r29mxy72wnpq"
+ "commit": "d5205f7b9b9eae0f7d0893f87d3391464719f9c0",
+ "sha256": "01jhb4bjb4dc4m4nw6n16dc4cc7x9z7j2vri0s1y16v1bm4cv26g"
}
},
{
@@ -86179,20 +87985,20 @@
"repo": "rust-lang/rust-mode",
"unstable": {
"version": [
- 20200513,
- 812
+ 20200709,
+ 723
],
- "commit": "bfe40565753295a4cf8403f4124710acd2827d21",
- "sha256": "1bx0hfilw48cz8n58lf427yg6sfi50wr91vcmj0w0m4s26zbdrr2"
+ "commit": "ca7d99c6fd90fc1e636aa9d4020a2f077786a0c3",
+ "sha256": "1m24g08q7w76aq0gnb2pdp0jbadi19fw4jmbgmx47180glz082qh"
},
"stable": {
"version": [
0,
- 4,
+ 5,
0
],
- "commit": "106aeab800fb3404baf231845d3e3549ec235afa",
- "sha256": "0bcrklyicxh032rrp585rl5mxd26nb61dp6r5bl935rlcmxzsczh"
+ "commit": "00177f542976601d7f114fed82caaa3daad7b177",
+ "sha256": "1f3nnl0d7p9b5cv1bpm0hj898qmr2psxfvmqr61bh684z7fgc045"
}
},
{
@@ -86226,8 +88032,8 @@
"repo": "brotzeit/rustic",
"unstable": {
"version": [
- 20200516,
- 759
+ 20200724,
+ 1517
],
"deps": [
"dash",
@@ -86241,8 +88047,8 @@
"spinner",
"xterm-color"
],
- "commit": "52b632d161b64bdca3f35e35180af63b668ce9fb",
- "sha256": "1pcqm8463hjlv70bn6cpl2sv3z2h992yvkzrcz0w2rpz6jgrcfg1"
+ "commit": "75b99201bb4e7a0bd990c006896ad7897f284ca2",
+ "sha256": "1ddma5fi2yaxg2c2hvigfz4hbp218l71ixcnnkzp8ilqr8m2jvjj"
}
},
{
@@ -86256,8 +88062,8 @@
20150402,
1442
],
- "commit": "134497bc460990c71ab8fa75431156e62c17da2d",
- "sha256": "1z5psj8mfp0fw8fx6v1sibf8cxhz30yyiwjw17w80f9c24g0j4ii"
+ "commit": "081d5173158054c6d0780b9462c74c5697eac1fc",
+ "sha256": "1s950jmhrwjmzrr3qv3636sn2rhxfvaqlrl36h8700pq3791l1fs"
},
"stable": {
"version": [
@@ -86350,15 +88156,15 @@
"repo": "mattusifer/s3ed",
"unstable": {
"version": [
- 20180204,
- 1349
+ 20200720,
+ 1313
],
"deps": [
"dash",
- "seq"
+ "s"
],
- "commit": "13503cb057bed29cb00a14dffe4472b5cb7748ad",
- "sha256": "1ak5nmay12s4ipmvm1a36kyny05xhzmj7wp6dry391db9n7g2wy0"
+ "commit": "3e3b962d3848e6cc8ce9dc491b2e29e915a5c351",
+ "sha256": "0v8c3zwnfy40clbq6lb03z33n5pj36sz5jpprmgppms3w2ba6fw8"
}
},
{
@@ -86393,16 +88199,16 @@
"repo": "sagemath/sage-shell-mode",
"unstable": {
"version": [
- 20191103,
- 1040
+ 20200524,
+ 958
],
"deps": [
"cl-lib",
"deferred",
"let-alist"
],
- "commit": "8ff9888fd84a96816512403a1b5ded93b4d4278b",
- "sha256": "0rrp137r5cf049xqry3jz514pmdzfxkmri9z8kv08yk3w3c9sapj"
+ "commit": "855fb4ece47cea2c72295ce2158e0915829835b5",
+ "sha256": "12s289g5xc1b7szyp0zhxdxh6rzhlhkzwiwg14hf020c41mz27am"
},
"stable": {
"version": [
@@ -86598,6 +88404,24 @@
"sha256": "0h8bl28p5xrs9daapcjkslm066a4hqlb764i5nz1db0lwrvr0csm"
}
},
+ {
+ "ename": "saveplace-pdf-view",
+ "commit": "94efcb8e99185753d73c7436c18a086c441c0d7f",
+ "sha256": "1z43sb8fyg8zhlcmpn2vbivjnzljka64q146v5v81k990pjvk3z1",
+ "fetcher": "github",
+ "repo": "nicolaisingh/saveplace-pdf-view",
+ "unstable": {
+ "version": [
+ 20200719,
+ 113
+ ],
+ "deps": [
+ "pdf-tools"
+ ],
+ "commit": "bbbc466fff060b372a9d2b30e48ec6bbb7d03095",
+ "sha256": "13dxd06dicv50rl1kk6c5971iaj7x3imkqs5q2ndm0daqzrp0lva"
+ }
+ },
{
"ename": "say-what-im-doing",
"commit": "35763febad20f29320d459394f810668db6c3353",
@@ -86635,8 +88459,8 @@
"deps": [
"cider"
],
- "commit": "277404a6bb0a979e195df5886fc143bb1d1f1e8c",
- "sha256": "0whsfl6z39zhjm6b3wcliwfs70xz3pg9b1r6s2bcwnp5ld1v65m9"
+ "commit": "cbc3546fb6b1374080f1646ac3a6532a5723b7eb",
+ "sha256": "06aysbwr4lr9cd8mbfdpkiz8458hwl5qg41nq1wnl5dx0gvw3fgn"
},
"stable": {
"version": [
@@ -86659,11 +88483,11 @@
"repo": "hvesalai/emacs-sbt-mode",
"unstable": {
"version": [
- 20200106,
- 753
+ 20200521,
+ 632
],
- "commit": "633a315ad453cd963588c9b8fba02d9cf75296b4",
- "sha256": "0ha2lyw42ir16b2d09y27q0rsdx6azcfv258frp1ja63mx0jiqic"
+ "commit": "4358ed862a1b1ec18ac9699afb4862146669eb79",
+ "sha256": "1qm5ziilapfpafqch3pl5iijfj1kwccl2r7g4xl5a2pqnc480sjl"
},
"stable": {
"version": [
@@ -86683,11 +88507,11 @@
"repo": "openscad/openscad",
"unstable": {
"version": [
- 20190413,
- 1246
+ 20200628,
+ 2256
],
- "commit": "648206e2ea609e8f38599cd540368d54ff52ae8a",
- "sha256": "0vsabvci7y5l1lbqmn0fw301wfnwbb7fw7vffm1gd0w7rjjhxw73"
+ "commit": "0c9a36b82c7129a0fdce20ce99e15ecdffd3b437",
+ "sha256": "0qsvi7d3bcsai99dvbdfm8n6qafvwj51r4g4ph5jch2f1yb8m995"
}
},
{
@@ -86698,14 +88522,14 @@
"repo": "zk-phi/scad-preview",
"unstable": {
"version": [
- 20160206,
- 1336
+ 20200816,
+ 549
],
"deps": [
"scad-mode"
],
- "commit": "fee011589671cc8f1296cb6aa81553e5bb699819",
- "sha256": "13x00dls59zshz69260pnqmx6ydrjg8p2jdjn1rzgf5dsmwfy3sc"
+ "commit": "75fe00a9aaf875ac97930bdb334aef9e479e41d5",
+ "sha256": "0vdb9ib76fjdvm3f13v3kh7x04izq993crrzsqp0vs5nilbkrs8c"
}
},
{
@@ -86716,20 +88540,20 @@
"repo": "hvesalai/emacs-scala-mode",
"unstable": {
"version": [
- 20190929,
- 1522
+ 20200524,
+ 1304
],
- "commit": "46bb948345f165ebffe6ff3116e36a3b8a3f219d",
- "sha256": "1072lsin7dxadc0xyhy42wd0cw549axbbd4dy95wfmfcc1xbzjwv"
+ "commit": "1d08e885b1489313666c7f15a3962432a4f757ee",
+ "sha256": "06g6szxb9a4ih90mcryv9r1h6nqbpk3x4icd1i6nh2ky1sj6s37q"
},
"stable": {
"version": [
1,
- 0,
+ 1,
0
],
- "commit": "56cba2903cf6e12c715dbb5c99b34c97b2679379",
- "sha256": "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg"
+ "commit": "46bb948345f165ebffe6ff3116e36a3b8a3f219d",
+ "sha256": "1072lsin7dxadc0xyhy42wd0cw549axbbd4dy95wfmfcc1xbzjwv"
}
},
{
@@ -86813,11 +88637,11 @@
"repo": "emacs-pe/scihub.el",
"unstable": {
"version": [
- 20190801,
+ 20200604,
920
],
- "commit": "a32e8f47961d606c1315a972f2dab4d3a61945af",
- "sha256": "06qcs7jq68ylmvw0kf1myhpgzci7i9qbb2h0hxh0g21mz8ssna3f"
+ "commit": "5a4666ca99de6a90108b4606b4c57270c03002ce",
+ "sha256": "1njvf7712ryfd83xk27b6d2nx653j57x3ckn7xba7an4i0g7gk4a"
}
},
{
@@ -86881,14 +88705,14 @@
"repo": "technomancy/scpaste",
"unstable": {
"version": [
- 20200415,
- 40
+ 20200717,
+ 2007
],
"deps": [
"htmlize"
],
- "commit": "ca95a8dd088e848bd1cab6be207c6a98343ee176",
- "sha256": "01v199xkadcbdr627skhisixdqj0hbbyv912xgyypm1rxdjfhhx9"
+ "commit": "2aa1513fa0a402f03b993c0a6929daf39820b02b",
+ "sha256": "1cvkqb5v0v790nmhg4wi6kv6mbzfkfcgvn2xh9bmny37dcv0i2gk"
},
"stable": {
"version": [
@@ -86926,6 +88750,30 @@
"sha256": "0yiwq2gc4gdgfhaagpawhb7yrzc4fsnyb10w5d0q4whv64cj8555"
}
},
+ {
+ "ename": "scratch-comment",
+ "commit": "9578c2878a7a5f89fd495531e03a8658696fc360",
+ "sha256": "06zn1czv7bw8akbgp61pxi1k4kd2r06d7nxvr14j3cpb3v7fs7kz",
+ "fetcher": "github",
+ "repo": "conao3/scratch-comment.el",
+ "unstable": {
+ "version": [
+ 20200812,
+ 1025
+ ],
+ "commit": "cf3e967b4def1308b6ef1cfeedd2cf15ee6e226c",
+ "sha256": "0wq1vf391h53ys3292ap7f4nvk4i7wz3cqfbb18bwzz7iga922qd"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "commit": "d62665ecbeb05d1f92761af185736609278ffba2",
+ "sha256": "1bnzijfp6jkhl59y18qxnj39f06jzs39xgvj5aj7vlab5zrassmg"
+ }
+ },
{
"ename": "scratch-ext",
"commit": "a142d336a57d075dfd5caf44fa1c1254b83ac728",
@@ -86979,14 +88827,14 @@
"repo": "zk-phi/scratch-palette",
"unstable": {
"version": [
- 20150225,
- 842
+ 20200816,
+ 551
],
"deps": [
"popwin"
],
- "commit": "f6803b448079f4a81cc699cec7442ef543cd5818",
- "sha256": "00b4r8bqlxc29k18vig0164d5c9fp5bp5q26d28lwr4f0s4a71d2"
+ "commit": "c39cacb11992383887fa096ace85510baed94aef",
+ "sha256": "1va9c97cvdqf6404kixvgk0qwrlnc1lrz6khpkdp2w7w1brhf2f7"
}
},
{
@@ -86997,14 +88845,14 @@
"repo": "zk-phi/scratch-pop",
"unstable": {
"version": [
- 20200504,
- 2004
+ 20200818,
+ 1820
],
"deps": [
"popwin"
],
- "commit": "1a36cb5ab6668aa57b1b7192521a472feeec1ea2",
- "sha256": "1hdbwzd52qhn2jc8ghkp0lwr2hzrs4zfnwj6vniffxd5xz3c21ck"
+ "commit": "b1bdd0f8a345737069194ab8727f164f5d8560b4",
+ "sha256": "03x0kb0cf4yzjxl9nqwl3sg9nl75l9n8k4ain0yw0h2vpi2g0wf3"
}
},
{
@@ -87198,21 +89046,6 @@
"sha256": "0zs08vxmjb3y4dnfq6djnrhmkgyhhwd5zylrjisrd4y7f089fyh4"
}
},
- {
- "ename": "seclusion-mode",
- "commit": "b087d151b00f5251b15ebb071896995874afb274",
- "sha256": "0ff10x6yr37vpp6ffbk1nb027lgmrydwjrb332fskwlf3xmy6v0m",
- "fetcher": "github",
- "repo": "dleslie/seclusion-mode",
- "unstable": {
- "version": [
- 20121118,
- 2353
- ],
- "commit": "9634e76c52bfb7200ff0f9f01404f743429e9ef0",
- "sha256": "15cjhwjiwmrfzmr74hbw5s92si2qdb8i97nmkbsgkj3444rxg239"
- }
- },
{
"ename": "secretaria",
"commit": "3eeddbcf95315da40d021a6913ccf344849c4284",
@@ -87365,11 +89198,11 @@
"repo": "Kungsgeten/selected.el",
"unstable": {
"version": [
- 20170222,
- 834
+ 20200528,
+ 606
],
- "commit": "03edaeac90bc6000d263f03be3d889b4685e1bf7",
- "sha256": "1d72vw1dcxnyir7vymr3cfxal5dndm1pmm192aa9bcyrcg7aq39g"
+ "commit": "3043fd2609f7e71d809763ae6e8dd4b6c904e63d",
+ "sha256": "11cr55g7rrr4gqb9r2znmff0bp112l7a96d26mznfdprzj7pdzvd"
}
},
{
@@ -87404,19 +89237,19 @@
"repo": "raxod502/selectrum",
"unstable": {
"version": [
- 20200514,
- 1440
+ 20200817,
+ 1459
],
- "commit": "392fb1ba8a594a291854c27d2b6824b04cd0c2e7",
- "sha256": "1rr7w8jlxsfn2kpryb1ywn066qlc31px1dbwd42hafp6k5cl870n"
+ "commit": "5448e7cbaeb8d58c5dfd474cd0e03d6db60ac532",
+ "sha256": "09xfi0gfk9jmjmz941cfzwrv15jlzqxzwlq4m0qb29g1r4kv62ng"
},
"stable": {
"version": [
- 1,
+ 2,
0
],
- "commit": "5995a4ba07a7b1b5f661ff050d93ad702f9014a4",
- "sha256": "105zl102dwbzvk50xh6b824nq6p24kxhky18ghdnk5yi5sv620lm"
+ "commit": "51b75f4b287b13beff86810eb3a060747ac191e9",
+ "sha256": "08wm4ybidn8g7sy5a009lnsm0f1p7a3jfzpzxnzylvnyrmyhi3y4"
}
},
{
@@ -87427,27 +89260,27 @@
"repo": "raxod502/prescient.el",
"unstable": {
"version": [
- 20200404,
- 1550
+ 20200716,
+ 1414
],
"deps": [
"prescient",
"selectrum"
],
- "commit": "3ab7605d997fb8337bf5ded2ad960b98ac0e1fd7",
- "sha256": "081v916gnjvx2rzjbqkqhdwijz57w7iryxzg71729gwvavs25lsv"
+ "commit": "cc289ba3b0d89f251267ca2b669d01b3afecc530",
+ "sha256": "0xwy2xh55dm4y7wlz2g6fkwf1xyqqjyp0sjb522qgasivknzwa5p"
},
"stable": {
"version": [
- 4,
- 1
+ 5,
+ 0
],
"deps": [
"prescient",
"selectrum"
],
- "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0",
- "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3"
+ "commit": "3f53946e6aa97c1e1783be74e5b71dfbd4b54fcc",
+ "sha256": "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix"
}
},
{
@@ -87492,14 +89325,14 @@
"repo": "wanderlust/semi",
"unstable": {
"version": [
- 20200429,
- 641
+ 20200818,
+ 1252
],
"deps": [
"flim"
],
- "commit": "57a948c5f07e57e78ab3c0e6fd76ffcd591bb4ac",
- "sha256": "0y73l0zf2lg7kxz7kpbirpipzq007bdrgmlqfrv8najh4q03gf8g"
+ "commit": "10897f024fd9282c73385d24514cc4b57fe193db",
+ "sha256": "14d4j17l0ngg6fp00mf2zgyz6989cx9n5n3za7ifcfr8gjbbn7gp"
}
},
{
@@ -87510,29 +89343,30 @@
"repo": "conao3/seml-mode.el",
"unstable": {
"version": [
- 20200419,
- 1022
+ 20200812,
+ 1027
],
"deps": [
"htmlize",
"impatient-mode",
"web-mode"
],
- "commit": "4ca9d275948898602640a46573cb95d7eef913e5",
- "sha256": "1wl5qsph19i0ll2ppn9va4563m4bfz1zpv99d7xd7w65x6cp29ci"
+ "commit": "7a9a8305f7b54ee59e4c29b33ef5fd4058ba4219",
+ "sha256": "0sm6kd0r7wjsvynfkhq33d6rz431j784jlbxjpag60g5avxha9s9"
},
"stable": {
"version": [
1,
- 5,
+ 6,
0
],
"deps": [
"htmlize",
- "simple-httpd"
+ "simple-httpd",
+ "web-mode"
],
- "commit": "f62f7a9f5e18ef8f370444a1fce710770227b0f5",
- "sha256": "037p2kiwkkbk921ik15jalcci0p87q3my9mxzyh6i0mnc6qsh4zf"
+ "commit": "1f8bda7e5a4a36212f968b462cfc31ce53c6db85",
+ "sha256": "1hc0rwlgapbqf9965n3nsyvd4chdga5av7ya82wjzxn1mx4bhifa"
}
},
{
@@ -87610,15 +89444,15 @@
"repo": "twlz0ne/separedit.el",
"unstable": {
"version": [
- 20200407,
- 728
+ 20200702,
+ 634
],
"deps": [
"dash",
"edit-indirect"
],
- "commit": "e9a7b4402859d73f052330106d29ad14c3d9b6f3",
- "sha256": "0d9w8n497j6q879rd9mqrmzvk3ssm95ayqbyfb5x0r3pnywdjp1b"
+ "commit": "fa752df206f8f6e64f27e2a6d998ddd58e3c444b",
+ "sha256": "1c0k5cg2si4i0hwdi7lbh058rq6vmry8ncddgq5dxbih14wpbys4"
}
},
{
@@ -87893,11 +89727,11 @@
"repo": "sfztools/emacs-sfz-mode",
"unstable": {
"version": [
- 20200312,
- 1153
+ 20200716,
+ 1023
],
- "commit": "4d8ccde889b112896c7299cad9f1e9305bde8cb3",
- "sha256": "1ccqb05xmnxpwxl9vdvkb3f8211kbj5rsb73xv1ghyx3i40qjmzm"
+ "commit": "aaf31d1b68817251affed7da719dfcb2acd4b51a",
+ "sha256": "1b9qi5vhqp2c2bmkyvmjj4nrb3n42g4w71p2phxssiwmyq80m28f"
}
},
{
@@ -87908,26 +89742,26 @@
"url": "https://depp.brause.cc/shackle.git",
"unstable": {
"version": [
- 20200506,
- 1231
+ 20200529,
+ 1839
],
"deps": [
"cl-lib"
],
- "commit": "4b81514191dd182a28a3e5b2fe3069264b6835fe",
- "sha256": "0k3waffnd08x1vb7mj6ix21zcadn9ipx4fis26iy3dsj35cbd3fb"
+ "commit": "171c3f437d853f34782b201d86ef765665b755e2",
+ "sha256": "0s4br59zpd5qq7z9074ddq9lmwnddq2ixijwi666wp5gxw45fpgg"
},
"stable": {
"version": [
1,
0,
- 3
+ 4
],
"deps": [
"cl-lib"
],
- "commit": "242bacc940c18b6f9c156e1912155d45537fd827",
- "sha256": "0qqx8py21jaq1bdafkfqx18ns4zn305qg84zbmy65spiqnfq8hwk"
+ "commit": "171c3f437d853f34782b201d86ef765665b755e2",
+ "sha256": "0s4br59zpd5qq7z9074ddq9lmwnddq2ixijwi666wp5gxw45fpgg"
}
},
{
@@ -87971,8 +89805,8 @@
20190903,
1907
],
- "commit": "f3cbe25c82f99367ac009d67a2400eb6d56547ff",
- "sha256": "10y7qcb61f0x17fy5h2flhvyyql99cshqmfy1varn1mgg2h36mn9"
+ "commit": "5f24c90bb8e7333ee4315619672dc2ec69d198be",
+ "sha256": "0msrhh41nyvyy17skd5y5lzdz7a6lxnlqnflgz4xf2qpnc390kd6"
}
},
{
@@ -88290,8 +90124,8 @@
"deps": [
"reformatter"
],
- "commit": "342c55fab27f1e62472eebbb53cfc73b0d422a34",
- "sha256": "0hmxa856hlai9ydarfsn5s9i8cnfrydgpa7mkh4a36klhdj21gfh"
+ "commit": "465dc1fcaeed778b504d3d349a30e611368dcc00",
+ "sha256": "1gzky5xs63y7xl7j2hs81aja8qq6c5l3vk07hh050flw4yfxyi23"
},
"stable": {
"version": [
@@ -88355,19 +90189,19 @@
"repo": "emacs-w3m/emacs-w3m",
"unstable": {
"version": [
- 20200406,
- 2209
+ 20200813,
+ 37
],
- "commit": "e522a44b151d69d4a176e8809225598ab540fc4d",
- "sha256": "1alishzz4j1hbfyfi09rkhffx6gv16yxln7q8jx25shb9rssivyz"
+ "commit": "7dcbab77334c5adf8309c7a93512c9f95a2c64e4",
+ "sha256": "0in8ir99b33d83nfxsnpj2dgyv4f558yrid77bp7f9k0qpgpj4zk"
}
},
{
"ename": "shm",
- "commit": "68a2fddb7e000487f022b3827a7de9808ae73e2a",
- "sha256": "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "0z9qwwqf63wmizzby3yanqa31050f9jp6zrfhx7grf8a9aj89m89",
"fetcher": "github",
- "repo": "chrisdone/structured-haskell-mode",
+ "repo": "projectional-haskell/structured-haskell-mode",
"unstable": {
"version": [
20180327,
@@ -88431,20 +90265,20 @@
"repo": "jcs-elpa/show-eol",
"unstable": {
"version": [
- 20190924,
- 621
+ 20200723,
+ 706
],
- "commit": "bd0e47d7d61bf04a923a1d1689693a47af3a2b22",
- "sha256": "0nq02qf7rxswxqcsl1lv7skd14ixmmyjkhk7wdbn5j3dhw192bh7"
+ "commit": "9fe95a4b1cda218082eb1d977190cc66c7a6b4ea",
+ "sha256": "1nzid34cwgyqih46glw3r5hkav1px5wf8w2skbac1f3vvjfm6qk7"
},
"stable": {
"version": [
0,
0,
- 3
+ 4
],
- "commit": "097a2a79e5bd7c297bcdc231559813056cd584ac",
- "sha256": "0yhwd20azk6ib992fy3vzb9knqji3g6hz3ahz89sz71sjjvy1rrm"
+ "commit": "9fe95a4b1cda218082eb1d977190cc66c7a6b4ea",
+ "sha256": "1nzid34cwgyqih46glw3r5hkav1px5wf8w2skbac1f3vvjfm6qk7"
}
},
{
@@ -88502,14 +90336,14 @@
"repo": "xuchunyang/shr-tag-pre-highlight.el",
"unstable": {
"version": [
- 20171113,
- 914
+ 20200626,
+ 1047
],
"deps": [
"language-detection"
],
- "commit": "6182f43a36b0f82ba6edcf6e423b5f69a46a814e",
- "sha256": "0916bpzi6sw5gyn5xgi9czf35zrvl04w10wz6fvz0lc57giihil1"
+ "commit": "931c447bc0d6c134ddc9657c664eeee33afbc54d",
+ "sha256": "09gcprqhl1ds4k407rlsjqr9y56a9wvjkli70wrf2l7w3dcm4qq0"
},
"stable": {
"version": [
@@ -88530,14 +90364,14 @@
"repo": "chenyanming/shrface",
"unstable": {
"version": [
- 20200508,
- 1711
+ 20200816,
+ 1032
],
"deps": [
"org"
],
- "commit": "a146e7d25713c33999deff24338670a5d1308c6a",
- "sha256": "17pm5ljn004wdsl2hryjla5my8a63mx3bpapkqfyvrkwswwzs3fw"
+ "commit": "9470de04daf0d917d0501432cea78cd6f5cefec4",
+ "sha256": "00qi4dg0684all2aw9dljzd3hp01vk3hsfqpf2pvri8l31a9dls5"
},
"stable": {
"version": [
@@ -88687,8 +90521,8 @@
20200410,
639
],
- "commit": "e5b4bae0a1a9bb8a762da40397a04efdd0b2b397",
- "sha256": "0p9b621rgy34r1hl9xfzxh4xpx9gpsr3n330ypfxhlr0s5754j73"
+ "commit": "5308d6891276b0aa2b0fd865f6c6f8c1a80ecb54",
+ "sha256": "01sz7iqny2r1zfipkria6r5w48rlbrp3ranqqyywvsxhwwr3apmp"
},
"stable": {
"version": [
@@ -88738,20 +90572,20 @@
"repo": "rnkn/side-notes",
"unstable": {
"version": [
- 20200311,
- 547
+ 20200617,
+ 1445
],
- "commit": "f78d7ba1173cf6056a95935add30cd30b7a7d347",
- "sha256": "0fv1l3vrm50qbxs0dc1qyy1m3i08w46lh3z6nz8p32va5yjwfjmj"
+ "commit": "27c964334b8e30fa88e4278ae58dc3d00df34f1f",
+ "sha256": "1xl2ykdscrwpxm02ypnf68mkxf9dkp64cj465b69s874x10bxfc3"
},
"stable": {
"version": [
0,
- 3,
- 1
+ 4,
+ 0
],
- "commit": "f78d7ba1173cf6056a95935add30cd30b7a7d347",
- "sha256": "0fv1l3vrm50qbxs0dc1qyy1m3i08w46lh3z6nz8p32va5yjwfjmj"
+ "commit": "27c964334b8e30fa88e4278ae58dc3d00df34f1f",
+ "sha256": "1xl2ykdscrwpxm02ypnf68mkxf9dkp64cj465b69s874x10bxfc3"
}
},
{
@@ -88942,14 +90776,14 @@
"repo": "jorenvo/simple-mpc",
"unstable": {
"version": [
- 20180716,
- 129
+ 20200523,
+ 1804
],
"deps": [
"s"
],
- "commit": "bee8520e81292b4c7353e45b193f9a13b482f5b2",
- "sha256": "1ja06pv007cmzjjgka95jlg31k7d29jrih1yxyblsxv85s9sg21q"
+ "commit": "ce731fa390b7e4edfc461a9cfb4443c1aab4b011",
+ "sha256": "14fb52r5fzdcqqbh5kkajaz43iqq8g64g0rsswwwv6g1j23y93k3"
}
},
{
@@ -89103,6 +90937,24 @@
"sha256": "1p1771qm3jndnf4rdhb1bri5cjiksvxizagi7vfb7mjmsmx18w61"
}
},
+ {
+ "ename": "sis",
+ "commit": "bea2374d589869dde682db96c35c530a051de3a9",
+ "sha256": "0zkfpmnnj30l36mcv90x90vs31x8q2rrs2ixy5w8lc96vn1dgavf",
+ "fetcher": "github",
+ "repo": "laishulu/emacs-smart-input-source",
+ "unstable": {
+ "version": [
+ 20200816,
+ 1533
+ ],
+ "deps": [
+ "terminal-focus-reporting"
+ ],
+ "commit": "2568d04908af2d529f5ce0e71f0da541ff53e2a8",
+ "sha256": "0kmfhq6rypcc00ylmhf0m9nd51r6kzqfp6hcd22riynq51fb2cyh"
+ }
+ },
{
"ename": "skeletor",
"commit": "1e63aefc869900c2af6f958dc138f9c72c63e2b8",
@@ -89272,8 +91124,8 @@
"repo": "yuya373/emacs-slack",
"unstable": {
"version": [
- 20200512,
- 1702
+ 20200725,
+ 1052
],
"deps": [
"alert",
@@ -89283,8 +91135,8 @@
"request",
"websocket"
],
- "commit": "b30525d63bb46882240de6f86e951305bcc7af10",
- "sha256": "1f35lr19g5ci1jba6b9hkl7vajg4iy1yw6wb8bhg8dyppdkwnmvy"
+ "commit": "7570e82604b59b65e9ef31c5325bef45769ae027",
+ "sha256": "1i7fb4icj9h4lkcsfqqqhsi59msmslckcgxaa5aag4v3cdy93prg"
}
},
{
@@ -89345,27 +91197,27 @@
"repo": "slime/slime",
"unstable": {
"version": [
- 20200414,
- 1444
+ 20200810,
+ 224
],
"deps": [
"cl-lib",
"macrostep"
],
- "commit": "221518f0d3d224403743e6690f6bb66c42d9dec9",
- "sha256": "0wbxv461lq7760gsqjw5djhjkzmwxz563l97csn2637gb1wkn461"
+ "commit": "fb12bac676ab51b75be19197e21ab4674479d627",
+ "sha256": "1lqd6mk87kmmyb83qf4h0i5wpq3mnqwzl9gdcjildy7afsp3f1fk"
},
"stable": {
"version": [
2,
- 24
+ 26
],
"deps": [
"cl-lib",
"macrostep"
],
- "commit": "c1f15e2bd02fabe7bb468b05fe311cd9a932f14f",
- "sha256": "0w7j835p9riyd6n4znj3x255lwsrmy0lj51hpc7bhk0vdz2cv2qm"
+ "commit": "fb12bac676ab51b75be19197e21ab4674479d627",
+ "sha256": "1lqd6mk87kmmyb83qf4h0i5wpq3mnqwzl9gdcjildy7afsp3f1fk"
}
},
{
@@ -89440,14 +91292,14 @@
"repo": "augfab/slime-repl-ansi-color",
"unstable": {
"version": [
- 20190426,
- 1414
+ 20200712,
+ 1226
],
"deps": [
"slime"
],
- "commit": "fdd0c7a75a217abca2ff16ab9281d55f392bd841",
- "sha256": "0d3q9js5vybddniyirvvabljmxasgdqimjdpy7pn48hh4rd875di"
+ "commit": "e38c7958d9657e41c426b4e96938b3f604238795",
+ "sha256": "0rbg6ndi59ycw54s2c21a3c2cr0wlymrpp4qr33yxv1ik00n5n5p"
}
},
{
@@ -89570,11 +91422,11 @@
"repo": "joaotavora/sly",
"unstable": {
"version": [
- 20200314,
- 55
+ 20200816,
+ 928
],
- "commit": "1382bda945ecfb4b177c7d05a36da8fd41e0384c",
- "sha256": "1hmdx3nakhpsmg6zr52090pimmy0kpjz2adyi0m1wzh9zdg5cx4x"
+ "commit": "155cb0655e037477b592f8bde9c80022427293e5",
+ "sha256": "0g0ncqb7x3g3gafxm5j0v893cvnskq4idb5442f0v8d3y9pr0lyi"
},
"stable": {
"version": [
@@ -89679,14 +91531,14 @@
"repo": "joaotavora/sly-quicklisp",
"unstable": {
"version": [
- 20191012,
- 2124
+ 20200707,
+ 1635
],
"deps": [
"sly"
],
- "commit": "01ebe3976a244309f2e277c09206831135a0b66c",
- "sha256": "1vfqmvayf35g6y3ljsm3rlzv5jm50qikhh4lv2zkkswj6gkkb1cv"
+ "commit": "4707b62803d7a29f172e9c5ff993b91187a9aaf3",
+ "sha256": "1i4fqgd42khl85d4fifgfz2z6njpb8bxdry4chmgl8wfhh0mydza"
}
},
{
@@ -89746,11 +91598,11 @@
"repo": "zenitani/elisp",
"unstable": {
"version": [
- 20200508,
- 249
+ 20200727,
+ 1249
],
- "commit": "f808ac53870d32c57a3cd01dd2850ee62d3af98a",
- "sha256": "0dy3idfbvlrrim3rkv7lrr12gg2s4wlml6wcwgv1mazq3kdvjvvl"
+ "commit": "1f14c86af7ca5813ddc0b6dfcf2edd4a81371644",
+ "sha256": "0z1mmbgsx2lxrlyg59kz39khbir5k3cwb83mpz49ixfmy54byx5n"
}
},
{
@@ -89770,16 +91622,16 @@
},
{
"ename": "smart-dash",
- "commit": "98a2cf93cc41cb2bba14f91a83b6949267623198",
- "sha256": "1n3lh0ximwrqawdg8q9ls6aabidrawqca5w67f8vsfmrvyfx48n4",
- "fetcher": "bitbucket",
+ "commit": "59d3ab87741a9290fce17307256e085b91dd1d8a",
+ "sha256": "1rs5xxmn2qdpwla55rq4ar1kani2acil3sq47gx15y3v0rsrxxkx",
+ "fetcher": "github",
"repo": "malsyned/smart-dash",
"unstable": {
"version": [
20200104,
1620
],
- "commit": "cc540eea7452e15d4ef2b09d8809d88174f509c0",
+ "commit": "9db5c6bb4a51457281588523a2725939a31d3f26",
"sha256": "10xp7nf42v9rz9as3gspjcm3rjy075xza3yqbcppdk1zm59xxljr"
}
},
@@ -89831,24 +91683,6 @@
"sha256": "0q5hxg265ad9gpclv2kzikg6jvbf3zzb1mrykxn0n7mnvdfdlhsi"
}
},
- {
- "ename": "smart-input-source",
- "commit": "82ef5414e63fe94905f042534d8bde88fb5461c6",
- "sha256": "1dx3cvbm9hrdfrj4ggf0hbmfag2hybdlrqgpzy48fc07dscv0acd",
- "fetcher": "github",
- "repo": "laishulu/emacs-smart-input-source",
- "unstable": {
- "version": [
- 20200428,
- 1031
- ],
- "deps": [
- "names"
- ],
- "commit": "6d6db53db20712570cb99cd6a03f2be0349d87b8",
- "sha256": "1h8vcdzgbg80c51cl3x6ic2d8q2sjlk5dp9j4wvmzqg6qdf34a6b"
- }
- },
{
"ename": "smart-jump",
"commit": "52f29e14e61b28cd1637ca5d6bd878d91a71251f",
@@ -90441,15 +92275,15 @@
"repo": "kyleam/snakemake-mode",
"unstable": {
"version": [
- 20200417,
- 2230
+ 20200720,
+ 349
],
"deps": [
"cl-lib",
"magit-popup"
],
- "commit": "03562dcd82964d53eff7314b844c2897d1d9af55",
- "sha256": "1cj8628l196da5j54wl8wq7znvha44z1f6w9qqg37yw0pjynbvxz"
+ "commit": "44b88fc2aff7c970c2699de2d8615d81092342f6",
+ "sha256": "0538bfjaj19s5fa94x3s0np4jj7cw2wc77yngxk809h8bb82s7ba"
},
"stable": {
"version": [
@@ -90689,14 +92523,14 @@
"repo": "hlissner/emacs-solaire-mode",
"unstable": {
"version": [
- 20200423,
- 742
+ 20200812,
+ 1552
],
"deps": [
"cl-lib"
],
- "commit": "adc8c0c60d914f6395eba0bee78feedda128b30b",
- "sha256": "0kj6lhx57gl3809q4bmgv7cac8wk61g1sdyr4c2a0y9jkzf21x67"
+ "commit": "cd63b675140232f399e7733d7ce95a0b931b1058",
+ "sha256": "0c7l1q7xyzvxqlk7vawfrx7gmzsmycjy2lib12wmgvfh83bgc3bh"
},
"stable": {
"version": [
@@ -90719,14 +92553,14 @@
"repo": "bbatsov/solarized-emacs",
"unstable": {
"version": [
- 20200411,
- 1026
+ 20200717,
+ 1054
],
"deps": [
"dash"
],
- "commit": "c8f09494330900081ed5a4f020c972a37fd7b02e",
- "sha256": "0z5srqz4g81bsyw74q04fwz30qvi4i08s7fszmwnwyr5xrf5dx42"
+ "commit": "63eb59a7ef32abc6780883e27df69a6e42a8a6e4",
+ "sha256": "1hqqmji6vh468w73xi3fvkyzznr27f83czz0pcxzb00q62cbdqf4"
},
"stable": {
"version": [
@@ -90757,8 +92591,8 @@
"flycheck",
"solidity-mode"
],
- "commit": "022b3159832384a7dcdc2168809e698600826047",
- "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69"
+ "commit": "d166a86b83907e0cfd64c191e9dfce4b44a9843e",
+ "sha256": "19hgvsrqch2vp49ag6m76bi5qxd20v95z0ib838rib9as15b17wq"
},
"stable": {
"version": [
@@ -90782,11 +92616,11 @@
"repo": "ethereum/emacs-solidity",
"unstable": {
"version": [
- 20200418,
- 921
+ 20200529,
+ 1924
],
- "commit": "022b3159832384a7dcdc2168809e698600826047",
- "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69"
+ "commit": "d166a86b83907e0cfd64c191e9dfce4b44a9843e",
+ "sha256": "19hgvsrqch2vp49ag6m76bi5qxd20v95z0ib838rib9as15b17wq"
},
"stable": {
"version": [
@@ -90856,10 +92690,10 @@
},
{
"ename": "sorcery-theme",
- "commit": "cdb6f1cfbf3bbeb1eeb6440fb216e8e3b523bb0f",
- "sha256": "1qsavwbqidva4m0mdw393qbwlibhkkywnxj9mshfmkwaq050ivb2",
+ "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8",
+ "sha256": "18g4lkn98cjz5y4c2csziykq9ixafgixsxki04hfk9k1d9idixz3",
"fetcher": "github",
- "repo": "vxid/emacs-theme-sorcery",
+ "repo": "mtreca/emacs-theme-sorcery",
"unstable": {
"version": [
20200413,
@@ -90880,20 +92714,20 @@
"repo": "mssola/soria",
"unstable": {
"version": [
- 20200505,
- 851
+ 20200803,
+ 1402
],
- "commit": "0f73c5a87b874e72ed286cf43e0b8dfec73769c3",
- "sha256": "0pmsgvmf1ilv2jpay1mwb49rjc1y3h1hhc2kg3rzjpg10p3mak1n"
+ "commit": "d5274cc4a8e19ed0f1393a09192def951d025a11",
+ "sha256": "1zdcwccndgmn83xmlxqlx6azd03g7dxd2ldc3dj6yxbjasfx00x5"
},
"stable": {
"version": [
0,
3,
- 2
+ 3
],
- "commit": "5edb9379cd21411fb182239ed9ac19be4a278f32",
- "sha256": "103837zizm5iqv3sskxgkhjij2icjx9sjvjhq2l9zi66rlh9gca7"
+ "commit": "d5274cc4a8e19ed0f1393a09192def951d025a11",
+ "sha256": "1zdcwccndgmn83xmlxqlx6azd03g7dxd2ldc3dj6yxbjasfx00x5"
}
},
{
@@ -90913,10 +92747,10 @@
},
{
"ename": "sos",
- "commit": "6440f81aed1fcddcaf7afeedb74520e605211986",
- "sha256": "0d0n2h7lbif32qgz0z2c36536mrx36d22gq86xm7kmxday6iy19k",
+ "commit": "e8acf595ef51c928b4b41a9fea171fbfd40c080d",
+ "sha256": "1sny4wa2746fi9p18js0y9fm2f9ix7yblqyqa36ibkfj4b50hvxi",
"fetcher": "github",
- "repo": "rudolfolah/emacs-sos",
+ "repo": "emacsattic/sos",
"unstable": {
"version": [
20200510,
@@ -91288,11 +93122,11 @@
"repo": "nashamri/spacemacs-theme",
"unstable": {
"version": [
- 20200324,
- 1107
+ 20200808,
+ 1859
],
- "commit": "f79c40fb241e204539fde97200abae91e828e585",
- "sha256": "1l2kkiyrskkpx8f901v0wrzaah1wjg15zdyv88spj3mh3hwd3b6n"
+ "commit": "462ef2ac16ab8c51de21d5f3d2b1b6122b314391",
+ "sha256": "1qhvf0xf58cm4x8wij1l6301q1y6jp8j7i61g8lizlb24f7fla9l"
}
},
{
@@ -91420,11 +93254,11 @@
"repo": "brailcom/speechd-el",
"unstable": {
"version": [
- 20200122,
- 2036
+ 20200706,
+ 1236
],
- "commit": "590278f2b37919d082f576e522cbb790167a7f8d",
- "sha256": "0s2znn91jy342xrcsda6mbf78f19ixxf5lf401jls8l5gj9bnx7f"
+ "commit": "058f91b4d1b0350221218656202ea80cd6827d65",
+ "sha256": "0c9k68mnwm7hhd9mj6f3p8k83kmd67rgzcr27791mnjfkhipynvb"
}
},
{
@@ -91497,11 +93331,11 @@
"repo": "ideasman42/emacs-spell-fu",
"unstable": {
"version": [
- 20200426,
- 600
+ 20200623,
+ 307
],
- "commit": "e62cfc4f08fc4743d6961fe3402adbf2260d7e70",
- "sha256": "1w6jsn3p6956vk5pzwlbc211sswqai8ary8ad3fbhbjwxl5z3gsc"
+ "commit": "e94d01cdc822e02968971cde09276047a5d55772",
+ "sha256": "0fph3l2cpis9k09d6yhl8rv9yb727ayqq6qw6pbmxmn687xmxx9q"
}
},
{
@@ -91669,14 +93503,14 @@
"repo": "remvee/spotify-el",
"unstable": {
"version": [
- 20181030,
- 810
+ 20200615,
+ 1418
],
"deps": [
"cl-lib"
],
- "commit": "29577cf1188161f98b8358c149aaf47b2c137902",
- "sha256": "0h6yhfvvyd9sd5d37d3ng3z56zfb546vl95qjq16kcvxq00hdn1v"
+ "commit": "7e28ef0b4519c6a46fce6a89c0ff1ed775eda71a",
+ "sha256": "0mi8g6ryjg7czrr6fchwq9459ijd5c9wsvj3s9j0l0w4jcyxrvrd"
},
"stable": {
"version": [
@@ -91930,8 +93764,8 @@
"deps": [
"reformatter"
],
- "commit": "2f10382034cd5cd2356cc69b4a1e9116d77a0d86",
- "sha256": "18z9hljifw63zy4jrsyg4x2lqzgx29sfibx3maj0dm90yzj6zmcg"
+ "commit": "9e6351dc97a6f58f221d6e1baa7bab292309c437",
+ "sha256": "1r49c8ick1vk7zl4h0472z0p6j3d5b839al3s687acgqdymb24kk"
},
"stable": {
"version": [
@@ -91957,6 +93791,21 @@
"sha256": "06ln4vijl8kii3nzc5cscgsadx1fqgxksflijd3ain83bn8g4wrd"
}
},
+ {
+ "ename": "sqlite3",
+ "commit": "75bbc8a92954bd12b4c9d206a804c34c97b19e3d",
+ "sha256": "1c7j8hzz8xs1nrn931apyj7nhwr3dnfbsrimb6fpdfmms8095y7w",
+ "fetcher": "github",
+ "repo": "pekingduck/emacs-sqlite3-api",
+ "unstable": {
+ "version": [
+ 20200710,
+ 1432
+ ],
+ "commit": "e5b14b03183cde855059084eba425428ec4618c1",
+ "sha256": "1r7hs23xa2yhr0rbgdhxid8gg4fwhrk2wjrk1scrp37aj2szwpjm"
+ }
+ },
{
"ename": "sqlup-mode",
"commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44",
@@ -92012,11 +93861,11 @@
"repo": "srcery-colors/srcery-emacs",
"unstable": {
"version": [
- 20200422,
- 1941
+ 20200813,
+ 1430
],
- "commit": "9630e465cc5166f723b7c5378e326561cf2a1738",
- "sha256": "0ppaicggrrd3wrbjddw75mnsfli9a8db6bg21m1k7bafjkgraxfn"
+ "commit": "a3a4df9875ea6ae21cfb483dfd7b5c92278fb1c3",
+ "sha256": "1lc8796r5vy4n9nz9q10qy4brzd7c7i7dsjmvci6c9f7blqnz1la"
},
"stable": {
"version": [
@@ -92059,25 +93908,22 @@
"repo": "srfi-explorations/emacs-srfi",
"unstable": {
"version": [
- 20200512,
- 2217
- ],
- "deps": [
- "cl-lib"
+ 20200817,
+ 549
],
- "commit": "fd64b75f1051c4fe59209412f00a28625371588c",
- "sha256": "1rh3nhwh75b698aq45cwmflv97r0596fq36w1rj08syfhmy3aari"
+ "commit": "1588f720ecd7f69a7972d5c9e113975af045c813",
+ "sha256": "136zx2sr0n4lb396vpz5nq60zjc3cav4kpx8r5h3nzgnmamqz61b"
},
"stable": {
"version": [
0,
- 1
+ 3
],
"deps": [
"cl-lib"
],
- "commit": "c0a1ae75bfb3fdc81bb722dff5f5e2fae3f07024",
- "sha256": "1zymgidk09yyjdd23cz7rx2hql8vpmpqn21i07hwcr7032v0kl7k"
+ "commit": "98b8b1f9edd4ce6a05eeef49bed0d1966bd7c528",
+ "sha256": "1il0z6lb2jz495gdp6g7wc0n9a4z8z8ndhrrl71rnws53fah0lm3"
}
},
{
@@ -92258,8 +94104,8 @@
20200221,
2025
],
- "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
- "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
+ "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e",
+ "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0"
},
"stable": {
"version": [
@@ -92286,8 +94132,8 @@
"stan-mode",
"yasnippet"
],
- "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
- "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
+ "commit": "e891a0fcb3a7ab7d9cedbe3deda560134636897e",
+ "sha256": "158afanfaww2jkrz9szap6ys8xhbpz35kd5apkxr1j9j7s8h0iw0"
},
"stable": {
"version": [
@@ -92303,6 +94149,38 @@
"sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
}
},
+ {
+ "ename": "standard-dirs",
+ "commit": "3af817370f249a7e7a04b06ccc850b24c0f4b5bb",
+ "sha256": "0jcwav3dhvdxkxsc1nrwswrljam06llyspd9nk70pfpafis9smzl",
+ "fetcher": "github",
+ "repo": "lafrenierejm/standard-dirs.el",
+ "unstable": {
+ "version": [
+ 20200621,
+ 1603
+ ],
+ "deps": [
+ "f",
+ "s"
+ ],
+ "commit": "e37b7e1c714c7798cd8e3a6569e4d71b96718a60",
+ "sha256": "0r814qcrhvx4qlx4sdzwdmrhiryslqclx0bnpp0qcrbx6g8qfl25"
+ },
+ "stable": {
+ "version": [
+ 2,
+ 0,
+ 0
+ ],
+ "deps": [
+ "f",
+ "s"
+ ],
+ "commit": "e37b7e1c714c7798cd8e3a6569e4d71b96718a60",
+ "sha256": "0r814qcrhvx4qlx4sdzwdmrhiryslqclx0bnpp0qcrbx6g8qfl25"
+ }
+ },
{
"ename": "standoff-mode",
"commit": "98858a45f72c28eec552b119a66479ea99b60f93",
@@ -92369,11 +94247,11 @@
"repo": "thisirs/state",
"unstable": {
"version": [
- 20180627,
- 1956
+ 20200727,
+ 1227
],
- "commit": "258fe1cba00bdc2c600f866bb0406c719661d0a6",
- "sha256": "1miwmb4012a4pjxc0qi0qrs0aw7yf8fhiy72ndf80sj050wmpaqn"
+ "commit": "8cd9210f17c1b134274a7352b996839aed9a7d8c",
+ "sha256": "04h8n2wy9qr4bskq9znhadcf02wk4ydhyaaq44yvh55hzmn6gm25"
}
},
{
@@ -92449,25 +94327,25 @@
},
{
"ename": "stgit",
- "commit": "726da64b7baea1735a916b826bdfb8f575860e21",
- "sha256": "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "0iv2fiv8i2h4pqbsvy10avijvlk2waprmn0z4jq4hcyvarwzxvp1",
"fetcher": "github",
- "repo": "ctmarinas/stgit",
+ "repo": "stacked-git/stgit",
"unstable": {
"version": [
- 20171130,
- 1559
+ 20200606,
+ 1308
],
- "commit": "fb180610de78c68736c963236afb28ee3ac952b4",
- "sha256": "106jjrbjdgxp1s41h9vn877rq7a3m1jj9brlgdz1mrjgay266gcc"
+ "commit": "333e9e434cec9aa2f887083cdf2cefcaa316f438",
+ "sha256": "1q058qav0al8mb6f3f3jc4mnzlvhlis9dllchw3flw3gx57qcrx5"
},
"stable": {
"version": [
0,
- 22
+ 23
],
- "commit": "9acc95666619699d4cdf0526305155407081d8de",
- "sha256": "0rhdgakd4vc0549m6zjwcmsnvh2i3mbv5laks25wnfmsxr8dwqns"
+ "commit": "e6dd7eff206a6515aefced2ad701beaf625d7b7d",
+ "sha256": "157vdhdjzxsf7077916ibn0jbsxw9d71m8mwm4kn0i0ip7sj9xdg"
}
},
{
@@ -92608,20 +94486,20 @@
"repo": "akicho8/string-inflection",
"unstable": {
"version": [
- 20180827,
- 1301
+ 20200517,
+ 115
],
- "commit": "e9a50855a4c718592c28a5a892f164ecf46e39a8",
- "sha256": "03kvp5xrv9p46m4w25jr5nvi801yafq5vxzif42y0dav7ifmmdfp"
+ "commit": "1937db7513db570606ea8798916180b7dd75d3b1",
+ "sha256": "06n968iqh6w8grmk8w67g6la9cxpp8ww5mi9s3zgdjhfcs5g8xdl"
},
"stable": {
"version": [
1,
0,
- 10
+ 11
],
- "commit": "9b08372301e3c5f91cb278ee0e00a48845a42cb6",
- "sha256": "0j3ms2cxbv24kr27r2jhzxpdih6w43gjdkm3sqd28c28ycab8d4b"
+ "commit": "1937db7513db570606ea8798916180b7dd75d3b1",
+ "sha256": "06n968iqh6w8grmk8w67g6la9cxpp8ww5mi9s3zgdjhfcs5g8xdl"
}
},
{
@@ -92795,10 +94673,10 @@
},
{
"ename": "subatomic-theme",
- "commit": "de7f6009bab3e9a5b14b7b96ab16557e81e7f078",
- "sha256": "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "0qh311h8vc3c7f2dv6gqq3kw1pxv6a7h4xbyqlas5ybkk2vzq12r",
"fetcher": "github",
- "repo": "cryon/subatomic",
+ "repo": "cryon/subatomic-theme",
"unstable": {
"version": [
20190607,
@@ -92878,14 +94756,14 @@
"repo": "zk-phi/sublimity",
"unstable": {
"version": [
- 20181121,
- 1311
+ 20200816,
+ 854
],
"deps": [
"cl-lib"
],
- "commit": "4c8d0280815978fc11e1c5f86266a11c717b0c89",
- "sha256": "1618ba3m36crh2wmmisi3ls5ijdqrwr58yda810jik0b6fjzzacv"
+ "commit": "133ac118eaa51cce81978ed78abba6aa8d427577",
+ "sha256": "0sqjdrzsp7pf1wj14vcr322n8fydjzzii4msdvlhj0xr3xhl0469"
},
"stable": {
"version": [
@@ -92927,14 +94805,14 @@
"repo": "nflath/sudo-edit",
"unstable": {
"version": [
- 20180731,
- 1908
+ 20200625,
+ 142
],
"deps": [
"cl-lib"
],
- "commit": "cc3d478937b1accd38742bfceba92af02ee9357d",
- "sha256": "1qv58x5j5a3v1s2ylhck1ykbfclq0mbi0gsvaql3nyv8cxazqlwl"
+ "commit": "0e2c32b5e5242d30f8780cbe8e1b1649476cac4d",
+ "sha256": "1z26i4hzi2mksl4nr8szzlnrnyv96fg7jjddbm5dp5dlmh2pndk1"
},
"stable": {
"version": [
@@ -93183,11 +95061,11 @@
"repo": "leafOfTree/svelte-mode",
"unstable": {
"version": [
- 20200327,
- 406
+ 20200816,
+ 354
],
- "commit": "48a26af6a3395a8bf3f09747d0a205c6dbc79313",
- "sha256": "12gg55jdb6b5jk0xizx2cqc795bgll2kap3jp08s1vr16zkdaryn"
+ "commit": "5db0451429d4bf68f5dd131837faa6eb601a631d",
+ "sha256": "1ffr9yzxr1z8xmvl0lf7nfp9gjp79zps556d3kni45dbnkdi0z1h"
}
},
{
@@ -93300,6 +95178,21 @@
"sha256": "1d45yanqk4w0idqwkrwig1dl22wr820k11r3gynv7an643k4wngp"
}
},
+ {
+ "ename": "sweet-theme",
+ "commit": "a149448c38504bdf6f782a10cb1440da9102990f",
+ "sha256": "1ca56disxyr30anvpqahh33s062y35w003yxi1rhdrknka2cnl5q",
+ "fetcher": "github",
+ "repo": "2bruh4me/sweet-theme",
+ "unstable": {
+ "version": [
+ 20200708,
+ 1202
+ ],
+ "commit": "78f741806ecebe01224bf54d09ad80e306652508",
+ "sha256": "1yqz15l6xa1vkll4gaa3jpr30vq3yjgbgadjilsmz5p8mblawhyx"
+ }
+ },
{
"ename": "sweetgreen",
"commit": "63812707948e6dcc00e00ebc3c423469593e80fd",
@@ -93343,16 +95236,16 @@
"repo": "danielmartin/swift-helpful",
"unstable": {
"version": [
- 20200516,
- 1836
+ 20200701,
+ 2005
],
"deps": [
"dash",
"lsp-mode",
"swift-mode"
],
- "commit": "e990ea6f5ea932763d002c3794dd9589add1532d",
- "sha256": "1a4yrj3yjqgd5jssxd38dvx06cigsszrvs6hv7slfl60p729i0lw"
+ "commit": "2c8c9cda5ed9d9e96bb3a39c6d0905a15dd9e2e6",
+ "sha256": "1kq4jxhig6bg4cifggy06a6ydksg68nr2gbnxn589znacxbs0iy9"
},
"stable": {
"version": [
@@ -93376,14 +95269,14 @@
"repo": "swift-emacs/swift-mode",
"unstable": {
"version": [
- 20200418,
- 617
+ 20200606,
+ 730
],
"deps": [
"seq"
],
- "commit": "2ab9ea1784a12a482ed9e3fb284b7a7658f40fff",
- "sha256": "0wml7f8k3gqlxm0yg744271mqh087prlsfmbiv7fvkrcs55q0592"
+ "commit": "d266fbd300a1bf1592e1462ead4be093b8b68f98",
+ "sha256": "0l3i74acv1msmbfkn99mz9g73kd7j1a7j0b082vcxw6kr69476yc"
},
"stable": {
"version": [
@@ -93466,8 +95359,8 @@
"deps": [
"ivy"
],
- "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851",
- "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3"
+ "commit": "dd43ab1217f72948dc5cd669467e33b8b568db44",
+ "sha256": "0h4273gr4h9xkdf5g08ci95jq0n9l1w3vgd1y9452cry1r07ya9l"
},
"stable": {
"version": [
@@ -93514,6 +95407,21 @@
"sha256": "05n4h20lfyg1kis5rig72ajbz680ml5fmsy6l1w4g9jx2xybpll2"
}
},
+ {
+ "ename": "swiss-holidays",
+ "commit": "2260acd32c74352c5b1c5622c527676a81223640",
+ "sha256": "1d91fnvm2sikfmy0s1gffzgn19088ggkkf992zbms7gy7njbgysf",
+ "fetcher": "github",
+ "repo": "egli/swiss-holidays",
+ "unstable": {
+ "version": [
+ 20200526,
+ 822
+ ],
+ "commit": "0995c9685033a09466f5b2dceb7316362bde997a",
+ "sha256": "098s55jsmr6na5qf8s5a3iws6zb47rbq7mk4garbxar9vyfi3bw7"
+ }
+ },
{
"ename": "switch-buffer-functions",
"commit": "d37ebd28f4a2f770958bd9a2669cce86cc76cbe7",
@@ -93570,16 +95478,16 @@
"repo": "emacsorphanage/swoop",
"unstable": {
"version": [
- 20200321,
- 319
+ 20200618,
+ 905
],
"deps": [
"async",
"ht",
"pcre2el"
],
- "commit": "7f6f20d0f32b76b7ce5b1459afa44c1ab700f8bb",
- "sha256": "1d134f3dyh8sa8q8dgmla01wiky61y4jmhqb5whqpb7c2p53niyc"
+ "commit": "0c737a961970a2e61735545320367bafaa8dfc49",
+ "sha256": "1kjzc7543b7l0rcq9iiwf8sq39akzw5spsv51yl4wmwgnmyj2n1c"
},
"stable": {
"version": [
@@ -93662,26 +95570,46 @@
"repo": "contrapunctus/sxiv.el",
"unstable": {
"version": [
- 20200508,
- 1620
+ 20200803,
+ 1431
],
"deps": [
"dash"
],
- "commit": "f1a030c538af6d47d32eef04ab6536eeef948268",
- "sha256": "0qnd89zphpa9cl7xw6lchsi0yw2a48v8xbgddgbsisff183bzcfz"
+ "commit": "9eb6a121bfdf64433cd8ac7985d2c82b590b5abb",
+ "sha256": "0fjzzynlmqxxrr4520rh7ds0gip6l8cbmrgp7ghrgm07830arpcj"
},
"stable": {
"version": [
0,
3,
- 2
+ 3
],
"deps": [
"dash"
],
- "commit": "f1a030c538af6d47d32eef04ab6536eeef948268",
- "sha256": "0qnd89zphpa9cl7xw6lchsi0yw2a48v8xbgddgbsisff183bzcfz"
+ "commit": "9eb6a121bfdf64433cd8ac7985d2c82b590b5abb",
+ "sha256": "0fjzzynlmqxxrr4520rh7ds0gip6l8cbmrgp7ghrgm07830arpcj"
+ }
+ },
+ {
+ "ename": "symbol-navigation-hydra",
+ "commit": "ed20cf413c32e924506a4c4aa7129d1185b63d46",
+ "sha256": "1aw8ssjqsqnihri3qp8c3q6dv52mc3rnq2mgyncrbghq1yajh8ml",
+ "fetcher": "github",
+ "repo": "bgwines/symbol-navigation-hydra",
+ "unstable": {
+ "version": [
+ 20200811,
+ 655
+ ],
+ "deps": [
+ "auto-highlight-symbol",
+ "hydra",
+ "multiple-cursors"
+ ],
+ "commit": "20a63121695452e39f1a3c9bfea1e313359c5f1e",
+ "sha256": "08fs5wr9p2rbwlydx2xmwqmvzr6q05fg4dji6wdf40dn3pb5w78g"
}
},
{
@@ -93692,14 +95620,14 @@
"repo": "wolray/symbol-overlay",
"unstable": {
"version": [
- 20191224,
- 250
+ 20200809,
+ 2023
],
"deps": [
"seq"
],
- "commit": "8096a684c29bae20e1f5a1c7adbe7881680a5c10",
- "sha256": "1x7ghzxn5634amvj6r786j8nm25b780pz8h57z7qk40x0s6qk5a7"
+ "commit": "f2734ce633c2b498d3ea70042a3ae9f93f9f046a",
+ "sha256": "1n1a2jldshfyyyxc3msr16fzczjlpglzdy7ab4qpyyz6ghklaqys"
},
"stable": {
"version": [
@@ -93744,8 +95672,8 @@
"repo": "countvajhula/symex.el",
"unstable": {
"version": [
- 20200425,
- 1911
+ 20200526,
+ 211
],
"deps": [
"cider",
@@ -93762,13 +95690,13 @@
"slime",
"smartparens"
],
- "commit": "3dba2ae3f65bd1c40e3756e05a57ced039a15a7f",
- "sha256": "1j2ycsi2ipbyaknscy0vgr1ybyvzl7j1q0gvazkl5rpihshz2shl"
+ "commit": "b35e3622601ca5b27bb8e1b7ab301cc6dd674a62",
+ "sha256": "118s8xxas5nmj181p7mf9lsal7jl0pkph3gs1gyr0x6c5y93b1ci"
},
"stable": {
"version": [
0,
- 6,
+ 7,
0
],
"deps": [
@@ -93786,8 +95714,8 @@
"slime",
"smartparens"
],
- "commit": "62bd31d8647b88ec179fb8ff89f583b55a0421cc",
- "sha256": "1c2y65hcd0nydhkh7a903flq061x8hld272n00xn4dd0b8kvjp29"
+ "commit": "8209d63d88b596e5e4ed66c56085c978f33acda5",
+ "sha256": "0l0pb9d5q84wv4jiappm3wi800dslv9ciq9rla0mrv4xb2lhf3pp"
}
},
{
@@ -93986,11 +95914,11 @@
"repo": "dantecatalfamo/sysctl.el",
"unstable": {
"version": [
- 20190720,
- 2028
+ 20200615,
+ 1824
],
- "commit": "0fc50305a96de059ad1ff4e6081c9b4089f5247f",
- "sha256": "0v2andw08qawgbdzn0vplxd3drs41gqf2qbidhakmsssdd4nqiib"
+ "commit": "d8c2e18de1d7a3b2999a4d5054c0bbf30cb10fed",
+ "sha256": "0jvw5r4z9lq36yv58slpc8fw9ljzrppdsg9j7cs34m0wnhyid4a4"
}
},
{
@@ -94251,10 +96179,10 @@
},
{
"ename": "tabula-rasa",
- "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44",
- "sha256": "14j92inssmm61bn475gyn0dn0rv8kvfnqyl1zq3xliy7a0jn58zz",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "041yl5727ba0b2ircmfmm693gg7vimrijd80k8w8j13xcrq5i1i3",
"fetcher": "github",
- "repo": "idomagal/Tabula-Rasa",
+ "repo": "IdoMagal/Tabula-Rasa",
"unstable": {
"version": [
20141216,
@@ -94391,11 +96319,11 @@
"repo": "saf-dmitry/taskpaper-mode",
"unstable": {
"version": [
- 20200513,
- 1728
+ 20200701,
+ 1436
],
- "commit": "45625bd90cf5dbdcaed02b57baaa995e240ceb4c",
- "sha256": "1s2xxscj675ps93hqczw1xcs3jsixblfzjcfpz74vbz9zkmq1ygm"
+ "commit": "5ded73ae13d58ab0bbd52ac7556ff29e114a96d6",
+ "sha256": "00bvjrbcqalwlw1lc883p8l7szb9qniqp120pwd6hgyvgpr7h3s1"
},
"stable": {
"version": [
@@ -94529,30 +96457,6 @@
"sha256": "0lh04mpa1yb3mwasvnnbdzffcig7ndlk13d96a0lavqn49a10fa3"
}
},
- {
- "ename": "tdd-status-mode-line",
- "commit": "25b445a1dea5e8f1042bed6b5372471c25129fd8",
- "sha256": "1i0s7f4y4v8681mymcmjlcbq0jfghgmdzrs167c453mb5ssz8yxg",
- "fetcher": "github",
- "repo": "algernon/tdd-status-mode-line",
- "unstable": {
- "version": [
- 20131123,
- 1716
- ],
- "commit": "4c082e62f4915b573338a97efcc6854d132323dc",
- "sha256": "1jyz6z5bk1gvmknphcnvjvbl329zm8m40yl0a1hfaj8fvhwyzdw5"
- },
- "stable": {
- "version": [
- 0,
- 1,
- 2
- ],
- "commit": "9b3c35b0a972772640e9fee653eab6a76e06416a",
- "sha256": "0bvxc926kaxvqnppaw4y6gp814qc0krvidn5qg761z4qwz023rax"
- }
- },
{
"ename": "tea-time",
"commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44",
@@ -94583,6 +96487,21 @@
"sha256": "0l3mhn8m96d9mxs9kkp6clj5qzns5dw9w628kf9ibwbbc5fq01aa"
}
},
+ {
+ "ename": "teco",
+ "commit": "f8c7a2d741bd0061f5edc30fd000a82cdd3b66e4",
+ "sha256": "0ahixvxvjbm7xngsqfjdb6lfg43bki9vays2yw2psmyw7c34zp3s",
+ "fetcher": "github",
+ "repo": "mtk/teco",
+ "unstable": {
+ "version": [
+ 20200707,
+ 2309
+ ],
+ "commit": "61caf8f419659a0567a269f290c90427a215d77b",
+ "sha256": "0jfrlpmcr8msj39fhm0sc11sxw46w0dk24zidsdp12lwgcnli44m"
+ }
+ },
{
"ename": "telega",
"commit": "e067f03ebe9dd8c90ceaa5a7983483087c74107f",
@@ -94591,27 +96510,28 @@
"repo": "zevlg/telega.el",
"unstable": {
"version": [
- 20200516,
- 1007
+ 20200814,
+ 1652
],
"deps": [
"rainbow-identifiers",
"visual-fill-column"
],
- "commit": "e2fd3b1b34ae659d306749ab3129ed498b3a2720",
- "sha256": "0h851m3p9cqblr5wpl769g8dl5vxjgx62c6grkdk2g0ip2cm4vcf"
+ "commit": "9594ebcb0f605e5b01bc4ec6d1bd1b6470002bc0",
+ "sha256": "0hm6yvr4ygkcycw850sd4lcwmrr49s88nhan08hal0xylzazlq24"
},
"stable": {
"version": [
0,
6,
- 0
+ 28
],
"deps": [
+ "rainbow-identifiers",
"visual-fill-column"
],
- "commit": "ae09592498ce380e57fbb76725fd4c89ae248864",
- "sha256": "0mv6i80958d9crzspzik5xh5g8326115bvg2frgv0dp9p6rm86m3"
+ "commit": "e53996777570a5bed84d21f6c8defd4f51c8e255",
+ "sha256": "058x6svgy33lyqjqq0l3byv8bysqig9jmh3kx8shaqr0ypfrjhi3"
}
},
{
@@ -94645,16 +96565,16 @@
"repo": "dbordak/telephone-line",
"unstable": {
"version": [
- 20200412,
- 1614
+ 20200516,
+ 2102
],
"deps": [
"cl-generic",
"cl-lib",
"seq"
],
- "commit": "65198f72f3b1ae618507aa28094f05d6de4846a9",
- "sha256": "177v612ii8nj9nsmfxlf17gr3wair4whzggi3pshch7ghbxdqv5q"
+ "commit": "110c578ccf6c0421cfd9eec7aa3e960b6fd49fb4",
+ "sha256": "157df4h9hr5mmwp0q5w0rdv7ndrjk3014r5xwwblszvx33s70gbk"
},
"stable": {
"version": [
@@ -94688,6 +96608,30 @@
"sha256": "1hfm0miqzym4fbj33hzh5iszp0i51imr1z54396vd81zjch9sxss"
}
},
+ {
+ "ename": "templatel",
+ "commit": "0e43ad23f7b58ddb82bc08066d8b48e04708b5ba",
+ "sha256": "10sx3kd22z4qa1g60c3fzxpc55xlddmb4iqqdbiqkn6bqzdzrslq",
+ "fetcher": "github",
+ "repo": "clarete/templatel",
+ "unstable": {
+ "version": [
+ 20200818,
+ 241
+ ],
+ "commit": "796021c2964a5bfbba7abf7f339f970bbedc3aab",
+ "sha256": "1yv85ik2slaibnajsfns1icliw0qyqw871jxdklav918lic9fia0"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 1
+ ],
+ "commit": "6785b487aaa6bbab3cffcf74e9f596c0058c1b18",
+ "sha256": "1qdjbbr6mq2ib8aan5hb47vdj2s50yxfidmjyfyyms28qpi3524g"
+ }
+ },
{
"ename": "temporary-persistent",
"commit": "e608f40d00a3b2a80a6997da00e7d04f76d8ef0d",
@@ -94990,14 +96934,14 @@
"repo": "davidshepherd7/terminal-here",
"unstable": {
"version": [
- 20180513,
- 833
+ 20200617,
+ 714
],
"deps": [
"cl-lib"
],
- "commit": "bc7f3477133df0142d3e49e6eb8eaf4468b57865",
- "sha256": "1i0pz5lfhgqzcqwi9wkiq8skj3hf00xn9vya890g1i9ix3bclq35"
+ "commit": "d8b95302abe6e4a8a91a4526441a1c5d51b886a6",
+ "sha256": "0b05arm8b95dkzj6m2kx7wb37z00y0bdsj3z34sjny75srph3c0c"
},
"stable": {
"version": [
@@ -95044,8 +96988,8 @@
"cl-lib",
"json"
],
- "commit": "a295a80a502771cc07dc061961e0eb85343c2925",
- "sha256": "02szncbbvb52kv9mn2clqhzg49knpny1bxsa7wd5l0gwbsqly3dw"
+ "commit": "ef50c6f0269a6fd9ce742d0a87647d60a0ef850f",
+ "sha256": "1c3zamvcambi9l91vilc0sbyzn21jj89n9j02simza4ffyn9xix9"
},
"stable": {
"version": [
@@ -95077,8 +97021,8 @@
"cl-lib",
"tern"
],
- "commit": "a295a80a502771cc07dc061961e0eb85343c2925",
- "sha256": "02szncbbvb52kv9mn2clqhzg49knpny1bxsa7wd5l0gwbsqly3dw"
+ "commit": "ef50c6f0269a6fd9ce742d0a87647d60a0ef850f",
+ "sha256": "1c3zamvcambi9l91vilc0sbyzn21jj89n9j02simza4ffyn9xix9"
},
"stable": {
"version": [
@@ -95135,11 +97079,20 @@
"repo": "TxGVNN/terraform-doc",
"unstable": {
"version": [
- 20190813,
- 1254
+ 20200803,
+ 1545
+ ],
+ "commit": "d609290021ea7f2d10caadffc9131663838f8ad4",
+ "sha256": "1gvydmi37d7jxibn7nfg1rhb6phfn3kgrlmq250g7321g15j1q3v"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 1
],
- "commit": "2ec10ea7bef5a75edfffeb515dd268e19c1f8c9c",
- "sha256": "0r70fc7vv2rjnwnsg7myc1c15f3ql6hp6zrf5msmf8r2iz32jnpp"
+ "commit": "d609290021ea7f2d10caadffc9131663838f8ad4",
+ "sha256": "1gvydmi37d7jxibn7nfg1rhb6phfn3kgrlmq250g7321g15j1q3v"
}
},
{
@@ -95247,14 +97200,14 @@
"repo": "rocky/emacs-test-simple",
"unstable": {
"version": [
- 20170527,
- 1532
+ 20200722,
+ 1121
],
"deps": [
"cl-lib"
],
- "commit": "cfd383d36dc6853917acb753fdfa0eebf33856f3",
- "sha256": "0rn3x0v92v3a2g58armazhg97bl72d90j5gwf1zdak75hzimmah2"
+ "commit": "ce6de04636e8d19ec84a475c03c0142b20a63de0",
+ "sha256": "1knpzibhwm8f604fklq35d2w5rlx26fq3fzzybdm2xb65mifqnar"
},
"stable": {
"version": [
@@ -95288,14 +97241,14 @@
"repo": "TobiasZawada/texfrag",
"unstable": {
"version": [
- 20200424,
- 205
+ 20200716,
+ 1331
],
"deps": [
"auctex"
],
- "commit": "48118c4e38836117efb4eede927ab85d9a0d2013",
- "sha256": "1dpvf9limh9b0sg0x41gyw9w5nf5nvkd7zzlyysswhinm6jba4iz"
+ "commit": "a5f59e0c5f43578f139a2943bd08e5b3140f4c2b",
+ "sha256": "11xissn0xpfx2xxcm5qj2smkxa5frcswvhpfv6m34j12z0nww7pw"
},
"stable": {
"version": [
@@ -95372,10 +97325,10 @@
},
{
"ename": "textx-mode",
- "commit": "dada0378af342e0798c418032a8dcc7dfd80d600",
- "sha256": "10y95m6fskvdb2gh078ifa70nc48shkvw0223iyqbyjys35h53bn",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "0004z2ym3rmbqr42ysziqja7y5fl2fnmhbsqclk0mvr247gmb4vf",
"fetcher": "github",
- "repo": "novakboskov/textx-mode",
+ "repo": "textX/textx-mode",
"unstable": {
"version": [
20170516,
@@ -95602,18 +97555,18 @@
20200212,
1903
],
- "commit": "81d2abd9097fc3497f77d830ebf8d8386beb7127",
- "sha256": "0k9yr3dx12cl07dlz0zmaaf4zfr4zh54w5ix74b0kj1ny299f9q6"
+ "commit": "32b109977cbde37bf719c2955ff7dd1e657a6c70",
+ "sha256": "0ww3k4yd5bk40r3v1a96mgzhaayqgb0v2kjvxzn10wcybqxf1zqb"
},
"stable": {
"version": [
2020,
- 5,
- 11,
+ 8,
+ 17,
0
],
- "commit": "99612a3f69c0aecf6c2c4535a610e888aa923820",
- "sha256": "17p6ip2na9629pdbrllrhrpnhlb9ngjdcs7g9ha3yhvk0sbgz4wf"
+ "commit": "b733bf19c3c68c0aa6d5e0bb7db4321fe13b47a2",
+ "sha256": "11kpja52drs4xsja6gyg37rq1681pfgv71cc3lksh2dn6jrn8nbq"
}
},
{
@@ -95663,26 +97616,26 @@
"repo": "tidalcycles/Tidal",
"unstable": {
"version": [
- 20191210,
- 1647
+ 20200523,
+ 833
],
"deps": [
"haskell-mode"
],
- "commit": "f68e58cd7f8c483307573a96307f1f872a1921a0",
- "sha256": "1rwc1vk0gl1sjnvzvwz4x25m6c61r8ghf6wrjclgifrm8zf1na5d"
+ "commit": "137192a2ef6c4f457ddba38a0397570266333854",
+ "sha256": "1wwmgzlqih3j8slggmi79xiy811qzlrwjqpd7y37lj508w96qppi"
},
"stable": {
"version": [
1,
- 4,
- 9
+ 6,
+ 1
],
"deps": [
"haskell-mode"
],
- "commit": "252e3be53eb1bf6bfcd1b3c52af982506c84a89e",
- "sha256": "19chvk24csg5w38q6yh1wky4nk4z8361p1q5q118427njqkl5ql3"
+ "commit": "7377b6c8ddc23d197018af203456063864df1457",
+ "sha256": "0vj55135h0mw093b9rlnq8hka9sj4kmhnv8xj46z2kcqj0qcq7q8"
}
},
{
@@ -95693,8 +97646,8 @@
"repo": "ananthakumaran/tide",
"unstable": {
"version": [
- 20200504,
- 832
+ 20200811,
+ 2114
],
"deps": [
"cl-lib",
@@ -95703,8 +97656,8 @@
"s",
"typescript-mode"
],
- "commit": "8a7c1fc5dcc9b3321c10c71f21d1436b0a62ac07",
- "sha256": "14i618dbhi66z19szyjznfnb56k9w64m00732g20r8izbhjsg4nm"
+ "commit": "f0b6dac4829c3daecf02bf445a5b41b4c68f2911",
+ "sha256": "0533kxxl68vsx99b5nwdhy885nl2ad8wc6my38kardmklshjpvj1"
},
"stable": {
"version": [
@@ -95723,6 +97676,21 @@
"sha256": "0ipri5jxx73vrra6dikbv0y2ws96wfi7bjh2v6pshiw3b1x2isav"
}
},
+ {
+ "ename": "tikz",
+ "commit": "fe4080be1b98c4016360113741a9bb6b3764e872",
+ "sha256": "07wbl8aih7p9gzjnljymryrrakq9ffwzd2l73h08hjvrr8ff92m9",
+ "fetcher": "github",
+ "repo": "emiliotorres/tikz",
+ "unstable": {
+ "version": [
+ 20200728,
+ 913
+ ],
+ "commit": "f1495516657da6dc2296ffb6c38a3bb4acf118ad",
+ "sha256": "0w9xff7y6zhb28b1cfbbam9gy7dp11i96yb4rn4lj8h2yry89293"
+ }
+ },
{
"ename": "tile",
"commit": "424cfd28378ef328721bb0dc3651808e64c01306",
@@ -96032,15 +98000,15 @@
"repo": "laishulu/emacs-tmux-pane",
"unstable": {
"version": [
- 20200419,
- 1331
+ 20200730,
+ 520
],
"deps": [
"names",
"s"
],
- "commit": "6e8d0584b0bbd412c5d29c87add7364299b3d2a0",
- "sha256": "054qncg530paiv1vs27hs94m2y2fzvr4iind1rr16m8v8qf7zia6"
+ "commit": "923524efe8e6e5e0d269de6bb253b45e02d9a663",
+ "sha256": "0bhck6vrb48zxfh5id637mq57k7jv4f2ax0lrhyvr0nw8m0ndqmx"
}
},
{
@@ -96075,16 +98043,16 @@
"repo": "abrochard/emacs-todoist",
"unstable": {
"version": [
- 20200227,
- 1510
+ 20200517,
+ 1825
],
"deps": [
"dash",
"org",
"transient"
],
- "commit": "b1fba9f3600e6cfe129efae304b96a7f6dc66e1a",
- "sha256": "0391m19ws4ajqfbbwd1q1z8p1l6ai94xzf2rqg5zdvlnmc06kl76"
+ "commit": "b3f003603111b7e31b94c354cf4c83c8208c01c3",
+ "sha256": "0srk3chc45fl6zjwymzqwmxm22w9pcjxg7968c7fkvbqr21wk6p7"
}
},
{
@@ -96095,11 +98063,11 @@
"repo": "rpdillon/todotxt.el",
"unstable": {
"version": [
- 20180626,
- 2230
+ 20200530,
+ 2337
],
- "commit": "f13e404304c9d26c105de872f96b4601441b3875",
- "sha256": "1yvy2pl2ncgkz1xz598qjvp2v3g66m57wz7nra2vira7m4kq4671"
+ "commit": "b51f7fa1357d2cbc1b72b10d15f8c6f009ce5a46",
+ "sha256": "1asf33na834mc4ppvfyjxa70v4r80dnq641si5kd86gjfzjjjfmi"
}
},
{
@@ -96149,8 +98117,8 @@
"deps": [
"cl-lib"
],
- "commit": "bcd3d76a47b4f0e7c382fb680b14f40208dae568",
- "sha256": "0sgzjddd34icbbm4pc7v1662k6288pkr70ki4p2j3q4mh9qqc8q7"
+ "commit": "fc9ec563430e3beaefc00b26da179f4b4ca9855b",
+ "sha256": "1m4v56yy73gvycsvpc36h7yh6yhn3fgp90rk5m248hz89gjf9kxv"
}
},
{
@@ -96479,8 +98447,8 @@
20171210,
2102
],
- "commit": "e5bf5f89741a9c43aa406491e94dd8d58c302fb4",
- "sha256": "104l0b9n9ia7zrha20yaxp6c09wg1h5l5a8b988k6mhyj9a1w1aw"
+ "commit": "89aac22259e5d09ae1183e0df163338fe491e9e7",
+ "sha256": "16hfahyhl1vv3r0amyvc514sw6x9x56b319lkp7bwcy8mxicc3cy"
},
"stable": {
"version": [
@@ -96559,20 +98527,20 @@
},
{
"ename": "transfer-sh",
- "commit": "6440f81aed1fcddcaf7afeedb74520e605211986",
- "sha256": "0xc6dkmayk935grmy8883l4cyv4zrq3fb77fj16knfj4yw8w6c9j",
- "fetcher": "github",
- "repo": "SRoskamp/transfer-sh.el",
+ "commit": "55dc23a82be3e85b46cfdee18697b1b096573924",
+ "sha256": "1pzsjibqbzkvfb4c5i271yb5jjadsclb383jfhi6jikpnm3vkf5g",
+ "fetcher": "gitlab",
+ "repo": "tuedachu/transfer-sh.el",
"unstable": {
"version": [
- 20180603,
- 1431
+ 20200601,
+ 1708
],
"deps": [
"async"
],
- "commit": "55da85f963d347255a2b46568954923679331798",
- "sha256": "0yv4i4ps379kz1q9qmjh4q3pk5ik77xw86faxmwpjx4yzp1wsz9v"
+ "commit": "0621a66d00ec91a209a542c10b158095088bd44d",
+ "sha256": "1dnh8ws788if32wqnhzqjm38zjhpm9l3sq74245djnn1mx5bm56m"
}
},
{
@@ -96583,11 +98551,11 @@
"repo": "magit/transient",
"unstable": {
"version": [
- 20200508,
- 1911
+ 20200819,
+ 1133
],
- "commit": "d49f85a8c1172b9f21d2fd4a54d1f802b53948fc",
- "sha256": "01rnd67mc9avm4d39vqr074shfmqjsilynivb3s32dqyk13fsz8r"
+ "commit": "f5d81ef0ed24be935f3c0192b746a1738d903d37",
+ "sha256": "0kyrf0nh9l9x1jwfca1921qc0w2ii1xp4ya4mv2jmanm3apbihb9"
},
"stable": {
"version": [
@@ -96607,14 +98575,14 @@
"repo": "conao3/transient-dwim.el",
"unstable": {
"version": [
- 20200508,
- 617
+ 20200812,
+ 1033
],
"deps": [
"transient"
],
- "commit": "e075bda369bbd0df2ac5e5d5626664f4a0062676",
- "sha256": "052pj4b4jgr9vk0nrap57kpy0fsplssc7b9w7lkdmpxrbdld7n6h"
+ "commit": "de03d875dd89b1d838be67b0c44d9786adf96717",
+ "sha256": "0gb4k3758bv25vdw30rq0vbs94vdyss0xsiyaxnmvpfnj0v9k2cq"
}
},
{
@@ -96625,14 +98593,14 @@
"repo": "holomorph/transmission",
"unstable": {
"version": [
- 20200506,
- 2144
+ 20200620,
+ 402
],
"deps": [
"let-alist"
],
- "commit": "b2c35b6f4c503976581573a4512c50e8081f9038",
- "sha256": "1b0d2xq22121f64hls28gb44m284g1b6xiw3mi7x6g1fil8b3wb2"
+ "commit": "7ed254437c1f95ce7f59e87e90d6ec5e4d91c01d",
+ "sha256": "15qim9dfir08hkqf0ynwf1953cq60726rkjyc32l8hkpjlgw23ar"
},
"stable": {
"version": [
@@ -96686,6 +98654,30 @@
"sha256": "03wc50vn1kmrgnzzhs06pwpap2p2rx84wwzxw0hawsg1f1l35m2x"
}
},
+ {
+ "ename": "transwin",
+ "commit": "4b6dc821c99edd8ee6faa5289b0ecbdbb28f5f08",
+ "sha256": "0vrzf3xhwincsl4gg0fghczvwzicci0gjsvpfpjzcqz3m7ab6frb",
+ "fetcher": "github",
+ "repo": "jcs-elpa/transwin",
+ "unstable": {
+ "version": [
+ 20200704,
+ 356
+ ],
+ "commit": "df814cb578b0a4c01ed68f1da262df17d2a0a694",
+ "sha256": "0kfq7br70cn9jpjnc7lxgimqcw9cpp4yf95dkjalbk5l8w8gzlm2"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 2
+ ],
+ "commit": "df814cb578b0a4c01ed68f1da262df17d2a0a694",
+ "sha256": "0kfq7br70cn9jpjnc7lxgimqcw9cpp4yf95dkjalbk5l8w8gzlm2"
+ }
+ },
{
"ename": "trashed",
"commit": "0a0609353c8ef01ca5da44b6239e1d4756da3a92",
@@ -96694,20 +98686,20 @@
"repo": "shingo256/trashed",
"unstable": {
"version": [
- 20200508,
- 734
+ 20200523,
+ 231
],
- "commit": "075749debcaf867bf151d83a59d7845dea71a4b9",
- "sha256": "1r22x2m4mdkdick40myayzmhxby2v515bm5a8pxxcppnvd8259ci"
+ "commit": "23e782f78d9adf6b5479a01bfac90b2cfbf729fe",
+ "sha256": "0lfza55nbb62nmr27cwpcz2ad1vm95piq4nfd8zvkwqbn6klwmm6"
},
"stable": {
"version": [
2,
1,
- 1
+ 2
],
- "commit": "075749debcaf867bf151d83a59d7845dea71a4b9",
- "sha256": "1r22x2m4mdkdick40myayzmhxby2v515bm5a8pxxcppnvd8259ci"
+ "commit": "23e782f78d9adf6b5479a01bfac90b2cfbf729fe",
+ "sha256": "0lfza55nbb62nmr27cwpcz2ad1vm95piq4nfd8zvkwqbn6klwmm6"
}
},
{
@@ -96805,8 +98797,8 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20200516,
- 1204
+ 20200816,
+ 939
],
"deps": [
"ace-window",
@@ -96818,8 +98810,8 @@
"pfuture",
"s"
],
- "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7",
- "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac"
+ "commit": "400b3916b61e61a299916f053cc52b48638479b7",
+ "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8"
},
"stable": {
"version": [
@@ -96840,6 +98832,25 @@
"sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2"
}
},
+ {
+ "ename": "treemacs-all-the-icons",
+ "commit": "7e6c70295787573cbe4dcf761cc8147eee1b9e04",
+ "sha256": "0zkvpkfjs4lf2a6g5qlg0pr9alqmr8rvy02qh8pgqgismaz8c5s1",
+ "fetcher": "github",
+ "repo": "Alexander-Miller/treemacs",
+ "unstable": {
+ "version": [
+ 20200801,
+ 920
+ ],
+ "deps": [
+ "all-the-icons",
+ "treemacs"
+ ],
+ "commit": "400b3916b61e61a299916f053cc52b48638479b7",
+ "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8"
+ }
+ },
{
"ename": "treemacs-evil",
"commit": "37cca017cf529a0553ba73bcb824a945ec8b1137",
@@ -96848,15 +98859,15 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20200302,
- 558
+ 20200716,
+ 2041
],
"deps": [
"evil",
"treemacs"
],
- "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7",
- "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac"
+ "commit": "400b3916b61e61a299916f053cc52b48638479b7",
+ "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8"
},
"stable": {
"version": [
@@ -96879,15 +98890,14 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20200510,
- 2001
+ 20200530,
+ 2129
],
"deps": [
- "cl-lib",
"treemacs"
],
- "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7",
- "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac"
+ "commit": "400b3916b61e61a299916f053cc52b48638479b7",
+ "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8"
},
"stable": {
"version": [
@@ -96918,8 +98928,8 @@
"pfuture",
"treemacs"
],
- "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7",
- "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac"
+ "commit": "400b3916b61e61a299916f053cc52b48638479b7",
+ "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8"
},
"stable": {
"version": [
@@ -96943,16 +98953,16 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20200421,
- 1426
+ 20200530,
+ 2129
],
"deps": [
"dash",
"persp-mode",
"treemacs"
],
- "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7",
- "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac"
+ "commit": "400b3916b61e61a299916f053cc52b48638479b7",
+ "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8"
},
"stable": {
"version": [
@@ -96976,15 +98986,15 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20200114,
- 1715
+ 20200530,
+ 2129
],
"deps": [
"projectile",
"treemacs"
],
- "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7",
- "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac"
+ "commit": "400b3916b61e61a299916f053cc52b48638479b7",
+ "sha256": "1z9kvq0p3fhb48n85bav12pj9xgblhh7v1xsi3bymimxhdmkziq8"
},
"stable": {
"version": [
@@ -97010,17 +99020,17 @@
20191108,
2217
],
- "commit": "306f7031d26e4ebfc9ff36614acdc6993f3e23c3",
- "sha256": "09k95b846mzak62acyzrmqvc7kwkni14w8d74079kr7lnar9g6zq"
+ "commit": "3ac940e97f3d03e48ca9d7fcd74916a9b01c72f3",
+ "sha256": "0pmrpij80m5kgcr8bw36r8wllgppasw08vn3ghwvis9srpaq75cn"
},
"stable": {
"version": [
0,
1,
- 1
+ 2
],
- "commit": "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d",
- "sha256": "04zwm6gx9pxfvgfkizx6pvb1ql8pqxjyzqp8flz0432x0gq5nlxk"
+ "commit": "3ac940e97f3d03e48ca9d7fcd74916a9b01c72f3",
+ "sha256": "0pmrpij80m5kgcr8bw36r8wllgppasw08vn3ghwvis9srpaq75cn"
}
},
{
@@ -97067,6 +99077,30 @@
"sha256": "0a1437hkcx2ba3jvvrn7f0x0gca36wagnhbq4ll2mlkmvdkac6is"
}
},
+ {
+ "ename": "tron-legacy-theme",
+ "commit": "975e93e060f50a1fd00a6ba1566a9386271bdfd6",
+ "sha256": "08cfhnkb62121h6dksw9c0d38vxm38dfbfww7c8kj491is0w63f4",
+ "fetcher": "github",
+ "repo": "ianpan870102/tron-legacy-emacs-theme",
+ "unstable": {
+ "version": [
+ 20200601,
+ 533
+ ],
+ "commit": "af17842821400a6fd466bb2769d13606e98550c0",
+ "sha256": "19pabaiza0lrvqa8yi0p83rffm9g44n6789m395iayfcxq49lylq"
+ },
+ "stable": {
+ "version": [
+ 2,
+ 5,
+ 0
+ ],
+ "commit": "cdc052b044448654109bfb7d9b3d8bbfcf49042d",
+ "sha256": "0q1i2q6pkld8rz938yj9g68a55041d9vnps05nn4v1l8rx1x8jif"
+ }
+ },
{
"ename": "trr",
"commit": "56fa3c0b65e4e300f01804df7779ba6f1cb18cec",
@@ -97258,14 +99292,14 @@
"repo": "ocaml/tuareg",
"unstable": {
"version": [
- 20191220,
- 2314
+ 20200518,
+ 1820
],
"deps": [
"caml"
],
- "commit": "c12061eb80c1487a1963af7cdae268d709a70ca9",
- "sha256": "0x85yy20caqb24n7qx3h8nw259p6593y5dx43jl5iapy2n9za1gy"
+ "commit": "ccde45bbc292123ec20617f1af7f7e19f7481545",
+ "sha256": "1yxv4bnqarilnpg5j7wywall8170hwvm0q4xx06yqjgcn8pq1lac"
},
"stable": {
"version": [
@@ -97327,30 +99361,6 @@
"sha256": "1gns60yj1ylm87456gzwr0gy0kivp5bd290rg6d8xbc86jdcls19"
}
},
- {
- "ename": "tup-mode",
- "commit": "bda3260dad1c766c5b6ae9124f966bf441e24f2f",
- "sha256": "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l",
- "fetcher": "github",
- "repo": "ejmr/tup-mode",
- "unstable": {
- "version": [
- 20140410,
- 1614
- ],
- "commit": "bcc100c6485f1c81fdcd1215dfc6c41a81c215c8",
- "sha256": "0y1b9zvwbw3vp41siyzj04bis939fgz3j27hc5ljjzy92kd39nzm"
- },
- "stable": {
- "version": [
- 1,
- 3,
- 1
- ],
- "commit": "945af9c8e6c402e10cd3bf8e28a9591174023d6d",
- "sha256": "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y"
- }
- },
{
"ename": "turing-machine",
"commit": "6440f81aed1fcddcaf7afeedb74520e605211986",
@@ -97510,11 +99520,11 @@
"repo": "emacs-typescript/typescript.el",
"unstable": {
"version": [
- 20200430,
- 1232
+ 20200817,
+ 817
],
- "commit": "0fc729787007b5111f3584034af0f3ef2389098f",
- "sha256": "0h4k5gxjx55bg7dx8ixl87qdbxrmdzym6bvg2apasjs3kz9ggan5"
+ "commit": "42a60e5c881082db2ec2c541a5c154308c4863e6",
+ "sha256": "14hn0v5gcbzj6y2xs30qyh8wba4l073x5281xd7xs05f9yv7dv5j"
},
"stable": {
"version": [
@@ -97570,8 +99580,8 @@
"f",
"mmt"
],
- "commit": "231cb7df43253b84323520b8ed70f128d37003af",
- "sha256": "1savrxs7xl92ifyxpxkkzv2didr7lb405h0dwz1bs1wldr5fb53f"
+ "commit": "f567867a0a519e17ad3552837b48d3d45fb73aa5",
+ "sha256": "0a5xds0mhfnq6kyc13s385vf4x4cqqpk2jiw1in7qg382fl8w2p0"
},
"stable": {
"version": [
@@ -97595,11 +99605,11 @@
"repo": "jorgenschaefer/typoel",
"unstable": {
"version": [
- 20200212,
- 919
+ 20200706,
+ 1714
],
- "commit": "505b4b1ead337b773863ea54066f867d07735f9e",
- "sha256": "0n8xh6bp757fjqa68slphw04kb4g0489g66r6f4n4v8bpbbi3bbl"
+ "commit": "173ebe4fc7ac38f344b16e6eaf41f79e38f20d57",
+ "sha256": "09835zlfzxby5lpz9njl705nqc2n2h2f7a4vpcyx89f5rb9qhy68"
},
"stable": {
"version": [
@@ -97610,6 +99620,38 @@
"sha256": "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2"
}
},
+ {
+ "ename": "typo-suggest",
+ "commit": "d2dc0688a0e8371b5d74e16b6e73bc91d6a835ea",
+ "sha256": "0hp55apmm5z0zjz81ll746m9733rp7z0ylrl49a1vxzfpwx2fw47",
+ "fetcher": "github",
+ "repo": "kadircancetin/typo-suggest",
+ "unstable": {
+ "version": [
+ 20200801,
+ 1000
+ ],
+ "deps": [
+ "company",
+ "helm"
+ ],
+ "commit": "ac48f2e59daee15983a5fd13009f751e0d928ab1",
+ "sha256": "0kjyjav2bwrr2kwvdm3dx7mi966ji49n9hcw9dxx458bl72giwqf"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
+ 3
+ ],
+ "deps": [
+ "company",
+ "helm"
+ ],
+ "commit": "ac48f2e59daee15983a5fd13009f751e0d928ab1",
+ "sha256": "0kjyjav2bwrr2kwvdm3dx7mi966ji49n9hcw9dxx458bl72giwqf"
+ }
+ },
{
"ename": "typoscript-mode",
"commit": "701de09cb97cbfa49a3a81aaeb9577817566efa2",
@@ -97685,6 +99727,21 @@
"sha256": "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m"
}
},
+ {
+ "ename": "udev-mode",
+ "commit": "38ea66665abd85da45aa005ba0fc03891fbbee63",
+ "sha256": "1gwp1hays9afl09vqv5zyq9s8k5w28jwc7aya0j7h6fbw3hrxnfn",
+ "fetcher": "github",
+ "repo": "benley/emacs-udev-mode",
+ "unstable": {
+ "version": [
+ 20200702,
+ 1536
+ ],
+ "commit": "5ca236980662141518603672ebdbdf863756da5a",
+ "sha256": "15nspdkjwbvxbqxlhmpsbhdf1zij9zd2z2xxhkmvdyjy89w0hyzp"
+ }
+ },
{
"ename": "uimage",
"commit": "346cb25abdfdd539d121a9f34bce75b2fc5a16be",
@@ -97765,10 +99822,10 @@
},
{
"ename": "undercover",
- "commit": "d58ad9eb863494f609114e3c6af8c14c891b83a5",
- "sha256": "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "09wfgskilv001mlvkiyw6yichkxd1wpz4j70r5mlzqgv7xfy7p1l",
"fetcher": "github",
- "repo": "sviridov/undercover.el",
+ "repo": "undercover-el/undercover.el",
"unstable": {
"version": [
20191122,
@@ -97819,6 +99876,29 @@
"sha256": "0i6jfr4l7mr8gpavmfblr5d41ck8aqzaf4iv1qk5fyzsb6yi0nla"
}
},
+ {
+ "ename": "undersea-theme",
+ "commit": "0ee426fc0dcf1d8a4519ea9f953a8e20f1505f05",
+ "sha256": "1f2lkm4nv0sah2674wkfd50qx3mjg57618kcjvwam1q6qz2k1q41",
+ "fetcher": "github",
+ "repo": "jcs-elpa/undersea-theme",
+ "unstable": {
+ "version": [
+ 20200719,
+ 618
+ ],
+ "commit": "d4edb2cc110f1679ebc82cb52a4242cbc74636db",
+ "sha256": "0agn2j0qd516kxqx1bh6ajpandi8vz7zas966nw88yhv8m8hlzb2"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 3
+ ],
+ "commit": "952d0c14258b0fd2d2e4642c6576708dac35c2f8",
+ "sha256": "005m1qzhqg25ymmh17mmp3g8ism5k8mz430ri689g26zzw4m76mh"
+ }
+ },
{
"ename": "underwater-theme",
"commit": "e7dccc77d082181629b8f0c45404ac5d8bd97590",
@@ -97851,11 +99931,11 @@
"repo": "ideasman42/emacs-undo-fu",
"unstable": {
"version": [
- 20200512,
- 19
+ 20200701,
+ 1435
],
- "commit": "2b1e53285a55ce50ca6fd60b050f2171e235d8f9",
- "sha256": "0x7i7aj9fh8j0944xbym3hijr33mc0kfadl7v657k0d8nx00x3zh"
+ "commit": "c0806c1903c5a0e4c69b6615cdc3366470a9b8ca",
+ "sha256": "1n594aakmcgyl7qbda86v4wsx8clm62ypiv3h559xz3x72h7mr3j"
}
},
{
@@ -97866,11 +99946,11 @@
"repo": "ideasman42/emacs-undo-fu-session",
"unstable": {
"version": [
- 20200510,
- 434
+ 20200517,
+ 949
],
- "commit": "0400f15f2a0cfcedb69c06c3ff62f3f8814b62fb",
- "sha256": "0f3f4svgsl5338bbglxscvk6mrscjbpcxqc2f84w2np7iyap4ls9"
+ "commit": "e2043f8350970e1a9ef06a94956a733826cdf32b",
+ "sha256": "14qlrdal1z64cqqssa34cw1yzsppslgwwy23060sxgjz2vvwwwfb"
}
},
{
@@ -97929,8 +100009,8 @@
20200304,
2218
],
- "commit": "02c36a04364bcb586477ab79d2b5e0d4e6ae6d47",
- "sha256": "0pp9ywxkvvfay2pblbqcknf2c3q5izig552r5zksmxbac1rlsvcm"
+ "commit": "6a3f9e929489ebac5aa26862363410144d84409e",
+ "sha256": "0jdk2r6jlynswjz047zz2v3dyfq94inf1zbsriq1b8fmia018gah"
},
"stable": {
"version": [
@@ -98032,8 +100112,8 @@
"repo": "rolandwalker/unicode-fonts",
"unstable": {
"version": [
- 20181001,
- 1509
+ 20200803,
+ 1335
],
"deps": [
"font-utils",
@@ -98042,8 +100122,8 @@
"persistent-soft",
"ucs-utils"
],
- "commit": "7b88ae84e589f6c8b9386b2fb5a02ff4ccb91169",
- "sha256": "07wzcfj92jiadgd6nj5rmxky2aiaxs89j7zywp877xdp4vv0v512"
+ "commit": "e3942fe40b418bfb2dc4e73633e09195437fef01",
+ "sha256": "1vyldpmbi92yqzj0v7wbxma86f3cla0jhxbmq8jzl94pqy6q98jc"
},
"stable": {
"version": [
@@ -98062,21 +100142,6 @@
"sha256": "07wzcfj92jiadgd6nj5rmxky2aiaxs89j7zywp877xdp4vv0v512"
}
},
- {
- "ename": "unicode-input",
- "commit": "5b7972602399f9df9139cff177e38653bb0f43ed",
- "sha256": "17sf3xnl8yyx4ln4mrjlrvfinb8dvabh81l3qyr9pkn5skpgqgj8",
- "fetcher": "bitbucket",
- "repo": "m00nlight/unicode-input",
- "unstable": {
- "version": [
- 20141219,
- 720
- ],
- "commit": "e76ccb549e6a2a66c373da927eb65d69353e07db",
- "sha256": "0kzcg1wxi1z424jdn7pibk9zyfyi85kligav08sl1c2hdldzya4l"
- }
- },
{
"ename": "unicode-math-input",
"commit": "e0d39bc129500e55b99c11b3d27e042619777414",
@@ -98192,6 +100257,21 @@
"sha256": "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn"
}
},
+ {
+ "ename": "unifdef",
+ "commit": "805d7ed87c68f45aa878a19816c21c1122501c01",
+ "sha256": "0d0k7h7bsgfmbnx697jc87mdhjqiw8wg6r8k4ay8cxfp2bxqnwkg",
+ "fetcher": "github",
+ "repo": "Lindydancer/unifdef",
+ "unstable": {
+ "version": [
+ 20200517,
+ 514
+ ],
+ "commit": "7a4b76f664c4375e3d98e8af0a29270752c13701",
+ "sha256": "0xx954cyvzndj7fy6k203nlnhaxi6d0pn3xrvy287dh9ydklng0m"
+ }
+ },
{
"ename": "unify-opening",
"commit": "0a2faab13744262ef4d12750f70b300b3afd2835",
@@ -98261,6 +100341,30 @@
"sha256": "1snbvhvx2csw1f314dbdwny8yvfq834plpkzx0vl4k3wddmr3a66"
}
},
+ {
+ "ename": "unisonlang-mode",
+ "commit": "5811216040e25a78c8eef9f9d90176173229eb4e",
+ "sha256": "0pckg82iawswaljp6yk9vd6piwjsfky3zzdf3gyj1b2phhr9zz3x",
+ "fetcher": "github",
+ "repo": "dariooddenino/unison-mode-emacs",
+ "unstable": {
+ "version": [
+ 20200803,
+ 808
+ ],
+ "commit": "2b794adbe0b2a4edd40f350173a32b80bd2c5896",
+ "sha256": "0zy3la6n51kgybjxibcsj13m6381p6klsq98h1sym8mxm2k2s78y"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2,
+ 0
+ ],
+ "commit": "f793430068ade1b0a2d744aaa45f569c9dec9085",
+ "sha256": "129xk966kkhwn0ym80739r23kwds09qjiavd01ddnb3pfhbjfbrk"
+ }
+ },
{
"ename": "universal-emotions-emoticons",
"commit": "57f913112c98db2248cf69e44deb69fd09cee042",
@@ -98325,10 +100429,10 @@
},
{
"ename": "untitled-new-buffer",
- "commit": "de62e48115e1e5f9506e6d47a3b23c0420c1205b",
- "sha256": "1hpv7k7jhpif9csdrd2gpz71s3fp4svsvrd1nh8hbx7avjl66pjf",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "0fqnwas6917338a896yi6y1fnp2yhpmkpk001wrw7fmybfqzw05y",
"fetcher": "github",
- "repo": "zonuexe/untitled-new-buffer.el",
+ "repo": "emacs-jp/untitled-new-buffer.el",
"unstable": {
"version": [
20161212,
@@ -98465,14 +100569,14 @@
"repo": "jwiegley/use-package",
"unstable": {
"version": [
- 20200322,
- 2110
+ 20200721,
+ 2156
],
"deps": [
"bind-key"
],
- "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2",
- "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531"
+ "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1",
+ "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip"
},
"stable": {
"version": [
@@ -98503,8 +100607,8 @@
"key-chord",
"use-package"
],
- "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2",
- "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531"
+ "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1",
+ "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip"
},
"stable": {
"version": [
@@ -98565,8 +100669,8 @@
"system-packages",
"use-package"
],
- "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2",
- "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531"
+ "commit": "4fb1f9a68f1e7e7d614652afc017a6652fd029f1",
+ "sha256": "073sm0mbxcjysap2bjzf1cl0134jy8a0xig7ywmmd0bm2y8qzfip"
},
"stable": {
"version": [
@@ -98618,26 +100722,26 @@
"repo": "jcs-elpa/use-ttf",
"unstable": {
"version": [
- 20190823,
- 939
+ 20200720,
+ 957
],
"deps": [
"s"
],
- "commit": "edfc3f4b50aec2234792c0cc894774e4916ce26a",
- "sha256": "0xy522czbxva2dpfbfjqf0xm6wi7cc98pz6ha7glgylsmcvhlvar"
+ "commit": "e09f7d08b462984da6bf53b523b4fcd6826a6a5d",
+ "sha256": "1vli40rz0c27y3sl7b3rzmssgzrmawg0hdd5fvf8x8mjl9d61sia"
},
"stable": {
"version": [
0,
0,
- 5
+ 6
],
"deps": [
"s"
],
- "commit": "8c7f50a2b6f5bd55cdd92e351371386ff4b6edce",
- "sha256": "0xg98ngrdlfjcb902qaljwhh9jszkafc2vm1x8627lnw1k7i6b3q"
+ "commit": "e09f7d08b462984da6bf53b523b4fcd6826a6a5d",
+ "sha256": "1vli40rz0c27y3sl7b3rzmssgzrmawg0hdd5fvf8x8mjl9d61sia"
}
},
{
@@ -98651,17 +100755,17 @@
20190715,
1836
],
- "commit": "952f97a46062bb3315d3ae20ecbfd58747019c25",
- "sha256": "0bfi325y5yzjbwnmdww0l5bpf4h9ynwz4mwg60k8q3p3f82pkrrm"
+ "commit": "7bc5117d3449fc19f5c706a6decfdb2a30984507",
+ "sha256": "0fg1amarrwyfq76mv0w5z78qxs1x9vsvmzf7qzvnwh92n7lv6snb"
},
"stable": {
"version": [
2,
- 5,
+ 6,
0
],
- "commit": "471cb311159773bbb280d0f1a4b47c54456c67a9",
- "sha256": "09hxi1v5wvb952rwfmj48n6ndxkqn8ciaqj1cd9xgkw62h54agq9"
+ "commit": "df2447a63de2fea0f56d8c63d35b0bf39e11c0f2",
+ "sha256": "1g0s46p8c5kbv1kxvvj838g8hghqbkykv94q6zwy0d7q8ai1kqrq"
}
},
{
@@ -98687,11 +100791,11 @@
"repo": "kanru/uuidgen-el",
"unstable": {
"version": [
- 20200223,
- 509
+ 20200816,
+ 1308
],
- "commit": "f096f35a6e1f27d2bc9e9093cd61dd97bc33f502",
- "sha256": "1nzf7cllyvx7kwdzpf0nl3g5a8mn6qgifa60aw68h0sx9a80xp01"
+ "commit": "b50e6fef2de4199a8f207b46588c2cb3890ddd85",
+ "sha256": "08m74kj7h70kna3pifk3sgsy7mck11p32vi48h9wzqnafyq3n55d"
},
"stable": {
"version": [
@@ -98702,6 +100806,25 @@
"sha256": "1nzf7cllyvx7kwdzpf0nl3g5a8mn6qgifa60aw68h0sx9a80xp01"
}
},
+ {
+ "ename": "v-mode",
+ "commit": "247cab604cf0ef6078f5b0f5887526bcbbcefb70",
+ "sha256": "0jky9y06fqj06m4mg95h8k3h5fihf9j9qj4w3n836qg5lnb4ywga",
+ "fetcher": "github",
+ "repo": "damon-kwok/v-mode",
+ "unstable": {
+ "version": [
+ 20200812,
+ 956
+ ],
+ "deps": [
+ "dash",
+ "hydra"
+ ],
+ "commit": "15a73b304e624d9b07fd8f23670569678d6cd9c3",
+ "sha256": "1arbd9wwaqlhc1hl4hgpfjn4ncyrirjmpq8sgnhffgw7vkzl99pv"
+ }
+ },
{
"ename": "v2ex-mode",
"commit": "b27b7d777415aa350c8c30822e239b9a4c02e77d",
@@ -98927,19 +101050,19 @@
"repo": "muffinmad/emacs-vc-hgcmd",
"unstable": {
"version": [
- 20200507,
- 2139
+ 20200615,
+ 1823
],
- "commit": "7433c6cc557440893d54be05fbf6500ff0e863d7",
- "sha256": "0wgr2g814a461nknqchwbrgfgax5hb5f9fp6ibz6616q56hrcbds"
+ "commit": "5c735b3e3897b7ba52b5ac4e6a2f43ca283fd52d",
+ "sha256": "050xk0rs7k79ymchqdkdmgpg3s22wpbdnzl3pz2wsghihkskz6q1"
},
"stable": {
"version": [
1,
- 11
+ 12
],
- "commit": "7433c6cc557440893d54be05fbf6500ff0e863d7",
- "sha256": "0wgr2g814a461nknqchwbrgfgax5hb5f9fp6ibz6616q56hrcbds"
+ "commit": "5c735b3e3897b7ba52b5ac4e6a2f43ca283fd52d",
+ "sha256": "050xk0rs7k79ymchqdkdmgpg3s22wpbdnzl3pz2wsghihkskz6q1"
}
},
{
@@ -99043,11 +101166,11 @@
"repo": "plapadoo/vdf-mode",
"unstable": {
"version": [
- 20191122,
- 823
+ 20200713,
+ 1838
],
- "commit": "35f5c3531b256b6578b9878ac2ce1ed79b3c8511",
- "sha256": "16650xwq85rp98z4nljd5s7f14fg4rr90nr7ipfshj1i6zvbk229"
+ "commit": "8fbf6157440345879a0543bcab233e790a7b60ee",
+ "sha256": "1m237py9jcxkm6z3wgsxzhikc3lidd28gfflcmr0wm588sdx48sl"
},
"stable": {
"version": [
@@ -99271,15 +101394,15 @@
"repo": "applied-science/emacs-vega-view",
"unstable": {
"version": [
- 20200510,
- 726
+ 20200520,
+ 1202
],
"deps": [
"cider",
"parseedn"
],
- "commit": "c869defa3c0d9931e8eb4050dbaedb781160410b",
- "sha256": "1l57w79ljihhfs4n60ak3hc3hdzv24wxkxafv51llb4zv2b85b5k"
+ "commit": "b0160c883f53ce069c0b4498880474c158ac7245",
+ "sha256": "1msc6s90a048lk4i8gqkhgnm1k52k40m62q9n1s0dwgmq1yj3zyl"
}
},
{
@@ -99290,20 +101413,20 @@
"repo": "federicotdn/verb",
"unstable": {
"version": [
- 20200515,
- 1734
+ 20200801,
+ 2217
],
- "commit": "af1f250fd34d53ecdf31be1756c8693b4182d452",
- "sha256": "0zk52ddlf11rwsd1f70i6jjc9z81jddqapfr2dv1d4ghn6j382x5"
+ "commit": "f8755213c8fadea92b7a2313fb38c0ee37b8a2cc",
+ "sha256": "0f59rw78hfc7hkgd9ja2hzyb6gaf400aa6375zcl3zxh2ljnvbvb"
},
"stable": {
"version": [
2,
- 10,
+ 12,
0
],
- "commit": "ee83e62490bec3b6d99281748a2e894c2bdc9e24",
- "sha256": "1zd7vkd3i3x5cr04sp3jpfd79cp0p30615c9605z1rq01jjxgm3m"
+ "commit": "08ddce1306ad1b8707300fee33848b7a48897fd3",
+ "sha256": "1azwmqhlasir5fhy2r3yd861xvk6lxrzq60svvyjss3kdlqp1irj"
}
},
{
@@ -99343,6 +101466,25 @@
"sha256": "1y6vjw5qzaxr37spg5d4nxffmhiipzsrd7mvh8bs3jcfrsg3080n"
}
},
+ {
+ "ename": "verona-mode",
+ "commit": "342867cf256c6e6c242387b6d8c439a7a90f17dc",
+ "sha256": "1w94hs8mkd6qfklgm7hxb8j7ykvif25czpha0yq7ghbfc0vb3595",
+ "fetcher": "github",
+ "repo": "damon-kwok/verona-mode",
+ "unstable": {
+ "version": [
+ 20200812,
+ 807
+ ],
+ "deps": [
+ "dash",
+ "hydra"
+ ],
+ "commit": "3519f83e68af163a6b01753ad7bb4cecf26c24b2",
+ "sha256": "1ck3x1w0nyn31s3fdks6wms5ic5n56jcxg49r56j3dwnifpk87mm"
+ }
+ },
{
"ename": "versuri",
"commit": "056daa8d5563dd6ffb9c93630f9b357f73c1e58a",
@@ -99596,21 +101738,21 @@
},
{
"ename": "vimish-fold",
- "commit": "b4862b0a3d43f073e645803cbbf11d973a4b51d5",
- "sha256": "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "1ld9sab9r82wr74rscxcmsmd07jgkmkysbcn5aswzyrf1gn62gr9",
"fetcher": "github",
- "repo": "mrkkrp/vimish-fold",
+ "repo": "seregaxvm/vimish-fold",
"unstable": {
"version": [
- 20200329,
- 1242
+ 20200524,
+ 1729
],
"deps": [
"cl-lib",
"f"
],
- "commit": "63685239655a151181b9152e45478dad587f86f2",
- "sha256": "1l6zca08diq3ppmg1pllihbfj0pcaqvbnisryr92mvbblhk44wxs"
+ "commit": "9d12e39f01da517565666e09a2e32e01aed24a90",
+ "sha256": "0xdk95hiamnim0bn1w5g0lccb9wc0sxbczrb95q3ndaw3cxxjaa2"
},
"stable": {
"version": [
@@ -99756,8 +101898,8 @@
20200428,
816
],
- "commit": "982606896e018c951917b73d2af6334df554cf9d",
- "sha256": "19ks9wjfjyfk4s53wvhdqjnjc6847v43nh3ir0yvr66mflqxgg54"
+ "commit": "64d38bc1c00953be05c193c01332a633be67aac2",
+ "sha256": "1gkl2bg0ax16d3b17n7s3j5ng261jxfl6q3bi5bff03jph900x1p"
},
"stable": {
"version": [
@@ -99875,11 +102017,11 @@
"repo": "blak3mill3r/vmd-mode",
"unstable": {
"version": [
- 20190929,
- 735
+ 20200727,
+ 701
],
- "commit": "aa9b753601ee1ed31b4f717629179ce7a2cacba5",
- "sha256": "0gc1c5q1krqlbaq0lb7p29biwpl32lgv4c6527c322a21in6a5pb"
+ "commit": "31655a41caf006c3dd64d6e57f6c4488098f8bce",
+ "sha256": "1pnx977pm305kr0zakwy1wkdfpk09rilwx8rmai4459lyz0sa8j9"
}
},
{
@@ -99940,11 +102082,11 @@
"repo": "dbrock/volume.el",
"unstable": {
"version": [
- 20150718,
- 2009
+ 20200523,
+ 1246
],
- "commit": "ecc1550b3c8b501d37e0f0116b54b535d15f90f6",
- "sha256": "0ymibjq6iwab5ia1fglhz4gm5cnbi792018fmrabcqkisj2zsjb7"
+ "commit": "bd0ca8430098164740f111ac2bd2582d7f628b79",
+ "sha256": "0v8x9d0qq8gjlf6ydri580wix6hisf6x9pywg5px6cqj53r8g6rc"
}
},
{
@@ -99958,8 +102100,8 @@
20191209,
1600
],
- "commit": "d1f954a3879ec3f93c8dea9177772bf4d5bd0ecb",
- "sha256": "13kfwp129wrlbbpvl9n4h7ybnycph68x214dx5v6v7ap6gnv0lr6"
+ "commit": "aea1ca9932df2c19a19e47f7971b7bc6b821181f",
+ "sha256": "0nk0vsxww46rrm1ijfpq58bn3zai7qmj2iqg1k8g14w7fc2si8mi"
},
"stable": {
"version": [
@@ -99981,8 +102123,8 @@
20191209,
1600
],
- "commit": "764f478f5866140b121b1e43857487b7a66afa72",
- "sha256": "0s8fh7n8qhsfdk8l7r81ifscaazgmpls4n3pginaqb5cszdy4063"
+ "commit": "5c11a73bfc5f3873490ed0ba88eed44e4707e455",
+ "sha256": "1ifwm4dwmv4f97p1byv3l5k26gyb97zp60wjhrzrdj2g49fg716g"
},
"stable": {
"version": [
@@ -100008,6 +102150,30 @@
"sha256": "01p5ys23m4zk5hniri55bcn8j7v6pd6ryi41qx20w29mramwzxl9"
}
},
+ {
+ "ename": "vscode-dark-plus-theme",
+ "commit": "0e7e489ea5cee3b1d2b6b5295cf95f3e1d9d6c60",
+ "sha256": "001xhi87dsh75sd0vg26v4w78rf1p8bhj1zhn3w7j255817xvcgd",
+ "fetcher": "github",
+ "repo": "ianpan870102/vscode-dark-plus-emacs-theme",
+ "unstable": {
+ "version": [
+ 20200818,
+ 341
+ ],
+ "commit": "a33ef7fd5d9249bbb59fcb822c032e28bb3bf792",
+ "sha256": "0wm54jy09hsg3vbw4qc5k4nzznsn3mqcn0al8mwh2522q6kb6l8j"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 5,
+ 0
+ ],
+ "commit": "c64d5f7088f1295df0bd8f1dc87a532e00647fbe",
+ "sha256": "09a6plb2dqayj4m456ldh43a654jbkg8zjiky7bkj5m0kpdc5426"
+ }
+ },
{
"ename": "vscode-icon",
"commit": "90a07c96a9223a9ad477cbea895ba522523c5be4",
@@ -100031,11 +102197,11 @@
"repo": "akermu/emacs-libvterm",
"unstable": {
"version": [
- 20200515,
- 1412
+ 20200813,
+ 1748
],
- "commit": "8337e77520bcdb136eebb74837dc71ac8ec67601",
- "sha256": "1wf8w8w0690mkih7c9xkk11i9f7r47abvfpyw4y576ansxlr5g1f"
+ "commit": "797357bf65952337627f2d0c594c2fef600aafae",
+ "sha256": "0lqlx97kb1mpw17lmrx2xa407ixn3wl2cv9rdwrvlrlvg8kcpjmn"
}
},
{
@@ -100046,14 +102212,15 @@
"repo": "jixiuf/vterm-toggle",
"unstable": {
"version": [
- 20200516,
- 1117
+ 20200614,
+ 1452
],
"deps": [
+ "projectile",
"vterm"
],
- "commit": "fd55be72e8ad19e2284c8f73d5707c033dbde46d",
- "sha256": "0q3459vpj5fp2i7nbk67mfd0nf78mpkgz771nhdj4a7xwghk6xgq"
+ "commit": "7f762d216fc7311bac4182f650e0207574c29357",
+ "sha256": "0nz3qcd2jmjfky0xn62fkhnxchf9nap3li5blis0jgi6igj47ykq"
}
},
{
@@ -100122,8 +102289,8 @@
"repo": "mihaiolteanu/vuiet",
"unstable": {
"version": [
- 20200424,
- 1400
+ 20200616,
+ 1136
],
"deps": [
"bind-key",
@@ -100132,8 +102299,8 @@
"s",
"versuri"
],
- "commit": "5da06a8acebcaf84a3581610ff24aae1b46f786b",
- "sha256": "16yfnqpdzi3bih16d7dzbqmd30m7w8rkjylnsg9m951vc0lysk3p"
+ "commit": "3dab1ea2253d5bc2974a1a064d2b1af3bd6b24f6",
+ "sha256": "1q1rcnsda1392kqh944hdj30d79300ycl46ck1bzx4szx3m3p801"
},
"stable": {
"version": [
@@ -100196,11 +102363,11 @@
"repo": "emacs-w3m/emacs-w3m",
"unstable": {
"version": [
- 20200325,
- 2226
+ 20200818,
+ 141
],
- "commit": "e522a44b151d69d4a176e8809225598ab540fc4d",
- "sha256": "1alishzz4j1hbfyfi09rkhffx6gv16yxln7q8jx25shb9rssivyz"
+ "commit": "7dcbab77334c5adf8309c7a93512c9f95a2c64e4",
+ "sha256": "0in8ir99b33d83nfxsnpj2dgyv4f558yrid77bp7f9k0qpgpj4zk"
}
},
{
@@ -100273,11 +102440,11 @@
"repo": "wakatime/wakatime-mode",
"unstable": {
"version": [
- 20180920,
- 702
+ 20200730,
+ 240
],
- "commit": "2531cb58287770883ba534d20b3288955c4d6ef3",
- "sha256": "12wa845lwvwg38801mk880izfhjs50ssy5alj1743c2bz7ig5grk"
+ "commit": "7626678315918bdbb81ede68149f20a7d97a928f",
+ "sha256": "0dlhj32mkylji1d55pc593d3gn8babcs6s4c0c5sfm6jfz14m9j0"
}
},
{
@@ -100674,11 +102841,11 @@
"repo": "fxbois/web-mode",
"unstable": {
"version": [
- 20200501,
- 1939
+ 20200612,
+ 1038
],
- "commit": "186a7c21049c50ecfd4109eb06c91196404f8bc5",
- "sha256": "1si8i21ysqwnkq38wr0r4liz3j8v8sj66y46yl6bpw77116fngx9"
+ "commit": "60ffd878c4371644bd964f00fea38054645e3e47",
+ "sha256": "0la14k422jqcny1bxgvv8yidanl3pv5kkdfbiwq8skxsd6m2xfq5"
},
"stable": {
"version": [
@@ -100856,8 +103023,8 @@
"deps": [
"cl-lib"
],
- "commit": "078f83902c0846c00ed8e3b6c5add7ff9b98d8f9",
- "sha256": "11nacz0vvhaa8582r0ylx5w886y2qysbvrh9s064g979vjyfh9rg"
+ "commit": "5aaf9d12068f98fb4efa772a3e5f4bb350b79a99",
+ "sha256": "13qwvjid9d67kk4ggvc2hvm6j4wy1jassd02krp8as91h5hr0y36"
},
"stable": {
"version": [
@@ -100966,6 +103133,21 @@
"sha256": "14vmgfz45wmpjfhfx3pfjn3bak8qvj1zk1w4xc5w1cfl6vnij6hv"
}
},
+ {
+ "ename": "weyland-yutani-theme",
+ "commit": "87fd30180367eaf64fe145d78e50febdfd79772b",
+ "sha256": "184vc3r34j2pv0a2a2bldbzpvv8d39c20znv6l9fmnqmr48fzvnq",
+ "fetcher": "github",
+ "repo": "jstaursky/weyland-yutani-theme",
+ "unstable": {
+ "version": [
+ 20200818,
+ 2225
+ ],
+ "commit": "d17297aee3a15b326e813d6c12831b587f6267fd",
+ "sha256": "0brixf1j1hdmj0wvd3qzlmr844fvd61nxgc5adczpy0qivc1c1c9"
+ }
+ },
{
"ename": "wgrep",
"commit": "9648e3df896fcd97b3757a727108bc78261973cc",
@@ -101133,11 +103315,11 @@
"repo": "justbur/emacs-which-key",
"unstable": {
"version": [
- 20200216,
- 1350
+ 20200817,
+ 2358
],
- "commit": "8b49ae978cceca65967f3544c236f32964ddbed0",
- "sha256": "15ydzqv23m1w6g27il57fmzs6pjcasdb7drml3msjpq2l8kr4ard"
+ "commit": "e48e190a75a0c176e1deac218b891e77792d6921",
+ "sha256": "1wr5lqjc5si0s0rn266jxfwln93l7aw79885w66gbjcynfy8rji3"
},
"stable": {
"version": [
@@ -101251,8 +103433,8 @@
20200304,
2227
],
- "commit": "5fac49636cd72a0043e2473c9a09a788cfd68d5f",
- "sha256": "0myx8vayakmhb5hbrskk58rkb1f0jdw7kinvk8fvv73g050yk28d"
+ "commit": "c344cfd78df23980ee48fb85fbc16989b7d4cffe",
+ "sha256": "1jwz89j6v8mmdim8knnwjz2ip0cwn5lq6x8nz78xns1ba5fg293b"
},
"stable": {
"version": [
@@ -101295,19 +103477,19 @@
"repo": "lassik/emacs-whois",
"unstable": {
"version": [
- 20200409,
- 1538
+ 20200715,
+ 1715
],
- "commit": "907abd9538c4a1e088853b816af883e5040fc430",
- "sha256": "1qfkppciijyyg76idqqzjy351rki8y4pffwicprnrhv1qixfhdvv"
+ "commit": "11d01c483ab3ba78b6ea1e195bda65b5e35f2d4c",
+ "sha256": "14w1cchij7i8a9m9z71dsz76aphidmvp8lbai4gaxxi4qiyvkcn3"
},
"stable": {
"version": [
0,
- 1
+ 2
],
- "commit": "b4cdab4d25225c6e834727a7d85cdb0d493da152",
- "sha256": "058wym1iwgz5n5yd508xdc05ncdyqbs53a5c9mq0s6gs06h5xfyw"
+ "commit": "7cc7e2734ec823bed6eb923387b3b33a1cde0c86",
+ "sha256": "0d8q8as85fjn2v65i25xv9bzg03mlk4jhxrbqrcg5ywjiv5i2ljg"
}
},
{
@@ -101321,8 +103503,8 @@
20200305,
221
],
- "commit": "71f84725e2643b2ee74f27c60c4fd8b79c9c3c97",
- "sha256": "1rs446cwbp6i79wi7srzaxg9hdahagcjkjill34j70hdy1r4xjas"
+ "commit": "9791ae59f8bd8b9375d2dede92de8eba5f0d89fb",
+ "sha256": "0fk2nhcjkwrni8np8788z9aanrj1hxchg37a1j1z9ds42f0ghj6h"
},
"stable": {
"version": [
@@ -101389,8 +103571,8 @@
"makey",
"s"
],
- "commit": "1de068d49a6b5faf8754d217bdaa2cbfc903a9fc",
- "sha256": "04gfhjpn4q8d4y6177gdffwjbqq627083pff2ckw79pbvlj9f2mm"
+ "commit": "a0d8456b9f71fcb40a28ec9235132df506aa6ecc",
+ "sha256": "1bndpdzscb917sp32khmifk7vdkj4psh7c8rf4j5s5zs7033qwka"
}
},
{
@@ -101668,6 +103850,29 @@
"sha256": "1f4v0xd341qs4kfnjqhgf8j26valvg6pz4rwcz0zj0s23niy2yil"
}
},
+ {
+ "ename": "windswap",
+ "commit": "442a7394fd31e641b778ef0b218a5ef158377db0",
+ "sha256": "0yxh8zlqg2gv08gfima2vgcqwadqkli1qz6q11xvy5a0d3n8drxr",
+ "fetcher": "github",
+ "repo": "purcell/windswap",
+ "unstable": {
+ "version": [
+ 20200722,
+ 411
+ ],
+ "commit": "1a334f6543e0a30c55ea1e6071e9732d948f9e4b",
+ "sha256": "0q36rqy1ss1hayf698zla2m6ff57gigkji5slaffjhnijhsj3c67"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1
+ ],
+ "commit": "33d59d371843d5a72a4327e318382ff27ee15674",
+ "sha256": "13hbpi6rr7vgyy1cbxaz947ixbrbp8x2dy6dw2l02c5hl4p65miw"
+ }
+ },
{
"ename": "windwow",
"commit": "12aba18872021ce0affa96c46a17353c7d073ca2",
@@ -101772,21 +103977,6 @@
"sha256": "0v1qmw3svydk7dlqbcymy1g1bygkfpb2h4b97zdp12xvd8mww9ny"
}
},
- {
- "ename": "wisp-mode",
- "commit": "5b7972602399f9df9139cff177e38653bb0f43ed",
- "sha256": "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc",
- "fetcher": "bitbucket",
- "repo": "ArneBab/wisp",
- "unstable": {
- "version": [
- 20191114,
- 2340
- ],
- "commit": "91ec8dc32652811861116e6f750f0fb41b21b771",
- "sha256": "0nc9c1agzhmlbh4ijjrsa9yx19hvxzk06gv6p4pgrlx1yg2khnli"
- }
- },
{
"ename": "wispjs-mode",
"commit": "a628330ee8deeab2bd5c2d4b61b33f119c4549d8",
@@ -101825,26 +104015,26 @@
"repo": "magit/with-editor",
"unstable": {
"version": [
- 20200217,
- 1015
+ 20200720,
+ 2014
],
"deps": [
"async"
],
- "commit": "f25a70777d9d9c90a52249791578bd72f1b7dfd7",
- "sha256": "1vb6dw07vx3zqqb1h457f9957yja8wfqcjcfcf3m78dah3l2qmr1"
+ "commit": "efafd482c21b90decbb0b682ed3159c86014d4f3",
+ "sha256": "1z3214zjf3dassb31k14gq4nbr3q8g5x87ydfah28hm4j08v0wb3"
},
"stable": {
"version": [
2,
9,
- 1
+ 4
],
"deps": [
"async"
],
- "commit": "7e0bf753709f1775d2bbbb6edf4482fca7fd286a",
- "sha256": "1y4zrgsfs0504ks30qb7hl32ygd3hb6yx5x8032b30j7rh5ks29d"
+ "commit": "efafd482c21b90decbb0b682ed3159c86014d4f3",
+ "sha256": "1z3214zjf3dassb31k14gq4nbr3q8g5x87ydfah28hm4j08v0wb3"
}
},
{
@@ -101904,26 +104094,26 @@
"repo": "p3r7/with-shell-interpreter",
"unstable": {
"version": [
- 20200510,
- 1621
+ 20200527,
+ 828
],
"deps": [
"cl-lib"
],
- "commit": "8d78bfeffa8a7bb4973395417d6fe21e4840ee16",
- "sha256": "0ygbabavrhl9xmxmqaxrjkhyf7ar5lin5v1ay94hzr1v1lyiyc9h"
+ "commit": "f8a01beda6260bd2eff3f9fe154ddc16da7b6504",
+ "sha256": "1xwmg85211s6fvc9agb8ib06klbk6cn890gpjq33bns6ldjsq41s"
},
"stable": {
"version": [
0,
2,
- 2
+ 3
],
"deps": [
"cl-lib"
],
- "commit": "5ff0c8bc0b99b28d6c696e56cd7f44c7aa9ccaf1",
- "sha256": "00dc0b0kj8215z14brwmzryb73w1j82r136a03n3pnczfh2l9z4n"
+ "commit": "eb2b629c885ca002b7225e20d03231835910d6be",
+ "sha256": "0b6z516lwcl08gnhlw99z9sdw15qxk3kanicpp0l0hcbmzann46k"
}
},
{
@@ -102205,32 +104395,26 @@
"repo": "pashinin/workgroups2",
"unstable": {
"version": [
- 20200516,
- 1451
+ 20200729,
+ 852
],
"deps": [
- "anaphora",
- "cl-lib",
- "dash",
- "f"
+ "dash"
],
- "commit": "239a5a3ba3b210be5d8fe527546d09241bd3185c",
- "sha256": "16lzv61scc1iq1vsbfvyzla91cnxh5a7s84wx3x3kq9jggzh6hbs"
+ "commit": "737306531f6834227eee2f63b197a23401003d23",
+ "sha256": "0f16a4zz5havxbadiv4h6msa30c1yfdkfk56gic5wapz4i26z3x7"
},
"stable": {
"version": [
1,
2,
- 0
+ 1
],
"deps": [
- "anaphora",
- "cl-lib",
- "dash",
- "f"
+ "dash"
],
- "commit": "928d509157ec8a4a2e343b6115dff034c3243a7a",
- "sha256": "0prj2b33h6rya7y9ff91r72bva1y6hg0sv9l11bn1gikmc6lc18n"
+ "commit": "737306531f6834227eee2f63b197a23401003d23",
+ "sha256": "0f16a4zz5havxbadiv4h6msa30c1yfdkfk56gic5wapz4i26z3x7"
}
},
{
@@ -102348,14 +104532,14 @@
"repo": "joostkremers/writeroom-mode",
"unstable": {
"version": [
- 20200427,
- 2319
+ 20200519,
+ 37
],
"deps": [
"visual-fill-column"
],
- "commit": "7f7acde5e8fc4ba74e511ca295e21f9ba7874730",
- "sha256": "01rc7v2kg1h3cc06qa521mx9kvdxpw2b5hg12skh9gq1v5q1pbv9"
+ "commit": "8a226a31a12a9203067094774ba6fd6175793e70",
+ "sha256": "1wb8lkza1a6yfgpwqlc78iq7b5hamss9lak2alwmp9j9aiwys1n0"
},
"stable": {
"version": [
@@ -102454,20 +104638,20 @@
"repo": "redguardtoo/wucuo",
"unstable": {
"version": [
- 20200516,
- 1526
+ 20200710,
+ 932
],
- "commit": "49d2ae558068954eb8c4324b8ee7a6b2b0a00ef9",
- "sha256": "1zr9fp4y9459y97zh4dj6109wwk6lj7sjfffwapyjmirnpfkxirk"
+ "commit": "54143769dbea06d34792687eadbc6c7a1cd89ea2",
+ "sha256": "1a6jy8vixc6ls6cjwxjy3ifmiw8xw3c0kfichgd1b6v20xqdvhh3"
},
"stable": {
"version": [
0,
- 1,
- 2
+ 2,
+ 6
],
- "commit": "49d2ae558068954eb8c4324b8ee7a6b2b0a00ef9",
- "sha256": "1zr9fp4y9459y97zh4dj6109wwk6lj7sjfffwapyjmirnpfkxirk"
+ "commit": "54143769dbea06d34792687eadbc6c7a1cd89ea2",
+ "sha256": "1a6jy8vixc6ls6cjwxjy3ifmiw8xw3c0kfichgd1b6v20xqdvhh3"
}
},
{
@@ -102578,11 +104762,11 @@
"repo": "xahlee/xah-css-mode",
"unstable": {
"version": [
- 20200309,
- 1750
+ 20200627,
+ 1652
],
- "commit": "43dbab2b8c35bd6892fe80bf064b41bd731545ff",
- "sha256": "0m6l2k22pfcp6s3dadm3w1mr7ar590xl64zjsr0dl9d8spc6gbz1"
+ "commit": "98e550db52865d6de141d5bbb85f8b4e68b56b39",
+ "sha256": "0km4b9praqpkv4n6sixmxjfvisp5640zyd1x85q43vkxrm39p7ah"
}
},
{
@@ -102593,11 +104777,11 @@
"repo": "xahlee/xah-elisp-mode",
"unstable": {
"version": [
- 20190125,
- 646
+ 20200719,
+ 1648
],
- "commit": "a09c51e450bf4b39bdc3f4063c2946baec7ae3b1",
- "sha256": "0hpdm6qns2i5zpavqq6zd7dyl9lxsxyic52jzjfisqv3gjrz8zpp"
+ "commit": "a051862622c56b7cad2057a95d8201ab38b50752",
+ "sha256": "00kan9rb133mf11qq0grdkph6ghv0hgwvdx3b21890mad20zmk1w"
}
},
{
@@ -102623,11 +104807,11 @@
"repo": "xahlee/xah-fly-keys",
"unstable": {
"version": [
- 20200427,
- 1357
+ 20200707,
+ 1310
],
- "commit": "17319a5e5514a61564c7314cb65b7d825ca0bb0f",
- "sha256": "1y5g89kl1lbwzxmgah06z6iisj55l089q25n9dbxmwnklsxpbicw"
+ "commit": "8c9c4df25e1406b093a32c87da19803337e4e09c",
+ "sha256": "10d1xvyd2mbvhmlf1x5snqn4d22xg0p53nq601s8b4f1gws6zs59"
}
},
{
@@ -102772,11 +104956,11 @@
"repo": "nhojb/xcode-project",
"unstable": {
"version": [
- 20181025,
- 1244
+ 20200810,
+ 2010
],
- "commit": "0bf9a4230fab7830350c750c39beda99ef74d72f",
- "sha256": "0746f2niclmlx90skvdb1xdac0nqj8a9pd9ap8n89ckb5r6f9hbg"
+ "commit": "11743f0a2212c840a108e1b905b1f20afcff8156",
+ "sha256": "1vj1xshdsff5xrgmp6c46q2ipglq4wy25mq51rnhv57f0r1wq62n"
},
"stable": {
"version": [
@@ -102811,6 +104995,30 @@
"sha256": "0w2bxrnidladpzrd82z3w3gvjhajs71k5vjk2y03r09i9fwn2ykc"
}
},
+ {
+ "ename": "xenops",
+ "commit": "605c8ca551d54c79246310bcee678cdd854548b0",
+ "sha256": "0l9pwjbdyfs2mkp2n9xg16pv02y063l92302fmi0h8rwra81xrvv",
+ "fetcher": "github",
+ "repo": "dandavison/xenops",
+ "unstable": {
+ "version": [
+ 20200730,
+ 1646
+ ],
+ "deps": [
+ "aio",
+ "auctex",
+ "avy",
+ "dash",
+ "dash-functional",
+ "f",
+ "s"
+ ],
+ "commit": "78cbe16b74480ac6304865c9c3cfad36b5d49d1d",
+ "sha256": "1rpcckp60pw1blkxs7wlp60pvpr847b6g2rcd6p0hpf5sx9wirgv"
+ }
+ },
{
"ename": "xkcd",
"commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -102905,10 +105113,10 @@
},
{
"ename": "xml-rpc",
- "commit": "547d773e07d6229d2135d1b081b5401039ffad39",
- "sha256": "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "08nx1a6v7b53zl1wgcypankdwqdgqcljwmzgrrd00ibi59nbfi4l",
"fetcher": "github",
- "repo": "hexmode/xml-rpc-el",
+ "repo": "xml-rpc-el/xml-rpc-el",
"unstable": {
"version": [
20181002,
@@ -102921,10 +105129,10 @@
"version": [
1,
6,
- 12
+ 13
],
- "commit": "0ab093d60140d19e31d217c8abdc7dbdac944486",
- "sha256": "0g52bmamcd54acyk6i47ar5jawad6ycvm9g656inb994wprnjin9"
+ "commit": "8f624f8b964e9145acb504e4457c9510e87dd93c",
+ "sha256": "0xa54z52rsfl3n0xgmbycj4zazp8ksgdwcq56swzs6wp72zlalmj"
}
},
{
@@ -102958,19 +105166,19 @@
"repo": "ndw/xmlunicode",
"unstable": {
"version": [
- 20191124,
- 2312
+ 20200812,
+ 747
],
- "commit": "80f30becf860db4277e71e3445994fccaf35ba98",
- "sha256": "0vs8l739104s3zqmqna4m0n0pkz4m04mivx6r9iqdjmg4khh6bfi"
+ "commit": "8ae84ded4341aaa303903b4da142ef3ea456391e",
+ "sha256": "0ki8i41jkkzk791dg5wvpl6nfa4py2bfcs6lf3wmw8y768vx6mbg"
},
"stable": {
"version": [
1,
- 21
+ 22
],
- "commit": "80f30becf860db4277e71e3445994fccaf35ba98",
- "sha256": "0vs8l739104s3zqmqna4m0n0pkz4m04mivx6r9iqdjmg4khh6bfi"
+ "commit": "852bcbd0bd014f62c41ac78648e4f6664209b40b",
+ "sha256": "03b18jhfpbhkaq5fj30k6drwpcpvrb6gf1l43ja1mnqyrilvni2x"
}
},
{
@@ -103106,11 +105314,11 @@
"repo": "atomontage/xterm-color",
"unstable": {
"version": [
- 20200514,
- 1932
+ 20200605,
+ 2017
],
- "commit": "3d1a24ca84d26ad4507a79260107b010a1d6886b",
- "sha256": "1qppbf4jidq6q8c7gby0syp4560xqc3kzgbdgdwl1jc5k08ln3cl"
+ "commit": "b9b1f84fb10fff5261702e38bf15b3ae75a4b6bb",
+ "sha256": "0mb5a1g7sby3v4gaqgg9w3lr5albd99mj3kd2bgga7h7kbcjfp5a"
},
"stable": {
"version": [
@@ -103185,6 +105393,29 @@
"sha256": "04j4xwcdxlnrwxs89605zmwxszbi2j0z67v80651pshgnhj5p19i"
}
},
+ {
+ "ename": "xwidgets-reuse",
+ "commit": "dada661402d2f3c9c4bcea8c41ebd926f8b26748",
+ "sha256": "08v2377h2f8yjav7icv0372d1h1wbjqsqnb57x0rwbivxwlb0ijy",
+ "fetcher": "github",
+ "repo": "lordpretzel/xwidgets-reuse",
+ "unstable": {
+ "version": [
+ 20200817,
+ 147
+ ],
+ "commit": "5d56472dda53e43e0a11edcd373b44c0dbab47ce",
+ "sha256": "1b85x1yhgip4g3kv1sdwf3zmi91w6m5xbmm6zzl84w67wqfmnqlz"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 2
+ ],
+ "commit": "3f95d81bfce1b3c52f9dcf2890cd2559a5287a33",
+ "sha256": "1i6g4n2pnp3r0pyn4p6xryh0x44lyvazy8kc1bfrzwzf6py9wmq0"
+ }
+ },
{
"ename": "xwwp",
"commit": "83c34ae5023410cc31f93255275d6465b6152a10",
@@ -103373,11 +105604,11 @@
"repo": "yoshiki/yaml-mode",
"unstable": {
"version": [
- 20200512,
- 2141
+ 20200725,
+ 1836
],
- "commit": "0b33131664719c61f834e77ff3b91ded3de2cd3b",
- "sha256": "0ig5hpk0wb46yz6gml6g7x9am0l3cay1bzxldms0g2qjh5swxrq4"
+ "commit": "68fecb5f0dec712a10c8655df6881392a4613617",
+ "sha256": "11lasdsray1cy01m4yiklin2apgfk2bac93m2ii88vjlv6b6vv04"
},
"stable": {
"version": [
@@ -103577,26 +105808,26 @@
"repo": "emacsorphanage/yascroll",
"unstable": {
"version": [
- 20200224,
- 1117
+ 20200701,
+ 336
],
"deps": [
"cl-lib"
],
- "commit": "b298a34ae872a45c3e83d29d33888abde59c185b",
- "sha256": "1pnynyy3scrd15q4ag769af5njrxx6rw48svbsfx3xrz1n0x9snz"
+ "commit": "9e828920d1931da66a473a66019922b9c3b729f5",
+ "sha256": "0cixj0swz322p7dghghbrasziygbzmn2ikcfiyrjar6bzh1mha9b"
},
"stable": {
"version": [
0,
1,
- 7
+ 9
],
"deps": [
"cl-lib"
],
- "commit": "784ebb0ee5496b5e7762bfd4c8101166542cb90d",
- "sha256": "1k9y319ny01yqkg1xsh4rh2xs3dpx5jgvhs17p4c4dvqm0g53mkm"
+ "commit": "9e828920d1931da66a473a66019922b9c3b729f5",
+ "sha256": "0cixj0swz322p7dghghbrasziygbzmn2ikcfiyrjar6bzh1mha9b"
}
},
{
@@ -103607,14 +105838,14 @@
"repo": "joaotavora/yasnippet",
"unstable": {
"version": [
- 20200413,
- 2221
+ 20200604,
+ 246
],
"deps": [
"cl-lib"
],
- "commit": "5b1217ab085fab4abeb1118dccb260691b446703",
- "sha256": "0486kd8brxwmbmw9bjf0p9i99dyl17hbc5aa03z7psqqlsw713mx"
+ "commit": "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6",
+ "sha256": "1cp1sgmfc8pgcy24l77aam833710mjp2y3m8l8c90677wxqr44vl"
},
"stable": {
"version": [
@@ -103637,14 +105868,14 @@
"repo": "leanprover-community/yasnippet-lean",
"unstable": {
"version": [
- 20190922,
- 2037
+ 20200526,
+ 326
],
"deps": [
"yasnippet"
],
- "commit": "9119be08a32286d3e8559138e8ae003856ae1c0a",
- "sha256": "1q06c574zn0ibbb3zbgi59zxj17i7kyjkcz45sj5h7hbn9l81594"
+ "commit": "e0933f55d59da5425d0604bdcdbbf3cb85967563",
+ "sha256": "0h64h47qdv3c20g9hlys2xb4w2jby7pdfhaza52y48wayz6vhpnx"
}
},
{
@@ -103655,25 +105886,27 @@
"repo": "AndreaCrotti/yasnippet-snippets",
"unstable": {
"version": [
- 20200508,
- 936
+ 20200802,
+ 1658
],
"deps": [
+ "s",
"yasnippet"
],
- "commit": "ab3c20483a39742d7c612bc006d09aa8ffa3186d",
- "sha256": "16gzc33qlmgbp9hq5c3bbv24b136ai23h3v0b2f9rr2xy9ln3ccz"
+ "commit": "b83c0f2f3bd068aa93c8f4c0c07f0b0a137d9cda",
+ "sha256": "0j1955y6gc3ddv783pd9kx834vvicpdsj49smkkpk4rj4s7pfxkz"
},
"stable": {
"version": [
0,
- 22
+ 23
],
"deps": [
+ "s",
"yasnippet"
],
- "commit": "e51a259527d685fe767b6ec951ad1940b1131a69",
- "sha256": "1xcmx0frialb86z5adi07b6skqks326w3v1xn49c54gxim027i5d"
+ "commit": "e5ebfcdb38eb79a6d6705107d07f7bab2e2b5c38",
+ "sha256": "18pcnjnqvcky6i49p38vy3ms5xiisn27vy47pc3vsgr3r2n87mqb"
}
},
{
@@ -103684,14 +105917,14 @@
"repo": "mineo/yatemplate",
"unstable": {
"version": [
- 20200108,
- 2102
+ 20200625,
+ 1336
],
"deps": [
"yasnippet"
],
- "commit": "bfee45cfc179d6b7fbc3ff06c9f79b76dc7fbf58",
- "sha256": "0h2fc9vjwb94n3nklq35s3dy9i4ihrqffp2556cmsaq7gzlipb81"
+ "commit": "23865adaee824db44acec8a4366ce2f29dd2e978",
+ "sha256": "0ri0kw70yy6mm17drpw5sifscaan3f32fj3xapa0hbz5jxrs9cr9"
},
"stable": {
"version": [
@@ -103904,12 +106137,31 @@
"sha256": "0cd77m4zyqs74iz56l4h0k7ccxnxhis0247j4f5mf94s51fn1x7p"
}
},
+ {
+ "ename": "ynab",
+ "commit": "20a365e48ed200afadae01c096d1ea669e9c1938",
+ "sha256": "0in7blx21kv01vbwkrmvcl4n07vm4wmxkbv3l78s9xrri66i3nvf",
+ "fetcher": "github",
+ "repo": "janders223/ynab.el",
+ "unstable": {
+ "version": [
+ 20200607,
+ 2008
+ ],
+ "deps": [
+ "cl-lib",
+ "ts"
+ ],
+ "commit": "2c6beb4d2c4996017f6b3c62c26db52a61e5c479",
+ "sha256": "07bb1hlya07p6s6ymjl3vfv99xln3vrp78h4sda5va52vj1935rs"
+ }
+ },
{
"ename": "yoficator",
- "commit": "5156f01564978718dd99ab3a54f19b6512de5c3c",
- "sha256": "0b6lv6wk5ammhb9rws9kig02wkm84i5avm7a1vd4sb7wkgm9nj9r",
+ "commit": "a3422f4918992343fcace1a3024be59a5d2ed8e5",
+ "sha256": "0v8hv2bqa9bl6cmfz8l9v72a6z1c2b3i1hjgbj38w9hdjvb2qad6",
"fetcher": "gitlab",
- "repo": "link2xt/yoficator",
+ "repo": "alx.k/yoficator",
"unstable": {
"version": [
20190509,
@@ -103951,8 +106203,8 @@
"repo": "xuchunyang/youdao-dictionary.el",
"unstable": {
"version": [
- 20200429,
- 259
+ 20200722,
+ 1705
],
"deps": [
"chinese-word-at-point",
@@ -103960,8 +106212,8 @@
"popup",
"pos-tip"
],
- "commit": "bd839711e3cf6d3eb9c308cea5694369a440899e",
- "sha256": "12r6avj1mxjj46s2p6kwhixhkinkm9krd62sy9ji7v9np2gqf7ll"
+ "commit": "8a4815a43565b9bfd257246e4895b8bfafb9d573",
+ "sha256": "0h8hgq76ja3fjrn8vsndkzvns4ar13qsydcrqjsj77jqw9kx9a43"
},
"stable": {
"version": [
@@ -103977,19 +106229,53 @@
"sha256": "1m4zri7kiw70062w2sp4fdqmmx2vmjisamjwmjdg6669dzvnpawq"
}
},
+ {
+ "ename": "ytdl",
+ "commit": "3531012169cb78d00cdf89fa54a7aff684200083",
+ "sha256": "0s2ngslz6l4mkib09inv5r4g122jsnyiyh9ijjb27y3pr48cj23d",
+ "fetcher": "gitlab",
+ "repo": "tuedachu/ytdl",
+ "unstable": {
+ "version": [
+ 20200727,
+ 1824
+ ],
+ "deps": [
+ "async",
+ "dash",
+ "transient"
+ ],
+ "commit": "2d617ed1cc0be35158411f897e4156c20ff6565f",
+ "sha256": "1fhbg0l6xrayqssl1xqjdgymdggpsvig73pwl4k9pjifaria2fbm"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 3,
+ 4
+ ],
+ "deps": [
+ "async",
+ "dash",
+ "transient"
+ ],
+ "commit": "2d617ed1cc0be35158411f897e4156c20ff6565f",
+ "sha256": "1fhbg0l6xrayqssl1xqjdgymdggpsvig73pwl4k9pjifaria2fbm"
+ }
+ },
{
"ename": "ytel",
- "commit": "ec52f03658dca774daf7301e81edb20aedf03c10",
- "sha256": "0adxiw83rah9hln3k8gm6s7ks3xpqfknypjb9j51lxcabc7c1677",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "0xafyxqps4dp44b4jmm69fa5d24df3fkyim7wa9ddgxkcqfl3mpx",
"fetcher": "github",
- "repo": "grastello/ytel",
+ "repo": "gRastello/ytel",
"unstable": {
"version": [
- 20200510,
- 1405
+ 20200725,
+ 1056
],
- "commit": "828323f9acb654d8f61ccbca510b471fb00879ee",
- "sha256": "1zixqicpdywzdc2pkx9h08y3kphmn9zcx44bj2rqg3h8xsmjayk5"
+ "commit": "d80c7964ec66589d5580fc13773e94f1834ab76f",
+ "sha256": "124pvj39lcv3dfz2m42qyydyab0xk6c5da54ffhrqbg8vri34w9w"
}
},
{
@@ -104078,11 +106364,20 @@
"repo": "zenlang/zen-mode",
"unstable": {
"version": [
- 20191224,
- 706
+ 20200609,
+ 822
+ ],
+ "commit": "c1b1806358f3cce6c04b30699987d82dc7d42559",
+ "sha256": "1ikny9lxvg8whcl2x0gmr31fdv93vwf53niqr11cx93bfsvs4a9z"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 8,
+ 20200609
],
- "commit": "3d34bce20c1d7d35b99916672ea0dd67a96c7716",
- "sha256": "1ykc58imkrhk4ib8mdgs7q7qrjbj84bm0rgfpgqk0dkfy16daj2q"
+ "commit": "c1b1806358f3cce6c04b30699987d82dc7d42559",
+ "sha256": "1ikny9lxvg8whcl2x0gmr31fdv93vwf53niqr11cx93bfsvs4a9z"
}
},
{
@@ -104093,11 +106388,11 @@
"repo": "bbatsov/zenburn-emacs",
"unstable": {
"version": [
- 20200305,
- 737
+ 20200701,
+ 1333
],
- "commit": "7dd796840376342426f60018a6cf209228452f3e",
- "sha256": "0zzg95sifg6ybh3ava67z688fycklqragkr3baxlhl2jfnwsps2l"
+ "commit": "c09dbd9a36bbc0062b90be182f2b4cac64128cee",
+ "sha256": "0lr73kghsi1f5awhgsbvh4snkbdkkpjn5bwf6s6ypbybmjf6kjxd"
},
"stable": {
"version": [
@@ -104246,20 +106541,21 @@
},
{
"ename": "zetteldeft",
- "commit": "c643adaf73e8324092874887636cdf0365c481ee",
- "sha256": "1vd70mrwn9cfalmiv97ja79hbdmyl5bm9cqsz5c276gk6v6pzvpc",
+ "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b",
+ "sha256": "05l2ljip5n9pcpcc1qm4m6ii86xs3dk94an1cigiw5is4qi8rhpl",
"fetcher": "github",
- "repo": "efls/zetteldeft",
+ "repo": "EFLS/zetteldeft",
"unstable": {
"version": [
- 20200516,
- 1108
+ 20200812,
+ 2159
],
"deps": [
+ "ace-window",
"deft"
],
- "commit": "f3503ec8fde88d733b7bbbd4431e85de396a3fe8",
- "sha256": "0843k0i6szjvc7f51q0pm7vmxpfz68911d75m75rg54k1jbynazq"
+ "commit": "2c4ddbf3e30e2f3ae6e877e08fd824b325fa7a62",
+ "sha256": "029fh32d2vilxlqs5jl3wc907ykxdkv36jjfzappyghd1qkp0iyi"
},
"stable": {
"version": [
@@ -104273,6 +106569,38 @@
"sha256": "0y709x03har1sm30vbja3k3vw4p1nfck5zii7cigl4vg0scpcri6"
}
},
+ {
+ "ename": "zetz-mode",
+ "commit": "ad2add185cf31a92ca1fcd3a9efcbcdb0aa9e583",
+ "sha256": "0k30c0f2h96vvb8yacpg710gi64swwslm1gljpzcwxni5kdpqkzm",
+ "fetcher": "github",
+ "repo": "damon-kwok/zetz-mode",
+ "unstable": {
+ "version": [
+ 20200812,
+ 957
+ ],
+ "deps": [
+ "dash",
+ "hydra"
+ ],
+ "commit": "3bd2cdb4f6c6e8400d58fa1001d0513e39ce38bb",
+ "sha256": "0v1aa0hr607afxd03p44m1abx2c8a5k91i047q7nv8sv0cd65ack"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
+ ],
+ "deps": [
+ "dash",
+ "hydra"
+ ],
+ "commit": "03a566b213e52da540818559f1b7bbb8400abb88",
+ "sha256": "1lv1psprhn2fr5knnapa11dc8dz5zh699s8k3ldkgm6a6adkms7n"
+ }
+ },
{
"ename": "zig-mode",
"commit": "6440f81aed1fcddcaf7afeedb74520e605211986",
@@ -104281,11 +106609,11 @@
"repo": "ziglang/zig-mode",
"unstable": {
"version": [
- 20200322,
- 131
+ 20200713,
+ 407
],
- "commit": "fc7fde327f45533bb73be643e7bda1eda10394b6",
- "sha256": "1ld34xs25bysxw9ialrlm6pnp5qbzx94zbb3594ghc2ggz5ph5d5"
+ "commit": "d88580913586b8749ed0ac3ae228e825a68f9412",
+ "sha256": "0r3cn6yxs013080il91x9b6fyx84bx3vzv7vkyr8npc2cz46klxs"
}
},
{
@@ -104310,6 +106638,24 @@
"sha256": "14dmda7ahnflv0db9yzssz7bidz3zsdnxxwnby0y48vcjv94nnl5"
}
},
+ {
+ "ename": "zimports",
+ "commit": "c19dd3c0cb18bb429a0aaf834555869b98fda349",
+ "sha256": "19rhl9v4k0nxy8lsc1imjar2ib0g6slma5crzxjbminjjqnp5c3s",
+ "fetcher": "github",
+ "repo": "schmir/zimports.el",
+ "unstable": {
+ "version": [
+ 20200606,
+ 1700
+ ],
+ "deps": [
+ "projectile"
+ ],
+ "commit": "a96e9b993c9aaccf1fd07c8fddfc247c4e07618c",
+ "sha256": "1bzfdwyc4aybvnh20q7ypghpi3zrhhs0v8488lksjl26j23mhrwk"
+ }
+ },
{
"ename": "zlc",
"commit": "cae2ac3513e371a256be0f1a7468e38e686c2487",
@@ -104506,20 +106852,20 @@
"repo": "cyrus-and/zoom",
"unstable": {
"version": [
- 20200106,
- 1204
+ 20200708,
+ 1105
],
- "commit": "a54324344eca49cfb11626446e1ebe239cba6557",
- "sha256": "01ycz8496ywb2d980hxpvlnzxw5012mrj8kh8d97vdclhdbkx0y1"
+ "commit": "a373e7eed59ad93315e5ae88c816ca70404d2d34",
+ "sha256": "0dmpin0rlwib659s3g7qp48qmma50amj7zdk281b4j0bl6p3zkyc"
},
"stable": {
"version": [
0,
2,
- 2
+ 3
],
- "commit": "578295532fb1c4ad2a2e95894e65cce02f812b54",
- "sha256": "1qcni15mps7w9waail21x0fy2rrd5y8cm4yzi8rs2ar4vqrjbyyp"
+ "commit": "85694c9baa99bcf247528a6743383a3a1e5323fe",
+ "sha256": "1xckqfkrx95b2bfdczz90y0b23bghlqkp2k5ml59ai2drb96l17h"
}
},
{
@@ -104574,24 +106920,6 @@
"sha256": "14waf3g7b92k3qd5088w4pn0wcspxjfkbswlzf7nnkjliw1yh0kf"
}
},
- {
- "ename": "zossima",
- "commit": "b7566fe6fffc38981ea33582d783c58f3842fe28",
- "sha256": "11kmnbqv4s8arindg7cxcdhbvfxsckks332wn7aiyb3bjhcgzwjb",
- "fetcher": "github",
- "repo": "technomancy/zossima",
- "unstable": {
- "version": [
- 20121124,
- 35
- ],
- "deps": [
- "inf-ruby"
- ],
- "commit": "991676635c374d2a12714dcf48c1ce2d6f97a375",
- "sha256": "0fgwxw7r3zfv0b7xi8bx7kxff2r5hdw9gxf16kwq04fnh18nhi39"
- }
- },
{
"ename": "zotelo",
"commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44",
@@ -104717,11 +107045,11 @@
"repo": "pesterhazy/zprint-mode.el",
"unstable": {
"version": [
- 20191130,
- 1829
+ 20200731,
+ 1238
],
- "commit": "4d0dd23b40155618181d9d1e4c82849e0d73b659",
- "sha256": "0im63h7ang7zypzbf45k5pxz11svyyk8pab9d4qg9jsb7bz9v7k0"
+ "commit": "b9b72b4918156f2f44aa544be9e19ea391937c2a",
+ "sha256": "1jvk8g8qc83y6pmklk403mikl6q3s6gls60fyw07p8f3kvhgfxzi"
}
},
{
@@ -104796,8 +107124,8 @@
"avy",
"cl-lib"
],
- "commit": "09613d53e1e6e7c58102fb8812bbef2121d57026",
- "sha256": "1rfi7gp5z2lm71qrf9akkn8iiiv297i1mqkvwyv7vlhx5vk21r4s"
+ "commit": "b0a50b8cb6925c3184405f81be9ef9be9da69f09",
+ "sha256": "003rg7x1vfv946j1m6yalzsgr88wvm3443pqf9yqwnzl2a3djq0g"
},
"stable": {
"version": [
diff --git a/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/pkgs/applications/editors/emacs-modes/updater-emacs.nix
index 518ee67e45120..b5de993eaa766 100644
--- a/pkgs/applications/editors/emacs-modes/updater-emacs.nix
+++ b/pkgs/applications/editors/emacs-modes/updater-emacs.nix
@@ -1,7 +1,7 @@
let
pkgs = import ../../../.. {};
- emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs26).emacsWithPackages (epkgs: let
+ emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: let
promise = epkgs.trivialBuild {
pname = "promise";
diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix
deleted file mode 100644
index 5bc29a046bc5d..0000000000000
--- a/pkgs/applications/editors/emacs/25.nix
+++ /dev/null
@@ -1,146 +0,0 @@
-{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, fetchpatch
-, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
-, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
-, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO
-, withX ? !stdenv.isDarwin
-, withGTK2 ? false, gtk2 ? null
-, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
-, withXwidgets ? false, webkitgtk, wrapGAppsHook ? null, glib-networking ? null
-, withCsrc ? true
-, autoconf ? null, automake ? null, texinfo ? null
-}:
-
-assert (libXft != null) -> libpng != null; # probably a bug
-assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
-assert withGTK2 -> withX || stdenv.isDarwin;
-assert withGTK3 -> withX || stdenv.isDarwin;
-assert withGTK2 -> !withGTK3 && gtk2 != null;
-assert withGTK3 -> !withGTK2 && gtk3 != null;
-assert withXwidgets -> withGTK3 && webkitgtk != null;
-
-let
- toolkit =
- if withGTK2 then "gtk2"
- else if withGTK3 then "gtk3"
- else "lucid";
-in
-stdenv.mkDerivation rec {
- name = "emacs-${version}${versionModifier}";
- version = "25.3";
- versionModifier = "";
-
- src = fetchurl {
- url = "mirror://gnu/emacs/${name}.tar.xz";
- sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
- };
-
- enableParallelBuilding = true;
-
- patches = lib.optionals stdenv.isDarwin [
- ./at-fdcwd.patch
-
- # Backport of the fix to
- # https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html
- # Should be removed when switching to Emacs 26.1
- (fetchurl {
- url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch";
- sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj";
- })
- ] ++ [
- # Backport patches so we can use webkitgtk with xwidgets.
- (fetchpatch {
- name = "0001-Omit-unnecessary-includes-from-xwidget-c.patch";
- url = "https://github.com/emacs-mirror/emacs/commit/a36ed9b5e95afea5716256bac24d883263aefbaf.patch";
- sha256 = "1j34c0vkj87il87xy1px23yk6bw73adpr7wqa79ncj89i4lc8qkb";
- })
- (fetchpatch {
- name = "0002-xwidget-Use-WebKit2-API.patch";
- url = "https://github.com/emacs-mirror/emacs/commit/d781662873f228b110a128f7a2b6583a4d5e0a3a.patch";
- sha256 = "1lld56zi4cw2hmjxhhdcc0f07k8lbj32h10wcq4ml3asdwa31ryr";
- })
- ];
-
- nativeBuildInputs = [ pkgconfig autoconf automake texinfo ]
- ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
-
- buildInputs =
- [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
- ++ lib.optionals stdenv.isLinux [ dbus libselinux ]
- ++ lib.optionals withX
- [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
- imagemagick gconf ]
- ++ lib.optional (withX && withGTK2) gtk2
- ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
- ++ lib.optional (stdenv.isDarwin && withX) cairo
- ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ]
- ++ lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
-
- hardeningDisable = [ "format" ];
-
- configureFlags = [ "--with-modules" ] ++
- (if stdenv.isDarwin
- then [ "--with-ns" "--disable-ns-self-contained" ]
- else if withX
- then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
- else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
- "--with-gif=no" "--with-tiff=no" ])
- ++ lib.optional withXwidgets "--with-xwidgets";
-
- preConfigure = ''
- ./autogen.sh
- '' + ''
- substituteInPlace lisp/international/mule-cmds.el \
- --replace /usr/share/locale ${gettext}/share/locale
-
- for makefile_in in $(find . -name Makefile.in -print); do
- substituteInPlace $makefile_in --replace /bin/pwd pwd
- done
- '';
-
- installTargets = [ "tags" "install" ];
-
- postInstall = ''
- mkdir -p $out/share/emacs/site-lisp
- cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
- $out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el
-
- rm -rf $out/var
- rm -rf $out/share/emacs/${version}/site-lisp
- '' + lib.optionalString withCsrc ''
- for srcdir in src lisp lwlib ; do
- dstdir=$out/share/emacs/${version}/$srcdir
- mkdir -p $dstdir
- find $srcdir -name "*.[chm]" -exec cp {} $dstdir \;
- cp $srcdir/TAGS $dstdir
- echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el
- done
- '' + lib.optionalString stdenv.isDarwin ''
- mkdir -p $out/Applications
- mv nextstep/Emacs.app $out/Applications
- '';
-
- meta = with stdenv.lib; {
- description = "The extensible, customizable GNU text editor";
- homepage = "https://www.gnu.org/software/emacs/";
- license = licenses.gpl3Plus;
- maintainers = with maintainers; [ lovek323 peti jwiegley ];
- platforms = platforms.all;
-
- longDescription = ''
- GNU Emacs is an extensible, customizable text editor—and more. At its
- core is an interpreter for Emacs Lisp, a dialect of the Lisp
- programming language with extensions to support text editing.
-
- The features of GNU Emacs include: content-sensitive editing modes,
- including syntax coloring, for a wide variety of file types including
- plain text, source code, and HTML; complete built-in documentation,
- including a tutorial for new users; full Unicode support for nearly all
- human languages and their scripts; highly customizable, using Emacs
- Lisp code or a graphical interface; a large number of extensions that
- add other functionality, including a project planner, mail and news
- reader, debugger interface, calendar, and more. Many of these
- extensions are distributed with GNU Emacs; others are available
- separately.
- '';
- };
-}
diff --git a/pkgs/applications/editors/emacs/26.nix b/pkgs/applications/editors/emacs/26.nix
new file mode 100644
index 0000000000000..a151006a995de
--- /dev/null
+++ b/pkgs/applications/editors/emacs/26.nix
@@ -0,0 +1,8 @@
+import ./generic.nix (rec {
+ version = "26.3";
+ sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d";
+ patches = [
+ ./clean-env-26.patch
+ ./tramp-detect-wrapped-gvfsd-26.patch
+ ];
+})
diff --git a/pkgs/applications/editors/emacs/27.nix b/pkgs/applications/editors/emacs/27.nix
new file mode 100644
index 0000000000000..1037c0cd91dc9
--- /dev/null
+++ b/pkgs/applications/editors/emacs/27.nix
@@ -0,0 +1,8 @@
+import ./generic.nix (rec {
+ version = "27.1";
+ sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a";
+ patches = [
+ ./clean-env.patch
+ ./tramp-detect-wrapped-gvfsd.patch
+ ];
+})
diff --git a/pkgs/applications/editors/emacs/clean-env-26.patch b/pkgs/applications/editors/emacs/clean-env-26.patch
new file mode 100644
index 0000000000000..88befda899a76
--- /dev/null
+++ b/pkgs/applications/editors/emacs/clean-env-26.patch
@@ -0,0 +1,15 @@
+Dump temacs in an empty environment to prevent -dev paths from ending
+up in the dumped image.
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -535,7 +535,7 @@ ifeq ($(CANNOT_DUMP),yes)
+ ln -f temacs$(EXEEXT) $@
+ else
+ unset EMACS_HEAP_EXEC; \
+- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
++ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
+ ifneq ($(PAXCTL_dumped),)
+ $(PAXCTL_dumped) $@
+ endif
diff --git a/pkgs/applications/editors/emacs/clean-env.patch b/pkgs/applications/editors/emacs/clean-env.patch
index 88befda899a76..2ffe8b777a00f 100644
--- a/pkgs/applications/editors/emacs/clean-env.patch
+++ b/pkgs/applications/editors/emacs/clean-env.patch
@@ -2,14 +2,15 @@ Dump temacs in an empty environment to prevent -dev paths from ending
up in the dumped image.
diff --git a/src/Makefile.in b/src/Makefile.in
+index fd05a45df5..13f529c253 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -535,7 +535,7 @@ ifeq ($(CANNOT_DUMP),yes)
- ln -f temacs$(EXEEXT) $@
- else
- unset EMACS_HEAP_EXEC; \
-- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
-+ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
+@@ -570,7 +570,7 @@ emacs$(EXEEXT): temacs$(EXEEXT) \
+ lisp.mk $(etc)/DOC $(lisp) \
+ $(lispsource)/international/charprop.el ${charsets}
+ ifeq ($(DUMPING),unexec)
+- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump
++ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump
ifneq ($(PAXCTL_dumped),)
- $(PAXCTL_dumped) $@
+ $(PAXCTL_dumped) emacs$(EXEEXT)
endif
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/generic.nix
similarity index 88%
rename from pkgs/applications/editors/emacs/default.nix
rename to pkgs/applications/editors/emacs/generic.nix
index b88aa00d42d41..2067d6c77789a 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/generic.nix
@@ -1,3 +1,11 @@
+{
+ version
+ , sha256
+ , versionModifier ? ""
+ , pname ? "emacs"
+ , name ? "emacs-${version}${versionModifier}"
+ , patches ? [ ]
+}:
{ stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm
, Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
@@ -11,7 +19,7 @@
, withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null
, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null
, withCsrc ? true
-, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
+, srcRepo ? false, autoreconfHook ? null, texinfo ? null
, siteStart ? ./site-start.el
, nativeComp ? false
, toolkit ? (
@@ -32,35 +40,31 @@ assert withXwidgets -> withGTK3 && webkitgtk != null;
let
- version = "26.3";
- versionModifier = "";
- name = "emacs-${version}${versionModifier}";
in stdenv.mkDerivation {
- inherit name version;
+ inherit pname version patches;
src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.xz";
- sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d";
+ inherit sha256;
};
enableParallelBuilding = true;
- patches = [
- ./clean-env.patch
- ./tramp-detect-wrapped-gvfsd.patch
- # unbreak macOS unexec
- (fetchpatch {
- url = "https://github.com/emacs-mirror/emacs/commit/888ffd960c06d56a409a7ff15b1d930d25c56089.patch";
- sha256 = "08q3ygdigqwky70r47rcgzlkc5jy82xiq8am5kwwy891wlpl7frw";
- })
- ];
-
postPatch = lib.concatStringsSep "\n" [
(lib.optionalString srcRepo ''
rm -fr .git
'')
+ ''
+ substituteInPlace lisp/international/mule-cmds.el \
+ --replace /usr/share/locale ${gettext}/share/locale
+
+ for makefile_in in $(find . -name Makefile.in -print); do
+ substituteInPlace $makefile_in --replace /bin/pwd pwd
+ done
+ ''
+
# Make native compilation work both inside and outside of nix build
(lib.optionalString nativeComp (let
libPath = lib.concatStringsSep ":" [
@@ -83,7 +87,7 @@ in stdenv.mkDerivation {
LIBRARY_PATH = if nativeComp then "${lib.getLib stdenv.cc.libc}/lib" else "";
nativeBuildInputs = [ pkgconfig makeWrapper ]
- ++ lib.optionals srcRepo [ autoconf automake texinfo ]
+ ++ lib.optionals srcRepo [ autoreconfHook texinfo ]
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
buildInputs =
@@ -112,24 +116,13 @@ in stdenv.mkDerivation {
(if withNS
then [ "--disable-ns-self-contained" ]
else if withX
- then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
+ then [ "--with-x-toolkit=${toolkit}" "--with-xft" "--with-cairo" ]
else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
"--with-gif=no" "--with-tiff=no" ])
++ lib.optional withXwidgets "--with-xwidgets"
++ lib.optional nativeComp "--with-nativecomp"
;
- preConfigure = lib.optionalString srcRepo ''
- ./autogen.sh
- '' + ''
- substituteInPlace lisp/international/mule-cmds.el \
- --replace /usr/share/locale ${gettext}/share/locale
-
- for makefile_in in $(find . -name Makefile.in -print); do
- substituteInPlace $makefile_in --replace /bin/pwd pwd
- done
- '';
-
installTargets = [ "tags" "install" ];
postInstall = ''
diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index 1624e62026af9..3a573504c417e 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -5,20 +5,20 @@
stdenv.mkDerivation rec {
pname = "emacs";
- version = "26.3";
+ version = "27.1";
emacsName = "emacs-${version}";
- macportVersion = "7.7";
+ macportVersion = "8.0";
name = "emacs-mac-${version}-${macportVersion}";
src = fetchurl {
url = "mirror://gnu/emacs/${emacsName}.tar.xz";
- sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d";
+ sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a";
};
macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
- sha256 = "18jadknm47ymbl7skrgc7y8xsdldcbgnlfl7qpgzm1ym8d92as6j";
+ sha256 = "0rjk82k9qp1g701pfd4f0q2myzvsnp9q8xzphlxwi5yzwbs91kjq";
};
hiresSrc = fetchurl {
@@ -76,7 +76,16 @@ stdenv.mkDerivation rec {
cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
'';
- doCheck = true;
+ # fails with:
+
+ # Ran 3870 tests, 3759 results as expected, 6 unexpected, 105 skipped
+ # 5 files contained unexpected results:
+ # lisp/url/url-handlers-test.log
+ # lisp/simple-tests.log
+ # lisp/files-x-tests.log
+ # lisp/cedet/srecode-utest-template.log
+ # lisp/net/tramp-tests.log
+ doCheck = false;
meta = with stdenv.lib; {
description = "The extensible, customizable text editor";
diff --git a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch
new file mode 100644
index 0000000000000..5d16194fd2027
--- /dev/null
+++ b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch
@@ -0,0 +1,14 @@
+diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
+index f370abba31..f2806263a9 100644
+--- a/lisp/net/tramp-gvfs.el
++++ b/lisp/net/tramp-gvfs.el
+@@ -164,7 +164,8 @@ tramp-gvfs-enabled
+ (and (featurep 'dbusbind)
+ (tramp-compat-funcall 'dbus-get-unique-name :system)
+ (tramp-compat-funcall 'dbus-get-unique-name :session)
+- (or (tramp-compat-process-running-p "gvfs-fuse-daemon")
++ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped")
++ (tramp-compat-process-running-p "gvfs-fuse-daemon")
+ (tramp-compat-process-running-p "gvfsd-fuse"))))
+ "Non-nil when GVFS is available.")
+
diff --git a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch
index 5d16194fd2027..5af6fcaba8c01 100644
--- a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch
+++ b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch
@@ -1,14 +1,12 @@
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
-index f370abba31..f2806263a9 100644
+index 34a234c..b5a471c 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
-@@ -164,7 +164,8 @@ tramp-gvfs-enabled
- (and (featurep 'dbusbind)
+@@ -122,6 +122,7 @@
(tramp-compat-funcall 'dbus-get-unique-name :system)
(tramp-compat-funcall 'dbus-get-unique-name :session)
-- (or (tramp-compat-process-running-p "gvfs-fuse-daemon")
-+ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped")
-+ (tramp-compat-process-running-p "gvfs-fuse-daemon")
+ (or (tramp-compat-process-running-p "gvfs-fuse-daemon")
++ (tramp-compat-process-running-p ".gvfsd-fuse-wrapped")
(tramp-compat-process-running-p "gvfsd-fuse"))))
"Non-nil when GVFS is available.")
diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix
index c6089fd5308cd..8343472fa70ac 100644
--- a/pkgs/applications/editors/featherpad/default.nix
+++ b/pkgs/applications/editors/featherpad/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, pkgconfig, qt5, fetchFromGitHub }:
-
-with qt5;
-
-stdenv.mkDerivation rec {
- version = "0.10.0";
+{ stdenv, mkDerivation, pkgconfig, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }:
+mkDerivation rec {
pname = "featherpad";
+ version = "0.10.0";
+
src = fetchFromGitHub {
owner = "tsujan";
repo = "FeatherPad";
rev = "V${version}";
sha256 = "1wrbs6kni9s3x39cckm9kzpglryxn5vyarilvh9pafbzpc6rc57p";
};
+
nativeBuildInputs = [ qmake pkgconfig qttools ];
buildInputs = [ qtbase qtsvg qtx11extras ];
+
meta = with stdenv.lib; {
description = "Lightweight Qt5 Plain-Text Editor for Linux";
homepage = "https://github.com/tsujan/FeatherPad";
diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix
index c6f5a23235a0e..347c5970cae6a 100644
--- a/pkgs/applications/editors/glow/default.nix
+++ b/pkgs/applications/editors/glow/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "1c16s5xiqr36azh2w90wg14jlw67ca2flbgjijpz7qd0ypxyfqlk";
+ doCheck = false;
+
buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ];
meta = with lib; {
diff --git a/pkgs/applications/editors/gophernotes/default.nix b/pkgs/applications/editors/gophernotes/default.nix
new file mode 100644
index 0000000000000..e48ee4dd13c73
--- /dev/null
+++ b/pkgs/applications/editors/gophernotes/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "gophernotes";
+ version = "0.7.1";
+
+ src = fetchFromGitHub {
+ owner = "gopherdata";
+ repo = "gophernotes";
+ rev = "v${version}";
+ sha256 = "0hs92bdrsjqafdkhg2fk3z16h307i32mvbm9f6bb80bgsciysh27";
+ };
+
+ vendorSha256 = "1ylqf1sx0h2kixnq9f3prn3sha43q3ybd5ay57yy5z79qr8zqvxs";
+
+ meta = with lib; {
+ description = "Go kernel for Jupyter notebooks";
+ homepage = "https://github.com/gopherdata/gophernotes";
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix
index 79e0027d50963..9722854b98044 100644
--- a/pkgs/applications/editors/hexdino/default.nix
+++ b/pkgs/applications/editors/hexdino/default.nix
@@ -20,6 +20,5 @@ rustPlatform.buildRustPackage {
homepage = "https://github.com/Luz/hexdino";
license = licenses.mit;
maintainers = [ maintainers.luz ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index a4c0353af5063..fa382cc88362d 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -220,9 +220,6 @@ let
};
}) (attrs: {
patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + ''
- # Patch built-in mono for ReSharperHost to start successfully
- interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
- patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen
rm -rf lib/ReSharperHost/linux-x64/dotnet
mkdir -p lib/ReSharperHost/linux-x64/dotnet/
ln -s ${dotnet-sdk_3}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet
@@ -271,12 +268,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2020.1.2"; /* updated by script */
+ version = "2020.2"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "0q5bnb0rmsgks7brrdpgah83s2ixa4pyhw8jvg9p2g48b582rmf7"; /* updated by script */
+ sha256 = "1j80k6r4nbr8abwkpx78sy3jzq3jsywn2k6g4mjx6h0adwxswymm"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -284,12 +281,12 @@ in
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
- version = "2020.1.5"; /* updated by script */
+ version = "2020.2"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
- sha256 = "0605d772156lzlz5904px2spdijc92yz6rjvmpyg6vk5zv5k2wm9"; /* updated by script */
+ sha256 = "0d0m6v4lr6qhi79csdpcyiyd2hnhlsan9lpnjmhkdxd84i1dl15a"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
update-channel = "DataGrip RELEASE";
@@ -297,12 +294,12 @@ in
goland = buildGoland rec {
name = "goland-${version}";
- version = "2020.1.4"; /* updated by script */
+ version = "2020.2.1"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
- sha256 = "1wgcc1faqn0y9brxikh53s6ly7zvpdmpg7m5gvp5437isbllisbl"; /* updated by script */
+ sha256 = "15jd2yn4g3lya54ppcp8b0bvf2pp2khdvqba2g1aml16d5z8mkq6"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE";
@@ -310,12 +307,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2020.1.3"; /* updated by script */
+ version = "2020.2"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "1aycsy2pg8nw5il8p2r6bhim9y47g5rfga63f0p435mpjmzpll0s"; /* updated by script */
+ sha256 = "0rymyyhgm42i487dhlxh78shyvq4hd56frgz7wrqf85hg2j5ha0y"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA RELEASE";
@@ -323,12 +320,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2020.1.3"; /* updated by script */
+ version = "2020.2"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
- sha256 = "188wkqcv67kizq4w6v4vg9jpr3qfgbg9x5jc77s4ki4nafkbfxas"; /* updated by script */
+ sha256 = "00mbf8asxjdnfciz6bl8b83kqknqdnars5w5w5w38rmza53pzxsi"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA RELEASE";
@@ -336,12 +333,12 @@ in
mps = buildMps rec {
name = "mps-${version}";
- version = "2020.1.2"; /* updated by script */
+ version = "2020.1.3"; /* updated by script */
description = "Create your own domain-specific language";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/mps/2020.1/MPS-${version}.tar.gz";
- sha256 = "0ygk31l44bxcv64h6lnqxssmx5prcb5b5xdm3qxmrv7xz1qv59c1"; /* updated by script */
+ sha256 = "1ncvq834vn47pmh3q875hgqi4m7h3inljp89w3jwwhjn3g985ysz"; /* updated by script */
};
wmClass = "jetbrains-mps";
update-channel = "MPS RELEASE";
@@ -349,12 +346,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2020.1.3"; /* updated by script */
+ version = "2020.2"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "0cw2rx68rl6mrnizpb69ahz4hrh8blry70cv4rjnkw19d4x877m8"; /* updated by script */
+ sha256 = "1zxhb2w7nivnx8habcf5vii6bwzaihs5x8smy0zf8ngv3xwr6vjc"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
@@ -362,12 +359,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2020.1.3"; /* updated by script */
+ version = "2020.2"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "1290k17nihiih8ipxfqax1xlx320h1vkwbcc5hc50psvpsfgiall"; /* updated by script */
+ sha256 = "12pp3xp74dzgjrv2nz83dnqycb250kkgqlb3skjkdx9pabmfxck0"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
@@ -375,12 +372,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2020.1.3"; /* updated by script */
+ version = "2020.2"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "1ag8jrfs38f0q11pyil4pvddi8lv46b0jxd3mcbmidn3p1z29f9x"; /* updated by script */
+ sha256 = "0xq0nba31yc7cm1lbgkmgfbr5kp5fq5k7j2n6kampm2hyx5fa0ak"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";
@@ -388,12 +385,12 @@ in
rider = buildRider rec {
name = "rider-${version}";
- version = "2020.1.4"; /* updated by script */
+ version = "2020.2"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
- sha256 = "0vicgwgsbllfw6fz4l82x4vbka3agf541576ix9akyvsskwbaxj9"; /* updated by script */
+ sha256 = "0fxgdxsrrl659lh45slikgck6jld90rd6nnj8gj3aixq0yp5pkix"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE";
@@ -401,12 +398,12 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
- version = "2020.1.3"; /* updated by script */
+ version = "2020.2"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
- sha256 = "1z6z2c31aq29hzi1cifc77zz9vnw48h2jvw4w61lvgskcnzrw9vn"; /* updated by script */
+ sha256 = "1caxd5qcxwwrdy3ma87gnywr5czg3lam1n2gwbnc7hdxgfnvn3qz"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "RubyMine RELEASE";
@@ -414,12 +411,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2020.1.3"; /* updated by script */
+ version = "2020.2"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "19zqac77fkw1czf86s39ggnd24r9ljr80gj422ch4fdkz4qy832q"; /* updated by script */
+ sha256 = "100j2q9hz0a50n3x3khk7hap7b496g6sx0y6q7n7vy2zayh5ibm5"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE";
diff --git a/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile b/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile
new file mode 100644
index 0000000000000..c3f096edcad11
--- /dev/null
+++ b/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gem 'sensu'
+gem 'iruby'
+gem 'cztop'
+gem 'ffi-rzmq'
+gem 'rbczmq'
diff --git a/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile.lock b/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile.lock
new file mode 100644
index 0000000000000..89f60a6dbdce9
--- /dev/null
+++ b/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile.lock
@@ -0,0 +1,119 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ addressable (2.6.0)
+ public_suffix (>= 2.0.2, < 4.0)
+ amq-protocol (2.0.1)
+ amqp (1.6.0)
+ amq-protocol (>= 2.0.1)
+ eventmachine
+ bond (0.5.1)
+ childprocess (0.5.8)
+ ffi (~> 1.0, >= 1.0.11)
+ cookiejar (0.3.3)
+ czmq-ffi-gen (0.15.0)
+ ffi (~> 1.9.10)
+ cztop (0.13.1)
+ czmq-ffi-gen (~> 0.15.0)
+ data_uri (0.1.0)
+ em-http-request (1.1.5)
+ addressable (>= 2.3.4)
+ cookiejar (!= 0.3.1)
+ em-socksify (>= 0.3)
+ eventmachine (>= 1.0.3)
+ http_parser.rb (>= 0.6.0)
+ em-http-server (0.1.8)
+ eventmachine
+ em-socksify (0.3.2)
+ eventmachine (>= 1.0.0.beta.4)
+ em-worker (0.0.2)
+ eventmachine
+ eventmachine (1.2.7)
+ ffi (1.9.21)
+ ffi-rzmq (2.0.7)
+ ffi-rzmq-core (>= 1.0.7)
+ ffi-rzmq-core (1.0.7)
+ ffi
+ http_parser.rb (0.6.0)
+ iruby (0.3)
+ bond (~> 0.5)
+ data_uri (~> 0.1)
+ mimemagic (~> 0.3)
+ multi_json (~> 1.11)
+ mimemagic (0.3.3)
+ multi_json (1.13.1)
+ oj (2.18.1)
+ parse-cron (0.1.4)
+ public_suffix (3.0.3)
+ rbczmq (1.7.9)
+ sensu (1.6.2)
+ em-http-request (= 1.1.5)
+ em-http-server (= 0.1.8)
+ eventmachine (= 1.2.7)
+ parse-cron (= 0.1.4)
+ sensu-extension (= 1.5.2)
+ sensu-extensions (= 1.10.0)
+ sensu-json (= 2.1.1)
+ sensu-logger (= 1.2.2)
+ sensu-redis (= 2.4.0)
+ sensu-settings (= 10.14.0)
+ sensu-spawn (= 2.5.0)
+ sensu-transport (= 8.2.0)
+ sensu-extension (1.5.2)
+ eventmachine
+ sensu-extensions (1.10.0)
+ sensu-extension
+ sensu-extensions-check-dependencies (= 1.1.0)
+ sensu-extensions-debug (= 1.0.0)
+ sensu-extensions-json (= 1.0.0)
+ sensu-extensions-occurrences (= 1.2.0)
+ sensu-extensions-only-check-output (= 1.0.0)
+ sensu-extensions-ruby-hash (= 1.0.0)
+ sensu-json (>= 1.1.0)
+ sensu-logger
+ sensu-settings
+ sensu-extensions-check-dependencies (1.1.0)
+ sensu-extension
+ sensu-extensions-debug (1.0.0)
+ sensu-extension
+ sensu-extensions-json (1.0.0)
+ sensu-extension
+ sensu-extensions-occurrences (1.2.0)
+ sensu-extension
+ sensu-extensions-only-check-output (1.0.0)
+ sensu-extension
+ sensu-extensions-ruby-hash (1.0.0)
+ sensu-extension
+ sensu-json (2.1.1)
+ oj (= 2.18.1)
+ sensu-logger (1.2.2)
+ eventmachine
+ sensu-json
+ sensu-redis (2.4.0)
+ eventmachine
+ sensu-settings (10.14.0)
+ parse-cron
+ sensu-json (>= 1.1.0)
+ sensu-spawn (2.5.0)
+ childprocess (= 0.5.8)
+ em-worker (= 0.0.2)
+ eventmachine
+ ffi (= 1.9.21)
+ sensu-transport (8.2.0)
+ amq-protocol (= 2.0.1)
+ amqp (= 1.6.0)
+ eventmachine
+ sensu-redis (>= 1.0.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ cztop
+ ffi-rzmq
+ iruby
+ rbczmq
+ sensu
+
+BUNDLED WITH
+ 1.17.2
diff --git a/pkgs/applications/editors/jupyter-kernels/iruby/default.nix b/pkgs/applications/editors/jupyter-kernels/iruby/default.nix
new file mode 100644
index 0000000000000..260a614fe5c0b
--- /dev/null
+++ b/pkgs/applications/editors/jupyter-kernels/iruby/default.nix
@@ -0,0 +1,17 @@
+{ lib
+, bundlerApp
+}:
+
+bundlerApp {
+ pname = "iruby";
+ gemdir = ./.;
+ exes = [ "iruby" ];
+
+ meta = with lib; {
+ description = "Ruby kernel for Jupyter";
+ homepage = "https://github.com/SciRuby/iruby";
+ license = licenses.mit;
+ maintainers = [ maintainers.costrouc ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix b/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix
new file mode 100644
index 0000000000000..1ba77a058ea2b
--- /dev/null
+++ b/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix
@@ -0,0 +1,429 @@
+{
+ addressable = {
+ dependencies = ["public_suffix"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
+ type = "gem";
+ };
+ version = "2.6.0";
+ };
+ amq-protocol = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rpn9vgh7y037aqhhp04smihzr73vp5i5g6xlqlha10wy3q0wp7x";
+ type = "gem";
+ };
+ version = "2.0.1";
+ };
+ amqp = {
+ dependencies = ["amq-protocol" "eventmachine"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0kbrqnpjgj9v0722p3n5rw589l4g26ry8mcghwc5yr20ggkpdaz9";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ bond = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1r19ifc4skyl2gxnifrxa5jvbbay9fb2in79ppgv02b6n4bhsw90";
+ type = "gem";
+ };
+ version = "0.5.1";
+ };
+ childprocess = {
+ dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1lv7axi1fhascm9njxh3lx1rbrnsm8wgvib0g7j26v4h1fcphqg0";
+ type = "gem";
+ };
+ version = "0.5.8";
+ };
+ cookiejar = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0q0kmbks9l3hl0wdq744hzy97ssq9dvlzywyqv9k9y1p3qc9va2a";
+ type = "gem";
+ };
+ version = "0.3.3";
+ };
+ czmq-ffi-gen = {
+ dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ngsd1yxiayd50v402vwhmq7ma9ang6pcba5kqiwq7smpdvfmbmp";
+ type = "gem";
+ };
+ version = "0.15.0";
+ };
+ cztop = {
+ dependencies = ["czmq-ffi-gen"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12xcz7g42dbp2ryhcwdm2ykj7bmwfhjhla296hy18g7a09zlfnz7";
+ type = "gem";
+ };
+ version = "0.13.1";
+ };
+ data_uri = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fzkxgdxrlbfl4537y3n9mjxbm28kir639gcw3x47ffchwsgdcky";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+ em-http-request = {
+ dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13rxmbi0fv91n4sg300v3i9iiwd0jxv0i6xd0sp81dx3jlx7kasx";
+ type = "gem";
+ };
+ version = "1.1.5";
+ };
+ em-http-server = {
+ dependencies = ["eventmachine"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0y8l4gymy9dzjjchjav90ck6has2i2zdjihlhcyrg3jgq6kjzyq5";
+ type = "gem";
+ };
+ version = "0.1.8";
+ };
+ em-socksify = {
+ dependencies = ["eventmachine"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rk43ywaanfrd8180d98287xv2pxyl7llj291cwy87g1s735d5nk";
+ type = "gem";
+ };
+ version = "0.3.2";
+ };
+ em-worker = {
+ dependencies = ["eventmachine"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk";
+ type = "gem";
+ };
+ version = "0.0.2";
+ };
+ eventmachine = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
+ type = "gem";
+ };
+ version = "1.2.7";
+ };
+ ffi = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0c2dl10pi6a30kcvx2s6p2v1wb4kbm48iv38kmz2ff600nirhpb8";
+ type = "gem";
+ };
+ version = "1.9.21";
+ };
+ ffi-rzmq = {
+ dependencies = ["ffi-rzmq-core"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14a5kxfnf8l3ngyk8hgmk30z07aj1324ll8i48z67ps6pz2kpsrg";
+ type = "gem";
+ };
+ version = "2.0.7";
+ };
+ ffi-rzmq-core = {
+ dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0amkbvljpjfnv0jpdmz71p1i3mqbhyrnhamjn566w0c01xd64hb5";
+ type = "gem";
+ };
+ version = "1.0.7";
+ };
+ "http_parser.rb" = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
+ type = "gem";
+ };
+ version = "0.6.0";
+ };
+ iruby = {
+ dependencies = ["bond" "data_uri" "mimemagic" "multi_json"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1wdf2c0x8y6cya0n3y0p3p7b1sxkb2fdavdn2k58rf4rs37s7rzn";
+ type = "gem";
+ };
+ version = "0.3";
+ };
+ mimemagic = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw";
+ type = "gem";
+ };
+ version = "0.3.3";
+ };
+ multi_json = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
+ type = "gem";
+ };
+ version = "1.13.1";
+ };
+ oj = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "147whmq8h2n04chskl3v4a132xhz5i6kk6vhnz83jwng4vihin5f";
+ type = "gem";
+ };
+ version = "2.18.1";
+ };
+ parse-cron = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "02fj9i21brm88nb91ikxwxbwv9y7mb7jsz6yydh82rifwq7357hg";
+ type = "gem";
+ };
+ version = "0.1.4";
+ };
+ public_suffix = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+ type = "gem";
+ };
+ version = "3.0.3";
+ };
+ rbczmq = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bqr44m2nb61smza6y5cahp09hk16lsn0z3wpq9g5zpr9nhp50fx";
+ type = "gem";
+ };
+ version = "1.7.9";
+ };
+ sensu = {
+ dependencies = ["em-http-request" "em-http-server" "eventmachine" "parse-cron" "sensu-extension" "sensu-extensions" "sensu-json" "sensu-logger" "sensu-redis" "sensu-settings" "sensu-spawn" "sensu-transport"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rxv6yj63nkxlzmmqk6qpfpcvrbar9s4sd4kgfb5zsv9bw7236cr";
+ type = "gem";
+ };
+ version = "1.6.2";
+ };
+ sensu-extension = {
+ dependencies = ["eventmachine"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bpizp4n01rv72cryjjlrbfxxj3csish3mkxjzdy4inpi5j5h1dw";
+ type = "gem";
+ };
+ version = "1.5.2";
+ };
+ sensu-extensions = {
+ dependencies = ["sensu-extension" "sensu-extensions-check-dependencies" "sensu-extensions-debug" "sensu-extensions-json" "sensu-extensions-occurrences" "sensu-extensions-only-check-output" "sensu-extensions-ruby-hash" "sensu-json" "sensu-logger" "sensu-settings"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "04v221qjv8qy3jci40i66p63ig5vrrh0dpgmf1l8229x5m7bxrsg";
+ type = "gem";
+ };
+ version = "1.10.0";
+ };
+ sensu-extensions-check-dependencies = {
+ dependencies = ["sensu-extension"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hc4kz7k983f6fk27ikg5drvxm4a85qf1k07hqssfyk3k75jyj1r";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ sensu-extensions-debug = {
+ dependencies = ["sensu-extension"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "11abdgn2kkkbvxq4692yg6a27qnxz4349gfiq7d35biy7vrw34lp";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ sensu-extensions-json = {
+ dependencies = ["sensu-extension"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1wnbn9sycdqdh9m0fhszaqkv0jijs3fkdbvcv8kdspx6irbv3m6g";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ sensu-extensions-occurrences = {
+ dependencies = ["sensu-extension"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lx5wsbblfs0rvkxfg09bsz0g2mwmckrhga7idnarsnm8m565v1v";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ sensu-extensions-only-check-output = {
+ dependencies = ["sensu-extension"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ds2i8wd4ji9ifig2zzr4jpxinvk5dm7j10pvaqy4snykxa3rqh3";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ sensu-extensions-ruby-hash = {
+ dependencies = ["sensu-extension"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xyrj3gbmslbivcd5qcmyclgapn7qf7f5jwfvfpw53bxzib0h7s3";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
+ sensu-json = {
+ dependencies = ["oj"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08zlxg5j3bhs72cc7wcllp026jbif0xiw6ib1cgawndlpsfl9fgx";
+ type = "gem";
+ };
+ version = "2.1.1";
+ };
+ sensu-logger = {
+ dependencies = ["eventmachine" "sensu-json"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jpw4kz36ilaknrzb3rbkhpbgv93w2d668z2cv395dq30d4d3iwm";
+ type = "gem";
+ };
+ version = "1.2.2";
+ };
+ sensu-redis = {
+ dependencies = ["eventmachine"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0widfmmj1h9ca2kk14wy1sqmlkq40linp89a73s3ghngnzri0xyk";
+ type = "gem";
+ };
+ version = "2.4.0";
+ };
+ sensu-settings = {
+ dependencies = ["parse-cron" "sensu-json"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "152n4hazv2l4vbzrgd316rpj135jmz042fyh6k2yv2kw0x29pi0f";
+ type = "gem";
+ };
+ version = "10.14.0";
+ };
+ sensu-spawn = {
+ dependencies = ["childprocess" "em-worker" "eventmachine" "ffi"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17yc8ivjpjbvig9r7yl6991d6ma0kcq75fbpz6i856ljvcr3lmd5";
+ type = "gem";
+ };
+ version = "2.5.0";
+ };
+ sensu-transport = {
+ dependencies = ["amq-protocol" "amqp" "eventmachine" "sensu-redis"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0x6vyfmg1jm1srf7xa5aka73by7qwcmry2rx8kq8phwa4g0v4mzr";
+ type = "gem";
+ };
+ version = "8.2.0";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/applications/editors/kakoune/plugins/case.kak.nix b/pkgs/applications/editors/kakoune/plugins/case.kak.nix
new file mode 100644
index 0000000000000..20df2872628ff
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/case.kak.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitLab }:
+
+stdenv.mkDerivation {
+ name = "case.kak";
+ version = "unstable-2020-04-06";
+
+ src = fetchFromGitLab {
+ owner = "FlyingWombat";
+ repo = "case.kak";
+ rev = "6f1511820aa3abfa118e0f856118adc8113e2185";
+ sha256 = "002njrlwgakqgp74wivbppr9qyn57dn4n5bxkr6k6nglk9qndwdp";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/kak/autoload/plugins
+ cp -r rc/case.kak $out/share/kak/autoload/plugins
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Ease navigation between opened buffers in Kakoune";
+ homepage = "https://gitlab.com/FlyingWombat/case.kak";
+ license = licenses.unlicense;
+ maintainers = with maintainers; [ eraserhd ];
+ platform = platforms.all;
+ };
+}
+
diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix
index 4e92887bccb3b..3926973f7eadb 100644
--- a/pkgs/applications/editors/kakoune/plugins/default.nix
+++ b/pkgs/applications/editors/kakoune/plugins/default.nix
@@ -3,11 +3,13 @@
{
inherit parinfer-rust;
+ case-kak = pkgs.callPackage ./case.kak.nix { };
kak-ansi = pkgs.callPackage ./kak-ansi.nix { };
kak-auto-pairs = pkgs.callPackage ./kak-auto-pairs.nix { };
kak-buffers = pkgs.callPackage ./kak-buffers.nix { };
kak-fzf = pkgs.callPackage ./kak-fzf.nix { };
kak-plumb = pkgs.callPackage ./kak-plumb.nix { };
kak-powerline = pkgs.callPackage ./kak-powerline.nix { };
+ kak-prelude = pkgs.callPackage ./kak-prelude.nix { };
kak-vertical-selection = pkgs.callPackage ./kak-vertical-selection.nix { };
}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
index dd0faf63453ba..657f4a19bbfc5 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
+++ b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
@@ -4,12 +4,12 @@ assert stdenv.lib.asserts.assertOneOf "fzf" fzf.pname [ "fzf" "skim" ];
stdenv.mkDerivation {
name = "kak-fzf";
- version = "2019-07-16";
+ version = "2020-05-24";
src = fetchFromGitHub {
owner = "andreyorst";
repo = "fzf.kak";
- rev = "ede90d3e02bceb714f997adfcbab8260b42e0a19";
- sha256 = "18w90j3fpk2ddn68497s33n66aap8phw5636y1r7pqsa641zdxcv";
+ rev = "b2aeb26473962ab0bf3b51ba5c81c50c1d8253d3";
+ sha256 = "0bg845i814xh4y688p2zx726rsg0pd6nb4a7qv2fckmk639f4wzc";
};
configurePhase = ''
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix
new file mode 100644
index 0000000000000..ee9c125827c89
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/kak-prelude.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation {
+ name = "kak-prelude";
+ version = "2020-03-15";
+
+ src = fetchFromGitHub {
+ owner = "alexherbo2";
+ repo = "prelude.kak";
+ rev = "05b2642b1e014bd46423f9d738cc38a624947b63";
+ sha256 = "180p8hq8z7mznzd9w9ma5as3ijs7zbzcj96prcpswqg263a0b329";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/kak/autoload/plugins
+ cp -r rc $out/share/kak/autoload/plugins/auto-pairs
+ '';
+
+ meta = with stdenv.lib;
+ { description = "Prelude of shell blocks for Kakoune.";
+ homepage = "https://github.com/alexherbo2/prelude.kak";
+ license = licenses.unlicense;
+ maintainers = with maintainers; [ buffet ];
+ platform = platforms.all;
+ };
+}
diff --git a/pkgs/applications/editors/kibi/default.nix b/pkgs/applications/editors/kibi/default.nix
new file mode 100644
index 0000000000000..85ad49a01d672
--- /dev/null
+++ b/pkgs/applications/editors/kibi/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "kibi";
+ version = "0.2.0";
+
+ cargoSha256 = "0zyqzb3k4ak7h58zjbg9b32hz1vgbbn9i9l85j4vd4aw8mhsz0n9";
+
+ src = fetchFromGitHub {
+ owner = "ilai-deutel";
+ repo = "kibi";
+ rev = "v${version}";
+ sha256 = "1cqnzw6gpsmrqcz82zn1x5i6najcr3i7shj0wnqzpwppff9a6yac";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A text editor in ≤1024 lines of code, written in Rust";
+ homepage = "https://github.com/ilai-deutel/kibi";
+ license = licenses.mit;
+ maintainers = with maintainers; [ robertodr ];
+ };
+}
diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index 26c5ee4215279..abf55b42c5513 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem
+{ stdenv, lib, fetchurl, zlib, glib, alsaLib, makeDesktopItem
, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf
, cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify
}:
@@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
mv $out/share/LightTable/light $out/bin/light
- ln -sf ${systemd.lib}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0
+ ln -sf ${lib.getLib systemd}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0
substituteInPlace $out/bin/light \
- --replace "/usr/lib/x86_64-linux-gnu" "${systemd.lib}/lib" \
+ --replace "/usr/lib/x86_64-linux-gnu" "${lib.getLib systemd}/lib" \
--replace "/lib/x86_64-linux-gnu" "$out/share/LightTable" \
--replace 'HERE=`dirname $(readlink -f $0)`' "HERE=$out/share/LightTable"
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 13a0e797adc22..244649f8663ee 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
in stdenv.mkDerivation rec {
pname = "nano";
- version = "5.0";
+ version = "5.2";
src = fetchurl {
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
- sha256 = "0dmagj4p1llb1a2w0iwdrqbd9cgp0bda4s18vwh6y1ndd6z983bw";
+ sha256 = "1qd7pn9g5dgzbfg4fb3nqxqgi2iqq0g6x33x8d1mx6mfw51xmhij";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index e56e7d9380732..b546aae790a7f 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -20,6 +20,14 @@ let
));
pyEnv = python.withPackages(ps: [ ps.pynvim ps.msgpack ]);
+
+ # FIXME: this is verry messy and strange.
+ # see https://github.com/NixOS/nixpkgs/pull/80528
+ luv = lua.pkgs.luv;
+ luvpath = with builtins ; if stdenv.isDarwin
+ then "${luv.libluv}/lib/lua/${lua.luaversion}/libluv.${head (match "([0-9.]+).*" luv.version)}.dylib"
+ else "${luv}/lib/lua/${lua.luaversion}/luv.so";
+
in
stdenv.mkDerivation rec {
pname = "neovim-unwrapped";
@@ -47,7 +55,7 @@ in
libtermkey
libuv
libvterm-neovim
- lua.pkgs.luv.libluv
+ luv.libluv
msgpack
ncurses
neovimLuaEnv
@@ -88,10 +96,8 @@ in
cmakeFlags = [
"-DGPERF_PRG=${gperf}/bin/gperf"
"-DLUA_PRG=${neovimLuaEnv.interpreter}"
+ "-DLIBLUV_LIBRARY=${luvpath}"
]
- # FIXME: this is verry messy and strange.
- ++ optional (!stdenv.isDarwin) "-DLIBLUV_LIBRARY=${lua.pkgs.luv}/lib/lua/${lua.luaversion}/luv.so"
- ++ optional (stdenv.isDarwin) "-DLIBLUV_LIBRARY=${lua.pkgs.luv.libluv}/lib/lua/${lua.luaversion}/libluv.dylib"
++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
;
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 8fe93d37c7e87..b04c575dded7b 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -38,6 +38,7 @@ let
meta = with stdenv.lib; {
description = "Neovim client library and GUI, in Qt5";
+ homepage = "https://github.com/equalsraf/neovim-qt";
license = licenses.isc;
maintainers = with maintainers; [ peterhoeg ];
inherit (neovim.meta) platforms;
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index 0ac90a8b3454d..e3c03c92e58c2 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -138,7 +138,7 @@ let
ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
''
+ optionalString withNodeJs ''
- ln -s ${nodePackages.neovim}/bin/neovim-node $out/bin/nvim-node
+ ln -s ${nodePackages.neovim}/bin/neovim-node-host $out/bin/nvim-node
''
+ optionalString vimAlias ''
ln -s $out/bin/nvim $out/bin/vim
diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix
index 5a0ef754db16f..0b1dd8fcb9f6f 100644
--- a/pkgs/applications/editors/setzer/default.nix
+++ b/pkgs/applications/editors/setzer/default.nix
@@ -17,13 +17,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "setzer";
- version = "0.2.8";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "cvfosammmm";
repo = "Setzer";
rev = "v${version}";
- sha256 = "1llxxjj038nd2p857bjdyyhzskn56826qi259v47vaqlv9hkifil";
+ sha256 = "0gx5fnyi932lswkhdvxfqs0wxx7hz690cbnpv4m3ysydi96mxwiv";
};
format = "other";
diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix
index cbb9f7bd5b874..869c20c1d6c4b 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@@ -1,18 +1,18 @@
{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, makeWrapper
-, boost, xercesc
-, qtbase, qttools, qtwebkit, qtxmlpatterns
-, python3, python3Packages
+, boost, xercesc, hunspell, zlib, pcre16
+, qtbase, qttools, qtwebengine, qtxmlpatterns
+, python3Packages
}:
mkDerivation rec {
pname = "sigil";
- version = "0.9.14";
+ version = "1.3.0";
src = fetchFromGitHub {
- sha256 = "0fmfbfpnmhclbbv9cbr1xnv97si6ls7331kk3ix114iqkngqwgl1";
- rev = version;
repo = "Sigil";
owner = "Sigil-Ebook";
+ rev = version;
+ sha256 = "02bkyi9xpaxdcivm075y3praxgvfay9z0189gvr6g8yc3ml1miyr";
};
pythonPath = with python3Packages; [ lxml ];
@@ -20,8 +20,9 @@ mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
buildInputs = [
- boost xercesc qtbase qttools qtwebkit qtxmlpatterns
- python3Packages.lxml ];
+ boost xercesc qtbase qttools qtwebengine qtxmlpatterns
+ python3Packages.lxml
+ ];
dontWrapQtApps = true;
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 94837023ca0d8..8f7e18a35c506 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "texstudio";
- version = "2.12.22";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "${pname}-org";
repo = pname;
rev = version;
- sha256 = "037jvsfln8wav17qj9anxz2a7p51v7ky85wmhdj2hgwp40al651g";
+ sha256 = "1663lgl30698awa7fjplr8rjnf6capqvf8z80lzlnkfl5m9ph0jb";
};
nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ];
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 20e1427ddef34..4b032d48ebf40 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "tiled";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "bjorn";
repo = pname;
rev = "v${version}";
- sha256 = "1x8jymmc56di1c1wxalsp6qhcban2hahn70ndd097b8mx52gckjr";
+ sha256 = "0b3xjcc86vs9lfxr7xann9d43dz3v3x1g7j1mcn31sy2n68a1wx3";
};
nativeBuildInputs = [ pkgconfig qmake ];
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 049ba45f7af37..3c55cffdcf12a 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -2,7 +2,7 @@
, lib
, fetchurl
, makeWrapper
-, electron_8
+, electron_9
, dpkg
, gtk3
, glib
@@ -13,15 +13,15 @@
}:
let
- electron = electron_8;
+ electron = electron_9;
in
stdenv.mkDerivation rec {
pname = "typora";
- version = "0.9.89";
+ version = "0.9.95";
src = fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
- sha256 = "0gk8j13z1ymad34zzcy4vqwyjgd5khgyw5xjj9rbzm5v537kqmx6";
+ sha256 = "0kgzk7z707vlbjrvykrnw2h6wscmc3h5hxycyz1z1j2cz26fns4p";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix
deleted file mode 100644
index 0e3a4a1505263..0000000000000
--- a/pkgs/applications/editors/vim/qvim.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-args@{ fetchgit, stdenv, ncurses, pkgconfig, gettext
-, lib, config, python, perl, tcl, ruby, qt4
-, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
-, libICE
-, lua
-, features
-, luaSupport ? config.vim.lua or true
-, perlSupport ? config.vim.perl or false # Perl interpreter
-, pythonSupport ? config.vim.python or true
-, rubySupport ? config.vim.ruby or true
-, nlsSupport ? config.vim.nls or false
-, tclSupport ? config.vim.tcl or false
-, multibyteSupport ? config.vim.multibyte or false
-, cscopeSupport ? config.vim.cscope or false
-, netbeansSupport ? config.netbeans or true # eg envim is using it
-
-# by default, compile with darwin support if we're compiling on darwin, but
-# allow this to be disabled by setting config.vim.darwin to false
-, darwinSupport ? stdenv.isDarwin && (config.vim.darwin or true)
-
-# add .nix filetype detection and minimal syntax highlighting support
-, ftNixSupport ? config.vim.ftNix or true
-
-, ... }: with args;
-
-let tag = "20140827";
- sha256 = "0ncgbcm23z25naicxqkblz0mcl1zar2qwgi37y5ar8q8884w9ml2";
-in {
-
- name = "qvim-7.4." + tag;
-
- enableParallelBuilding = true; # test this
-
- src = fetchgit {
- url = "https://bitbucket.org/equalsraf/vim-qt.git";
- rev = "refs/tags/package-" + tag;
- inherit sha256;
- };
-
- # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux
- # to meta.platforms.unix
- preConfigure = assert (! stdenv.isDarwin); "";
-
- configureFlags = [
- "--with-vim-name=qvim"
- "--enable-gui=qt"
- "--with-features=${features}"
- "--disable-xsmp"
- "--disable-xsmp_interact"
- "--disable-workshop" # Sun Visual Workshop support
- "--disable-sniff" # Sniff interface
- "--disable-hangulinput" # Hangul input support
- "--disable-fontset" # X fontset output support
- "--disable-acl" # ACL support
- "--disable-gpm" # GPM (Linux mouse daemon)
- "--disable-mzscheme"
- ]
- ++ stdenv.lib.optionals luaSupport [
- "--with-lua-prefix=${lua}"
- "--enable-luainterp"
- ]
- ++ stdenv.lib.optional pythonSupport "--enable-pythoninterp"
- ++ stdenv.lib.optional (pythonSupport && stdenv.isDarwin) "--with-python-config-dir=${python}/lib"
- ++ stdenv.lib.optional nlsSupport "--enable-nls"
- ++ stdenv.lib.optional perlSupport "--enable-perlinterp"
- ++ stdenv.lib.optional rubySupport "--enable-rubyinterp"
- ++ stdenv.lib.optional tclSupport "--enable-tcl"
- ++ stdenv.lib.optional multibyteSupport "--enable-multibyte"
- ++ stdenv.lib.optional darwinSupport "--enable-darwin"
- ++ stdenv.lib.optional cscopeSupport "--enable-cscope";
-
- nativeBuildInputs = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw
- libXau libXmu libICE qt4
- ]
- ++ stdenv.lib.optional nlsSupport gettext
- ++ stdenv.lib.optional perlSupport perl
- ++ stdenv.lib.optional pythonSupport python
- ++ stdenv.lib.optional tclSupport tcl
- ++ stdenv.lib.optional rubySupport ruby
- ++ stdenv.lib.optional luaSupport lua
- ;
-
- postPatch = ''
- '' + stdenv.lib.optionalString ftNixSupport ''
- # because we cd to src in the main patch phase, we can't just add this
- # patch to the list, we have to apply it manually
- cd runtime
- patch -p2 < ${./ft-nix-support.patch}
- cd ..
- '';
-
- postInstall = stdenv.lib.optionalString stdenv.isLinux ''
- rpath=`patchelf --print-rpath $out/bin/qvim`;
- for i in $nativeBuildInputs; do
- echo adding $i/lib
- rpath=$rpath:$i/lib
- done
- echo $nativeBuildInputs
- echo $rpath
- patchelf --set-rpath $rpath $out/bin/qvim
- '';
-
- dontStrip = 1;
-
- meta = with stdenv.lib; {
- description = "The most popular clone of the VI editor (Qt GUI fork)";
- homepage = "https://bitbucket.org/equalsraf/vim-qt/wiki/Home";
- license = licenses.vim;
- maintainers = with maintainers; [ smironov ttuegel ];
- platforms = platforms.linux;
- };
-}
-
diff --git a/pkgs/applications/editors/viw/default.nix b/pkgs/applications/editors/viw/default.nix
new file mode 100644
index 0000000000000..4025bf252b309
--- /dev/null
+++ b/pkgs/applications/editors/viw/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, ncurses }:
+
+stdenv.mkDerivation rec {
+ pname = "viw";
+ version = "unstable-20171029";
+
+ src = fetchFromGitHub {
+ owner = "lpan";
+ repo = pname;
+ rev = "2cf317f6d82a6fa58f284074400297b6dc0f44c2";
+ sha256 = "0bnkh57v01zay6ggk0rbddaf75i48h8z06xsv33wfbjldclaljp1";
+ };
+
+ buildInputs = [ ncurses ];
+
+ makeFlags = [ "CC=cc" ];
+ checkFlags = [ "test-command" "test-buffer" "test-state" ];
+
+ installPhase = ''
+ install -Dm 755 -t $out/bin viw
+ install -Dm 644 -t $out/share/doc/${pname} README.md
+ '';
+
+ meta = with stdenv.lib; {
+ description = "VI Worsened, a fun and light clone of VI";
+ homepage = "https://github.com/lpan/viw";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ AndersonTorres ];
+ };
+}
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 38d695bd74ac2..57bd73d60192d 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -62,7 +62,7 @@ in
else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages)
++ [ libsecret libXScrnSaver ];
- runtimeDependencies = lib.optional (stdenv.isLinux) [ systemd.lib fontconfig.lib ];
+ runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib ];
nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook;
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 285b3a8a1806c..bedc8c60c707d 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "162qwjmm439zplcyjhbb961ircqpdfw13h9ybnik1q128f4650ky";
- x86_64-darwin = "1kmg1h1gnx9kdnigjzpqd6rlzv7bz01h29ldla2srfr2q6nr0r9v";
+ x86_64-linux = "1i4vq8a81jgshn9iqkj8rp0yqihq2bjim27c8sh4vl9d6a8a6vcr";
+ x86_64-darwin = "090xj8pq3fdn7dcfrzvgvx906k6gs2xm04xkymz8vpm3a4rq1svn";
}.${system};
in
callPackage ./generic.nix rec {
@@ -21,7 +21,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.47.3";
+ version = "1.48.2";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 149eb5cf86105..5039fa4707c76 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "01wzdwb6laa0kwgwwvqri06ckdixg1w4fwcx400vhg3mby4n9wvl";
- x86_64-darwin = "1byh1x839w4r88yv0k7jpvxvida1xpf7pvnsp6vnawvqpbmdwlw0";
+ x86_64-linux = "17frdyli375l20mb7sb5bmw000p9cplj4pagmhnb6nibi9wqypdx";
+ x86_64-darwin = "1dh5k36fjdfwhidlsg1grjwy3s9jik3pg6xpdgi6946vzqv1vxll";
}.${system};
sourceRoot = {
@@ -27,7 +27,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.47.3";
+ version = "1.48.2";
pname = "vscodium";
executableName = "codium";
diff --git a/pkgs/applications/editors/xxe-pe/default.nix b/pkgs/applications/editors/xxe-pe/default.nix
new file mode 100644
index 0000000000000..e7cfe6284e357
--- /dev/null
+++ b/pkgs/applications/editors/xxe-pe/default.nix
@@ -0,0 +1,77 @@
+{ stdenv
+, fetchurl
+, lib
+, unzip
+, makeWrapper
+, openjdk11
+, makeDesktopItem
+, icoutils
+, config
+, acceptLicense ? config.xxe-pe.acceptLicense or false
+}:
+
+let
+ pkg_path = "$out/lib/xxe";
+
+ desktopItem = makeDesktopItem {
+ name = "XMLmind XML Editor Personal Edition";
+ exec = "xxe";
+ icon = "xxe";
+ desktopName = "xxe";
+ genericName = "XML Editor";
+ categories = "Development;IDE;TextEditor;Java";
+ };
+in
+stdenv.mkDerivation rec {
+ pname = "xxe-pe";
+ version = "9.4.0";
+
+ src =
+ assert !acceptLicense -> throw ''
+ You must accept the XMLmind XML Editor Personal Edition License at
+ https://www.xmlmind.com/xmleditor/license_xxe_perso.html
+ by setting nixpkgs config option `xxe-pe.acceptLicense = true;`
+ or by using `xxe-pe.override { acceptLicense = true; }` package.
+ '';
+ fetchurl {
+ url = "https://www.xmlmind.com/xmleditor/_download/xxe-perso-${builtins.replaceStrings [ "." ] [ "_" ] version}.zip";
+ sha256 = "FKPdf9cOpgm/WG2i8bFnR6MmEifpiq5ykw2zHA8HnT8=";
+ };
+
+ nativeBuildInputs = [
+ unzip
+ makeWrapper
+ icoutils
+ ];
+
+ dontStrip = true;
+
+ installPhase = ''
+ mkdir -p "${pkg_path}"
+ mkdir -p "${pkg_path}" "$out/share/applications"
+ cp -a * "${pkg_path}"
+ ln -s ${desktopItem}/share/applications/* $out/share/applications
+
+ icotool -x "${pkg_path}/bin/icon/xxe.ico"
+ ls
+ for f in xxe_*.png; do
+ res=$(basename "$f" ".png" | cut -d"_" -f3 | cut -d"x" -f1-2)
+ mkdir -pv "$out/share/icons/hicolor/$res/apps"
+ mv "$f" "$out/share/icons/hicolor/$res/apps/xxe.png"
+ done;
+ '';
+
+ postFixup = ''
+ mkdir -p "$out/bin"
+ makeWrapper "${pkg_path}/bin/xxe" "$out/bin/xxe" \
+ --prefix PATH : ${lib.makeBinPath [ openjdk11 ]}
+ '';
+
+ meta = with lib; {
+ description = "Strictly validating, near WYSIWYG, XML editor with DocBook support";
+ homepage = "https://www.xmlmind.com/xmleditor/";
+ license = licenses.unfree;
+ maintainers = [ maintainers.jtojnar ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/gis/gmt/dcw.nix b/pkgs/applications/gis/gmt/dcw.nix
new file mode 100644
index 0000000000000..58390e8929032
--- /dev/null
+++ b/pkgs/applications/gis/gmt/dcw.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ pname = "dcw-gmt";
+ version = "1.1.4";
+ src = fetchurl {
+ url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${version}.tar.gz";
+ sha256 = "8d47402abcd7f54a0f711365cd022e4eaea7da324edac83611ca035ea443aad3";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/dcw-gmt
+ cp -rv ./* $out/share/dcw-gmt
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://www.soest.hawaii.edu/pwessel/dcw/";
+ description = "Vector basemap of the world, for use with GMT";
+ longDescription = ''
+ DCW-GMT is an enhancement to the original 1:1,000,000 scale vector basemap
+ of the world, available from the Princeton University Digital Map and
+ Geospatial Information Center. It contains more state boundaries (the
+ largest 8 countries are now represented) than the original data
+ source. Information about DCW can be found on Wikipedia
+ (https://en.wikipedia.org/wiki/Digital_Chart_of_the_World). This data is
+ for use by GMT, the Generic Mapping Tools.
+ '';
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ tviti ];
+ };
+
+}
diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix
new file mode 100644
index 0000000000000..8c7c7687f3dd7
--- /dev/null
+++ b/pkgs/applications/gis/gmt/default.nix
@@ -0,0 +1,73 @@
+{ stdenv, fetchurl, cmake, curl, Accelerate, CoreGraphics, CoreVideo
+, fftwSinglePrec, netcdf, pcre, gdal, blas, lapack, glibc, ghostscript, dcw-gmt
+, gshhg-gmt }:
+
+/* The onus is on the user to also install:
+ - ffmpeg for webm or mp4 output
+ - graphicsmagick for gif output
+*/
+
+stdenv.mkDerivation rec {
+ pname = "gmt";
+ version = "6.1.0";
+ src = fetchurl {
+ url = "https://github.com/GenericMappingTools/gmt/releases/download/${version}/gmt-${version}-src.tar.gz";
+ sha256 = "0vzxzpvbf1sqma2airsibxvqb9m4sajm7jsfr7rrv6q7924c7ijw";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ curl gdal netcdf pcre dcw-gmt gshhg-gmt ]
+ ++ (if stdenv.isDarwin then [
+ Accelerate
+ CoreGraphics
+ CoreVideo
+ ] else [
+ glibc
+ fftwSinglePrec
+ blas
+ lapack
+ ]);
+
+ propagatedBuildInputs = [ ghostscript ];
+
+ cmakeFlags = [
+ "-DGMT_DOCDIR=share/doc/gmt"
+ "-DGMT_MANDIR=share/man"
+ "-DGMT_LIBDIR=lib"
+ "-DCOPY_GSHHG:BOOL=FALSE"
+ "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt"
+ "-DCOPY_DCW:BOOL=FALSE"
+ "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt"
+ "-DGDAL_ROOT=${gdal.out}"
+ "-DNETCDF_ROOT=${netcdf.out}"
+ "-DPCRE_ROOT=${pcre.out}"
+ "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE"
+ "-DGMT_ENABLE_OPENMP:BOOL=TRUE"
+ "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE"
+ "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid
+ ] ++ (with stdenv;
+ lib.optional (!isDarwin) [
+ "-DFFTW3_ROOT=${fftwSinglePrec.dev}"
+ "-DLAPACK_LIBRARY=${lapack}/lib/liblapack.so"
+ "-DBLAS_LIBRARY=${blas}/lib/libblas.so"
+ ]);
+
+ meta = with stdenv.lib; {
+ homepage = "https://www.generic-mapping-tools.org";
+ description = "Tools for manipulating geographic and cartesian data sets";
+ longDescription = ''
+ GMT is an open-source collection of command-line tools for manipulating
+ geographic and Cartesian data sets (including filtering, trend fitting,
+ gridding, projecting, etc.) and producing high-quality illustrations
+ ranging from simple x–y plots via contour maps to artificially illuminated
+ surfaces and 3D perspective views. It supports many map projections and
+ transformations and includes supporting data such as coastlines, rivers,
+ and political boundaries and optionally country polygons.
+ '';
+ platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ tviti ];
+ };
+
+}
diff --git a/pkgs/applications/gis/gmt/gshhg.nix b/pkgs/applications/gis/gmt/gshhg.nix
new file mode 100644
index 0000000000000..0f22f87c89b5f
--- /dev/null
+++ b/pkgs/applications/gis/gmt/gshhg.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ pname = "gshhg-gmt";
+ version = "2.3.7";
+ src = fetchurl {
+ url = "ftp://ftp.soest.hawaii.edu/gmt/gshhg-gmt-${version}.tar.gz";
+ sha256 = "9bb1a956fca0718c083bef842e625797535a00ce81f175df08b042c2a92cfe7f";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/gshhg-gmt
+ cp -rv ./* $out/share/gshhg-gmt
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://www.soest.hawaii.edu/pwessel/gshhg/";
+ description = "High-resolution shoreline data set, for use with GMT";
+ longDescription = ''
+ GSHHG is a high-resolution shoreline data set amalgamated from two
+ databases: Global Self-consistent Hierarchical High-resolution Shorelines
+ (GSHHS) and CIA World Data Bank II (WDBII). GSHHG contains vector
+ descriptions at five different resolutions of land outlines, lakes,
+ rivers, and political boundaries. This data is for use by GMT, the Generic
+ Mapping Tools.
+ '';
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ tviti ];
+ };
+
+}
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 72e84620252fb..130c0af6ee20d 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -10,7 +10,7 @@ let
[ qscintilla-qt5 gdal jinja2 numpy psycopg2
chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
in mkDerivation rec {
- version = "3.10.7";
+ version = "3.10.9";
pname = "qgis";
name = "${pname}-unwrapped-${version}";
@@ -18,7 +18,7 @@ in mkDerivation rec {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings ["."] ["_"] version}";
- sha256 = "0z593n5g3zwhlzhs0z7nlpblz6z2rl3y7y3j1wf1rdx76i8p3qgf";
+ sha256 = "0d646hvrhhgsw789qc2g3iblmsvr64qh15jck1jkaljzrj3qbml6";
};
passthru = {
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 053272b1efa78..716972342edf8 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -1,27 +1,90 @@
-{ stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma,
- libharu, opencv2, vigra, postgresql, Cocoa,
- unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }:
+{ stdenv
+, fetchurl
+# native
+, autoreconfHook
+, pkg-config
+# not native
+, gdal
+, wxGTK31-gtk3
+, proj_5
+, dxflib
+, curl
+, libiodbc
+, lzma
+, libharu
+, opencv
+, vigra
+, postgresql
+, Cocoa
+, unixODBC
+, poppler
+, hdf4
+, hdf5
+, netcdf
+, sqlite
+, qhull
+, giflib
+, libsvm
+, fftw
+}:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "saga";
- version = "7.6.3";
+ version = "7.7.0";
+ src = fetchurl {
+ url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${stdenv.lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
+ sha256 = "1nmvrlcpcm2pas9pnav13iydnym9d8yqqnwq47lm0j6b0a2wy9zk";
+ };
+
+ nativeBuildInputs = [
+ # Upstream's gnerated ./configure is not reliable
+ autoreconfHook
+ pkg-config
+ ];
+ configureFlags = [
+ "--with-system-svm"
+ # hdf is no detected otherwise
+ "HDF5_LIBS=-l${hdf5}/lib"
+ "HDF5_CFLAGS=-I${hdf5.dev}/include"
+ ];
+ buildInputs = [
+ curl
+ dxflib
+ fftw
+ libsvm
+ hdf5
+ gdal
+ wxGTK31-gtk3
+ proj_5
+ libharu
+ opencv
+ vigra
+ postgresql
+ libiodbc
+ lzma
+ qhull
+ giflib
+ ]
# See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
# for why the have additional buildInputs on darwin
- buildInputs = [ gdal wxGTK30 proj libharu opencv2 vigra postgresql libiodbc lzma
- qhull giflib ]
- ++ stdenv.lib.optionals stdenv.isDarwin
- [ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ];
+ ++ stdenv.lib.optionals stdenv.isDarwin [
+ Cocoa
+ unixODBC
+ poppler
+ netcdf
+ sqlite
+ ];
+
+ patches = [
+ # See https://sourceforge.net/p/saga-gis/bugs/280/
+ ./opencv4.patch
+ ];
enableParallelBuilding = true;
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
- src = fetchurl {
- url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.6.3/saga-7.6.3.tar.gz";
- sha256 = "0f1qy2y929gd9y7h45bkv9x71xapbzyn06v6wqivjaiydsi1qycb";
- };
-
meta = with stdenv.lib; {
description = "System for Automated Geoscientific Analyses";
homepage = "http://www.saga-gis.org";
diff --git a/pkgs/applications/gis/saga/opencv4.patch b/pkgs/applications/gis/saga/opencv4.patch
new file mode 100644
index 0000000000000..0b26192bf09bd
--- /dev/null
+++ b/pkgs/applications/gis/saga/opencv4.patch
@@ -0,0 +1,14 @@
+--- a/src/tools/imagery/imagery_opencv/Makefile.am
++++ b/src/tools/imagery/imagery_opencv/Makefile.am
+@@ -7,9 +7,9 @@
+
+ if HAVE_CV
+ DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+-CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv
++CXX_INCS = -I$(top_srcdir)/src/saga_core `pkg-config opencv4 --cflags`
+ AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
+-AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv --libs`
++AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv4 --libs`
+ pkglib_LTLIBRARIES = libimagery_opencv.la
+ libimagery_opencv_la_SOURCES =\
+ MLB_Interface.cpp\
diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix
index c26243c0c59b1..0ac19c0d13361 100644
--- a/pkgs/applications/gis/whitebox-tools/default.nix
+++ b/pkgs/applications/gis/whitebox-tools/default.nix
@@ -19,6 +19,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html";
license = licenses.mit;
maintainers = [ maintainers.mpickering ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 8da44a7a060b7..e7abc94a42641 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -13,8 +13,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "7.0.10-25";
- sha256 = "15y07kgy4mx3qyxsbd9g6s2yaa2mxnfvfzas35jw0vz6qjjyaw5c";
+ version = "7.0.10-27";
+ sha256 = "1fqwbg2ws6ix3bymx7ncb4k4f6bg8q44n9xnlvngjapflnrmhcph";
patches = [];
};
in
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 6327548dc1421..71c2de08a5693 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -7,12 +7,12 @@
}:
stdenv.mkDerivation rec {
- version = "3.0.2";
+ version = "3.2.1";
pname = "darktable";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
- sha256 = "1yrnkw8c47kmy2x6m1xp69hwyk02xyc8pd9kvcmyj54lzrhzdfka";
+ sha256 = "035rvqmw386hm0jpi14lf4dnpr5rjkalzjkyprqh42nwi3m86dkf";
};
nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 63b8d7b3f6091..b2a0396560178 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
+{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
# For `digitaglinktree`
, perl, sqlite
@@ -33,7 +33,6 @@
, libkipi
, libksane
, liblqr1
-, libqtav
, libusb1
, marble
, libGL
@@ -52,13 +51,11 @@
mkDerivation rec {
pname = "digikam";
- version = "6.2.0";
+ version = "6.4.0";
- src = fetchFromGitHub {
- owner = "KDE";
- repo = "digikam";
- rev = "v${version}";
- sha256 = "1l1nb1nwicmip2jxhn5gzr7h60igvns0zs3kzp36r6qf4wvg3v2z";
+ src = fetchurl {
+ url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
+ sha256 = "0vwd97zkxv30y8x0z76s4fsj4w9ysgsmpjclp2h2bpava7zi4l3p";
};
nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
@@ -76,7 +73,6 @@ mkDerivation rec {
libkipi
libksane
liblqr1
- libqtav
libusb1
libGL
libGLU
diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix
deleted file mode 100644
index ccd4fd660f76c..0000000000000
--- a/pkgs/applications/graphics/draftsight/default.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU, libGL, xdg_utils,
- dbus, alsaLib, cups, fontconfig, glib, icu, libpng12,
- xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc,
- libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
- libXrender, libXcomposite }:
-
-let version = "2018SP2"; in
-stdenv.mkDerivation {
- pname = "draftsight";
- inherit version;
-
- nativeBuildInputs = [ dpkg makeWrapper ];
-
- unpackPhase = ''
- mkdir $out
- mkdir $out/draftsight
- dpkg -x $src $out/draftsight
- '';
-
- # Both executables and bundled libraries need patching to find their
- # dependencies. The makeWrapper & QT_XKB_CONFIG_ROOT is to
- # alleviate "xkbcommon: ERROR: failed to add default include path
- # /usr/share/X11/xkb" and "Qt: Failed to create XKB context!".
- installPhase = ''
- mkdir $out/bin
- for exe in DraftSight dsHttpApiController dsHttpApiService FxCrashRptApp HelpGuide; do
- echo "Patching $exe..."
- patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath $libPath:\$ORIGIN/../Libraries \
- $out/draftsight/opt/dassault-systemes/DraftSight/Linux/$exe
- makeWrapper $out/draftsight/opt/dassault-systemes/DraftSight/Linux/$exe \
- $out/bin/$exe \
- --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb"
- done
- for lib in $out/draftsight/opt/dassault-systemes/DraftSight/Libraries/*.so*; do
- # DraftSight ships with broken symlinks for some reason
- if [ -f $(readlink -f $lib) ]
- then
- echo "Patching $lib..."
- patchelf --set-rpath $libPath:\$ORIGIN/../Libraries $lib
- else
- echo "Ignoring broken link $lib"
- fi
- done
- for lib in $out/draftsight/opt/dassault-systemes/DraftSight/APISDK/lib/cpp/*.so*; do
- if [ -f $(readlink $lib) ]
- then
- echo "Patching $lib..."
- chmod u+w $lib
- patchelf --set-rpath $libPath:\$ORIGIN/../Libraries $lib
- else
- echo "Ignoring broken link $lib"
- fi
- done
- # These libraries shouldn't really be here anyway:
- find $out/draftsight/opt/dassault-systemes/DraftSight/APISDK/Samples/C++ \
- -type d -name _lib | xargs rm -r
- '';
-
- # TODO: Figure out why HelpGuide segfaults at startup.
-
- # This must be here for main window graphics to appear (without it
- # it also gives the error: "QXcbIntegration: Cannot create platform
- # OpenGL context, neither GLX nor EGL are enabled"). My guess is
- # that it dlopen()'s libraries in paths removed by shrinking RPATH.
- dontPatchELF = true;
-
- src = fetchurl {
- name = "draftSight.deb";
- url = "http://dl-ak.solidworks.com/nonsecure/draftsight/${version}/draftSight.deb";
- sha256 = "05lrvml0zkzqg0sj6sj2h8h66hxdmsw5fg9fwz923r1y8j48qxdx";
- };
-
- libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU libGL xdg_utils
- dbus alsaLib cups.lib fontconfig glib icu libpng12
- xkeyboard_config zlib libxslt libxml2 sqlite orc libX11
- libXcursor libXrandr libxcb libXi libSM libICE libXrender
- libXcomposite ];
-
- meta = with stdenv.lib; {
- description = "2D design & drafting application, meant to be similar to AutoCAD";
- longDescription = "Professional-grade 2D design and drafting solution from Dassault Systèmes that lets you create, edit, view and mark up any kind of 2D CAD drawing.";
- homepage = "https://www.3ds.com/products-services/draftsight-cad-software/";
- license = stdenv.lib.licenses.unfree;
- maintainers = with maintainers; [ hodapp ];
- platforms = [ "x86_64-linux" ];
- };
-}
diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index f678e50f4d374..5d037bba5ba56 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
- version = "13.5.7";
+ version = "13.6.2";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
- sha256 = "1b2sb44zsa6g5nnsa7drn4fn61jfz3a3g3bisai85fyjff746ipc";
+ sha256 = "17nahdv06d41vyqkcqflf652wjp410i3hn4rhlv5cnd3jcr5vgih";
};
nativeBuildInputs = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
];
runtimeDependencies = [
- systemd.lib
+ (lib.getLib systemd)
];
dontBuild = true;
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index 0ffcb5cdb410d..20e295c85e9f1 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -1,7 +1,8 @@
-{ lib
+{ stdenv
+, lib
, mkDerivation
-, fetchurl
-, cmake
+, fetchFromGitHub
+, fetchpatch
, extra-cmake-modules
# common deps
@@ -9,6 +10,7 @@
# client deps
, qtbase
+, qtkeychain
, qtmultimedia
, qtsvg
, qttools
@@ -23,6 +25,8 @@
# optional server deps
, libmicrohttpd
, libsodium
+, withSystemd ? stdenv.isLinux
+, systemd ? null
# options
, buildClient ? true
@@ -35,11 +39,9 @@
with lib;
let
- commonDeps = [
- karchive
- ];
clientDeps = [
qtbase
+ qtkeychain
qtmultimedia
qtsvg
qttools
@@ -49,40 +51,57 @@ let
libvpx # WebM video export
miniupnpc # automatic port forwarding
];
+
serverDeps = [
# optional:
libmicrohttpd # HTTP admin api
libsodium # ext-auth support
- ];
+ ] ++ optional withSystemd systemd;
+
kisDeps = [
qtx11extras
];
+ boolToFlag = bool:
+ if bool then "ON" else "OFF";
+
in mkDerivation rec {
pname = "drawpile";
version = "2.1.17";
- src = fetchurl {
- url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz";
- sha256 = "11lhn1mymhqk9g5sh384xhj3qw8h9lv88pr768y9q6kg3sl7nzzf";
+ src = fetchFromGitHub {
+ owner = "drawpile";
+ repo = "drawpile";
+ rev = "${version}";
+ sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM=";
};
- nativeBuildInputs = [
- cmake
- extra-cmake-modules
+ patches = [
+ # fix for libmicrohttpd 0.9.71
+ (fetchpatch {
+ url = "https://github.com/drawpile/Drawpile/commit/ed1a75deb113da2d1df91a28f557509c4897130e.diff";
+ sha256 = "sha256-54wabH5F3Hf+6vv9rpCwCRdhjSaUFtuF/mE1/U+CpOA=";
+ name = "mhdfix.patch"; })
+ ];
+
+ nativeBuildInputs = [ extra-cmake-modules ];
+
+ buildInputs = [
+ karchive
+ ]
+ ++ optionals buildClient clientDeps
+ ++ optionals buildServer serverDeps
+ ++ optionals enableKisTablet kisDeps;
+
+ cmakeFlags = [
+ "-Wno-dev"
+ "-DINITSYS=systemd"
+ "-DCLIENT=${boolToFlag buildClient}"
+ "-DSERVER=${boolToFlag buildServer}"
+ "-DSERVERGUI=${boolToFlag buildServerGui}"
+ "-DTOOLS=${boolToFlag buildExtraTools}"
+ "-DKIS_TABLET=${boolToFlag enableKisTablet}"
];
- buildInputs =
- commonDeps ++
- optionals buildClient clientDeps ++
- optionals buildServer serverDeps ++
- optionals enableKisTablet kisDeps ;
-
- cmakeFlags =
- optional (!buildClient ) "-DCLIENT=off" ++
- optional (!buildServer ) "-DSERVER=off" ++
- optional (!buildServerGui ) "-DSERVERGUI=off" ++
- optional ( buildExtraTools) "-DTOOLS=on" ++
- optional ( enableKisTablet) "-DKIS_TABLET=on";
meta = {
description = "A collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously";
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 4782d9201480d..82128f81353fa 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -7,11 +7,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "feh";
- version = "3.4.1";
+ version = "3.5";
src = fetchurl {
url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
- sha256 = "0yvvj1s7ayn0lwils582smwkmckdk0gij5c58g45n4xh981n693q";
+ sha256 = "07jklibpi4ig9pbdrwhllsfffxn2h8xf4ma36qii00w4hb69v3rq";
};
outputs = [ "out" "man" "doc" ];
diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix
index 1c1c6ba08ee28..2962825e49b13 100644
--- a/pkgs/applications/graphics/gcolor3/default.nix
+++ b/pkgs/applications/graphics/gcolor3/default.nix
@@ -1,31 +1,40 @@
-{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook
-, fetchpatch }:
+{ stdenv
+, fetchFromGitLab
+, meson
+, ninja
+, gettext
+, pkg-config
+, libxml2
+, gtk3
+, libportal
+, wrapGAppsHook
+}:
-let
- version = "2.3.1";
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "gcolor3";
- inherit version;
+ version = "2.4.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "gcolor3";
rev = "v${version}";
- sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7";
+ sha256 = "rHIAjk2m3Lkz11obgNZaapa1Zr2GDH7XzgzuAJmq+MU=";
};
- patches = [
- # Remove useage of deprecrated G_PARAM_PRIVATE
- (fetchpatch {
- url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch";
- sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9";
- })
+ nativeBuildInputs = [
+ meson
+ ninja
+ gettext
+ pkg-config
+ libxml2 # xml-stripblanks preprocessing of GResource
+ wrapGAppsHook
];
- nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ];
-
- buildInputs = [ gtk3 hicolor-icon-theme ];
+ buildInputs = [
+ gtk3
+ libportal
+ ];
postPatch = ''
chmod +x meson_install.sh # patchShebangs requires executable file
@@ -34,7 +43,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A simple color chooser written in GTK3";
- homepage = "https://www.hjdskes.nl/projects/gcolor3/";
+ homepage = "https://gitlab.gnome.org/World/gcolor3";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index aa440f2c47a1e..6ec15bf02ab27 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -131,6 +131,21 @@ in stdenv.mkDerivation rec {
gegl
];
+ configureFlags = [
+ "--without-webkit" # old version is required
+ "--disable-check-update"
+ "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
+ "--with-icc-directory=/run/current-system/sw/share/color/icc"
+ # fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
+ "--libdir=\${exec_prefix}/lib"
+ ];
+
+ enableParallelBuilding = true;
+
+ # on Darwin,
+ # test-eevl.c:64:36: error: initializer element is not a compile-time constant
+ doCheck = !stdenv.isDarwin;
+
# Check if librsvg was built with --disable-pixbuf-loader.
PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}";
@@ -155,21 +170,6 @@ in stdenv.mkDerivation rec {
gtk = gtk2;
};
- configureFlags = [
- "--without-webkit" # old version is required
- "--disable-check-update"
- "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
- "--with-icc-directory=/run/current-system/sw/share/color/icc"
- # fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
- "--libdir=\${exec_prefix}/lib"
- ];
-
- # on Darwin,
- # test-eevl.c:64:36: error: initializer element is not a compile-time constant
- doCheck = !stdenv.isDarwin;
-
- enableParallelBuilding = true;
-
meta = with lib; {
description = "The GNU Image Manipulation Program";
homepage = "https://www.gimp.org/";
diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix
index 8660f6f218e26..337b8f4cba6c2 100644
--- a/pkgs/applications/graphics/gnome-photos/default.nix
+++ b/pkgs/applications/graphics/gnome-photos/default.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
};
tests = {
- installed-tests = nixosTests.gnome-photos;
+ installed-tests = nixosTests.installed-tests.gnome-photos;
};
};
diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix
new file mode 100644
index 0000000000000..1ed5f07c5f0af
--- /dev/null
+++ b/pkgs/applications/graphics/lightburn/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, patchelf, fetchurl, p7zip
+, nss, nspr, libusb1
+, qtbase, qtmultimedia, qtserialport
+, autoPatchelfHook, wrapQtAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "lightburn";
+ version = "0.9.15";
+
+ nativeBuildInputs = [
+ p7zip
+ autoPatchelfHook
+ wrapQtAppsHook
+ ];
+
+ src = fetchurl {
+ url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
+ sha256 = "1dwmrili4jfw55gnlnda3imgli7f4jqz9smwlynf7k87lxrhppmh";
+ };
+
+ buildInputs = [
+ nss nspr libusb1
+ qtbase qtmultimedia qtserialport
+ ];
+
+ # We nuke the vendored Qt5 libraries that LightBurn ships and instead use our
+ # own.
+ unpackPhase = ''
+ 7z x $src
+ rm -rf LightBurn/lib LightBurn/plugins
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share $out/bin
+ cp -ar LightBurn $out/share/LightBurn
+ ln -s $out/share/LightBurn/LightBurn $out/bin
+
+ wrapQtApp $out/bin/LightBurn
+ '';
+
+ meta = {
+ description = "LightBurn is layout, editing, and control software for your laser cutter.";
+ homepage = "https://lightburnsoftware.com/";
+ license = stdenv.lib.licenses.unfree;
+ maintainers = with stdenv.lib.maintainers; [ q3k ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix
index 8e8032a1f31bf..bde8999eb41cc 100644
--- a/pkgs/applications/graphics/meshlab/default.nix
+++ b/pkgs/applications/graphics/meshlab/default.nix
@@ -1,4 +1,6 @@
-{ mkDerivation, lib, fetchFromGitHub
+{ mkDerivation
+, lib
+, fetchFromGitHub
, fetchpatch
, libGLU
, qtbase
@@ -17,13 +19,13 @@
mkDerivation rec {
pname = "meshlab";
- version = "2020.03";
+ version = "2020.07";
src = fetchFromGitHub {
owner = "cnr-isti-vclab";
repo = "meshlab";
- rev = "f3568e75c9aed6da8bb105a1c8ac7ebbe00e4536";
- sha256 = "17g9icgy1w67afxiljzxk94dyhj4f336gjxn0bhppd58xfqh8w4g";
+ rev = "Meshlab-${version}";
+ sha256 = "0vj849b57zk3k6lx35zzcjhr9gdy4hxqnnkb8chwy7hw262cm3ri";
fetchSubmodules = true; # for vcglib
};
@@ -44,12 +46,13 @@ mkDerivation rec {
nativeBuildInputs = [ cmake ];
- patches = [ ./no-build-date.patch ];
-
- # MeshLab computes the version based on the build date, remove when https://github.com/cnr-isti-vclab/meshlab/issues/622 is fixed.
- postPatch = ''
- substituteAll ${./fix-version.patch} /dev/stdout | patch -p1 --binary
- '';
+ patches = [
+ # Make cmake use the system qhull. The next meshlab will not need this patch because it is already in master.
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/cnr-isti-vclab/meshlab/pull/747.patch";
+ sha256 = "0wx9f6zn458xz3lsqcgvsbwh1pgi3g0lah93nlbsb0sagng7n565";
+ })
+ ];
preConfigure = ''
substituteAll ${./meshlab.desktop} install/linux/resources/meshlab.desktop
@@ -62,7 +65,7 @@ mkDerivation rec {
"-DALLOW_BUNDLED_LIB3DS=OFF"
"-DALLOW_BUNDLED_MUPARSER=OFF"
"-DALLOW_BUNDLED_QHULL=OFF"
- # disable when available in nixpkgs
+ # disable when available in nixpkgs
"-DALLOW_BUNDLED_OPENCTM=ON"
"-DALLOW_BUNDLED_SSYNTH=ON"
# some plugins are disabled unless these are on
@@ -70,6 +73,11 @@ mkDerivation rec {
"-DALLOW_BUNDLED_LEVMAR=ON"
];
+ postFixup = ''
+ patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
+ patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlabserver-wrapped
+ '';
+
# Meshlab is not format-security clean; without disabling hardening, we get:
# src/common/GLLogStream.h:61:37: error: format not a string literal and no format arguments [-Werror=format-security]
# 61 | int chars_written = snprintf(buf, buf_size, f, std::forward(ts)...);
@@ -82,7 +90,7 @@ mkDerivation rec {
description = "A system for processing and editing 3D triangular meshes.";
homepage = "http://www.meshlab.net/";
license = lib.licenses.gpl3;
- maintainers = with lib.maintainers; [viric];
+ maintainers = with lib.maintainers; [ viric ];
platforms = with lib.platforms; linux;
};
}
diff --git a/pkgs/applications/graphics/meshlab/fix-version.patch b/pkgs/applications/graphics/meshlab/fix-version.patch
deleted file mode 100644
index 5184dfcba25d0..0000000000000
--- a/pkgs/applications/graphics/meshlab/fix-version.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/src/common/mlapplication.h
-+++ b/src/common/mlapplication.h
-@@ -23 +23 @@ public:
-- return QString::number(compileTimeYear()) + "." + (compileTimeMonth() < 10 ? "0" + QString::number(compileTimeMonth()) : QString::number(compileTimeMonth()));
-+ return "@version@";
diff --git a/pkgs/applications/graphics/meshlab/meshlab.desktop b/pkgs/applications/graphics/meshlab/meshlab.desktop
index a9c7ef7978426..aa8de186440d5 100644
--- a/pkgs/applications/graphics/meshlab/meshlab.desktop
+++ b/pkgs/applications/graphics/meshlab/meshlab.desktop
@@ -10,6 +10,5 @@ Exec=@out@/bin/meshlab %U
TryExec=@out@/bin/meshlab
Icon=@out@/share/icons/hicolor/meshlab.png
Terminal=false
-MimeType=model/mesh;application/x-3ds;image/x-3ds;application/sla;
+MimeType=model/mesh;application/x-3ds;image/x-3ds;model/x-ply;application/sla;model/x-quad-object;model/x-geomview-off;application/x-cyclone-ptx;application/x-vmi;application/x-bre;model/vnd.collada+xml;model/openctm;application/x-expe-binary;application/x-expe-ascii;application/x-xyz;application/x-gts;chemical/x-pdb;application/x-tri;application/x-asc;model/x3d+xml;model/x3d+vrml;model/vrml;model/u3d;model/idtf;
Categories=Graphics;3DGraphics;Viewer;Qt;
-END_DESKTOP
\ No newline at end of file
diff --git a/pkgs/applications/graphics/meshlab/no-build-date.patch b/pkgs/applications/graphics/meshlab/no-build-date.patch
deleted file mode 100644
index 9588596e5b2c2..0000000000000
--- a/pkgs/applications/graphics/meshlab/no-build-date.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/meshlab/mainwindow_RunTime.cpp
-+++ b/src/meshlab/mainwindow_RunTime.cpp
-@@ -3312 +3312 @@ void MainWindow::about()
-- temp.labelMLName->setText(MeshLabApplication::completeName(MeshLabApplication::HW_ARCHITECTURE(QSysInfo::WordSize))+" (built on "+__DATE__+")");
-+ temp.labelMLName->setText(MeshLabApplication::completeName(MeshLabApplication::HW_ARCHITECTURE(QSysInfo::WordSize)));
---- a/src/meshlabplugins/filter_plymc/plymc_main.cpp
-+++ b/src/meshlabplugins/filter_plymc/plymc_main.cpp
-@@ -121 +121 @@ int main(int argc, char *argv[])
-- printf( "\n PlyMC "_PLYMC_VER" ("__DATE__")\n"
-+ printf( "\n PlyMC "_PLYMC_VER"\n"
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index ae7499022047d..d23c02dbbdff6 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -18,13 +18,13 @@
mkDerivation rec {
pname = "nomacs";
- version = "3.16.224";
+ version = "3.17.2206";
src = fetchFromGitHub {
owner = "nomacs";
repo = "nomacs";
rev = version;
- sha256 = "05d4hqg0gl3g9s2xf1hr7mc7g4cqarcap4nzxxa51fsphw2b8x16";
+ sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/odafileconverter/default.nix b/pkgs/applications/graphics/odafileconverter/default.nix
new file mode 100644
index 0000000000000..0378c4db13b68
--- /dev/null
+++ b/pkgs/applications/graphics/odafileconverter/default.nix
@@ -0,0 +1,53 @@
+{ lib, stdenv, mkDerivation, dpkg, fetchurl, qtbase }:
+
+let
+ # To obtain the version you will need to run the following command:
+ #
+ # dpkg-deb -I ${odafileconverter.src} | grep Version
+ version = "21.7.0.0";
+ rpath = "$ORIGIN:${lib.makeLibraryPath [ stdenv.cc.cc qtbase ]}";
+
+in mkDerivation {
+ pname = "oda-file-converter";
+ inherit version;
+ nativeBuildInputs = [ dpkg ];
+
+ src = fetchurl {
+ # NB: this URL is not stable (i.e. the underlying file and the corresponding version will change over time)
+ url = "https://download.opendesign.com/guestfiles/ODAFileConverter/ODAFileConverter_QT5_lnxX64_7.2dll.deb";
+ sha256 = "0sa21nnwzqb6g7gl0z43smqgcd9h3xipj3cq2cl7ybfh3cvcxfi9";
+ };
+
+ unpackPhase = ''
+ dpkg -x $src oda_unpacked
+ sourceRoot=$PWD/oda_unpacked
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin $out/lib
+ cp -vr $sourceRoot/usr/bin/ODAFileConverter_${version} $out/libexec
+ cp -vr $sourceRoot/usr/share $out/share
+ '';
+
+ dontWrapQtApps = true;
+ fixupPhase = ''
+ echo "setting interpreter"
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/libexec/ODAFileConverter
+ patchelf --set-rpath '${rpath}' $out/libexec/ODAFileConverter
+ wrapQtApp $out/libexec/ODAFileConverter
+ mv $out/libexec/ODAFileConverter $out/bin
+
+ find $out/libexec -type f -executable | while read file; do
+ echo "patching $file"
+ patchelf --set-rpath '${rpath}' $file
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "For converting between different versions of .dwg and .dxf";
+ homepage = "https://www.opendesign.com/guestfiles/oda_file_converter";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ nagisa ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix
new file mode 100644
index 0000000000000..68830699699e2
--- /dev/null
+++ b/pkgs/applications/graphics/opentoonz/default.nix
@@ -0,0 +1,51 @@
+{ boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint
+, libpng, libtiff, libusb1, lz4, lzma, lzo, openblas, pkgconfig, qtbase
+, qtmultimedia, qtscript, stdenv, superlu, wrapQtAppsHook, }:
+let source = import ./source.nix { inherit fetchFromGitHub; };
+in stdenv.mkDerivation rec {
+ inherit (source) src;
+
+ pname = "opentoonz";
+ version = source.versions.opentoonz;
+
+ nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
+
+ buildInputs = [
+ boost
+ freeglut
+ freetype
+ glew
+ libjpeg
+ libmypaint
+ libpng
+ libtiff
+ libusb1
+ lz4
+ lzma
+ lzo
+ openblas
+ qtbase
+ qtmultimedia
+ qtscript
+ superlu
+ ];
+
+ postUnpack = "sourceRoot=$sourceRoot/toonz";
+
+ cmakeDir = "../sources";
+ cmakeFlags = [
+ "-DTIFF_INCLUDE_DIR=${libtiff.dev}/include"
+ "-DTIFF_LIBRARY=${libtiff.out}/lib/libtiff.so"
+ ];
+
+ postInstall = ''
+ sed -i '/cp -r .*stuff/a\ chmod -R u+w $HOME/.config/OpenToonz/stuff' $out/bin/opentoonz
+ '';
+
+ meta = {
+ description = "Full-featured 2D animation creation software";
+ homepage = "https://opentoonz.github.io/";
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = with stdenv.lib.maintainers; [ chkno ];
+ };
+}
diff --git a/pkgs/applications/graphics/opentoonz/libtiff.nix b/pkgs/applications/graphics/opentoonz/libtiff.nix
new file mode 100644
index 0000000000000..6663c47553e3a
--- /dev/null
+++ b/pkgs/applications/graphics/opentoonz/libtiff.nix
@@ -0,0 +1,21 @@
+# Per https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md ,
+# opentoonz requires its own modified version of libtiff. We still build it as
+# a separate package
+# 1. For visibility for tools like vulnix, and
+# 2. To avoid a diamond-dependency problem with qt linking the normal libtiff
+# and opentoonz linking qt and this modified libtiff, we build a qt against
+# this modified libtiff as well.
+
+{ fetchFromGitHub, libtiff }:
+let source = import ./source.nix { inherit fetchFromGitHub; };
+in libtiff.overrideAttrs (old: {
+ inherit (source) src;
+ version = source.versions.libtiff + "-opentoonz";
+ postUnpack = (old.postUnpack or "") + ''
+ sourceRoot="$sourceRoot/thirdparty/tiff-${source.versions.libtiff}"
+ '';
+ # opentoonz uses internal libtiff headers
+ postInstall = (old.postInstall or "") + ''
+ cp libtiff/{tif_config,tif_dir,tiffiop}.h $dev/include
+ '';
+})
diff --git a/pkgs/applications/graphics/opentoonz/source.nix b/pkgs/applications/graphics/opentoonz/source.nix
new file mode 100644
index 0000000000000..7378d2f5f9654
--- /dev/null
+++ b/pkgs/applications/graphics/opentoonz/source.nix
@@ -0,0 +1,16 @@
+# opentoonz's source archive contains both opentoonz's source and a modified
+# version of libtiff that opentoonz requires.
+
+{ fetchFromGitHub, }: rec {
+ versions = {
+ opentoonz = "1.4.0";
+ libtiff = "4.0.3";
+ };
+
+ src = fetchFromGitHub {
+ owner = "opentoonz";
+ repo = "opentoonz";
+ rev = "v${versions.opentoonz}";
+ sha256 = "0vgclx2yydsm5i2smff3fj8m750nhf35wfhva37kywgws01s189b";
+ };
+}
diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix
index e6037c6fce396..a1c354b2ac5b7 100644
--- a/pkgs/applications/graphics/pdfcpu/default.nix
+++ b/pkgs/applications/graphics/pdfcpu/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "09alkpfyxapycv6zsaz7prgbr0a1jzd78n7w2mh01mg4hhb2j3k7";
+ doCheck = false;
+
subPackages = [ "cmd/pdfcpu" ];
meta = with stdenv.lib; {
@@ -20,6 +22,5 @@ buildGoModule rec {
homepage = "https://pdfcpu.io";
license = licenses.asl20;
maintainers = with maintainers; [ doronbehar ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index edd923822ea39..19e8121ac08d8 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -91,7 +91,7 @@ in stdenv.mkDerivation rec {
$out/opt/pencil/pencil
# fix missing libudev
- ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/pencil/libudev.so.1
+ ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/pencil/libudev.so.1
wrapProgram $out/opt/pencil/pencil \
--prefix LD_LIBRARY_PATH : $out/opt/pencil
'';
diff --git a/pkgs/applications/graphics/qosmic/default.nix b/pkgs/applications/graphics/qosmic/default.nix
new file mode 100644
index 0000000000000..96823441b6e16
--- /dev/null
+++ b/pkgs/applications/graphics/qosmic/default.nix
@@ -0,0 +1,70 @@
+{ mkDerivation
+, fetchFromGitHub
+, fetchpatch
+, qmake
+, wrapQtAppsHook
+, qtbase
+, pkg-config
+, lua
+, flam3
+, libxml2
+, libpng
+, libjpeg
+, lib
+}:
+
+mkDerivation rec {
+ pname = "qosmic";
+ version = "1.6.0";
+
+ src = fetchFromGitHub {
+ owner = "bitsed";
+ repo = "qosmic";
+ rev = "v${version}";
+ sha256 = "13nw1mkdib14430r21mj352v62vi546vf184vyhxm7yjjygyra1w";
+ };
+
+ patches = [
+ # Allow overriding PREFIX (to install to $out,
+ # written while creating this derivation)
+ # https://github.com/bitsed/qosmic/pull/39
+ (fetchpatch {
+ name = "allow-overriding-PREFIX.patch";
+ url = "https://github.com/bitsed/qosmic/commit/77fb3a577b0710efae2a1d9ed97c26ae16f3a5ba.patch";
+ sha256 = "0v9hj9s78cb6bg8ca0wjkbr3c7ml1n51n8h4a70zpzzgzz7rli5b";
+ })
+ # Fix QButtonGroup include errors with Qt 5.11:
+ # Will be part of the next post-1.6.0 release
+ (fetchpatch {
+ name = "fix-class-QButtonGroup-include-errors-with-Qt-5.11.patch";
+ url = "https://github.com/bitsed/qosmic/commit/3f6e1ea8d384a124dbc2d568171a4da798480752.patch";
+ sha256 = "0bp6b759plkqs32nvfpkfvf3qqzc9716k3ycwnjvwabbvpg1xwbl";
+ })
+ ];
+
+ nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];
+
+ buildInputs = [
+ qtbase
+ lua
+ flam3
+ libxml2
+ libpng
+ libjpeg
+ ];
+
+ qmakeFlags = [
+ # Use pkg-config to correctly locate library paths
+ "-config" "link_pkgconfig"
+ ];
+
+ meta = with lib; {
+ description = "A cosmic recursive flame fractal editor";
+ homepage = "https://github.com/bitsed/qosmic";
+ license = licenses.gpl3Plus;
+ maintainers = [ maintainers.raboof ];
+ # It might be possible to make it work on OSX,
+ # but this has not been tested.
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/graphics/runwayml/default.nix b/pkgs/applications/graphics/runwayml/default.nix
index eb8ecc34b8f35..9366276ebf84c 100644
--- a/pkgs/applications/graphics/runwayml/default.nix
+++ b/pkgs/applications/graphics/runwayml/default.nix
@@ -6,20 +6,19 @@
let
pname = "runwayml";
- version = "0.10.20";
+ version = "0.14.3";
name = "${pname}-${version}";
src = fetchurl {
- url = "https://runway-releases.s3.amazonaws.com/Runway%20${version}.AppImage";
- sha256 = "1wi94xi8nrwfc4v2j1crlmwr0nxg95ffp5h4hxd84crvya8ibxgz";
- name="${pname}-${version}.AppImage";
+ url = "https://runway-releases.s3.amazonaws.com/Runway-${version}.AppImage";
+ sha256 = "1bx8j39wd2z6f32hdvmk9z77bivnizzdhn296kin2nnqgq6v6y93";
};
binary = appimageTools.wrapType2 {
name = pname;
inherit src;
};
- # we only use this to extract the icon
+ # we only use this to extract the icon and desktop file
appimage-contents = appimageTools.extractType2 {
inherit name src;
};
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 3549a16e27059..c041d2dde8ccd 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -40,11 +40,11 @@
stdenv.mkDerivation rec {
pname = "shotwell";
- version = "0.31.1";
+ version = "0.31.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0mbgrad4d4snffw2z3rkhwqq1bkxdgy52pblx99vjadvpgspb034";
+ sha256 = "0ywzr6vgcz8yy60v0jp55na9lgqi4dbh2vakfphkcml1gpah0r2l";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix
index 41463a7627ae7..1addb2d7bd56a 100644
--- a/pkgs/applications/graphics/viewnior/default.nix
+++ b/pkgs/applications/graphics/viewnior/default.nix
@@ -1,24 +1,38 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, desktop-file-utils, gtk2, libpng, exiv2, lcms
, intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}:
stdenv.mkDerivation rec {
pname = "viewnior";
- version = "1.6";
+ version = "1.7";
src = fetchFromGitHub {
- owner = "xsisqox";
+ owner = "hellosiyan";
repo = "Viewnior";
rev = "${pname}-${version}";
- sha256 = "06ppv3r85l3id4ij6h4y5fgm3nib2587fdrdv9fccyi75zk7fs0p";
+ sha256 = "0y4hk3vq8psba5k615w18qj0kbdfp5w0lm98nv5apy6hmcpwfyig";
};
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs =
- [ pkgconfig gtk2 libpng exiv2 lcms intltool gettext
- shared-mime-info glib gdk-pixbuf perl
- ];
-
- meta = {
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkgconfig
+ desktop-file-utils
+ intltool
+ gettext
+ ];
+
+ buildInputs = [
+ gtk2
+ libpng
+ exiv2
+ lcms
+ shared-mime-info
+ glib
+ gdk-pixbuf
+ perl
+ ];
+
+ meta = with stdenv.lib; {
description = "Fast and simple image viewer";
longDescription =
'' Viewnior is insipred by big projects like Eye of Gnome, because of it's
@@ -27,13 +41,9 @@ stdenv.mkDerivation rec {
with the quality of it's functions. The program is made with better integration
in mind (follows Gnome HIG2).
'';
-
- license = stdenv.lib.licenses.gpl3;
-
+ license = licenses.gpl3;
homepage = "http://siyanpanayotov.com/project/viewnior/";
-
- maintainers = [ stdenv.lib.maintainers.smironov ];
-
- platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
+ maintainers = with maintainers; [ smironov artturin ];
+ platforms = platforms.gnu ++ platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix
index 380f70c7c9366..8396ce72e5067 100644
--- a/pkgs/applications/graphics/write_stylus/default.nix
+++ b/pkgs/applications/graphics/write_stylus/default.nix
@@ -1,29 +1,22 @@
{ mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, libX11, libXi, fetchurl, makeDesktopItem }:
let
- # taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon
- # license: Free for commercial use
- desktopIcon = fetchurl {
- url = "https://www.iconfinder.com/icons/50835/download/png/256";
- sha256 = "0abdya42yf9alxbsmc2nf8jwld50zfria6z3d4ncvp1zw2a9jhb8";
- };
-in
-mkDerivation rec {
- pname = "write_stylus";
- version = "300";
-
desktopItem = makeDesktopItem {
name = "Write";
exec = "Write";
comment = "A word processor for handwriting";
- icon = desktopIcon;
+ icon = "write_stylus";
desktopName = "Write";
genericName = "Write";
categories = "Office;Graphics";
};
+in
+mkDerivation rec {
+ pname = "write_stylus";
+ version = "300";
src = fetchurl {
url = "http://www.styluslabs.com/write/write${version}.tar.gz";
- sha256 = "1kg4qqxgg7iyxl13hkbl3j27dykra56dj67hbv0392mwdcgavihq";
+ sha256 = "0h1wf3af7jzp3f3l8mlnshi83d7a4v4y8nfqfai4lmskyicqlz7c";
};
sourceRoot = ".";
@@ -36,8 +29,11 @@ mkDerivation rec {
# symlink the binary to bin/
ln -s $out/Write/Write $out/bin/Write
+ # Create desktop item
mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications/
+ mkdir -p $out/share/icons
+ ln -s $out/Write/Write144x144.png $out/share/icons/write_stylus.png
'';
preFixup = let
libPath = lib.makeLibraryPath [
diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix
index 5c7b4c22a38bf..08ef0cd7b5844 100644
--- a/pkgs/applications/graphics/xfractint/default.nix
+++ b/pkgs/applications/graphics/xfractint/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, libX11, libXft}:
stdenv.mkDerivation rec {
pname = "xfractint";
- version = "20.04p15";
+ version = "20.04p16";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
src = fetchurl {
url = "https://www.fractint.net/ftp/current/linux/xfractint-${version}.tar.gz";
- sha256 = "1wv2hgyjvrjxzqxb55vz65ra80p24j8sd34llykk2qlx73x8f3nk";
+ sha256 = "1ba77jifxv8jql044mdydh4p4ms4w5vw3qrqmcfzlvqfxk7h2m2f";
};
buildInputs = [libX11 libXft];
diff --git a/pkgs/applications/graphics/yeetgif/default.nix b/pkgs/applications/graphics/yeetgif/default.nix
index 3ae1b98661a68..84bcdee5b76ed 100644
--- a/pkgs/applications/graphics/yeetgif/default.nix
+++ b/pkgs/applications/graphics/yeetgif/default.nix
@@ -18,6 +18,5 @@ buildGoPackage rec {
homepage = "https://github.com/sgreben/yeetgif";
license = with licenses; [ mit asl20 cc-by-nc-sa-40 ];
maintainers = with maintainers; [ ajs124 ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index 2c163445d5b05..7bb4e92179424 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, copyPathsToStore, lib, kdepimTeam,
+ mkDerivation, lib, kdepimTeam,
extra-cmake-modules, shared-mime-info,
boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin,
ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,
diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix
index 485397ec4aac3..1537bd25d55e8 100644
--- a/pkgs/applications/kde/calendarsupport.nix
+++ b/pkgs/applications/kde/calendarsupport.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- akonadi, akonadi-calendar, akonadi-mime, kcalutils, kdepim-apps-libs,
+ akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs,
kholidays, kidentitymanagement, kmime, pimcommon, qttools,
}:
@@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- akonadi akonadi-mime kcalutils kdepim-apps-libs kholidays pimcommon qttools
+ akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools
];
propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];
outputs = [ "out" "dev" ];
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 4767ff3c84bfc..8816ae3cbbc6d 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -100,7 +100,6 @@ let
kcalutils = callPackage ./kcalutils.nix {};
kcharselect = callPackage ./kcharselect.nix {};
kcolorchooser = callPackage ./kcolorchooser.nix {};
- kdav = callPackage ./kdav.nix {};
kdebugsettings = callPackage ./kdebugsettings.nix {};
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
@@ -147,6 +146,7 @@ let
kpat = callPackage ./kpat.nix {};
kpimtextedit = callPackage ./kpimtextedit.nix {};
ksmtp = callPackage ./ksmtp {};
+ ksquares = callPackage ./ksquares.nix {};
kqtquickcharts = callPackage ./kqtquickcharts.nix {};
kpkpass = callPackage ./kpkpass.nix {};
krdc = callPackage ./krdc.nix {};
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 3d632271869b9..90e1cf43f6b11 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=(http://download.kde.org/stable/release-service/20.04.3/src)
+WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.1/src)
diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix
index bb8a97e8341eb..6204919a32858 100644
--- a/pkgs/applications/kde/grantleetheme/default.nix
+++ b/pkgs/applications/kde/grantleetheme/default.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, copyPathsToStore, lib, kdepimTeam,
+ mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
grantlee, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase,
}:
@@ -11,7 +11,6 @@ mkDerivation {
maintainers = kdepimTeam;
};
output = [ "out" "dev" ];
- patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase
diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
deleted file mode 100644
index ebb81248475fa..0000000000000
--- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp
-index 27d5bc8..8d43140 100644
---- a/src/grantleetheme.cpp
-+++ b/src/grantleetheme.cpp
-@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePrivate &other)
- , description(other.description)
- , name(other.name)
- , dirName(other.dirName)
-- , absolutePath(other.absolutePath)
-+ , absolutePaths(other.absolutePaths)
- , author(other.author)
- , email(other.email)
- , loader(other.loader)
-@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine()
-
- void ThemePrivate::setupLoader()
- {
-- // Get the parent dir with themes, we set the theme directory separately
-- QDir dir(absolutePath);
-- dir.cdUp();
-+ QStringList templateDirs;
-+ for (const QString& path : absolutePaths) {
-+ QDir dir(path);
-+ dir.cdUp();
-+ templateDirs << dir.absolutePath();
-+ }
-
- loader = QSharedPointer::create();
-- loader->setTemplateDirs({ dir.absolutePath() });
-+ loader->setTemplateDirs(templateDirs);
- loader->setTheme(dirName);
-
- if (!sEngine) {
-@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, const QString &dirName, const QString &de
- KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
- if (group.isValid()) {
- d->dirName = dirName;
-- d->absolutePath = themePath;
-+ d->absolutePaths = QStringList(themePath);
- d->name = group.readEntry("Name", QString());
- d->description = group.readEntry("Description", QString());
- d->themeFileName = group.readEntry("FileName", QString());
-@@ -140,7 +143,7 @@ Theme::~Theme()
-
- bool Theme::operator==(const Theme &other) const
- {
-- return isValid() && other.isValid() && d->absolutePath == other.absolutePath();
-+ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();
- }
-
- Theme &Theme::operator=(const Theme &other)
-@@ -184,7 +187,12 @@ QString Theme::dirName() const
-
- QString Theme::absolutePath() const
- {
-- return d->absolutePath;
-+ return d->absolutePaths.first();
-+}
-+
-+QStringList Theme::absolutePaths() const
-+{
-+ return d->absolutePaths;
- }
-
- QString Theme::author() const
-@@ -223,6 +231,13 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con
- return result;
- }
-
-+void Theme::addThemeDir(const QString& path)
-+{
-+ QDir dir(path);
-+ dir.cdUp();
-+ d->absolutePaths << dir.absolutePath();
-+}
-+
- void Theme::addPluginPath(const QString &path)
- {
- if (!ThemePrivate::sEngine) {
-diff --git a/src/grantleetheme.h b/src/grantleetheme.h
-index a25c27b..be38299 100644
---- a/src/grantleetheme.h
-+++ b/src/grantleetheme.h
-@@ -48,11 +48,14 @@ public:
- Q_REQUIRED_RESULT QStringList displayExtraVariables() const;
- Q_REQUIRED_RESULT QString dirName() const;
- Q_REQUIRED_RESULT QString absolutePath() const;
-+ Q_REQUIRED_RESULT QStringList absolutePaths() const;
- Q_REQUIRED_RESULT QString author() const;
- Q_REQUIRED_RESULT QString authorEmail() const;
-
- Q_REQUIRED_RESULT QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray());
-
-+ void addThemeDir(const QString&);
-+
- static void addPluginPath(const QString &path);
-
- private:
-diff --git a/src/grantleetheme_p.h b/src/grantleetheme_p.h
-index eb73dcb..00510e9 100644
---- a/src/grantleetheme_p.h
-+++ b/src/grantleetheme_p.h
-@@ -43,7 +43,7 @@ public:
- QString description;
- QString name;
- QString dirName;
-- QString absolutePath;
-+ QStringList absolutePaths;
- QString author;
- QString email;
-
-diff --git a/src/grantleethememanager.cpp b/src/grantleethememanager.cpp
-index 606d717..dc99041 100644
---- a/src/grantleethememanager.cpp
-+++ b/src/grantleethememanager.cpp
-@@ -125,25 +125,18 @@ public:
-
- for (const QString &directory : qAsConst(themesDirectories)) {
- QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot);
-- QStringList alreadyLoadedThemeName;
- while (dirIt.hasNext()) {
- dirIt.next();
- const QString dirName = dirIt.fileName();
- GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
- if (theme.isValid()) {
- QString themeName = theme.name();
-- if (alreadyLoadedThemeName.contains(themeName)) {
-- int i = 2;
-- const QString originalName(theme.name());
-- while (alreadyLoadedThemeName.contains(themeName)) {
-- themeName = originalName + QStringLiteral(" (%1)").arg(i);
-- ++i;
-- }
-- theme.d->name = themeName;
-+ QMap::iterator i = themes.find(dirName);
-+ if (i != themes.end()) {
-+ i.value().addThemeDir(dirIt.filePath());
-+ } else {
-+ themes.insert(dirName, theme);
- }
-- alreadyLoadedThemeName << themeName;
-- themes.insert(dirName, theme);
-- //qDebug()<<" theme.name()"<addDir(directory);
-@@ -366,7 +359,7 @@ QString ThemeManager::pathFromThemes(const QString &themesRelativePath, const QS
- GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
- if (theme.isValid()) {
- if (dirName == themeName) {
-- return theme.absolutePath();
-+ return theme.absolutePaths().first();
- }
- }
- }
diff --git a/pkgs/applications/kde/grantleetheme/series b/pkgs/applications/kde/grantleetheme/series
deleted file mode 100644
index 9095599ea56b1..0000000000000
--- a/pkgs/applications/kde/grantleetheme/series
+++ /dev/null
@@ -1 +0,0 @@
-grantlee-merge-theme-dirs.patch
diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix
index 8224b98253b66..30955d1c27438 100644
--- a/pkgs/applications/kde/incidenceeditor.nix
+++ b/pkgs/applications/kde/incidenceeditor.nix
@@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs,
- kdiagram, kldap, kmime, qtbase,
+ kdiagram, kldap, kmime, pimcommon, qtbase
}:
mkDerivation {
@@ -14,7 +14,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram
- kldap kmime qtbase
+ kldap kmime pimcommon qtbase
];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix
index 6189e8706db0a..57c02ea4e84ce 100644
--- a/pkgs/applications/kde/kdepim-apps-libs/default.nix
+++ b/pkgs/applications/kde/kdepim-apps-libs/default.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, copyPathsToStore, lib, kdepimTeam,
+ mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets,
kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison,
@@ -11,7 +11,6 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
- patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets
diff --git a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch
deleted file mode 100644
index 02c369cc4ee84..0000000000000
--- a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
-===================================================================
---- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
-+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
-@@ -50,9 +50,9 @@ public:
- mTemplateLoader.clear();
- }
-
-- void changeGrantleePath(const QString &path)
-+ void changeGrantleePath(const QStringList &paths)
- {
-- mTemplateLoader->setTemplateDirs(QStringList() << path);
-+ mTemplateLoader->setTemplateDirs(paths);
- mEngine->addTemplateLoader(mTemplateLoader);
-
- mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html"));
-@@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee
-
- void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path)
- {
-- d->changeGrantleePath(path);
-+ d->changeGrantleePath(QStringList(path));
- }
-
- void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
- {
-- d->changeGrantleePath(theme.absolutePath());
-+ d->changeGrantleePath(theme.absolutePaths());
- }
-
- inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value)
-Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
-===================================================================
---- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
-+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
-@@ -74,9 +74,9 @@ public:
- mTemplateLoader.clear();
- }
-
-- void changeGrantleePath(const QString &path)
-+ void changeGrantleePath(const QStringList &paths)
- {
-- mTemplateLoader->setTemplateDirs(QStringList() << path);
-+ mTemplateLoader->setTemplateDirs(paths);
- mEngine->addTemplateLoader(mTemplateLoader);
-
- mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html"));
-@@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta
-
- void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path)
- {
-- d->changeGrantleePath(path);
-+ d->changeGrantleePath(QStringList(path));
- }
-
- void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
- {
-- d->changeGrantleePath(theme.absolutePath());
-+ d->changeGrantleePath(theme.absolutePaths());
- }
-
- void GrantleeContactFormatter::setForceDisableQRCode(bool b)
diff --git a/pkgs/applications/kde/kdepim-apps-libs/series b/pkgs/applications/kde/kdepim-apps-libs/series
deleted file mode 100644
index 1e8a52b55e964..0000000000000
--- a/pkgs/applications/kde/kdepim-apps-libs/series
+++ /dev/null
@@ -1 +0,0 @@
-kdepim-apps-libs-grantlee-merge-theme-dirs.patch
diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix
index 65719514f96b0..e0a5d43e654fd 100644
--- a/pkgs/applications/kde/kdepim-runtime/default.nix
+++ b/pkgs/applications/kde/kdepim-runtime/default.nix
@@ -1,11 +1,11 @@
{
- mkDerivation, copyPathsToStore, lib, kdepimTeam,
+ mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
shared-mime-info,
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
- kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
- pimcommon, qtwebengine, libkgapi, qtnetworkauth, qtspeech, qtxmlpatterns,
+ kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
+ pimcommon, qtwebengine, libkgapi, qca-qt5, qtnetworkauth, qtspeech, qtxmlpatterns,
}:
mkDerivation {
@@ -18,7 +18,7 @@ mkDerivation {
buildInputs = [
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
- kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
- pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns
+ kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
+ pimcommon libkgapi qca-qt5 qtnetworkauth qtspeech qtxmlpatterns
];
}
diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix
index 6b8941e57876c..d225eba822340 100644
--- a/pkgs/applications/kde/kmail.nix
+++ b/pkgs/applications/kde/kmail.nix
@@ -27,5 +27,4 @@ mkDerivation {
kdepim-addons
];
propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ];
- patches = [ ./kmail.patch ];
}
diff --git a/pkgs/applications/kde/kmail.patch b/pkgs/applications/kde/kmail.patch
deleted file mode 100644
index 71a23be2d8391..0000000000000
--- a/pkgs/applications/kde/kmail.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt
-index 48ed076..9c56896 100644
---- a/agents/archivemailagent/CMakeLists.txt
-+++ b/agents/archivemailagent/CMakeLists.txt
-@@ -22,6 +22,7 @@ ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui )
- add_library(archivemailagent STATIC ${libarchivemailagent_SRCS})
- target_link_libraries(archivemailagent
- KF5::MailCommon
-+ KF5::Libkdepim
- KF5::I18n
- KF5::Notifications
- KF5::IconThemes
-diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt
-index a56b730..83604cf 100644
---- a/agents/followupreminderagent/CMakeLists.txt
-+++ b/agents/followupreminderagent/CMakeLists.txt
-@@ -23,6 +23,7 @@ target_link_libraries(followupreminderagent
- KF5::AkonadiMime
- KF5::AkonadiAgentBase
- KF5::DBusAddons
-+ KF5::FollowupReminder
- KF5::XmlGui
- KF5::KIOWidgets
- KF5::Notifications
diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix
index 978baa925e5ac..eb28458392ce2 100644
--- a/pkgs/applications/kde/kontact.nix
+++ b/pkgs/applications/kde/kontact.nix
@@ -4,7 +4,7 @@
qtwebengine,
kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem,
akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,
- mailcommon, libkdepim
+ mailcommon, libkdepim, pimcommon
}:
mkDerivation {
@@ -18,6 +18,6 @@ mkDerivation {
qtwebengine
kcmutils kcrash kdbusaddons kparts kwindowsystem
akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit
- mailcommon libkdepim
+ mailcommon libkdepim pimcommon
];
}
diff --git a/pkgs/applications/kde/ksquares.nix b/pkgs/applications/kde/ksquares.nix
new file mode 100644
index 0000000000000..94a639a0d3700
--- /dev/null
+++ b/pkgs/applications/kde/ksquares.nix
@@ -0,0 +1,22 @@
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, libkdegames, kconfig, kcrash, kxmlgui }:
+
+mkDerivation {
+ name = "ksquares";
+ meta = with lib; {
+ homepage = "https://kde.org/applications/en/games/org.kde.ksquares";
+ description = "KSquares is a game of Dots and Boxes";
+ maintainers = with maintainers; [ freezeboy ];
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ };
+ nativeBuildInputs = [
+ extra-cmake-modules
+ ];
+ buildInputs = [
+ kdoctools
+ libkdegames
+ kconfig
+ kcrash
+ kxmlgui
+ ];
+}
diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix
index f002ff0f34032..5de58658777a7 100644
--- a/pkgs/applications/kde/mailimporter.nix
+++ b/pkgs/applications/kde/mailimporter.nix
@@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, karchive, kcompletion, kconfig, kcoreaddons, ki18n,
- kmime, kxmlgui, libkdepim
+ kmime, kxmlgui, libkdepim, pimcommon
}:
mkDerivation {
@@ -14,6 +14,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime
- kxmlgui libkdepim
+ kxmlgui libkdepim pimcommon
];
}
diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix
index cd9ff2528fac7..2e74f528aeb17 100644
--- a/pkgs/applications/kde/pimcommon.nix
+++ b/pkgs/applications/kde/pimcommon.nix
@@ -1,9 +1,9 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs,
+ akonadi, akonadi-contacts, akonadi-mime, akonadi-search, grantlee, karchive, kcmutils, kcodecs,
kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons,
- kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit,
+ kiconthemes, kimap, kio, kitemmodels, kjobwidgets, kldap, knewstuff, kpimtextedit,
kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine
}:
@@ -15,12 +15,12 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets
- kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit
+ akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets
+ kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpimtextedit
kpurpose kwallet kwindowsystem libkdepim qtwebengine
];
propagatedBuildInputs = [
- akonadi akonadi-contacts kconfig kcontacts kimap
+ akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap
];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 12a84991adb78..5bcb48acc1816 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -4,1739 +4,1731 @@
{
akonadi = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-20.04.3.tar.xz";
- sha256 = "c91cc53afd2f81fbeed55700cd86010ee865de2594948769410167e6992bdb32";
- name = "akonadi-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/akonadi-20.08.1.tar.xz";
+ sha256 = "f930de5fae376f138e87c6d67357ab799a3397d865b55c50f771b4427d85f495";
+ name = "akonadi-20.08.1.tar.xz";
};
};
akonadi-calendar = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-calendar-20.04.3.tar.xz";
- sha256 = "ff8732b0d09b87ce0760b7df02ee390d3c0c064780076ed4c6ed05c52ca634bb";
- name = "akonadi-calendar-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/akonadi-calendar-20.08.1.tar.xz";
+ sha256 = "896ec2523203022bf70e23897d59b64c8bfffad4ead5b6756555ab34a4047ef5";
+ name = "akonadi-calendar-20.08.1.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-calendar-tools-20.04.3.tar.xz";
- sha256 = "654fec93158e6623a8a81a371fa85d0a18b9f486f6c29926d97a8105a2d65ed2";
- name = "akonadi-calendar-tools-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/akonadi-calendar-tools-20.08.1.tar.xz";
+ sha256 = "21ccc2e1090eeda1eba0c29ab51c3bae1e8f57aedead569c4ed7995f5ad6cffc";
+ name = "akonadi-calendar-tools-20.08.1.tar.xz";
};
};
akonadiconsole = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadiconsole-20.04.3.tar.xz";
- sha256 = "acd6d63a30af49ec66ff30c3ecdd4e53c4f4a15c4d1e41ffd988366b5106447c";
- name = "akonadiconsole-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/akonadiconsole-20.08.1.tar.xz";
+ sha256 = "077ee646babbc4ca4075505d3dd830f4f5b8b1253617228e96f565fe23bcaad9";
+ name = "akonadiconsole-20.08.1.tar.xz";
};
};
akonadi-contacts = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-contacts-20.04.3.tar.xz";
- sha256 = "5bcd7acc70631e844ed77e127ff895efb573b62ef79062a6065e24b8826af39d";
- name = "akonadi-contacts-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/akonadi-contacts-20.08.1.tar.xz";
+ sha256 = "eee775960345ec0ca13b0550bb56fb6875867921fa7b9412a2c4b0dfb8ab4366";
+ name = "akonadi-contacts-20.08.1.tar.xz";
};
};
akonadi-import-wizard = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-import-wizard-20.04.3.tar.xz";
- sha256 = "225615f9d64166ce33718817dfda7aadada5876204c939edc1455ae01b7bf1b2";
- name = "akonadi-import-wizard-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/akonadi-import-wizard-20.08.1.tar.xz";
+ sha256 = "d895c866a05f0a55ca8f2d852ed0ae3fdc13aa160cbcbaf9f1017443458d9526";
+ name = "akonadi-import-wizard-20.08.1.tar.xz";
};
};
akonadi-mime = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-mime-20.04.3.tar.xz";
- sha256 = "92e9bab71f87c0de8e3437dd4779054332826fe2522c36a7c038c789b207f7ac";
- name = "akonadi-mime-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/akonadi-mime-20.08.1.tar.xz";
+ sha256 = "3c7a57f798a7db1e1aebc3162c20f58a0fb9ed9e703078344ef1de215c73ff0b";
+ name = "akonadi-mime-20.08.1.tar.xz";
};
};
akonadi-notes = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-notes-20.04.3.tar.xz";
- sha256 = "e1b4b6d2347038774589a9a8a935e4697d248008dfd2b5b496e6555974c96a55";
- name = "akonadi-notes-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/akonadi-notes-20.08.1.tar.xz";
+ sha256 = "afc0cdba349f0b2edece44221a7c3c532d07251ec51f05994e83a1d79c4f50fc";
+ name = "akonadi-notes-20.08.1.tar.xz";
};
};
akonadi-search = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akonadi-search-20.04.3.tar.xz";
- sha256 = "21ca09d39d6e550ca01e80f1a112557f00387e014763b1f47824d53d41cb5bdf";
- name = "akonadi-search-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/akonadi-search-20.08.1.tar.xz";
+ sha256 = "db305bfc55535d8812d84a119e4dcf04e7b87c345e7ac3a884469cbf55abca83";
+ name = "akonadi-search-20.08.1.tar.xz";
};
};
akregator = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/akregator-20.04.3.tar.xz";
- sha256 = "e175a1b60270ad76afaf16e8e5630d237cdc068c06d0ae93591494b18ad4584c";
- name = "akregator-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/akregator-20.08.1.tar.xz";
+ sha256 = "21751a5a14b188649caeeb19cbcef877dd00548a29c073f8694e227d951c7a00";
+ name = "akregator-20.08.1.tar.xz";
};
};
analitza = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/analitza-20.04.3.tar.xz";
- sha256 = "f9d1873c6190dc1eaeb6fad97d4197256342e0b729f7e8199e15bfb495f854b7";
- name = "analitza-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/analitza-20.08.1.tar.xz";
+ sha256 = "91c691df8be52255db9387549c6392ad2c5358c12e805f3a96520e2aa0c147de";
+ name = "analitza-20.08.1.tar.xz";
};
};
ark = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ark-20.04.3.tar.xz";
- sha256 = "e7251b0b6f12291ffbaa328bf7f8e101ebeef6fd110dabbcf76d8ad7cfd305bc";
- name = "ark-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ark-20.08.1.tar.xz";
+ sha256 = "32e8546b186b88efc9d4688e02def0b6225d921f9b92cfcd328417f09ec0f725";
+ name = "ark-20.08.1.tar.xz";
};
};
artikulate = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/artikulate-20.04.3.tar.xz";
- sha256 = "394e93df2b370ba1e6621b2bcf871be42efde6fa2189de29d4c8198e387767ea";
- name = "artikulate-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/artikulate-20.08.1.tar.xz";
+ sha256 = "b626a6a38f6eb50d64607032d5b100351c4242e40a4a13cdce4769e188ee361a";
+ name = "artikulate-20.08.1.tar.xz";
};
};
audiocd-kio = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/audiocd-kio-20.04.3.tar.xz";
- sha256 = "af8782771a5d48fb2e3ba9703f8b8e542f5fddd418ca293d23a6eb83ebe86929";
- name = "audiocd-kio-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/audiocd-kio-20.08.1.tar.xz";
+ sha256 = "7662849929c96d1745ce4ac7ddc931be2eff5e3cc755f2cd959b4d3f4b20b9b0";
+ name = "audiocd-kio-20.08.1.tar.xz";
};
};
baloo-widgets = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/baloo-widgets-20.04.3.tar.xz";
- sha256 = "29394f9d47407074a5ec0f85ceade5dcc8c03f0d9a83c1e339310f19f7711ae3";
- name = "baloo-widgets-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/baloo-widgets-20.08.1.tar.xz";
+ sha256 = "9f48cb2f1b45e46828b1656abaeb60e836650015c07277ec52bea053d0058958";
+ name = "baloo-widgets-20.08.1.tar.xz";
};
};
blinken = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/blinken-20.04.3.tar.xz";
- sha256 = "d6901fe40768ba8319609bfd143b2d1c585b04a148aedcb4b358b041db7f1afb";
- name = "blinken-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/blinken-20.08.1.tar.xz";
+ sha256 = "53b30435ea0d83f713ecb53219173aa55c0d11194830972734a4acc9a5a28c5a";
+ name = "blinken-20.08.1.tar.xz";
};
};
bomber = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/bomber-20.04.3.tar.xz";
- sha256 = "b292c11ebfb4311420ce6b9a4b132a437d061946e8eb08556fec89bb84c23428";
- name = "bomber-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/bomber-20.08.1.tar.xz";
+ sha256 = "a4b2f5dcce7e125da30bef6bcc9746b67f8451d2040696714686dd618d80a96c";
+ name = "bomber-20.08.1.tar.xz";
};
};
bovo = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/bovo-20.04.3.tar.xz";
- sha256 = "5365c0fd5a57814f224585e4331be129414d1f5d51d2b90bac8421df4ae5f300";
- name = "bovo-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/bovo-20.08.1.tar.xz";
+ sha256 = "5d5ee817a73de0deef6b7c35a798bda02c6d15e9dd0e7379a13c23c0832fe0d1";
+ name = "bovo-20.08.1.tar.xz";
};
};
calendarsupport = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/calendarsupport-20.04.3.tar.xz";
- sha256 = "40b069e1561fac49f46dd0504af0ac459010ac98f30748b8f15a50ca1fd35b5b";
- name = "calendarsupport-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/calendarsupport-20.08.1.tar.xz";
+ sha256 = "38d6e695725c8484e1492d431144a0ecd1b66535bc07ac77e1f0eb1499d8fc32";
+ name = "calendarsupport-20.08.1.tar.xz";
};
};
cantor = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/cantor-20.04.3.tar.xz";
- sha256 = "ff589ccb48016fd784de9883fe19ee0c2c450e3993e9cc5f7dc499448db0c6a4";
- name = "cantor-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/cantor-20.08.1.tar.xz";
+ sha256 = "c44b96ac861302589923d144bf7b5d529b6eb2f91cea2d014944a0516de31a05";
+ name = "cantor-20.08.1.tar.xz";
};
};
cervisia = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/cervisia-20.04.3.tar.xz";
- sha256 = "3e2aac0a08c01d9ea5c5814e739f082ec5a510cd8f0f6bce37cfff9130b0f078";
- name = "cervisia-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/cervisia-20.08.1.tar.xz";
+ sha256 = "eedd3b3f00b97d513437fdbd2eeaa28cd6db29512983b82196bdededd8b701f2";
+ name = "cervisia-20.08.1.tar.xz";
};
};
dolphin = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/dolphin-20.04.3.tar.xz";
- sha256 = "5e493e898e02005780b59474f506904742625b50e4669c113906d4f30daa863e";
- name = "dolphin-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/dolphin-20.08.1.tar.xz";
+ sha256 = "7d6ef04b866366a0ff3b199aac082ade41b3748b225ef7675ea42ccf48cbdc24";
+ name = "dolphin-20.08.1.tar.xz";
};
};
dolphin-plugins = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/dolphin-plugins-20.04.3.tar.xz";
- sha256 = "f0dad66e7302711e136b0253fb73dbf16bc9facdbb4ad617207fb818fc84130a";
- name = "dolphin-plugins-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/dolphin-plugins-20.08.1.tar.xz";
+ sha256 = "a00cab6b30c9b5a4c0164704c9eab2cbb661928e775f83acb3691af77bf17427";
+ name = "dolphin-plugins-20.08.1.tar.xz";
};
};
dragon = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/dragon-20.04.3.tar.xz";
- sha256 = "2b0d6414f2cea9f2a0b2ebddeffa7e5342db96fac34b2a00439fca5784f6131f";
- name = "dragon-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/dragon-20.08.1.tar.xz";
+ sha256 = "691bc338ca25e70e9a43cbcdf50f2e0aa92643bdad0329bdc3e09373ac287040";
+ name = "dragon-20.08.1.tar.xz";
};
};
elisa = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/elisa-20.04.3.tar.xz";
- sha256 = "d99dc2eb80d4219d08c72e612ac07cbb6c91c2eff365b49da69cbc3c1e70885b";
- name = "elisa-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/elisa-20.08.1.tar.xz";
+ sha256 = "1a0234a074a70bfcd4b2ccc14664b2cc7f88d2ccfd33c1716d35c27a31e258c0";
+ name = "elisa-20.08.1.tar.xz";
};
};
eventviews = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/eventviews-20.04.3.tar.xz";
- sha256 = "f10d43f57e62d68b6d0b41e9e3442baee8b68664e085f6e4347ac6adc1af32ff";
- name = "eventviews-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/eventviews-20.08.1.tar.xz";
+ sha256 = "b46e6ad32a503ce1dc1e5ade71e79f44011362fe569836ca1f2cd11c560a5a73";
+ name = "eventviews-20.08.1.tar.xz";
};
};
ffmpegthumbs = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ffmpegthumbs-20.04.3.tar.xz";
- sha256 = "089305a75d32cf8bf1b9279623b524912af78aa538379dcccf998ca1ab165164";
- name = "ffmpegthumbs-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ffmpegthumbs-20.08.1.tar.xz";
+ sha256 = "8b7cd6bd27b29977d0406b08c2cf33988c651a2f59392be47f076e49eea5673b";
+ name = "ffmpegthumbs-20.08.1.tar.xz";
};
};
filelight = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/filelight-20.04.3.tar.xz";
- sha256 = "d0939d0a04424978c06b675ac784c6a1ecbccbb67a31f5af661c6716bf38f0a4";
- name = "filelight-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/filelight-20.08.1.tar.xz";
+ sha256 = "9677038781a1d66238da0e54f967c9c97cb44d593dbe164b8e26f38d0ac75330";
+ name = "filelight-20.08.1.tar.xz";
};
};
granatier = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/granatier-20.04.3.tar.xz";
- sha256 = "9d06047f613a03b32d603e90bd14ca2873be9da9b4b17b98a65242e9855a7aaf";
- name = "granatier-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/granatier-20.08.1.tar.xz";
+ sha256 = "7b0d53fd50fdb56270f8fd53d45478c0f1be10bb67b901db08b0f413c4baeb3e";
+ name = "granatier-20.08.1.tar.xz";
};
};
grantlee-editor = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/grantlee-editor-20.04.3.tar.xz";
- sha256 = "1a3e4ece1a37e11735291bbec99314bc0ede0714377db916ed1266ec19325ef5";
- name = "grantlee-editor-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/grantlee-editor-20.08.1.tar.xz";
+ sha256 = "edeb994eab7001bcf8462834a61ae1a045e9122ae104d31bdeed2ac7497b6306";
+ name = "grantlee-editor-20.08.1.tar.xz";
};
};
grantleetheme = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/grantleetheme-20.04.3.tar.xz";
- sha256 = "c5b2e4b1d5e14b39d2e66d160ba0b86c16f86e921abf578640bf1576a5f25eb3";
- name = "grantleetheme-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/grantleetheme-20.08.1.tar.xz";
+ sha256 = "9a8f91ce63a3b143d47d8e3fbd1378732639cd3daf5b5789989164d8225fe54f";
+ name = "grantleetheme-20.08.1.tar.xz";
};
};
gwenview = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/gwenview-20.04.3.tar.xz";
- sha256 = "d176021d6784e33cb0aaa6fa2517e81f9eac237079d2a06d6b55b8f4b04e8bd9";
- name = "gwenview-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/gwenview-20.08.1.tar.xz";
+ sha256 = "df1c45317aff9aece8b023cd87aab62c9cd222520795922564e89fdc9df48995";
+ name = "gwenview-20.08.1.tar.xz";
};
};
incidenceeditor = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/incidenceeditor-20.04.3.tar.xz";
- sha256 = "b3c70c926acab7a0585bf2bf7575ebe4d04c439fc49af073d0cb599f3b9e57c2";
- name = "incidenceeditor-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/incidenceeditor-20.08.1.tar.xz";
+ sha256 = "eecc51eb405c473eb20449842dcdb3dac96712bbcf7aeedaa06614e1da3e0bbe";
+ name = "incidenceeditor-20.08.1.tar.xz";
};
};
juk = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/juk-20.04.3.tar.xz";
- sha256 = "2566257f83db74d69b95e109146a82e1e03966b3592c891b48e81cf2a13d812b";
- name = "juk-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/juk-20.08.1.tar.xz";
+ sha256 = "aa9a93a0befacf401cf41d8358b4987d8b370b4c153f3b66e05e922472e004a8";
+ name = "juk-20.08.1.tar.xz";
};
};
k3b = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/k3b-20.04.3.tar.xz";
- sha256 = "562dc91be0a992ef0f139310bfd941202e4ae273e11b754d02a8cf6f85f20420";
- name = "k3b-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/k3b-20.08.1.tar.xz";
+ sha256 = "66fad59f4e35c24dc8868c46ff45ffa66048501e0a6ac0c23a8b9e957033e50f";
+ name = "k3b-20.08.1.tar.xz";
};
};
kaccounts-integration = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kaccounts-integration-20.04.3.tar.xz";
- sha256 = "57661418d6fe58f9c3d308ba8804e5bc83312bba0967e13bf144b1a7dba9b36d";
- name = "kaccounts-integration-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kaccounts-integration-20.08.1.tar.xz";
+ sha256 = "b65ec11be0c2b612222de382d24345f19be0cd264243f0d954da8a81b80034bc";
+ name = "kaccounts-integration-20.08.1.tar.xz";
};
};
kaccounts-providers = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kaccounts-providers-20.04.3.tar.xz";
- sha256 = "ffeeac1283c453a4bbd4249cbe314eb7f9800a9cbedce192fdb1f12f30670e3e";
- name = "kaccounts-providers-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kaccounts-providers-20.08.1.tar.xz";
+ sha256 = "481a2e2708773197b63937233ade6380c0b64e13a1610f27aa2751b6ee3624a4";
+ name = "kaccounts-providers-20.08.1.tar.xz";
};
};
kaddressbook = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kaddressbook-20.04.3.tar.xz";
- sha256 = "d1c8f6af88572548a90756963921a8555df239467858432079a37788f4980b58";
- name = "kaddressbook-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kaddressbook-20.08.1.tar.xz";
+ sha256 = "f7fb72cbff43ae6dfb222e5b1c49947602086412b97634484eb3cc86ab773aa2";
+ name = "kaddressbook-20.08.1.tar.xz";
};
};
kajongg = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kajongg-20.04.3.tar.xz";
- sha256 = "0175fb44b4f092fa318113a576f41e0a29dc1f5d7dfbf0ca7877a5c46a095d00";
- name = "kajongg-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kajongg-20.08.1.tar.xz";
+ sha256 = "801c0cc63767809ea4909ceb66dbbbb3e8ad400db7a24c80dc6ae8f3f5c9a6b9";
+ name = "kajongg-20.08.1.tar.xz";
};
};
kalarm = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kalarm-20.04.3.tar.xz";
- sha256 = "71f94af998495c759b9c2e7bf2092887748301c993f76dbf36f6ac9e4bb2a1f5";
- name = "kalarm-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kalarm-20.08.1.tar.xz";
+ sha256 = "22fea5be32c8db6b0903f216307f20dafc2ac69c620d9b4512e1034c0294c207";
+ name = "kalarm-20.08.1.tar.xz";
};
};
kalarmcal = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kalarmcal-20.04.3.tar.xz";
- sha256 = "19c9aab451f95f7689d8b18059e84f189b11cf15bb7f60fe55402b944512692e";
- name = "kalarmcal-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kalarmcal-20.08.1.tar.xz";
+ sha256 = "745515662c23154480e73f4a8d6e9ec760d01770383c1dd7f31d3f1463be7602";
+ name = "kalarmcal-20.08.1.tar.xz";
};
};
kalgebra = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kalgebra-20.04.3.tar.xz";
- sha256 = "988ae02433e961a84da35498aa6ff88fbcc36f8f12d55457116935740d3f1475";
- name = "kalgebra-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kalgebra-20.08.1.tar.xz";
+ sha256 = "a5ab916eba3bfd7535408768e6530e993bc1097ef1a2a0af5aa804aa1f713caf";
+ name = "kalgebra-20.08.1.tar.xz";
};
};
kalzium = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kalzium-20.04.3.tar.xz";
- sha256 = "b884fc8c13c3618a73e3ecfd265660e7045245059a951aff32c12ee5981902ca";
- name = "kalzium-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kalzium-20.08.1.tar.xz";
+ sha256 = "c2c4a823525ab5927c39f29e2150f34fc03947fb852aea1bdb73390c5a709188";
+ name = "kalzium-20.08.1.tar.xz";
};
};
kamera = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kamera-20.04.3.tar.xz";
- sha256 = "dcac50db634fccb3e602abb575322342d50c56832a61731546cf1fec552d5b3e";
- name = "kamera-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kamera-20.08.1.tar.xz";
+ sha256 = "f5b04ca46313de1bb0a57253650d1d1578f45796035888b759ad224b5866ee96";
+ name = "kamera-20.08.1.tar.xz";
};
};
kamoso = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kamoso-20.04.3.tar.xz";
- sha256 = "9b6410f75bd47901cdd787ea5a7a7bc93da16837f955f27de9e609d9e7b4b896";
- name = "kamoso-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kamoso-20.08.1.tar.xz";
+ sha256 = "ed8fa6a6127a8bea5294534aa2552526af101f981de58512fbb9f7dfd78e8984";
+ name = "kamoso-20.08.1.tar.xz";
};
};
kanagram = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kanagram-20.04.3.tar.xz";
- sha256 = "7fe8fde45d54b09118238f4a7a63aa2f6fc24ae14c49739ffe71cffc44bc5a95";
- name = "kanagram-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kanagram-20.08.1.tar.xz";
+ sha256 = "c810db58884e80d95baef149b8ced8fff7c5e48d6057478e81a5c8895ae67b42";
+ name = "kanagram-20.08.1.tar.xz";
};
};
kapman = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kapman-20.04.3.tar.xz";
- sha256 = "e3c34e94a204e6d9a4ebb35c415b8c5707313fba746867f2984fd0e95926d529";
- name = "kapman-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kapman-20.08.1.tar.xz";
+ sha256 = "934da85c5d9c99a0ed658fe4d99df258246716e04e13ceb3e18b11cc035c4f4c";
+ name = "kapman-20.08.1.tar.xz";
};
};
kapptemplate = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kapptemplate-20.04.3.tar.xz";
- sha256 = "72ce76b66ae503591a60081f334c2d2a0e9338a125b64de413e1e4ab81c29013";
- name = "kapptemplate-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kapptemplate-20.08.1.tar.xz";
+ sha256 = "7b350467e14bc310a695ffa3481afa7857de2f6ec714915ee2d8a25a6511909b";
+ name = "kapptemplate-20.08.1.tar.xz";
};
};
kate = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kate-20.04.3.tar.xz";
- sha256 = "38d92f2b95032cd20bd5b78ada2ee25fc9c06593047d063c28419df0839bc334";
- name = "kate-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kate-20.08.1.tar.xz";
+ sha256 = "44607f6a1d5ca8bb7173bedbeabef65bb98dde0fd009987bd8139fbb53959146";
+ name = "kate-20.08.1.tar.xz";
};
};
katomic = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/katomic-20.04.3.tar.xz";
- sha256 = "9ced288f46af528aa31931a0ab1a1b2d346d63ce6729e508163bf3370dbd261f";
- name = "katomic-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/katomic-20.08.1.tar.xz";
+ sha256 = "1aa655857bb1708880b6fbf4e54acdfe1cb7f47a9494249978251d870b86f13a";
+ name = "katomic-20.08.1.tar.xz";
};
};
kbackup = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kbackup-20.04.3.tar.xz";
- sha256 = "0360f5b5d512a48975e09e5c1d2f035b7c2e1ead00b9b9f76059b76eb4499f92";
- name = "kbackup-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kbackup-20.08.1.tar.xz";
+ sha256 = "08b0c43fca2dba65e1173841343daf8e6e37e11101be7315011e8345ba9b1e72";
+ name = "kbackup-20.08.1.tar.xz";
};
};
kblackbox = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kblackbox-20.04.3.tar.xz";
- sha256 = "8bf24ceaf33fabd3ec3030b42565dcbb2d8b282553a3222d741b0b43d70d3a38";
- name = "kblackbox-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kblackbox-20.08.1.tar.xz";
+ sha256 = "3f09d483fa3a3013e685df9efd9cee8d9d1b9f0e017cc97d92636bae89fc469c";
+ name = "kblackbox-20.08.1.tar.xz";
};
};
kblocks = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kblocks-20.04.3.tar.xz";
- sha256 = "128cbd7751883cc46d3bc0fcf3c2fc40d8d87631ad54c90459727da209237609";
- name = "kblocks-20.04.3.tar.xz";
- };
- };
- kblog = {
- version = "20.04.3";
- src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kblog-20.04.3.tar.xz";
- sha256 = "5932a8ba3ec33f13aec201252abb6d0712740f52af03747e9eb0f6c0764cb9b4";
- name = "kblog-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kblocks-20.08.1.tar.xz";
+ sha256 = "e2b6e5b0727ca45d6b0f0e8b9f0aa029a0acb9bdebeac5bfd849455e560977ed";
+ name = "kblocks-20.08.1.tar.xz";
};
};
kbounce = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kbounce-20.04.3.tar.xz";
- sha256 = "21977895752b7a33484463cf3fe47ff6f4d5ad4bb8ee824b92b309c5c0ee3837";
- name = "kbounce-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kbounce-20.08.1.tar.xz";
+ sha256 = "99af3bd297fcbecb9eaa4222bbb5122144beff9cb999420bf45339d61375f2a4";
+ name = "kbounce-20.08.1.tar.xz";
};
};
kbreakout = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kbreakout-20.04.3.tar.xz";
- sha256 = "4e9bd79060d826d99573e3db364005b32d70643b0fe0d7c5e427fb1c8a34896b";
- name = "kbreakout-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kbreakout-20.08.1.tar.xz";
+ sha256 = "0d57c105f2778b68c0b5ff8cb3e02d5c7ea2956b90d48d126ff1118b94d5f2fa";
+ name = "kbreakout-20.08.1.tar.xz";
};
};
kbruch = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kbruch-20.04.3.tar.xz";
- sha256 = "7381df5deb97580a0d60881d591b3d18715c8ad5692a580aebe82a836f1bb8df";
- name = "kbruch-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kbruch-20.08.1.tar.xz";
+ sha256 = "f04bf902a31b68d18c69afff511a591817a35f5ad866de4f84aa1b664b35a41e";
+ name = "kbruch-20.08.1.tar.xz";
};
};
kcachegrind = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kcachegrind-20.04.3.tar.xz";
- sha256 = "ef6e782540c254eada9e75049eb02919afd7adc9940ace79aa20dcad26240770";
- name = "kcachegrind-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kcachegrind-20.08.1.tar.xz";
+ sha256 = "59c43296aaa7d8a5dbf782ba9248ee8bb6308e7bd7bdfc0b99e1c912529337f2";
+ name = "kcachegrind-20.08.1.tar.xz";
};
};
kcalc = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kcalc-20.04.3.tar.xz";
- sha256 = "1ec38e3bf0c17df25a3367d4f3d5f7ef32b9a6fb5f081c20ad0091a968a2cf4a";
- name = "kcalc-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kcalc-20.08.1.tar.xz";
+ sha256 = "46702fe8eca8b604e15f3f2eb4d1f17b8601b6ad0b03bb9cd0a0dd7ed7a13c49";
+ name = "kcalc-20.08.1.tar.xz";
};
};
kcalutils = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kcalutils-20.04.3.tar.xz";
- sha256 = "6604e0377c8955be7963853691aeaf689c00e2f78caab6b3472ffb4c822e07a3";
- name = "kcalutils-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kcalutils-20.08.1.tar.xz";
+ sha256 = "ae6a8ca02722f8f593a8d248ab3d043cc68be23d18f820e150af000a902601c2";
+ name = "kcalutils-20.08.1.tar.xz";
};
};
kcharselect = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kcharselect-20.04.3.tar.xz";
- sha256 = "0da77b66efeab1ba7c17335853f3c3feab9b53b4c37cfa6a9f983327d13080f4";
- name = "kcharselect-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kcharselect-20.08.1.tar.xz";
+ sha256 = "36575e9fd0a93fb3ddaf6a75a213786351bdd3ab8c167dc1a3e2824a23a6655b";
+ name = "kcharselect-20.08.1.tar.xz";
};
};
kcolorchooser = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kcolorchooser-20.04.3.tar.xz";
- sha256 = "276cee46f92eeb5b47ec09366498b117c657fb2e618fc9fe34c797d4384549fd";
- name = "kcolorchooser-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kcolorchooser-20.08.1.tar.xz";
+ sha256 = "20cae01bd5e8c824f8e7900badd0d66464c363a749a1ce9fe6fe3a1e31c99ade";
+ name = "kcolorchooser-20.08.1.tar.xz";
};
};
kcron = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kcron-20.04.3.tar.xz";
- sha256 = "b1d7d36e5b9efe4fd5c5fedf0b9e267fd2aaf6423e6a18bb64112a0c8257e4fa";
- name = "kcron-20.04.3.tar.xz";
- };
- };
- kdav = {
- version = "20.04.3";
- src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdav-20.04.3.tar.xz";
- sha256 = "b645d5d17c967fd09c3d7abdfc262740a95870dd66bd3e5f4c0382da097d8510";
- name = "kdav-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kcron-20.08.1.tar.xz";
+ sha256 = "24ee9aee48bef951d6ac1fff32271417c4eb2239f0ec1de8388f2bae55ce83f5";
+ name = "kcron-20.08.1.tar.xz";
};
};
kdebugsettings = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdebugsettings-20.04.3.tar.xz";
- sha256 = "5f42891c0990216780fbe005521e423d922007c7ddeac97a05c3c99b6fe30344";
- name = "kdebugsettings-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kdebugsettings-20.08.1.tar.xz";
+ sha256 = "cac50d34c8a31805924aa75755475a754109fc643e95fe50188477522d113a55";
+ name = "kdebugsettings-20.08.1.tar.xz";
};
};
kdeconnect-kde = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdeconnect-kde-20.04.3.tar.xz";
- sha256 = "412940a35dcd9f1491a54e4f9fd5ffdadc890bb9a45cfe2a0f8cb1ee7dc1ccbb";
- name = "kdeconnect-kde-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kdeconnect-kde-20.08.1.tar.xz";
+ sha256 = "8ebfe36b4d08b36881082a3748f63a7c645b51e8f3b094607512817e9f6ce668";
+ name = "kdeconnect-kde-20.08.1.tar.xz";
};
};
kde-dev-scripts = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kde-dev-scripts-20.04.3.tar.xz";
- sha256 = "0b321954ea79e829d81c9be0170babae87e5eab22c8d42b296746d5a0160fbae";
- name = "kde-dev-scripts-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kde-dev-scripts-20.08.1.tar.xz";
+ sha256 = "f7f99a199fea69019738e6d2147e5f6e4419835aa2c39e6d60f4d2e5d629ba96";
+ name = "kde-dev-scripts-20.08.1.tar.xz";
};
};
kde-dev-utils = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kde-dev-utils-20.04.3.tar.xz";
- sha256 = "8f004e47bbd5ee032d711673b3320e59663087c636c9c51d031dc563b5391c83";
- name = "kde-dev-utils-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kde-dev-utils-20.08.1.tar.xz";
+ sha256 = "8105a5b911643dca1f0c476c9247282f80e4ea17bae06dcca63ba9638bf5d21d";
+ name = "kde-dev-utils-20.08.1.tar.xz";
};
};
kdeedu-data = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdeedu-data-20.04.3.tar.xz";
- sha256 = "e717f82a1b4729f0a6df65221e9c2b01df17acf3d4eb8c2340cea23b6b65d969";
- name = "kdeedu-data-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kdeedu-data-20.08.1.tar.xz";
+ sha256 = "d9c10c849f94b8cff7f79747a0594b8050f19d5477799b03f803c4241a9d12b6";
+ name = "kdeedu-data-20.08.1.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdegraphics-mobipocket-20.04.3.tar.xz";
- sha256 = "24ce0c1565b8bc922ea08c3d6bb625ff4bba2e656545e09e410a0ff3bc84c80f";
- name = "kdegraphics-mobipocket-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kdegraphics-mobipocket-20.08.1.tar.xz";
+ sha256 = "9974c36d90fc23d9a3a7172cf1526dc3671bf90f01f608effe92f64fce53c372";
+ name = "kdegraphics-mobipocket-20.08.1.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdegraphics-thumbnailers-20.04.3.tar.xz";
- sha256 = "b72bdd67738391a10672cd20667555168382285a764bd9e712e1485e7860441f";
- name = "kdegraphics-thumbnailers-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kdegraphics-thumbnailers-20.08.1.tar.xz";
+ sha256 = "8303231f2fc44c071b3f6a477ae5335f2657dbfaba52362529aaba20973a5995";
+ name = "kdegraphics-thumbnailers-20.08.1.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdenetwork-filesharing-20.04.3.tar.xz";
- sha256 = "8cdbe70cd4263e8be6fdc0de987cb9255efae9b747018bc5098c0882a3d69c4d";
- name = "kdenetwork-filesharing-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kdenetwork-filesharing-20.08.1.tar.xz";
+ sha256 = "e88f4a2f6d7b8a61ebd491eb112f51d50f9949d729022fab01223d6ea36b8a01";
+ name = "kdenetwork-filesharing-20.08.1.tar.xz";
};
};
kdenlive = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdenlive-20.04.3.tar.xz";
- sha256 = "29e5fa37f4680683cc6e244cee4d0b3a0e3e3290f15c0e0b6015ae4784d7315e";
- name = "kdenlive-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kdenlive-20.08.1.tar.xz";
+ sha256 = "f99e3f22c3d5e41a3ca251299d010ac2bc44933091c25d360104d562a1090873";
+ name = "kdenlive-20.08.1.tar.xz";
};
};
kdepim-addons = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdepim-addons-20.04.3.tar.xz";
- sha256 = "db0c70df94891bd6f90db533287269909e3442bfd0f546fa3f951d71f6268e9d";
- name = "kdepim-addons-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kdepim-addons-20.08.1.tar.xz";
+ sha256 = "a0bddcbe8f8f6d8c878a6b5634578522a8d485e424cf37d35bc17df9a1ffc7c2";
+ name = "kdepim-addons-20.08.1.tar.xz";
};
};
kdepim-apps-libs = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdepim-apps-libs-20.04.3.tar.xz";
- sha256 = "7d69ac9cecfe0035e4806f0ff43fd41ac3755d788fffea9fd51427e1bc7027e3";
- name = "kdepim-apps-libs-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kdepim-apps-libs-20.08.1.tar.xz";
+ sha256 = "a0664933b3b5ff20747bf2adec9fbbecf22935129349208430d53e8c9bf5b5bb";
+ name = "kdepim-apps-libs-20.08.1.tar.xz";
};
};
kdepim-runtime = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdepim-runtime-20.04.3.tar.xz";
- sha256 = "1e4cffed12098baf29d8acfc4e4e12848d36ad8f55bf75d8c089a57e6f906494";
- name = "kdepim-runtime-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kdepim-runtime-20.08.1.tar.xz";
+ sha256 = "27a4c04dcf2eac4108a43acbdd57e3a8aa1da92443a3e7977329d0218da05c24";
+ name = "kdepim-runtime-20.08.1.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdesdk-kioslaves-20.04.3.tar.xz";
- sha256 = "7d55121100d048bdab5f045126261eaad55ed58a2de97b211ad6acf03e22344b";
- name = "kdesdk-kioslaves-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kdesdk-kioslaves-20.08.1.tar.xz";
+ sha256 = "528cce0ea4c7c9fd53a604591eae4a70d39421ebbe62ed59bcbc80072f95c19f";
+ name = "kdesdk-kioslaves-20.08.1.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdesdk-thumbnailers-20.04.3.tar.xz";
- sha256 = "e526cbad484807e11e03d85e5fc706df118e8f3327846f396e8df024b770c566";
- name = "kdesdk-thumbnailers-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kdesdk-thumbnailers-20.08.1.tar.xz";
+ sha256 = "5b189182f2a734f82e67e23d3293e694c51f97c0a9acd1ec5498442a3d2a3804";
+ name = "kdesdk-thumbnailers-20.08.1.tar.xz";
};
};
kdf = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdf-20.04.3.tar.xz";
- sha256 = "f52e34c36cd924ae6f8fa1291d548abbf5e0bcf0c82d69a583f01dfe128332a8";
- name = "kdf-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kdf-20.08.1.tar.xz";
+ sha256 = "c100c87e9dbfcf7c12ce78d743f4ce3a2ec2bf3c1b0d969af1285255071195a5";
+ name = "kdf-20.08.1.tar.xz";
};
};
kdialog = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdialog-20.04.3.tar.xz";
- sha256 = "75b8214980f5043d23b0226827f049815147e1206ffd64c1fe9e091e63c27a62";
- name = "kdialog-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kdialog-20.08.1.tar.xz";
+ sha256 = "089e8a8e85a9021b830e9b8a19ecb1999781915a716c9c2b3c99894a5d1c8dcf";
+ name = "kdialog-20.08.1.tar.xz";
};
};
kdiamond = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kdiamond-20.04.3.tar.xz";
- sha256 = "f1bd1c5471224d4ab2269637bd89e11e5903bf4f15f1b2a3ae01c252adad7096";
- name = "kdiamond-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kdiamond-20.08.1.tar.xz";
+ sha256 = "1629dc6f70873b42081bd75dbf858da56d380c32925ddd49bd2110d458cb4b23";
+ name = "kdiamond-20.08.1.tar.xz";
};
};
keditbookmarks = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/keditbookmarks-20.04.3.tar.xz";
- sha256 = "ec25b40d0ab85e3f72eb334ea7d658d6fe19ae08d626d9fbf0ad71d57594ad88";
- name = "keditbookmarks-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/keditbookmarks-20.08.1.tar.xz";
+ sha256 = "8bfedffae0332dbfb611d25f3178ab7babe374155cce7c44e1aaa841934c3123";
+ name = "keditbookmarks-20.08.1.tar.xz";
};
};
kfind = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kfind-20.04.3.tar.xz";
- sha256 = "ff0d412dcd4b5812eb781618c4bf52d33f4691af2b9def4ba56644b5a668ef6e";
- name = "kfind-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kfind-20.08.1.tar.xz";
+ sha256 = "e49412d0eae6f77369b96ee7fa5902252294d03da1e8782460d4bba5be6bb149";
+ name = "kfind-20.08.1.tar.xz";
};
};
kfloppy = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kfloppy-20.04.3.tar.xz";
- sha256 = "4e0d392471eddd23847129b5538846edd1a834f02119d312aed3698e6bfd9e1c";
- name = "kfloppy-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kfloppy-20.08.1.tar.xz";
+ sha256 = "cfbe396c252acc23a929d05fe1a71099bc19ee3ab55f4f40e47780cf871852c5";
+ name = "kfloppy-20.08.1.tar.xz";
};
};
kfourinline = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kfourinline-20.04.3.tar.xz";
- sha256 = "c339009355dea086c28baa454aac1c15d601e15685ba8006100f50475518875f";
- name = "kfourinline-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kfourinline-20.08.1.tar.xz";
+ sha256 = "2c65dcc685d7e46da73e53ac3ab250ef4d1738bb85aa6f1b09160ff2ece364a2";
+ name = "kfourinline-20.08.1.tar.xz";
};
};
kgeography = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kgeography-20.04.3.tar.xz";
- sha256 = "69b4b06cfb1f6abb5c12bb0bf9334f178af2018288ee507678efe594e0392887";
- name = "kgeography-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kgeography-20.08.1.tar.xz";
+ sha256 = "f7ce4c6a00f18558aa04f4af0b71e45efc10c67f0b3454c5f0b2527a43133d30";
+ name = "kgeography-20.08.1.tar.xz";
};
};
kget = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kget-20.04.3.tar.xz";
- sha256 = "930b7ed50d19e41bfead8e6d71d8ec4024d688907489c17fb9274a73e4c7c0c2";
- name = "kget-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kget-20.08.1.tar.xz";
+ sha256 = "efbfc08a5a4ed3974bbdab20c5eae07cdb70f7f42e9de1c75651a57511d7e576";
+ name = "kget-20.08.1.tar.xz";
};
};
kgoldrunner = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kgoldrunner-20.04.3.tar.xz";
- sha256 = "ab535067a8991a94bd7cd5a990a6120538206d241c8e8149c7b774cbdd1d0941";
- name = "kgoldrunner-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kgoldrunner-20.08.1.tar.xz";
+ sha256 = "40380c0d3b65e06cdb9d9ca3791c10e0d2d300856cc49a7b3da0145b7651274b";
+ name = "kgoldrunner-20.08.1.tar.xz";
};
};
kgpg = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kgpg-20.04.3.tar.xz";
- sha256 = "bcd3211ab8112f070215e8e6451021859fefc57b813bdad1b421a1f129e17cbb";
- name = "kgpg-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kgpg-20.08.1.tar.xz";
+ sha256 = "6b926c2adf896c3f68402ec10faf8db1e5f7c7b9fa8c1c26f9021d1fb0c975b0";
+ name = "kgpg-20.08.1.tar.xz";
};
};
khangman = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/khangman-20.04.3.tar.xz";
- sha256 = "db827d20ce5f0522675d75c18fd4c804047cc2e5a2ca2f7a7421b5fc91952831";
- name = "khangman-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/khangman-20.08.1.tar.xz";
+ sha256 = "fe94116ea833295a46c59a7420676925bb1038e7da86f6369d452087add40868";
+ name = "khangman-20.08.1.tar.xz";
};
};
khelpcenter = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/khelpcenter-20.04.3.tar.xz";
- sha256 = "3930c321388f27925a63add5f11fe65eb34b7301fb22d78f16f5f3de8467a9ed";
- name = "khelpcenter-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/khelpcenter-20.08.1.tar.xz";
+ sha256 = "217b433c1a5da966ad5dab1e89e2e719632f1e035ab92cce094c5f0848bb6e39";
+ name = "khelpcenter-20.08.1.tar.xz";
};
};
kidentitymanagement = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kidentitymanagement-20.04.3.tar.xz";
- sha256 = "09e63cdb07bb38ba8c82d796212b1bd9d218dbe8adde215bff9c689c93b90917";
- name = "kidentitymanagement-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kidentitymanagement-20.08.1.tar.xz";
+ sha256 = "3b34e029e99647d6742825633682ab8a5eecbe102e34ea2472cb53afb853840d";
+ name = "kidentitymanagement-20.08.1.tar.xz";
};
};
kig = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kig-20.04.3.tar.xz";
- sha256 = "ccbc8f10e79f420d8a97aa00616fc29ed771721bfe22eb74b160464ac6cc3023";
- name = "kig-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kig-20.08.1.tar.xz";
+ sha256 = "f318d346cd152e62ae892ade31a784f0b7b823c56fdfd64e05a330072ad95745";
+ name = "kig-20.08.1.tar.xz";
};
};
kigo = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kigo-20.04.3.tar.xz";
- sha256 = "ccc4f9638bfd3e1bf7f25621e10907f08cd0354858f9a174ab8f5c51c77e8a77";
- name = "kigo-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kigo-20.08.1.tar.xz";
+ sha256 = "58fa166a487c855d300c8a33758928131fc4db80cbda19a08e3de918335d2bdb";
+ name = "kigo-20.08.1.tar.xz";
};
};
killbots = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/killbots-20.04.3.tar.xz";
- sha256 = "66c48ddeb49118ea8139422c0370256f88a4e3104dbe664bc25d2c63edfdf326";
- name = "killbots-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/killbots-20.08.1.tar.xz";
+ sha256 = "252636f4df2af0e087f4d604f76c5d8702c38392d821281a0f6283be4e429af9";
+ name = "killbots-20.08.1.tar.xz";
};
};
kimagemapeditor = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kimagemapeditor-20.04.3.tar.xz";
- sha256 = "d86f8a9e0a1aba71236f7af844076758774ab1c10b4b2fa1d244c9b5d24adf33";
- name = "kimagemapeditor-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kimagemapeditor-20.08.1.tar.xz";
+ sha256 = "bf391d0812e0f2dce6a11481972cf9d04f14d0bf92cad7210fa35a1fa0edf230";
+ name = "kimagemapeditor-20.08.1.tar.xz";
};
};
kimap = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kimap-20.04.3.tar.xz";
- sha256 = "870d22a4f07080453ade2e1224acb563232211fe48e1beabe8c58d27730b4bfa";
- name = "kimap-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kimap-20.08.1.tar.xz";
+ sha256 = "eae645ae2535c2612556e8938011cc478054c032126bb55683b95127d1b94741";
+ name = "kimap-20.08.1.tar.xz";
};
};
kio-extras = {
- version = "20.04.3";
+ version = "20.08.1";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/20.08.1/src/kio-extras-20.08.1.tar.xz";
+ sha256 = "1122635926052f34fd35d8aeef9c3c1d892690d8372f2b7d902e6449cdab988a";
+ name = "kio-extras-20.08.1.tar.xz";
+ };
+ };
+ kio-gdrive = {
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kio-extras-20.04.3.tar.xz";
- sha256 = "ff0edabe83ee4958ce7559e935f6b7ae3f76aee43ee5774543368ca334b21090";
- name = "kio-extras-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kio-gdrive-20.08.1.tar.xz";
+ sha256 = "5104136948ee60cd527109bb9e8830e6a12f6062a29f34bc995b2625b0280825";
+ name = "kio-gdrive-20.08.1.tar.xz";
};
};
kipi-plugins = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kipi-plugins-20.04.3.tar.xz";
- sha256 = "e128ba8a2194bb0ce6a5eac97d56479003f08c1d740a56a6c8d976df1a71632a";
- name = "kipi-plugins-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kipi-plugins-20.08.1.tar.xz";
+ sha256 = "b7d8f1aa087006a48d9bd7ec036ab4779e898e3b02692c91342439747cad6c5c";
+ name = "kipi-plugins-20.08.1.tar.xz";
};
};
kirigami-gallery = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kirigami-gallery-20.04.3.tar.xz";
- sha256 = "1868c4782c8a9c7a80eb6b465a27cb7fc46dc9a8e47d2530559ba3b2f1131461";
- name = "kirigami-gallery-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kirigami-gallery-20.08.1.tar.xz";
+ sha256 = "497886cc5a8483f068a642ce19df19f69fd105a4fb583f1a9898c885659c9df5";
+ name = "kirigami-gallery-20.08.1.tar.xz";
};
};
kiriki = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kiriki-20.04.3.tar.xz";
- sha256 = "1df78a7b9e91f20841411fc2561d077dcd897211e5c20f1f526670c9f3b7a97d";
- name = "kiriki-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kiriki-20.08.1.tar.xz";
+ sha256 = "51e77cbbf6a0c60487d72b03b28c08409d0b6134c983d9e420fbc4d7f73223e8";
+ name = "kiriki-20.08.1.tar.xz";
};
};
kiten = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kiten-20.04.3.tar.xz";
- sha256 = "3b0bdd2b711ee67bbc194b301da3ed99d4ee75bb6ff18ab50c0a1b4c1c4ef162";
- name = "kiten-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kiten-20.08.1.tar.xz";
+ sha256 = "f3764d090db8027746e83c326e833680fd669dca66dd6af095ba120e66de2901";
+ name = "kiten-20.08.1.tar.xz";
};
};
kitinerary = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kitinerary-20.04.3.tar.xz";
- sha256 = "8c7dab2e28891af268d22884ecbb9cd7031c4b34352ed3b576dbb6dcb5977c7e";
- name = "kitinerary-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kitinerary-20.08.1.tar.xz";
+ sha256 = "d3e0b6130b5c603bc1494404fa91ed1995e9142d66e4c3ddd5d2c79fdea856e4";
+ name = "kitinerary-20.08.1.tar.xz";
};
};
kjumpingcube = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kjumpingcube-20.04.3.tar.xz";
- sha256 = "1716e1de95e8610dc80d991c4518beedbdf6d4c40a07f71a1dba0971e0a6cb9b";
- name = "kjumpingcube-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kjumpingcube-20.08.1.tar.xz";
+ sha256 = "226424cd21f75c499eedd15460a466988b179312467ed16437df87be494d9fbc";
+ name = "kjumpingcube-20.08.1.tar.xz";
};
};
kldap = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kldap-20.04.3.tar.xz";
- sha256 = "ab32ef61da11f1401f9d648f6831a946dd6964ffd4f35f6c84ad9ca19dd422f1";
- name = "kldap-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kldap-20.08.1.tar.xz";
+ sha256 = "098fb07b280ef25dcf04b18f627223014257f6c0874b2959f2a8e68cacdb74a7";
+ name = "kldap-20.08.1.tar.xz";
};
};
kleopatra = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kleopatra-20.04.3.tar.xz";
- sha256 = "59c6eb6b626b502f6b194ac4bbde8ed95e613d6b6fd54818c0206dd84575a34d";
- name = "kleopatra-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kleopatra-20.08.1.tar.xz";
+ sha256 = "e7bc3ce03ad5431e4289360ba6b701e38d53b60de58fd1ed358480cec48657a6";
+ name = "kleopatra-20.08.1.tar.xz";
};
};
klettres = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/klettres-20.04.3.tar.xz";
- sha256 = "ed943bce624a599f7759487d0ff3b16c340f2beadbad25dab30b6607dbd2695e";
- name = "klettres-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/klettres-20.08.1.tar.xz";
+ sha256 = "f29d6df1de3562731f246a892caaa493b9bccc9d1317a948e03ad12cb8c80c06";
+ name = "klettres-20.08.1.tar.xz";
};
};
klickety = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/klickety-20.04.3.tar.xz";
- sha256 = "703158b1c1cafc16368fa09c4c58ea6d10942b90af693a851f9b5ec84add691d";
- name = "klickety-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/klickety-20.08.1.tar.xz";
+ sha256 = "a9b63b3e944faba25498e981c06981dc354f9acd34b77f46fe2bebef388bf2cb";
+ name = "klickety-20.08.1.tar.xz";
};
};
klines = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/klines-20.04.3.tar.xz";
- sha256 = "83bebb2dbb7da8e325a378da3903246ff562c56dcf9ea4991dedb5b253c81f7d";
- name = "klines-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/klines-20.08.1.tar.xz";
+ sha256 = "d16650d7d44f48f47700dcb8fe97519dd28fe7213052636363d281c24f46a2b9";
+ name = "klines-20.08.1.tar.xz";
};
};
kmag = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmag-20.04.3.tar.xz";
- sha256 = "f006b2e3b685accc343cdfc8b90d915e7c2647d983b66c2d38565d669ed6d464";
- name = "kmag-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kmag-20.08.1.tar.xz";
+ sha256 = "0aaaf19af2c943ae460dbcc1984bae167b79be287802e8a6faa6aaaed11718f3";
+ name = "kmag-20.08.1.tar.xz";
};
};
kmahjongg = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmahjongg-20.04.3.tar.xz";
- sha256 = "1f4fce58163323c23aa37f849e556ee4ed7fe33fb36e21754116e1d0e2c33673";
- name = "kmahjongg-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kmahjongg-20.08.1.tar.xz";
+ sha256 = "842b3d2e9c60b6a8e6bb6d09f26db49d988889ec3962ac40aea0e79434c2eb43";
+ name = "kmahjongg-20.08.1.tar.xz";
};
};
kmail = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmail-20.04.3.tar.xz";
- sha256 = "5b653c680097a7be4ff53bc902bc3fcda9edac99f699a63a1375a1df81240d03";
- name = "kmail-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kmail-20.08.1.tar.xz";
+ sha256 = "7ba5854e36e2ed752baa3a1ac15d1a6227699da6f5bdca3c250f22226b4d902b";
+ name = "kmail-20.08.1.tar.xz";
};
};
kmail-account-wizard = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmail-account-wizard-20.04.3.tar.xz";
- sha256 = "ba789c679664a390480808431510d7d6ee1591a5f7be3dfceb5951347e3cc9b1";
- name = "kmail-account-wizard-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kmail-account-wizard-20.08.1.tar.xz";
+ sha256 = "7a1dc9ad542c0e54b80e955a162888c7d4b6bababcf02681d54af4480c03bd8d";
+ name = "kmail-account-wizard-20.08.1.tar.xz";
};
};
kmailtransport = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmailtransport-20.04.3.tar.xz";
- sha256 = "45685bf61f24c9c7070a9f5b982d48005a7bf0ef04f391df2959772b17857cc2";
- name = "kmailtransport-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kmailtransport-20.08.1.tar.xz";
+ sha256 = "4cabad74e141891546b0f47f44030eeb59fb63257a5c0d1c12124815ebf710c1";
+ name = "kmailtransport-20.08.1.tar.xz";
};
};
kmbox = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmbox-20.04.3.tar.xz";
- sha256 = "50b2a8ba98cf24117ba66ddb9b51d1db575998b36ad1aa15fec0135446cc7561";
- name = "kmbox-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kmbox-20.08.1.tar.xz";
+ sha256 = "df77b2bf448d1ce21ff4a816f1164297519b48cd60200cea0edae6e72a81a19b";
+ name = "kmbox-20.08.1.tar.xz";
};
};
kmime = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmime-20.04.3.tar.xz";
- sha256 = "a416e16f61a2dd4274b1abc54af71ffe73b01c93137bc1fa462642bb947d150c";
- name = "kmime-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kmime-20.08.1.tar.xz";
+ sha256 = "cd0beaa46040d571b505d07853be76f099289e22d99ce4884695d4d645dfbe8c";
+ name = "kmime-20.08.1.tar.xz";
};
};
kmines = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmines-20.04.3.tar.xz";
- sha256 = "8a729ffd6406d7d6173fbd050e40a566b5ce4e7b960f3971fff82fef9c18c4d3";
- name = "kmines-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kmines-20.08.1.tar.xz";
+ sha256 = "eeb58941c94330f3ffdca60c0ca84d8ebcc9c6c355737217b521c54e50c650cd";
+ name = "kmines-20.08.1.tar.xz";
};
};
kmix = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmix-20.04.3.tar.xz";
- sha256 = "1830bc59d836d2155fd7a24c5afe3c7f5682a96217c159a062fd28b851414dc6";
- name = "kmix-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kmix-20.08.1.tar.xz";
+ sha256 = "012d14adbb200a7e66ddbc9ebc8e18c4e5082ae24dea6ab22284b6c730a1b472";
+ name = "kmix-20.08.1.tar.xz";
};
};
kmousetool = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmousetool-20.04.3.tar.xz";
- sha256 = "acf710dcdc53e58d3a833345f88214b22dfbd5ab9fd26d9e26c883c18441c715";
- name = "kmousetool-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kmousetool-20.08.1.tar.xz";
+ sha256 = "c1d769efdd318eb1e29905122c579c72a41da74b45a076b79cf177b1800e1464";
+ name = "kmousetool-20.08.1.tar.xz";
};
};
kmouth = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmouth-20.04.3.tar.xz";
- sha256 = "edc1aab8edd13f3f10f99b79a27dabaffe22ac7048868dd7b66b33a662cc46b2";
- name = "kmouth-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kmouth-20.08.1.tar.xz";
+ sha256 = "d87fb47fa00c54f13cdaef33d15cc74f31d7009d4a8d988902b62c698d1e2c2c";
+ name = "kmouth-20.08.1.tar.xz";
};
};
kmplot = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kmplot-20.04.3.tar.xz";
- sha256 = "57389abae04c204d0c2462709b70a919e0050b20867bcb23f3ab72788051e501";
- name = "kmplot-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kmplot-20.08.1.tar.xz";
+ sha256 = "6d294a89f9e0fc42262ada6d71ba5abaeb756beb194e71f1852e18ae2b85456e";
+ name = "kmplot-20.08.1.tar.xz";
};
};
knavalbattle = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/knavalbattle-20.04.3.tar.xz";
- sha256 = "78feb74eb2e52d4738e5aa8969dc4db00307bb758623cbf34d7f245242f07279";
- name = "knavalbattle-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/knavalbattle-20.08.1.tar.xz";
+ sha256 = "e0cbffc5643aac302c53cfd957eefa7f89486fdd0d9c55b74f39d733a0ac3b65";
+ name = "knavalbattle-20.08.1.tar.xz";
};
};
knetwalk = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/knetwalk-20.04.3.tar.xz";
- sha256 = "6bc61fb70eb0cde3f312aa672f848447ed5eb5bbc2d48d65c6a010c12e154054";
- name = "knetwalk-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/knetwalk-20.08.1.tar.xz";
+ sha256 = "30cbf7bdf5f875ce172a382ef7da8e74803015017c6cd525cb6c288defac020d";
+ name = "knetwalk-20.08.1.tar.xz";
};
};
knights = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/knights-20.04.3.tar.xz";
- sha256 = "b695e1f141dc3fd1a5deca6179bddb0f3d4aa9103c5cc539c01a2a789adade4f";
- name = "knights-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/knights-20.08.1.tar.xz";
+ sha256 = "58518d8ecce5744fdf68c18e0803f48cb912fa29c5ea93ed6ccd2d4d320f722d";
+ name = "knights-20.08.1.tar.xz";
};
};
knotes = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/knotes-20.04.3.tar.xz";
- sha256 = "90c47b902f738492286d9b3e0acb26e6a10504e1c933f921213cd1784309b796";
- name = "knotes-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/knotes-20.08.1.tar.xz";
+ sha256 = "7d066a34d46684f258481466875d18f99a9000d66dec36f7dcab92790f6c57bb";
+ name = "knotes-20.08.1.tar.xz";
};
};
kolf = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kolf-20.04.3.tar.xz";
- sha256 = "dc2fd28fbfaa21d75ad6482513adddb9bd04ac0432d2d72419f85d65140ee186";
- name = "kolf-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kolf-20.08.1.tar.xz";
+ sha256 = "04d117895a6504d6138d1e3cd3157dd3318ba93eefd749182556344650f6a2f8";
+ name = "kolf-20.08.1.tar.xz";
};
};
kollision = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kollision-20.04.3.tar.xz";
- sha256 = "49365efc2cfc4c9406cbedf84ad8a135df79536cba166cd77402955803a56207";
- name = "kollision-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kollision-20.08.1.tar.xz";
+ sha256 = "858d69131951734181b449ce48498b3b843634eb8c069c932042b3c0f862f98c";
+ name = "kollision-20.08.1.tar.xz";
};
};
kolourpaint = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kolourpaint-20.04.3.tar.xz";
- sha256 = "55ec6d42fcf10b15b80b6fdabacdf189d1cda283a19a1c04b6a4a58abb56bee8";
- name = "kolourpaint-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kolourpaint-20.08.1.tar.xz";
+ sha256 = "7de98e081f13fb9f8a73932d5e8ce6f1cfd73e345fa28d03f515cad69f1b8bae";
+ name = "kolourpaint-20.08.1.tar.xz";
};
};
kompare = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kompare-20.04.3.tar.xz";
- sha256 = "6c49547c3adbe96c184bae6eda47963ce42ede2808e5588ec3f8ea924853a941";
- name = "kompare-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kompare-20.08.1.tar.xz";
+ sha256 = "6e9109f1b24b3d79dec3d70c75357a67d16ab35081bcf7e4b842981b84796aa2";
+ name = "kompare-20.08.1.tar.xz";
};
};
konqueror = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/konqueror-20.04.3.tar.xz";
- sha256 = "d2f81f697e88eb4fe962aaa43942ef35e7a03df10f811a46ae6805a27e637e35";
- name = "konqueror-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/konqueror-20.08.1.tar.xz";
+ sha256 = "e3aac062d9e431e63a861ecf5a1d577b11a154faaed5bd95ef6b69b4fc8a34e9";
+ name = "konqueror-20.08.1.tar.xz";
};
};
konquest = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/konquest-20.04.3.tar.xz";
- sha256 = "004b3d8d38acecb0d5e78d037a47d137f0517d74768da461ce51fbd2a549578d";
- name = "konquest-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/konquest-20.08.1.tar.xz";
+ sha256 = "cad87dd698bd1ebc0279216614f7fa7c3d3f36d545683a69f1ceafe9e279bbfe";
+ name = "konquest-20.08.1.tar.xz";
};
};
konsole = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/konsole-20.04.3.tar.xz";
- sha256 = "7874b6117d31eecd9fc475536c9bfc73c78d66d57b128cffb0bb931881564f15";
- name = "konsole-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/konsole-20.08.1.tar.xz";
+ sha256 = "bdd82f9104b2f76c53bdbdef613391719b70719a132d24f12e5f620e1c9313d1";
+ name = "konsole-20.08.1.tar.xz";
};
};
kontact = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kontact-20.04.3.tar.xz";
- sha256 = "c35a68a0a99195d1d9b63f7c8edaadb9e4f1dd6957e3823e2e44c8225ccafde7";
- name = "kontact-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kontact-20.08.1.tar.xz";
+ sha256 = "36c33eb5685c22f94257e86ff760d1aa225ae6e2d69402a2b653c54627c7cbde";
+ name = "kontact-20.08.1.tar.xz";
};
};
kontactinterface = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kontactinterface-20.04.3.tar.xz";
- sha256 = "9c0587df91b9de55218d7313c445c68d13b22aeb09dc142caf8d8036574e3b09";
- name = "kontactinterface-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kontactinterface-20.08.1.tar.xz";
+ sha256 = "8272d0c17423a15e56e9e6d3979ee3017fd02ed996b8b6902c47312276ffeb51";
+ name = "kontactinterface-20.08.1.tar.xz";
};
};
kopete = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kopete-20.04.3.tar.xz";
- sha256 = "b37a120e3239ee4e53aedf5756c63f62a737c0774021ec27b120b054e57f886b";
- name = "kopete-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kopete-20.08.1.tar.xz";
+ sha256 = "9846baae28d723963927d231716e2a8bc19795bac920958b688b48394ef5bc05";
+ name = "kopete-20.08.1.tar.xz";
};
};
korganizer = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/korganizer-20.04.3.tar.xz";
- sha256 = "bf2ee5a3e50dca9ab0cde0b5b0d67dc561788527a216d4ef159144da5bf192a3";
- name = "korganizer-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/korganizer-20.08.1.tar.xz";
+ sha256 = "e693d895b36575f2a73c36ceaafadf81465bbf9b03c74da27f5273a2e7e3670e";
+ name = "korganizer-20.08.1.tar.xz";
};
};
kpat = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kpat-20.04.3.tar.xz";
- sha256 = "2a207c9efa1a62c99f8b33cf44782c563ee032b706ef63548239a4c303ec9a66";
- name = "kpat-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kpat-20.08.1.tar.xz";
+ sha256 = "2c23ee028c03c5c210b110a2ad253aa7d91c5a0abcb101eb2b3f4c640092463c";
+ name = "kpat-20.08.1.tar.xz";
};
};
kpimtextedit = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kpimtextedit-20.04.3.tar.xz";
- sha256 = "f6cc5cf0ca2e598ba0c98590f16a8fabf87e1592ad62e6832c787cf2c3616cb8";
- name = "kpimtextedit-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kpimtextedit-20.08.1.tar.xz";
+ sha256 = "2664e6cbe520fa345e18db071dd5b8a5b4cf9b0fc7317eb04849005228666189";
+ name = "kpimtextedit-20.08.1.tar.xz";
};
};
kpkpass = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kpkpass-20.04.3.tar.xz";
- sha256 = "1f8b9bd587c278773fb016bc9fb774b03f82bcdf3c95fdca8bfc070f9a3ff322";
- name = "kpkpass-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kpkpass-20.08.1.tar.xz";
+ sha256 = "76012e5bdd4cc434313a0f311acec8f7c798542008cd8efa71fcdf04fb77e55b";
+ name = "kpkpass-20.08.1.tar.xz";
};
};
kqtquickcharts = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kqtquickcharts-20.04.3.tar.xz";
- sha256 = "69ff44ceb85779f7d4f52e092a8a5d18231ea0704d67d34d15ef94acf0d668c7";
- name = "kqtquickcharts-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kqtquickcharts-20.08.1.tar.xz";
+ sha256 = "ea931bfefcc04bee03bff2498b92ca1a390967bbc5366c739d1a7cde6bb75820";
+ name = "kqtquickcharts-20.08.1.tar.xz";
};
};
krdc = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/krdc-20.04.3.tar.xz";
- sha256 = "4e8f60b4abd05d45e59a773a63cc185529e9fbabb295524a59c835af547d4bc8";
- name = "krdc-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/krdc-20.08.1.tar.xz";
+ sha256 = "7b1fa57be31a3534099e7f203ef9afde23c86c4bbed1072a9d1164a3cf5e1e20";
+ name = "krdc-20.08.1.tar.xz";
};
};
kreversi = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kreversi-20.04.3.tar.xz";
- sha256 = "b2d9220f5919361ff81473c8b597585cc4c004b16ee459691e26feeb2e0c3114";
- name = "kreversi-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kreversi-20.08.1.tar.xz";
+ sha256 = "5da68ddd37f5dbd4e1c94d1641c69f0e9b4e99eff3cdafcdcbac1139ca517315";
+ name = "kreversi-20.08.1.tar.xz";
};
};
krfb = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/krfb-20.04.3.tar.xz";
- sha256 = "44532435ef824ff09d877d6984dbdfdcc5fd941f9e2abed65829dba89afeee0d";
- name = "krfb-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/krfb-20.08.1.tar.xz";
+ sha256 = "a80b9bab47f2a7299e33b0e2a10b117605ec1cc572ca72e914c7f01dde383eda";
+ name = "krfb-20.08.1.tar.xz";
};
};
kross-interpreters = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kross-interpreters-20.04.3.tar.xz";
- sha256 = "7e5d1f771477831f42dc209c0333977af17a143ec8c7f60acbab9f5390818457";
- name = "kross-interpreters-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kross-interpreters-20.08.1.tar.xz";
+ sha256 = "1fb7d75d83e63d1a7147468dd25eeb6aeb06b4679f126c658a8b40ef257f9a4e";
+ name = "kross-interpreters-20.08.1.tar.xz";
};
};
kruler = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kruler-20.04.3.tar.xz";
- sha256 = "66a02829d860777184e281747dd696c6bd326d874a96173d9c47759b9e7243fe";
- name = "kruler-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kruler-20.08.1.tar.xz";
+ sha256 = "a9a1f3bd7b02416a393826f7bb810211ef2e14a3628706de735cb88e791d72d1";
+ name = "kruler-20.08.1.tar.xz";
};
};
kshisen = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kshisen-20.04.3.tar.xz";
- sha256 = "ee91821b13dc13d54a0cdf64582eff820faf934df3654135c55bd3210b98bd52";
- name = "kshisen-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kshisen-20.08.1.tar.xz";
+ sha256 = "d53af415ed2f4d202f5a6f965408e39062e39f43acf83b9550b6cf2ecc1f7641";
+ name = "kshisen-20.08.1.tar.xz";
};
};
ksirk = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ksirk-20.04.3.tar.xz";
- sha256 = "c3c86db84b2603a0cd11e7b0da5e3c66b81c26983ace113b836ec3579dce736a";
- name = "ksirk-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ksirk-20.08.1.tar.xz";
+ sha256 = "763d3a8f518365391d2a04943f6efa9c73c388b7701deff300e9e42e4efe848f";
+ name = "ksirk-20.08.1.tar.xz";
};
};
ksmtp = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ksmtp-20.04.3.tar.xz";
- sha256 = "107d135e9337dfec6f16095c75dd0cf81bdc86cee6eeb6d212954a08a9c2e3ce";
- name = "ksmtp-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ksmtp-20.08.1.tar.xz";
+ sha256 = "608d395cd1a046810ebd00f990d6f7c63d66677e7293ef06948ab9d336d2f08f";
+ name = "ksmtp-20.08.1.tar.xz";
};
};
ksnakeduel = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ksnakeduel-20.04.3.tar.xz";
- sha256 = "99a033313a3093489d39e7d537d064287aeebbfea05accfe8a189f0296664bf2";
- name = "ksnakeduel-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ksnakeduel-20.08.1.tar.xz";
+ sha256 = "25bb5cfe2ed480b8ee31d9fe2e62272d77e7b8667748eb4f2c855901f718784f";
+ name = "ksnakeduel-20.08.1.tar.xz";
};
};
kspaceduel = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kspaceduel-20.04.3.tar.xz";
- sha256 = "dda32d2a89645129c7ee83aca7b21bc01d5120e0d58e8f39516c0837be531e38";
- name = "kspaceduel-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kspaceduel-20.08.1.tar.xz";
+ sha256 = "382def18d1ce6a4333fb47bcd87aed6837382a2b0da2cb8b835d0b34eaed9e38";
+ name = "kspaceduel-20.08.1.tar.xz";
};
};
ksquares = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ksquares-20.04.3.tar.xz";
- sha256 = "eb72d929cd59b076d20483ee03548d72df3dc894b631947ce3440aff0ecad730";
- name = "ksquares-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ksquares-20.08.1.tar.xz";
+ sha256 = "163c5c070643e31594ada4e812433eb5f615ef425dddafd515e6c445d821f319";
+ name = "ksquares-20.08.1.tar.xz";
};
};
ksudoku = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ksudoku-20.04.3.tar.xz";
- sha256 = "2df6e5cf78eee919624aa71716ef35baa9215e44662cdd7b315cfbc328c6ac19";
- name = "ksudoku-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ksudoku-20.08.1.tar.xz";
+ sha256 = "e53b694b340f812cd3bdf5126a32a1e71efe0785897c5d15f9e28c68fd794840";
+ name = "ksudoku-20.08.1.tar.xz";
};
};
ksystemlog = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ksystemlog-20.04.3.tar.xz";
- sha256 = "03a6f81d1b4aa8557f7da6777ef909a02fbd811b3a39df81312dc0a70bbb8f77";
- name = "ksystemlog-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ksystemlog-20.08.1.tar.xz";
+ sha256 = "e0e8bc1cf8ee229206c8a65e30979ba8b72426c8dc2f737f6fecb0dfb36ed21a";
+ name = "ksystemlog-20.08.1.tar.xz";
};
};
kteatime = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kteatime-20.04.3.tar.xz";
- sha256 = "2ddc0df953a66376e5b0c11544a6a2ec9f173e4481a44a290aada20402c7d686";
- name = "kteatime-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kteatime-20.08.1.tar.xz";
+ sha256 = "23cc14f587e4ae4e3b56f1fb7a2093301df740328e35b25d7fca55d35f012ce5";
+ name = "kteatime-20.08.1.tar.xz";
};
};
ktimer = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktimer-20.04.3.tar.xz";
- sha256 = "e9881d68ed4fbbff5900d615f81145cd73e70a08092a83b87d71705ee5904395";
- name = "ktimer-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktimer-20.08.1.tar.xz";
+ sha256 = "9c7062f9ee64ff49a7c7773fe41cee0899e30f1f47368af73da067e51db6714b";
+ name = "ktimer-20.08.1.tar.xz";
};
};
ktnef = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktnef-20.04.3.tar.xz";
- sha256 = "31f5f15ab27112f99ab7b2575a4f90bf612b99a3816544e6919ad4c5a2dc7145";
- name = "ktnef-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktnef-20.08.1.tar.xz";
+ sha256 = "433b232a0c835e7f27c06e6d19856e4f8690c3e3b5c5d63f85172897b2448c81";
+ name = "ktnef-20.08.1.tar.xz";
};
};
ktouch = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktouch-20.04.3.tar.xz";
- sha256 = "7f1c456ae758a6e7eb58e83120289fa8eb5c56c3c98cd9c9f974cea5dd156ea8";
- name = "ktouch-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktouch-20.08.1.tar.xz";
+ sha256 = "e098ebbccca743f678103a9adf54fc388fa4379cc6f667e48259d0b50f56b5fb";
+ name = "ktouch-20.08.1.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-accounts-kcm-20.04.3.tar.xz";
- sha256 = "d45588dbd1441ccb0576e7f76489217351bad5fd25d4636ae9da6f81654f5f4b";
- name = "ktp-accounts-kcm-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktp-accounts-kcm-20.08.1.tar.xz";
+ sha256 = "b71f2f654c3cf48e4b4b037a0ae8f6fef5bac9c3483458c0eadf7b3253577504";
+ name = "ktp-accounts-kcm-20.08.1.tar.xz";
};
};
ktp-approver = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-approver-20.04.3.tar.xz";
- sha256 = "9c91d44476151f39ef02e2eeede7dee7f24689643a07d51d44ca8d98577d24a2";
- name = "ktp-approver-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktp-approver-20.08.1.tar.xz";
+ sha256 = "51296f4d84585ba63d4c72cdbdee6e2b436a1aff8ce6b475a8c9a81766856b39";
+ name = "ktp-approver-20.08.1.tar.xz";
};
};
ktp-auth-handler = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-auth-handler-20.04.3.tar.xz";
- sha256 = "6c73960c44ff42e8c0b6be54b308fc992ab8177f90954ebd960ea6d610e14568";
- name = "ktp-auth-handler-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktp-auth-handler-20.08.1.tar.xz";
+ sha256 = "6c1c006a3381caeebdfc37886b91b598153f3778567303d8a031e84599c9d582";
+ name = "ktp-auth-handler-20.08.1.tar.xz";
};
};
ktp-call-ui = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-call-ui-20.04.3.tar.xz";
- sha256 = "b997c6252c35f7e295f2389ac76c5dc12227e8a6bbfd1b42d72b622d488bcf98";
- name = "ktp-call-ui-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktp-call-ui-20.08.1.tar.xz";
+ sha256 = "feb783be10b0792cb0c59456a00607b2d595e8bef90f0b4ec79dd070596d413c";
+ name = "ktp-call-ui-20.08.1.tar.xz";
};
};
ktp-common-internals = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-common-internals-20.04.3.tar.xz";
- sha256 = "0e7a1c61869d297831615c719e5c79f2b00a6572479d2c2eaca642de6d376efd";
- name = "ktp-common-internals-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktp-common-internals-20.08.1.tar.xz";
+ sha256 = "5750bde4950fbe26f06a306aa642c9c501d4f0e1b41b57234d9e36b189a91d1b";
+ name = "ktp-common-internals-20.08.1.tar.xz";
};
};
ktp-contact-list = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-contact-list-20.04.3.tar.xz";
- sha256 = "c909e21fb168c14c61d1d617b6854ff505eaf4693479d8d0bba746fde0ee11af";
- name = "ktp-contact-list-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktp-contact-list-20.08.1.tar.xz";
+ sha256 = "809db5ff05c1ec632109be408cef987532193b1b0bea69d6a9286c12ccfe19a1";
+ name = "ktp-contact-list-20.08.1.tar.xz";
};
};
ktp-contact-runner = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-contact-runner-20.04.3.tar.xz";
- sha256 = "cb3313ca916a7e3fff78529ccc4a499763766957d22f65dee9663cd950c2b4a6";
- name = "ktp-contact-runner-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktp-contact-runner-20.08.1.tar.xz";
+ sha256 = "a9e761fd35545cfffade088e33f4358e2743416f61e9ba490f21f3b04193158f";
+ name = "ktp-contact-runner-20.08.1.tar.xz";
};
};
ktp-desktop-applets = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-desktop-applets-20.04.3.tar.xz";
- sha256 = "40f1125d4d91e2586d06d45b59d12ac19ee93aaae8c3d4df75db196f7e91e875";
- name = "ktp-desktop-applets-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktp-desktop-applets-20.08.1.tar.xz";
+ sha256 = "d6ffd4b29c4fb977937cb47d55d023012be1a9b3602dd1f1628eba7d8c9167cd";
+ name = "ktp-desktop-applets-20.08.1.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-filetransfer-handler-20.04.3.tar.xz";
- sha256 = "74df7140bac0b87e3ff39e8ab692bb4c65a10612f328c8d60a84433ae865de52";
- name = "ktp-filetransfer-handler-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktp-filetransfer-handler-20.08.1.tar.xz";
+ sha256 = "35495c1d18a7b65496fcf17cade4a81e4795b1603c380c036dda0a7626f66312";
+ name = "ktp-filetransfer-handler-20.08.1.tar.xz";
};
};
ktp-kded-module = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-kded-module-20.04.3.tar.xz";
- sha256 = "972a4a5d7108351a07be670654b4e78dfe9fb7657336c563040e1e831134aad2";
- name = "ktp-kded-module-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktp-kded-module-20.08.1.tar.xz";
+ sha256 = "247e4047e3955e21066ec461a5374d1b3d925bb92b42adc46d3711e542ad7e04";
+ name = "ktp-kded-module-20.08.1.tar.xz";
};
};
ktp-send-file = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-send-file-20.04.3.tar.xz";
- sha256 = "fa67edd7ec516ed727d5df0d30ccf6b990cee40f8062a9966a8643d6f26c8344";
- name = "ktp-send-file-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktp-send-file-20.08.1.tar.xz";
+ sha256 = "b3786c6e6f09ea086c2d94d2a6dd653e45bab8f984c6287c39f5e0134d6ffee1";
+ name = "ktp-send-file-20.08.1.tar.xz";
};
};
ktp-text-ui = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktp-text-ui-20.04.3.tar.xz";
- sha256 = "be6253246134aa6513b0ff36d25a833d469e6850da1f5c8c05666a555bbfd9b2";
- name = "ktp-text-ui-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktp-text-ui-20.08.1.tar.xz";
+ sha256 = "5cdb88f55b6ca1a1053b8d5b2604eff681c5f3558f0c8037034c264793de8c02";
+ name = "ktp-text-ui-20.08.1.tar.xz";
};
};
ktuberling = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/ktuberling-20.04.3.tar.xz";
- sha256 = "0fb7ef29c5bf02de56243e608a050fce992df56586d305a157ed3ac70f002a44";
- name = "ktuberling-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/ktuberling-20.08.1.tar.xz";
+ sha256 = "62d3d8db7b1db7f9d58df44acf61342ce42fb081038fc48f8f6e45d9167ceaa6";
+ name = "ktuberling-20.08.1.tar.xz";
};
};
kturtle = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kturtle-20.04.3.tar.xz";
- sha256 = "e04034812c62e22be0ee7eb91d89a9e0e0c73bb5cba8e914373f407c99e8c0cb";
- name = "kturtle-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kturtle-20.08.1.tar.xz";
+ sha256 = "c261fdf44b36aaa278b4b9752a0d989facec3768853606e5c0b8a86d9d01edb3";
+ name = "kturtle-20.08.1.tar.xz";
};
};
kubrick = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kubrick-20.04.3.tar.xz";
- sha256 = "983310938ad0437902d886f433b0693a3a08faaca0f5553a3aa24e89e3215fb9";
- name = "kubrick-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kubrick-20.08.1.tar.xz";
+ sha256 = "c0c017f6913f94224e18df7d96ba9ad92f51522a331b77f5722f2d2c953c342c";
+ name = "kubrick-20.08.1.tar.xz";
};
};
kwalletmanager = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kwalletmanager-20.04.3.tar.xz";
- sha256 = "3821d17f5238bd51b9d19ef5974e063aa6426f35afcd0cffa89af109c770151e";
- name = "kwalletmanager-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kwalletmanager-20.08.1.tar.xz";
+ sha256 = "b5a134db6b6bceb802c6c45915636bcd95fea5b6846cfd022917405f48cc92c5";
+ name = "kwalletmanager-20.08.1.tar.xz";
};
};
kwave = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kwave-20.04.3.tar.xz";
- sha256 = "111ea78c90371f566500e88d746812b17875e154e431b3694e3d226f3f19e988";
- name = "kwave-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kwave-20.08.1.tar.xz";
+ sha256 = "3791f9401271c23d3ababd14e4c1e6acfe58df2100331e31ba61453feaf9fa32";
+ name = "kwave-20.08.1.tar.xz";
};
};
kwordquiz = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/kwordquiz-20.04.3.tar.xz";
- sha256 = "464684309e098c4e8663d39cd98f53a640a93e1d8ac169a2a0ac3cc98d7f8e12";
- name = "kwordquiz-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/kwordquiz-20.08.1.tar.xz";
+ sha256 = "77d2d30abcb37ee6a8e0b121ed1969f2fa61eb32814f49a0186043a4e8f1a71c";
+ name = "kwordquiz-20.08.1.tar.xz";
};
};
libgravatar = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libgravatar-20.04.3.tar.xz";
- sha256 = "0a5eadd5c8492eb17225e0ff2d221f69231e72ca9b8a78080301639662a18acf";
- name = "libgravatar-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libgravatar-20.08.1.tar.xz";
+ sha256 = "dfe95055869944b79b1f4120f013b547225b02b69c7e410fd09d52469a892263";
+ name = "libgravatar-20.08.1.tar.xz";
};
};
libkcddb = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkcddb-20.04.3.tar.xz";
- sha256 = "d205d3a458c0d54d7118e36006710fe2d2993de5b417c9d8936762fa710634b4";
- name = "libkcddb-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libkcddb-20.08.1.tar.xz";
+ sha256 = "1519c9248b46d95d8761a8ed22b0805964a5fef5aa665710b08851c753f70590";
+ name = "libkcddb-20.08.1.tar.xz";
};
};
libkcompactdisc = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkcompactdisc-20.04.3.tar.xz";
- sha256 = "5bc98eba521f66cb52645786cf875037397e4dbd3ec4c9a23687d936d1505d24";
- name = "libkcompactdisc-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libkcompactdisc-20.08.1.tar.xz";
+ sha256 = "f43b8129a0083686dbc939387931867d9d65e14936f2a86be0a7286e01cf1974";
+ name = "libkcompactdisc-20.08.1.tar.xz";
};
};
libkdcraw = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkdcraw-20.04.3.tar.xz";
- sha256 = "e37e9210a250955d1fe63d2d96571d0630572633e567eb047af9f24db2b86cb5";
- name = "libkdcraw-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libkdcraw-20.08.1.tar.xz";
+ sha256 = "3431810972d886635ba6249ac86a9442a9c3a3333eb0b27533fc459e757e9eb1";
+ name = "libkdcraw-20.08.1.tar.xz";
};
};
libkdegames = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkdegames-20.04.3.tar.xz";
- sha256 = "fda965e2ff166abe89cf008a5160262f061a6c3aeda4a71a834b5ed66ea6d0be";
- name = "libkdegames-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libkdegames-20.08.1.tar.xz";
+ sha256 = "6ab0b143dcba2d935dd0182c9154657ebbfb205c28bc86e2e13875b58e23737d";
+ name = "libkdegames-20.08.1.tar.xz";
};
};
libkdepim = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkdepim-20.04.3.tar.xz";
- sha256 = "f4ecc6d33aace0a0025afe390a113f79bb052b816c567ea31996aaf08fe873ea";
- name = "libkdepim-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libkdepim-20.08.1.tar.xz";
+ sha256 = "a2fb769239283e7f536d4779089ad8664d1498cf7520f057589bf0285630fb4b";
+ name = "libkdepim-20.08.1.tar.xz";
};
};
libkeduvocdocument = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkeduvocdocument-20.04.3.tar.xz";
- sha256 = "a53e17a84420fca8f9572d8439da2c63d1241a607952454003a4020104a25558";
- name = "libkeduvocdocument-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libkeduvocdocument-20.08.1.tar.xz";
+ sha256 = "ecd158beb7fcc1a5d540d956669c6fdce6172f4b282755170d2791076d75ad84";
+ name = "libkeduvocdocument-20.08.1.tar.xz";
};
};
libkexiv2 = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkexiv2-20.04.3.tar.xz";
- sha256 = "12fa569aca07269e880bd976a6cc37b4f585fe2aac8837d437bc29999d95f6be";
- name = "libkexiv2-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libkexiv2-20.08.1.tar.xz";
+ sha256 = "67310ae90d89f26d2ae98ede8fa973e27ea1ce3d15c389954d391cd058543979";
+ name = "libkexiv2-20.08.1.tar.xz";
};
};
libkgapi = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkgapi-20.04.3.tar.xz";
- sha256 = "9b689d8c4a1df0b792604cf5951b30d8343e984d890f4a3fb946a449723e520d";
- name = "libkgapi-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libkgapi-20.08.1.tar.xz";
+ sha256 = "dfa9003556a01ef19eda186973f87356d32ea8f82f8d653803b2cc935f077127";
+ name = "libkgapi-20.08.1.tar.xz";
};
};
libkgeomap = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkgeomap-20.04.3.tar.xz";
- sha256 = "34e41b2505a34355a31a548bb8f94955b3dc4391c71201164574ff45b532818d";
- name = "libkgeomap-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libkgeomap-20.08.1.tar.xz";
+ sha256 = "a210945b6807efca3390173233269aa31f27a23b5f36670b88f66b3b28df846f";
+ name = "libkgeomap-20.08.1.tar.xz";
};
};
libkipi = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkipi-20.04.3.tar.xz";
- sha256 = "4a72f0d1423a6a6f7017bf0598c99261575feb4d9af73520074f6f0b7f9e4c25";
- name = "libkipi-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libkipi-20.08.1.tar.xz";
+ sha256 = "4722ab563c1350042920d1937b84fdd38b5779449a2d9b689328cd82241cb5d2";
+ name = "libkipi-20.08.1.tar.xz";
};
};
libkleo = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkleo-20.04.3.tar.xz";
- sha256 = "ef2a37a1c8793e4c89dcf49bc330044a617b4b04472679b179992b188e412c50";
- name = "libkleo-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libkleo-20.08.1.tar.xz";
+ sha256 = "78c1dc2e4d7177aaf37cb1c706d9c21b08fac7d130ac1da3d3f2a6f083117ffb";
+ name = "libkleo-20.08.1.tar.xz";
};
};
libkmahjongg = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkmahjongg-20.04.3.tar.xz";
- sha256 = "24fcff9d91c5143c7275c5c97c2be32e85f5c788749df3acc841fd28bee450a0";
- name = "libkmahjongg-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libkmahjongg-20.08.1.tar.xz";
+ sha256 = "5a8674921e39b38655d1f95340831b1bc746047cbad8501706436f5dacf47fc2";
+ name = "libkmahjongg-20.08.1.tar.xz";
};
};
libkomparediff2 = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libkomparediff2-20.04.3.tar.xz";
- sha256 = "e27a5fd3dd80a9c7c052ec3c824acc529073464788d1c6950d4d2c407b74c0b0";
- name = "libkomparediff2-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libkomparediff2-20.08.1.tar.xz";
+ sha256 = "9d109dfea1433602cdabc89ffa5f522147befc9b1d6d9760549aba7db5dbd399";
+ name = "libkomparediff2-20.08.1.tar.xz";
};
};
libksane = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libksane-20.04.3.tar.xz";
- sha256 = "34827bcc5b9277292dd4434f2bf7610a28d54c86565f0410d4470c61f374c46e";
- name = "libksane-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libksane-20.08.1.tar.xz";
+ sha256 = "0d8717ad004a2480aea232d9a2317b4d1cc4678d53f0176bdaeb411eedd19dbe";
+ name = "libksane-20.08.1.tar.xz";
};
};
libksieve = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/libksieve-20.04.3.tar.xz";
- sha256 = "8aacc0c41ac2b7bf48c8479c8fba581a325828b907053eba6b9b5ff4c63d0529";
- name = "libksieve-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/libksieve-20.08.1.tar.xz";
+ sha256 = "a1defe888c6c5a3c16ef6fad39d9eb94bc784031079763f004048951820acec0";
+ name = "libksieve-20.08.1.tar.xz";
};
};
lokalize = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/lokalize-20.04.3.tar.xz";
- sha256 = "fccba64af9faa5cbb5dfdb303009504993fe71282f0dbc9c748c5a28a327c379";
- name = "lokalize-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/lokalize-20.08.1.tar.xz";
+ sha256 = "a4a3e5703d39ae8fe12d2ff832e99b3339ba1c8ec8d2439abeb348e687f1eae9";
+ name = "lokalize-20.08.1.tar.xz";
};
};
lskat = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/lskat-20.04.3.tar.xz";
- sha256 = "b7e33cc8097ee4bf4e5182a2a5db1e142c65b119424079f5e7f179720092815b";
- name = "lskat-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/lskat-20.08.1.tar.xz";
+ sha256 = "319d611468b969b3bb62731a0aa04c5672bb689c41adf5545dfa8b9742668775";
+ name = "lskat-20.08.1.tar.xz";
};
};
mailcommon = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/mailcommon-20.04.3.tar.xz";
- sha256 = "80b6285c8152a64362f5f406b4a766b0937ff29acf87133b0326b6e7ce66809f";
- name = "mailcommon-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/mailcommon-20.08.1.tar.xz";
+ sha256 = "d4ee996f74a749ad626ca5029821546da82dbfc1c81864ff39b5f51d6dcf1d88";
+ name = "mailcommon-20.08.1.tar.xz";
};
};
mailimporter = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/mailimporter-20.04.3.tar.xz";
- sha256 = "13a95ee3d89d658222dcdc905311c72b1ba04e6b8aac863dee767a4d72d3d54e";
- name = "mailimporter-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/mailimporter-20.08.1.tar.xz";
+ sha256 = "dcf2b94d4f66be2b339b31dfebef7af373e0cf59f09e4cfb664eb828e1d4f73f";
+ name = "mailimporter-20.08.1.tar.xz";
};
};
marble = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/marble-20.04.3.tar.xz";
- sha256 = "9c0b6fb13d53e1748de081c43e06cc132d5b07d46e594443b207fbaf74e1f95b";
- name = "marble-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/marble-20.08.1.tar.xz";
+ sha256 = "96b019a41ae4e0aaab59950b6be040bd2145f130190b8c0dea436c791e3192ed";
+ name = "marble-20.08.1.tar.xz";
};
};
mbox-importer = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/mbox-importer-20.04.3.tar.xz";
- sha256 = "ce208091272052a909521cda31a74b2f4c8e8fabcb2937c24639673d1f43981d";
- name = "mbox-importer-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/mbox-importer-20.08.1.tar.xz";
+ sha256 = "262c8805539b7c766099c6287d1dbf88161afe6d32c1c6821ebe63cff4fe3b71";
+ name = "mbox-importer-20.08.1.tar.xz";
};
};
messagelib = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/messagelib-20.04.3.tar.xz";
- sha256 = "aa2c254f50ed4664b67df5857bba063d1400fe280f3a58658cfa59d3155b2adf";
- name = "messagelib-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/messagelib-20.08.1.tar.xz";
+ sha256 = "fc41124e905456a3c5227ca6154dc3e77620e307458fbb19f5421cbfb04523b3";
+ name = "messagelib-20.08.1.tar.xz";
};
};
minuet = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/minuet-20.04.3.tar.xz";
- sha256 = "9afb598280a9b90013833005299fb0c33c3c7cc02b687f65616e04dc12e21d41";
- name = "minuet-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/minuet-20.08.1.tar.xz";
+ sha256 = "a640025550337f415f7bfaaad7f6ef7de667dd054131be2c313d894c3f6703ea";
+ name = "minuet-20.08.1.tar.xz";
};
};
okular = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/okular-20.04.3.tar.xz";
- sha256 = "60865a5d09f41d30572b72224fb61baf9dde18cf6e246565d852e672e7bc4cfe";
- name = "okular-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/okular-20.08.1.tar.xz";
+ sha256 = "77b5d8e410a2a008ea63f60a561f99053ec07d92da6ee3afaeefd977aadebd83";
+ name = "okular-20.08.1.tar.xz";
};
};
palapeli = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/palapeli-20.04.3.tar.xz";
- sha256 = "8ae05cce4a1ccb5226c9895195c47825054363a127905dacd5b25fc2a4df3828";
- name = "palapeli-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/palapeli-20.08.1.tar.xz";
+ sha256 = "31b847caa89b998dfa580553d96c656b05f2d85fdd88f0ba71e953762cefac90";
+ name = "palapeli-20.08.1.tar.xz";
};
};
parley = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/parley-20.04.3.tar.xz";
- sha256 = "b5e74fbd458824d26c0ea7cb8ed5510e3f6e849c9dbda4bc7804b9b95a64da03";
- name = "parley-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/parley-20.08.1.tar.xz";
+ sha256 = "9617a90c2d4f9ab5d928febc6bcd10c9023dcc10e9f1202bfb97b77019948f0c";
+ name = "parley-20.08.1.tar.xz";
};
};
picmi = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/picmi-20.04.3.tar.xz";
- sha256 = "57406f820d58132602b3e6524bad2d7aba3466f7c1a78a623077e7df5faf6838";
- name = "picmi-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/picmi-20.08.1.tar.xz";
+ sha256 = "027e37a2c9dcf828684a0f8ffdcfc6451a2bd62976c10d990e471fa0f5ba97c3";
+ name = "picmi-20.08.1.tar.xz";
};
};
pimcommon = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/pimcommon-20.04.3.tar.xz";
- sha256 = "a5d295f7174cafeb27bc1aed03a715525b132f9dca734a183dd705a2c7ffa40b";
- name = "pimcommon-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/pimcommon-20.08.1.tar.xz";
+ sha256 = "58a33349bf932076f6be343ae64e23f146e2a6a96e3af8ce68dbd752f2c80dd9";
+ name = "pimcommon-20.08.1.tar.xz";
};
};
pim-data-exporter = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/pim-data-exporter-20.04.3.tar.xz";
- sha256 = "742727f09c984ff86f0406fa756b8ab50e695d6bd8a10abd7d55950c1c2c10de";
- name = "pim-data-exporter-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/pim-data-exporter-20.08.1.tar.xz";
+ sha256 = "54092763e4b951f4e90a217c876107900e0706da68ca5517184e5da258ae95ec";
+ name = "pim-data-exporter-20.08.1.tar.xz";
};
};
pim-sieve-editor = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/pim-sieve-editor-20.04.3.tar.xz";
- sha256 = "e59c4eee3f7548fc724f7b79cbff2f90c10be92eb0cab7259dd57fd221f2b7dc";
- name = "pim-sieve-editor-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/pim-sieve-editor-20.08.1.tar.xz";
+ sha256 = "f788038796f226bfe426835fc6f186e23f2c7f9fda8316dfa6af307d6936d4ad";
+ name = "pim-sieve-editor-20.08.1.tar.xz";
};
};
poxml = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/poxml-20.04.3.tar.xz";
- sha256 = "a070eb5c12e14df691648a9a3e482c021c484f59dfaac413eeacc002cdc1833a";
- name = "poxml-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/poxml-20.08.1.tar.xz";
+ sha256 = "9f4bcafc664532706fe634ce8b0f410619d5e3c285526a7b61969155d75bbad2";
+ name = "poxml-20.08.1.tar.xz";
};
};
print-manager = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/print-manager-20.04.3.tar.xz";
- sha256 = "9d877925cafdf7dfa0dcce5694f849b13ca8bb7c4552a800eebd26a3fc42d376";
- name = "print-manager-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/print-manager-20.08.1.tar.xz";
+ sha256 = "52d41ca3ae69e6e8e1eb4ddf1d516868dc436e81779053efdea5e3819545ca5b";
+ name = "print-manager-20.08.1.tar.xz";
};
};
rocs = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/rocs-20.04.3.tar.xz";
- sha256 = "1620ff8360568ab4201d526ea4489bd672f6715b6d200251d63ed139dcc58a94";
- name = "rocs-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/rocs-20.08.1.tar.xz";
+ sha256 = "3c5f764f06f6f5b7c68523be4fdd37e75b2249e0b15001bc39e55051d9e271ef";
+ name = "rocs-20.08.1.tar.xz";
};
};
signon-kwallet-extension = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/signon-kwallet-extension-20.04.3.tar.xz";
- sha256 = "a391ceff9c86f2e3d8a74a26ffb4143d0adffc8669a51a019d39f16a8e207c1c";
- name = "signon-kwallet-extension-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/signon-kwallet-extension-20.08.1.tar.xz";
+ sha256 = "10a0ea806dc63cbf6c6d4794fe596c68355bccb3e08370d70ce7a8e95af448a5";
+ name = "signon-kwallet-extension-20.08.1.tar.xz";
};
};
spectacle = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/spectacle-20.04.3.tar.xz";
- sha256 = "71e852aceaac1dc76cd9aa4aa8284ced1c149d7374d9e06f996f4259a72ccbd6";
- name = "spectacle-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/spectacle-20.08.1.tar.xz";
+ sha256 = "4a01b5ef41901ff2e83bb517c2e96a978188b98cb62243eb541a317f57a2bd69";
+ name = "spectacle-20.08.1.tar.xz";
};
};
step = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/step-20.04.3.tar.xz";
- sha256 = "89d7e29b6e5f888886022701cbfd628c322daa3da43dda4c3fd90d1a137aa29d";
- name = "step-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/step-20.08.1.tar.xz";
+ sha256 = "6e04930963676b1bfa55ee095914c7491a61bf3963c45ed4157f868175ee6605";
+ name = "step-20.08.1.tar.xz";
};
};
svgpart = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/svgpart-20.04.3.tar.xz";
- sha256 = "2ffb67858ac5c01f5bb5d4728526786c5b6b6a8b70d688123c52efa084fae1b4";
- name = "svgpart-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/svgpart-20.08.1.tar.xz";
+ sha256 = "206c3741464f959ffbaea09bc918fc3e88f32fcf12928cd8c399ab44d4b1f228";
+ name = "svgpart-20.08.1.tar.xz";
};
};
sweeper = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/sweeper-20.04.3.tar.xz";
- sha256 = "16b247b9e3f3d3497f31f9dcb91ff06725a07f0f56a934fdf1ecf1af1ab1b426";
- name = "sweeper-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/sweeper-20.08.1.tar.xz";
+ sha256 = "722c25de8cc74fe7e8310d47a7e794f32e935331f89d4f5249fd045a83ce0431";
+ name = "sweeper-20.08.1.tar.xz";
};
};
umbrello = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/umbrello-20.04.3.tar.xz";
- sha256 = "c34a5f6ca945dd409921903abd2e0078b6a056a0d221d59674980ce424cf1e62";
- name = "umbrello-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/umbrello-20.08.1.tar.xz";
+ sha256 = "d980d67f8a878e01cd3af5499aa843df703f20cdecca8a14b59d87d13c747328";
+ name = "umbrello-20.08.1.tar.xz";
};
};
yakuake = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/yakuake-20.04.3.tar.xz";
- sha256 = "62466165becc848d05461f7b12b67615a517d2919b6fccd8441dfeed9a0a04fa";
- name = "yakuake-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/yakuake-20.08.1.tar.xz";
+ sha256 = "6768a360a3d79080e6e53821460ed27f6c2e47fa11077bbec3213d85385d6fac";
+ name = "yakuake-20.08.1.tar.xz";
};
};
zeroconf-ioslave = {
- version = "20.04.3";
+ version = "20.08.1";
src = fetchurl {
- url = "${mirror}/stable/release-service/20.04.3/src/zeroconf-ioslave-20.04.3.tar.xz";
- sha256 = "3b2ac8833499a53a78547ae34be4a29a6cb79d54601a8c638b225f1c2059d9f0";
- name = "zeroconf-ioslave-20.04.3.tar.xz";
+ url = "${mirror}/stable/release-service/20.08.1/src/zeroconf-ioslave-20.08.1.tar.xz";
+ sha256 = "ca1685a22922057ba89510d71a11218bf47db0d0313aec2b55aca21932564866";
+ name = "zeroconf-ioslave-20.08.1.tar.xz";
};
};
}
diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix
index 5210e10f814b0..715af073d8b5f 100644
--- a/pkgs/applications/logging/humioctl/default.nix
+++ b/pkgs/applications/logging/humioctl/default.nix
@@ -1,8 +1,8 @@
{ buildGoModule, fetchFromGitHub, installShellFiles, stdenv }:
let
- humioCtlVersion = "0.26.0";
- sha256 = "1j33hmvhkb546dbi2qd5hmpcv715yg9rnpxicc1mayr9f1i2aj2i";
+ humioCtlVersion = "0.26.1";
+ sha256 = "1zpcbfv7zlym0jfyz78piggm8zhqlzbwpwq0dn255d0zc48zp773";
vendorSha256 = "1l2wa4w43srfrkb4qrgiyzdb6bnaqvp9g3fnrln6bhrcw6jsgj4z";
in buildGoModule {
name = "humioctl-${humioCtlVersion}";
@@ -11,6 +11,8 @@ in buildGoModule {
vendorSha256 = vendorSha256;
+ doCheck = false;
+
src = fetchFromGitHub {
owner = "humio";
repo = "cli";
diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix
index b67e514ce54d1..ecd130426de17 100644
--- a/pkgs/applications/misc/adobe-reader/default.nix
+++ b/pkgs/applications/misc/adobe-reader/default.nix
@@ -28,5 +28,9 @@ stdenv.mkDerivation {
description = "Adobe Reader, a viewer for PDF documents";
homepage = "http://www.adobe.com/products/reader";
license = stdenv.lib.licenses.unfree;
+ knownVulnerabilities = [
+ "Numerous unresolved vulnerabilities"
+ "See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53"
+ ];
};
}
diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix
index 8602282dd6b7a..114021eb78f31 100644
--- a/pkgs/applications/misc/archiver/default.nix
+++ b/pkgs/applications/misc/archiver/default.nix
@@ -16,11 +16,12 @@ buildGoModule rec {
vendorSha256 = "1ikrgl03r9zkn86kxkqi2kf540g3qzzz24i5wvh6g3d5q49nygl9";
+ doCheck = false;
+
meta = with lib; {
description = "Easily create & extract archives, and compress & decompress files of various formats";
homepage = "https://github.com/mholt/archiver";
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix
index 1dbcdf31ed19b..9f157798a7d2e 100644
--- a/pkgs/applications/misc/ausweisapp2/default.nix
+++ b/pkgs/applications/misc/ausweisapp2/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "AusweisApp2";
- version = "1.20.1";
+ version = "1.20.2";
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
rev = "${version}";
- sha256 = "17ify6v4z8i8ps3s8qabnrqfkj0my4yzyqwk3q3nhrqilbnhr40x";
+ sha256 = "1vibk3wmn54qr2mwz537hrr959y0r1zabp0gsijhzj2mk68g9pnb";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix
index 8b17ecea3cbb9..43362b0394eb2 100644
--- a/pkgs/applications/misc/bemenu/default.nix
+++ b/pkgs/applications/misc/bemenu/default.nix
@@ -11,13 +11,13 @@ assert x11Support -> xlibs != null && xorg != null;
stdenv.mkDerivation rec {
pname = "bemenu";
- version = "0.4.1";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "Cloudef";
repo = pname;
rev = version;
- sha256 = "1fjcs9d3533ay3nz79cx3c0lmy2chgragr2lhsy0xl2ckr0iins0";
+ sha256 = "1ifq5bk7782b9m6bl111x33fn38rpppdrww7hfavqia9a9gi2sl5";
};
nativeBuildInputs = [ pkgconfig pcre ];
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 45df354754592..2190307fbb569 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -17,11 +17,11 @@ let python = python3Packages.python; in
stdenv.mkDerivation rec {
pname = "blender";
- version = "2.83.3";
+ version = "2.83.5";
src = fetchurl {
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
- sha256 = "18m27abp4j3xv48dr6ddr2mqcvx2vkjffr487z90059yv9k0yh2p";
+ sha256 = "0xyawly00a59hfdb6b7va84k5fhcv2mxnzd77vs22bzi9y7sap43";
};
patches = lib.optional stdenv.isDarwin ./darwin.patch;
diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index 3cc51c83616e4..e3ffdef44d0ca 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -3,13 +3,13 @@
buildGoModule rec {
pname = "cheat";
- version = "4.0.2";
+ version = "4.0.4";
src = fetchFromGitHub {
owner = "cheat";
repo = "cheat";
rev = version;
- sha256 = "06dqwjyk7pmfxvkscn06sc307pxvyjqc6myighfsh3f5x83pg1nc";
+ sha256 = "0cracw6pja3d7z6ip6lbmpvfxlxcnh3fbgh5ba8c87bhfz99idqn";
};
subPackages = [ "cmd/cheat" ];
@@ -23,6 +23,8 @@ buildGoModule rec {
vendorSha256 = null;
+ doCheck = false;
+
meta = with stdenv.lib; {
description = "Create and view interactive cheatsheets on the command-line";
maintainers = with maintainers; [ mic92 ];
diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/applications/misc/coolreader/default.nix
new file mode 100644
index 0000000000000..c3efed72cb0eb
--- /dev/null
+++ b/pkgs/applications/misc/coolreader/default.nix
@@ -0,0 +1,26 @@
+{ mkDerivation, fetchFromGitHub, cmake, pkg-config, lib,
+ qttools, fribidi, libunibreak }:
+
+mkDerivation rec {
+ pname = "coolreader";
+ version = "3.2.45";
+
+ src = fetchFromGitHub {
+ owner = "buggins";
+ repo = pname;
+ rev = "cr${version}";
+ sha256 = "0nkk4d0j04yjwanjszq8h8hvx87rnwax2k6akm4bpjxwpcs4icws";
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+
+ buildInputs = [ qttools fribidi libunibreak ];
+
+ meta = with lib; {
+ homepage = "https://github.com/buggins/coolreader";
+ description = "Cross platform open source e-book reader";
+ license = licenses.gpl2Plus; # see https://github.com/buggins/coolreader/issues/80
+ maintainers = with maintainers; [ gebner ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index fb177e8278f4d..7cf89a74e1008 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "CopyQ";
- version = "3.11.1";
+ version = "3.12.0";
src = fetchFromGitHub {
owner = "hluk";
repo = "CopyQ";
rev = "v${version}";
- sha256 = "1xxf8d220pa77195d9f3l3scvvyqsh1pvlrbw4cq6ydj9qbp5kf0";
+ sha256 = "04jidibf0b80c5vd659pz2wibmggjyyj9yz2bw7j4g84hwraksxb";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 324c010b8b551..e8a04aa2e14f5 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "dbeaver-ce";
- version = "7.1.4";
+ version = "7.2.0";
desktopItem = makeDesktopItem {
name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "0a11hjwngm9i05wjx3qavf1zmlaz13dvhqm54ci4d27qrczywcyr";
+ sha256 = "0zpxsdzhn5fsrlq04v5kvkrgf4dsj5zmpypj9awsd2mjcbp6yxd7";
};
installPhase = ''
diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix
deleted file mode 100644
index 623e6dc0fbef0..0000000000000
--- a/pkgs/applications/misc/direwolf/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchFromGitHub
-, espeak, alsaLib, perl
-, python }:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
- pname = "direwolf";
- version = "1.4";
-
- src = fetchFromGitHub {
- owner = "wb2osz";
- repo = "direwolf";
- rev = version;
- sha256 = "033sffjs2dz48077hc58jr4lxxs8md1fyfh4lig6ib7pyigiv1y0";
- };
-
- buildInputs = [
- espeak perl python
- ] ++ (optional stdenv.isLinux alsaLib);
-
- postPatch = ''
- for i in Makefile.*; do
- substituteInPlace "$i" \
- --replace /usr/share $out/share
- done
-
- substituteInPlace dwespeak.sh \
- --replace espeak ${espeak}/bin/espeak
- '';
-
- preInstall = ''
- mkdir -p $out/bin
- '';
- installFlags = [ "INSTALLDIR=$(out)" ];
-
- meta = {
- description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway";
- homepage = "https://github.com/wb2osz/direwolf/";
- license = licenses.gpl2;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix
index 7d5fa173c06fa..d0f84df784155 100644
--- a/pkgs/applications/misc/dstask/default.nix
+++ b/pkgs/applications/misc/dstask/default.nix
@@ -18,6 +18,8 @@ buildGoModule rec {
# and
vendorSha256 = null;
+ doCheck = false;
+
# The ldflags reduce the executable size by stripping some debug stuff.
# The other variables are set so that the output of dstask version shows the
# git ref and the release version from github.
diff --git a/pkgs/applications/misc/effitask/cargo-lock.patch b/pkgs/applications/misc/effitask/cargo-lock.patch
new file mode 100644
index 0000000000000..4f56b82368fa6
--- /dev/null
+++ b/pkgs/applications/misc/effitask/cargo-lock.patch
@@ -0,0 +1,1091 @@
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 0000000..55e4495
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,1085 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "aho-corasick"
++version = "0.7.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "arrayvec"
++version = "0.4.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "atk"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "atk-sys"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "autocfg"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "backtrace"
++version = "0.3.41"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "backtrace-sys 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "backtrace-sys"
++version = "0.1.35"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "bitflags"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "cairo-rs"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cairo-sys-rs"
++version = "0.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cc"
++version = "1.0.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "cfg-if"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "chrono"
++version = "0.4.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "effitask"
++version = "0.1.0"
++dependencies = [
++ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "human-panic 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "notify 4.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pulldown-cmark 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "relm 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "relm-attributes 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "relm-derive 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "todo-txt 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "filetime"
++version = "0.2.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "fragile"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "fsevent"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "fsevent-sys"
++version = "2.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "fuchsia-zircon"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "fuchsia-zircon-sys"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "gdk"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "gdk-pixbuf"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "gdk-pixbuf-sys"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "gdk-sys"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "getopts"
++version = "0.2.21"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "getrandom"
++version = "0.1.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "gio"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "gio-sys"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "glib"
++version = "0.8.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "glib-sys"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "gobject-sys"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "gtk"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "gtk-sys"
++version = "0.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "human-panic"
++version = "1.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "backtrace 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
++ "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "inotify"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "inotify-sys"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "iovec"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "kernel32-sys"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "lazycell"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "lexical-core"
++version = "0.6.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "libc"
++version = "0.2.68"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "log"
++version = "0.4.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "memchr"
++version = "2.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "mio"
++version = "0.6.21"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "mio-extras"
++version = "2.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "miow"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "net2"
++version = "0.2.33"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "nodrop"
++version = "0.1.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "nom"
++version = "5.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lexical-core 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "notify"
++version = "4.0.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "filetime 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "inotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-integer"
++version = "0.1.42"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "os_type"
++version = "2.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "pango"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "pango-sys"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "pkg-config"
++version = "0.3.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "proc-macro2"
++version = "0.4.30"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "pulldown-cmark"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quote"
++version = "0.6.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quote"
++version = "1.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.1.56"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "regex"
++version = "1.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "relm"
++version = "0.18.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "relm-attributes"
++version = "0.16.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "relm-gen-widget 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "relm-derive"
++version = "0.18.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "relm-gen-widget"
++version = "0.16.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rustc-demangle"
++version = "0.1.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rustc_version"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ryu"
++version = "1.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "same-file"
++version = "1.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "semver"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "semver-parser"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "serde"
++version = "1.0.106"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "serde_derive"
++version = "1.0.106"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "slab"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "static_assertions"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "syn"
++version = "0.15.44"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "syn"
++version = "1.0.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "termcolor"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "thread_local"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "time"
++version = "0.1.42"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "todo-txt"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "nom 5.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "toml"
++version = "0.5.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicase"
++version = "2.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-width"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "uuid"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "version_check"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "walkdir"
++version = "2.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wasi"
++version = "0.9.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "winapi-build"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi-util"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "ws2_32-sys"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "xdg"
++version = "2.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[metadata]
++"checksum aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
++"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
++"checksum atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "86b7499272acf036bb5820c6e346bbfb5acc5dceb104bc2c4fd7e6e33dfcde6a"
++"checksum atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f"
++"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
++"checksum backtrace 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)" = "a4ed64ae6d9ebfd9893193c4b2532b1292ec97bd8271c9d7d0fa90cd78a34cba"
++"checksum backtrace-sys 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "7de8aba10a69c8e8d7622c5710229485ec32e9d55fdad160ea559c086fdcd118"
++"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++"checksum cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e05db47de3b0f09a222fa4bba2eab957d920d4243962a86b2d77ab401e4a359c"
++"checksum cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63"
++"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
++"checksum chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
++"checksum filetime 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f59efc38004c988e4201d11d263b8171f49a2e7ec0bdbb71773433f271504a5e"
++"checksum fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9"
++"checksum fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6"
++"checksum fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0"
++"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
++"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
++"checksum gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6243e995f41f3a61a31847e54cc719edce93dd9140c89dca3b9919be1cfe22d5"
++"checksum gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9726408ee1bbada83094326a99b9c68fea275f9dbb515de242a69e72051f4fcc"
++"checksum gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0"
++"checksum gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb"
++"checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
++"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
++"checksum gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6261b5d34c30c2d59f879e643704cf54cb44731f3a2038000b68790c03e360e3"
++"checksum gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911"
++"checksum glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b"
++"checksum glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2"
++"checksum gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9"
++"checksum gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "709f1074259d4685b96133f92b75c7f35b504715b0fcdc96ec95de2607296a60"
++"checksum gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1"
++"checksum human-panic 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "39f357a500abcbd7c5f967c1d45c8838585b36743823b9d43488f24850534e36"
++"checksum inotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24e40d6fd5d64e2082e0c796495c8ef5ad667a96d03e5aaa0becfd9d47bcbfb8"
++"checksum inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0"
++"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
++"checksum lexical-core 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f86d66d380c9c5a685aaac7a11818bdfa1f733198dfd9ec09c70b762cd12ad6f"
++"checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
++"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
++"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
++"checksum mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
++"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
++"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
++"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
++"checksum nom 5.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6"
++"checksum notify 4.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd"
++"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
++"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
++"checksum os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7edc011af0ae98b7f88cf7e4a83b70a54a75d2b8cb013d6efd02e5956207e9eb"
++"checksum pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "393fa071b144f8ffb83ede273758983cf414ca3c0b1d2a5a9ce325b3ba3dd786"
++"checksum pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d"
++"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
++"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
++"checksum proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3"
++"checksum pulldown-cmark 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1c205cc82214f3594e2d50686730314f817c67ffa80fe800cf0db78c3c2b9d9e"
++"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
++"checksum quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
++"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
++"checksum rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
++"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
++"checksum regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3"
++"checksum regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae"
++"checksum relm 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4127341a75eb96dc99ba39b87a2783bb011b20fbdbafc25ed2f58216d2ff714"
++"checksum relm-attributes 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4a8db24611fee7bb021f3aad7c4eaaba6d360947860b78b933a4d3ef86079b7f"
++"checksum relm-derive 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ec66397054dc1ea6c658159866b9978add6a90655aba5dd4a90c34d2e63f9d69"
++"checksum relm-gen-widget 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49ad47b054bdc12c90fb6b37c81ef785ee2a4a8a92c4e150b18325052766fbb0"
++"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
++"checksum ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76"
++"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
++"checksum serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)" = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399"
++"checksum serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)" = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c"
++"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
++"checksum static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7f3eb36b47e512f8f1c9e3d10c2c1965bc992bd9cdb024fa581e2194501c83d3"
++"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
++"checksum syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03"
++"checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
++"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
++"checksum todo-txt 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d77aa2f90bd72b990bb2b8de52289b7a34f51cf035627df5e3ce361b321b417"
++"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
++"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
++"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
++"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
++"checksum uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
++"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
++"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
++"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++"checksum winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fa515c5163a99cc82bab70fd3bfdd36d827be85de63737b40fcef2ce084a436e"
++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
++"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
++"checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57"
diff --git a/pkgs/applications/misc/effitask/default.nix b/pkgs/applications/misc/effitask/default.nix
new file mode 100644
index 0000000000000..f8adc7f61f6cb
--- /dev/null
+++ b/pkgs/applications/misc/effitask/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, openssl
+, gtk3
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "effitask";
+ version = "1.4.0";
+
+ src = fetchFromGitHub {
+ owner = "sanpii";
+ repo = "${pname}";
+ rev = "${version}";
+ sha256 = "09bffxdp43s8b1rpmsgqr2kyz3i4jbd2yrwbxw21fj3sf3mwb9ig";
+ };
+
+ # workaround for missing Cargo.lock file https://github.com/sanpii/effitask/issues/48
+ cargoPatches = [ ./cargo-lock.patch ];
+
+ cargoSha256 = "0dvmp23kny6rlv6c0mfyy3cmz1bi5wcm1mxps4z67lym5kxfd362";
+
+ buildInputs = [ openssl gtk3 ];
+
+ nativeBuildInputs = [ pkg-config ];
+
+ # default installPhase don't install assets
+ installPhase = ''
+ runHook preInstall
+ make install PREFIX="$out"
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Graphical task manager, based on the todo.txt format";
+ longDescription = ''
+ To use it as todo.sh add-on, create a symlink like this:
+ mkdir ~/.todo.actions.d/
+ ln -s $(which effitask) ~/.todo.actions.d/et
+
+ Or use it as standalone program by defining some environment variables
+ like described in the projects readme.
+ '';
+ homepage = "https://github.com/sanpii/effitask";
+ maintainers = with maintainers; [ davidak ];
+ license = with licenses; [ mit ];
+ };
+}
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 4d078f3922429..db6b6f2e18137 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -3,7 +3,6 @@
, fetchFromGitHub
, wrapQtAppsHook
, python3
-, python3Packages
, zbar
, secp256k1
, enableQt ? true
@@ -22,6 +21,14 @@
let
version = "4.0.2";
+ # electrum is not compatible with dnspython 2.0.0 yet
+ # use the latest 1.x release instead
+ py = python3.override {
+ packageOverrides = self: super: {
+ dnspython = super.dnspython_1;
+ };
+ };
+
libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.0"
else if stdenv.isDarwin then "libsecp256k1.0.dylib"
@@ -45,7 +52,7 @@ let
};
in
-python3Packages.buildPythonApplication {
+py.pkgs.buildPythonApplication {
pname = "electrum";
inherit version;
@@ -61,7 +68,7 @@ python3Packages.buildPythonApplication {
nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ];
- propagatedBuildInputs = with python3Packages; [
+ propagatedBuildInputs = with py.pkgs; [
aiohttp
aiohttp-socks
aiorpcx
@@ -116,7 +123,7 @@ python3Packages.buildPythonApplication {
wrapQtApp $out/bin/electrum
'';
- checkInputs = with python3Packages; [ pytest ];
+ checkInputs = with py.pkgs; [ pytest ];
checkPhase = ''
py.test electrum/tests
diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index b7c655caaaf42..4bcb66f48b927 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -1,6 +1,7 @@
{ stdenv
, fetchurl
, python3Packages
+, wrapQtAppsHook
}:
python3Packages.buildPythonApplication rec {
@@ -12,7 +13,7 @@ python3Packages.buildPythonApplication rec {
sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7";
};
- nativeBuildInputs = with python3Packages; [ pyqt5 ];
+ nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ];
propagatedBuildInputs = with python3Packages; [
pyaes
@@ -35,6 +36,10 @@ python3Packages.buildPythonApplication rec {
sed -i '/Created: .*/d' gui/qt/icons_rc.py
'';
+ postFixup = ''
+ wrapQtApp $out/bin/electrum-ltc
+ '';
+
checkPhase = ''
$out/bin/electrum-ltc help >/dev/null
'';
@@ -54,4 +59,3 @@ python3Packages.buildPythonApplication rec {
maintainers = with maintainers; [ ];
};
}
-
diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix
index 2cf8813aac402..9ab3fda96dc21 100644
--- a/pkgs/applications/misc/et/default.nix
+++ b/pkgs/applications/misc/et/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "0.1.2";
src = fetchFromGitHub {
- owner = "geistesk";
+ owner = "oxzi";
repo = "et";
rev = version;
sha256 = "0i0lgmnly8n7y4y6pb10pxgxyz8s5zk26k8z1g1578v1wan01lnq";
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Minimal libnotify-based (egg) timer";
- homepage = "https://github.com/geistesk/et";
+ homepage = "https://github.com/oxzi/et";
license = licenses.gpl3;
platforms = platforms.unix;
- maintainers = with maintainers; [ geistesk ];
+ maintainers = with maintainers; [ oxzi ];
};
}
diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix
index a27e6e4851638..5e3a85c3b93fc 100644
--- a/pkgs/applications/misc/etesync-dav/default.nix
+++ b/pkgs/applications/misc/etesync-dav/default.nix
@@ -9,6 +9,10 @@ python3Packages.buildPythonApplication rec {
sha256 = "1q8h89hqi4kxphn1g5nbcia0haz5k57is9rycwaabm55mj9s9fah";
};
+ postPatch = ''
+ substituteInPlace setup.py --replace "Radicale==" "Radicale>="
+ '';
+
propagatedBuildInputs = with python3Packages; [
etesync
flask
diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
index 991123bf60bf7..b1e9f3ac35a31 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "0b2m9xkac60k5rbxmb03cxf530m23av14pnsjk8067l998sm4vqi";
+ doCheck = false;
+
subPackages = [ "./exercism" ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/foot/default.nix b/pkgs/applications/misc/foot/default.nix
new file mode 100644
index 0000000000000..02909ee1f2fc8
--- /dev/null
+++ b/pkgs/applications/misc/foot/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchgit
+, fcft, freetype, pixman, libxkbcommon, fontconfig, wayland
+, meson, ninja, ncurses, scdoc, tllist, wayland-protocols, pkg-config
+}:
+
+stdenv.mkDerivation rec {
+ pname = "foot";
+ version = "1.4.4";
+
+ src = fetchgit {
+ url = "https://codeberg.org/dnkl/foot.git";
+ rev = "${version}";
+ sha256 = "1cr4sz075v18clh8nlvgyxlbvfkhbsg0qrqgnclip5rwa24ry1lg";
+ };
+
+ nativeBuildInputs = [
+ meson ninja ncurses scdoc tllist wayland-protocols pkg-config
+ ];
+ buildInputs = [
+ fontconfig freetype pixman wayland libxkbcommon fcft
+ ];
+
+ # recommended build flags for foot as per INSTALL.md
+ # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#user-content-release-build
+ preConfigure = ''
+ export CFLAGS+="-O3 -fno-plt"
+ '';
+
+ mesonFlags = [ "--buildtype=release" "-Db_lto=true" ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://codeberg.org/dnkl/foot/";
+ description = "A fast, lightweight and minimalistic Wayland terminal emulator";
+ license = licenses.mit;
+ maintainers = [ maintainers.sternenseemann ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/fslint/default.nix b/pkgs/applications/misc/fslint/default.nix
new file mode 100644
index 0000000000000..f6e1071ac5e80
--- /dev/null
+++ b/pkgs/applications/misc/fslint/default.nix
@@ -0,0 +1,41 @@
+{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }:
+
+let pythonEnv = python2.withPackages(ps: [ ps.pyGtkGlade]);
+in stdenv.mkDerivation rec {
+ pname = "fslint";
+ version = "2.46";
+
+ src = fetchFromGitHub {
+ owner = "pixelb";
+ repo = "fslint";
+ rev = version;
+ sha256 = "048pc1rsslbsrfchl2wmdd4hpa2gycglib7kdx8vqs947zcm0sfv";
+ };
+
+ buildInputs = [
+ pythonEnv makeWrapper
+ ];
+
+ prePatch = ''
+ substituteInPlace fslint-gui --replace "liblocation=os.path.dirname(os.path.abspath(sys.argv[0]))" "liblocation='$out'"
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ cp * -R $out/
+ cp fslint-gui $out/bin/fslint
+
+ wrapProgram "$out/bin/fslint" \
+ --prefix PYTHONPATH : "${pythonEnv.interpreter}"
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "A utility to find and clean various forms of lint on a filesystem.";
+ homepage = "https://www.pixelbeat.org/fslint/";
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.dasj19 ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix
index 7370939be7ad0..cef58b353a3e7 100644
--- a/pkgs/applications/misc/fuzzel/default.nix
+++ b/pkgs/applications/misc/fuzzel/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "fuzzel";
- version = "1.3.0";
+ version = "1.4.1";
src = fetchgit {
url = "https://codeberg.org/dnkl/fuzzel";
rev = "${version}";
- sha256 = "12jv5iwmksygw8nfkxbd9rbi03wnpgb30hczq009aqgy7lyi5zmp";
+ sha256 = "18pg46xry7q4i19mpjfz942c6vkqlrj4q18p85zldzv9gdsxnm9c";
};
nativeBuildInputs = [ pkg-config meson ninja scdoc git ];
diff --git a/pkgs/applications/misc/gcstar/default.nix b/pkgs/applications/misc/gcstar/default.nix
new file mode 100644
index 0000000000000..b1ab386083ea1
--- /dev/null
+++ b/pkgs/applications/misc/gcstar/default.nix
@@ -0,0 +1,72 @@
+{ stdenv
+, fetchFromGitLab
+, perlPackages
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gcstar";
+ version = "1.7.2";
+
+ src = fetchFromGitLab {
+ owner = "Kerenoc";
+ repo = "GCstar";
+ rev = "v${version}";
+ sha256 = "1vqfff33sssvlvsva1dflggmwl00j5p64sn1669f9wrbvjkxgpv4";
+ };
+
+ nativeBuildInputs = [ wrapGAppsHook ];
+
+ buildInputs = with perlPackages; [
+ perl
+ ArchiveZip
+ DateCalc
+ DateTimeFormatStrptime
+ Glib
+ Gtk2
+ GD
+ GDGraph
+ GDText
+ HTMLParser
+ JSON
+ ImageExifTool
+ librelative
+ LWPUserAgent
+ LWPProtocolHttps
+ MP3Info
+ MP3Tag
+ NetFreeDB
+ OggVorbisHeaderPurePerl
+ Pango
+ XMLSimple
+ XMLParser
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ cd gcstar
+ perl install --text --prefix=$out
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ wrapProgram $out/bin/gcstar --prefix PERL5LIB : $PERL5LIB
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://gitlab.com/Kerenoc/GCstar";
+ description = "Manage your collections of movies, games, books, music and more";
+ longDescription = ''
+ GCstar is an application for managing your collections.
+ It supports many types of collections, including movies, books, games, comics, stamps, coins, and many more.
+ You can even create your own collection type for whatever unique thing it is that you collect!
+ Detailed information on each item can be automatically retrieved from the internet and you can store additional data, such as the location or who you've lent it to.
+ You may also search and filter your collections by many criteria.
+ '';
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ dasj19 ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix
index 9f4220c59ee38..ee6ed27ddda8a 100644
--- a/pkgs/applications/misc/geoipupdate/default.nix
+++ b/pkgs/applications/misc/geoipupdate/default.nix
@@ -13,11 +13,12 @@ buildGoModule rec {
vendorSha256 = "0q4byhvs1c1xm4qjvs2vyf98vdv121qn0z51arcf7k4ayrys5xcx";
+ doCheck = false;
+
meta = with stdenv.lib; {
description = "Automatic GeoIP database updater";
homepage = "https://github.com/maxmind/geoipupdate";
license = with licenses; [ asl20 ];
- platforms = platforms.all;
maintainers = with maintainers; [ das_j ];
};
}
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index def70d7df3c68..35e9d16f9df0a 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libintl libiconv json_c ];
propagatedBuildInputs = [ glib gtk ];
- doCheck = true;
+ doCheck = !stdenv.isDarwin;
mesonFlags = [
"-Ddocs=disabled" # docs do not seem to be installed
diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix
index d576d2b5b4760..9af6e39cb9bbf 100644
--- a/pkgs/applications/misc/glom/default.nix
+++ b/pkgs/applications/misc/glom/default.nix
@@ -1,5 +1,5 @@
{ stdenv
-, fetchFromGitLab
+, fetchurl
, pkgconfig
, autoconf
, automake
@@ -26,7 +26,8 @@
, goocanvasmm2
, evince
, isocodes
-, gtksourceviewmm4
+, gtksourceview
+, gtksourceviewmm
, postgresql
, gobject-introspection
, yelp-tools
@@ -48,16 +49,13 @@ let
boost_python = boost.override { enablePython = true; inherit python; };
in stdenv.mkDerivation rec {
pname = "glom";
- version = "unstable-2018-12-16";
+ version = "1.32.0";
outputs = [ "out" "lib" "dev" "doc" "devdoc" ];
- src = fetchFromGitLab {
- domain = "gitlab.gnome.org";
- owner = "GNOME";
- repo = pname;
- rev = "fa5ff04f209f35bf3e97bc1c3eb1d1138d6172ce";
- sha256 = "145hnk96xa4v35i3a3mbf3fnx4nlk8cksc0qhm7nrh8cnnrbdfgn";
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "1wcd4kd3crwqjv0jfp73jkyyf5ws8mvykg37kqxmcb58piz21gsk";
};
nativeBuildInputs = [
@@ -93,7 +91,8 @@ in stdenv.mkDerivation rec {
evince
isocodes
python3.pkgs.pygobject3
- gtksourceviewmm4
+ gtksourceview
+ gtksourceviewmm
postgresql # for pg_config
];
diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix
index 5fad7b9ac0318..7844a6a593cef 100644
--- a/pkgs/applications/misc/go-jira/default.nix
+++ b/pkgs/applications/misc/go-jira/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "18jwxnkv94lsxfv57ga519knxm077cc8chp5c992ipk58a04nv18";
+ doCheck = false;
+
meta = with stdenv.lib; {
description = "Simple command line client for Atlassian's Jira service written in Go";
homepage = "https://github.com/go-jira/jira";
diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
index 018b902294fe6..91096ddc91737 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -2,17 +2,17 @@ GEM
remote: https://rubygems.org/
specs:
backports (3.18.1)
- concurrent-ruby (1.1.6)
+ concurrent-ruby (1.1.7)
crass (1.0.6)
execjs (2.7.0)
ffi (1.13.1)
gemojione (4.3.3)
json
github-markup (3.0.4)
- gollum (5.1)
+ gollum (5.1.1)
gemojione (~> 4.1)
gollum-lib (~> 5.0)
- kramdown (~> 2.1.0)
+ kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.0.0)
mustache (>= 0.99.5, < 1.0.0)
octicons (~> 8.5)
@@ -38,7 +38,8 @@ GEM
mime-types (>= 1.15)
rugged (~> 0.99)
json (2.3.1)
- kramdown (2.1.0)
+ kramdown (2.3.0)
+ rexml
kramdown-parser-gfm (1.0.1)
kramdown (~> 2.0)
loofah (2.6.0)
@@ -63,7 +64,7 @@ GEM
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.4)
- rouge (3.21.0)
+ rouge (3.22.0)
rss (0.2.9)
rexml
ruby2_keywords (0.0.2)
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
index d7f837ed1fc30..45bf0e04d07f5 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -14,10 +14,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
+ sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
type = "gem";
};
- version = "1.1.6";
+ version = "1.1.7";
};
crass = {
groups = ["default"];
@@ -76,10 +76,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06qc6flb2sik64ich3j4a9yky9cqsj77vdjff51wxi4lhd9ga6sk";
+ sha256 = "14i6y3ilv9l7cqvkawl75js26cfj1pd8cphhmq9lic95ajvdf371";
type = "gem";
};
- version = "5.1";
+ version = "5.1.1";
};
gollum-lib = {
dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"];
@@ -114,14 +114,15 @@
version = "2.3.1";
};
kramdown = {
+ dependencies = ["rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688";
+ sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
type = "gem";
};
- version = "2.1.0";
+ version = "2.3.0";
};
kramdown-parser-gfm = {
dependencies = ["kramdown"];
@@ -286,10 +287,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1agrrmj88k9jkk36ra1ml2c1jffpp595pkxmcla74ac9ia09vn3s";
+ sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m";
type = "gem";
};
- version = "3.21.0";
+ version = "3.22.0";
};
rss = {
dependencies = ["rexml"];
diff --git a/pkgs/applications/misc/gomatrix/default.nix b/pkgs/applications/misc/gomatrix/default.nix
index 77d63a93ae4e5..c903f1ba1bbe5 100644
--- a/pkgs/applications/misc/gomatrix/default.nix
+++ b/pkgs/applications/misc/gomatrix/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "1yw0gph4zfg8w4343882l6b9lggwyak2zz8ic1l1m2m44p3aq169";
+ doCheck = false;
+
meta = with lib; {
description = ''Displays "The Matrix" in a terminal'';
license = licenses.bsd2;
diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
index dff69130c18ac..db38810634541 100644
--- a/pkgs/applications/misc/googleearth/default.nix
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, glibc, libGLU, libGL, freetype, glib, libSM, libICE, libXi, libXv
, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11
-, zlib, fontconfig, dpkg, libproxy, libxml2, gstreamer, gst_all_1, dbus }:
+, zlib, fontconfig, dpkg, libproxy, libxml2, gst_all_1, dbus }:
let
arch =
@@ -33,7 +33,6 @@ let
fontconfig
libproxy
libxml2
- gstreamer
dbus
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
@@ -80,7 +79,7 @@ stdenv.mkDerivation rec {
for a in $out/opt/google/earth/free/*.so* ; do
patchelf --set-rpath "${fullPath}:\$ORIGIN" $a
done
-
+
# Add desktop config file and icons
mkdir -p $out/share/{applications,icons/hicolor/{16x16,22x22,24x24,32x32,48x48,64x64,128x128,256x256}/apps,pixmaps}
ln -s $out/opt/google/earth/free/google-earth.desktop $out/share/applications/google-earth.desktop
diff --git a/pkgs/applications/misc/gopacked/default.nix b/pkgs/applications/misc/gopacked/default.nix
index 418fe96a897b3..57f6be40ab02a 100644
--- a/pkgs/applications/misc/gopacked/default.nix
+++ b/pkgs/applications/misc/gopacked/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "0fklr3lxh8g7gda65wf2wdkqv15869h7m1bwbzbiv8pasrf5b352";
+ doCheck = false;
+
meta = with lib; {
description = "A simple text-based Minecraft modpack manager";
license = licenses.agpl3;
diff --git a/pkgs/applications/misc/havoc/default.nix b/pkgs/applications/misc/havoc/default.nix
index fc4cc680ca4d6..a6d5278fc3c5a 100644
--- a/pkgs/applications/misc/havoc/default.nix
+++ b/pkgs/applications/misc/havoc/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "havoc";
- version = "2019-12-08";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "ii8";
repo = pname;
- rev = "507446c92ed7bf8380a58c5ba2b14aba5cdf412c";
- sha256 = "13nfnan1gmy4cqxmqv0rc8a4mcb1g62v73d56hy7z2psv4am7a09";
+ rev = version;
+ sha256 = "1g05r9j6srwz1krqvzckx80jn8fm48rkb4xp68953gy9yp2skg3k";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/misc/html5validator/default.nix b/pkgs/applications/misc/html5validator/default.nix
new file mode 100644
index 0000000000000..657996d1da9f5
--- /dev/null
+++ b/pkgs/applications/misc/html5validator/default.nix
@@ -0,0 +1,25 @@
+{ buildPythonApplication, fetchFromGitHub, nose, openjdk, lib }:
+
+buildPythonApplication rec {
+ pname = "html5validator";
+ version = "0.3.3";
+
+ src = fetchFromGitHub {
+ owner = "svenkreiss";
+ repo = "html5validator";
+ rev = "v${version}";
+ sha256 = "130acqi0dsy3midg7hwslykzry6crr4ln6ia0f0avyywkz4bplsv";
+ };
+
+ propagatedBuildInputs = [ openjdk ];
+
+ checkInputs = [ nose ];
+ checkPhase = "PATH=$PATH:$out/bin nosetests";
+
+ meta = with lib; {
+ homepage = "https://github.com/svenkreiss/html5validator";
+ description = "Command line tool that tests files for HTML5 validity";
+ license = licenses.mit;
+ maintainers = [ maintainers.phunehehe ];
+ };
+}
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index b08d2fe79140c..a04c2bddaf945 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -12,6 +12,9 @@ buildGoModule rec {
};
vendorSha256 = "17xn6bdy942g6nx5xky41ixmd5kaz68chj3rb02ibpyraamx04nm";
+
+ doCheck = false;
+
runVend = true;
buildFlags = [ "-tags" "extended" ];
diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix
new file mode 100644
index 0000000000000..bb6956aaa596e
--- /dev/null
+++ b/pkgs/applications/misc/imag/default.nix
@@ -0,0 +1,63 @@
+{ stdenv
+, rustPlatform
+, fetchFromGitHub
+, llvmPackages
+, openssl
+, pkg-config
+, installShellFiles
+, Security
+, gitMinimal
+, utillinuxMinimal
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "imag";
+ version = "0.10.1";
+
+ src = fetchFromGitHub {
+ owner = "matthiasbeyer";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0f9915f083z5qqcxyavj0w6m973c8m1x7kfb89pah5agryy5mkaq";
+ };
+
+ nativeBuildInputs = [ installShellFiles pkg-config ];
+ buildInputs = [ openssl ]
+ ++ stdenv.lib.optional stdenv.isDarwin Security;
+ checkInputs = [ gitMinimal utillinuxMinimal ];
+
+ LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
+
+ cargoSha256 = "0n8cw70qh8g4hfwfaxwwxbrrx5hm2z037z8kdhvdpqkxljl9189x";
+
+ checkPhase = ''
+ export HOME=$TMPDIR
+ git config --global user.email "nobody@example.com"
+ git config --global user.name "Nobody"
+
+ # UI tests uses executables directly, so we need to build them before
+ # launching the tests
+ cargo build
+ '' + (
+ # CLI uses the presence of a controlling TTY to check if arguments are
+ # passed in stdin, or in the command-line, so we use script to create
+ # a PTY for us.
+ if !stdenv.isDarwin then ''
+ script -qfec "cargo test --workspace"
+ '' else ''
+ script -q "cargo test --workspace"
+ ''
+ );
+
+ postInstall = ''
+ installShellCompletion target/imag.{bash,fish} --zsh target/_imag
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Commandline personal information management suite";
+ homepage = "https://imag-pim.org/";
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ filalex77 minijackson ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix
new file mode 100644
index 0000000000000..6be6e842bde72
--- /dev/null
+++ b/pkgs/applications/misc/inkcut/default.nix
@@ -0,0 +1,54 @@
+{ lib, python3Packages, fetchFromGitHub, wrapQtAppsHook }:
+
+with python3Packages;
+
+buildPythonApplication rec {
+ pname = "inkcut";
+ version = "2.1.1";
+
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1c0mfdfy9iq4l683f3aa7cm7x2w9px83dyigc7655wvaq3bxi2rp";
+ };
+
+ nativeBuildInputs = [ wrapQtAppsHook ];
+
+ propagatedBuildInputs = [
+ enamlx
+ twisted
+ lxml
+ qreactor
+ jsonpickle
+ pyserial
+ pycups
+ qtconsole
+ pyqt5
+ ];
+
+ # QtApplication.instance() does not work during tests?
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "inkcut"
+ "inkcut.cli"
+ "inkcut.console"
+ "inkcut.core"
+ "inkcut.device"
+ "inkcut.job"
+ "inkcut.joystick"
+ "inkcut.monitor"
+ "inkcut.preview"
+ ];
+
+ dontWrapQtApps = true;
+ makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
+
+ meta = with lib; {
+ homepage = "https://www.codelv.com/projects/inkcut/";
+ description = "Control 2D plotters, cutters, engravers, and CNC machines";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ raboof ];
+ };
+}
diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index 86f1bf23a6b53..ffc7c0e2aebf7 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -10,7 +10,7 @@ GEM
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
colorator (1.1.0)
- concurrent-ruby (1.1.6)
+ concurrent-ruby (1.1.7)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
@@ -18,11 +18,11 @@ GEM
ffi (1.13.1)
forwardable-extended (2.6.0)
gemoji (3.0.1)
- html-pipeline (2.13.0)
+ html-pipeline (2.14.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
- i18n (1.8.3)
+ i18n (1.8.5)
concurrent-ruby (~> 1.0)
jekyll (4.1.1)
addressable (~> 2.4)
@@ -56,7 +56,7 @@ GEM
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
- kramdown (2.2.1)
+ kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
@@ -67,7 +67,7 @@ GEM
mercenary (0.4.0)
mini_portile2 (2.4.0)
minitest (5.14.1)
- nokogiri (1.10.9)
+ nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
@@ -76,7 +76,7 @@ GEM
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.4)
- rouge (3.20.0)
+ rouge (3.22.0)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
@@ -86,7 +86,7 @@ GEM
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-display_width (1.7.0)
- zeitwerk (2.3.0)
+ zeitwerk (2.4.0)
PLATFORMS
ruby
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index e4c8a94fce4bb..b14b27f3756b4 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -36,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
+ sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
type = "gem";
};
- version = "1.1.6";
+ version = "1.1.7";
};
em-websocket = {
dependencies = ["eventmachine" "http_parser.rb"];
@@ -98,10 +98,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01snn9z3c2p17d9wfczkdkml6mdffah6fpyzgs9mdskb14m68rq6";
+ sha256 = "080sn9z1a64gv04p318jz10y6lv6qd3avip08rrcmq9k4ihai0f1";
type = "gem";
};
- version = "2.13.0";
+ version = "2.14.0";
};
"http_parser.rb" = {
groups = ["default"];
@@ -119,10 +119,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s";
+ sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
type = "gem";
};
- version = "1.8.3";
+ version = "1.8.5";
};
jekyll = {
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
@@ -218,10 +218,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "059mk8lmddp2a2aa6s4pp7x2yyqbqg5crx5jkn32dzlnqi2j5cn6";
+ sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
type = "gem";
};
- version = "2.2.1";
+ version = "2.3.0";
};
kramdown-parser-gfm = {
dependencies = ["kramdown"];
@@ -291,10 +291,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
+ sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
type = "gem";
};
- version = "1.10.9";
+ version = "1.10.10";
};
pathutil = {
dependencies = ["forwardable-extended"];
@@ -353,10 +353,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic";
+ sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m";
type = "gem";
};
- version = "3.20.0";
+ version = "3.22.0";
};
safe_yaml = {
groups = ["default"];
@@ -426,9 +426,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0";
+ sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k";
type = "gem";
};
- version = "2.3.0";
+ version = "2.4.0";
};
}
\ No newline at end of file
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index 9acfaaa97cd18..d795507206588 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -17,7 +17,7 @@ GEM
execjs
coffee-script-source (1.12.2)
colorator (1.1.0)
- concurrent-ruby (1.1.6)
+ concurrent-ruby (1.1.7)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
@@ -29,11 +29,11 @@ GEM
ffi (1.13.1)
forwardable-extended (2.6.0)
gemoji (3.0.1)
- html-pipeline (2.13.0)
+ html-pipeline (2.14.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
- i18n (1.8.3)
+ i18n (1.8.5)
concurrent-ruby (~> 1.0)
jekyll (4.1.1)
addressable (~> 2.4)
@@ -55,7 +55,7 @@ GEM
jekyll-coffeescript (2.0.0)
coffee-script (~> 2.2)
coffee-script-source (~> 1.12)
- jekyll-feed (0.14.0)
+ jekyll-feed (0.15.0)
jekyll (>= 3.7, < 5.0)
jekyll-gist (1.5.0)
octokit (~> 4.2)
@@ -77,7 +77,7 @@ GEM
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
- kramdown (2.2.1)
+ kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
@@ -97,7 +97,7 @@ GEM
mini_portile2 (2.4.0)
minitest (5.14.1)
multipart-post (2.1.1)
- nokogiri (1.10.9)
+ nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
octokit (4.18.0)
faraday (>= 0.9)
@@ -110,7 +110,7 @@ GEM
ffi (~> 1.0)
rdoc (6.2.1)
rexml (3.2.4)
- rouge (3.20.0)
+ rouge (3.22.0)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
@@ -125,7 +125,7 @@ GEM
thread_safe (~> 0.1)
unicode-display_width (1.7.0)
yajl-ruby (1.4.1)
- zeitwerk (2.3.0)
+ zeitwerk (2.4.0)
PLATFORMS
ruby
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index 073f69f5b33b1..aa0bc9bcdcc57 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -90,10 +90,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
+ sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
type = "gem";
};
- version = "1.1.6";
+ version = "1.1.7";
};
em-websocket = {
dependencies = ["eventmachine" "http_parser.rb"];
@@ -195,10 +195,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01snn9z3c2p17d9wfczkdkml6mdffah6fpyzgs9mdskb14m68rq6";
+ sha256 = "080sn9z1a64gv04p318jz10y6lv6qd3avip08rrcmq9k4ihai0f1";
type = "gem";
};
- version = "2.13.0";
+ version = "2.14.0";
};
"http_parser.rb" = {
groups = ["default"];
@@ -216,10 +216,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s";
+ sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
type = "gem";
};
- version = "1.8.3";
+ version = "1.8.5";
};
jekyll = {
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
@@ -260,10 +260,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fhbz5wc8cf60dwsbqcr49wygyk5qarpc7g77p6dlwq2r21nil5c";
+ sha256 = "1mgc1ik2cq2g8g7z9ql2i6ydzy771m2i4qrd1q77x8cf2sprlb0z";
type = "gem";
};
- version = "0.14.0";
+ version = "0.15.0";
};
jekyll-gist = {
dependencies = ["octokit"];
@@ -369,10 +369,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "059mk8lmddp2a2aa6s4pp7x2yyqbqg5crx5jkn32dzlnqi2j5cn6";
+ sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
type = "gem";
};
- version = "2.2.1";
+ version = "2.3.0";
};
kramdown-parser-gfm = {
dependencies = ["kramdown"];
@@ -519,10 +519,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
+ sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
type = "gem";
};
- version = "1.10.9";
+ version = "1.10.10";
};
octokit = {
dependencies = ["faraday" "sawyer"];
@@ -602,10 +602,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic";
+ sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m";
type = "gem";
};
- version = "3.20.0";
+ version = "3.22.0";
};
safe_yaml = {
groups = ["default"];
@@ -718,9 +718,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0";
+ sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k";
type = "gem";
};
- version = "2.3.0";
+ version = "2.4.0";
};
}
\ No newline at end of file
diff --git a/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch b/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch
new file mode 100644
index 0000000000000..8f9271ac996b2
--- /dev/null
+++ b/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch
@@ -0,0 +1,49 @@
+From 2629af4ed00d7ca65359178203d80fb146901cdb Mon Sep 17 00:00:00 2001
+From: Daniel Fullmer
+Date: Fri, 3 Jul 2020 21:00:45 -0700
+Subject: [PATCH 1/2] Fix CMakeLists
+
+---
+ CMakeLists.txt | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e218279..4341de9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -57,6 +57,7 @@ endif(JPEG_FOUND)
+ include(FindJasper)
+ if(JASPER_FOUND)
+ set(HAVE_JASPER_LIB 1)
++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${JASPER_LIBRARY})
+ endif(JASPER_FOUND)
+
+ # paths from willuslib/wgs.c
+@@ -71,9 +72,12 @@ else()
+ message(STATUS "Could NOT find ghostscript executable")
+ endif(GHOSTSCRIPT_EXECUTABLE)
+
+-# willus.h
+-# HAVE_GSL_LIB
+-
++pkg_check_modules(GSL gsl)
++if(GSL_FOUND)
++ set(HAVE_GSL_LIB 1)
++ include_directories(SYSTEM ${GSL_INCLUDEDIR})
++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS})
++endif(GSL_FOUND)
+
+ # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0)
+ # MUPDF_STATIC_LDFLAGS misses mupdf-js-none, and doubles libs ...
+@@ -85,7 +89,7 @@ if(MUPDF_FOUND)
+ include_directories(SYSTEM ${MUPDF_INCLUDEDIR})
+ message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}")
+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS}
+- -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype
++
+ )
+ endif(MUPDF_FOUND)
+
+--
+2.27.0
+
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 8899654cc4c88..431426e55fbd8 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchzip, fetchurl, fetchpatch, cmake, pkgconfig
-, zlib, libpng
+{ stdenv, runCommand, fetchzip, fetchurl, fetchpatch, fetchFromGitHub
+, cmake, pkgconfig, zlib, libpng, makeWrapper
, enableGSL ? true, gsl
, enableGhostScript ? true, ghostscript
, enableMuPDF ? true, mupdf
@@ -11,44 +11,132 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
- pname = "k2pdfopt";
- version = "2.51a";
+# k2pdfopt is a pain to package. It requires modified versions of mupdf,
+# leptonica, and tesseract. Instead of shipping patches for these upstream
+# packages, k2pdfopt includes just the modified source files for these
+# packages. The individual files from the {mupdf,leptonica,tesseract}_mod/
+# directories are intended to replace the corresponding source files in the
+# upstream packages, for a particular version of that upstream package.
+#
+# There are a few ways we could approach packaging these modified versions of
+# mupdf, leptonica, and mupdf:
+# 1) Override the upstream source with a new derivation that involves copying
+# the modified source files from k2pdfopt and replacing the corresponding
+# source files in the upstream packages. Since the files are intended for a
+# particular version of the upstream package, this would not allow us to easily
+# use updates to those packages in nixpkgs.
+# 2) Manually produce patches which can be applied against the upstream
+# project, and have the same effect as replacing those files. This is what I
+# believe k2pdfopt should do this for us anyway. The benefit of creating and
+# applying patches in this way is that minor updates (esp. security fixes) to
+# upstream packages might still allow these patches to apply successfully.
+# 3) Automatically produce these patches inside a nix derivation. This is the
+# approach taken here, using the "mkPatch" provided below. This has the
+# benefit of easier review and should hopefully be simpler to update in the
+# future.
+
+let
+ # Create a patch against src based on changes applied in patchCommands
+ mkPatch = { name, src, patchCommands }: runCommand "${name}-k2pdfopt.patch" { inherit src; } ''
+ source $stdenv/setup
+ unpackPhase
- src = (fetchzip {
- url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51_src.zip";
- sha256 = "133l7xkvi67s6sfk8cfh7rmavbsf7ib5fyksk1ci6b6sch3z2sw9";
- });
+ orig=$sourceRoot
+ new=$sourceRoot-modded
+ cp -r $orig/. $new/
- # Note: the v2.51a zip contains only files to be replaced in the v2.50 zip.
- v251a_src = (fetchzip {
- url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51a_src.zip";
- sha256 = "0vvwblii7kgdwfxw8dzk6jbmz4dv94d7rkv18i60y8wkayj6yhl6";
- });
+ pushd $new >/dev/null
+ ${patchCommands}
+ popd >/dev/null
- postUnpack = ''
- cp -r ${v251a_src}/* $sourceRoot
+ diff -Naur $orig $new > $out || true
'';
- patches = [ ./k2pdfopt.patch ./k2pdfopt-mupdf-1.16.1.patch ];
+ pname = "k2pdfopt";
+ version = "2.53";
+ k2pdfopt_src = fetchzip {
+ url = "http://www.willus.com/${pname}/src/${pname}_v${version}_src.zip";
+ sha256 = "1fna8bg3pascjfc3hmc6xn0xi2yh7f1qp0d344mw9hqanbnykyy8";
+ };
+in stdenv.mkDerivation rec {
+ inherit pname version;
+ src = k2pdfopt_src;
+
+ patches = [
+ ./0001-Fix-CMakeLists.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace willuslib/bmpdjvu.c \
+ --replace "" ""
+ '';
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
buildInputs =
let
- # The patches below were constructed by taking the files from k2pdfopt in
- # the {mupdf,leptonica,tesseract}_mod/ directories, replacing the
- # corresponding files in the respective source trees, resolving any errors
- # with more recent versions of these depencencies, and running diff.
- mupdf_modded = mupdf.overrideAttrs (attrs: {
- patches = attrs.patches ++ [ ./mupdf.patch ]; # Last verified with mupdf 1.16.1
+ # We use specific versions of these sources below to match the versions
+ # used in the k2pdfopt source. Note that this does _not_ need to match the
+ # version used elsewhere in nixpkgs, since it is only used to create the
+ # patch that can then be applied to the version in nixpkgs.
+ mupdf_patch = mkPatch {
+ name = "mupdf";
+ src = fetchurl {
+ url = "https://mupdf.com/downloads/archive/mupdf-1.17.0-source.tar.gz";
+ sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0";
+ };
+ patchCommands = ''
+ cp ${k2pdfopt_src}/mupdf_mod/{filter-basic,font,stext-device,string}.c ./source/fitz/
+ cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/
+ '';
+ };
+ mupdf_modded = mupdf.overrideAttrs ({ patches ? [], ... }: {
+ patches = patches ++ [ mupdf_patch ];
+ # This function is missing in font.c, see font-win32.c
+ postPatch = ''
+ echo "void pdf_install_load_system_font_funcs(fz_context *ctx) {}" >> source/fitz/font.c
+ '';
});
- leptonica_modded = leptonica.overrideAttrs (attrs: {
- patches = [ ./leptonica.patch ]; # Last verified with leptonica 1.78.0
+
+ leptonica_patch = mkPatch {
+ name = "leptonica";
+ src = fetchurl {
+ url = "http://www.leptonica.org/source/leptonica-1.79.0.tar.gz";
+ sha256 = "1n004gv1dj3pq1fcnfdclvvx5nang80336aa67nvs3nnqp4ncn84";
+ };
+ patchCommands = "cp -r ${k2pdfopt_src}/leptonica_mod/. ./src/";
+ };
+ leptonica_modded = leptonica.overrideAttrs ({ patches ? [], ... }: {
+ patches = patches ++ [ leptonica_patch ];
});
+
+ tesseract_patch = mkPatch {
+ name = "tesseract";
+ src = fetchFromGitHub {
+ owner = "tesseract-ocr";
+ repo = "tesseract";
+ rev = "4.1.1";
+ sha256 = "1ca27zbjpx35nxh9fha410z3jskwyj06i5hqiqdc08s2d7kdivwn";
+ };
+ patchCommands = ''
+ cp ${k2pdfopt_src}/tesseract_mod/{baseapi,tesscapi,tesseract}.* src/api/
+ cp ${k2pdfopt_src}/tesseract_mod/{tesscapi,tessedit,tesseract}.* src/ccmain/
+ cp ${k2pdfopt_src}/tesseract_mod/dotproduct{avx,fma,sse}.* src/arch/
+ cp ${k2pdfopt_src}/tesseract_mod/{intsimdmatrixsse,simddetect}.* src/arch/
+ cp ${k2pdfopt_src}/tesseract_mod/{errcode,genericvector,mainblk,params,serialis,tessdatamanager,tess_version,tprintf,unicharset}.* src/ccutil/
+ cp ${k2pdfopt_src}/tesseract_mod/{input,lstmrecognizer}.* src/lstm/
+ cp ${k2pdfopt_src}/tesseract_mod/openclwrapper.* src/opencl/
+ '';
+ };
tesseract_modded = tesseract4.override {
- tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: {
- patches = [ ./tesseract.patch ]; # Last verified with tesseract 1.4
+ tesseractBase = tesseract4.tesseractBase.overrideAttrs ({ patches ? [], ... }: {
+ patches = patches ++ [ tesseract_patch ];
+ # Additional compilation fixes
+ postPatch = ''
+ echo libtesseract_api_la_SOURCES += tesscapi.cpp >> src/api/Makefile.am
+ substituteInPlace src/api/tesseract.h \
+ --replace "#include " "//#include "
+ '';
});
};
in
@@ -71,6 +159,10 @@ stdenv.mkDerivation rec {
install -D -m 755 k2pdfopt $out/bin/k2pdfopt
'';
+ preFixup = optionalString enableTesseract ''
+ wrapProgram $out/bin/k2pdfopt --set-default TESSDATA_PREFIX ${tesseract4}/share/tessdata
+ '';
+
meta = with stdenv.lib; {
description = "Optimizes PDF/DJVU files for mobile e-readers (e.g. the Kindle) and smartphones";
homepage = "http://www.willus.com/k2pdfopt";
diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch
deleted file mode 100644
index 3a9eca30e751a..0000000000000
--- a/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-diff --git a/willuslib/wmupdf.c b/willuslib/wmupdf.c
-index 81627ef..f14a96c 100644
---- a/willuslib/wmupdf.c
-+++ b/willuslib/wmupdf.c
-@@ -189,8 +189,6 @@ int wmupdf_remake_pdf(char *infile,char *outfile,WPDFPAGEINFO *pageinfo,int use_
- pdf_write_opts.do_compress=1;
- pdf_write_opts.do_linear=0;
- pdf_write_opts.do_garbage=1; /* 2 and 3 don't work for this. */
-- pdf_write_opts.continue_on_error=0;
-- pdf_write_opts.errors=NULL;
- write_failed=0;
- wpdfpageinfo_sort(pageinfo);
- xref=NULL;
-@@ -1687,8 +1685,8 @@ WPDFOUTLINE *wpdfoutline_read_from_pdf_file(char *filename)
- /* Sumatra version of MuPDF v1.4 -- use locally installed fonts */
- pdf_install_load_system_font_funcs(ctx);
- fz_try(ctx) { doc=fz_open_document(ctx,filename); }
-- fz_catch(ctx)
-- {
-+ fz_catch(ctx)
-+ {
- fz_drop_context(ctx);
- return(NULL);
- }
-@@ -1890,5 +1888,5 @@ static pdf_obj *pdf_new_string_utf8(fz_context *ctx,char *string)
- willus_mem_free((double **)&utfbuf,funcname);
- return(pdfobj);
- }
--
-+
- #endif /* HAVE_MUPDF_LIB */
-diff --git a/willuslib/wmupdfinfo.c b/willuslib/wmupdfinfo.c
-index 5c7f38c..9b9e6fd 100644
---- a/willuslib/wmupdfinfo.c
-+++ b/willuslib/wmupdfinfo.c
-@@ -237,23 +237,22 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename)
- pdf_obj *robj;
-
- robj=pdf_resolve_indirect(ctx,obj);
-- n=pdf_sprint_obj(ctx,NULL,0,robj,1);
-- buf=malloc(n+2);
-+ buf=pdf_sprint_obj(ctx,NULL,0,&n,robj,1,0);
- if (buf==NULL)
- {
- fz_write_printf(ctx,out,"Info object (%d %d R):\n",pdf_to_num(ctx,obj),pdf_to_gen(ctx,obj));
-- pdf_print_obj(ctx,out,robj,1);
-+ pdf_print_obj(ctx,out,robj,1,0);
- }
- else
- {
-- pdf_sprint_obj(ctx,buf,n+2,robj,1);
-+ pdf_sprint_obj(ctx,buf,n+2,&n,robj,1,0);
- display_pdf_field(ctx,out,buf,"Title","TITLE");
- display_pdf_field(ctx,out,buf,"CreationDate","CREATED");
- display_pdf_field(ctx,out,buf,"ModDate","LAST MODIFIED");
- display_pdf_field(ctx,out,buf,"Producer","PDF PRODUCER");
- display_pdf_field(ctx,out,buf,"Creator","CREATOR");
- display_file_size(ctx,out,filename);
-- free(buf);
-+ fz_free(ctx,buf);
- }
- }
- if (glo->dims==1)
-@@ -275,7 +274,7 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename)
- if (obj)
- {
- fz_write_printf(ctx,out, "\nEncryption object (%d %d R):\n", pdf_to_num(ctx,obj), pdf_to_gen(ctx,obj));
-- pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1);
-+ pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1, 0);
- }
- }
-
-@@ -396,7 +395,7 @@ gatherdimensions(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_
- if (j < glo->dims)
- return;
-
-- glo->dim = fz_resize_array(ctx, glo->dim, glo->dims+1, sizeof(struct info));
-+ glo->dim = fz_realloc_array(ctx, glo->dim, glo->dims+1, struct info);
- glo->dims++;
-
- glo->dim[glo->dims - 1].page = page;
-@@ -441,7 +440,7 @@ gatherfonts(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *
- if (k < glo->fonts)
- continue;
-
-- glo->font = fz_resize_array(ctx, glo->font, glo->fonts+1, sizeof(struct info));
-+ glo->font = fz_realloc_array(ctx, glo->font, glo->fonts+1, struct info);
- glo->fonts++;
-
- glo->font[glo->fonts - 1].page = page;
-@@ -510,7 +509,7 @@ gatherimages(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj
- if (k < glo->images)
- continue;
-
-- glo->image = fz_resize_array(ctx, glo->image, glo->images+1, sizeof(struct info));
-+ glo->image = fz_realloc_array(ctx, glo->image, glo->images+1, struct info);
- glo->images++;
-
- glo->image[glo->images - 1].page = page;
-@@ -568,7 +567,7 @@ gatherforms(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *
- if (k < glo->forms)
- continue;
-
-- glo->form = fz_resize_array(ctx, glo->form, glo->forms+1, sizeof(struct info));
-+ glo->form = fz_realloc_array(ctx, glo->form, glo->forms+1, struct info);
- glo->forms++;
-
- glo->form[glo->forms - 1].page = page;
-@@ -613,7 +612,7 @@ gatherpsobjs(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj
- if (k < glo->psobjs)
- continue;
-
-- glo->psobj = fz_resize_array(ctx, glo->psobj, glo->psobjs+1, sizeof(struct info));
-+ glo->psobj = fz_realloc_array(ctx, glo->psobj, glo->psobjs+1, struct info);
- glo->psobjs++;
-
- glo->psobj[glo->psobjs - 1].page = page;
-@@ -656,7 +655,7 @@ gathershadings(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob
- if (k < glo->shadings)
- continue;
-
-- glo->shading = fz_resize_array(ctx, glo->shading, glo->shadings+1, sizeof(struct info));
-+ glo->shading = fz_realloc_array(ctx, glo->shading, glo->shadings+1, struct info);
- glo->shadings++;
-
- glo->shading[glo->shadings - 1].page = page;
-@@ -724,7 +723,7 @@ gatherpatterns(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob
- if (k < glo->patterns)
- continue;
-
-- glo->pattern = fz_resize_array(ctx, glo->pattern, glo->patterns+1, sizeof(struct info));
-+ glo->pattern = fz_realloc_array(ctx, glo->pattern, glo->patterns+1, struct info);
- glo->patterns++;
-
- glo->pattern[glo->patterns - 1].page = page;
-@@ -1216,7 +1215,7 @@ void wmupdfinfo_get(char *filename,int *pagelist,char **buf)
- if (fout==NULL)
- return;
- */
--
-+
- ctx = fz_new_context(NULL, NULL, FZ_STORE_UNLIMITED);
- if (!ctx)
- {
-@@ -1307,5 +1306,5 @@ static void date_convert(char *dst,char *src)
- else if (src[i]!='\0')
- sprintf(&dst[strlen(dst)]," %s",&src[i]);
- }
--
-+
- #endif /* HAVE_MUPDF_LIB */
diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
deleted file mode 100644
index cf7e4896b803c..0000000000000
--- a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4a2378b..502c477 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,6 +52,7 @@ endif(JPEG_FOUND)
- include(FindJasper)
- if(JASPER_FOUND)
- set(HAVE_JASPER_LIB 1)
-+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${JASPER_LIBRARY})
- endif(JASPER_FOUND)
-
- # paths from willuslib/wgs.c
-@@ -66,8 +67,12 @@ else()
- message(STATUS "Could NOT find ghostscript executable")
- endif(GHOSTSCRIPT_EXECUTABLE)
-
--# willus.h
--# HAVE_GSL_LIB
-+pkg_check_modules(GSL gsl)
-+if(GSL_FOUND)
-+ set(HAVE_GSL_LIB 1)
-+ include_directories(SYSTEM ${GSL_INCLUDEDIR})
-+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS})
-+endif(GSL_FOUND)
-
-
- # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0)
-@@ -80,7 +85,7 @@ if(MUPDF_FOUND)
- include_directories(SYSTEM ${MUPDF_INCLUDEDIR})
- message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}")
- set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS}
-- -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype
-+
- )
- endif(MUPDF_FOUND)
-
-@@ -91,9 +96,25 @@ if(DJVU_FOUND)
- set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${DJVU_LDFLAGS})
- endif(DJVU_FOUND)
-
--# HAVE_GOCR_LIB
--# HAVE_LEPTONICA_LIB
--# HAVE_TESSERACT_LIB
-+find_library(GOCR_LIB NAMES Pgm2asc)
-+if(GOCR_LIB)
-+ set(HAVE_GOCR_LIB 1)
-+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GOCR_LIB})
-+endif(GOCR_LIB)
-+
-+pkg_check_modules(LEPTONICA lept)
-+if(LEPTONICA_FOUND)
-+ set(HAVE_LEPTONICA_LIB 1)
-+ include_directories(SYSTEM ${LEPTONICA_INCLUDEDIR})
-+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${LEPTONICA_LDFLAGS})
-+endif(LEPTONICA_FOUND)
-+
-+pkg_check_modules(TESSERACT tesseract)
-+if(TESSERACT_FOUND)
-+ set(HAVE_TESSERACT_LIB 1)
-+ include_directories(SYSTEM ${TESSERACT_INCLUDEDIR})
-+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${TESSERACT_LDFLAGS})
-+endif(TESSERACT_FOUND)
-
- # ---- Describe project
-
-diff --git a/willuslib/CMakeLists.txt b/willuslib/CMakeLists.txt
-index 463bbc9..8043db5 100644
---- a/willuslib/CMakeLists.txt
-+++ b/willuslib/CMakeLists.txt
-@@ -6,7 +6,7 @@ include_directories(..)
- set(WILLUSLIB_SRC
- ansi.c array.c bmp.c bmpdjvu.c bmpmupdf.c dtcompress.c filelist.c
- fontdata.c fontrender.c gslpolyfit.c linux.c math.c mem.c ocr.c
-- ocrjocr.c ocrtess.c pdfwrite.c point2d.c render.c strbuf.c string.c
-+ ocrgocr.c ocrtess.c pdfwrite.c point2d.c render.c strbuf.c string.c
- token.c wfile.c wgs.c wgui.c willusversion.c win.c winbmp.c
- wincomdlg.c winmbox.c winshell.c wmupdf.c wmupdfinfo.c wpdf.c wsys.c
- wzfile.c wleptonica.c
-diff --git a/willuslib/ocrgocr.c b/willuslib/ocrgocr.c
-index 6027e9a..fbe10f0 100644
---- a/willuslib/ocrgocr.c
-+++ b/willuslib/ocrgocr.c
-@@ -29,6 +29,8 @@
- #ifdef HAVE_GOCR_LIB
- #include
-
-+job_t *OCR_JOB;
-+
- /*
- ** bmp8 must be grayscale
- ** (x1,y1) and (x2,y2) from top left of bitmap
-@@ -63,6 +65,7 @@ void gocr_single_word_from_bmp8(char *text,int maxlen,WILLUSBITMAP *bmp8,
- h=y2-y1+1;
- dh=h+bw*2;
- job=&_job;
-+ OCR_JOB=job;
- job_init(job);
- job_init_image(job);
- // willus_mem_alloc_warn((void **)&job->src.p.p,w*h,funcname,10);
diff --git a/pkgs/applications/misc/k2pdfopt/leptonica.patch b/pkgs/applications/misc/k2pdfopt/leptonica.patch
deleted file mode 100644
index dfab99fd0130d..0000000000000
--- a/pkgs/applications/misc/k2pdfopt/leptonica.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From 8c11a20925686855023df90ed477957c7d7fe91e Mon Sep 17 00:00:00 2001
-From: Daniel Fullmer
-Date: Fri, 13 Sep 2019 15:54:21 -0400
-Subject: [PATCH] Willus mod for k2pdfopt
-
----
- src/allheaders.h | 4 ++
- src/dewarp2.c | 106 ++++++++++++++++++++++++++++++++++++++++++-----
- src/leptwin.c | 6 ++-
- 3 files changed, 104 insertions(+), 12 deletions(-)
-
-diff --git a/src/allheaders.h b/src/allheaders.h
-index e68eff1..b3cc729 100644
---- a/src/allheaders.h
-+++ b/src/allheaders.h
-@@ -669,6 +669,10 @@ LEPT_DLL extern L_DEWARPA * dewarpaReadMem ( const l_uint8 *data, size_t size );
- LEPT_DLL extern l_ok dewarpaWrite ( const char *filename, L_DEWARPA *dewa );
- LEPT_DLL extern l_ok dewarpaWriteStream ( FILE *fp, L_DEWARPA *dewa );
- LEPT_DLL extern l_ok dewarpaWriteMem ( l_uint8 **pdata, size_t *psize, L_DEWARPA *dewa );
-+/* WILLUS MOD */
-+ LEPT_DLL extern l_int32 dewarpBuildPageModel_ex ( L_DEWARP *dew, const char *debugfile,l_int32 fit_order );
-+ LEPT_DLL extern l_int32 dewarpFindVertDisparity_ex ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag,l_int32 fit_order );
-+ LEPT_DLL extern l_int32 dewarpBuildLineModel_ex ( L_DEWARP *dew, l_int32 opensize, const char *debugfile,l_int32 fit_order );
- LEPT_DLL extern l_ok dewarpBuildPageModel ( L_DEWARP *dew, const char *debugfile );
- LEPT_DLL extern l_ok dewarpFindVertDisparity ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag );
- LEPT_DLL extern l_ok dewarpFindHorizDisparity ( L_DEWARP *dew, PTAA *ptaa );
-diff --git a/src/dewarp2.c b/src/dewarp2.c
-index 220eec1..2e29500 100644
---- a/src/dewarp2.c
-+++ b/src/dewarp2.c
-@@ -144,9 +144,17 @@ static const l_float32 L_ALLOWED_W_FRACT = 0.05; /* no bigger */
- * longest textlines.
- *
- */
-+/* WILLUS MOD */
- l_ok
--dewarpBuildPageModel(L_DEWARP *dew,
-- const char *debugfile)
-+dewarpBuildPageModel(L_DEWARP *dew,const char *debugfile)
-+{
-+return(dewarpBuildPageModel_ex(dew,debugfile,2));
-+}
-+
-+l_ok
-+dewarpBuildPageModel_ex(L_DEWARP *dew,
-+ const char *debugfile,
-+ l_int32 fit_order)
- {
- l_int32 linecount, topline, botline, ret;
- PIX *pixs, *pix1, *pix2, *pix3;
-@@ -225,7 +233,7 @@ PTAA *ptaa1, *ptaa2;
- /* Get the sampled vertical disparity from the textline centers.
- * The disparity array will push pixels vertically so that each
- * textline is flat and centered at the y-position of the mid-point. */
-- if (dewarpFindVertDisparity(dew, ptaa2, 0) != 0) {
-+ if (dewarpFindVertDisparity_ex(dew, ptaa2, 0, fit_order) != 0) {
- L_WARNING("vertical disparity not built\n", procName);
- ptaaDestroy(&ptaa2);
- return 1;
-@@ -290,13 +298,24 @@ PTAA *ptaa1, *ptaa2;
- * a pdf. Non-pix debug output goes to /tmp.
- *
- */
-+/* WILLUS MOD */
- l_ok
- dewarpFindVertDisparity(L_DEWARP *dew,
- PTAA *ptaa,
- l_int32 rotflag)
- {
-+return(dewarpFindVertDisparity_ex(dew,ptaa,rotflag,2));
-+}
-+/* WILLUS MOD -- add cubic and quartic fits and ..._ex functions */
-+l_int32
-+dewarpFindVertDisparity_ex(L_DEWARP *dew,
-+ PTAA *ptaa,
-+ l_int32 rotflag,
-+ l_int32 fit_order)
-+{
- l_int32 i, j, nlines, npts, nx, ny, sampling;
--l_float32 c0, c1, c2, x, y, midy, val, medval, meddev, minval, maxval;
-+/* WILLUS MOD */
-+l_float32 c0, c1, c2, c3, c4, x, y, midy, val, medval, meddev, minval, maxval;
- l_float32 *famidys;
- NUMA *nax, *nafit, *nacurve0, *nacurve1, *nacurves;
- NUMA *namidy, *namidys, *namidysi;
-@@ -304,11 +323,22 @@ PIX *pix1, *pix2, *pixcirc, *pixdb;
- PTA *pta, *ptad, *ptacirc;
- PTAA *ptaa0, *ptaa1, *ptaa2, *ptaa3, *ptaa4, *ptaa5, *ptaat;
- FPIX *fpix;
-+/* WILLUS MOD */
-+l_int32 fit_order1,fit_order2;
-
- PROCNAME("dewarpFindVertDisparity");
-
- if (!dew)
- return ERROR_INT("dew not defined", procName, 1);
-+/* WILLUS MOD */
-+ if (fit_order < 10)
-+ fit_order1 = fit_order2 = fit_order;
-+ else
-+ {
-+ fit_order1=fit_order % 10;
-+ fit_order2=fit_order / 10;
-+ fit_order2=fit_order2 % 10;
-+ }
- dew->vsuccess = 0;
- if (!ptaa)
- return ERROR_INT("ptaa not defined", procName, 1);
-@@ -331,12 +361,32 @@ FPIX *fpix;
- pixdb = (rotflag) ? pixRotateOrth(dew->pixs, 1) : pixClone(dew->pixs);
- for (i = 0; i < nlines; i++) { /* for each line */
- pta = ptaaGetPta(ptaa, i, L_CLONE);
-- ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL);
-- numaAddNumber(nacurve0, c2);
-+/* WILLUS MOD */
-+if (fit_order1>3)
-+ {
-+ ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL);
-+ numaAddNumber(nacurve0, c4);
-+ }
-+else if (fit_order1==3)
-+ {
-+ ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL);
-+ numaAddNumber(nacurve0, c3);
-+ }
-+else
-+ {
-+ ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL);
-+ numaAddNumber(nacurve0, c2);
-+ }
- ptad = ptaCreate(nx);
- for (j = 0; j < nx; j++) { /* uniformly sampled in x */
- x = j * sampling;
-- applyQuadraticFit(c2, c1, c0, x, &y);
-+/* WILLUS MOD */
-+if (fit_order1>3)
-+ applyQuarticFit(c4, c3, c2, c1, c0, x, &y);
-+else if (fit_order1==3)
-+ applyCubicFit(c3, c2, c1, c0, x, &y);
-+else
-+ applyQuadraticFit(c2, c1, c0, x, &y);
- ptaAddPt(ptad, x, y);
- }
- ptaaAddPta(ptaa0, ptad, L_INSERT);
-@@ -350,7 +400,13 @@ FPIX *fpix;
- for (i = 0; i < nlines; i++) {
- pta = ptaaGetPta(ptaa, i, L_CLONE);
- ptaGetArrays(pta, &nax, NULL);
-- ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit);
-+/* WILLUS MOD */
-+if (fit_order1>3)
-+ptaGetQuarticLSF(pta, NULL, NULL, NULL, NULL, NULL, &nafit);
-+else if (fit_order1==3)
-+ptaGetCubicLSF(pta, NULL, NULL, NULL, NULL, &nafit);
-+else
-+ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit);
- ptad = ptaCreateFromNuma(nax, nafit);
- ptaaAddPta(ptaat, ptad, L_INSERT);
- ptaDestroy(&pta);
-@@ -494,11 +550,24 @@ FPIX *fpix;
- ptaa5 = ptaaCreate(nx); /* uniformly sampled across full height of image */
- for (j = 0; j < nx; j++) { /* for each column */
- pta = ptaaGetPta(ptaa4, j, L_CLONE);
-- ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL);
-+/* WILLUS MOD */
-+/* Order higher than 2 can cause a little craziness here. */
-+if (fit_order2>3)
-+ ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL);
-+else if (fit_order2==3)
-+ ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL);
-+else
-+ ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL);
- ptad = ptaCreate(ny);
- for (i = 0; i < ny; i++) { /* uniformly sampled in y */
- y = i * sampling;
-- applyQuadraticFit(c2, c1, c0, y, &val);
-+/* WILLUS MOD */
-+if (fit_order2>3)
-+ applyQuarticFit(c4, c3, c2, c1, c0, y, &val);
-+else if (fit_order2==3)
-+ applyCubicFit(c3, c2, c1, c0, y, &val);
-+else
-+ applyQuadraticFit(c2, c1, c0, y, &val);
- ptaAddPt(ptad, y, val);
- }
- ptaaAddPta(ptaa5, ptad, L_INSERT);
-@@ -1602,11 +1671,21 @@ FPIX *fpix;
- * See notes there.
- *
- */
-+/* WILLUS MOD */
- l_ok
- dewarpBuildLineModel(L_DEWARP *dew,
- l_int32 opensize,
- const char *debugfile)
- {
-+return(dewarpBuildLineModel_ex(dew,opensize,debugfile,2));
-+}
-+
-+l_int32
-+dewarpBuildLineModel_ex(L_DEWARP *dew,
-+ l_int32 opensize,
-+ const char *debugfile,
-+ l_int32 fit_order)
-+{
- char buf[64];
- l_int32 i, j, bx, by, ret, nlines;
- BOXA *boxa;
-@@ -1695,6 +1774,8 @@ PTAA *ptaa1, *ptaa2;
-
- /* Remove all lines that are not at least 0.75 times the length
- * of the longest line. */
-+/* WILLUS MOD */
-+/*
- ptaa2 = dewarpRemoveShortLines(pix, ptaa1, 0.75, DEBUG_SHORT_LINES);
- if (debugfile) {
- pix1 = pixConvertTo32(pix);
-@@ -1704,6 +1785,8 @@ PTAA *ptaa1, *ptaa2;
- pixDestroy(&pix1);
- pixDestroy(&pix2);
- }
-+*/
-+ptaa2=ptaa1;
- ptaaDestroy(&ptaa1);
- nlines = ptaaGetCount(ptaa2);
- if (nlines < dew->minlines) {
-@@ -1717,7 +1800,8 @@ PTAA *ptaa1, *ptaa2;
- * centers. The disparity array will push pixels vertically
- * so that each line is flat and centered at the y-position
- * of the mid-point. */
-- ret = dewarpFindVertDisparity(dew, ptaa2, 1 - i);
-+/* WILLUS MOD */
-+ ret = dewarpFindVertDisparity_ex(dew, ptaa2, 1 - i, fit_order);
-
- /* If i == 0, move the result to the horizontal disparity,
- * rotating it back by -90 degrees. */
-diff --git a/src/leptwin.c b/src/leptwin.c
-index 72643a0..573d33e 100644
---- a/src/leptwin.c
-+++ b/src/leptwin.c
-@@ -364,5 +364,9 @@ PIXCMAP *cmap;
-
- return hBitmap;
- }
--
-+#else
-+/* willus mod: Avoid weird issue with OS/X library archiver when there are no symbols */
-+int leptwin_my_empty_func(void);
-+int leptwin_my_empty_func(void)
-+{return(0);}
- #endif /* _WIN32 */
---
-2.22.0
-
diff --git a/pkgs/applications/misc/k2pdfopt/mupdf.patch b/pkgs/applications/misc/k2pdfopt/mupdf.patch
deleted file mode 100644
index 0c59a1d201630..0000000000000
--- a/pkgs/applications/misc/k2pdfopt/mupdf.patch
+++ /dev/null
@@ -1,1060 +0,0 @@
-From d8927c969e3387ca2669a616c0ba53bce918a031 Mon Sep 17 00:00:00 2001
-From: Daniel Fullmer
-Date: Fri, 13 Sep 2019 15:11:45 -0400
-Subject: [PATCH] Willus mod for k2pdfopt
-
----
- source/fitz/filter-basic.c | 3 +
- source/fitz/font-win32.c | 866 +++++++++++++++++++++++++++++++++++++
- source/fitz/font.c | 3 +
- source/fitz/stext-device.c | 5 +
- source/fitz/string.c | 5 +
- source/pdf/pdf-annot.c | 14 +-
- source/pdf/pdf-link.c | 3 +
- source/pdf/pdf-parse.c | 5 +
- source/pdf/pdf-xref.c | 9 +
- 9 files changed, 912 insertions(+), 1 deletion(-)
- create mode 100644 source/fitz/font-win32.c
-
-diff --git a/source/fitz/filter-basic.c b/source/fitz/filter-basic.c
-index 0713a62e7..b8ef4d292 100644
---- a/source/fitz/filter-basic.c
-+++ b/source/fitz/filter-basic.c
-@@ -259,7 +259,10 @@ look_for_endstream:
- if (!state->warned)
- {
- state->warned = 1;
-+/* willus mod -- no warning */
-+/*
- fz_warn(ctx, "PDF stream Length incorrect");
-+*/
- }
- return *stm->rp++;
- }
-diff --git a/source/fitz/font-win32.c b/source/fitz/font-win32.c
-new file mode 100644
-index 000000000..45de8cfd3
---- /dev/null
-+++ b/source/fitz/font-win32.c
-@@ -0,0 +1,866 @@
-+/*
-+** Routines to access MS Windows system fonts.
-+** From sumatra PDF distro.
-+** Modified for MuPDF v1.9a by willus.com
-+*/
-+#include "mupdf/pdf.h"
-+
-+/*
-+ Which fonts are embedded is based on a few preprocessor definitions.
-+
-+ The base 14 fonts are always embedded.
-+ For CJK font substitution we embed DroidSansFallback.
-+
-+ Set NOCJK to skip all CJK support (this also omits embedding the CJK CMaps)
-+ Set NOCJKFONT to skip the embedded CJK font.
-+ Set NOCJKFULL to embed a smaller CJK font without CJK Extension A support.
-+*/
-+
-+#ifdef NOCJK
-+#define NOCJKFONT
-+#endif
-+
-+/* SumatraPDF: also load fonts included with Windows */
-+#ifdef _WIN32
-+
-+#ifndef UNICODE
-+#define UNICODE
-+#endif
-+#ifndef _UNICODE
-+#define _UNICODE
-+#endif
-+
-+#include
-+
-+// TODO: Use more of FreeType for TTF parsing (for performance reasons,
-+// the fonts can't be parsed completely, though)
-+#include
-+#include FT_TRUETYPE_IDS_H
-+#include FT_TRUETYPE_TAGS_H
-+
-+#define TTC_VERSION1 0x00010000
-+#define TTC_VERSION2 0x00020000
-+
-+#define MAX_FACENAME 128
-+
-+// Note: the font face must be the first field so that the structure
-+// can be treated like a simple string for searching
-+typedef struct pdf_fontmapMS_s
-+{
-+ char fontface[MAX_FACENAME];
-+ char fontpath[MAX_PATH];
-+ int index;
-+} pdf_fontmapMS;
-+
-+typedef struct pdf_fontlistMS_s
-+{
-+ pdf_fontmapMS *fontmap;
-+ int len;
-+ int cap;
-+} pdf_fontlistMS;
-+
-+typedef struct _tagTT_OFFSET_TABLE
-+{
-+ ULONG uVersion;
-+ USHORT uNumOfTables;
-+ USHORT uSearchRange;
-+ USHORT uEntrySelector;
-+ USHORT uRangeShift;
-+} TT_OFFSET_TABLE;
-+
-+typedef struct _tagTT_TABLE_DIRECTORY
-+{
-+ ULONG uTag; //table name
-+ ULONG uCheckSum; //Check sum
-+ ULONG uOffset; //Offset from beginning of file
-+ ULONG uLength; //length of the table in bytes
-+} TT_TABLE_DIRECTORY;
-+
-+typedef struct _tagTT_NAME_TABLE_HEADER
-+{
-+ USHORT uFSelector; //format selector. Always 0
-+ USHORT uNRCount; //Name Records count
-+ USHORT uStorageOffset; //Offset for strings storage, from start of the table
-+} TT_NAME_TABLE_HEADER;
-+
-+typedef struct _tagTT_NAME_RECORD
-+{
-+ USHORT uPlatformID;
-+ USHORT uEncodingID;
-+ USHORT uLanguageID;
-+ USHORT uNameID;
-+ USHORT uStringLength;
-+ USHORT uStringOffset; //from start of storage area
-+} TT_NAME_RECORD;
-+
-+typedef struct _tagFONT_COLLECTION
-+{
-+ ULONG Tag;
-+ ULONG Version;
-+ ULONG NumFonts;
-+} FONT_COLLECTION;
-+
-+static struct {
-+ char *name;
-+ char *pattern;
-+} baseSubstitutes[] = {
-+ { "Courier", "CourierNewPSMT" },
-+ { "Courier-Bold", "CourierNewPS-BoldMT" },
-+ { "Courier-Oblique", "CourierNewPS-ItalicMT" },
-+ { "Courier-BoldOblique", "CourierNewPS-BoldItalicMT" },
-+ { "Helvetica", "ArialMT" },
-+ { "Helvetica-Bold", "Arial-BoldMT" },
-+ { "Helvetica-Oblique", "Arial-ItalicMT" },
-+ { "Helvetica-BoldOblique", "Arial-BoldItalicMT" },
-+ { "Times-Roman", "TimesNewRomanPSMT" },
-+ { "Times-Bold", "TimesNewRomanPS-BoldMT" },
-+ { "Times-Italic", "TimesNewRomanPS-ItalicMT" },
-+ { "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT" },
-+ { "Symbol", "SymbolMT" },
-+};
-+static const char *base_font_names[][10] =
-+{
-+ { "Courier", "CourierNew", "CourierNewPSMT", NULL },
-+ { "Courier-Bold", "CourierNew,Bold", "Courier,Bold",
-+ "CourierNewPS-BoldMT", "CourierNew-Bold", NULL },
-+ { "Courier-Oblique", "CourierNew,Italic", "Courier,Italic",
-+ "CourierNewPS-ItalicMT", "CourierNew-Italic", NULL },
-+ { "Courier-BoldOblique", "CourierNew,BoldItalic", "Courier,BoldItalic",
-+ "CourierNewPS-BoldItalicMT", "CourierNew-BoldItalic", NULL },
-+ { "Helvetica", "ArialMT", "Arial", NULL },
-+ { "Helvetica-Bold", "Arial-BoldMT", "Arial,Bold", "Arial-Bold",
-+ "Helvetica,Bold", NULL },
-+ { "Helvetica-Oblique", "Arial-ItalicMT", "Arial,Italic", "Arial-Italic",
-+ "Helvetica,Italic", "Helvetica-Italic", NULL },
-+ { "Helvetica-BoldOblique", "Arial-BoldItalicMT",
-+ "Arial,BoldItalic", "Arial-BoldItalic",
-+ "Helvetica,BoldItalic", "Helvetica-BoldItalic", NULL },
-+ { "Times-Roman", "TimesNewRomanPSMT", "TimesNewRoman",
-+ "TimesNewRomanPS", NULL },
-+ { "Times-Bold", "TimesNewRomanPS-BoldMT", "TimesNewRoman,Bold",
-+ "TimesNewRomanPS-Bold", "TimesNewRoman-Bold", NULL },
-+ { "Times-Italic", "TimesNewRomanPS-ItalicMT", "TimesNewRoman,Italic",
-+ "TimesNewRomanPS-Italic", "TimesNewRoman-Italic", NULL },
-+ { "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT",
-+ "TimesNewRoman,BoldItalic", "TimesNewRomanPS-BoldItalic",
-+ "TimesNewRoman-BoldItalic", NULL },
-+ { "Symbol", "Symbol,Italic", "Symbol,Bold", "Symbol,BoldItalic",
-+ "SymbolMT", "SymbolMT,Italic", "SymbolMT,Bold", "SymbolMT,BoldItalic", NULL },
-+ { "ZapfDingbats", NULL }
-+};
-+
-+static pdf_fontlistMS fontlistMS =
-+{
-+ NULL,
-+ 0,
-+ 0,
-+};
-+static int strcmp_ignore_space(const char *a, const char *b);
-+static const char *clean_font_name(const char *fontname);
-+static const char *pdf_clean_base14_name(const char *fontname);
-+
-+static inline USHORT BEtoHs(USHORT x)
-+{
-+ BYTE *data = (BYTE *)&x;
-+ return (data[0] << 8) | data[1];
-+}
-+
-+static inline ULONG BEtoHl(ULONG x)
-+{
-+ BYTE *data = (BYTE *)&x;
-+ return (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
-+}
-+
-+static int strcmp_ignore_space(const char *a, const char *b)
-+{
-+ while (1)
-+ {
-+ while (*a == ' ')
-+ a++;
-+ while (*b == ' ')
-+ b++;
-+ if (*a != *b)
-+ return 1;
-+ if (*a == 0)
-+ return *a != *b;
-+ if (*b == 0)
-+ return *a != *b;
-+ a++;
-+ b++;
-+ }
-+}
-+
-+/* A little bit more sophisticated name matching so that e.g. "EurostileExtended"
-+ matches "EurostileExtended-Roman" or "Tahoma-Bold,Bold" matches "Tahoma-Bold" */
-+static int
-+lookup_compare(const void *elem1, const void *elem2)
-+{
-+ const char *val1 = elem1;
-+ const char *val2 = elem2;
-+ int len1 = strlen(val1);
-+ int len2 = strlen(val2);
-+
-+ if (len1 != len2)
-+ {
-+ const char *rest = len1 > len2 ? val1 + len2 : val2 + len1;
-+ if (',' == *rest || !_stricmp(rest, "-roman"))
-+ return _strnicmp(val1, val2, fz_mini(len1, len2));
-+ }
-+
-+ return _stricmp(val1, val2);
-+}
-+
-+static void
-+remove_spaces(char *srcDest)
-+{
-+ char *dest;
-+
-+ for (dest = srcDest; *srcDest; srcDest++)
-+ if (*srcDest != ' ')
-+ *dest++ = *srcDest;
-+ *dest = '\0';
-+}
-+
-+static int
-+str_ends_with(const char *str, const char *end)
-+{
-+ size_t len1 = strlen(str);
-+ size_t len2 = strlen(end);
-+
-+ return len1 >= len2 && !strcmp(str + len1 - len2, end);
-+}
-+
-+static pdf_fontmapMS *
-+pdf_find_windows_font_path(const char *fontname)
-+{
-+ return bsearch(fontname, fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), lookup_compare);
-+}
-+
-+/* source and dest can be same */
-+static void
-+decode_unicode_BE(fz_context *ctx, char *source, int sourcelen, char *dest, int destlen)
-+{
-+ WCHAR *tmp;
-+ int converted, i;
-+
-+ if (sourcelen % 2 != 0)
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string");
-+
-+ tmp = fz_malloc_array(ctx, sourcelen / 2 + 1, sizeof(WCHAR));
-+ for (i = 0; i < sourcelen / 2; i++)
-+ tmp[i] = BEtoHs(((WCHAR *)source)[i]);
-+ tmp[sourcelen / 2] = '\0';
-+
-+ converted = WideCharToMultiByte(CP_UTF8, 0, tmp, -1, dest, destlen, NULL, NULL);
-+ fz_free(ctx, tmp);
-+ if (!converted)
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string");
-+}
-+
-+static void
-+decode_platform_string(fz_context *ctx, int platform, int enctype, char *source, int sourcelen, char *dest, int destlen)
-+{
-+ switch (platform)
-+ {
-+ case TT_PLATFORM_APPLE_UNICODE:
-+ switch (enctype)
-+ {
-+ case TT_APPLE_ID_DEFAULT:
-+ case TT_APPLE_ID_UNICODE_2_0:
-+ decode_unicode_BE(ctx, source, sourcelen, dest, destlen);
-+ return;
-+ }
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype);
-+ case TT_PLATFORM_MACINTOSH:
-+ switch (enctype)
-+ {
-+ case TT_MAC_ID_ROMAN:
-+ if (sourcelen + 1 > destlen)
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : overlong fontname: %s", source);
-+ // TODO: Convert to UTF-8 from what encoding?
-+ memcpy(dest, source, sourcelen);
-+ dest[sourcelen] = 0;
-+ return;
-+ }
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype);
-+ case TT_PLATFORM_MICROSOFT:
-+ switch (enctype)
-+ {
-+ case TT_MS_ID_SYMBOL_CS:
-+ case TT_MS_ID_UNICODE_CS:
-+ case TT_MS_ID_UCS_4:
-+ decode_unicode_BE(ctx, source, sourcelen, dest, destlen);
-+ return;
-+ }
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype);
-+ default:
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype);
-+ }
-+}
-+
-+static void
-+grow_system_font_list(fz_context *ctx, pdf_fontlistMS *fl)
-+{
-+ int newcap;
-+ pdf_fontmapMS *newitems;
-+
-+ if (fl->cap == 0)
-+ newcap = 1024;
-+ else
-+ newcap = fl->cap * 2;
-+
-+ // use realloc/free for the fontmap, since the list can
-+ // remain in memory even with all fz_contexts destroyed
-+ newitems = realloc(fl->fontmap, newcap * sizeof(pdf_fontmapMS));
-+ if (!newitems)
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "OOM in grow_system_font_list");
-+ memset(newitems + fl->cap, 0, sizeof(pdf_fontmapMS) * (newcap - fl->cap));
-+
-+ fl->fontmap = newitems;
-+ fl->cap = newcap;
-+}
-+
-+static void
-+append_mapping(fz_context *ctx, pdf_fontlistMS *fl, const char *facename, const char *path, int index)
-+{
-+ if (fl->len == fl->cap)
-+ grow_system_font_list(ctx, fl);
-+
-+ if (fl->len >= fl->cap)
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : fontlist overflow");
-+
-+ fz_strlcpy(fl->fontmap[fl->len].fontface, facename, sizeof(fl->fontmap[0].fontface));
-+ fz_strlcpy(fl->fontmap[fl->len].fontpath, path, sizeof(fl->fontmap[0].fontpath));
-+ fl->fontmap[fl->len].index = index;
-+
-+ ++fl->len;
-+}
-+
-+static void
-+safe_read(fz_context *ctx, fz_stream *file, int offset, char *buf, int size)
-+{
-+ int n;
-+ fz_seek(ctx, file, offset, 0);
-+ n = fz_read(ctx, file, (unsigned char *)buf, size);
-+ if (n != size)
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "safe_read: read %d, expected %d", n, size);
-+}
-+
-+static void
-+read_ttf_string(fz_context *ctx, fz_stream *file, int offset, TT_NAME_RECORD *ttRecordBE, char *buf, int size)
-+{
-+ char szTemp[MAX_FACENAME * 2];
-+ // ignore empty and overlong strings
-+ int stringLength = BEtoHs(ttRecordBE->uStringLength);
-+ if (stringLength == 0 || stringLength >= sizeof(szTemp))
-+ return;
-+
-+ safe_read(ctx, file, offset + BEtoHs(ttRecordBE->uStringOffset), szTemp, stringLength);
-+ decode_platform_string(ctx, BEtoHs(ttRecordBE->uPlatformID),
-+ BEtoHs(ttRecordBE->uEncodingID), szTemp, stringLength, buf, size);
-+}
-+
-+static void
-+makeFakePSName(char szName[MAX_FACENAME], const char *szStyle)
-+{
-+ // append the font's subfamily, unless it's a Regular font
-+ if (*szStyle && _stricmp(szStyle, "Regular") != 0)
-+ {
-+ fz_strlcat(szName, "-", MAX_FACENAME);
-+ fz_strlcat(szName, szStyle, MAX_FACENAME);
-+ }
-+ remove_spaces(szName);
-+}
-+
-+static void
-+parseTTF(fz_context *ctx, fz_stream *file, int offset, int index, const char *path)
-+{
-+ TT_OFFSET_TABLE ttOffsetTableBE;
-+ TT_TABLE_DIRECTORY tblDirBE;
-+ TT_NAME_TABLE_HEADER ttNTHeaderBE;
-+ TT_NAME_RECORD ttRecordBE;
-+
-+ char szPSName[MAX_FACENAME] = { 0 };
-+ char szTTName[MAX_FACENAME] = { 0 };
-+ char szStyle[MAX_FACENAME] = { 0 };
-+ char szCJKName[MAX_FACENAME] = { 0 };
-+ int i, count, tblOffset;
-+
-+ safe_read(ctx, file, offset, (char *)&ttOffsetTableBE, sizeof(TT_OFFSET_TABLE));
-+
-+ // check if this is a TrueType font of version 1.0 or an OpenType font
-+ if (BEtoHl(ttOffsetTableBE.uVersion) != TTC_VERSION1 &&
-+ BEtoHl(ttOffsetTableBE.uVersion) != TTAG_OTTO)
-+ {
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid font version %x", (unsigned int)BEtoHl(ttOffsetTableBE.uVersion));
-+ }
-+
-+ // determine the name table's offset by iterating through the offset table
-+ count = BEtoHs(ttOffsetTableBE.uNumOfTables);
-+ for (i = 0; i < count; i++)
-+ {
-+ int entryOffset = offset + sizeof(TT_OFFSET_TABLE) + i * sizeof(TT_TABLE_DIRECTORY);
-+ safe_read(ctx, file, entryOffset, (char *)&tblDirBE, sizeof(TT_TABLE_DIRECTORY));
-+ if (!BEtoHl(tblDirBE.uTag) || BEtoHl(tblDirBE.uTag) == TTAG_name)
-+ break;
-+ }
-+ if (count == i || !BEtoHl(tblDirBE.uTag))
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : nameless font");
-+ tblOffset = BEtoHl(tblDirBE.uOffset);
-+
-+ // read the 'name' table for record count and offsets
-+ safe_read(ctx, file, tblOffset, (char *)&ttNTHeaderBE, sizeof(TT_NAME_TABLE_HEADER));
-+ offset = tblOffset + sizeof(TT_NAME_TABLE_HEADER);
-+ tblOffset += BEtoHs(ttNTHeaderBE.uStorageOffset);
-+
-+ // read through the strings for PostScript name and font family
-+ count = BEtoHs(ttNTHeaderBE.uNRCount);
-+ for (i = 0; i < count; i++)
-+ {
-+ short langId, nameId;
-+ BOOL isCJKName;
-+
-+ safe_read(ctx, file, offset + i * sizeof(TT_NAME_RECORD), (char *)&ttRecordBE, sizeof(TT_NAME_RECORD));
-+
-+ langId = BEtoHs(ttRecordBE.uLanguageID);
-+ nameId = BEtoHs(ttRecordBE.uNameID);
-+ isCJKName = TT_NAME_ID_FONT_FAMILY == nameId && LANG_CHINESE == PRIMARYLANGID(langId);
-+
-+ // ignore non-English strings (except for Chinese font names)
-+ if (langId && langId != TT_MS_LANGID_ENGLISH_UNITED_STATES && !isCJKName)
-+ continue;
-+ // ignore names other than font (sub)family and PostScript name
-+ fz_try(ctx)
-+ {
-+ if (isCJKName)
-+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szCJKName, sizeof(szCJKName));
-+ else if (TT_NAME_ID_FONT_FAMILY == nameId)
-+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szTTName, sizeof(szTTName));
-+ else if (TT_NAME_ID_FONT_SUBFAMILY == nameId)
-+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szStyle, sizeof(szStyle));
-+ else if (TT_NAME_ID_PS_NAME == nameId)
-+ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szPSName, sizeof(szPSName));
-+ }
-+ fz_catch(ctx)
-+ {
-+ fz_warn(ctx, "ignoring face name decoding fonterror");
-+ }
-+ }
-+
-+ // try to prevent non-Arial fonts from accidentally substituting Arial
-+ if (!strcmp(szPSName, "ArialMT"))
-+ {
-+ // cf. https://code.google.com/p/sumatrapdf/issues/detail?id=2471
-+ if (strcmp(szTTName, "Arial") != 0)
-+ szPSName[0] = '\0';
-+ // TODO: is there a better way to distinguish Arial Caps from Arial proper?
-+ // cf. http://code.google.com/p/sumatrapdf/issues/detail?id=1290
-+ else if (strstr(path, "caps") || strstr(path, "Caps"))
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "ignore %s, as it can't be distinguished from Arial,Regular", path);
-+ }
-+
-+ if (szPSName[0])
-+ append_mapping(ctx, &fontlistMS, szPSName, path, index);
-+ if (szTTName[0])
-+ {
-+ // derive a PostScript-like name and add it, if it's different from the font's
-+ // included PostScript name; cf. http://code.google.com/p/sumatrapdf/issues/detail?id=376
-+ makeFakePSName(szTTName, szStyle);
-+ // compare the two names before adding this one
-+ if (lookup_compare(szTTName, szPSName))
-+ append_mapping(ctx, &fontlistMS, szTTName, path, index);
-+ }
-+ if (szCJKName[0])
-+ {
-+ makeFakePSName(szCJKName, szStyle);
-+ if (lookup_compare(szCJKName, szPSName) && lookup_compare(szCJKName, szTTName))
-+ append_mapping(ctx, &fontlistMS, szCJKName, path, index);
-+ }
-+}
-+
-+static void
-+parseTTFs(fz_context *ctx, const char *path)
-+{
-+ fz_stream *file = fz_open_file(ctx, path);
-+ /* "fonterror : %s not found", path */
-+ fz_try(ctx)
-+ {
-+ parseTTF(ctx, file, 0, 0, path);
-+ }
-+ fz_always(ctx)
-+ {
-+ fz_drop_stream(ctx,file);
-+ }
-+ fz_catch(ctx)
-+ {
-+ fz_rethrow(ctx);
-+ }
-+}
-+
-+static void
-+parseTTCs(fz_context *ctx, const char *path)
-+{
-+ FONT_COLLECTION fontcollectionBE;
-+ ULONG i, numFonts, *offsettableBE = NULL;
-+
-+ fz_stream *file = fz_open_file(ctx, path);
-+ /* "fonterror : %s not found", path */
-+
-+ fz_var(offsettableBE);
-+
-+ fz_try(ctx)
-+ {
-+ safe_read(ctx, file, 0, (char *)&fontcollectionBE, sizeof(FONT_COLLECTION));
-+ if (BEtoHl(fontcollectionBE.Tag) != TTAG_ttcf)
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : wrong format %x", (unsigned int)BEtoHl(fontcollectionBE.Tag));
-+ if (BEtoHl(fontcollectionBE.Version) != TTC_VERSION1 &&
-+ BEtoHl(fontcollectionBE.Version) != TTC_VERSION2)
-+ {
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid version %x", (unsigned int)BEtoHl(fontcollectionBE.Version));
-+ }
-+
-+ numFonts = BEtoHl(fontcollectionBE.NumFonts);
-+ offsettableBE = fz_malloc_array(ctx, numFonts, sizeof(ULONG));
-+
-+ safe_read(ctx, file, sizeof(FONT_COLLECTION), (char *)offsettableBE, numFonts * sizeof(ULONG));
-+ for (i = 0; i < numFonts; i++)
-+ parseTTF(ctx, file, BEtoHl(offsettableBE[i]), i, path);
-+ }
-+ fz_always(ctx)
-+ {
-+ fz_free(ctx, offsettableBE);
-+ fz_drop_stream(ctx,file);
-+ }
-+ fz_catch(ctx)
-+ {
-+ fz_rethrow(ctx);
-+ }
-+}
-+
-+static void
-+extend_system_font_list(fz_context *ctx, const WCHAR *path)
-+{
-+ WCHAR szPath[MAX_PATH], *lpFileName;
-+ WIN32_FIND_DATA FileData;
-+ HANDLE hList;
-+
-+ GetFullPathName(path, nelem(szPath), szPath, &lpFileName);
-+
-+ hList = FindFirstFile(szPath, &FileData);
-+ if (hList == INVALID_HANDLE_VALUE)
-+ {
-+ // Don't complain about missing directories
-+ if (GetLastError() == ERROR_FILE_NOT_FOUND)
-+ return;
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "extend_system_font_list: unknown error %d", (int)GetLastError());
-+ }
-+ do
-+ {
-+ if (!(FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
-+ {
-+ char szPathUtf8[MAX_PATH], *fileExt;
-+ int res;
-+ lstrcpyn(lpFileName, FileData.cFileName, szPath + MAX_PATH - lpFileName);
-+ res = WideCharToMultiByte(CP_UTF8, 0, szPath, -1, szPathUtf8, sizeof(szPathUtf8), NULL, NULL);
-+ if (!res)
-+ {
-+ fz_warn(ctx, "WideCharToMultiByte failed for %S", szPath);
-+ continue;
-+ }
-+ fileExt = szPathUtf8 + strlen(szPathUtf8) - 4;
-+ fz_try(ctx)
-+ {
-+ if (!_stricmp(fileExt, ".ttc"))
-+ parseTTCs(ctx, szPathUtf8);
-+ else if (!_stricmp(fileExt, ".ttf") || !_stricmp(fileExt, ".otf"))
-+ parseTTFs(ctx, szPathUtf8);
-+ }
-+ fz_catch(ctx)
-+ {
-+ // ignore errors occurring while parsing a given font file
-+ }
-+ }
-+ } while (FindNextFile(hList, &FileData));
-+ FindClose(hList);
-+}
-+
-+static void
-+destroy_system_font_list(void)
-+{
-+ free(fontlistMS.fontmap);
-+ memset(&fontlistMS, 0, sizeof(fontlistMS));
-+}
-+
-+static void
-+create_system_font_list(fz_context *ctx)
-+{
-+ WCHAR szFontDir[MAX_PATH];
-+ UINT cch;
-+
-+ cch = GetWindowsDirectory(szFontDir, nelem(szFontDir) - 12);
-+ if (0 < cch && cch < nelem(szFontDir) - 12)
-+ {
-+ /* willus.com edit--Win XP default MSVCRT.DLL doesn't have wcscat_s */
-+#ifdef _WIN64
-+ wcscat_s(szFontDir, MAX_PATH, L"\\Fonts\\*.?t?");
-+#else
-+ wcscat(szFontDir,L"\\Fonts\\*.?t?");
-+#endif
-+ extend_system_font_list(ctx, szFontDir);
-+ }
-+
-+ if (fontlistMS.len == 0)
-+ fz_warn(ctx, "couldn't find any usable system fonts");
-+
-+#ifdef NOCJKFONT
-+ {
-+ // If no CJK fallback font is builtin but one has been shipped separately (in the same
-+ // directory as the main executable), add it to the list of loadable system fonts
-+ WCHAR szFile[MAX_PATH], *lpFileName;
-+ GetModuleFileName(0, szFontDir, MAX_PATH);
-+ GetFullPathName(szFontDir, MAX_PATH, szFile, &lpFileName);
-+ lstrcpyn(lpFileName, L"DroidSansFallback.ttf", szFile + MAX_PATH - lpFileName);
-+ extend_system_font_list(ctx, szFile);
-+ }
-+#endif
-+
-+ // sort the font list, so that it can be searched binarily
-+ qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp);
-+
-+#ifdef DEBUG
-+ // allow to overwrite system fonts for debugging purposes
-+ // (either pass a full path or a search pattern such as "fonts\*.ttf")
-+ cch = GetEnvironmentVariable(L"MUPDF_FONTS_PATTERN", szFontDir, nelem(szFontDir));
-+ if (0 < cch && cch < nelem(szFontDir))
-+ {
-+ int i, prev_len = fontlistMS.len;
-+ extend_system_font_list(ctx, szFontDir);
-+ for (i = prev_len; i < fontlistMS.len; i++)
-+ {
-+ pdf_fontmapMS *entry = bsearch(fontlistMS.fontmap[i].fontface, fontlistMS.fontmap, prev_len, sizeof(pdf_fontmapMS), lookup_compare);
-+ if (entry)
-+ *entry = fontlistMS.fontmap[i];
-+ }
-+ qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp);
-+ }
-+#endif
-+
-+ // make sure to clean up after ourselves
-+ atexit(destroy_system_font_list);
-+}
-+
-+static fz_font *
-+pdf_load_windows_font_by_name(fz_context *ctx, const char *orig_name)
-+{
-+ pdf_fontmapMS *found = NULL;
-+ char *comma, *fontname;
-+ fz_font *font;
-+
-+ /* WILLUS MOD--not multi-threaded for k2pdfopt */
-+ /* fz_synchronize_begin(); */
-+ if (fontlistMS.len == 0)
-+ {
-+ fz_try(ctx)
-+ {
-+ create_system_font_list(ctx);
-+ }
-+ fz_catch(ctx) { }
-+ }
-+ /* WILLUS MOD--not multi-threaded for k2pdfopt */
-+ /* fz_synchronize_end(); */
-+ if (fontlistMS.len == 0)
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror: couldn't find any fonts");
-+
-+ // work on a normalized copy of the font name
-+ fontname = fz_strdup(ctx, orig_name);
-+ remove_spaces(fontname);
-+
-+ // first, try to find the exact font name (including appended style information)
-+ comma = strchr(fontname, ',');
-+ if (comma)
-+ {
-+ *comma = '-';
-+ found = pdf_find_windows_font_path(fontname);
-+ *comma = ',';
-+ }
-+ // second, substitute the font name with a known PostScript name
-+ else
-+ {
-+ int i;
-+ for (i = 0; i < nelem(baseSubstitutes) && !found; i++)
-+ if (!strcmp(fontname, baseSubstitutes[i].name))
-+ found = pdf_find_windows_font_path(baseSubstitutes[i].pattern);
-+ }
-+ // third, search for the font name without additional style information
-+ if (!found)
-+ found = pdf_find_windows_font_path(fontname);
-+ // fourth, try to separate style from basename for prestyled fonts (e.g. "ArialBold")
-+ if (!found && !comma && (str_ends_with(fontname, "Bold") || str_ends_with(fontname, "Italic")))
-+ {
-+ int styleLen = str_ends_with(fontname, "Bold") ? 4 : str_ends_with(fontname, "BoldItalic") ? 10 : 6;
-+ fontname = fz_resize_array(ctx, fontname, strlen(fontname) + 2, sizeof(char));
-+ comma = fontname + strlen(fontname) - styleLen;
-+ memmove(comma + 1, comma, styleLen + 1);
-+ *comma = '-';
-+ found = pdf_find_windows_font_path(fontname);
-+ *comma = ',';
-+ if (!found)
-+ found = pdf_find_windows_font_path(fontname);
-+ }
-+ // fifth, try to convert the font name from the common Chinese codepage 936
-+ if (!found && fontname[0] < 0)
-+ {
-+ WCHAR cjkNameW[MAX_FACENAME];
-+ char cjkName[MAX_FACENAME];
-+ if (MultiByteToWideChar(936, MB_ERR_INVALID_CHARS, fontname, -1, cjkNameW, nelem(cjkNameW)) &&
-+ WideCharToMultiByte(CP_UTF8, 0, cjkNameW, -1, cjkName, nelem(cjkName), NULL, NULL))
-+ {
-+ comma = strchr(cjkName, ',');
-+ if (comma)
-+ {
-+ *comma = '-';
-+ found = pdf_find_windows_font_path(cjkName);
-+ *comma = ',';
-+ }
-+ if (!found)
-+ found = pdf_find_windows_font_path(cjkName);
-+ }
-+ }
-+
-+ fz_free(ctx, fontname);
-+ if (!found)
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "couldn't find system font '%s'", orig_name);
-+
-+ /*
-+ fz_warn(ctx, "loading non-embedded font '%s' from '%s'", orig_name, found->fontpath);
-+ */
-+
-+ font = fz_new_font_from_file(ctx, orig_name, found->fontpath, found->index,
-+ strcmp(found->fontface, "DroidSansFallback") != 0);
-+ /* willus mod for MuPDF v1.10, 10-21-2016 */
-+ {
-+ fz_font_flags_t *flags;
-+ flags=fz_font_flags(font);
-+ if (flags!=NULL)
-+ flags->ft_substitute = 1;
-+ }
-+ return font;
-+}
-+
-+static fz_font *
-+pdf_load_windows_font(fz_context *ctx, const char *fontname, int bold, int italic, int needs_exact_metrics)
-+{
-+ if (needs_exact_metrics)
-+ {
-+ const char *clean_name;
-+ /* WILLUS: Declare pdf_clean_base14_name() */
-+ extern const char *pdf_clean_base14_name(const char *fontname);
-+
-+ /* TODO: the metrics for Times-Roman and Courier don't match
-+ those of Windows' Times New Roman and Courier New; for
-+ some reason, Poppler doesn't seem to have this problem */
-+ int len;
-+ if (fz_lookup_builtin_font(ctx,fontname, bold, italic, &len))
-+ return NULL;
-+
-+ /* cf. http://code.google.com/p/sumatrapdf/issues/detail?id=2173 */
-+ clean_name = pdf_clean_base14_name(fontname);
-+ if (clean_name != fontname && !strncmp(clean_name, "Times-", 6))
-+ return NULL;
-+ }
-+
-+ // TODO: unset font->ft_substitute for base14/needs_exact_metrics?
-+ return pdf_load_windows_font_by_name(ctx, fontname);
-+}
-+
-+static const char *clean_font_name(const char *fontname)
-+{
-+ int i, k;
-+ for (i = 0; i < nelem(base_font_names); i++)
-+ for (k = 0; base_font_names[i][k]; k++)
-+ if (!strcmp_ignore_space(base_font_names[i][k], fontname))
-+ return base_font_names[i][0];
-+ return fontname;
-+}
-+
-+
-+/* SumatraPDF: expose clean_font_name */
-+static const char * pdf_clean_base14_name(const char *fontname)
-+{
-+ return clean_font_name(fontname);
-+}
-+
-+static fz_font *
-+pdf_load_windows_cjk_font(fz_context *ctx, const char *fontname, int ros, int serif)
-+{
-+ fz_font *font;
-+
-+ font=NULL; /* WILLUS: Avoid compiler warning */
-+ /* try to find a matching system font before falling back to an approximate one */
-+ fz_try(ctx)
-+ {
-+ font = pdf_load_windows_font_by_name(ctx, fontname);
-+ }
-+ fz_catch(ctx)
-+ {
-+ font = NULL;
-+ }
-+ if (font)
-+ return font;
-+
-+ /* try to fall back to a reasonable system font */
-+ fz_try(ctx)
-+ {
-+ if (serif)
-+ {
-+ switch (ros)
-+ {
-+ case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "MingLiU"); break;
-+ case FZ_ADOBE_GB: font = pdf_load_windows_font_by_name(ctx, "SimSun"); break;
-+ case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Mincho"); break;
-+ case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Batang"); break;
-+ default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid serif ros");
-+ }
-+ }
-+ else
-+ {
-+ switch (ros)
-+ {
-+ case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "DFKaiShu-SB-Estd-BF"); break;
-+ case FZ_ADOBE_GB:
-+ fz_try(ctx)
-+ {
-+ font = pdf_load_windows_font_by_name(ctx, "KaiTi");
-+ }
-+ fz_catch(ctx)
-+ {
-+ font = pdf_load_windows_font_by_name(ctx, "KaiTi_GB2312");
-+ }
-+ break;
-+ case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Gothic"); break;
-+ case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Gulim"); break;
-+ default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid sans-serif ros");
-+ }
-+ }
-+ }
-+ fz_catch(ctx)
-+ {
-+#ifdef NOCJKFONT
-+ /* If no CJK fallback font is builtin, maybe one has been shipped separately */
-+ font = pdf_load_windows_font_by_name(ctx, "DroidSansFallback");
-+#else
-+ fz_rethrow(ctx);
-+#endif
-+ }
-+
-+ return font;
-+}
-+
-+#endif
-+
-+void pdf_install_load_system_font_funcs(fz_context *ctx)
-+{
-+#ifdef _WIN32
-+ fz_install_load_system_font_funcs(ctx, pdf_load_windows_font, pdf_load_windows_cjk_font, NULL);
-+#endif
-+}
-diff --git a/source/fitz/font.c b/source/fitz/font.c
-index 00c6e8f99..1448b4a56 100644
---- a/source/fitz/font.c
-+++ b/source/fitz/font.c
-@@ -4,8 +4,11 @@
- #include "draw-imp.h"
-
- #include
-+/* willus mod -- remove hb includes */
-+/*
- #include "hb.h"
- #include "hb-ft.h"
-+*/
-
- #include
-
-diff --git a/source/fitz/stext-device.c b/source/fitz/stext-device.c
-index 2df90305e..b1f99e056 100644
---- a/source/fitz/stext-device.c
-+++ b/source/fitz/stext-device.c
-@@ -825,6 +825,11 @@ fz_new_stext_device(fz_context *ctx, fz_stext_page *page, const fz_stext_options
- dev->lastchar = ' ';
- dev->curdir = 1;
- dev->lasttext = NULL;
-+ /* willus mod -- seems like this should be here, but not sure. */
-+ if (opts)
-+ dev->flags = opts->flags;
-+ else
-+ dev->flags = 0;
-
- return (fz_device*)dev;
- }
-diff --git a/source/fitz/string.c b/source/fitz/string.c
-index f8eedb682..7a767983d 100644
---- a/source/fitz/string.c
-+++ b/source/fitz/string.c
-@@ -560,6 +560,10 @@ fz_utflen(const char *s)
- */
- float fz_atof(const char *s)
- {
-+/* willus mod: atof(s), #if-#else-#endif */
-+#if (!defined(__SSE__))
-+ return(atof(s));
-+#else
- float result;
-
- if (s == NULL)
-@@ -572,6 +576,7 @@ float fz_atof(const char *s)
- return 1;
- result = fz_clamp(result, -FLT_MAX, FLT_MAX);
- return result;
-+#endif
- }
-
- /*
-diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c
-index 4dfdf36fe..acff7d12a 100644
---- a/source/pdf/pdf-annot.c
-+++ b/source/pdf/pdf-annot.c
-@@ -5,8 +5,20 @@
- #include
- #include
-
-+/* willus mod--don't use _mkgmtime--not available in Win XP */
- #ifdef _WIN32
--#define timegm _mkgmtime
-+static time_t timegm(struct tm *date);
-+static time_t timegm(struct tm *date)
-+
-+ {
-+ time_t t,z;
-+ struct tm gmz;
-+
-+ z=(time_t)0;
-+ gmz=(*gmtime(&z));
-+ t=mktime(date)-mktime(&gmz);
-+ return(t);
-+ }
- #endif
-
- #define isdigit(c) (c >= '0' && c <= '9')
-diff --git a/source/pdf/pdf-link.c b/source/pdf/pdf-link.c
-index 37444b471..613cc05b9 100644
---- a/source/pdf/pdf-link.c
-+++ b/source/pdf/pdf-link.c
-@@ -345,6 +345,9 @@ pdf_resolve_link(fz_context *ctx, pdf_document *doc, const char *uri, float *xp,
- }
- return page;
- }
-+/* willus mod -- be quiet */
-+/*
- fz_warn(ctx, "unknown link uri '%s'", uri);
-+*/
- return -1;
- }
-diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c
-index 04a772204..9dd0cd898 100644
---- a/source/pdf/pdf-parse.c
-+++ b/source/pdf/pdf-parse.c
-@@ -663,9 +663,14 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc,
- if (c == '\r')
- {
- c = fz_peek_byte(ctx, file);
-+/* willus mod -- no warning */
-+/*
- if (c != '\n')
- fz_warn(ctx, "line feed missing after stream begin marker (%d %d R)", num, gen);
- else
-+*/
-+if (c=='\n')
-+/* willus mod -- end */
- fz_read_byte(ctx, file);
- }
- stm_ofs = fz_tell(ctx, file);
-diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
-index 8f888059b..08de7bfba 100644
---- a/source/pdf/pdf-xref.c
-+++ b/source/pdf/pdf-xref.c
-@@ -710,8 +710,11 @@ pdf_xref_size_from_old_trailer(fz_context *ctx, pdf_document *doc, pdf_lexbuf *b
- if (!s)
- fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length missing");
- len = fz_atoi(fz_strsep(&s, " "));
-+/* willus mod -- no warning */
-+/*
- if (len < 0)
- fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length must be positive");
-+*/
-
- /* broken pdfs where the section is not on a separate line */
- if (s && *s != '\0')
-@@ -1378,7 +1381,10 @@ pdf_init_document(fz_context *ctx, pdf_document *doc)
- {
- pdf_drop_xref_sections(ctx, doc);
- fz_rethrow_if(ctx, FZ_ERROR_TRYLATER);
-+/* willus mod -- be quiet */
-+/*
- fz_warn(ctx, "trying to repair broken xref");
-+*/
- repaired = 1;
- }
-
-@@ -1506,7 +1512,10 @@ pdf_drop_document_imp(fz_context *ctx, pdf_document *doc)
- /* Swallow error, but continue dropping */
- }
-
-+/* willu smod -- no pdf_drop_js */
-+/*
- pdf_drop_js(ctx, doc->js);
-+*/
-
- pdf_drop_xref_sections(ctx, doc);
- fz_free(ctx, doc->xref_index);
---
-2.22.0
-
diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/pkgs/applications/misc/k2pdfopt/tesseract.patch
deleted file mode 100644
index adfee9ae282f3..0000000000000
--- a/pkgs/applications/misc/k2pdfopt/tesseract.patch
+++ /dev/null
@@ -1,675 +0,0 @@
-From 39aa8502eee7bb669a29d1a9b3bfe5c9595ad960 Mon Sep 17 00:00:00 2001
-From: Daniel Fullmer
-Date: Fri, 13 Sep 2019 13:45:05 -0400
-Subject: [PATCH] Willus mod changes from k2pdfopt
-
----
- src/api/Makefile.am | 1 +
- src/api/baseapi.cpp | 87 +++++++++++
- src/api/baseapi.h | 3 +
- src/api/tesscapi.cpp | 311 +++++++++++++++++++++++++++++++++++++
- src/api/tesseract.h | 29 ++++
- src/ccmain/tessedit.cpp | 5 +-
- src/ccutil/ccutil.h | 7 +
- src/ccutil/genericvector.h | 21 ++-
- src/ccutil/mainblk.cpp | 17 +-
- src/ccutil/params.cpp | 3 +-
- src/ccutil/serialis.cpp | 3 +
- src/ccutil/serialis.h | 2 +
- src/lstm/input.cpp | 3 +
- 13 files changed, 488 insertions(+), 4 deletions(-)
- create mode 100644 src/api/tesscapi.cpp
- create mode 100644 src/api/tesseract.h
-
-diff --git a/src/api/Makefile.am b/src/api/Makefile.am
-index d9b76eb6..cd2dc30f 100644
---- a/src/api/Makefile.am
-+++ b/src/api/Makefile.am
-@@ -39,6 +39,7 @@ libtesseract_api_la_SOURCES += lstmboxrenderer.cpp
- libtesseract_api_la_SOURCES += pdfrenderer.cpp
- libtesseract_api_la_SOURCES += wordstrboxrenderer.cpp
- libtesseract_api_la_SOURCES += renderer.cpp
-+libtesseract_api_la_SOURCES += tesscapi.cpp
-
- lib_LTLIBRARIES += libtesseract.la
- libtesseract_la_LDFLAGS = $(LEPTONICA_LIBS) $(OPENCL_LDFLAGS) $(libarchive_LIBS)
-diff --git a/src/api/baseapi.cpp b/src/api/baseapi.cpp
-index 9245d07c..ea964ee6 100644
---- a/src/api/baseapi.cpp
-+++ b/src/api/baseapi.cpp
-@@ -215,6 +215,14 @@ TessBaseAPI::TessBaseAPI()
- // Use the current locale if building debug code.
- std::locale::global(std::locale(""));
- #endif
-+ const char *locale;
-+ locale = std::setlocale(LC_ALL, nullptr);
-+/* willus mod Remove assertions--taken care of in tesscapi.cpp */
-+// ASSERT_HOST(!strcmp(locale, "C"));
-+ locale = std::setlocale(LC_CTYPE, nullptr);
-+// ASSERT_HOST(!strcmp(locale, "C"));
-+ locale = std::setlocale(LC_NUMERIC, nullptr);
-+// ASSERT_HOST(!strcmp(locale, "C"));
- }
-
- TessBaseAPI::~TessBaseAPI() {
-@@ -1333,6 +1341,85 @@ static void AddBoxToTSV(const PageIterator* it, PageIteratorLevel level,
- text->add_str_int("\t", bottom - top);
- }
-
-+/* willus mod */
-+int TessBaseAPI::GetOCRWords(int **x00,int **y00,int **x11,int **y11,int **ybaseline0,
-+ char **utf8words)
-+
-+ {
-+ int iword,nwords,totlen,it8;
-+ int *x0,*y0,*x1,*y1,*ybaseline;
-+ char *tutf8;
-+
-+ ResultIterator *res_it = GetIterator();
-+ /* Count words */
-+ iword=0;
-+ totlen=0;
-+ while (!res_it->Empty(RIL_BLOCK))
-+ {
-+ if (res_it->Empty(RIL_WORD))
-+ {
-+ res_it->Next(RIL_WORD);
-+ continue;
-+ }
-+ iword++;
-+ STRING textstr=std::unique_ptr(res_it->GetUTF8Text(RIL_WORD)).get();
-+ totlen+=strlen(textstr.string())+1;
-+ res_it->Next(RIL_WORD);
-+ }
-+ nwords=iword;
-+/*
-+printf("\nnwords=%d, totlen=%d\n",nwords,totlen);
-+*/
-+ x0=(*x00)=(int *)malloc(sizeof(int)*5*nwords);
-+ y0=(*y00)=&x0[nwords];
-+ x1=(*x11)=&y0[nwords];
-+ y1=(*y11)=&x1[nwords];
-+ ybaseline=(*ybaseline0)=&y1[nwords];
-+ tutf8=(*utf8words)=(char *)malloc(totlen);
-+ iword=0;
-+ it8=0;
-+ res_it->Begin();
-+ while (!res_it->Empty(RIL_BLOCK))
-+ {
-+ if (res_it->Empty(RIL_WORD))
-+ {
-+ res_it->Next(RIL_WORD);
-+ continue;
-+ }
-+ STRING textstr=std::unique_ptr(res_it->GetUTF8Text(RIL_WORD)).get();
-+ strcpy(&tutf8[it8],textstr.string());
-+ it8 += strlen(&tutf8[it8])+1;
-+ /*
-+ STRING textstr("");
-+ textstr += std::unique_ptr(res_it->GetUTF8Text(RIL_WORD)).get();
-+ */
-+/*
-+printf("Word %d: '%s'\n",iword,textstr.string());
-+*/
-+ int left, top, right, bottom;
-+ int u1,v1,u2,v2;
-+ res_it->BoundingBox(RIL_WORD, &left, &top, &right, &bottom);
-+ res_it->Baseline(RIL_WORD, &u1, &v1, &u2, &v2);
-+ x0[iword]=left;
-+ x1[iword]=right;
-+ y0[iword]=top;
-+ y1[iword]=bottom;
-+ ybaseline[iword]=(v1+v2)/2;
-+ iword++;
-+/*
-+printf("BB: (%d,%d)-(%d,%d) BL: (%d,%d)-(%d,%d)\n",left,bottom,right,top,x1,y1,x2,y2);
-+*/
-+ res_it->Next(RIL_WORD);
-+ }
-+/*
-+printf("iword=%d\n",iword);
-+*/
-+ return(iword);
-+ }
-+
-+/* willus mod */
-+int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words);
-+
- /**
- * Make a TSV-formatted string from the internal data structures.
- * page_number is 0-based but will appear in the output as 1-based.
-diff --git a/src/api/baseapi.h b/src/api/baseapi.h
-index 3724dd92..23be5920 100644
---- a/src/api/baseapi.h
-+++ b/src/api/baseapi.h
-@@ -575,6 +575,9 @@ class TESS_API TessBaseAPI {
- */
- char* GetHOCRText(ETEXT_DESC* monitor, int page_number);
-
-+/* willus mod */
-+int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words);
-+
- /**
- * Make a HTML-formatted string with hOCR markup from the internal
- * data structures.
-diff --git a/src/api/tesscapi.cpp b/src/api/tesscapi.cpp
-new file mode 100644
-index 00000000..1752fafe
---- /dev/null
-+++ b/src/api/tesscapi.cpp
-@@ -0,0 +1,311 @@
-+/*
-+** tesscapi.cpp willus.com attempt at C wrapper for tesseract.
-+** (Butchered from tesseractmain.cpp)
-+** Last udpated 9-1-12
-+**
-+** Copyright (C) 2012 http://willus.com
-+**
-+** This program is free software: you can redistribute it and/or modify
-+** it under the terms of the GNU Affero General Public License as
-+** published by the Free Software Foundation, either version 3 of the
-+** License, or (at your option) any later version.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+** GNU Affero General Public License for more details.
-+**
-+** You should have received a copy of the GNU Affero General Public License
-+** along with this program. If not, see
-+#endif
-+
-+// Include automatically generated configuration file if running autoconf
-+#ifdef HAVE_CONFIG_H
-+#include "config_auto.h"
-+#endif
-+#include
-+#ifdef USING_GETTEXT
-+#include
-+#define _(x) gettext(x)
-+#else
-+#define _(x) (x)
-+#endif
-+
-+#include "allheaders.h"
-+#include "baseapi.h"
-+#include "strngs.h"
-+#include "params.h"
-+#include "blobs.h"
-+#include "simddetect.h"
-+#include "tesseractclass.h"
-+/*
-+#include "notdll.h"
-+*/
-+
-+/* C Wrappers */
-+#include "tesseract.h"
-+
-+// static tesseract::TessBaseAPI api[4];
-+
-+/*
-+** ocr_type=0: OEM_DEFAULT
-+** ocr_type=1: OEM_TESSERACT_ONLY
-+** ocr_type=2: OEM_LSTM_ONLY
-+** ocr_type=3: OEM_TESSERACT_LSTM_COMBINED
-+*/
-+void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out,
-+ char *initstr,int maxlen,int *status)
-+
-+ {
-+ char original_locale[256];
-+ tesseract::TessBaseAPI *api = new tesseract::TessBaseAPI;
-+/*
-+printf("@tess_capi_init\n");
-+printf(" datapath='%s'\n",datapath);
-+printf(" language='%s'\n",language);
-+printf(" ocr_type=%d\n",ocr_type);
-+*/
-+#ifdef USE_NLS
-+ setlocale (LC_ALL, "");
-+ bindtextdomain (PACKAGE, LOCALEDIR);
-+ textdomain (PACKAGE);
-+#endif
-+ /* willus mod, 11-24-16 */
-+ /* Tesseract needs "C" locale to correctly parse all data .traineddata files. */
-+/*
-+printf("locale='%s'\n",setlocale(LC_ALL,NULL));
-+printf("ctype='%s'\n",setlocale(LC_CTYPE,NULL));
-+printf("numeric='%s'\n",setlocale(LC_NUMERIC,NULL));
-+*/
-+ strncpy(original_locale,setlocale(LC_ALL,NULL),255);
-+ original_locale[255]='\0';
-+/*
-+printf("original_locale='%s'\n",original_locale);
-+*/
-+ setlocale(LC_ALL,"C");
-+/*
-+printf("new locale='%s'\n",setlocale(LC_ALL,NULL));
-+printf("new ctype='%s'\n",setlocale(LC_CTYPE,NULL));
-+printf("new numeric='%s'\n",setlocale(LC_NUMERIC,NULL));
-+*/
-+ // fprintf(stderr, "tesseract %s\n", tesseract::TessBaseAPI::Version());
-+ // Make the order of args a bit more forgiving than it used to be.
-+ const char* lang = "eng";
-+ tesseract::PageSegMode pagesegmode = tesseract::PSM_SINGLE_BLOCK;
-+ if (language!=NULL && language[0]!='\0')
-+ lang = language;
-+ /*
-+ if (output == NULL)
-+ {
-+ fprintf(stderr, _("Usage:%s imagename outputbase [-l lang] "
-+ "[-psm pagesegmode] [configfile...]\n"), argv[0]);
-+ fprintf(stderr,
-+ _("pagesegmode values are:\n"
-+ "0 = Orientation and script detection (OSD) only.\n"
-+ "1 = Automatic page segmentation with OSD.\n"
-+ "2 = Automatic page segmentation, but no OSD, or OCR\n"
-+ "3 = Fully automatic page segmentation, but no OSD. (Default)\n"
-+ "4 = Assume a single column of text of variable sizes.\n"
-+ "5 = Assume a single uniform block of vertically aligned text.\n"
-+ "6 = Assume a single uniform block of text.\n"
-+ "7 = Treat the image as a single text line.\n"
-+ "8 = Treat the image as a single word.\n"
-+ "9 = Treat the image as a single word in a circle.\n"
-+ "10 = Treat the image as a single character.\n"));
-+ fprintf(stderr, _("-l lang and/or -psm pagesegmode must occur before any"
-+ "configfile.\n"));
-+ exit(1);
-+ }
-+ */
-+/*
-+printf("SSE = %s\n",SIMDDetect::IsSSEAvailable() ? "AVAILABLE" : "NOT AVAILABLE");
-+printf("AVX = %s\n",SIMDDetect::IsAVXAvailable() ? "AVAILABLE" : "NOT AVAILABLE");
-+*/
-+/*
-+v4.00 loads either TESSERACT enginer, LSTM engine, or both. No CUBE.
-+*/
-+ ocr_type=0; /* Ignore specified and use default */
-+ api->SetOutputName(NULL);
-+ (*status)=api->Init(datapath,lang,
-+ ocr_type==0 ? tesseract::OEM_DEFAULT :
-+ (ocr_type==1 ? tesseract::OEM_TESSERACT_ONLY :
-+ (ocr_type==2 ? tesseract::OEM_LSTM_ONLY :
-+ (tesseract::OEM_TESSERACT_LSTM_COMBINED))));
-+ if ((*status)!=0)
-+ {
-+ /* willus mod, 11-24-16 */
-+ setlocale(LC_ALL,original_locale);
-+ api->End();
-+ delete api;
-+ return(NULL);
-+ }
-+ /*
-+ api.Init("tesscapi",lang,tesseract::OEM_DEFAULT,
-+ &(argv[arg]), argc - arg, NULL, NULL, false);
-+ */
-+ // We have 2 possible sources of pagesegmode: a config file and
-+ // the command line. For backwards compatability reasons, the
-+ // default in tesseract is tesseract::PSM_SINGLE_BLOCK, but the
-+ // default for this program is tesseract::PSM_AUTO. We will let
-+ // the config file take priority, so the command-line default
-+ // can take priority over the tesseract default, so we use the
-+ // value from the command line only if the retrieved mode
-+ // is still tesseract::PSM_SINGLE_BLOCK, indicating no change
-+ // in any config file. Therefore the only way to force
-+ // tesseract::PSM_SINGLE_BLOCK is from the command line.
-+ // It would be simpler if we could set the value before Init,
-+ // but that doesn't work.
-+ if (api->GetPageSegMode() == tesseract::PSM_SINGLE_BLOCK)
-+ api->SetPageSegMode(pagesegmode);
-+
-+ /*
-+ ** Initialization message
-+ */
-+ {
-+ char istr[1024];
-+ int sse,avx;
-+
-+// printf("tessedit_ocr_engine_mode = %d\n",tessedit_ocr_engine_mode);
-+ sprintf(istr,"%s",api->Version());
-+ sse=tesseract::SIMDDetect::IsSSEAvailable();
-+ avx=tesseract::SIMDDetect::IsAVXAvailable();
-+ if (sse || avx)
-+ sprintf(&istr[strlen(istr)]," [%s]",sse&&avx?"SSE+AVX":(sse?"SSE":"AVX"));
-+ sprintf(&istr[strlen(istr)],"\n Tesseract data folder = '%s'",datapath==NULL?getenv("TESSDATA_PREFIX"):datapath);
-+ strcat(istr,"\n Tesseract languages: ");
-+ GenericVector languages;
-+ api->GetLoadedLanguagesAsVector(&languages);
-+/*
-+printf("OEM=%d\n",api->oem());
-+printf("Langs='%s'\n",api->GetInitLanguagesAsString());
-+printf("AnyTessLang()=%d\n",(int)api->tesseract()->AnyTessLang());
-+printf("AnyLSTMLang()=%d\n",(int)api->tesseract()->AnyLSTMLang());
-+printf("num_sub_langs()=%d\n",api->tesseract()->num_sub_langs());
-+printf("languages.size()=%d\n",(int)languages.size());
-+*/
-+
-+ for (int i=0;i<=api->tesseract()->num_sub_langs();i++)
-+ {
-+ tesseract::Tesseract *lang1;
-+ int eng;
-+ lang1 = i==0 ? api->tesseract() : api->tesseract()->get_sub_lang(i-1);
-+ eng=(int)lang1->tessedit_ocr_engine_mode;
-+ sprintf(&istr[strlen(istr)],"%s%s [%s]",i==0?"":", ",lang1->lang.string(),
-+ eng==2?"LSTM+Tess":(eng==1?"LSTM":"Tess"));
-+ }
-+/*
-+printf("%d. '%s'\n",i+1,languages[i].string());
-+printf(" sublang[%d].oem_engine = %d\n",i+1,(int)api->tesseract()->get_sub_lang(i)->tessedit_ocr_engine_mode);
-+*/
-+
-+ /*
-+ if (ocr_type==0 || ocr_type==3)
-+ sprintf(&istr[strlen(istr)],"[LSTM+] (lang=");
-+ else if (ocr_type==2)
-+ sprintf(&istr[strlen(istr)],"[LSTM] (lang=");
-+ strncpy(&istr[strlen(istr)],language,253-strlen(istr));
-+ istr[253]='\0';
-+ strcat(istr,")");
-+ */
-+ if (out!=NULL)
-+ fprintf(out,"%s\n",istr);
-+ if (initstr!=NULL)
-+ {
-+ strncpy(initstr,istr,maxlen-1);
-+ initstr[maxlen-1]='\0';
-+ }
-+ }
-+
-+
-+ /* Turn off LSTM debugging output */
-+ api->SetVariable("lstm_debug_level","0");
-+#if (WILLUSDEBUG & 1)
-+ api->SetVariable("lstm_debug_level","9");
-+ api->SetVariable("paragraph_debug_level","9");
-+ api->SetVariable("tessdata_manager_debug_level","9");
-+ api->SetVariable("tosp_debug_level","9");
-+ api->SetVariable("wordrec_debug_level","9");
-+ api->SetVariable("segsearch_debug_level","9");
-+#endif
-+ /* willus mod, 11-24-16 */
-+ setlocale(LC_ALL,original_locale);
-+ return((void *)api);
-+ }
-+
-+
-+int tess_capi_get_ocr(void *vapi,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out)
-+
-+ {
-+ tesseract::TessBaseAPI *api;
-+ static int old_segmode=-1;
-+
-+ api=(tesseract::TessBaseAPI *)vapi;
-+ if (old_segmode != segmode)
-+ {
-+ old_segmode=segmode;
-+ api->SetPageSegMode((tesseract::PageSegMode)segmode);
-+ }
-+ if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL))
-+ {
-+ /* pixDestroy(&pix); */
-+ if (out!=NULL)
-+ fprintf(out,"tesscapi: Error during bitmap processing.\n");
-+ api->Clear();
-+ return(-1);
-+ }
-+ strncpy(outstr,api->GetUTF8Text(),maxlen-1);
-+ outstr[maxlen-1]='\0';
-+ api->Clear();
-+ return(0);
-+ }
-+
-+
-+int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode,
-+ int **left,int **top,int **right,int **bottom,
-+ int **ybase,char **text,int *nw,
-+ FILE *out)
-+
-+ {
-+ tesseract::TessBaseAPI *api;
-+ static int old_segmode=-1;
-+
-+ api=(tesseract::TessBaseAPI *)vapi;
-+ if (old_segmode != segmode)
-+ {
-+ old_segmode=segmode;
-+ api->SetPageSegMode((tesseract::PageSegMode)segmode);
-+ }
-+ if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL))
-+ {
-+ if (out!=NULL)
-+ fprintf(out,"tesscapi: Error during bitmap processing.\n");
-+ api->Clear();
-+ (*nw)=0;
-+ return(-1);
-+ }
-+ (*nw)=api->GetOCRWords(left,top,right,bottom,ybase,text);
-+ api->Clear();
-+ return(0);
-+ }
-+
-+
-+void tess_capi_end(void *vapi)
-+
-+ {
-+ tesseract::TessBaseAPI *api;
-+
-+ if (vapi==NULL)
-+ return;
-+ api=(tesseract::TessBaseAPI *)vapi;
-+ api->End();
-+ delete api;
-+ }
-diff --git a/src/api/tesseract.h b/src/api/tesseract.h
-new file mode 100644
-index 00000000..575948cc
---- /dev/null
-+++ b/src/api/tesseract.h
-@@ -0,0 +1,29 @@
-+/*
-+** Willus.com's Tesseract C Wrappers
-+**
-+** 6-8-12
-+**
-+*/
-+
-+#ifndef _TESSERACT_H_
-+#define _TESSERACT_H_
-+
-+//#include
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out,
-+ char *initstr,int maxlen,int *status);
-+int tess_capi_get_ocr(void *api,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out);
-+int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode,
-+ int **left,int **top,int **right,int **bottom,
-+ int **ybase,char **text,int *nw,
-+ FILE *out);
-+void tess_capi_end(void *api);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-diff --git a/src/ccmain/tessedit.cpp b/src/ccmain/tessedit.cpp
-index 17f0951b..7af94ee2 100644
---- a/src/ccmain/tessedit.cpp
-+++ b/src/ccmain/tessedit.cpp
-@@ -101,6 +101,10 @@ bool Tesseract::init_tesseract_lang_data(
- " to your \"tessdata\" directory.\n");
- return false;
- }
-+ /* willus mod */
-+ TFile fp;
-+ strncpy(fp.tfile_filename,tessdata_path.string(),511);
-+ fp.tfile_filename[511]='\0';
- #ifndef DISABLED_LEGACY_ENGINE
- if (oem == OEM_DEFAULT) {
- // Set the engine mode from availability, which can then be overridden by
-@@ -116,7 +120,6 @@ bool Tesseract::init_tesseract_lang_data(
- #endif // ndef DISABLED_LEGACY_ENGINE
-
- // If a language specific config file (lang.config) exists, load it in.
-- TFile fp;
- if (mgr->GetComponent(TESSDATA_LANG_CONFIG, &fp)) {
- ParamUtils::ReadParamsFromFp(SET_PARAM_CONSTRAINT_NONE, &fp,
- this->params());
-diff --git a/src/ccutil/ccutil.h b/src/ccutil/ccutil.h
-index 71e89c60..bdeccc14 100644
---- a/src/ccutil/ccutil.h
-+++ b/src/ccutil/ccutil.h
-@@ -80,6 +80,13 @@ class CCUtil {
- // Member parameters.
- // These have to be declared and initialized after params_ member, since
- // params_ should be initialized before parameters are added to it.
-+/* willus mod */
-+/*
-+ #ifdef _WIN32
-+ STRING_VAR_H(tessedit_module_name, WINDLLNAME,
-+ "Module colocated with tessdata dir");
-+ #endif
-+*/
- INT_VAR_H(ambigs_debug_level, 0, "Debug level for unichar ambiguities");
- BOOL_VAR_H(use_definite_ambigs_for_classifier, false,
- "Use definite ambiguities when running character classifier");
-diff --git a/src/ccutil/genericvector.h b/src/ccutil/genericvector.h
-index 3556d153..3a5e8662 100644
---- a/src/ccutil/genericvector.h
-+++ b/src/ccutil/genericvector.h
-@@ -382,7 +382,26 @@ inline bool LoadDataFromFile(const char* filename, GenericVector* data) {
- // reserve an extra byte in case caller wants to append a '\0' character
- data->reserve(size + 1);
- data->resize_no_init(size);
-- result = static_cast(fread(&(*data)[0], 1, size, fp)) == size;
-+ /* willus mod Dec 2018--weird issue with Win XP and MinGW gcc 7.3.0 */
-+ /* Can't read entire file at once -- need to break up into smaller blocksize reads */
-+ {
-+ int frs,n;
-+ int blocksize;
-+ blocksize=1024*1024;
-+ for (n=0;1;)
-+ {
-+ int bs;
-+ bs= size-n > blocksize ? blocksize : size-n;
-+ frs=(int)fread(&(*data)[n],1,bs,fp);
-+ n+=frs;
-+ if (frs=size)
-+ break;
-+ }
-+ result = static_cast((long)n==size);
-+ }
-+ /*
-+ result = static_cast(fread(&(*data)[0], 1, size, fp)) == size;
-+ */
- }
- fclose(fp);
- }
-diff --git a/src/ccutil/mainblk.cpp b/src/ccutil/mainblk.cpp
-index 52b04b04..80b26044 100644
---- a/src/ccutil/mainblk.cpp
-+++ b/src/ccutil/mainblk.cpp
-@@ -55,8 +55,22 @@ void CCUtil::main_setup(const char *argv0, const char *basename) {
- #if defined(_WIN32)
- } else if (datadir == nullptr || _access(datadir.string(), 0) != 0) {
- /* Look for tessdata in directory of executable. */
-+ /*
-+ char drive[_MAX_DRIVE];
-+ char dir[_MAX_DIR];
-+ */
- char path[_MAX_PATH];
-- DWORD length = GetModuleFileName(nullptr, path, sizeof(path));
-+ int i;
-+ /* DWORD length = */ GetModuleFileName(nullptr, path, sizeof(path));
-+ /* willus mod--avoid _splitpath_s -- not in XP */
-+ for (i=strlen(path)-1;i>=0 && path[i]!='/' && path[i]!='\\';i--);
-+ if (i>=0)
-+ {
-+ path[i]='\0';
-+ datadir=path;
-+ datadir += "/tessdata";
-+ }
-+ /*
- if (length > 0 && length < sizeof(path)) {
- char* separator = std::strrchr(path, '\\');
- if (separator != nullptr) {
-@@ -65,6 +79,7 @@ void CCUtil::main_setup(const char *argv0, const char *basename) {
- datadir += "/tessdata";
- }
- }
-+ */
- #endif /* _WIN32 */
- #if defined(TESSDATA_PREFIX)
- } else {
-diff --git a/src/ccutil/params.cpp b/src/ccutil/params.cpp
-index 00bf2563..486c5ce0 100644
---- a/src/ccutil/params.cpp
-+++ b/src/ccutil/params.cpp
-@@ -82,7 +82,8 @@ bool ParamUtils::ReadParamsFromFp(SetParamConstraint constraint, TFile *fp,
-
- if (!foundit) {
- anyerr = true; // had an error
-- tprintf("Warning: Parameter not found: %s\n", line);
-+ /* willus mod */
-+ tprintf("Tesseract warning: Parameter %s not found in file %s.\n",line,fp->tfile_filename);
- }
- }
- }
-diff --git a/src/ccutil/serialis.cpp b/src/ccutil/serialis.cpp
-index 7def011f..6107a494 100644
---- a/src/ccutil/serialis.cpp
-+++ b/src/ccutil/serialis.cpp
-@@ -201,6 +201,9 @@ bool TFile::Open(const STRING& filename, FileReader reader) {
- offset_ = 0;
- is_writing_ = false;
- swap_ = false;
-+ /* willus mod */
-+ strncpy(tfile_filename,filename.string(),511);
-+ tfile_filename[511]='\0';
- if (reader == nullptr)
- return LoadDataFromFile(filename, data_);
- else
-diff --git a/src/ccutil/serialis.h b/src/ccutil/serialis.h
-index 095b9227..4cc8251e 100644
---- a/src/ccutil/serialis.h
-+++ b/src/ccutil/serialis.h
-@@ -77,6 +77,8 @@ class TFile {
- public:
- TFile();
- ~TFile();
-+ /* willus mod */
-+ char tfile_filename[512];
-
- // All the Open methods load the whole file into memory for reading.
- // Opens a file with a supplied reader, or nullptr to use the default.
-diff --git a/src/lstm/input.cpp b/src/lstm/input.cpp
-index 73b584b3..0b0b54c3 100644
---- a/src/lstm/input.cpp
-+++ b/src/lstm/input.cpp
-@@ -93,8 +93,11 @@ Pix* Input::PrepareLSTMInputs(const ImageData& image_data,
- return nullptr;
- }
- if (width < min_width || height < min_width) {
-+ /* willus mod -- no warning */
-+ /*
- tprintf("Image too small to scale!! (%dx%d vs min width of %d)\n", width,
- height, min_width);
-+ */
- pixDestroy(&pix);
- return nullptr;
- }
---
-2.22.0
-
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 86ea1d6d5045f..f0131712b2378 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -40,13 +40,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "keepassxc";
- version = "2.6.0";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = version;
- sha256 = "0yi6kxnsrqirjn6hxhwym2krzf86qxf3kc6bfpkmiaggnd2kqpkp";
+ sha256 = "0wgn0glmcxaa670bpxh7n7abjlxcx4h1rl1169cmah0ddxnxnxpq";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 323fc501c8422..257cacf69a0cb 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -2,21 +2,14 @@
with python3.pkgs; buildPythonApplication rec {
pname = "khal";
- version = "0.10.1";
+ version = "0.10.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l";
+ sha256 = "11qhrga44knlnp88py9p547d4nr5kn041d2nszwa3dqw7mf22ks9";
};
- # Include a khal.desktop file via upstream commit.
- # This patch should be removed when updating to the next version, probably.
patches = [
- (fetchpatch {
- name = "add-khal-dot-desktop.patch";
- url = "https://github.com/pimutils/khal/commit/1f93d238fec7c934dd2f8e48f54925d22130e3aa.patch";
- sha256 = "06skn3van7zd93348fc6axllx71ckkc7h2zljqlvwa339vca608c";
- })
./skip-broken-test.patch
];
diff --git a/pkgs/applications/misc/khal/skip-broken-test.patch b/pkgs/applications/misc/khal/skip-broken-test.patch
index c3c982547aef0..fc37f6acc86e2 100644
--- a/pkgs/applications/misc/khal/skip-broken-test.patch
+++ b/pkgs/applications/misc/khal/skip-broken-test.patch
@@ -1,3 +1,15 @@
+diff --git a/tests/cli_test.py b/tests/cli_test.py
+index 5e354a5..d8fbcd5 100644
+--- a/tests/cli_test.py
++++ b/tests/cli_test.py
+@@ -493,6 +493,7 @@ def test_import_invalid_choice_and_prefix(runner):
+ assert result.output == '09.04.-09.04. An Event\n'
+
+
++@pytest.mark.skip(reason="Mocking breaks in this testcase")
+ def test_import_from_stdin(runner, monkeypatch):
+ ics_data = 'This is some really fake icalendar data'
+
diff --git a/tests/ui/test_editor.py b/tests/ui/test_editor.py
index 27b7fa5..5978d72 100644
--- a/tests/ui/test_editor.py
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 98cd8a5a4fb01..a3e4c1309ffcd 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,12 +1,12 @@
{ stdenv, glibcLocales, python3 }:
python3.pkgs.buildPythonApplication rec {
- version = "0.16.1";
+ version = "0.17.0";
pname = "khard";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "0fg4qh5gzki5wg958wlpc8a2icnk74gzg33lqxjm755cfnjng7qd";
+ sha256 = "062nv4xkfsjc11k9m52dh6xjn9z68a4a6x1s8z05wwv4jbp1lkhn";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index b1cdd5e86ea5a..65d7df72489f0 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -20,14 +20,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
- version = "0.18.2";
+ version = "0.18.3";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "0x6h8g017mbpjkpkb1y8asyfdc48bgjzmj5gachsp5cf5jcqwir2";
+ sha256 = "0y05bw6d1m79dyhm7b6lk6wy82pmy2s9jhf01kf8gr2p0rjjp9yl";
};
buildInputs = [
diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix
index 784656b8b96fa..5f6c679f3ba1b 100644
--- a/pkgs/applications/misc/klayout/default.nix
+++ b/pkgs/applications/misc/klayout/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "klayout";
- version = "0.26.5";
+ version = "0.26.6";
src = fetchFromGitHub {
owner = "KLayout";
repo = "klayout";
rev = "v${version}";
- sha256 = "1zv8yazhdyxm33vdn0m5cciw7zzg45nwdg4rdcsydnrwg7d667r6";
+ sha256 = "0z17pdjdc2r2m5yi5bfz504dzzs978z8p6bhlf08v2npvigp8vz1";
};
postPatch = ''
diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index 816b352460ba2..578c56a748a7f 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -23,6 +23,8 @@ in mkDerivation rec {
propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ];
+ NIX_LDFLAGS = "-ltag";
+
meta = with lib; {
description = "A powerful batch renamer for KDE";
homepage = "https://kde.org/applications/utilities/krename/";
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
index 99e24eea15892..b3a68cffeff18 100644
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@@ -8,7 +8,6 @@
, gobject-introspection
, gst_all_1
, gtk3
-, libgnome-keyring
, libnotify
, pango
, webkitgtk
@@ -22,6 +21,7 @@
, pygobject3
, pyyaml
, requests
+, keyring
# commands that lutris needs
, xrandr
@@ -71,13 +71,13 @@ let
in buildPythonApplication rec {
pname = "lutris-original";
- version = "0.5.6";
+ version = "0.5.7.1";
src = fetchFromGitHub {
owner = "lutris";
repo = "lutris";
rev = "v${version}";
- sha256 = "1f78qhyy8xqdg0rhxcwkap1bmg5mfxhb8qw1vbpxr6g62ajpwksa";
+ sha256 = "12ispwkbbm5aq263n3bdjmjfkpwplizacnqs2c0wnag4zj4kpm29";
};
nativeBuildInputs = [ wrapGAppsHook ];
@@ -88,14 +88,13 @@ in buildPythonApplication rec {
gnome-desktop
gobject-introspection
gtk3
- libgnome-keyring
libnotify
pango
webkitgtk
] ++ gstDeps;
propagatedBuildInputs = [
- evdev distro pyyaml pygobject3 requests pillow dbus-python
+ evdev distro pyyaml pygobject3 requests pillow dbus-python keyring
];
# avoid double wrapping
diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix
similarity index 97%
rename from pkgs/applications/misc/lutris/chrootenv.nix
rename to pkgs/applications/misc/lutris/fhsenv.nix
index 6fad8b23d33ee..2b656775ab5ca 100644
--- a/pkgs/applications/misc/lutris/chrootenv.nix
+++ b/pkgs/applications/misc/lutris/fhsenv.nix
@@ -97,7 +97,7 @@ in buildFHSUserEnv {
libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib
alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd
- vulkan-loader xdg_utils sqlite gnutls p11-kit libbsd
+ vulkan-loader xdg_utils sqlite gnutls p11-kit libbsd harfbuzz
# PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"
diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index 6fcd86596fb3a..993596aabe1d4 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, which }:
stdenv.mkDerivation rec {
version = "2.4.2";
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
doCheck = true;
checkTarget = "test";
+ checkInputs = [ which ];
installPhase = ''
mkdir -p $out/{bin,share/{${pname}-${version},man/man1}}
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index d38113981aac5..96833bb25d353 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
, desktop-file-utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
- version = "20.03";
+ version = "20.08";
pname = "mediainfo-gui";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "1f1shnycf0f1fwka9k9s250l228xjkg0k4k73h8bpld8msighgnw";
+ sha256 = "1baf2dj5s3g1x4ssqli1b2r1203syk42m09zhp36qcinmfixv11l";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 1ed1ef4afb535..09f20a9ba5ddc 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
- version = "20.03";
+ version = "20.08";
pname = "mediainfo";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "1f1shnycf0f1fwka9k9s250l228xjkg0k4k73h8bpld8msighgnw";
+ sha256 = "1baf2dj5s3g1x4ssqli1b2r1203syk42m09zhp36qcinmfixv11l";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix
index 52db4d0c6cc66..14b9ebfe4c7dd 100644
--- a/pkgs/applications/misc/minder/default.nix
+++ b/pkgs/applications/misc/minder/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "minder";
- version = "1.9.1";
+ version = "1.9.2";
src = fetchFromGitHub {
owner = "phase1geo";
repo = pname;
rev = version;
- sha256 = "1823nl9hgsa9l04ra1drj3c7r8s5ybx6c06d9ijpwqz191sz2jg2";
+ sha256 = "0lhwwx515f0ycpinkhgbjnik7dj2c7fckikbgzwkzzs25xqp9ayj";
};
nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ];
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index f58fb13e61f00..7c7906fc841f0 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -3,6 +3,8 @@
, harfbuzz #substituting glyphs with opentype fonts
, fribidi, m17n_lib #bidi and encoding
, openssl, libssh2 #build-in ssh
+, fcitx, ibus, uim #IME
+, wrapGAppsHook #color picker in mlconfig
}:
stdenv.mkDerivation rec {
@@ -14,10 +16,11 @@ stdenv.mkDerivation rec {
sha256 = "17h6j4nmbyvsx2shm8mqm7smzq9i7mbqxjw19c2m0rhf5yzqhr3k";
};
- nativeBuildInputs = [ pkgconfig autoconf ];
+ nativeBuildInputs = [ pkgconfig autoconf wrapGAppsHook ];
buildInputs = [
libX11 gdk-pixbuf.dev cairo libXft gtk3 vte
harfbuzz fribidi m17n_lib openssl libssh2
+ fcitx ibus uim
];
#bad configure.ac and Makefile.in everywhere
diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix
index efd9cc4c021d7..c815a74e01977 100644
--- a/pkgs/applications/misc/moolticute/default.nix
+++ b/pkgs/applications/misc/moolticute/default.nix
@@ -9,13 +9,13 @@
mkDerivation rec {
pname = "moolticute";
- version = "0.43.19";
+ version = "0.44.0";
src = fetchFromGitHub {
owner = "mooltipass";
repo = pname;
rev = "v${version}";
- sha256 = "1rpkiyhy7z5zq0rmn0kj2kva57bnhkhvaplrlhfczv99h1kwsixg";
+ sha256 = "1xlbhx6f1ysx8gka8g67271whzhkzsnkavpq3x58hdxr8v88khby";
};
outputs = [ "out" "udev" ];
diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix
index 81c236589654d..be81760892409 100644
--- a/pkgs/applications/misc/mop/default.nix
+++ b/pkgs/applications/misc/mop/default.nix
@@ -26,6 +26,5 @@ buildGoPackage rec {
description = "Simple stock tracker implemented in go";
homepage = "https://github.com/mop-tracker/mop";
license = licenses.mit;
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 07ca64518e521..63d7077d32e06 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -45,11 +45,11 @@ let
inherit (python2.pkgs) paramiko pycairo pyodbc;
in stdenv.mkDerivation rec {
pname = "mysql-workbench";
- version = "8.0.20";
+ version = "8.0.21";
src = fetchurl {
url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
- sha256 = "0c0ig2fqfpli7fwb4v4iwvfh4szzj3grx8j9rbh40kllkc8v5qh6";
+ sha256 = "0rqgr1dcbf6yp60hninbw5dnwykx5ngbyhhx0sbhgv0m0cq5a44h";
};
patches = [
@@ -142,7 +142,7 @@ in stdenv.mkDerivation rec {
"-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config"
"-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config"
"-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}"
- # mysql-workbench 8.0.20 depends on libmysqlconnectorcpp 1.1.8.
+ # mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8.
# Newer versions of connector still provide the legacy library when enabled
# but the headers are in a different location.
"-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc"
diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix
index e403ccea0da30..008d19576da43 100644
--- a/pkgs/applications/misc/navi/default.nix
+++ b/pkgs/applications/misc/navi/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "navi";
- version = "2.7.1";
+ version = "2.9.0";
src = fetchFromGitHub {
owner = "denisidoro";
repo = "navi";
rev = "v${version}";
- sha256 = "12p9l41k7isaapr0xbsm7brkjrv7i8826y029i12psz92nsynk29";
+ sha256 = "16rwhpyk0zqks9z9bv2a1a8vww2m6867kg33bjbr29hawjg68jql";
};
- cargoSha256 = "11dc3gc7fyikbbgacmljhysr2sl7lmq6w3bsfcf2cqny39r25yp0";
+ cargoSha256 = "19w9gm389lj1zwhyjifhc2fzkvrvqvyc80lwxz070cnj11ir2l9m";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index 293f1d16b1cb3..9ec5018c4e3f4 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "nnn";
- version = "3.3";
+ version = "3.4";
src = fetchFromGitHub {
owner = "jarun";
repo = pname;
rev = "v${version}";
- sha256 = "1dxa5blpdf0s03znhnr23zzpsz8yzqpnwknycz42h1w9g9s9jz1v";
+ sha256 = "0lyrpyhzzs2bdgx3ifq1c5dq3s2v30xdiaq0j8zjc64s6bghfxnd";
};
configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf);
diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix
index bb85c84f7ee25..dc03b9b4f93c7 100644
--- a/pkgs/applications/misc/obinskit/default.nix
+++ b/pkgs/applications/misc/obinskit/default.nix
@@ -1,4 +1,5 @@
{ stdenv
+, lib
, fetchurl
, libxkbcommon
, systemd
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/opt/obinskit/resources/app.asar \
- --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon systemd.lib xorg.libXt ]}"
+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index 396a784511286..98eb76d9be180 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -2,7 +2,7 @@
let
pname = "obsidian";
- version = "0.7.3";
+ version = "0.8.2";
in
appimageTools.wrapType2 rec {
@@ -11,7 +11,7 @@ appimageTools.wrapType2 rec {
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/Obsidian-${version}.AppImage";
- sha256 = "1qiag5szagalik72j8s2dmp7075g48jxgcdy0wgd02kfv90ai0y6";
+ sha256 = "04jgsd97ivdm84diiafwqxzc9vvga1gsr7xicmqhdq05ns3xsfyz";
};
profile = ''
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 793ea927a01fc..4434bc6d113b6 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -1,114 +1,171 @@
-{ pkgs, stdenv, lib, fetchFromGitHub, python3
-# To include additional plugins, pass them here as an overlay.
+{ pkgs
+, stdenv
+, lib
+, fetchFromGitHub
+, python3
+ # To include additional plugins, pass them here as an overlay.
, packageOverrides ? self: super: {}
}:
let
mkOverride = attrname: version: sha256:
- self: super: {
- ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: {
+ self: super: {
+ ${attrname} = super.${attrname}.overridePythonAttrs (
+ oldAttrs: {
inherit version;
src = oldAttrs.src.override {
inherit version sha256;
};
- });
- };
+ }
+ );
+ };
py = python3.override {
self = py;
- packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([
- (mkOverride "flask" "0.12.5" "fac2b9d443e49f7e7358a444a3db5950bdd0324674d92ba67f8f1f15f876b14f")
- (mkOverride "flask_assets" "0.12" "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0")
- (mkOverride "flaskbabel" "0.12.2" "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii")
- (mkOverride "flask_login" "0.4.1" "1v2j8zd558xfmgn3rfbw0xz4vizjcnk8kqw52q4f4d9ygfnc25f8")
- (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a")
- (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d")
- (mkOverride "psutil" "5.6.7" "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa")
- (mkOverride "watchdog" "0.9.0" "07cnvvlpif7a6cg4rav39zq8fxa5pfqawchr46433pij0y6napwn")
- (mkOverride "werkzeug" "0.16.1" "010zmhyfbp4d56c1rgalwi188imjlkv9g7rm25jrvify6xnqalxk")
- (mkOverride "websocket_client" "0.56.0" "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z")
- (mkOverride "wrapt" "1.11.2" "1q81762dgsgrd12f8qc39zk8s5wll3m5xc32jdmlf6cls4gh4njn")
+ packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) (
+ [
+ # the following dependencies are non trivial to update since later versions introduce backwards incompatible
+ # changes that might affect plugins, or due to other observed problems
+ (mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b")
+ (mkOverride "rsa" "4.0" "1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487")
+ (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a")
+ (mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409")
+ (mkOverride "unidecode" "0.04.21" "280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051")
- # Octoprint holds back jinja2 to 2.8.1 due to breaking changes.
- # This old version does not have updated test config for pytest 4,
- # and pypi tarball doesn't contain tests dir anyways.
- (self: super: {
- jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec {
- version = "2.8.1";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m";
- };
- doCheck = false;
- });
+ # Built-in dependency
+ (
+ self: super: {
+ octoprint-filecheck = self.buildPythonPackage rec {
+ pname = "OctoPrint-FileCheck";
+ version = "2020.08.07";
- httpretty = super.httpretty.overridePythonAttrs (oldAttrs: rec {
- doCheck = false;
- });
+ src = fetchFromGitHub {
+ owner = "OctoPrint";
+ repo = "OctoPrint-FileCheck";
+ rev = version;
+ sha256 = "05ys05l5x7d2bkg3yqrga6m65v3g5fcnnzbfab7j9w2pzjdapx5b";
+ };
+ doCheck = false;
+ };
+ }
+ )
- celery = super.celery.overridePythonAttrs (oldAttrs: rec {
- doCheck = false;
- });
- })
- (self: super: {
- octoprint = self.buildPythonPackage rec {
- pname = "OctoPrint";
- version = "1.4.0";
+ # Built-in dependency
+ (
+ self: super: {
+ octoprint-firmwarecheck = self.buildPythonPackage rec {
+ pname = "OctoPrint-FirmwareCheck";
+ version = "2020.06.22";
- src = fetchFromGitHub {
- owner = "foosel";
- repo = "OctoPrint";
- rev = version;
- sha256 = "0387228544v28d69dcdg2zr5gp6qavkfr6dydpjgj5awxv3w25d5";
- };
+ src = fetchFromGitHub {
+ owner = "OctoPrint";
+ repo = "OctoPrint-FirmwareCheck";
+ rev = version;
+ sha256 = "19y7hrgg9z8hl7cwqkvg8nc8bk0wwrsfvjd1wawy33wn60psqv1h";
+ };
+ doCheck = false;
+ };
+ }
+ )
- propagatedBuildInputs = with super; [
- awesome-slugify flask flask_assets rsa requests pkginfo watchdog
- semantic-version werkzeug flaskbabel tornado
- psutil pyserial flask_login netaddr markdown
- pylru pyyaml sarge feedparser netifaces click websocket_client
- scandir chainmap future wrapt monotonic emoji jinja2
- frozendict cachelib sentry-sdk filetype markupsafe
- ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ];
+ (
+ self: super: {
+ octoprint = self.buildPythonPackage rec {
+ pname = "OctoPrint";
+ version = "1.4.2";
- checkInputs = with super; [ pytestCheckHook mock ddt ];
+ src = fetchFromGitHub {
+ owner = "OctoPrint";
+ repo = "OctoPrint";
+ rev = version;
+ sha256 = "1bblrjwkccy1ifw7lf55g3k9lq1sqzwd49vj8bfzj2w07a7qda62";
+ };
- postPatch = let
- ignoreVersionConstraints = [
- "sentry-sdk"
- ];
- in ''
- sed -r -i \
- ${lib.concatStringsSep "\n" (map (e:
- ''-e 's@${e}[<>=]+.*@${e}",@g' \''
- ) ignoreVersionConstraints)}
- setup.py
- '';
+ propagatedBuildInputs = with super; [
+ octoprint-firmwarecheck
+ octoprint-filecheck
+ markupsafe
+ tornado
+ markdown
+ rsa
+ regex
+ flask
+ jinja2
+ flask_login
+ flask-babel
+ flask_assets
+ werkzeug
+ itsdangerous
+ cachelib
+ pyyaml
+ pyserial
+ netaddr
+ watchdog
+ sarge
+ netifaces
+ pylru
+ pkginfo
+ requests
+ semantic-version
+ psutil
+ click
+ feedparser
+ future
+ websocket_client
+ wrapt
+ emoji
+ frozendict
+ sentry-sdk
+ filetype
+ unidecode
+ blinker
+ ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ];
- dontUseSetuptoolsCheck = true;
+ checkInputs = with super; [ pytestCheckHook mock ddt ];
- preCheck = ''
- export HOME=$(mktemp -d)
- rm pytest.ini
- '';
+ postPatch = let
+ ignoreVersionConstraints = [
+ "sentry-sdk"
+ ];
+ in
+ ''
+ sed -r -i \
+ ${lib.concatStringsSep "\n" (
+ map (
+ e:
+ ''-e 's@${e}[<>=]+.*@${e}",@g' \''
+ ) ignoreVersionConstraints
+ )}
+ setup.py
+ '';
- disabledTests = [
- "test_check_setup" # Why should it be able to call pip?
- ] ++ lib.optionals stdenv.isDarwin [
- "test_set_external_modification"
- ];
+ dontUseSetuptoolsCheck = true;
- passthru.python = self.python;
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ rm pytest.ini
+ '';
- meta = with stdenv.lib; {
- homepage = "https://octoprint.org/";
- description = "The snappy web interface for your 3D printer";
- license = licenses.agpl3;
- maintainers = with maintainers; [ abbradar gebner WhittlesJr ];
- };
- };
- })
- (import ./plugins.nix {inherit pkgs;})
- packageOverrides
- ]);
+ disabledTests = [
+ "test_check_setup" # Why should it be able to call pip?
+ ] ++ lib.optionals stdenv.isDarwin [
+ "test_set_external_modification"
+ ];
+
+ passthru.python = self.python;
+
+ meta = with stdenv.lib; {
+ homepage = "https://octoprint.org/";
+ description = "The snappy web interface for your 3D printer";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ abbradar gebner WhittlesJr ];
+ };
+ };
+ }
+ )
+ (import ./plugins.nix { inherit pkgs; })
+ packageOverrides
+ ]
+ );
};
-in with py.pkgs; toPythonApplication octoprint
+in
+ with py.pkgs; toPythonApplication octoprint
diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix
index f3dafb78bcaf9..7682b56e4d6df 100644
--- a/pkgs/applications/misc/ola/default.nix
+++ b/pkgs/applications/misc/ola/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-python-libs" ];
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "A framework for controlling entertainment lighting equipment.";
homepage = "https://www.openlighting.org/ola/";
diff --git a/pkgs/applications/misc/olifant/default.nix b/pkgs/applications/misc/olifant/default.nix
index 4358de03b5b15..21091b2583a5d 100644
--- a/pkgs/applications/misc/olifant/default.nix
+++ b/pkgs/applications/misc/olifant/default.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "olifant";
- version = "0.2.1-beta5";
+ version = "0.2.1-beta6";
src = fetchFromGitHub {
owner = "cleac";
repo = pname;
rev = version;
- sha256 = "1fpyg3nii75vmsdhp8x4yvhi3npvp3xnbqmd0qcidn05mbsam68r";
+ sha256 = "sha256-3hnEa4Q1dH0R8Jp+Ew0+dH1PEm3F+56jYwqhJ+vll4M=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/openambit/default.nix b/pkgs/applications/misc/openambit/default.nix
new file mode 100644
index 0000000000000..5ef6d4ae84d41
--- /dev/null
+++ b/pkgs/applications/misc/openambit/default.nix
@@ -0,0 +1,48 @@
+{ cmake
+, fetchFromGitHub
+, lib
+, libusb1
+, mkDerivation
+, python3
+, qtbase
+, qttools
+, udev
+, zlib
+}:
+
+mkDerivation rec {
+ pname = "openambit";
+ version = "0.5";
+
+ src = fetchFromGitHub {
+ owner = "openambitproject";
+ repo = pname;
+ rev = version;
+ sha256 = "1074kvkamwnlkwdajsw1799wddcfkjh2ay6l842r0s4cvrxrai85";
+ };
+
+ nativeBuildInputs = [ cmake qttools ];
+ buildInputs = [ libusb1 python3 qtbase udev zlib ];
+
+ cmakeFlags = [ "-DCMAKE_INSTALL_UDEVRULESDIR=${placeholder "out"}/lib/udev/rules.d" ];
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ $out/bin/openambit --version
+ '';
+
+ postInstall = ''
+ install -m755 -D $src/tools/openambit2gpx.py $out/bin/openambit2gpx
+
+ mv -v $out/lib/udev/rules.d/libambit.rules \
+ $out/lib/udev/rules.d/20-libambit.rules
+ '';
+
+ meta = with lib; {
+ description = "Helps fetch data from Suunto Ambit GPS watches";
+ homepage = "https://github.com/openambitproject/openambit/";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ rycee ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix
index e537180686cd6..544329ec5e797 100644
--- a/pkgs/applications/misc/openjump/default.nix
+++ b/pkgs/applications/misc/openjump/default.nix
@@ -1,33 +1,33 @@
-{ stdenv, fetchurl, unzip, runtimeShell }:
+{ stdenv, fetchurl, unzip, makeWrapper
+, coreutils, gawk, which, gnugrep, findutils
+, jdk
+}:
stdenv.mkDerivation {
- name = "openjump-1.3.1";
+ pname = "openjump";
+ version = "1.15";
src = fetchurl {
- url = "mirror://sourceforge/jump-pilot/OpenJUMP/1.3.1/openjump-1.3.1.zip";
- sha256 = "0y4z53yx0x7rp3c8rnj028ni3gr47r35apgcpqp3jl7r2di6zgqm";
+ url = "mirror://sourceforge/jump-pilot/OpenJUMP/1.15/OpenJUMP-Portable-1.15-r6241-CORE.zip";
+ sha256 = "12snzkv83w6khcdqzp6xahqapwp82af6c7j2q8n0lj62hk79rfgl";
};
- # ln jump.log hack: a different user will probably get a permission denied
- # error. Still this is better than getting it always.
- # TODO: build from source and patch this
+ # TODO: build from source
unpackPhase = ''
mkdir -p $out/bin;
cd $out; unzip $src
- s=$out/bin/OpenJump
- dir=$(echo $out/openjump-*)
- cat >> $s << EOF
- #!${runtimeShell}
- cd $dir/bin
- exec ${stdenv.shell} openjump.sh
- EOF
- chmod +x $s
- ln -s /tmp/openjump.log $dir/bin/jump.log
'';
- installPhase = ":";
+ buildInputs = [unzip makeWrapper];
- buildInputs = [unzip];
+ installPhase = ''
+ dir=$(echo $out/OpenJUMP-*)
+
+ chmod +x $dir/bin/oj_linux.sh
+ makeWrapper $dir/bin/oj_linux.sh $out/bin/OpenJump \
+ --set JAVA_HOME ${jdk.home} \
+ --set PATH "${coreutils}/bin:${gawk}/bin:${which}/bin:${gnugrep}/bin:${findutils}/bin"
+ '';
meta = {
description = "Open source Geographic Information System (GIS) written in the Java programming language";
diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix
index 77f6513b0ca2a..89a16568281a9 100644
--- a/pkgs/applications/misc/openrgb/default.nix
+++ b/pkgs/applications/misc/openrgb/default.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, lib, fetchFromGitHub, qmake, libusb1, hidapi }:
+{ mkDerivation, lib, fetchFromGitHub, qmake, libusb1, hidapi, pkg-config }:
mkDerivation rec {
pname = "openrgb";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "CalcProgrammer1";
repo = "OpenRGB";
rev = "release_${version}";
- sha256 = "0b1mkp4ca4gdzk020kp6dkd3i9a13h4ikrn3417zscsvv5y9kv0s";
+ sha256 = "1931aisdahjr99d4qqk824ib4x19mvhqgqmkm3j6fc5zd2hnw87m";
};
- nativeBuildInputs = [ qmake ];
+ nativeBuildInputs = [ qmake pkg-config ];
buildInputs = [ libusb1 hidapi ];
installPhase = ''
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 849e156b52924..ccb7f3e47c86b 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -35,13 +35,13 @@
buildPythonApplication rec {
pname = "orca";
- version = "3.36.3";
+ version = "3.36.5";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1x0xrcyxlvcjlqp6wcsx5d951i500079wqs04scssjzwqggy330n";
+ sha256 = "0nyb33p4y6nmln41pi70c8hiyjyasaryy10mazi7b2s6fy9pk25x";
};
patches = [
diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix
index 348ea4b991ec2..aaaf6dc778b9b 100644
--- a/pkgs/applications/misc/pastel/default.nix
+++ b/pkgs/applications/misc/pastel/default.nix
@@ -21,6 +21,5 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/sharkdp/pastel/releases/tag/v${version}";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ davidtwco ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index d8203b9e7b5dc..4e172e5fd7c1f 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "pdfpc";
- version = "4.3.4";
+ version = "4.4.0";
src = fetchFromGitHub {
repo = product;
owner = product;
rev = "v${version}";
- sha256 = "07aafsm4jzdgpahz83p0ajv40hry7gviyadqi13ahr8xdhhwy2sd";
+ sha256 = "0vh2r32akvasdrghkaq7ard24r2qncp34jfiyshi3zxabm9bhfaa";
};
nativeBuildInputs = [
@@ -31,14 +31,6 @@ stdenv.mkDerivation rec {
cmakeFlags = stdenv.lib.optional stdenv.isDarwin "-DMOVIES=OFF";
- patches = [
- # Fix build vala 0.46
- (fetchpatch {
- url = "https://github.com/pdfpc/pdfpc/commit/bbc16b97ecbdcdd22c2dc827a5c0e8b569073312.patch";
- sha256 = "0wi1rqcvg65cxnxvmvavcvghqyksnpijq1p91m57jaby3hb0pdcy";
- })
- ];
-
meta = with stdenv.lib; {
description = "A presenter console with multi-monitor support for PDF files";
homepage = "https://pdfpc.github.io/";
diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix
index 22add00c84d8b..a6dd86393ff11 100644
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files";
license = licenses.agpl3;
platforms = platforms.all;
- maintainers = with maintainers; [ maintainers."1000101" ];
+ maintainers = with maintainers; [ _1000101 ];
};
}
diff --git a/pkgs/applications/misc/pipr/default.nix b/pkgs/applications/misc/pipr/default.nix
new file mode 100644
index 0000000000000..b5a12f9ce7eef
--- /dev/null
+++ b/pkgs/applications/misc/pipr/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+, bubblewrap
+, makeWrapper
+, lib
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "pipr";
+ version = "0.0.12";
+
+ src = fetchFromGitHub {
+ owner = "ElKowar";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0l7yvpc59mbzh87lngj6pj8w586fwa07829l5x9mmxnkf6srapmc";
+ };
+
+ cargoSha256 = "1xzc1x5mjvj2jgdhwmjbdbqi8d7ln1ss7akn72d96kmy1wsj1qsa";
+
+ nativeBuildInputs = [ makeWrapper ];
+ postFixup = ''
+ wrapProgram "$out/bin/pipr" --prefix PATH : ${lib.makeBinPath [ bubblewrap ]}
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A commandline-tool to interactively write shell pipelines";
+ homepage = "https://github.com/ElKowar/pipr";
+ license = licenses.mit;
+ maintainers = with maintainers; [ elkowar ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/qcad/application-dir.patch b/pkgs/applications/misc/qcad/application-dir.patch
index 84782e1e7178f..0b8a29319eb3d 100644
--- a/pkgs/applications/misc/qcad/application-dir.patch
+++ b/pkgs/applications/misc/qcad/application-dir.patch
@@ -33,3 +33,16 @@ index c6c31cbf5..c51b59ce6 100644
}
int RSettings::getSnapRange() {
+diff --git a/qcad.desktop b/qcad.desktop
+index 93c5e9720..2d0e6bf32 100644
+--- a/qcad.desktop
++++ b/qcad.desktop
+@@ -48,7 +48,7 @@ Comment[sv]=2D CAD-system
+ Comment[sl]=Sistem 2D CAD
+ Comment[uk]=2D САПР
+ Comment[tr]=2D CAD Sistemi
+-Exec=qcad %F
++Exec=qcad-bin %F
+ X-MultipleArgs=true
+ Icon=qcad_icon
+ Terminal=false
diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix
index 0079cd220bdeb..26b6f3297644b 100644
--- a/pkgs/applications/misc/qcad/default.nix
+++ b/pkgs/applications/misc/qcad/default.nix
@@ -11,13 +11,13 @@
mkDerivationWith stdenv.mkDerivation rec {
pname = "qcad";
- version = "3.24.3.10";
+ version = "3.25.0.0";
src = fetchFromGitHub {
owner = "qcad";
repo = "qcad";
rev = "v${version}";
- sha256 = "0izyn4y1ffq1mgxs5dymkrqih6n6v9ifrcpyk1z2vyhbm5xx4qsa";
+ sha256 = "07qph2645m1wi9yi04ixdvx8dli03q1vimj3laqdmnpipi54lljc";
};
patches = [
@@ -25,11 +25,13 @@ mkDerivationWith stdenv.mkDerivation rec {
];
postPatch = ''
- mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}
- cp \
- src/3rdparty/qt-labs-qtscriptgenerator-5.12.3/qt-labs-qtscriptgenerator-5.12.3.pro \
- src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}/qt-labs-qtscriptgenerator-${qt5.qtbase.version}.pro
- '';
+ if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} ]; then
+ mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}
+ cp \
+ src/3rdparty/qt-labs-qtscriptgenerator-5.14.0/qt-labs-qtscriptgenerator-5.14.0.pro \
+ src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}/qt-labs-qtscriptgenerator-${qt5.qtbase.version}.pro
+ fi
+ '';
qmakeFlags = [
"MUPARSER_DIR=${muparser}"
diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
index c57153fe0e0df..e9f049159bfa7 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/pkgs/applications/misc/qdirstat/default.nix
@@ -3,17 +3,19 @@
, makeWrapper, perlPackages, mkDerivation }:
let
- version = "1.6.1";
-in mkDerivation rec {
pname = "qdirstat";
- inherit version;
+ version = "1.7";
src = fetchFromGitHub {
owner = "shundhammer";
- repo = "qdirstat";
+ repo = pname;
rev = version;
- sha256 = "0q77a347qv1aka6sni6l03zh5jzyy9s74aygg554r73g01kxczpb";
+ sha256 = "163x3fxra0l3vvrzm25mh7jvcwjbmwsqlpppkxx76mkz9a1769fy";
};
+in
+
+mkDerivation {
+ inherit pname version src;
nativeBuildInputs = [ qmake makeWrapper ];
diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix
index 90e99b5adf835..f159cd852e885 100644
--- a/pkgs/applications/misc/remarkable/rmapi/default.nix
+++ b/pkgs/applications/misc/remarkable/rmapi/default.nix
@@ -13,12 +13,13 @@ buildGoModule rec {
vendorSha256 = "077s13pcql5w2m6wzls1q06r7p501kazbwzxgfh6akwza15kb4is";
+ doCheck = false;
+
meta = with stdenv.lib; {
description = "A Go app that allows access to the ReMarkable Cloud API programmatically";
homepage = "https://github.com/juruen/rmapi";
changelog = "https://github.com/juruen/rmapi/blob/v${version}/CHANGELOG.md";
license = licenses.agpl3;
maintainers = [ maintainers.nickhu ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index 9784e24187bf8..6b28b52dcf02e 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -1,19 +1,21 @@
{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver }:
let
+ version = "2.16.3.1";
src =
if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
name = "rescuetime-installer.deb";
- url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb";
- sha256 = "1yzbs2lg04bq0clkr6gfkx3j6wrahpnxqfiq4askk9k76y4ncd4m";
+ url = "https://www.rescuetime.com/installers/rescuetime_${version}_i386.deb";
+ sha256 = "1374nmj6g6w24cv604kzac0v57gcl1pwpw0nxpr7kv2786x1aqg2";
} else fetchurl {
name = "rescuetime-installer.deb";
- url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
- sha256 = "1njxsh601d0p6n0hxv44gcg8gd43xwym83xwqba26vj6xw82bknv";
+ url = "https://www.rescuetime.com/installers/rescuetime_${version}_amd64.deb";
+ sha256 = "05qs6wbc3705z8w9c3n83m4j8xfmzm673lyh5j95x1ak5czkrphk";
};
in mkDerivation {
# https://www.rescuetime.com/updates/linux_release_notes.html
- name = "rescuetime-2.15.0.1";
+ inherit version;
+ pname = "rescuetime";
inherit src;
nativeBuildInputs = [ dpkg ];
# avoid https://github.com/NixOS/patchelf/issues/99
diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix
index b508a73de1dcb..e1ae63e09fd37 100644
--- a/pkgs/applications/misc/rsclock/default.nix
+++ b/pkgs/applications/misc/rsclock/default.nix
@@ -18,6 +18,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/valebes/rsClock";
license = licenses.mit;
maintainers = with maintainers; [valebes];
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix
index f2f6c5854f06f..b68a3a98e34c5 100644
--- a/pkgs/applications/misc/sampler/default.nix
+++ b/pkgs/applications/misc/sampler/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "04nywhkil5xkipcibrp6vi63rfcvqgv7yxbxmmrhqys2cdxfvazv";
+ doCheck = false;
+
subPackages = [ "." ];
buildInputs = [ alsaLib ];
diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix
index 997786fc10724..d220047a0a3b0 100644
--- a/pkgs/applications/misc/sdcv/default.nix
+++ b/pkgs/applications/misc/sdcv/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sdcv";
- version = "0.5.2";
+ version = "0.5.3";
src = fetchFromGitHub {
owner = "Dushistov";
repo = "sdcv";
rev = "v${version}";
- sha256 = "1b67s4nj0s5fh3cjk7858qvhiisc557xx72xwzrb8hq6ijpwx5k0";
+ sha256 = "144qpl9b8r2php0zhi9b7vg6flpvdgjy6yfaipydwwhxi4wy9600";
};
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix
index 6c55c3157f5c7..883b3eec03dbb 100644
--- a/pkgs/applications/misc/sidequest/default.nix
+++ b/pkgs/applications/misc/sidequest/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
let
pname = "sidequest";
- version = "0.10.2";
+ version = "0.10.11";
desktopItem = makeDesktopItem rec {
name = "SideQuest";
@@ -16,7 +16,7 @@
src = fetchurl {
url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
- sha256 = "1vfxn4gx5b138gj6nk4w3jlp2l56cqpb8hq2kn5mrf4dhjii8n88";
+ sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 52aa215987b91..05cf15b8accc7 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -4,6 +4,7 @@
, fetchurl
, makeDesktopItem
, makeWrapper
+, lib
, stdenv
, udev
, wrapGAppsHook
@@ -16,10 +17,10 @@ let
pname = "simplenote";
- version = "1.20.0";
+ version = "1.21.1";
sha256 = {
- x86_64-linux = "0fzv8nbac5bnxvm2p7p4jsjvfrzk3h9j57zjmwvsi2dq6l80d2n7";
+ x86_64-linux = "00qx82d17yrrg2mxwhm40av0mpf5hy14j338i5ijhwp79yc8fk8x";
}.${system} or throwSystem;
meta = with stdenv.lib; {
@@ -82,7 +83,7 @@ let
'';
runtimeDependencies = [
- udev.lib
+ (lib.getLib udev)
];
postFixup = ''
diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix
index 01dd6a19d44fb..6adf24f617c96 100644
--- a/pkgs/applications/misc/slstatus/default.nix
+++ b/pkgs/applications/misc/slstatus/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
homepage = "https://tools.suckless.org/slstatus/";
description = "status monitor for window managers that use WM_NAME like dwm";
license = licenses.isc;
- maintainers = with maintainers; [ geistesk ];
+ maintainers = with maintainers; [ oxzi ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix
new file mode 100644
index 0000000000000..a860b555b597c
--- /dev/null
+++ b/pkgs/applications/misc/snowsql/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, fetchurl
+, rpmextract
+, patchelf
+, makeWrapper
+, openssl
+}:
+
+stdenv.mkDerivation rec {
+ pname = "snowsql";
+ version = "1.2.5";
+
+ src = fetchurl {
+ url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/1.2/linux_x86_64/snowflake-snowsql-1.2.5-1.x86_64.rpm";
+ sha256 = "c66e2044640197f4a5b5a16b89e8e7c6a816aa539004a0fb016aab185795f2d5";
+ };
+
+ nativeBuildInputs = [ rpmextract makeWrapper ];
+
+ libPath =
+ stdenv.lib.makeLibraryPath
+ [
+ openssl
+ ];
+
+ buildCommand = ''
+ mkdir -p $out/bin/
+ cd $out
+ rpmextract $src
+ rm -R usr/bin
+ mv usr/* $out
+ rmdir usr
+
+ ${patchelf}/bin/patchelf \
+ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+ lib64/snowflake/snowsql/snowsql
+
+ makeWrapper $out/lib64/snowflake/snowsql/snowsql $out/bin/snowsql \
+ --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/lib64/snowflake/snowsql \
+
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Command line client for the Snowflake database";
+ homepage = "https://www.snowflake.com";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ andehen ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/misc/super_user_spark/default.nix b/pkgs/applications/misc/super_user_spark/default.nix
deleted file mode 100644
index dd1218282d85f..0000000000000
--- a/pkgs/applications/misc/super_user_spark/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkDerivation, fetchgit, aeson, aeson-pretty, base, bytestring, directory
-, filepath, hspec, hspec-core, HUnit, mtl, optparse-applicative
-, parsec, process, pureMD5, QuickCheck, shelly, stdenv, text
-, transformers, unix
-}:
-mkDerivation {
- pname = "super-user-spark";
- version = "0.3.2.0-dev";
- src = fetchgit {
- url = "https://github.com/NorfairKing/super-user-spark";
- sha256 = "0akyc51bghzkk8j75n0i8v8rrsklidwvljhx3aibxfbkqp33372g";
- rev = "ab8635682d67842b9e6d909cf3c618014e4157f2";
- };
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson aeson-pretty base bytestring directory filepath mtl
- optparse-applicative parsec process pureMD5 shelly text
- transformers unix
- ];
- executableHaskellDepends = [ base ];
- testHaskellDepends = [
- aeson aeson-pretty base bytestring directory filepath hspec
- hspec-core HUnit mtl optparse-applicative parsec process pureMD5
- QuickCheck shelly text transformers unix
- ];
- jailbreak = true;
- description = "Configure your dotfile deployment with a DSL";
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/NorfairKing/super-user-spark";
- maintainers = [ stdenv.lib.maintainers.badi ];
-}
diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix
index 38826b7735fb9..1cb5bb441ed87 100644
--- a/pkgs/applications/misc/syncthing-tray/default.nix
+++ b/pkgs/applications/misc/syncthing-tray/default.nix
@@ -23,6 +23,5 @@ buildGoPackage rec {
homepage = "https://github.com/alex2108/syncthing-tray";
license = licenses.mit;
maintainers = with maintainers; [ nickhu ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/misc/systembus-notify/default.nix b/pkgs/applications/misc/systembus-notify/default.nix
index 28c1be4219d68..374adc6c89bfe 100644
--- a/pkgs/applications/misc/systembus-notify/default.nix
+++ b/pkgs/applications/misc/systembus-notify/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "systembus-notify";
- version = "1.0";
+ version = "1.1";
src = fetchFromGitHub {
owner = "rfjakob";
repo = "systembus-notify";
rev = "v${version}";
- sha256 = "11zq84qfmbyl51d3r6294l2bjhlgwa9bx7d263g9fkqrwsg0si0y";
+ sha256 = "1pdn45rfpwhrf20hs87qmk2j8sr7ab8161f81019wnypnb1q2fsv";
};
buildInputs = [ systemd ];
diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix
deleted file mode 100644
index 2a083f45731f9..0000000000000
--- a/pkgs/applications/misc/taskell/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ lib, haskellPackages, fetchFromGitHub }:
-
-let
- version = "1.9.4";
- sha256 = "0k8s1f0c99fz6jmqi6jqscsfxrrijnnpyw4jcj8zxpdf0sc07gca";
-
-in (haskellPackages.mkDerivation {
- pname = "taskell";
- inherit version;
-
- src = fetchFromGitHub {
- owner = "smallhadroncollider";
- repo = "taskell";
- rev = version;
- inherit sha256;
- };
-
- postPatch = ''${haskellPackages.hpack}/bin/hpack'';
-
- # basically justStaticExecutables; TODO: use justStaticExecutables
- enableSharedExecutables = false;
- enableLibraryProfiling = false;
- isExecutable = true;
- doHaddock = false;
- postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
-
- # copied from packages.yaml
- libraryHaskellDepends = with haskellPackages; [
- classy-prelude
- # base <=5
- aeson
- brick
- # bytestring
- config-ini
- # containers
- # directory
- file-embed
- fold-debounce
- http-conduit
- http-client
- http-types
- lens
- raw-strings-qq
- # mtl
- # template-haskell
- # text
- time
- vty
- tz
- ];
-
- executableHaskellDepends = [];
-
- testHaskellDepends = with haskellPackages; [
- tasty
- tasty-discover
- tasty-expected-failure
- tasty-hunit
- ];
-
- description = "Command-line Kanban board/task manager with support for Trello boards and GitHub projects";
- homepage = "https://taskell.app";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ matthiasbeyer ];
- platforms = [ "x86_64-linux" ];
-})
diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix
index 020298a0c5237..f9e2ea34b39e8 100644
--- a/pkgs/applications/misc/tdrop/default.nix
+++ b/pkgs/applications/misc/tdrop/default.nix
@@ -1,24 +1,34 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
-, xwininfo, xdotool, xprop }:
+, xwininfo, xdotool, xprop, gawk, coreutils
+, gnugrep, procps }:
stdenv.mkDerivation {
pname = "tdrop";
- version = "unstable-2018-11-13";
+ version = "unstable-2020-05-14";
src = fetchFromGitHub {
owner = "noctuid";
repo = "tdrop";
- rev = "198795c0d2573a31979330d6a2ae946eb81deebf";
- sha256 = "1fhibqgmls64mylcb6q46ipmg1q6pvaqm26vz933gqav6cqsbdzs";
+ rev = "a9f2862515e5c190ac61d394e7fe7e1039871b89";
+ sha256 = "1zxhihgba33k8byjsracsyhby9qpdngbly6c8hpz3pbsyag5liwc";
};
dontBuild = true;
installFlags = [ "PREFIX=$(out)" ];
- postInstall = ''
- wrapProgram $out/bin/tdrop \
- --prefix PATH : ${lib.makeBinPath [ xwininfo xdotool xprop ]}
+ postInstall = let
+ binPath = lib.makeBinPath [
+ xwininfo
+ xdotool
+ xprop
+ gawk
+ coreutils
+ gnugrep
+ procps
+ ];
+ in ''
+ wrapProgram $out/bin/tdrop --prefix PATH : ${binPath}
'';
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix
index a283f744929b1..52116a52fbb7e 100644
--- a/pkgs/applications/misc/terminal-parrot/default.nix
+++ b/pkgs/applications/misc/terminal-parrot/default.nix
@@ -13,11 +13,12 @@ buildGoModule rec {
vendorSha256 = "1qalnhhq3fmyzj0hkzc5gk9wbypr558mz3ik5msw7fid68k2i48c";
+ doCheck = false;
+
meta = with stdenv.lib; {
description = "Shows colorful, animated party parrot in your terminial";
homepage = "https://github.com/jmhobbs/terminal-parrot";
license = licenses.mit;
- platforms = platforms.all;
maintainers = [ maintainers.heel ];
};
}
diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix
index f55b3852e5bf5..431f922eeeec6 100644
--- a/pkgs/applications/misc/todiff/default.nix
+++ b/pkgs/applications/misc/todiff/default.nix
@@ -20,6 +20,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/Ekleog/todiff";
maintainers = with maintainers; [ ekleog ];
license = licenses.mit;
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix
index e7ba56f6f25fd..68388376f8f00 100644
--- a/pkgs/applications/misc/todoist/default.nix
+++ b/pkgs/applications/misc/todoist/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "0cznb8glh36dwyyn1gx1ggkwa9zffrrxg52k78brnaczsl0rsmky";
+ doCheck = false;
+
meta = {
homepage = "https://github.com/sachaos/todoist";
description = "Todoist CLI Client";
diff --git a/pkgs/applications/misc/tty-solitaire/default.nix b/pkgs/applications/misc/tty-solitaire/default.nix
new file mode 100644
index 0000000000000..00e6efb713e5e
--- /dev/null
+++ b/pkgs/applications/misc/tty-solitaire/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, ncurses }:
+
+stdenv.mkDerivation rec {
+ pname = "tty-solitaire";
+ version = "1.3.0";
+
+ src = fetchFromGitHub {
+ owner = "mpereira";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0kix7wfy2bda8cw5kfm7bm5acd5fqmdl9g52ms9bza4kf2jnb754";
+ };
+
+ buildInputs = [ ncurses ];
+
+ patchPhase = "sed -i -e '/^CFLAGS *?= *-g *$/d' Makefile";
+
+ makeFlags = [ "CC=cc" "PREFIX=${placeholder "out"}" ];
+
+ meta = with stdenv.lib; {
+ description = "Klondike Solitaire in your ncurses terminal";
+ license = licenses.mit;
+ homepage = "https://github.com/mpereira/tty-solitaire";
+ platforms = ncurses.meta.platforms;
+ maintainers = [ maintainers.AndersonTorres ];
+ };
+}
diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix
index 69ec8fffaa1af..4aeff6c9ec8d0 100644
--- a/pkgs/applications/misc/wofi/default.nix
+++ b/pkgs/applications/misc/wofi/default.nix
@@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ];
buildInputs = [ wayland gtk3 ];
+ patches = [
+ # https://todo.sr.ht/~scoopta/wofi/121
+ ./do_not_follow_symlinks.patch
+ ];
+
postInstall = ''
installManPage man/wofi*
'';
diff --git a/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch b/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch
new file mode 100644
index 0000000000000..f917c4c1685d0
--- /dev/null
+++ b/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch
@@ -0,0 +1,39 @@
+diff -r 3414ab984249 modes/run.c
+--- a/modes/run.c Tue Aug 11 19:07:49 2020 -0700
++++ b/modes/run.c Sat Aug 22 13:39:52 2020 +0200
+@@ -91,23 +91,10 @@
+
+ char* path = strdup(getenv("PATH"));
+
+- struct map* paths = map_init();
+-
+ char* save_ptr;
+ char* str = strtok_r(path, ":", &save_ptr);
+ do {
+
+- str = realpath(str, NULL);
+- if(str == NULL) {
+- continue;
+- }
+- if(map_contains(paths, str)) {
+- free(str);
+- continue;
+- }
+-
+- map_put(paths, str, "true");
+-
+ DIR* dir = opendir(str);
+ if(dir == NULL) {
+ continue;
+@@ -132,11 +119,9 @@
+ }
+ free(full_path);
+ }
+- free(str);
+ closedir(dir);
+ } while((str = strtok_r(NULL, ":", &save_ptr)) != NULL);
+ free(path);
+- map_free(paths);
+ map_free(cached);
+ map_free(entries);
+ }
diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index 9e3022457a0e4..b19b1b86cf57f 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "worker";
- version = "4.4.0";
+ version = "4.5.0";
src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";
- sha256 = "1k2svpzq01n1h9365nhi7r2k7dmsviczxi9m6fb80ccccdz7i530";
+ sha256 = "02xrdg1v784p4gfqjm1mlxqwi40qlbzhp68p5ksj96cjv6av5b5s";
};
buildInputs = [ libX11 ];
diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index 8bc0a31b91fe7..612b97b5b53cf 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -18,6 +18,8 @@ buildGoModule rec {
vendorSha256 = "09iy148pnbdrzjj2j50lbd8s9mkv7vggrx77mj88p1gnqclz3lip";
+ doCheck = false;
+
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
subPackages = [ "." ];
diff --git a/pkgs/applications/misc/x3270/default.nix b/pkgs/applications/misc/x3270/default.nix
new file mode 100644
index 0000000000000..747d26538764c
--- /dev/null
+++ b/pkgs/applications/misc/x3270/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, openssl, m4, expat
+, libX11, libXt, libXaw, libXmu, bdftopcf, mkfontdir
+, fontadobe100dpi, fontadobeutopia100dpi, fontbh100dpi
+, fontbhlucidatypewriter100dpi, fontbitstream100dpi
+, tcl
+, ncurses }:
+
+let
+ majorVersion = "4";
+ minorVersion = "0";
+ versionSuffix = "ga9";
+in stdenv.mkDerivation rec {
+ pname = "x3270";
+ version = "${majorVersion}.${minorVersion}${versionSuffix}";
+
+ src = fetchurl {
+ url = "http://x3270.bgp.nu/download/0${majorVersion}.0${minorVersion}/suite3270-${version}-src.tgz";
+ sha256 = "0km24rgll0s4ji6iz8lvy5ra76ds162s95y33w5px6697cwqkp9j";
+ };
+
+ buildFlags = "unix";
+
+ postConfigure = ''
+ pushd c3270 ; ./configure ; popd
+ '';
+
+ nativeBuildInputs = [ m4 ];
+ buildInputs = [
+ expat
+ libX11 libXt libXaw libXmu bdftopcf mkfontdir
+ fontadobe100dpi fontadobeutopia100dpi fontbh100dpi
+ fontbhlucidatypewriter100dpi fontbitstream100dpi
+ tcl
+ ncurses
+ expat
+ ];
+
+ meta = with stdenv.lib; {
+ description = "IBM 3270 terminal emulator for the X Window System";
+ homepage = "http://x3270.bgp.nu/index.html";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.anna328p ];
+ };
+}
diff --git a/pkgs/applications/misc/xmenu/default.nix b/pkgs/applications/misc/xmenu/default.nix
new file mode 100644
index 0000000000000..0904d1d048fc5
--- /dev/null
+++ b/pkgs/applications/misc/xmenu/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, imlib2, libX11, libXft, libXinerama }:
+
+stdenv.mkDerivation rec {
+ pname = "xmenu";
+ version = "4.3.1";
+
+ src = fetchFromGitHub {
+ owner = "phillbush";
+ repo = "xmenu";
+ rev = "v${version}";
+ sha256 = "0m97w1nwak5drcxxlyisqb73fxkapy2rlph9mg531kbx3k2h30r1";
+ };
+
+ buildInputs = [ imlib2 libX11 libXft libXinerama ];
+
+ postPatch = "sed -i \"s:/usr/local:$out:\" config.mk";
+
+ meta = with stdenv.lib; {
+ description = "XMenu is a menu utility for X";
+ homepage = "https://github.com/phillbush/xmenu";
+ license = licenses.publicDomain;
+ maintainers = with maintainers; [ neonfuz ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 44f200174d9ba..58b1a81c90fc3 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -24,18 +24,17 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dsqlite=enabled"
"-Dmagic=enabled"
- # "-Dseccomp=enabled"
"-Dmanpages=enabled"
"-Dconvert-icon=enabled"
"-Dsynctex=enabled"
# Make sure tests are enabled for doCheck
"-Dtests=enabled"
- ];
+ ] ++ optional (!stdenv.isLinux) "-Dseccomp=disabled";
nativeBuildInputs = [
meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx
- gettext wrapGAppsHook libxml2 check
- ] ++ optional stdenv.isLinux appstream-glib;
+ gettext wrapGAppsHook libxml2 check appstream-glib
+ ];
buildInputs = [
gtk girara libintl sqlite glib file librsvg
diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix
new file mode 100644
index 0000000000000..3d762d9ab2a71
--- /dev/null
+++ b/pkgs/applications/misc/zettlr/default.nix
@@ -0,0 +1,38 @@
+{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas}:
+
+# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
+let
+ pname = "zettlr";
+ version = "1.7.5";
+ name = "${pname}-${version}";
+ src = fetchurl {
+ url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
+ sha256 = "040lx01ywdpla34d4abkmh51kchr11s17la6fk6yq77y8zb87xzi";
+ };
+ appimageContents = appimageTools.extractType2 {
+ inherit name src;
+ };
+in appimageTools.wrapType2 rec {
+ inherit name src;
+
+ profile = ''
+ export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
+ '';
+
+ multiPkgs = null; # no 32bit needed
+ extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
+ extraInstallCommands = ''
+ mv $out/bin/{${name},${pname}}
+ install -m 444 -D ${appimageContents}/zettlr.desktop $out/share/applications/zettlr.desktop
+ install -m 444 -D ${appimageContents}/zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png
+ substituteInPlace $out/share/applications/zettlr.desktop --replace 'Exec=AppRun' 'Exec=${pname}'
+ '';
+
+ meta = with lib; {
+ description = "A markdown editor for writing academic texts and taking notes";
+ homepage = "https://www.zettlr.com";
+ platforms = [ "x86_64-linux" ];
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ tfmoraes ];
+ };
+}
diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix
index d88d7296fd649..710d824df11f6 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/pkgs/applications/misc/zola/default.nix
@@ -31,6 +31,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://www.getzola.org/";
license = licenses.mit;
maintainers = with maintainers; [ dywedir ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix
index 3f2e4ca99be6b..0796e11731155 100644
--- a/pkgs/applications/networking/Sylk/default.nix
+++ b/pkgs/applications/networking/Sylk/default.nix
@@ -2,7 +2,7 @@
let
pname = "Sylk";
- version = "2.8.0";
+ version = "2.8.2";
in
appimageTools.wrapType2 rec {
@@ -10,7 +10,7 @@ appimageTools.wrapType2 rec {
src = fetchurl {
url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage";
- hash = "sha256:09j1kijs31yk3iw2lj7szv1nwkqiqydj3zkkmr49qlib1qj717wh";
+ hash = "sha256:0figpfm5cgbryq6v26k9gj42zgbk335bsa3bzyxpvz2slq8rzb2y";
};
profile = ''
diff --git a/pkgs/applications/networking/browsers/amfora/default.nix b/pkgs/applications/networking/browsers/amfora/default.nix
index d2d8de375a745..2772cb6d987de 100644
--- a/pkgs/applications/networking/browsers/amfora/default.nix
+++ b/pkgs/applications/networking/browsers/amfora/default.nix
@@ -2,16 +2,18 @@
buildGoModule rec {
pname = "amfora";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "makeworld-the-better-one";
repo = "amfora";
rev = "v${version}";
- sha256 = "1z4r1yqy5nkfa7yqcsqpqfdcghw8idryzb3s6d6ibca47r0qlcvw";
+ sha256 = "011h5xzwiafh3fdp9wil8n618p45ph9swa66lw6s82ijpiizz79s";
};
- vendorSha256 = "0xj2s14dq10fwqqxjn4d8x6zljd5d15gjbja2gb75rfv09s4fdgv";
+ vendorSha256 = "10f3bh3r3jc1185r8r1ihg8rprdpl8qwg5b6wqwsda96ydkbpi2b";
+
+ doCheck = false;
meta = with lib; {
description = "A fancy terminal browser for the Gemini protocol";
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 5a8171a40a4eb..ceceffb8da084 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -86,11 +86,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.11.97";
+ version = "1.12.112";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "1wmjwk98fvzy5slyqpzpnn1mx663q3pvcyr3fzcinf6v971vz3q2";
+ sha256 = "0nvxmz1wrr6cfyhbnrfjsy9szbjmvjl6080pgkp25xa8rcql5gmb";
};
dontConfigure = true;
diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix
index 3ce04842c6e48..b302be4e013c8 100644
--- a/pkgs/applications/networking/browsers/captive-browser/default.nix
+++ b/pkgs/applications/networking/browsers/captive-browser/default.nix
@@ -16,7 +16,6 @@ buildGoPackage rec {
description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings";
homepage = "https://blog.filippo.io/captive-browser";
license = licenses.mit;
- platforms = platforms.all;
maintainers = with maintainers; [ volth ];
};
}
diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix
index 7c234c42c2695..2da44bd4ed965 100644
--- a/pkgs/applications/networking/browsers/castor/default.nix
+++ b/pkgs/applications/networking/browsers/castor/default.nix
@@ -45,7 +45,6 @@ rustPlatform.buildRustPackage rec {
description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols";
homepage = "https://sr.ht/~julienxx/Castor";
license = licenses.mit;
- platforms = platforms.all;
maintainers = with maintainers; [ fgaz ];
};
}
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 51e3fb032f2b2..7c0609730c249 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -90,6 +90,5 @@ mkChromiumDerivation (base: rec {
platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
timeout = 172800; # 48 hours
- broken = channel == "dev"; # Requires LLVM 11
};
})
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index e538fb66bf9d9..d0937a9c6d467 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
+{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
# default dependencies
, bzip2, flac, speex, libopus
@@ -144,8 +144,9 @@ let
++ optional pulseSupport libpulseaudio
++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ];
- patches = [
+ patches = optionals (versionRange "68" "86") [
./patches/nix_plugin_paths_68.patch
+ ] ++ [
./patches/remove-webp-include-69.patch
./patches/no-build-timestamps.patch
./patches/widevine-79.patch
@@ -159,12 +160,18 @@ let
#
# ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
# ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" )
- ] ++ optionals (useVaapi) [ # Improvements for the VA-API build:
+ ] ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build:
./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi
./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium)
];
- postPatch = ''
+ postPatch = optionalString (!versionRange "0" "86") ''
+ # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.):
+ substituteInPlace native_client/SConstruct \
+ --replace "#! -*- python -*-" ""
+ substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
+ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
+ '' + ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
--replace \
@@ -190,7 +197,7 @@ let
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
chrome/browser/shell_integration_linux.cc
- sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
+ sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
device/udev_linux/udev?_loader.cc
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 2429baba4b366..efaaefce65a2a 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,4 +1,4 @@
-{ newScope, config, stdenv, llvmPackages_9, llvmPackages_10
+{ newScope, config, stdenv, llvmPackages_10, llvmPackages_11
, makeWrapper, ed, gnugrep, coreutils
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, libva ? null
@@ -28,7 +28,7 @@ let
callPackage = newScope chromium;
- chromium = {
+ chromium = rec {
inherit stdenv llvmPackages;
upstream-info = (callPackage ./update.nix {}).getChannel channel;
@@ -36,15 +36,6 @@ let
mkChromiumDerivation = callPackage ./common.nix ({
inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone;
# TODO: Remove after we can update gn for the stable channel (backward incompatible changes):
- gnChromium = gn.overrideAttrs (oldAttrs: {
- version = "2020-03-23";
- src = fetchgit {
- url = "https://gn.googlesource.com/gn";
- rev = "5ed3c9cc67b090d5e311e4bd2aba072173e82db9";
- sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy";
- };
- });
- } // lib.optionalAttrs (channel == "beta") {
gnChromium = gn.overrideAttrs (oldAttrs: {
version = "2020-05-19";
src = fetchgit {
@@ -53,7 +44,8 @@ let
sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17";
};
});
- } // lib.optionalAttrs (channel == "dev") {
+ } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") {
+ llvmPackages = llvmPackages_11;
gnChromium = gn.overrideAttrs (oldAttrs: {
version = "2020-07-20";
src = fetchgit {
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 54da49b9e3019..239a6282a6756 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -44,11 +44,11 @@ let
flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi";
- version = "32.0.0.403";
+ version = "32.0.0.414";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "1xirngiqypylgm8f3ddvny2ghqxgj8i98bm1carcj2vryw53wwal";
+ sha256 = "0wzf5i6qf5wgjm905kd3qh97rj47fybl9g7z72vasilbx8q5wfwk";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 81cc31aacc8fd..5639ff2b67915 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "06cl77yi7cb6r7n8mn38d61zmgwxi690qxrkd56hg2773hn06wq5";
- sha256bin64 = "0a6c44qb0n2hdc42p5xqybnbhgdxd51lyygkqz42fmym6id65v88";
- version = "85.0.4183.39";
+ sha256 = "0fz781bxx1rnjwfix2dgzq5w1lg3x6a9vd9k49gh4z5q092slr10";
+ sha256bin64 = "12nm7h70pbzwc5rc7kcwfwgjs0h8cdnys5wlfjkbq6irwb6m1lm6";
+ version = "85.0.4183.83";
};
dev = {
- sha256 = "1l2d3gk7si1djxn3901fjgykv7nzc8g970m3fb9pjflfrr8f17v6";
- sha256bin64 = "0flsmy5blrc9gs6cikag7mdlvgkm6mzm745kcq0shfmhanvlkykn";
- version = "86.0.4209.2";
+ sha256 = "16yj47x580i8p88m88f5bcs85qmrfwmyp9na7yrnk0lnq06wbj4i";
+ sha256bin64 = "0i81xcfdn65j2i4vfx52v4a9vlar8y9ykqdhshymqfz4qqqk37d1";
+ version = "86.0.4238.0";
};
stable = {
- sha256 = "1b6cqnwx76pp4y5hvz3qm8lm1ayaxr5578k76164acr35bmypx6a";
- sha256bin64 = "0znxq5ncyvyysx3p8xikzg8jm8jr51k478y29m985x6c5p5a4zyw";
- version = "84.0.4147.105";
+ sha256 = "0fz781bxx1rnjwfix2dgzq5w1lg3x6a9vd9k49gh4z5q092slr10";
+ sha256bin64 = "0fa3la2nvqr0w40j2qkbwnh36924fsp2ajsla6aky6hz08mq2q1g";
+ version = "85.0.4183.83";
};
}
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index ca868a0807747..a16beb6520898 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchgit, meson, ninja, pkgconfig, nix-update-script
-, python3, gtk3, libsecret, gst_all_1, webkitgtk
+, python3, gtk3, libsecret, gst_all_1, webkitgtk, glib
, glib-networking, gtkspell3, hunspell, desktop-file-utils
-, gobject-introspection, wrapGAppsHook }:
+, gobject-introspection, wrapGAppsHook, gnome3 }:
python3.pkgs.buildPythonApplication rec {
pname = "eolie";
- version = "0.9.63";
+ version = "0.9.99";
format = "other";
doCheck = false;
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/eolie";
rev = "refs/tags/${version}";
fetchSubmodules = true;
- sha256 = "0z8gcfg7i842rr5p8r3vqa31kf7nnj1yv3afax3jzf4zbnhb8wm0";
+ sha256 = "077jww5mqg6bbqbj0j1gss2j3dxlfr2xw8bc43k8vg52drqg6g8w";
};
nativeBuildInputs = [
@@ -33,18 +33,23 @@ python3.pkgs.buildPythonApplication rec {
gst-plugins-base
gst-plugins-ugly
gstreamer
+ gnome3.gnome-settings-daemon
gtk3
gtkspell3
hunspell
libsecret
- webkitgtk
+ (webkitgtk.override {enableGLES = false;})
+ glib
];
propagatedBuildInputs = with python3.pkgs; [
+ pyfxa
beautifulsoup4
+ cryptography
pycairo
pygobject3
python-dateutil
+ pycrypto
];
postPatch = ''
@@ -52,9 +57,11 @@ python3.pkgs.buildPythonApplication rec {
patchShebangs meson_post_install.py
'';
+ dontWrapGApps = true;
preFixup = ''
buildPythonPath "$out $propagatedBuildInputs"
patchPythonScript "$out/libexec/eolie-sp"
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
passthru = {
@@ -63,6 +70,7 @@ python3.pkgs.buildPythonApplication rec {
};
};
+ strictDeps = false;
meta = with stdenv.lib; {
description = "A new GNOME web browser";
diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix
index f9e814a0941b8..3c2aace79b267 100644
--- a/pkgs/applications/networking/browsers/falkon/default.nix
+++ b/pkgs/applications/networking/browsers/falkon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, lib, fetchFromGitHub
+{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch
, cmake, extra-cmake-modules, pkgconfig, qmake
, libpthreadstubs, libxcb, libXdmcp
, qtsvg, qttools, qtwebengine, qtx11extras
@@ -17,6 +17,14 @@ mkDerivation rec {
sha256 = "1w64slh9wpcfi4v7ds9wci1zvwh0dh787ndpi6hd4kmdgnswvsw7";
};
+ patches = [
+ # fixes build with qt5 5.14
+ (fetchpatch {
+ url = "https://github.com/KDE/falkon/commit/bbde5c6955c43bc744ed2c4024598495de908f2a.diff";
+ sha256 = "0f7qcddvvdnij3di0acg7jwvwfwyd0xizlav4wccclbj8x7qp5ld";
+ })
+ ];
+
preConfigure = ''
export NONBLOCK_JS_DIALOGS=true
export KDE_INTEGRATION=true
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 94490ee7e2f9c..7548eb94fa6dc 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,965 +1,965 @@
{
- version = "79.0b7";
+ version = "81.0b4";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ach/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ach/firefox-81.0b4.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "423172ecaa10ac58180d725febebb54131c7443b77fb5205102512a467cb9698";
+ sha256 = "4b133dd14e8ce1b934e482c4f7f7b5ca4b58751181bed89f6573ba5994ebe644";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/af/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/af/firefox-81.0b4.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "408a019bd91f9f167606fc068fcf8c815fbf63253040323a496ecb039e048239";
+ sha256 = "8e50a0845eb058ee853fe40b13c88d764e721f7f8ac2eb54695049ab2a66e3e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/an/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/an/firefox-81.0b4.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "9e1ba3ade4031b2a1349cac7ae2df975705dec9a0928721c4fae634f16ad2336";
+ sha256 = "3edf8e157cac424b1cbfff019240877e7b7c3bf5ed1b576580569c155c5dd660";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ar/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ar/firefox-81.0b4.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "b007dcecaf3c3fbf4e2d1b55311269984932e9193f045ae5659656d288a6d290";
+ sha256 = "b2167ff357963e3295eed2ed423a1c3bcf62d645329b8f4cf817ad3c0e101c97";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ast/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ast/firefox-81.0b4.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "dd4e126494416fd0188d8dfcf7b202a61199cd9ceeae2d59d4c278cb82dee95e";
+ sha256 = "805a87a99a417ff4b762c01a9a2b88c7963f53a04fc19b42015db304b15f4bbe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/az/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/az/firefox-81.0b4.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "a375291cf4e6b86b8bb4097115014e16dec3e75237bb5124cc2c71c630103aae";
+ sha256 = "79c61c9515a683731649bcb5d36b26b95dd56165765e5a952339910310c9d259";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/be/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/be/firefox-81.0b4.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "678768f65e54aaab7c1088f0b65e1eb9d8590b257c8f72ceeaaf690235cb3ed1";
+ sha256 = "318fece7d1ad734f6a19faa7003e060b1254b31bf62e59580c70a64c4a167ec6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/bg/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bg/firefox-81.0b4.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "4d3a8bda9f809af7fae056bc17b6ca49acff26f175b750af2e341048ae18e502";
+ sha256 = "55616606306dbd0933240d718fef8e83004fd65e4f53dd18f1601f09d0b94e92";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/bn/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bn/firefox-81.0b4.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "3e389228649921f1accf39541d9c76797be1e94e9b65a7cfe69c40f2a1081c58";
+ sha256 = "c38fdef89f6aee7bf03362d2edfe4dcc665d540b1e1dc1dad8c53db20d70087d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/br/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/br/firefox-81.0b4.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "f5813909a8ea779ac7a13db38af5630ef4581f9df482169342108825573a4fd6";
+ sha256 = "c5ac1c8e9dc2f4c5a1a2b6e33bf699a823a9422bce46922bc36222700a29d2e5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/bs/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bs/firefox-81.0b4.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "7cd07a4e9bb83df432450fd6babd4058ea445d14d1769e31592954f14838252d";
+ sha256 = "a18718ef7f467ed87c76816fb6797165db3e06bc166c5e88b526c9f2ce5c1d19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ca-valencia/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ca-valencia/firefox-81.0b4.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "a2ca4b866d764880a0dca1397f655e074bad53cfc9b811cf113c13e8525b0d0f";
+ sha256 = "fcfccd0714c965801ce468f6817bf37eb074064e6e0b616c81be7218a6b632fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ca/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ca/firefox-81.0b4.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "cbfbe3266fcad8b4887a3dfe6c90b6808297803a112245a40984e6648242dee3";
+ sha256 = "5f08a2b2d357d5a6828865913b9e28fe90bda7a8ce17a0ea60effb25b8441b7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/cak/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cak/firefox-81.0b4.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "aa9e74a8ed9fff2e04cb2b4b0eaaa81b8a40e9409d48e70af9dcb68397f7b331";
+ sha256 = "db41156b75e1148527c51b915e3d9367d1c36a8d24a52132d1cc9cfe63bd9db6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/cs/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cs/firefox-81.0b4.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "894dec5e0affc7b3f3bd5bf44e1109593a8aa6435fe71e481e3f8983af98a3fc";
+ sha256 = "d3287f28964581e63a3b1a5484e47e8ef33c136b39f13e07d6f3d555c27864cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/cy/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cy/firefox-81.0b4.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "8f3784f77b09c674a23a255492f1634d280e0fc56f0a3694275ef6c024dba530";
+ sha256 = "f41fd34cf1cc72d5fc80113cdc9fae7f03f434e45e990e17a94dd68463464c49";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/da/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/da/firefox-81.0b4.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "57bc320453a7a7d19ea98c61915cafb964044be95d3d25ebfbb67668d2e8ec33";
+ sha256 = "dbbf1611913315ac5294f400c727cd5afbc832efbea56bd839b77cd4d6a5b823";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/de/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/de/firefox-81.0b4.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "7e782965454cef0005df730141f593b37e01f15c120185de02ae315a6471b0bf";
+ sha256 = "1047799de5b42b5cb0827371872b7e85b93a4474bde9288da54a573841e156bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/dsb/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/dsb/firefox-81.0b4.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "ffab16697e970e33256b518a2f607f660a4b6ea6bcb66c89ddef9d77bc2f0073";
+ sha256 = "602eaa32d32db35d6a6d07f1c0cc53eaa4e432b7ab81d1f23b47d3125ac98d24";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/el/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/el/firefox-81.0b4.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "72e2f63d29736b517c1cb1a715b3f53adc2a1b7a5275bb9254ed5246fc809d50";
+ sha256 = "8a460f9542e213b1605265c6497742e7d55213ac91b42d00a15b3123b47754ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/en-CA/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-CA/firefox-81.0b4.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "afc0656f0c1cf3b45a17475531294dd88976d2ab5adced074d041f8ab0b82e5c";
+ sha256 = "9bcc44ca3f4192a2a7a001f27db6884dd481551663b6d0c348ed0b9281dabe87";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/en-GB/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-GB/firefox-81.0b4.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "cc9a1b76381a57025a814f50240a3f54ad4c65afc6dbcb964bc64cfa0428a8b9";
+ sha256 = "9d241d56362ec52619ce02cdd2f11dc90c2e0f7c515c707ea56eca2e8f0eb306";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/en-US/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-US/firefox-81.0b4.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "baa573e6205a1892e30d5dd4cb1f569e7d188a196ff44fae9fe3b9d1f3698e53";
+ sha256 = "28972b08f8b3f2d19f5d50a2c9275fc459fc3e57df11c884149d1fdb9d99300b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/eo/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/eo/firefox-81.0b4.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "affb91fbc15242b9d7d1dd95f5a5f4d2baaba7f4c299667bb83cd2852d0e0070";
+ sha256 = "013caa4590462b4bc5dc09cb963cfd85cba4b5419111cdc87316574ca5691e80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/es-AR/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-AR/firefox-81.0b4.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "b2990fce69dd8a605367297fbb031e683a91b7992dab83bac67024dc2f4c8967";
+ sha256 = "d6970ccf4d58e2f1219cb0d43a8788084d0863f0f349ab3292e182fb0201e860";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/es-CL/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-CL/firefox-81.0b4.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "4a3ed88b87309f482c43ef8acc30e67e1e791364a774dae5ef2de9d3948dbf52";
+ sha256 = "76fb3c865b3efa1da1d34c8caa7b56b5b6d0af2cbbaeaef873fa96d2b8c93bb1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/es-ES/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-ES/firefox-81.0b4.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "3c33e05e6d28db7a164984c746c3919e641dc2a6db8d192cfe9cac000fa16743";
+ sha256 = "7b41a2b297df4f0f6d4f44e1eb0ea0cbf02454382d0994f119a77876c578c4b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/es-MX/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-MX/firefox-81.0b4.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "4b8c25940ec033be273e83694784c5175fd54f146e5d20eed04c5c675c3aa902";
+ sha256 = "733b90640a30df66700397ab0cc2045fcbc25af94ef9f36463a191228b511b77";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/et/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/et/firefox-81.0b4.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "512bec2a4e96fc4cc55bdcd2651928e3070556fb3ac266776674d2f157f839a4";
+ sha256 = "027286d744b1d9f21157d8242445ccd7610a08d8d541d64635fc16549aac1b4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/eu/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/eu/firefox-81.0b4.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "a27a0907895889a42d803da53de25c8d89387ab5dadbbf0907a9b49124de5e6a";
+ sha256 = "ff555da3aaf1abb2c384772b309fb4129dad57b9fd523fcabef5b2743d3063ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/fa/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fa/firefox-81.0b4.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "3d3fe4787c0f5cc9980cabff9830f107664af7bf30b1f7a5f9195d36a6bbeb11";
+ sha256 = "c99f9297568f93eda17058d96dfaf83e587907be9b5005e8f649f693662e4fb6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ff/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ff/firefox-81.0b4.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "4b768ef1f4c02bbd4e6ce524fb1d23c9d94778da4ef706fab4f8b6c5bbc2e22b";
+ sha256 = "91658b195a622afa3c6fde535391eff1aa6b70f4c0cccc5c55e56e6d66459435";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/fi/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fi/firefox-81.0b4.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "bf65329b5cdd186b68d14471bde971beb85d8d8d8bf1ef539b9b6ddcda352c6c";
+ sha256 = "cbc70d2051c96813ab081251c339f6cacd29ff26bdd8174b35caf9905a874635";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/fr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fr/firefox-81.0b4.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "a3f7e5ca5cf021135ee4e3723cc6752815877698f12f9f0192f6ef5df1d6ab66";
+ sha256 = "51890621c8c3c0e40103a10e705adbc860937e5dbbb8a3984eb71a5cae3ed63b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/fy-NL/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fy-NL/firefox-81.0b4.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "f8ded8da8420d57eeb97f896c1ca300ea37a05a9c4ec0882f6458fe90f9d57f4";
+ sha256 = "5c3a982a51951901732ec7684514be233fe1c44780531fb38f7205724c241387";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ga-IE/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ga-IE/firefox-81.0b4.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "e243ae2eb3bbaa2062149b81ae7a0b3707a22cdd22cf12d52b4ad16a092b1f50";
+ sha256 = "04b5d338c7557f12fc6fb2206d444a8a00be6814b1ca26de4923449a4425b57d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/gd/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gd/firefox-81.0b4.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "21c754935d320abf785d9da13458cd7cad87b94a9bd58f04b7d2caccc74d4a23";
+ sha256 = "6bc0de0ac627203b1ba035f7a7ba7dd19bd82a7730c526c217150cc5de668fd4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/gl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gl/firefox-81.0b4.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "3ed764d4ffb47f8b044122677333c56a43097f9a9f6ac41f14cd3e2c2c1b1f0f";
+ sha256 = "37522d032422af770e37a93e33de6c0b8b79b2d22c6e71f32107cc8808de4d35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/gn/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gn/firefox-81.0b4.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "4f74dce5938a97ef1b813f5e7423f8f7915a22c5248da3462ac3692534dcda09";
+ sha256 = "f761db975c72d7e419601988c0674acc7fe17227d5569cac85a1fe2d91f5141c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/gu-IN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gu-IN/firefox-81.0b4.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "1d75b6b71937b131b09ea15d5f2e1abaa53077f7e2c7d4d9716f64dc73c0c27c";
+ sha256 = "8565c1965e09060ddc5b253fa126998f827d17dd58692ec4d17d194d29a464a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/he/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/he/firefox-81.0b4.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "1e383432af4efb2e8ecf50f1ba2491312066f3b6212a82d7ce586ea6075183f6";
+ sha256 = "c3cc5911103ce955f89c5104ceb1ee50f7c047e4ec761681c8693b643f5d91a8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/hi-IN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hi-IN/firefox-81.0b4.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "2eebb66deb729e9b3ba6b2672467c3e7e1e30f978eb7a9a25c6cc87b2a524795";
+ sha256 = "95463325675e56e700eaffb6e6690f4b398adb5cb77aaa34b87e16cb142f3533";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/hr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hr/firefox-81.0b4.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "f4e71ac432b6e3991ca68190ba837ef0b6da2ca2ed0e5d4e21e0257f6bc95821";
+ sha256 = "6332ae812507f79baaed24e4fb79fc6c383418c4c9d41c0f3dbebc2fb72efef5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/hsb/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hsb/firefox-81.0b4.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "12b5694518fc5bb41a7d371a2dd0e38b0c8a63f82fc10cb9838c2f6d85f442ba";
+ sha256 = "b18a7d31d3ce7373bcbd6bb7ff56adc023c58097126781d5f915828be8fef92b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/hu/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hu/firefox-81.0b4.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "bb12e0d9ffa8adb6f34702e553b87b36f5b346a40819674f54edd6e127e3cfb7";
+ sha256 = "b1e4c6c9c21b2593f3fa111820a7e6a2e2e72e8b3065738f6a50df6ef4b7f18b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/hy-AM/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hy-AM/firefox-81.0b4.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "96224e693763a6aef998b6166a8026c6c9ac96cab1bbd064e91e823bf299c5bc";
+ sha256 = "562f4d9e094b688cb53860834e425997e65b78222724c48ff4ddd71ccca264fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ia/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ia/firefox-81.0b4.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "e2b65a3363dcc13ebbdbe85fca49038bd1bc9ec98cbc49f148de407f0c905e75";
+ sha256 = "87299a8aeee6da57666a06cc2d4f479b0c74c220e2b22ddf5254a052f11edacd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/id/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/id/firefox-81.0b4.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "d8aa4ba3b4f86c1110cf2da3a5b999901dae2510ee4083189cfa62c5db0ce0fd";
+ sha256 = "0cf1bae8def307d08e4c24fb44f7cfbebf150f1edfde2a3c0855a69775f26539";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/is/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/is/firefox-81.0b4.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "3a814210821ef5b0d9f6c6c20bff5b8a658febab7d1c2480d4de23c4a57ab52d";
+ sha256 = "6140d270e99173d995e42d32c0b696a51f72b1c6baa746549bdbbe7e2a08a811";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/it/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/it/firefox-81.0b4.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "2acce241d65617fcb1aa4ea992fbd84a1089848f3f8a2daee58d381368189bb6";
+ sha256 = "3583cf0223528929141879c085278354927ced41d71321fe8d832ebd356d4614";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ja/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ja/firefox-81.0b4.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "d25196134b98791547e92d0d1af29d27ef1ca180eec31a9b71700ccafbbff093";
+ sha256 = "4a1bcf87b3cd09d7c3379bd922ede7a3c6c4a19bf11596e858634b408df95cad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ka/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ka/firefox-81.0b4.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "733c8da99cb3746fe056b4cf76eb827333857d296a9c4d1d4617ee546001f87d";
+ sha256 = "320567daf4e4bb12c7209aff34d98efdbb2dead9b34f23d4a2181d2cdddeed71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/kab/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kab/firefox-81.0b4.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "80c0bfabb148359eda25c475563038682237df10662681577c5d652b46661180";
+ sha256 = "5b9d60703b494a4eb5956e59bc2d6893bc70e8b890d0c940f25d25b605000c89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/kk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kk/firefox-81.0b4.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "b87bc307b178c6c6fb3652fcceda3f442616f97be21e72fcdafdbd93dac18f63";
+ sha256 = "45580e0c3cbb265f718a69ac9de7220d3d89e52e3b8a5cfceb7363c20e63c83e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/km/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/km/firefox-81.0b4.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "4284fc0cc354aa780785a090672ca4391c697a40a4c4ad41f5802aa43057ee6d";
+ sha256 = "24b4879f22829a2a5d72219cba2c5658bf7c7e73ffdc9640f6e897ec613733c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/kn/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kn/firefox-81.0b4.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "106342053396211986095a4cca1ebef5c3b91f4cd06b93db8dadcbaf4822c0dc";
+ sha256 = "905ed3fa762c73c5ba677b8ca5b620294cb1ad36dea2ac53fdfca5a739c0c0e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ko/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ko/firefox-81.0b4.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "5b57440c026c2815bea57df975697b15ae347f5b82cae855d4b01b21e82e36db";
+ sha256 = "a6a63ca4106ee9c710331ea50099e2a50842465095d38ea55a63dcb3ee3d80ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/lij/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lij/firefox-81.0b4.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "b3a7b7e78c228f73d3fcb5524d786e51fa9e4826acbb0b2ac9fad70ec6e02f50";
+ sha256 = "b6fa42dc9bc68d4b71ae93eebfb1a19416f0cdd06d20fb344c0c0347aa2d4862";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/lt/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lt/firefox-81.0b4.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "f2309fc6a904f33bd96902ba349dbc47b655b888169f451ba8f8eda952ebe94a";
+ sha256 = "c70f6e7c20e252fdef6bf136c99095ebc27672719594df302e58be801a3f06d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/lv/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lv/firefox-81.0b4.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "70e583717b3b17fa68d9fab1a1c2470eaae52474e7b774f653183ba371041fce";
+ sha256 = "c64d561be20fc8f0e7507a0b1dc2e5d79af407531a37cc7da3fd880789899fdb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/mk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/mk/firefox-81.0b4.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "ba20c3d5c88ecde3aa8fe382b8af4dd372f070fc6fae75644030315e33840859";
+ sha256 = "aa38b13c6bc5288ab491f5ccee3a881474b1f42f1bd959435035782d1c39f407";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/mr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/mr/firefox-81.0b4.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "f20ff1fc503b01746c040cadd0298dfbaa96892aba20a3020f0f69ec7bc6873e";
+ sha256 = "e56eea60ca1cd447e30cccc82ce7a4797fa23e9bb4871a5e20e05d44ac35f720";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ms/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ms/firefox-81.0b4.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "6b1f0aac0028fcb24e45aade305e9e1315fff61c7e602d76e5a142326643c8a9";
+ sha256 = "9d8445e2bda6a8cc8714a0eaf82e1b9ec03fbd94042c3557f07d9c8b25bc4b6f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/my/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/my/firefox-81.0b4.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "c5994f515d238efc6fc1eb0c9aaeb0b445970594ee26802ec80331614029657b";
+ sha256 = "4a7527e5e3e6ea0181cc8b9a2f206bbe162a4e1867faa75b4af261f08e89ae0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/nb-NO/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nb-NO/firefox-81.0b4.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "bdd3cbd3188b64fb29dfcc073bd66bb19ba92978c03720a348b04d2d8ceb4ff3";
+ sha256 = "c2ae9f5fb235541cc69cc3c4307dd4b7de51a9f4b6e038ef3091a773edec6c5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ne-NP/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ne-NP/firefox-81.0b4.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "2c91bf86d1c6b5c9b7fbda1daf57ec554a69845d27cd1900c7089ea51b99aa52";
+ sha256 = "05acc175b06ab7f5861a3a7e58e9a92c40e0660224426fc8225fba6c25888726";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/nl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nl/firefox-81.0b4.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "26999404dbfa9cd673d22d32a8c310aa5e486bfa9c18890189358f35a676e42a";
+ sha256 = "640be4e631343c9f2a55c24a4d5c63908627e9ab2d39a5346d1842d8e4a57799";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/nn-NO/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nn-NO/firefox-81.0b4.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "7f6897fbdd4cefe9619f7c73b2c82ca951ef54939e353ea3e36fdf72b114ddc2";
+ sha256 = "46a898f41e5c3c9853b05fda8f44be01b2fd5a7fe3dad281c21588c2deaaedce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/oc/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/oc/firefox-81.0b4.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "b06bbf9b56c67330dea919244ba5ddfc424eb48c2776df2c3059a5786d702a1b";
+ sha256 = "7481c8bad2e905a033f09ec4c20f8d4b184a0f90fce1c10648c4fc57a7a5f301";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/pa-IN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pa-IN/firefox-81.0b4.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "c644a7e89020c0640085ff7925dbc8a3428b1d17b021822643e02949427e0581";
+ sha256 = "a460ed0241c569e1ac62727b17f8c8d0d4091e794900e2e2be7d8d8e2b90ada4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/pl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pl/firefox-81.0b4.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "baaf3ad6bbff585b82de9fcfbad371146cdc64fcca60daac2db018335472528c";
+ sha256 = "d82e300cc8be61ddc2aa66bd4d4ec35cd18e47603bd19530cf48728c5fe67a5c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/pt-BR/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pt-BR/firefox-81.0b4.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "c0daeaba4f24cd35f2ba107817553c226368ab9133782245f47c92f26cf4b49e";
+ sha256 = "1ee1560d4597adbd230fb0c556a4d8fa6984ee86bb731f7a5a936d660897eb99";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/pt-PT/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pt-PT/firefox-81.0b4.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "1515e964eb405bd368bd46a66354aac8cd0cc44f0922b50714f55d2adc98ec88";
+ sha256 = "be7e484f8c3f4d8b7b894a437b70b2f4b448e3a7df518ce6906295df9be7749d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/rm/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/rm/firefox-81.0b4.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "a0772fc62a05dbe85e435bf218fa643dbf9a81292dda482df1d4d283bc88eae7";
+ sha256 = "819cf6a13d1690dee4e4255aa0c3f551411e2b7076f8ce3447bba47f07c806db";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ro/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ro/firefox-81.0b4.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "2e2d674cce4e2fefbc70689a5057cb6f19294cc61f37775879340dae5ac3ac54";
+ sha256 = "2baa8154f358962983c7e0b26c4a7cc8cf97587b646884527fafe46f5d8d92ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ru/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ru/firefox-81.0b4.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "0d6b8905d5ebdb0642ad5722fc547ff09b7b8a0453cd30b16872ec28bb68f760";
+ sha256 = "eaaa5338ff8ffbc9bad5321ee3eb7410feb9a26a06d3cc49707c0a048f4412e2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/si/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/si/firefox-81.0b4.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "f7c83715895a77c87c7e711ea37eda5e58360f5616d35247e1919ead9535ab70";
+ sha256 = "ce04721a96cea62eb7011c261f740e9e0ad6288ad9ff231538c3a6df86fb40ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/sk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sk/firefox-81.0b4.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "a436fc43f923baac4269a40e0f4ca06b782171f3aa7abb2d35c69cc44656fb57";
+ sha256 = "4b19fef341d64f94ad97a0bb8821693b00e4e7e04454156f92f0c82f4fee0005";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/sl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sl/firefox-81.0b4.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "4580231b7220cc85e9cfbce8ab8d1c8a4071818344df3738a3cd0c2b4b83e791";
+ sha256 = "96192922f2012a3e6be634c7ed09017cebf9498c6fc2862336bfddbc4ea40840";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/son/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/son/firefox-81.0b4.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "310f20fb411aa27fa45d826008b39b4add9155af76347b7dfcee3363f4a40130";
+ sha256 = "dfb144edeb3712bc0a3bf7e0675de80315c78bea7d7c6ee5f6047c077acbddf9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/sq/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sq/firefox-81.0b4.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "44ce349d3db8b1afb7f020da53a04613b31c906795bba259dae156dcb6ef1d92";
+ sha256 = "54dfab9e843dcde43cf188ae33922371fb90c1bfda53ef629df16576d6a0bac2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/sr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sr/firefox-81.0b4.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "045e01214cc8d9c74d273960165982fa5b739bb8e18e91d59e576c815c5a4afe";
+ sha256 = "f00b5184ccb47223858128aa26481867fb33aa50a914a8c807235c9a2bdf74fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/sv-SE/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sv-SE/firefox-81.0b4.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "66a2bc65df656d98b4245c2d1611beb085c0403f87178fe9b7920018a2b0abd9";
+ sha256 = "d3884cf4a9ff23971badfb1a794c9489e0006e6851a0e501e290d8793054cc1e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ta/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ta/firefox-81.0b4.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "2e53ff624eacf0df39db5d208aa397dc21751c97ddbfaa21b4850614c40f68df";
+ sha256 = "53584d2093feffd36a8a5249ee438b82d21af834a3c2c210944030c127b91cb2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/te/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/te/firefox-81.0b4.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "3b98487fbb9339321c321c306d0c240da5b2f56c936f7581128493c91e7bba0e";
+ sha256 = "63b65440720bc492fc95d080b191ba452cc87c8501b195e02df66ea4487fb902";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/th/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/th/firefox-81.0b4.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "188230c8eee66fc85c1e20d76d953d3cf3d2fa85d9803f1adf396fba8a4bf62e";
+ sha256 = "3b01fff09734f2206e4aee227ee7f0c13544fb1635f92a5221ee356117955446";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/tl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/tl/firefox-81.0b4.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "47612e155887b0de76a0a9b74c84d2894dd43f7999c252ee74346fdb74f60f4a";
+ sha256 = "00f1c65baf63246a9ff44d98171a6ceec6e276488f5d6fbdf6f97760509b3bc7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/tr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/tr/firefox-81.0b4.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "050f115edc3ae514c0fa08174e9f15dbf3acf43cb1aa6bca9d3c4fcb5b9255e4";
+ sha256 = "064d6c6036fae215fcb50a87863e6808bd1626084d9144a18f7ea1f4c7072093";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/trs/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/trs/firefox-81.0b4.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "8c02bc28f5951350c62be9aa9a6f8a76f33eb1f4d018b12f3860e26866169578";
+ sha256 = "73c892e0b0ab0bcdbcf6af88fdc8de335bcd5c56805675ba7b487ed3b620ed22";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/uk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/uk/firefox-81.0b4.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "bb131c9754fcbee6c62de6ba95a2d786775c2835d12ca69b2b3dc556fef7d2e1";
+ sha256 = "8ac48524702e3f177e78fe97e4fcf528752a3ea0ef08e9212037dbd0febea53e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/ur/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ur/firefox-81.0b4.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "54fe4551d9095b8256d9d65dfae0f2433afc5d51055f47ec9fb9a5b538079164";
+ sha256 = "154dd642021769aa67a081080f33d87d736686b9e6e46cdfa2bd2201605bda26";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/uz/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/uz/firefox-81.0b4.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "d1e874a0aa5225a6e8d95a6d40771689663148a6eb3b6d25581339370f345187";
+ sha256 = "dd36910596d777f49de3dfe8e22f2838b76081cb259107047b9a98c3445c01eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/vi/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/vi/firefox-81.0b4.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "1335be8474044bff9a47a5c2952974f55edb80d7b70de25fcaf5aee5c0487d33";
+ sha256 = "3cef9f657f83bbfc68ab4a7c8ab84e1e937553cca98cfc30d3fbbec5c8be7907";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/xh/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/xh/firefox-81.0b4.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "dad0ac74d192b5d89d7e89dac553f3f18a781a51330f7e154ce4cb6ee4c45782";
+ sha256 = "30a98fa9218cbb07d792629e73a250659b321a3555eedca0a68e6ffb1d5191a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/zh-CN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/zh-CN/firefox-81.0b4.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "a19ace9857172338831b1cf0b581ce1b09ff75e96417bc5ada5805c3074c0a98";
+ sha256 = "bf15e819d84a3cd3825df2046bd9ffc139008f45fdbbdc64e04cec6a549af3e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-x86_64/zh-TW/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/zh-TW/firefox-81.0b4.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "73914747c3472b6ff5cac485822fbba4be19c630dd4ddf925a6f2afba2849cf9";
+ sha256 = "b194749cb05fe282f59f2f6621a5d04fba42406d7a3ea71242b667fe94a5a857";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ach/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ach/firefox-81.0b4.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "c95aa05f0a86fc30f20a4438ac66541b5ad03ecb904db4c19f50e659403d20f7";
+ sha256 = "203ca1a13f76935935daf2124c662329df93af0e44b4bcee7334ff60092c8027";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/af/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/af/firefox-81.0b4.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "c20dc401907d2b42aa4f2e920833c2cd7fe1fed35788422e84837d401f48bede";
+ sha256 = "481d233552b0702a8b8092748b4c71da3c14c8df5e971c5b4662273cd8808022";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/an/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/an/firefox-81.0b4.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "5b965e8d6c0baf11be096efe2ad3ba638bf7b10afbc39db7c29b9bbf6fe0c797";
+ sha256 = "a128b96a34eea409a8b5fa412e6a1a36bcc28f2fbed40ba9b474b9d86d23dbae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ar/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ar/firefox-81.0b4.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "fba07c7262166659140132b7380f8f293194abe46045a3994e5f6c194709b120";
+ sha256 = "a2ab8b556b6b477bb1aa287f630e7ae6aa902fd1b75968c01c2e2c76fe9cdf09";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ast/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ast/firefox-81.0b4.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "8d4daa8bc48e6975eea8229718b0a04698c0ab0aecc5ab767d14444e854187f8";
+ sha256 = "193422cbafcaf5ed58f334a9d5b30f9a6181aa1cb649303df18626d9a3484088";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/az/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/az/firefox-81.0b4.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "41c13d04350b9fdf5be5c385bb74ac5e8ab9296c186627b89e43e5a0ab1deff0";
+ sha256 = "c206f5351f0ba474a5277e223514f032c7ff0b66029f570143f2d1d2b8ccf566";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/be/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/be/firefox-81.0b4.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "d46d199e66e4c4049496b29acf973731e1cfac1e3e40c45f8387444075dbfa51";
+ sha256 = "c3d7d04ea43230b6a6e4227b799d47348bc5c2ab6a60e93f4107efa6e7b34ef3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/bg/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bg/firefox-81.0b4.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "157571ec4956ec72ace64ccc156d565f96f42bfce4d79c25fe5e60ab62197388";
+ sha256 = "08edf0db8aebd41f25366ef4302214b4ef00540be39406fc780eec288b0de324";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/bn/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bn/firefox-81.0b4.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "82a7018fb11e81f26d1870021266182c608433e64b38b4ef59422332261327ef";
+ sha256 = "a6d5dd5918d94e74ee8ffeb10c4caba65697ecdb81598b0bda815fa5d4830a78";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/br/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/br/firefox-81.0b4.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "ba31697f52277171e4de631e161c319c9aa9b35ca128d9f1e94b4a43badcf5d7";
+ sha256 = "4e7ffbc380b6f8716399ee9d7b9ffc5fcdcae72f48b63ae4bcd2011a85efa0b1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/bs/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bs/firefox-81.0b4.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "a99c9753fd41832d4ab310d5bc31978dae09b217f046fe7bc3c5c52f9e82193d";
+ sha256 = "ef36dae13dc3c943e5981a16d7ca61b4c6daa9a4873d2cd87022fbbcd01c8907";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ca-valencia/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ca-valencia/firefox-81.0b4.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "630893c4edc30df6c41e2124be493be1a7927f94fc0638796b335a9ae3b990ca";
+ sha256 = "584a0370f79011dd2691461acd573133348a94cc1323d6fb99dea9dd6df1e155";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ca/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ca/firefox-81.0b4.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "9a38f2b2697d453b946486f293d4c8da0b63c22f0866c90ca42ab1200d27a5bc";
+ sha256 = "e280fe05f4e9320fd354407811ea8664d50de3810298e5eb4922b2d3e549ad11";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/cak/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cak/firefox-81.0b4.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "a78bc582617086d993bd35cf763e5da105c37ec1d2ce962c28c9d8761cc47535";
+ sha256 = "3decca8b5b0d44db169abfa20f07b3c109bbea0a68ae3e44a35f97e3b989324b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/cs/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cs/firefox-81.0b4.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "466826a061e54f7e5d5aac5db9ce288588ba3d839db4d94e32d377e845aa869e";
+ sha256 = "efccc2a43f961179f61eb7858b1e17ffd069bf7a26027faaad09f1b529ade52c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/cy/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cy/firefox-81.0b4.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "f95226e082dd690f037b0ba60e8d47ce7d880005c0b7c8ff97db3f6d24f536f7";
+ sha256 = "dc8a1945d0230070e2bdf65b673a9aecc4868c9821f7f1e2f6e0d18bb98c912d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/da/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/da/firefox-81.0b4.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "ee5cdbe8be79834b0d81bfbe7f10c2c98f42d07bb511681eea566a2009d3a363";
+ sha256 = "058b800e2c9fc464f2a75fa48542269056a88916b9474a953f0d29a3e9041257";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/de/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/de/firefox-81.0b4.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "7a633122b530bce8d6869f5fd03d7ecae40f3b718cd862151b179d4e4c9234a1";
+ sha256 = "7fbd0b27073b2c46829fc0d631ed11fd9a38a07d0ce474f6837ad1f5c2adff62";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/dsb/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/dsb/firefox-81.0b4.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "d6c6ba8f3c3ac64fd847bf2c48cc57b025908fcfba43722db2056971d413bf21";
+ sha256 = "d0b6083098d416366040a877a92b163d469e2764af995c65fced49de23148624";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/el/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/el/firefox-81.0b4.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "767d72120d99c6868859218abd2a19df545e00537d82f720d630aa2714eb1500";
+ sha256 = "104258b0e47b661d7c75c72f5a0d7750399a101a9996a3f8837f0f524e9820db";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/en-CA/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-CA/firefox-81.0b4.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "9e52734eb1ad30092a1e51d9a1d2c0d9fef1657c471ff8af5a709654c28d9991";
+ sha256 = "be6750a6946b7ef58869d0c9f0412febffcbe4955c823a573d02822f9a14266e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/en-GB/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-GB/firefox-81.0b4.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "0b78313c516b2da9c3442c50a1678a7c5898acd53f8f55a0506f1e60ae1c622a";
+ sha256 = "e6d2c60c30aa90b6026cb85d6fc3a1d1b7266263980df652c9a1c158528cfc74";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/en-US/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-US/firefox-81.0b4.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "a254b48fc1faabe03db018a22166898a2363bcad6a507dfa2df3889dd4977e80";
+ sha256 = "be534d43126a7fdd297f3431b579495b6f22832a358a0c793a23bea8adce1c9d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/eo/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/eo/firefox-81.0b4.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "decc99f94501b1a4ff11194ca4f02731aca46293faae7663c10b77d845b07c97";
+ sha256 = "6ffe84994fe7db178e59ea667495e95e6fba621cd0e4ec812d94dc3d98cf0a3e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/es-AR/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-AR/firefox-81.0b4.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "561b1c3687b676b1bbbdb9730801a487bb97efe98efe5bf44731cd0245e231e8";
+ sha256 = "982874a48791db0bc98559de45bb8884da93ee0a0738664c73ae5a08b3b1a2ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/es-CL/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-CL/firefox-81.0b4.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "5de4b0c90da0f5b9a081dfd12143fa406d3712d4693ee28fb1667947fe3f0289";
+ sha256 = "c21fcdeacdf570a9f8bba9c34c64a60776aa8a4de56b5f773b1d26eca6d65b70";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/es-ES/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-ES/firefox-81.0b4.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "99aaf2c57fd51e61781053b3ee60ce1a89319b1101f95201f31f4128cec02905";
+ sha256 = "bb34dda74d59c862ab24ad9ff0c5ad1e1fb5d73e6029b915f966d0913cf4506a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/es-MX/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-MX/firefox-81.0b4.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "d1e7e80b55ed6567cc3d651ec28efd64512276178ae1a0c8af9cb4db37103c11";
+ sha256 = "53686263f77643ad4f769faac81697c7e1eca216ed0a7b051c2318b181318d7b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/et/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/et/firefox-81.0b4.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "9ff5dfd1b737f3eb881decea26a36af108c7b4d7729d19849d9834eec7b853b4";
+ sha256 = "053d8ad6cf01be9f51cd133090e99230dfe797effc749e14c8a21ba712546776";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/eu/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/eu/firefox-81.0b4.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "3da605f9a1bc592f9bdf7ce041bfc43f2235c2764828af4bee017993f38b34f9";
+ sha256 = "77774b9126ccbca2b5716b1701f8eb7933ee67ec5437a00b8ab991f423888a80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/fa/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fa/firefox-81.0b4.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "1ea532fad20ae95df4bef6e68e6ca39a40c546edf14f164d052b9bcef3ba59d2";
+ sha256 = "4a0554bff8c11ca39f1de223537d595d298e6f61c2590543151e8ab1d8eca36e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ff/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ff/firefox-81.0b4.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "0fc5478ea083211c952d0c6f43a6061e7ad6a1b4c44f419204f143f1ada6c46e";
+ sha256 = "272784bfa53ddc48fa43590b3ebd2fce808786b4649efa1d5b417488efbb8911";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/fi/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fi/firefox-81.0b4.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "3374b7bd157211e8ddb5b3c5b2b719a341387eefd59016ae0856a2bab71ae8f2";
+ sha256 = "c389eb80f3cdd215549c7ce55402a7c03544eca2fa3c2074842af32755d14cac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/fr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fr/firefox-81.0b4.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "024ce5cd0bafee4ef9060e75a64cc7e04023fd9e9a62bc7bfcbb0e7895316d54";
+ sha256 = "dc5a79229fbdd3e9fada6b6bbb35183c17a703b9c3f29d9172f2b56cd5c0d289";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/fy-NL/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fy-NL/firefox-81.0b4.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "76b362664bb225421a845171afdc859575b0f706549e1b60657cea47f3678265";
+ sha256 = "3eb69867818f0a8448e4f421f0ded4ad1a172bd5c99048065bd4b6cf83e8b25c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ga-IE/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ga-IE/firefox-81.0b4.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "6093099531b07d1e6a37703aeee8333cf5e486faf7712f444a8b9e439c599a6c";
+ sha256 = "b09208ca65279e393f512a04712f91b2b170ca6e32777479acb7a03db89e87dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/gd/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gd/firefox-81.0b4.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "0c463034000e2835bd13f4ba7f411ff155462590e161b07d89ab4c3bbc3726d6";
+ sha256 = "011beadfc3e78ff216a13d55a9b54471ebf84bb1be852aa986ab5ba1648836f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/gl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gl/firefox-81.0b4.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "e743aa14124231717ad972f50b7ac1bf295cc67b9477b9db08cb688fcd7ec3d8";
+ sha256 = "c492314ad418a190484fce335d1dc5a28a515f630c59b1cf2d7e812b6d3c3bf4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/gn/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gn/firefox-81.0b4.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "8c6811b5d5dd33d18e6610af344f97d62790d8d5750418ec0f21d9f9e0fd37f2";
+ sha256 = "25b03d5251a69631f5d0cbf9dd89d1ce1dd5355e05efcc233bcf62e5311d4d01";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/gu-IN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gu-IN/firefox-81.0b4.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "b983b6d1f852c78f9930d4f0a8ecd8c2dfd552bd096e0cf29f228c3e1bc35fa6";
+ sha256 = "1cc9a3b933b625a26beeb7c31eb062e22ff8dc98c4860bf6ef4aef5567552d63";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/he/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/he/firefox-81.0b4.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "ddfb93bbd03aa7d7bd52fa0f7b934bd46898975b728f6418e7318bd63c3efcf7";
+ sha256 = "027cd01f51db3b4d27381870ddf95ca2f7252bf7c6588c3d073d303bebb45311";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/hi-IN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hi-IN/firefox-81.0b4.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "b2cafc34206987deb4357d3f7628cc85ba2df43df8c4b2e4ca1e0b997737372d";
+ sha256 = "99d6d2159ae34ce2154678e4913145ccb9c96572ef19a18db6a223647b7ec68e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/hr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hr/firefox-81.0b4.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "03e543d215397e93ff41604909f81a74a45ed5fcc09ff6d17fc26e9ada47b3d0";
+ sha256 = "d9b2fbc6474bac73fe7fb5c4eb818f5dc0d74cbbd52c3aacbed0f17db8bce9eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/hsb/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hsb/firefox-81.0b4.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "c7fe91aeab07e566c817e6bf34c08bf2c7c2c126fcaa62bed9d666f89d9cecd3";
+ sha256 = "dcd0c254c542a50807cbf1d0036a4cab5463c237318fb1d1fec9826d052aef62";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/hu/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hu/firefox-81.0b4.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "8075abfc9e82ad812cb413440cb20c55b1f8807c05a164b5fb1658504639e13e";
+ sha256 = "5a0a94eeb9c8d219b3e34e92fc51163e190c606f975735215177d521b7ed9656";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/hy-AM/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hy-AM/firefox-81.0b4.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "e14e6d19c65fac2de302fa203760efae8804db439ad67bc4e8e604a98394ad34";
+ sha256 = "2ff26ab884697d226bcfe224ff5c068aed355f6bb00777fa6d9f3bd0b9f9b386";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ia/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ia/firefox-81.0b4.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "b8e500e10a6ebc05a7c666075851e4e37fcb2199b0bd0a0729d8a6a3a2a1ff90";
+ sha256 = "7bd9d940f81d76984886463cc10920896247084f91efedf99f787601a47abba6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/id/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/id/firefox-81.0b4.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "ef0684735d48f667df792036ff5917f8d1ce58bd2dcd719c8990ff077f5d47a3";
+ sha256 = "c415b55ec7701219557cc4815ec0975d86f18312a2ef6a8abf3e82876edc5045";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/is/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/is/firefox-81.0b4.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "bf734b89739a181cfb8ed7eb5daf7412553e279aab1467d677cf3e1476460f7e";
+ sha256 = "3ee6e83bd9c244b123c1a1989fbcc0524c4101fefe697ea0a9ab7c6a05302ac5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/it/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/it/firefox-81.0b4.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "76eeb8b7466ac0eb3e0f12d393cd35d6ced9805dc78463327e0ad434af442dc3";
+ sha256 = "de141769375ff5da94ee1030f5af84b309917eeea48cde769419004ca5a015c6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ja/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ja/firefox-81.0b4.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "80899dafca1e9b9b9526cd611cc41e4e3c78fa6e4a700908e6c3749d1a6d4753";
+ sha256 = "69c5c01998a78c17ba55f262493c4e7bfa4fe03bd19a8ca605546f41f0c6f794";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ka/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ka/firefox-81.0b4.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "dcc7c6540cfda312a3ab4f410969aabac19307b29217dc935f5f9f0d3f027211";
+ sha256 = "4c37f22f1a20c79c1b391b0f86bde8535c0766980a1b9a42ef912cbf91752392";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/kab/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kab/firefox-81.0b4.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "7bcb2bc74f9e46e69a218bebc63fef7ec86848feae475dc381f654ab958fc07c";
+ sha256 = "1c6722e18e1eff26918de17454d8103929115f7f036a1c23247695f7fee13051";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/kk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kk/firefox-81.0b4.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "605adecfebfa0664fd97b621e22f6bb1835733c46f2c96aaffa7d73e9f658dd3";
+ sha256 = "9ef2e2142d2e6d49adf59e6dd190b4ff816cf566cd35e5d288f66794aa2d73c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/km/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/km/firefox-81.0b4.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "9911c0e3e88888a4066151c9e7a0c6f70e3add4b8f99e496e5a0fe53d8af937c";
+ sha256 = "bf0899cad62f3331d157c557cbf3cf1f7faadaa7f9aeed3c6547b4533689dd7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/kn/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kn/firefox-81.0b4.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "411a655cff2f061dca76bee33b723a286e3672950441be143a29b57269179f42";
+ sha256 = "cfea495b254e1ca8c1be94e95f0c1f126d5f1a1c9d54129562fbec5ded6dec58";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ko/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ko/firefox-81.0b4.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "82aba23c212ff220854ccff2b84932473037ff7732bc8aeace6f771732fc3add";
+ sha256 = "ba8c93f8567a4f6bbf7af3c38a2d2ee793b05c0246638ded86538f91e6e9112b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/lij/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lij/firefox-81.0b4.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "903ac88108c6b8973dadc412f85b8b241dd388f83508bf7d2aefd64234ffb62c";
+ sha256 = "c093b95b291af78460396e87ad39aa142d9925a7253f74aef9640fac0134e397";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/lt/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lt/firefox-81.0b4.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "3b97cca86af3b94777b4ef389d7ba9027f482c3a48dd5f16dea3130d508ee20f";
+ sha256 = "b035e58bfe373138626d9c5a22e6b6a8c6f35e8ba30ce821f80a1a85fd16c35c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/lv/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lv/firefox-81.0b4.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "f5100e1ebfe3e8df3873e487221b4829c9b05e995d02f93dcac7e4ddd37a473d";
+ sha256 = "6dd5cf66db0207527966532a2728d37438f71d1e79caf9b97916d0e404c9509f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/mk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/mk/firefox-81.0b4.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "78237d16087898319dd6f8993494a84bd8554ff68826ce1bcaecb0733375a46b";
+ sha256 = "1308f476d0052e1317b4c7db29d4d2218c60921a9ba7f619dde4455aee7978de";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/mr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/mr/firefox-81.0b4.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "4ab019edd1a72b22faa8f294698f09d1b760855ace96396a53745d53013da407";
+ sha256 = "7336012a19cd650dfb8f842de37da8e29e7b0948cc707880667eca87bb31869a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ms/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ms/firefox-81.0b4.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "ced211480048fb2105bfb956430459706d4185d01a740f30d544b2da4de16282";
+ sha256 = "192e12151ed1be4c3f7ea12beedd2c50f6e7fa877ae8c448cc899cd0fa1c6d24";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/my/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/my/firefox-81.0b4.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "44a29644307d24b1e6f2c178c262858212fb0294bf46ddae8d6ebc5606541f0c";
+ sha256 = "08db2ff728d5bfcf751e95eb9bba34a94c435e53863790ae06daf803d56c227d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/nb-NO/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nb-NO/firefox-81.0b4.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "00c84bfd35833898706297f35b78eb0bfd3767bdcb9688e4deac0731b99720de";
+ sha256 = "22cfe518994fff77dc41e6f45550549593564ef2fa2dd34e31af17f5e42d636d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ne-NP/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ne-NP/firefox-81.0b4.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "e7eb9deabda42cdaa0f5b94b9e216d7681bb95f271fb4a73fad216a7fe7b9ee3";
+ sha256 = "605180e46adcaee8fb813dc41c4e7bbe5f509f181b607554137712405c0cc294";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/nl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nl/firefox-81.0b4.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "c73694c9c25f5bb45e657fbb47b5143c6812e15b62487036306074f5818ac107";
+ sha256 = "ba8b45685a1d428d5fa1e38e1a3ec024f55db2f3ce4221fd53b96b0e0801a6b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/nn-NO/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nn-NO/firefox-81.0b4.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "defeb54e992715ff6f3e450d0ca2fe1dedf70a0f2776010d44e0ad864dfa2231";
+ sha256 = "0b76c63f7942576a2deb29cf15b089d2e73aa0b25f07eb1a511ccf033c68234a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/oc/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/oc/firefox-81.0b4.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "e60ab6dea689030851a07178b56a979d30f4f1247329692ff93ca81dd59d5435";
+ sha256 = "5de508b4039c395b594a0c78d25655113906b95a735d1e94f8e1171ca789da19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/pa-IN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pa-IN/firefox-81.0b4.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "79dcb55f76031c0d05ff97810f0b9f6c11fbca3cf8a41b2b04ac06526dea5020";
+ sha256 = "0bf9e4751ef967f4c6f63cb6332fe3940698b3e67d0e4873ea6bf639487159f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/pl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pl/firefox-81.0b4.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "5944423bd0bbdd744c66237fcfa6aa00eba60e68b5cfa400b47a39b9fa77baa9";
+ sha256 = "0fcece8a65132810cb297a599cd4b003604854f0af684b33c9de554fbf7b1e86";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/pt-BR/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pt-BR/firefox-81.0b4.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "6efa3010b67b697211b8f83a1fae8e7b62f4207bef1d71fa3a02fb6d9d620195";
+ sha256 = "8363d209d1eb7e8053acb4805df119e230ab31e74b3389ddb01b53b032c12bf4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/pt-PT/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pt-PT/firefox-81.0b4.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "b817ad0bfbd0cd0f8f3fa304ca82b0b2f30bb8dd5542e7d3422237d53b31cad5";
+ sha256 = "cf2ecf2a673f0a4f17cecb10b330bec530fd6e37aff9ed821aa68e202f59f864";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/rm/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/rm/firefox-81.0b4.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "a46d4e796bc3771b076845281a07a83016880295b35db3ff8fcfb2f0485602ac";
+ sha256 = "8849e945e79f0f9605e288de967e9f5316c792b150654e23ca65f6c91bba8978";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ro/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ro/firefox-81.0b4.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "5ea2f33d5274e4e1c105229ebe0a1cb1e8118c4157d059d62dafb893e7281d4f";
+ sha256 = "452496612b170e53423009a128f092a3d4a372e0e6fe352e649b3c989f6f254b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ru/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ru/firefox-81.0b4.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "e5513faf273a108b271cdb4eb3f20600030ea8ccf095fb7e4992fd72537c6433";
+ sha256 = "0e7787bee9fdbb1ca0bd3ef050b1ee5d6c6d8277da941232d6ef10c612003773";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/si/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/si/firefox-81.0b4.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "71b01eb76cc515af4ac1d4a28fbd27acea07cf57c26c84896ac70838cbc4d88d";
+ sha256 = "bfd6df7b86490aa941f5878ad749d7918bc3c907a177213ab8a60df0270eea69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/sk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sk/firefox-81.0b4.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "78e954e351141f5c92b0e975f6c3bdfa9dea259cfdbb195848f8a926009d8cbc";
+ sha256 = "87c4827968ac3de5fb7609b9d7685653ef279bafbbb8b15f15f93cc876d6e021";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/sl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sl/firefox-81.0b4.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "50f8d47d6de655322ae96b637045c44c27461dd9781d05c7a5c68fdec9433a22";
+ sha256 = "6b272ee0cc91ba6114dc777f1833ed5201a96fd905a0d68a71cbafafe1a066cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/son/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/son/firefox-81.0b4.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "0225bbf879728bbc64bbaf8b8db1881cff37706865a85ba786d159607865e4e9";
+ sha256 = "342f9eedcb359409fb324c13120ed25421435b614e9b5e15585ccf1551c263c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/sq/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sq/firefox-81.0b4.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "3653b02ba5b32a2d5b2d886cbf5aa8279d4217a5066ba7757668c3bc4a7928b1";
+ sha256 = "ad11f5878139c46a2344d0bcf6b02ad2c19e59f9861e7ac74668801e14742b73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/sr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sr/firefox-81.0b4.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "5a5965f6855eecf7aa11a11cf752f354663a30daa7623cee72364eebc1e7540f";
+ sha256 = "5e555aafe353036537609b9ba997374d106bb5ecaaa386b5395b7d156ff89901";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/sv-SE/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sv-SE/firefox-81.0b4.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "723689ff6da680082e1e3e3ac3c81b2e6378780150ec958df91c49e1b655304a";
+ sha256 = "cbd33b4fd20d8a7401e384196c28adf9fda6ee2bf24895d75e75f8b727d33e53";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ta/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ta/firefox-81.0b4.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "2a3a062e0c00667d011d07c94863f93dec6197c2d627c32a3b7d53aa8cf4fd16";
+ sha256 = "8e4e9919ec79c1847449cc75539f24801d972b67d6895727aafddf7485d95ed3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/te/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/te/firefox-81.0b4.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "56c8bafd594a4661618424fb0cf56dbcdbf8c7192b875dd9175ad0716f5aead3";
+ sha256 = "cb756aa758e69f26eb50d2e81bcb922c2a15a2304ef99debe67a57c44b2c3c52";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/th/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/th/firefox-81.0b4.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "e8fe3a7ae603b2e10edabf6b7d21831f1e90ef33cd32ddbd42c2d51dbd2bf347";
+ sha256 = "8c2be1458aa4077264ec946181d7ab3160086d12c821dc3d5fa3bbba46de3574";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/tl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/tl/firefox-81.0b4.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "1843201fdd0c198f1b0a7faabbcf3eb1bf94bb90aaf17f637b3a21aec3fd46bd";
+ sha256 = "e51e4cf97b79b3720129ed9467b57d393a4ffd5698a9a941cd28feffa1d166fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/tr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/tr/firefox-81.0b4.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "f50155ef38be88543bfa039c293a5e405b6f0cc45988356213707c6a23e91c3a";
+ sha256 = "9f0a494434bc3d78c43428bc535517b5d61743326fbdbf1836a84f353408a54e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/trs/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/trs/firefox-81.0b4.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "4e25bb3f9a3e30b110dd08297c34db0a6df068117bd60a7ce1adc7541637fa3a";
+ sha256 = "24cadb7247a254595c29aebe60784d37061465f2c960a8d036096c6df71e4186";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/uk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/uk/firefox-81.0b4.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "037e10ecb056be944a039ed69cf00d5e26e423d9f224fb632256bdcb0df9fe56";
+ sha256 = "6aa85e7119fd3ca00cd87d898eb93d954b1e58d01edf14106c41df98bdca4d99";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/ur/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ur/firefox-81.0b4.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "79ec0515ed9c39dec7fc053bf1c0649494571d1d240737b9e99b7cf081d0ac24";
+ sha256 = "6b188379acb89178d08e827a60244c2298eae62434991d53378327c36829fa01";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/uz/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/uz/firefox-81.0b4.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "20007b42603acf29a32f20a900597928fead8bf550f5e085d20f75fd7043000d";
+ sha256 = "782ced50737f68a9fa6db854cde83ef7bbc6f95776a44918248efcedd95230ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/vi/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/vi/firefox-81.0b4.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "66826957d8668cb8e5970a812469f5cc8703b9e7251314c89ad79389c08834e1";
+ sha256 = "37b600b306c901080f659955163b1696f5129e71bc3c5f65dc74d280ee6e3024";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/xh/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/xh/firefox-81.0b4.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "1d304796883187c2d610ab171c72db38e915cdbd958f2b27adceb932d41bbfed";
+ sha256 = "ebdfb9a50a5a7cad0508ade647ef3f81e18837d6b84212de6393a854bbfc652f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/zh-CN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/zh-CN/firefox-81.0b4.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "dbf10c078118dbb59d18504465f30cca18c76603679ef71e209afe1017711a1b";
+ sha256 = "fbc7b8952fa6d2d73b736abf4e60a10512eb983ea4588f7e746bff9512b953ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b7/linux-i686/zh-TW/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/zh-TW/firefox-81.0b4.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "97a3f9fe2527a6b1f74c46e63d75794eb616ecab1b98962dc591d2e5a634fad3";
+ sha256 = "5c29c56ef6480703ef9b6a2dc3cae8bc45b2fc01495ba099bd1ee28bbcdce55a";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 6f5b18bd56cb3..d86b9d6f98709 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -45,7 +45,7 @@
, gnused
, gnugrep
, gnupg
-, ffmpeg_3
+, ffmpeg
, runtimeShell
, mesa # firefox wants gbm for drm+dmabuf
, systemLocale ? config.i18n.defaultLocale or "en-US"
@@ -130,7 +130,7 @@ stdenv.mkDerivation {
libpulseaudio
(lib.getDev libpulseaudio)
systemd
- ffmpeg_3
+ ffmpeg
] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
stdenv.cc.cc
];
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index fcf9e42866d6c..5b61afe0241c0 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,965 +1,965 @@
{
- version = "79.0b7";
+ version = "80.0b8";
sources = [
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ach/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ach/firefox-80.0b8.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "2a659a4c9ce537066033ad5b9b074cf7ed287f2d6a74f19629b12da972d4f8b0";
+ sha256 = "f9b686c12733f6be1c96fcc71727f55e9c79f417df64a4b703c7fadaaf3a85e6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/af/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/af/firefox-80.0b8.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "3ae9a051572c9e4a1e4073b481b7e88d20e38141ae9d1e9bf5d52dfcd4ed5c64";
+ sha256 = "dc73e323741c3612607812878d24450b0b5d5274a8e58d25a9c3957d457b2431";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/an/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/an/firefox-80.0b8.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "0797cee34f6b9239ebebbbe4d8f8df69c72ed2082bfbe31baf480409c7775f23";
+ sha256 = "a84e966f8ac0373f63c7fd76148e16c56af645bb9b83cccee91e20065883f92d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ar/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ar/firefox-80.0b8.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "6c7d5f915298719685f9f0fdd7e1e723b1a211d1f3a2d3ffe8e4990c05074731";
+ sha256 = "9949f976617961c3853fc6e4596bac9a7c18d66b72df22b9b217dbccaea6b0c7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ast/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ast/firefox-80.0b8.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "c5f1e493ca669097f6fb55a55fa807a32811f04908a07d3226d15f4538c3904d";
+ sha256 = "89f277e215e11c7efd270c6f0952292db5c85057a50b48a3753fb16c1322587d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/az/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/az/firefox-80.0b8.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "71a2053e7111c7b2fee0e894233a9683f6642a99122497b0576afe7ae1394d5f";
+ sha256 = "44c84f6e00f5672c4f4b5d26d727da4aa0e8f5bbdcb4ab484be4015b5ea4bb55";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/be/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/be/firefox-80.0b8.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "1f31dc9330c9448da8e479f84c6c5afc0d9d3d35fc5cf69f3219a97587b1ef8d";
+ sha256 = "cbcb4dbf931214f01167705529ce410935a378ddf76f32c04a16a019a04dcec6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/bg/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/bg/firefox-80.0b8.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "9edfd72f9af794c5ae3a09f2f116030c54d0afe06885c06a0488383545a24015";
+ sha256 = "6af931944901fc143d9958538aecfcfa5c8604aa928dcad7ff4062e4752b2861";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/bn/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/bn/firefox-80.0b8.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "13bf7557054b87ea9dac68f570ce74d7db2804b253c19fdb971590676a81463a";
+ sha256 = "5f44e1a8abf75708aed3c73c217ac6aa31520c32eae8c6a2c28838d4591fd779";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/br/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/br/firefox-80.0b8.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "101e1695b473a27bd74598f4619990ebb174675de425b5c8cb61388d774751f0";
+ sha256 = "7f345832f046770ff20457c902b499a6d2d3650e3cbad696d0a0ce81371b8710";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/bs/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/bs/firefox-80.0b8.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "0d31577767122a8d3efffffd8a5a9c185ef52211c6b29f640c23a321f7677e9a";
+ sha256 = "539e441b74c8897113d8fe36076473f61cd26f9be24d5197dfa8f92a5ce68169";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ca-valencia/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ca-valencia/firefox-80.0b8.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "1c85f9c3cc3ff7e3c0ada13dd820253e1f40ba9a16ef1c3133cca96ff2365b88";
+ sha256 = "8f8581a6888dbdce1d357e8a289a0befa20e1679a8cc7bff13ef237bb5498ec9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ca/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ca/firefox-80.0b8.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "bb9302215164d27e94b86987a7251fab10ca07a14187164fb1f4315504eec3c0";
+ sha256 = "5f3b7553a62465e18e103ffce48f75cc58489349c3cf966e3ba0138ce14d7b8c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/cak/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/cak/firefox-80.0b8.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "e3a9ec93be88bbd39936f889f922fc3e0acc863ea722fcfcf6594e2d0e43290c";
+ sha256 = "a1269157c6ec005756c1e0f0bbbf61a524f03b4c69022a2c49661c0375a78839";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/cs/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/cs/firefox-80.0b8.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "e5ec5ea8b0046268efb1c18c4c6658011937350e8e76cdbb3e3a0a23267170c8";
+ sha256 = "15a26b351b40964089c8eed80fd5cadafd66ef39abbf19ce50a8b7ef5bdc661d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/cy/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/cy/firefox-80.0b8.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "9d1213c853be161754bb043d05d01a78cb7a371e7d37bdddfb5f63f6d1591c24";
+ sha256 = "8400fc3e6192f2095d4a57bf354dbeee1b771a8aa61ab0d865956cdddfafcaf6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/da/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/da/firefox-80.0b8.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "0fb13fee88dcd92efec4149ab9b9e59a5580c2d23db696ec3dbc8e3884b4f9fa";
+ sha256 = "83c7818e65c32723c2bd0a4f65a33f19941fdcc5d84055cf2532cf8c4592020b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/de/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/de/firefox-80.0b8.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "cc4faf8b58e4ef0818c20a8b06dc16d20eef1ccc8f556e60de5229797f06dd95";
+ sha256 = "589b9249ffcff23c388716c24cd09baa8b309d771b97f4dfcf9c979ad9a3342a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/dsb/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/dsb/firefox-80.0b8.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "361815297980f892965ceeb1973fae3497c7a63b81165b8d9ebaff2eb9974045";
+ sha256 = "df57cc439fa74d93921c7c1265b7335e23c0df545e78eccce34e06fa528e75b3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/el/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/el/firefox-80.0b8.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "0fb9e9a4a4fb751174b6dca7e08d64c90b216bf05986bb3dc22a9e43e92fb115";
+ sha256 = "7a2b0380cc8733e7d6eb5adc228fd543d8459d7b7d9ffbcb39b73dffd395e5de";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/en-CA/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/en-CA/firefox-80.0b8.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "560acac5ae8b74dfb8e920fa305a0521dd21100612bdf4c246672d5fbc22028d";
+ sha256 = "6e747524fb05aa987e0c24b21fc9ab27901f1cb205b7cffa100d5bdb7ba130c6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/en-GB/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/en-GB/firefox-80.0b8.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "1a7b0655c42dde407bff4e080bd300b0d58e684988980f29833c99d377ce6eb9";
+ sha256 = "4e95f0c08c44e6d4830abaf9c2d25b10e63753f1dd48e192d4464a03b82a68de";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/en-US/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/en-US/firefox-80.0b8.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "73abe84bfe269e88a5ae3166650e3e8003baaad070f20d02dfbb1fc7bd4bbcd0";
+ sha256 = "2b75be9a3961e734ae16e591c367e76828e9a3adc458629db69fe5fb32a8b476";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/eo/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/eo/firefox-80.0b8.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "496452c6cba42e034a06ff131422848482cac1f21458073807fe63a8c7a4181e";
+ sha256 = "2fb71c60605c4c56432c262f62d72509d520787a7e86a45b496a68e55d08823b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/es-AR/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/es-AR/firefox-80.0b8.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "ba4c710925d449742163879277cd09d3b78edcb07a47650ce4979742c1b78b2f";
+ sha256 = "3aefd418e20dbb7ae0b8aa87d15be140b4ddd7f6572ae0ca691b98f7f919361b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/es-CL/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/es-CL/firefox-80.0b8.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "f03b825ceb72e73a8bf338e218e9e31f67db0474915af7ad45e6b5274ba9cb92";
+ sha256 = "7d650204f7f717cb39b218919b3654db5cced3fffa4d06fdcbd4eba5cea1263b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/es-ES/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/es-ES/firefox-80.0b8.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "05b8ee0cba2a66eebf519f8f81ff7cd5a4f71325a36d86fb32454190d8a74e47";
+ sha256 = "5870182df6c69538ac1eaad0e61f580165e2e916cb76bbdee8b659a5a58dc68b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/es-MX/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/es-MX/firefox-80.0b8.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "7007566a648ef1352fde0b4f27343e556eaa9d637c94130cbac4e678f323ed2d";
+ sha256 = "166dc0e61759c879737a10c3b709e5bc94493bfbf01a7997c2d38b48254d6af6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/et/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/et/firefox-80.0b8.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "8e312269718a58ac88bf906ac0f7eafe534467d224c131756ba7c17165eb495a";
+ sha256 = "b8b8ea33ad920876b36abd8d35a61f01548c5a482c7eab0998f83f066bb62e27";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/eu/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/eu/firefox-80.0b8.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "fb482b765f0b47184e9dffe87bf65320ad66a8bb98d34808bf2c9de65ee14a61";
+ sha256 = "255637aa99002ea1f353098b19787077501efc915a74c2bc88a6ed6c05f12079";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/fa/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/fa/firefox-80.0b8.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "ade51674f73223be4863134abb917a09812ca3a2a65bc3330d27916fd55c2e64";
+ sha256 = "304144942ac8e71f4c29bf4bbc91f17a05bfd712e621cc0029909e0b65e09a95";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ff/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ff/firefox-80.0b8.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "6780ab7da6474f22ea9073a0b7cc4c37e484c6491e5d8c6f045aa3859d52650d";
+ sha256 = "7ce1b42078fe98783e2da541cdd69dd2083ada20254ef80fb53454950e77eddd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/fi/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/fi/firefox-80.0b8.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "4e62a2aa181272b82484635c2e333fa9d57e4e364d1e0216ff372abaac5a9c10";
+ sha256 = "af9271da2138c9c0d73fec09c5356a87b91aecc36a1211a9ce35e0ee1bcedda2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/fr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/fr/firefox-80.0b8.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "ee726f28deb98529e1570b4f2e004d2fe402e29b67eb1454023fed037ede7c8f";
+ sha256 = "c7f347082b17060c7af21ef12f9fd8b210ee20f877e7e791379c482a63e04ace";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/fy-NL/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/fy-NL/firefox-80.0b8.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "18e86d886a39a65132919363200a0dae1e814ae8e9ec48b7dd6f32bce54e2da3";
+ sha256 = "51d42832b2f58e0d8f011762f9884dd49ab243d45b050258ceeae96bb92daad9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ga-IE/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ga-IE/firefox-80.0b8.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "0b9d03430637f573540c7a66995a67ff3f688baede86bb71baa64b6bdc02ba1f";
+ sha256 = "33a50b14ff9d965deac611e0dd6a85de9caa9cde9b99a8dd955a28916e026d7e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/gd/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/gd/firefox-80.0b8.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "8108759648e45d28d13b5eb75b326524a5c21e4088d5dd4c36f9a6d46d895951";
+ sha256 = "bd3469f5c101682a723eb5b261c591fa619b64dc99466ae919658cf44ae8fed4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/gl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/gl/firefox-80.0b8.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "4fbe3cf6a9eff16df3c2c2523590fc5b3d0f7b4109ed7604598df64728ebc088";
+ sha256 = "eedd3b89b26b6634827e07a5b20b57716f54a604b18d9849a4b2fe30ab7c366e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/gn/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/gn/firefox-80.0b8.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "61ebc91bcb8a5e5de8ccbefa28c5ae5b952711edfdbba4fb79510148f877ac3b";
+ sha256 = "206a292bdf13d98a502ff89ea57e94b37a528e57b88c1611c5094ed64aae2b0d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/gu-IN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/gu-IN/firefox-80.0b8.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "f0460163bb713885571592f020254e9e6ef6270338509faf8b46d26142f13ef7";
+ sha256 = "2ec91a2be77abc9b52e4d466cfaef70ef02b7b92e332fe572cdc3f4e53ac5276";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/he/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/he/firefox-80.0b8.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "40c8091ba8e9b5aa0ad944a9de91ad62df6871d34431744d0d453571d322df9f";
+ sha256 = "5f53772c8a24d4fe1be3cc21673a924a5d65e606168f079b8091f4502d1218b7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/hi-IN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/hi-IN/firefox-80.0b8.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "d1df833b5d69a2b403a3a15a9833192890e8998c065c7dc08739f16d7ca33b7d";
+ sha256 = "15e74fb5124e1547f7eb776bd3b6d4096338731f1d97b6c0944e7f3af1b569c9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/hr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/hr/firefox-80.0b8.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "97c98db6dc9822a8f4a99c547b4637422e2d60e99360237dc5e54bb340a6614f";
+ sha256 = "5c4a0c766ed006e0f43856104aa8bd96e8d63ca618fda401370633b707e80374";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/hsb/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/hsb/firefox-80.0b8.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "7b207f72447869a7702c386006207a48b41730715b5bec3b7ddd5c4470653b90";
+ sha256 = "6945e71a060bcbf8a329c65ddcba786beb4f955cc2105806bf5873c07daae988";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/hu/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/hu/firefox-80.0b8.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "974048bbb8330723eb8dc2eb6e714c41bf94e4003ce58e42ea14407b7a64bac0";
+ sha256 = "5da76038365922aff82c540652132c7763a07f4336ef003a434299240444b036";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/hy-AM/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/hy-AM/firefox-80.0b8.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "6cc431e37736bb5843e23f26934537c7e30d9243d73d292d24749c7c7a8ab61d";
+ sha256 = "4be5260452b39b707d271b5696710038174c397083f626b3fd877aad36c37142";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ia/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ia/firefox-80.0b8.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "0e67c59fc97d0d0d1c4f41fb31a978bfe3305177e399980e1d3a94971a00b63a";
+ sha256 = "94dac5899d0f2d5afa0dec53472afb329b956347d22581e1b9668a123d200278";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/id/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/id/firefox-80.0b8.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "44fc48465bd361f54807550cdc314e7b3df48e2a97157f4fd0f2de3778d61cb8";
+ sha256 = "d4cade715292ed116c2605dd6a8c70854cad373641982283decbc1e2f0417490";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/is/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/is/firefox-80.0b8.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "385ce32f2924afcd2fd3622c6fb4ed74ecf727c0cd746176da8d153869deb56c";
+ sha256 = "5f4bf4e8bb2f5e72872e99f8415b864df457c93ddabbcd4377588895c83b1d7a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/it/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/it/firefox-80.0b8.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "da5ffed78430fe022067693988981d2479b58a88f122d9fdd470d28f01c67ab3";
+ sha256 = "5fa9251fd8c8e0d4aebc006ea1f8df15afada7276a1bd0517b89c2a6f8e488b6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ja/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ja/firefox-80.0b8.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "2c900cf33ab97010d9b97a025afe627a76ba7387422e783c71a731608b4d6470";
+ sha256 = "a1557fd84bb39786566b6c11d1efea9464a96b77a690b1b1c3b165283c031185";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ka/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ka/firefox-80.0b8.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "d3c0bbdcce1743c23e725f939db929c286e179b21246ca425cc0780f820d8971";
+ sha256 = "f9359c7eb9c6536ced999c18571babd932a1b1bd22565d6489bb43cb17893eb8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/kab/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/kab/firefox-80.0b8.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "9998b64b4a23d491d5d88fd7b788665f851b3966dbad4edb706c6a4c238df6f6";
+ sha256 = "9b34875edfbf6383b5bbddd110d969e32e448e47eaf48b7f41c215e6b3f8da62";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/kk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/kk/firefox-80.0b8.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "61ac1d6176c8fa04fe6c41f01ef8b9b0248015fbeda318fd61700b0e525258a6";
+ sha256 = "78bdac1a7f0bd82440e43c6079332624b1e7e60defe45d55493857b1f9e2c7ce";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/km/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/km/firefox-80.0b8.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "5fe470f9e58d17637f773a729e05e30894f6b2bf7a86bbc6c543b9e0593f2712";
+ sha256 = "9fc753e4fa4a2a3a911dcfe9d8c7c993416833bedec4e94e85d95ef075209377";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/kn/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/kn/firefox-80.0b8.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "56c2c34d30359b3eb2063b0794b21f4f47c71bf8d016f6c8d62b710abe65c807";
+ sha256 = "1e45e618c6d4db4f870e4d3baf60676d2a76916ce0998ae33d671ab73e8c1bfa";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ko/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ko/firefox-80.0b8.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "1d81122b44c6e6718a2477c2fc03d952029f7b7b931d54b8d6e1e6f29d4b6882";
+ sha256 = "afe8410a5be470aa016720f411f33aa0b244fa34dacb138ab145b97a7e195db9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/lij/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/lij/firefox-80.0b8.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "783389dc8efc184ac77fcd12c9609913b1f1fca0acffc33401bd37c3b19eaa92";
+ sha256 = "094f4ad0a2b988f0d75938dd6439ad5dacb1eee42584e7d1b424289117512d49";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/lt/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/lt/firefox-80.0b8.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "6b2b629c1e1a34895293a2c03a4377096dca6ce646e7211726303c2fa410c259";
+ sha256 = "69164a34e2cacc8f68e8e87defe713c4dcd1de278d449e1f9eb7b8cf42aae305";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/lv/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/lv/firefox-80.0b8.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "a79d1cb7261e6bad9a166c4bb8d154852e2b55100813332e48007a341643a9f4";
+ sha256 = "10262da2e4d50f2e331b3bd0c4d064002a3a5f10719284b96cced812ca0551bb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/mk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/mk/firefox-80.0b8.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "63534b4a079cc08a74e1a6ac121af5ce8bb40487b4b0b78b5063deedd8f5bb9d";
+ sha256 = "d310667e306b177191965b40b6cc8556e0fa749a3ebfa6120b0255e701d81ac1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/mr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/mr/firefox-80.0b8.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "ea3e085da4aa2f7701995063457ff3ec10270fb19178cf61da9b207cc1616b23";
+ sha256 = "2130fd9a56e2e4f4c09ea57cf0a566ade53c255c52e867c40316e14a04a59e0f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ms/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ms/firefox-80.0b8.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "97ba068e4ce9f3d12ce4c8b962ef519596a1849f93efb99bbf6fdc208afaeafb";
+ sha256 = "ac215f60d098eacfb4d03e857e0229d0368a113e5758f00044790953712cc4bf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/my/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/my/firefox-80.0b8.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "b889e3065f164d751c0169ec517b02046e7b617b401793ee5571411e0eeb431d";
+ sha256 = "0f89f81cde40821463e9ddbd988616d019d73fc0a27cc3a427dad4c9bd6fc931";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/nb-NO/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/nb-NO/firefox-80.0b8.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "a4fb718c5130ec72f6f860d81817428614221fc609202bd28276f593c528cc4e";
+ sha256 = "4d599136e6a8f430f21605895d2ea63aaa3542a2b9dff5fa44d3a618dff1be5b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ne-NP/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ne-NP/firefox-80.0b8.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "ed2e54b3c132b8728b9a703b0afbe15d363ef7a78a32ca4b31928480c976c182";
+ sha256 = "859dc2201e76de7f08b2c29d11382f02bb2eb6f9ec48f65656f578da67cc10d3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/nl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/nl/firefox-80.0b8.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "1850779e05bde3037ef1e46bf910d6296c22e536ba42ecb538cf794a259651c7";
+ sha256 = "f9b7784f2c626f6bfe8a39a18a593d9f0d10d0f6407d1015969fd3744a483e88";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/nn-NO/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/nn-NO/firefox-80.0b8.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "a67f80c9adb05dfdc15d28d679ece1a3903119d1ef4504e7d695b232a1a0e7cd";
+ sha256 = "6c46d8b833423fe0eed0da6c162ae16f6969b569902c41fa21ee7e19ce7515fd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/oc/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/oc/firefox-80.0b8.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "d89d61ce305e6870dae9c59760710a5e87dc73b3eccc13f790542ae23dc5cf62";
+ sha256 = "c359b9438f6065adb64baca086b7bed295ffccb825a96b4bcc5721ed4346a061";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/pa-IN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/pa-IN/firefox-80.0b8.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "9ff261de3081fe1e0c5f5ab9fe5b74b2c6efb5a6f4a25430ee22dd96c1b6d88c";
+ sha256 = "6ae3b82728155e195747176188e30d4ddc3d5e9499ab018902e2e1289b19c171";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/pl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/pl/firefox-80.0b8.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "1618c91f0fb1f3faace8e52285e50f720b32d2a244aeb9ea968ab2957b24bf93";
+ sha256 = "45b97c17dcd1042eb205f6c59f5b679fcd224705cd5009dc2e39c8a22099ecb9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/pt-BR/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/pt-BR/firefox-80.0b8.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "04a88b46f5ea749d1d645d1c3b373aa30153312680f151c459eeb41581201b6a";
+ sha256 = "50b2309fc1b083f739b090729096fe82747dc3e889923d271aae500ee5f0c82d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/pt-PT/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/pt-PT/firefox-80.0b8.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "602556ee8e4cc6e7c1171aca0c5b0fc9a4a0e8e9ae2ce8a067fb7c5f5427b613";
+ sha256 = "aac403c497aa1bb9e37038ea7897f57074278d080e592bf1984f1712a80de632";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/rm/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/rm/firefox-80.0b8.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "4bc83e6f4dbe0b0cd2ae656edba3c2bc0477d33c4d27ea7562e444780c313908";
+ sha256 = "b8330c7ef733c1d50e320376bdd9c5205fd56f58fc7baf46497f1b0902193dc5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ro/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ro/firefox-80.0b8.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "d43b2477c5b38440ee4a73e3c16cf6cf1fa7d67a8c5cd5a53c87032d376c8679";
+ sha256 = "ae7d39f56d162d7b8bfb4d55c6de9b46a40f45c1bf9a4191e65c7a99a36b22ab";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ru/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ru/firefox-80.0b8.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "eb4706f05215ca613adfa6d662e0cdaabb9f53553b22d7a5f86e7a2c2ce3522c";
+ sha256 = "10e1adf60a23574fd5ccf9ae1be83710c92c902367174f73952d18412228814f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/si/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/si/firefox-80.0b8.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "eff6b3c1613e6c11323647eb66e400689c764a122f5cf4dfbed1efe4eee347b4";
+ sha256 = "fe02265dfb0bb12ad9a5739e802937540425789c8e36220f59001ef4fc256f16";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/sk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/sk/firefox-80.0b8.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "4689f362e2e1ec2fb9f10d3081e15c47bdc288f782ae0297dcc342b48849f7a3";
+ sha256 = "73c58bb35f204f875d2c8d293780810be6083d2934fa8d7d7e02a3bc8d41e5a3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/sl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/sl/firefox-80.0b8.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "b612a245c461015c36cbc71a9ee6252753e9848085a6beef05ba8994b966e2e3";
+ sha256 = "90243b7a75889617085715d6cbb65c220f1fc5eba5d4a70612277dcb6a6df6b6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/son/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/son/firefox-80.0b8.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "c257e92147ab9b41cac22d4321c2c69605544adb26095db681bc8101f9767bf2";
+ sha256 = "ba8ead8c649116edb7e168b25e6eb3735a85cf5c15a2a78ebe8340cd7071adc1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/sq/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/sq/firefox-80.0b8.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "b79017f3dd0fdafecd961db3d9a32047d61daa7ebcf3e1565b63be7e4065377e";
+ sha256 = "6466c44847b3b0370665e996582a2cbed9a8eb56a8b3f683582011cba77e918c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/sr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/sr/firefox-80.0b8.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "fa42ebf34b9633906cf5bc879cc22e9e668eaeca329aed15e2ca12e4c0b7c711";
+ sha256 = "06869c6fc77aecdf48a991ebd65cc6052c8c3aca976b01cac5e39933c7aa9190";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/sv-SE/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/sv-SE/firefox-80.0b8.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "257739d27dc7770756ba896b52e2137eca1f7e7aae44c737988821f0120ae5a2";
+ sha256 = "e763358e9672fbc8b990bacae8687c7558d9718cc9d1e80798ee9ad220f28b35";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ta/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ta/firefox-80.0b8.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "bf837831d901c9be834ac9b5602cbd873ebd0416b042eb4e672423f153532c76";
+ sha256 = "1669e95f886a7adeac0489c072fb88f1ca09daf3b42027006305857bdbfced4f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/te/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/te/firefox-80.0b8.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "dae3cdb82904e8c30d19e5811bf37c1dc7b43a5a74ac7adb537bf2530e99983b";
+ sha256 = "3d5c9f1596291eba38fa5b5174674fdcfd335e4cff44ecc50ddc7f08ca254b97";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/th/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/th/firefox-80.0b8.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "7843b01b201421563a0df660a990779569a4363c16c5e9f8cf780693ad810b2d";
+ sha256 = "d583744cc4d1099f23960b0ee7c80992233864c94f877623f0c566a65cd944fe";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/tl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/tl/firefox-80.0b8.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "13397743b49932fce379399bf9de6de1e4d45cd94786acb07db153b30aa16c47";
+ sha256 = "cb6b8cdf1747e211cceeb07bda07573bc193574fa3603bfebaa537857953ce13";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/tr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/tr/firefox-80.0b8.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "59aa948f6c2ba7fc6d6efcd7d8649638e4748eeaf968c65cdab6ea8130f161e2";
+ sha256 = "e2561f98607ac5dcc67ef825cfe73d1c2af4ef9c5c01ebf48ee4dc0f80b53d07";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/trs/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/trs/firefox-80.0b8.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "87a57b3d0e213d910c2eb3dbb0cd2130cf3c869d11119b664c163ed0461cccf5";
+ sha256 = "de1e1f83c439d17d5489d666f1772ac32e26d70a5b3309176b528de413fae39d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/uk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/uk/firefox-80.0b8.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "e4e816e4a9b01b77965b769c0d0234a06cca25249b3b5bd8a88e48a7d604683d";
+ sha256 = "7632b4734ffe3106e78ddfc9e5ed81dbd219045f4b954421be4629397436763c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/ur/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ur/firefox-80.0b8.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "ca179ad92d133b5325621a48ffb45cb64bc2599c6d801a1eb6db64aca8f35e2e";
+ sha256 = "8e6c6d36546492ae93128c780c80bcae86ebaded38cc753db1f0401d4b5d31e3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/uz/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/uz/firefox-80.0b8.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "e10632d9a14b6ee90b4aa38a9ecf40415ad3a1c8bd69527df5a2ba53d2379f30";
+ sha256 = "18c7827cc1337e0a2cb3a1e9603aff8e7c3ac8e5631cb791eb0b7a2de35bb487";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/vi/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/vi/firefox-80.0b8.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "ca5b7b3940392caf5064b32f346db5a7bb029c312fb8b87e536fb0fb1e10f3bc";
+ sha256 = "e78c922c13e0207c9cfb4d492e855543979e77b49a18fc63796c7e74cc4fcdeb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/xh/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/xh/firefox-80.0b8.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "af5e2b09e2924a643caa7b558df44a71a20d0ffa4fe0f4e0b388fc2a95abfb03";
+ sha256 = "bd30e089384bac81aacf68c52ac884712bd0c739f517faa6390090d112d9fcf7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/zh-CN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/zh-CN/firefox-80.0b8.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "c47b7a8d08cb72395ece3a447a23105f34f2ba05933023a8cef59d5f6b1c69d7";
+ sha256 = "316ad740bbba808a66b6fa00a9b1391597c949fa217e721563c685ef9fa028f1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-x86_64/zh-TW/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/zh-TW/firefox-80.0b8.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "af463a670c52af7d4ba9dfcac8e38283ef6327b3f547bf8a3fa25669e7ddc3a8";
+ sha256 = "f92189c808903b314ff4cc30fdfa7d5e2085ce22b9763e95144a7d69e6af719d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ach/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ach/firefox-80.0b8.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "6327271b9604b848a71a0990d90b232f0484e2213e6d597290ea9482439db396";
+ sha256 = "aaf1bc4cda7e1f1182f701485f5cb186d4b731851aca70611cd478c923b2427b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/af/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/af/firefox-80.0b8.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "7b536fe21cf9b9b25f441bea18e152ef577f8adfb4e5a1411f99e28412f09b4a";
+ sha256 = "1be25b19658c15a88031169c57acda5ebd49b63212f584da6f859370b493ad32";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/an/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/an/firefox-80.0b8.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "db33ebc2b3786a849f7a1a2277465ef44b47774f7196bf9ab5b6c0054add1491";
+ sha256 = "d461a566f7efc35ac323b0e8e963b8332a349e1b317401c2975cf4c75f7ce8cd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ar/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ar/firefox-80.0b8.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "ebfc4e893b639e85f63441b5d62614691c0d56ac5e0cafe42abb8f2037b53045";
+ sha256 = "2051bf3ff16a6ebf15ed4fcd97adc2bef65c04500d09ff1f009785f41c0b02a2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ast/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ast/firefox-80.0b8.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "0fb08980f64b7fb4abe662d63a29cd3161da8b62876cf0e24b4bd194302550cf";
+ sha256 = "97951d00f79bed031680ff9676201c9ff0fe79273e4f2697cd19ca9ccdfe95cc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/az/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/az/firefox-80.0b8.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "ac07cda47ca5adfba148ff2838ac725a1e6c0d23e9491429d6c4dbf24895d6b2";
+ sha256 = "a461aa41658c34bef1bffba2d34619ea402fdda2e51aa1e0200002b2e9321c8d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/be/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/be/firefox-80.0b8.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "250f9fcf7f5a30ef29f1b9f88a3829bd638db7bc6814977c1ed796de35304271";
+ sha256 = "ff1d2fa9203fce0aac5d91b38034910bbf7b0822b499fe522ed981f3365db8c3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/bg/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/bg/firefox-80.0b8.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "ea1833aef54f2d3af92fa233a1fde1e4d6d95ce1be10fc270302a747010f0437";
+ sha256 = "17553a8566afe02d916b18d76a8850295512d9514bc37bbac459bd28a3bf46ec";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/bn/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/bn/firefox-80.0b8.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "13e2c4855bb08dd7984e9d9c8954613f1939f11e3e17c11ba0a97648df72a173";
+ sha256 = "9863e968594a556a7bd52a43cd3c965687d4116c9fbfb62bed38b1b7ee343728";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/br/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/br/firefox-80.0b8.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "36127db7c1e8631f5ef3ad5a91358e19e63973e3f1357899a2e59e26d3d23b48";
+ sha256 = "762f1f951560f8c85a44cc2a7c318e4f8e5a0b752011cf06f86235e3aedabebf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/bs/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/bs/firefox-80.0b8.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "747036648519b96edeb77f4cb2761d9a052d208f6d7e2a6fdfbd58529ec4f95d";
+ sha256 = "24fc8ac01417df1bbcec358c083f7627ed13bc76921bf0efc14e9f7653e9a819";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ca-valencia/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ca-valencia/firefox-80.0b8.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "bc90c0ac17e94784e40f33ac720e9ea441308d3468de07fa71daacfc65103858";
+ sha256 = "b071e20fadfaa2c06baa1579343c18167f6adf88e1c98fc68413287f6a45225f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ca/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ca/firefox-80.0b8.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "d3cfbae13f2d66340dad938bf8522fed7f76dfe5f6766a9ca51027cfc0149950";
+ sha256 = "e63fc27b2bd404ae9190035d5537822fe76213545d8dd076566abd12ea213e25";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/cak/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/cak/firefox-80.0b8.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "66f4a2ddd79374bcd838d8f58f4d7590fde01c02eb785fcb2a88ce8240f8b4bf";
+ sha256 = "6f4fc3e51819d9d3914ad624593cfc755d9e8f78263700268dab46c38e8fdbcf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/cs/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/cs/firefox-80.0b8.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "ec7c9a9a75d727cea5cdae265cd27d87576cfef4330038d0b2615b66c273d5e3";
+ sha256 = "ee61413b6544ec56d13bebd08ee2ee69f8d1f16e886ba31d46c2a786c0984f7c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/cy/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/cy/firefox-80.0b8.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "90fcdcb46042800214eb1d9cd3433742def627d6632ec238fd7350207bc35b6c";
+ sha256 = "8f29a8b77732cb1387371538efdf970d0e93d3de866b103c836990a4f0a30933";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/da/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/da/firefox-80.0b8.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "196843914579725bc3b20ebb4fb8c26c566e783dd362cdd6b2e152395868d0f7";
+ sha256 = "b89854119e139a8e9347b262131ed5da62672f6d728b1017963a11d279861a45";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/de/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/de/firefox-80.0b8.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "2c5360c5466b9fca6b14298f5bec5e6aa235939a3a634d33811b20bfd380b585";
+ sha256 = "c453a0f5cf528c582a35997a963b944d31666018ffc912ee4e188f795066b925";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/dsb/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/dsb/firefox-80.0b8.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "a919f0b74ac09426a2583eba117cb40a82e6ee2a07a2aaab60b4f799712a69c0";
+ sha256 = "bf1f7ebef2aa4a5e0ed824a2c89a0b86101b5cc754feec482f0c39ef2ef3dea4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/el/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/el/firefox-80.0b8.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "f65942155da5ca573e31aa31899011fe13f34f0d7dad9647719433888c1cf89f";
+ sha256 = "b31ea72af96ecfd2b625d813bf32e08dfbffb9c0acb004e1f279b7937d675a90";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/en-CA/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/en-CA/firefox-80.0b8.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "54e019cafaa8decd89c88f54292c4998fbc2e57055f0f5ddcfabbc8df9c73029";
+ sha256 = "31866007d8bc76202fcec3b9531afe237c9822025a14113051a9389cd9f81ec8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/en-GB/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/en-GB/firefox-80.0b8.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "ab1549eff6ffc8fa7fb29eb77edb68f4597cf82134decd94b08823eb473aeac4";
+ sha256 = "82b2e6cc268eefb687255fdc5170aa8ab6136d6a07b881d49c044e1700eb9190";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/en-US/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/en-US/firefox-80.0b8.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "411a5568b8f50c14fe914aa73c176a0ecca2e7cf7e3d79c50876eeaadee11286";
+ sha256 = "dcd29328d9b464c16bd034f635a16d1593f98e08becc6a278d265b07bdc208a2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/eo/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/eo/firefox-80.0b8.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "f912580b694269cf7f1fc0cc800a4d47556cb9f4c2a2a55110b4f125d6c520f2";
+ sha256 = "cfd6996e81513426d0534ba62e4f2d22fafcef51ed48da4a593b9d3ead2cb2fb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/es-AR/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/es-AR/firefox-80.0b8.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "70f281c7f5230a1863988356006a29d1ce3741d6a7a53144911ea0f2c9362213";
+ sha256 = "9d4c24e1153f723a789c1934c15cf8b4d3925fd34e8fee98d7e5ad19c9f7a9d3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/es-CL/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/es-CL/firefox-80.0b8.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "dceecdc644217bf766b5c541f21a059728d96d7afaf7d7994c108dd4d8288df6";
+ sha256 = "91364ba1a2ab6c8bdede117f45a855b5968bee492e054123433c0fc034d66415";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/es-ES/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/es-ES/firefox-80.0b8.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "10d45c94bec1726d53a2a124c335ad09b8a98ee0b620675747ca5f377664ada8";
+ sha256 = "1cef40ebfb1b12813d85a975ac0620b3ed339acf5de8e4d0ff0aba6aadedcc7d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/es-MX/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/es-MX/firefox-80.0b8.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "6a01c307f080a365cdfd466ec465b53f2403864d21523b898edc49c1b6796122";
+ sha256 = "e41ae370750f65e59470e05b2ed501a308f8743cde3291bae2fb8d17af553789";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/et/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/et/firefox-80.0b8.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "8a5a86438c66846de40d0a6a37e75c4a50979c37ac30e651184c37777818e690";
+ sha256 = "5a279c246cffd27f6c919f451161e87b30ac8743e1a22ac490496b28af7e75de";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/eu/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/eu/firefox-80.0b8.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "1e4bd58c05cd690ed5ce9b924d63d42869e30f36a518416933167b4fa82577ce";
+ sha256 = "3530e6f3060fd133dfad72532319c6cdb5be5bdd2dc0395d02e379b203264d20";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/fa/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/fa/firefox-80.0b8.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "effec9e39b683876a0eb878729614db9c8eec0dae10efd000a31bc1f555e7d28";
+ sha256 = "ae1b1fa06440f1038c97fa9d625a2b58ce5ffe11fb53a71afff632a18675f113";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ff/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ff/firefox-80.0b8.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "4ee25c22f150d3a0c15f27cb7db24df9c28dc11819aaeb278fccc7d7d549f6f2";
+ sha256 = "05b47dda3d1fbce0e3dcd79534aef247516e5ded783d1184975ba97b1abb09f8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/fi/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/fi/firefox-80.0b8.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "6fd82fcfbdf0a35c4387ef094fb6c74fa016f6a0a5298cb994b81ab26e193fbe";
+ sha256 = "689eeeee1a769ec9bb53014044a615f0a5c05d8a15e6dcd408d18ef452c0b441";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/fr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/fr/firefox-80.0b8.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "450649d04f0f07faf1727262f40f6b099ccdfbf8ad2d7f4b104442dc15c23b0e";
+ sha256 = "c64e31adfc24ba1fca84922b33a71bb74150ddc9b4d5e52f3627d2aac3b11516";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/fy-NL/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/fy-NL/firefox-80.0b8.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "bbeac2bf3ce08afce827aa8a54b84afed226f3239233541ed1c8086a671cadf6";
+ sha256 = "36765f1c9e1b15b43fd7d70c9f9dd1b977c4171ff920710346493214e08f9dc0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ga-IE/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ga-IE/firefox-80.0b8.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "295edafd0cc283cb6b76f4c8b41f96b55a80260d5659e854add0f427b9508a10";
+ sha256 = "026c461de7bba74facc421a58028e46efe32e7e3f441a8ca030911e2e883f56a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/gd/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/gd/firefox-80.0b8.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "9b0c82c457dec3b6437f4e85d5fb0e8b83f4f42ab79af80d5ca239bb0e3bb9a2";
+ sha256 = "c2a21914b4f7cc71d6456e9c395fcf2ebbca12408563decc4a400e3d5d43c865";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/gl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/gl/firefox-80.0b8.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "e36e7e99186eba6248100b0ff30c60017d00a4ffc4e03bba432143d2c13eeca3";
+ sha256 = "888aaad1dba8db4d71785fee01c100aa1919d432e8ccaa044e386224abe9494e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/gn/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/gn/firefox-80.0b8.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "cd4495331d98faeee35580622c6b71daebe8c9215dc53e66e61f09dfb8fb4caa";
+ sha256 = "d5b1d103104c2e6e7b8198be649b0628acb4cfe6865422fc9e3db3b6ecc07cc6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/gu-IN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/gu-IN/firefox-80.0b8.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "7063ad601882e593e3bd8e21b31045ee08dc5a4ac16e974c17bb79f8d81b5773";
+ sha256 = "215b9df33e06685f9b264b06b512d325aa8353b3f3975699b77e9fc8d18531f1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/he/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/he/firefox-80.0b8.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "99a831c67f0f921342948a48d307918299c6fbfe90b1870d95a546381c5b23f6";
+ sha256 = "8a19ef1eb702a0083c7751cbd7f2437c5fa46ba3f61a5f5d07f797b8ca696d22";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/hi-IN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/hi-IN/firefox-80.0b8.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "2500af40403eb26d589f7df03d982bb9f3b5c36840e58ae865d54b1d8fd67809";
+ sha256 = "17a84efead836ce54c1c0f0f5486595753f97463fbc2031d78b01e33c7a7775d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/hr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/hr/firefox-80.0b8.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "a475c6dc89d4157194a9cd3dce3c3e0735d5e87291ad3f1a53c65937bafd0646";
+ sha256 = "41bc47533991b818b26fa149a30825326879cdb3ba92eab0ae5171be595078bd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/hsb/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/hsb/firefox-80.0b8.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "56fd6b3cc09829f992a17470455dcf77d17007eb77f739faf875c031e0db1a27";
+ sha256 = "9ee8d0255eaaefe37f00960ed59c83a06b8356a8c6ea05d1f9697edb9880593e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/hu/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/hu/firefox-80.0b8.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "9bd2e510e1b1d86e0e3c18a74500b545bf991e13048c0a579037077367da4318";
+ sha256 = "a9b6dfa44cc8d90a530aeb98ac96a0ac1e63b4a46b9af8ddfd4d6f268fc7eb5a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/hy-AM/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/hy-AM/firefox-80.0b8.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "fdb30d5912a582bec4210316084b6e4d72af7f694c734185300a18b6c018de9a";
+ sha256 = "e93f74803b536d3b12b6e41d064a7adc5dc16615d045a2e6cf792d25477fbdc6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ia/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ia/firefox-80.0b8.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "db5433abfd49f87cb521c770c5c9886cee3d05f46bb2c438eb276b3d1a4f0678";
+ sha256 = "931dbb0817dd797c5af61bc683f3d95ed99ad9834efe2f66a50f9e444e708061";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/id/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/id/firefox-80.0b8.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "c3cb2636848f07a2f612b6a173d14e9cdfd3d43cbcba6b4deeb1497d97931143";
+ sha256 = "1e1afcecc3bcadfbd6989eefc191f8d5cfd0f4d29c1f6814927370aa647af854";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/is/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/is/firefox-80.0b8.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "26e4a0d6b984ca0b052456e3f60cf0fadaf4ca3c6aa057cd4e3cfee9d1bdde26";
+ sha256 = "4907987557a6a560557d417dcc31f9c7dd45dc0d2767ed050770f6fc6f308641";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/it/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/it/firefox-80.0b8.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "47d0e079f98f231ec70a87add9c79a50e0d05280084f6b0754001a5bba73c472";
+ sha256 = "d895c87359cfb98e236c4b5bac92391528eef07a45dca2d067a7d55fed4ebe7c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ja/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ja/firefox-80.0b8.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "fdab4bc84626eff91a6217b6375effe868763facdba10475de208958c7072909";
+ sha256 = "30dc7aee461930bea42c9f2985ff766f4aaf3ec0bd7f09562626b155bf80f202";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ka/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ka/firefox-80.0b8.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "e6d63c57823b7d2092483b42b6c2cc0a513c3e88503d946092d110acb51bdc94";
+ sha256 = "d452668daf3b5a9f0602417822f7581183dfd5dbcc5d770afa20e1d61d557003";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/kab/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/kab/firefox-80.0b8.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "e1bda5cab5ee3cf3116ffb1cfae2a3ca1fed37ed37199ae4f7a0f8124b6c52be";
+ sha256 = "5e828a4f6abbb80c7b575db2a70ddcff0d734f11eb9bca55c2b8d00f08fa6497";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/kk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/kk/firefox-80.0b8.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "d4fd96e4197dc6b0209fd2705538f1fee05eb7df7aa07cd4f4fb2b4e350d2b02";
+ sha256 = "994e8ccd626f3e640b8a1b687a22ae6e3943b25995278f3333b6814ce61185c2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/km/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/km/firefox-80.0b8.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "a1baed9b2812f4e971334c669ea3c7d7d070d5c5ec8c4b7b2dbc798c7678d37f";
+ sha256 = "a63ad9f77f01523dfb02eb6c2880a4046a556bae6d329a5e5480aa3eea0aec85";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/kn/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/kn/firefox-80.0b8.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "da83a68df08aa7414d4704e953de2ad4ad3dbf84b82688a2583ec453056c4bc6";
+ sha256 = "5396452efe004c7cb57105bb7134875e073f822927a98db23e96994e11fc7155";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ko/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ko/firefox-80.0b8.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "a43a33e313917c4af3125269a7c4ad8156b14caf245c398e355d94a8d065aca3";
+ sha256 = "a0bd2586531902121344b7c70e9ec9ae4e08514d2c467a17664701735f8d74ab";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/lij/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/lij/firefox-80.0b8.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "ede64a7caf7ef5154276f95f9c7e8b6034a973c3a78304f27a81e2c9e5df1e8c";
+ sha256 = "ac4f16381c71e3a4f00c6ac615913cc7d5eda77dd9ca337b9a8ec0e63a2e9176";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/lt/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/lt/firefox-80.0b8.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "8ad8928b7b798968f27cfc7e24277fbc0d6d8beebceff32a75209553dc0b1e99";
+ sha256 = "bbeda439051c1ff43ba08b95de57914237e7b9845fef0d92efa02265cdc81961";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/lv/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/lv/firefox-80.0b8.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "45f07bf77ebd1d13edc198d17d55b97eb3ae8121bdffbfdd299dd8ce23ba064b";
+ sha256 = "bb500de9c32241a7e28828e3f9b89427be1a54475d7b05b9c678d489a457c329";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/mk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/mk/firefox-80.0b8.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "3e04acc10056a6116b009711340b0dfc9c1aed7ecd391c7472136165f3f09ce8";
+ sha256 = "5689b2805b30cece9f9757a1869906529a7094b4a9de5d5180a5bea7582606de";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/mr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/mr/firefox-80.0b8.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "be5bc1739252fcd43840d28072d28e72b4ade4c6a781d0f305e9f0d003fb1a64";
+ sha256 = "fc5ec6938f33c548f52cfb90f8a40b342bc9b4a7b97c3fcc1b3cd2aa5a031270";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ms/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ms/firefox-80.0b8.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "bea5d4b9c75358d6ddcae33317fedadb85ac3fd7d330eea2dd1f3d087e4d468c";
+ sha256 = "374e2a6ea3c59c7f985606f2e631294b57e20d7aff2bd8256ef9c91189e960b3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/my/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/my/firefox-80.0b8.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "7473dfd9a71e07f8a9120b7b7095b29769f20a6d07d901b5da81fdd655241f22";
+ sha256 = "d9058df8893da03a707e549d9f133942fa71bf51e06c1a654f3ac588d79af82b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/nb-NO/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/nb-NO/firefox-80.0b8.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "25567b6a2f0f43b4cb521248dfa05ce66887b8effc470ac4f0c0a0f437a41ddc";
+ sha256 = "11019961c5378bb86b45b2c6d4b74ca1e41e86aed500ec0cd73fbe1785ef7742";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ne-NP/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ne-NP/firefox-80.0b8.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "95cabf92a9c94f9bde7b61d72d413fe4b966f421801d0930efa33f1bc2ab86f0";
+ sha256 = "de45c606c961a38c84196cab1827089b1b22e2dd0c23302ce57bf9fcbfcaf82e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/nl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/nl/firefox-80.0b8.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "5c48347c90e9a4ae2d2872a7746a5ca8e4721270aaa055ad4a93f1b1484717e2";
+ sha256 = "bc2d98ae8f0fcc608d55b394398c45c1bcfcd02956031ca4762cc98d265916d8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/nn-NO/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/nn-NO/firefox-80.0b8.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "13ab88ef1ad4a2c4059ca026d4ec57c2c182d5994f418e24adea134baed5743b";
+ sha256 = "b7c1d390a8bdf295ad8951959fcb720f977139592ef0f669005dcca0e6cbb19b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/oc/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/oc/firefox-80.0b8.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "cde496e5042cb13241893033ee422eb3bf04f30d133014027dfbf20a798aabde";
+ sha256 = "a61a765b698f48c15cf07ea424e8e69be7630261a94c6514fa739974b51243f0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/pa-IN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/pa-IN/firefox-80.0b8.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "6c0950038162d456a19fc13f757e12775de5fe587d65cc798a81571683168f7a";
+ sha256 = "6721ca2f49b60f5ff1d86e0b1c9a1d6107c5d701b319a2abec7b6fcb9f845d57";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/pl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/pl/firefox-80.0b8.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "4d1c818f9145b9470a94812928c352ba7e6d7c87480e13c0bf1f846a0b59edcd";
+ sha256 = "a77c0c05be64f027d25feaa75a788c630dd7af831c0c2fa334db7c36ac340144";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/pt-BR/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/pt-BR/firefox-80.0b8.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "b6dbf7818ddc5c042afe7291aadf06b30f1b5c475d2d4d5d795d5398ccaac21e";
+ sha256 = "2baf74be32eec18bb235b57ee3816a3c9df916bbd4458aab1613af864581a072";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/pt-PT/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/pt-PT/firefox-80.0b8.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "a41d15c3f7df4da81b6ccb886d9e3ce87d9e067c8d7a3dd8ccb7f6df84dd66cf";
+ sha256 = "0103da6d53b4a9e9512b8e3b90e583d8592a5bd02f09aedb90f49b1ce73516e6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/rm/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/rm/firefox-80.0b8.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "832c780415d6bccb98a0a26319d5e66cc880237eccc8390664598c97cbbd277a";
+ sha256 = "5dc1ace0d108460d6a57f7b158a1640d822c4e07a2e4d108db9f17e63150e4a1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ro/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ro/firefox-80.0b8.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "dafbc67e6fd92cb6aada9e5ad8a959ff604df7d87d42f86830f0a1168320724d";
+ sha256 = "1e2ee8f338625bf95da2914e54b22e1a052cce955a92102163e67cacc41129b8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ru/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ru/firefox-80.0b8.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "2823297a82e53780f065d533c654597e11a24bc4ee81233e0b76e264db9b89a2";
+ sha256 = "c57cda1ba6e8895044fbc55b37eb5e241b02904f69337a6430b3b9fd47a57fea";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/si/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/si/firefox-80.0b8.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "d89cc0407d9c2845e1db4fc0fddd4677767288725f427dd5b6386cd745971570";
+ sha256 = "e31df32be4babb9b1eeb5f6a5a44d1c94b07fd5c4bf70d8cc78d4061e1e790a0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/sk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/sk/firefox-80.0b8.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "2f863d3bc1a5584bffa215b8b4b4601e193e1250f10dc2763295a098b7b11651";
+ sha256 = "0630c3c617d1a646ab0acdc0c18346ac29066a8a31be9995f96e5daecc74bb24";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/sl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/sl/firefox-80.0b8.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "37f3f5237807722b09ebfa154650856111be5f23cea2bc91a267269a47628550";
+ sha256 = "65cc9e3d0e6af8743a768cf23b1dcb281d5ee26cbdf0fb2f0639cfe032f8cc07";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/son/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/son/firefox-80.0b8.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "26f388b1216810b7efe4dc31a4bffe49f13be24c5aa795b1aa498055d93852f9";
+ sha256 = "7f25deb9d71b23647722745d813e8e115e0d08190811efa4fc0b6456ee5bc634";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/sq/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/sq/firefox-80.0b8.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "291e9b48894185bd9f69d45a4691b6853fa06d0bba7da5768c79d9620d0fde31";
+ sha256 = "e103461a63337bd7905345091edde08056eb267a522a205d6308e33d477f7d49";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/sr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/sr/firefox-80.0b8.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "0b27689121d07127e853e359c4e76185586be41691388d917f8191e79abb4b0f";
+ sha256 = "cfaead5b0913dd265c18e42793a2a845aeb6e421b6c54a0f979bc80cd7a6cb18";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/sv-SE/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/sv-SE/firefox-80.0b8.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "0a5663b5c784f124ae4f94093fb56151b00c55246e314d46d91e0f23ed267719";
+ sha256 = "7343ae52dc3f85d35264fb6cc86daea45deed4cc3b7c3dc3078afdfde9a48919";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ta/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ta/firefox-80.0b8.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "b258c0eb4669d2a17b9ba32aa58ad11806ad061ad194d7a38d3a3a3895e7c433";
+ sha256 = "389ae6d8db8280f74944c2c5d61dc031ba4ae4db792c1f851ff72ebfb123b17c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/te/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/te/firefox-80.0b8.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "8cf33b851b93a874c2f8142c121ccb1cf67a43c21a2b860dde9d094732726151";
+ sha256 = "e49d8a521ffc7087c8d75f5ecbb9f6c010966c9f92dd4c105278aeeee1eee865";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/th/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/th/firefox-80.0b8.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "cb8f9854ac12291108ac80c054b2a6360cdeb1dc6a7e50dd1dd5d42fac974670";
+ sha256 = "a27ff17d3bd090cf5bf798465dbeb3e369ea03a738729b748a0b03bb2d0418f8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/tl/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/tl/firefox-80.0b8.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "2f0c4d2b0ab11c21086cfba3dc5fea6706d232aaeeba2f55678b4001eff67a59";
+ sha256 = "5826bcb2683e74bc5588c7b12099d9d2ac70ecb0026d375bea92d94a3f381f70";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/tr/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/tr/firefox-80.0b8.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "825e7726a9db2fa1242116b6364161b0edbf046ebe4ad9d22b608f9765176c71";
+ sha256 = "73d79d2dfc0c7ac86566c1d41a6cbf6367ff57a6c5dcd459e1994d5bb8290fe8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/trs/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/trs/firefox-80.0b8.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "2e9cb6ac8fa41724f1610dfc9c70a5acea342aa018905959912d74aa5103ee44";
+ sha256 = "a8b7cab92a7b449ce57a2eaf6a447e4cec99fbd8dd43ffe36dd4b87cd04c19a7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/uk/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/uk/firefox-80.0b8.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "c5a0d18bcb92b29b8858636ef6834ccae3919417b459d4bd758a179f52ffbe15";
+ sha256 = "af59707ac1141ed356a9bacfa116d0a65236352f6bbbddd69e8544a551064782";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/ur/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ur/firefox-80.0b8.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "3b29b93415798ca9c380f5e7ee443a0b3eeed5642439c7548ca614ce8f5b5350";
+ sha256 = "4a6068c0384b69592312bde06631584e612fd1f17d0af4b71dbfe38fe19dd413";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/uz/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/uz/firefox-80.0b8.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "c601dab737b448849aaf8d1036d84e2e41ba1f3a0e843bb2ce7c90f9261fde82";
+ sha256 = "a6f01fd45fc403dff8a97be0bcdcd2837eff7880ad039eab2cb31a2eca82c6e9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/vi/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/vi/firefox-80.0b8.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "190eacbfddda5cd842a09d80a67bbc601f651c85add6aeb9e62c41f8de3abf12";
+ sha256 = "b7cc325a09e7e5a6097c81055eec760452ebff160af5e5f9b7a790a2d3fba53d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/xh/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/xh/firefox-80.0b8.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "3d88d444b72832855ccb1bbb136bf02ac8f7e65beac61385c4113591f111bdfa";
+ sha256 = "64e6d44ed8b07fefb110463e1003cab01503a52bcb72c76d6030325cd6c796d9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/zh-CN/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/zh-CN/firefox-80.0b8.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "792f06b36437d43915668fae21165f362f95780774d366f3793469cf71cd0e08";
+ sha256 = "11312a9a212159bb929df04217292481b9aacdebc50ae941729b37f9c7c8312b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/79.0b7/linux-i686/zh-TW/firefox-79.0b7.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/zh-TW/firefox-80.0b8.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "972d9963ec88985048f583752064194b897c21e540aad8ab668e29c547a6ad20";
+ sha256 = "0b3f5974dd951fe9ec988c8608b186a2d5ebbc397fb017d587e869cbe4dcc74b";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 618a6fc519db5..e8e5109351e4b 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,965 +1,965 @@
{
- version = "79.0";
+ version = "80.0";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ach/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ach/firefox-80.0.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "25571c5d9aa4294f84d3e8aceb501efcadcc7d80dae799ee7246391782079885";
+ sha256 = "4679b0ce4913b2c240f873fe5898234362d0b2cd6777e73ce272f37950edfd02";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/af/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/af/firefox-80.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "400edad1b17de72f33237d5c0fbe20dee9a2032aac41745339d62eaafd36b157";
+ sha256 = "ae2f6e7d46344f56599ef1e7ba3f3321636ee378e8e1a4c0b8e652c5e71b932b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/an/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/an/firefox-80.0.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "13971db840762cbe9b54c917c1cae459259df1bfc8783d0659accf539dc0bf05";
+ sha256 = "8ae2ea7f6184f5f0cd5bc937924cfc5d813bb8bb0ea3e4e0770352b15291c043";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ar/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ar/firefox-80.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "7c8f5692e483667ccc173d9205ab5b5b77b4e4d50a5643f4ac531b1809a97d80";
+ sha256 = "54926c7b61e4d99f1d49f709fad198604c5e5af165d60a96c6f5cb1a94f73884";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ast/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ast/firefox-80.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "50cc5928b1877be40e29f30b51cfd183d9196bf73f68234866eff9e0e50c2e36";
+ sha256 = "589262534a8665387cbbb3c13f5003738bca4c5673884bda831a4858aa73de54";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/az/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/az/firefox-80.0.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "6f8f0b486652ac7bb4e3808a02b123acbd4babd6b272c503c6fc14159278d492";
+ sha256 = "60bfac6b93deff04f63c67dc9944d3df8efb314054ed6ee8f93d3b09db8608b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/be/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/be/firefox-80.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "f2dd77674d83b888e2016177eb80c7855a7fa26318ec052fbb919fd2abab6561";
+ sha256 = "48cdbcb785f190dce708db6ca1fc711d5d2411da0f544b3a5d03aba6665efa1b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bg/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bg/firefox-80.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "08514f73d202ed1f53f0ef23de3093ac7eb08049fedf3bb09b69c98148efb99b";
+ sha256 = "a48fbe5f88ec729c1becbf7c63957ee48cd7692d153dcf709dd038ce1a218317";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bn/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bn/firefox-80.0.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "7f5114a60d966e2dedb95c1b65696bd3b04d25eb057b9a109d8bb0dc43b46f40";
+ sha256 = "38245ddeeaa699941f54ba3d3d0fc3e804b57d4e8a6a0d1c58cf25d7c271a23c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/br/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/br/firefox-80.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "816dbbdd0f86874aad38733a30b54e683c7b18557c34d977ced6cd17ddf8b125";
+ sha256 = "6766542a98977e6f2329b76345ab8f59d545479f1564261a47c0cb7b7db1e3d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bs/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bs/firefox-80.0.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "6c975f990120e9c70121eea464e9c375df40f6aa78275922d005096135044067";
+ sha256 = "9bcd21931680502a9a5459f82a6d103d8b367b09cfa9048f54d87ca654e39e34";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca-valencia/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ca-valencia/firefox-80.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "e993527db5fac86e5a503cb7615c073363d73c733837f7acc66b30d17b7a369d";
+ sha256 = "a666b19726a6d10863cf351059dc45f610cd0356e2220a8d9e2a5bf2df0fde3a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ca/firefox-80.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "8ac5bfa08c2f082816c4f7bc45a0ebdadd04a078efcd172049899890ddcc3ffc";
+ sha256 = "458e791ac8025a56a7a9444aeb8aa1138f5108c5a5cd1d87a31bbe71c6ed51ca";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cak/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cak/firefox-80.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "76680375d4f2ffb8f70414e2f934fe442e30d50c1921f7eb596f1325ee01a155";
+ sha256 = "890f462890cdc825e138d174e396b78e10f74111d01da47514a8e449ee470676";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cs/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cs/firefox-80.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "99f83abcdc15839e879b7cced936fc3bb628d8b42f5381dad980d444d4fcfe1f";
+ sha256 = "98e1bec6f176bc83da232b76b33e6dfe09db91c4be1424cf0c7b4e18e26b8d5e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cy/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cy/firefox-80.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "d81fee7d2b5b8177f1b28f4e4d05f4b266b876adcf5ed62a7d458465ca50bf42";
+ sha256 = "06b649bc87eea5c81fa37873582a963d972cbc3d0a65fa9fcc12c67c107ccfbc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/da/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/da/firefox-80.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "40fdbaa88e3ac77d4cc846bf01b00ba1cdb5d3241f7af8a47efc92c929c862e1";
+ sha256 = "98328f0f7ec2b807717fd4ae6aaeb7daaae8a962eb929b760598f225f6d9e784";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/de/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/de/firefox-80.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "6635eb71b5f4dc01ceed02771cc4e7bf7b3ba340c75f471fb7ecfde8170f838b";
+ sha256 = "401877f41fd2bda02d0cbb7737f029f648e1d2b3c9642b093ef8bd4342f13712";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/dsb/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/dsb/firefox-80.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "afe56bea25e44fbd3cd1fff7411cc20473ed0212500304ed865a985c2565594c";
+ sha256 = "408ae85999139ba5c027bbf9ca20157b991e741349aae77176c012b862a7b4ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/el/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/el/firefox-80.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "b83801b722069d476bdb3325051f6e0bf2c34b6081320b82824aaf218d0f968a";
+ sha256 = "430c1062e9edc9bc4a0a47268782cb7928214df074aec17e2e3a283b7bfa69d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-CA/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-CA/firefox-80.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "e5a1a6e755cf35287f455a36c2019157fc7a0de6296c0af5949f7d33c55c871b";
+ sha256 = "7f8d97a5643c959eb09119264c8829c7b7227c01f8e035b17f3c21eee3d1e0c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-GB/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-GB/firefox-80.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "709d89f99e96d76a77b0a1a40d7f2ef49d6709b41336973c114fc25fee2f1d49";
+ sha256 = "d2361c90c46dc43eae25ff53440157322351645d6a20ed077e2496fbc3b955bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-US/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-US/firefox-80.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "d57ce2ec9d39d4f0e1100a2faf7cfdc827eeb45db672511d5a6aea7229430f85";
+ sha256 = "84191f06dd927cd16b8c0900e6c330f68cc8012bc48e9277891282a2d6f7bce7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eo/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/eo/firefox-80.0.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "facef477b06aab7d67580c6931d97a26c5a7a9ae9555d92c7f31227d0e944dcd";
+ sha256 = "8a9f5359cbb0d8a0d173d3302181ab41f463d8cf6b17f9c06e33432a95d79b0f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-AR/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-AR/firefox-80.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "43449d930cfd29ff06a1f38b3a36cf7b2bb7aa4feef1a4509f60f1370f08539e";
+ sha256 = "0f5e7d4a23daab7c96cf706fe1c5a62d9a244d39bf6be97325cfcc1d699936c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-CL/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-CL/firefox-80.0.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "fd821e8cf3c2f67f0993d08dc43026b1f5454a91102dc44706587d5744a63d1c";
+ sha256 = "fd914b5892f2aa297054e79c6d6d863f1b4d88ab1a2bfae3d40192848c9efd64";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-ES/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-ES/firefox-80.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "b1db4d75e75bd4329cc8ff4e637f920ebab47384442fae56584f170421a18657";
+ sha256 = "b87aa07e99d0c8d3a17c76bc7e281f8309cda97565bbfa4dff653326fb2bbcb5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-MX/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-MX/firefox-80.0.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "b08ce5a33ada7d551b341693545ec7d9c30afc4529a3e33f55836a4e2bec1a41";
+ sha256 = "ffb619b95658d5001a036e0906689f12520cc25d541c4b5b154e44e4b176da33";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/et/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/et/firefox-80.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "5fea2b490a7323cf9cec5e02fd148aab16c18a4bc107b1f267ca2b442eb2d53e";
+ sha256 = "2558280c2fa85aa3a2fdfc59994de6a593ccbb6a7141e76c21e5318152b6e992";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eu/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/eu/firefox-80.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "98f89c8e3efcdc3585c6cd0cd6de6b5ab7ab7a55266328a2fd6198e1b739fd7f";
+ sha256 = "0ad66a2dd10d1e5b0d44e6db28982d82430acb7cef6e465ad0c88fd7958606ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fa/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fa/firefox-80.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "874beed2e6b23f7edc7b51465a758243468e99e835951bb908336f16dc7baf0c";
+ sha256 = "39b1bc086dd14ced01668961dac12a5408f5cc261188b2c32b6114dc70c67e4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ff/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ff/firefox-80.0.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "f84e37769376d2a05fd1d76903ff75c79e3631c2c7c5ceccdadde59de991aead";
+ sha256 = "1511c50bd3ced8f570fe409ef609a6c9dc626d061156e5091e667b9314a5c4a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fi/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fi/firefox-80.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "8898a7ba0aefe3e26c4239c8b4d3768f716004b18da5ce5799ac5fb159b699b0";
+ sha256 = "4d9e7fe4eaa94e4a2195589cdaf9f58c4b55339751001e87bd42a6326ee26787";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fr/firefox-80.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "3f6e7cd8ffa7bf343d28cd289ea14f88e4e0ccf7229ff122c118627ba909a400";
+ sha256 = "99f293639744dd8e2615bc4d6290d2f5baeb9d646bc796d3bfac5de8a1c001f8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fy-NL/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fy-NL/firefox-80.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "de4d6f8aa0564ff23eed16f2bb41486a62ed4fad935625eb1d26829aa281d71c";
+ sha256 = "a8628d16e51d7355198415f086186c9874f37f9250e64512457aa725c8ba9f04";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ga-IE/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ga-IE/firefox-80.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "48a595094b959f74455f568d872b3426bb6ad9be60df256d5cc1d5ac7cc688a2";
+ sha256 = "df63d7991979e8fdf8f6911f8df2122d9995c50c089596bc0f7c0e7179326051";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gd/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gd/firefox-80.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "8c64d89f708238affb2bc356a5f86b491d368f6b838371c62ed647291925e72a";
+ sha256 = "616906a45df46004e081cba3cdadd2782c3d402619193f5d19142977b7ff0fcb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gl/firefox-80.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "2d391f67f0f911112332a155436e5013ebb505620e5070d03b794949df2a4f36";
+ sha256 = "bbff8f63ba3c029c97e5d40d3ecb41d757b5fccd59018dc81d7484f12c830686";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gn/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gn/firefox-80.0.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "732951a35fc0ab79327a225ee02494eff4a17a8b5b348764f980610fcb1de6ef";
+ sha256 = "62d7fbf8afb95d221df768fc190381a859e142a253b8df6b63ee276c4111077e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gu-IN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gu-IN/firefox-80.0.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "0c3f65ab3736b43832feea9459a6fc336d0611c3221eba091c6194494eaf252c";
+ sha256 = "3e451729a93e315c9ae767d21c5fe25c505e327ab435c5a9c4f606e04ca61051";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/he/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/he/firefox-80.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "c62d4e52a2f308061fc6348531b708cfb26c0aee71a5f08f33b265af1789ea54";
+ sha256 = "a48159e9c2798308ca4765f02ac90a0a2b05029ae0505ad59688d281fc06344f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hi-IN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hi-IN/firefox-80.0.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "e83f4fa9cd50d2389697b78eb6591b7d1c1a6b4a61ae91b429909cb3cdbe1a99";
+ sha256 = "39341543e9e8e2d5a377ead92287413df77d2f1c00a7362eb42d8e640b8f75ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hr/firefox-80.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "10ccf56a6f388a49ab6b5aa24ab3d82cf3ee685af5fd9592fec35055c1195d48";
+ sha256 = "0067b77ff388004e0c60855868f1a45a282282b8c7360847b65ad2b53a558010";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hsb/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hsb/firefox-80.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "771b5bba633c08861acc056cf0cbd73752f6109f601b8d59685dcad23804e3db";
+ sha256 = "5c3a47a28a8e67f6a5be72540d9ae85474e093b1a67254949794918a8294ded6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hu/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hu/firefox-80.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "0f8631c95cc683d0c9faa5153cd3b499fa89374f6d8c2d0ef161074b03355d2b";
+ sha256 = "2c6e390d9348d2d9c1f2adc30b73c451aa6fdd281dfc040fa79dc7365a5414f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hy-AM/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hy-AM/firefox-80.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "e3f6989cf2716b455d5d962c88307a74cd57d57c8585f31a4007579534b168a3";
+ sha256 = "ba3d7371aae296aa6417e3c5d2b4647c0d0d0cb4f20441be525f2dd2ad594125";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ia/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ia/firefox-80.0.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "aa769627a633e32b8bab9dc1e0cb3e4030a9d6af36c66a6fd365520eb978a7a3";
+ sha256 = "799ba99b5e5c9568d94c7ee7a3bc482eb6d827830ecdc8aef9a2e4d9b157634a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/id/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/id/firefox-80.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "179529666d1dce606758f7a7ee700e1823a7c4f5840195ed57a5eb48f2ce21ac";
+ sha256 = "97f9f9194178918d8af8453b165aaede0a236e75b973a8ab0374a36ea4a8f8cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/is/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/is/firefox-80.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "53f5231e74ee28eef4ecf954ac850f1e6070fb7be51e7c8a0aa8477e0c9325e3";
+ sha256 = "f63efcd86ece79d4a996c23e22a1876e3db25bfc09e5132e1832c309711d9012";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/it/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/it/firefox-80.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "410c0c6f119b70006a947ea34ed1462247f4cfda996cf9797423784c8833776f";
+ sha256 = "c1d5fcbe8a3fba613e5da888f5252043663b7a1fb801da5cf54934af11ea5782";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ja/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ja/firefox-80.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "38f1f110e1490626908dad0e8f638453e70adc2afe66da5ae834a889e0ed13b4";
+ sha256 = "75c5d37fdf2a488b0dbfb09c6bd020db90d699713350ca3c091d5e8096d41d18";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ka/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ka/firefox-80.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "bd38f5fe5707a0ca0aee0de7d1ec8afcc92fa0faa8661b724b876c0faf5bccf7";
+ sha256 = "364b16782a4948e986268aca5e07dd92367120e97aa1d3bcfd5b78e58f58025c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kab/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kab/firefox-80.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "d7c748eeeb4d26433147b02d08b57f41be742b86480220d4fa7ae08823ae7984";
+ sha256 = "20a5bfaf08f75040d1c627f79ff8cb133d0574c83cb13f8902367e88a3742bfc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kk/firefox-80.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "8e3f43b8551b9844aeccfb21390ae1ce59eb7acde612efa4d9eeb4bcfc81bf60";
+ sha256 = "f61bce593069f598b8b8fc035b09607f423d5600df7cb620360fb1aaf4cce68a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/km/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/km/firefox-80.0.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "44819213495492477fc7401b816f45b2a7d3d4e6b5b04b2b5dbb73380fc60ef0";
+ sha256 = "7056f40cc5fc9d59145f4e08a4b19aad8e2b473beb4d8a7b09d636559bcd8457";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kn/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kn/firefox-80.0.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "89b97b079894174c2826e6106806d6bf9a46a3499e0e458a8219ba9f5ce6722e";
+ sha256 = "c18b07bc5ee941f001e3ba9336d677f51b60dc08c2bf516b68882f647475b5b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ko/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ko/firefox-80.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "731f9a98b4edfcf249fd08f94e8849a8f1c396ed577c0a1ed921b2d58863d029";
+ sha256 = "7b58b30aa461119ef842ee886d06676fb5b00d05547e959bbaae4ab597cdcda6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lij/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lij/firefox-80.0.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "a3325d7298d0cffc04757e3d4617725145ab5dcb11d359b029f92e70cfa47905";
+ sha256 = "8107773361daf1257a1a77d853ae5baa1e9ff393d16118fb1987723f2a7af33b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lt/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lt/firefox-80.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "2071fa08893ca0b55181478c677669577c9011e8f4d39b499aaec939046e45e4";
+ sha256 = "356a337cdb3ea658e6723897da2f8d99179ebfac01d071f641c661eea1da52c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lv/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lv/firefox-80.0.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "b6639a338afa0fe86e0324d844740caa9260b26e3f06d075348999253f0a0bc7";
+ sha256 = "10a9272101d4b37ac5949f2606317da5f41d205cfdc0967cacd9c72aba550cbb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/mk/firefox-80.0.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "e06db923b89559735663c93b551f31e48cd12b86f5fc7fdf78e8db88fba48d59";
+ sha256 = "45618096f39f0c6e28a900e2a5985fc1ce5c9fbcd6abeeb2d21fb4b5bc095876";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/mr/firefox-80.0.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "dcd161187ddb20eaad0353c7ba0bf7d5d0149c8bc324151d41d013e5756a7e35";
+ sha256 = "63d774fdd4f825780c7f667365a560b72dd1f31449d408553f8c51dfb6583dc4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ms/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ms/firefox-80.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "d309a899fe69b3b17a33c43093ce78e1942b497e3e3db252a46968884bb9d737";
+ sha256 = "fa67faa072b03b64132320a19691eadc719f8598167aa39f21d097b1e8fe42ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/my/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/my/firefox-80.0.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "9f74bf01425741e1c08d5a637e20b3df7e5aefc0421da14eb3ecc8199a03a0d9";
+ sha256 = "e40c7c534108dc7e9f978d3e6ea025e41b0e6120b9dd701a7935f90a7c4b834a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nb-NO/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nb-NO/firefox-80.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "638a017eb9d5f7402565dd293c44b236460be99d718fa43cfa705a55eca949e3";
+ sha256 = "99b52d2ecd2ce0154378630f80f3bb9371d0cb7c59d780e8abcbd47f7008a7c2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ne-NP/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ne-NP/firefox-80.0.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "d7d0b87b0f3aa4c8cfe1d6a44b011c167b48e19384031a302d0e0eb5bf422951";
+ sha256 = "49e9e67f879ecc519001ba500d136285c89a0fef3f7b8b1a693e8efd2af152cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nl/firefox-80.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "88a6ed36cf8116634010f5a1ab27fb22f2519974ba10dd48deb2a6fbb2ac659e";
+ sha256 = "ada875468cd865efa4023bfecc0cde06469fa3bf655944a2dfb945603d3ad483";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nn-NO/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nn-NO/firefox-80.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "aa6475e941d6e2f724447a94c2000f9f8983d872a317d4ccb1df421128687564";
+ sha256 = "b04996dccdb1a34ae41066a58090eb1be8fef2d458cf1aeb0297650123ffbce8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/oc/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/oc/firefox-80.0.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "2535537159fd34b6680cb676d607e3810f78d2db2130e35c1086210c8fc40c0e";
+ sha256 = "c6db46006f3bdaacd7a4ede17166e2bbcb4ef672d432363e86a819858327d867";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pa-IN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pa-IN/firefox-80.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "ddf3f2da7c31bf2b52e9dc4ad9f3d2b25c42e4c621594bb48a9213d2a18ea91a";
+ sha256 = "a52fde04d6f25f6ff0641ade83dbb88f4d15aff689a041cad36352705fcb43ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pl/firefox-80.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "efb57f54e1cdf5a99b84856fa12d8591cc970d5850bab7595a5e804458b1f430";
+ sha256 = "6918dd7bbde254eef27b740147d64550a1b4203979fedec6f9064006300e4638";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-BR/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pt-BR/firefox-80.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "704d84a395b6d24b33723121785cc17d36ffb95eec1c550895f61277add01cba";
+ sha256 = "21bd4c8b68c7154889f4d06cec9eb3696dde94e2ec2b946f25a627ade2b16a7b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-PT/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pt-PT/firefox-80.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "c8f67765c2bd151c68a973135ad67c46287aa11bd8055b1ee084e7c18bdc7a38";
+ sha256 = "b30ab69cacd27d7a60a0387caea18712cfd4f4e2dd45f7bb51e3074e46dc3f05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/rm/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/rm/firefox-80.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "5fe367fc5338a867cf16322fd4cfb55899275825a6aababbcc95be1f2df54a79";
+ sha256 = "9fdba8959e1276684bdd53c2c3d02e80768f3e9a289bccacf5a719f5ce51efbb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ro/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ro/firefox-80.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "f22ce12f453e7c08a1fa1277f80a24038a2906d556c5d96fd6c331b185f38bcb";
+ sha256 = "e31d0a914b107736fb83e686c5c011b912b7a5b04fb394b7e769c40ab249b504";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ru/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ru/firefox-80.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "057a5c87914e98c056a2213c348bbe72be46cad8566d7cdb0f68370b19f4b313";
+ sha256 = "3b26ecd7fd38e224625def5087fe5e6ff1aa408e3a04a06e160e688402026113";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/si/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/si/firefox-80.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "9b97d6588b9f304e090dd5c0258f0209fc7229ccf7ce21d6fb0d6da1f829dd38";
+ sha256 = "bb37483590bfe23951063e15626724a665cb03de6ce2916992ebad88759f2691";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sk/firefox-80.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "621fb92cccbf325edf25ea274e90fe9533a0ce5fdb1e0bd9f266b4a1f3a47ffa";
+ sha256 = "60be0fae9156d425708360e233a39e8b1d2be45216d8a155d06f020fb5808cd9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sl/firefox-80.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "f840e911bebf98a7917f15421fcd8feaeb72097659bd3fb0f3d1fcd2e348ec75";
+ sha256 = "d1261f9dc8091df947df5e64b5123d8d4b39bf15ba6dbe5fc4844bce9f3be220";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/son/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/son/firefox-80.0.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "9b834f1895db63a263d3f2ce2567095b8000ad39d0753020f69a704dac7d12f7";
+ sha256 = "76ae5c6f4890d5c29ee33ffd81923696f755e6fe0fa8081c75e72ed1599e5070";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sq/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sq/firefox-80.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "7136196b26f6e9b963d86e1cd9a088f9d2a7751e08193a59dd27c00b08da4d4f";
+ sha256 = "5aa679e980bd0808b0c924e4ad11bb6b3256afd031cb04f16f862eb9bfd4644d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sr/firefox-80.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "6cd5ce0c122a3b9cb6c066ab8df57277bec7d78e4fab9f15ef88c7ca16a6a3e1";
+ sha256 = "a4941d40721de72abf22b97846cc16de49670d7f096829aa0d1775089734d36e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sv-SE/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sv-SE/firefox-80.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "ed0104efacbe6c4054b5d6a2c4397c13db38d245bd557dfe8ed876334bb232a1";
+ sha256 = "c50a2d0bb15cc95982e3d2997719a65eba6e0099ffb13b066e66e5aa951375fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ta/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ta/firefox-80.0.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "4589d31f7ba58e6f149ddf64f6020b262cfa9a7b8c228ddbad5ac9032013bb74";
+ sha256 = "53651d5b0ea3d36c6600c57f02c27202f2f5b938aef34de4164f325ef46d8666";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/te/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/te/firefox-80.0.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "3bae0a5ae9735ba623b8f3b4f333169f4f99fc37c43ee29e65221aae21060d9e";
+ sha256 = "5225d57d4a5c83843ecc83735be2fbb4004d4411da5ea72340cd6306078fc426";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/th/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/th/firefox-80.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "eac036a449108ee78cf3d527a85abcb87b0c116d78e71d7a0274f326ebcf1218";
+ sha256 = "b38092aef16253b180dfe0d297ee1bb8417dbb4851466625b80858a18b2d3801";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/tl/firefox-80.0.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "f8c9053e62b80b7ad1f20e622c25d01b8926c89b8780f1ae642d922d293d5018";
+ sha256 = "5ac9aa87ad90d60a852f7cbfc611c05eeef09b2aba46da80a2ddb093ce5f1730";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/tr/firefox-80.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "8c6d089c9b0a1acdddbaf01d44b274da4a7d01751239dd017add9c7a0867dd38";
+ sha256 = "b2a6aa22523f9d3396675c60ca7590e9c379a15c445727f01c3ada090a0557fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/trs/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/trs/firefox-80.0.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "086b1b43a42f3c1487ead061b822b94274dd58b927df5b481f8079b960b52dc3";
+ sha256 = "0e3e21f8c76bba90e730959e3f176c5b4406196a4b9f00aa4d85088495eeb337";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/uk/firefox-80.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "e3ee4bf352916f57bece093a079ef58f68a1d3c60d39e02ac7ba9587b98b6cf9";
+ sha256 = "626f9af6252a003cf869067de439197d8b0dd0b73e654310f439579959036f5b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ur/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ur/firefox-80.0.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "7e485392f74814c874c2efd153add419a110c790514f4fef4bad0a4c5043751f";
+ sha256 = "67e1108697c033ba3c6bcce7e36e5ab269f66a75674795e931aeeefadd7e949f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uz/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/uz/firefox-80.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "7a9f0e8e1a776d1155c609bce03380ecad60c2259a05248ddabb65a6c2f8080f";
+ sha256 = "90e6d82c75ee24925cc6fdb48674e7ace3e58fd2cf27441d8ba9b24002b03a03";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/vi/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/vi/firefox-80.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "a50f5c651093bb205f5cf7d1c44c12994d0aa73cf3a3cf1dea22e3754c6943e0";
+ sha256 = "dff1e18e968d514b91d4f3c419da0570478e1667485761be703349b5c6019124";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/xh/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/xh/firefox-80.0.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "a94a46b428a87a3cd543dfcdbef46708931e18b377c548b11ca565067c953ebb";
+ sha256 = "1d524f5c5e6003c4cb1e00676ab5c369752c80c763684d7550224c7bdc66ca68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-CN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/zh-CN/firefox-80.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "911e0b9591dea07aab26e4e35e84645d79c132fcfcabe504ff242ac87d853834";
+ sha256 = "8893528da90e46d8eb287ab857ee6e18d89355d7901e221c7820d7f1bdfc155f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-TW/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/zh-TW/firefox-80.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "58afd8192b08eb343da9385344b87ad0e72046cdda26495a5534a75f12d40d38";
+ sha256 = "8b01036a6c807e22f66ccd93fa335e3fe71476e7a9993965172b85d2eada27ea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ach/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ach/firefox-80.0.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "055e0f66d0e5e3c9f3bc7ae94f6bd46a8ab0bb87dcefc2cace02f4ebbbabbf33";
+ sha256 = "1bb95b52770a8cad2b339874ac4576e190790935dfbfccf22cfa8be41e3b7e5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/af/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/af/firefox-80.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "0705f3f63655b6b55604d9b2b801ea07bacf2f0060ce6a2ca6c1d6021c35a594";
+ sha256 = "919522f2c9d8f0b3c7f7c7d4311735e68eee173883c80f4d168625b690d0f29c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/an/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/an/firefox-80.0.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "f1735cdcb500df69cf66886f194d101393f8e5880b790fc135348e6515fc7ba5";
+ sha256 = "878eba95507de8dc1788e01facd9710e39cb62d75229d6204601c58ea0df4cf5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ar/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ar/firefox-80.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "97dc4e314f361d7afc3e77d13d712f45306af21e4ef2e5737409b9932b341f92";
+ sha256 = "4bfc935eb7a94eb6cb957b118c4811cbc0d1265a9fbcd4b4ecd3aea593658af1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ast/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ast/firefox-80.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "2cb19f22bc6372d4b3406d87b19acc4ec61cf60317869392145b7405a820b7ea";
+ sha256 = "c64157e1ef1c361cf1dff89ed443f9b7fceab088c3bdac4058e262a1c068c97d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/az/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/az/firefox-80.0.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "83fe4b78ca684c9a58702451e4f8bbc9ee4a67aeb066d74699f7e3d471e0a16c";
+ sha256 = "6045ef88f6cda1ac9b87854c7ac0dbfe789f9a4b4f7d35f9612beff57d832b60";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/be/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/be/firefox-80.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "f08a685b2b99d3f508487215e426af802097599752ab82dfbd801c063588194a";
+ sha256 = "6c0e25a6610a0da75f086a829a142f1b7f419e1357d7c97efaba4f1a9c95b5d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bg/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bg/firefox-80.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "a5d3c78d91e813358e7b1c33c10854f43112398ee88310c078aa0b5db00b7518";
+ sha256 = "1c8579439940499262e8e2096f16bd6767441b72a00774a35d76db9463fdaf34";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bn/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bn/firefox-80.0.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "eab386c0bc37dbe0ab2c8b51a470bc9f65a8f59ad17223d95fe631507da8fefa";
+ sha256 = "06eaec1ac31a6c2dc21eaa871aa2dd4f45a299458d5cc950c2d52454366ba1b3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/br/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/br/firefox-80.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "125e5bfe77bac8d9155b07d057e3e8e8de3c3b4bb3aa3de192f2ae55ab9f4e33";
+ sha256 = "3f8a1a9204ba24d2367f6ad995343eccdb48c981d726ed72e6f96b3579bb504f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bs/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bs/firefox-80.0.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "6d9fafc803b098e8fe93911e9d07baa28765dff6b072aa911f74b2076cef54f3";
+ sha256 = "61da2d6bb7dc90615949b10ab45ac56d38ccd4007ab6f0ff730454994d303f6c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca-valencia/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ca-valencia/firefox-80.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "91d71b2538e059c9aed1d7a564125c25bca6f6c8213eb247aea7357b1f27b9a3";
+ sha256 = "15ea7d6e7eee13f2100111b8c9fd10cba728acdc27575ad0160b5baa5c5ba0f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ca/firefox-80.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "5088cc39fd0b18926e6821348373f834a8b5d093ccaf9152cfc8da3157522734";
+ sha256 = "140c3b74f0edd7ad47c07dfd5cff6fd224048560ccc691467a00d3c67cc1505e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cak/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cak/firefox-80.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "31c9be88e0263e0968fa2ebba0673234532d6a99d5cf97ab7b863b814d9d140e";
+ sha256 = "614876abaaddbca2dd2c56eae7b865828fa446c07bc5401f7bfca7637edb2728";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cs/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cs/firefox-80.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "a606452009ca9e9e7d5f44fc9b42a222e3f557ac4d338c90ab9335dbd96e6683";
+ sha256 = "2dafa0635a3192a9049d7804f97beaccf6e62a8613e96ba241dff1728aef840f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cy/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cy/firefox-80.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "a8254adacb701007945e4cbb48d861358cfefd4f590e509264ecdd4e0e858235";
+ sha256 = "1993cd996e6027b4dbc0e306ab8c09772e0013bdbdd2dc9c774a702555b2f21e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/da/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/da/firefox-80.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "350ce9d092799302a8c3830fc756c7ddacc752f9b42e70bd73dc1d61a1d1d07b";
+ sha256 = "8fb1663ba5f646cf65593fe6eb57a63f750b555f6c75fad7f4a9d3592bb46421";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/de/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/de/firefox-80.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "576c95fc5aadbaeba43991b2fb28e13cd3f18f2e81e6584a0208328a4f9c5ca6";
+ sha256 = "9536de23132d6267f3535e08194679ec16afbcf1c3cf6beaec64cff7de38d701";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/dsb/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/dsb/firefox-80.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "024054a027af7a4e8f68a299ae24a47eaa2ab2e69a847cfaa053295cd454b947";
+ sha256 = "277cd59ab97d33a89e621ca3819fea2cc58042cc373891fd4599cdbddbf483ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/el/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/el/firefox-80.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "63ff8a79ec70c7ce44d8375e5ee377754e329f32ad751b87de214707984eba7f";
+ sha256 = "609c2e25ab34f793a85e60ff9fec4d4281bdd228026ef698fda1b25e956142ed";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-CA/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-CA/firefox-80.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "eb8597936d2a3a2747827227082743a5b267ee12b45f16e901ab87ad897ae780";
+ sha256 = "ca54e8fd35633530605149ca7aba49099098f96e880dd0629885e6c867c3d632";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-GB/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-GB/firefox-80.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "8a1b4c0320439cd3ac22b46fc111564b7ed68ba9f04c7b20a276ac550ebd84e6";
+ sha256 = "6a6e6b1b34fbaa578a035e430d10fd2911bf64e1917b170cd47ab565ddf9bdbd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-US/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-US/firefox-80.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "d56bc3d81f7e1807852b326d3f0b00f9e745fe4f8b97c0ffc64aee979db4fa15";
+ sha256 = "d87d71827f0161f7d3230217fc4f7c7bdca804ccc5f49b4d107151fbcdd7622b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eo/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/eo/firefox-80.0.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "cd979e28dbf2032ed8f1e5c7c84eda3ddefdef4223749b6fd61ef2f727401a4e";
+ sha256 = "50f158c96b8de9b789dbc138004646ae583b900fb067b59108ee4ad97e0cd2e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-AR/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-AR/firefox-80.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "4875b4139be6ddcf1e7bff57c3045f29e7730a7bd0e38fffa0443bd0f3aa45a4";
+ sha256 = "e5589a3a92ce6ee1b5756beb4cd6903e1526d74d457bf3fffd8b9072ded3c5a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-CL/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-CL/firefox-80.0.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "68bf54d52e45e0b8e0cfd27ec39e3ff97307e91bcede2f2d2561ac5139d179b8";
+ sha256 = "3188fad7ee67a0c98b370ac32a50136c41f69154f99fda13804d16356679a87f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-ES/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-ES/firefox-80.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "e324772591d019b5b27a00716c30ed0f8803dee83276b19b43f5808f584d5000";
+ sha256 = "c9f37fa0ab8e4d3c16cbc20ae9ce0f0a568a9cc2c48fbcfa114b1ab2b9b462a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-MX/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-MX/firefox-80.0.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "bf40f1eec6d42c5706a2ae0f840ec00778801d98476dd6055a7170e8ebe8033a";
+ sha256 = "f07ee3d9317157e5205187bffddb0339fb810ff06aeb192d12e367acdfe89592";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/et/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/et/firefox-80.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "d0f45fa9c2e9559efe0376a53d1bfc7fed04a408d563419e283a0e1a4b4f0840";
+ sha256 = "01aa2da0ec5504f601e774fb9a35e0b8bcaf59fee1cf8fe33a5d29c05fa75d68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eu/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/eu/firefox-80.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "def48b817fcd432a3573a1d17bbc4dc8616e8b94366836406cf6341d610ba3aa";
+ sha256 = "6d3f10b801660064e8f51fa45bc17bf1fec641cbb526e1da925b8eb71b863112";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fa/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fa/firefox-80.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "08e4e0c50bb80aba30c2f3666cf568c39bd031938a1e2a6b9fd092da688e3b4f";
+ sha256 = "0f519bd6d2e8d1e01ef3f6af13937a84fe4c551b56a6c438d01f2b7818c0c440";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ff/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ff/firefox-80.0.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "3e9e75e5501d2a5d1d1d11e628d6b9acbd613f3a0f7aed005752f4d07f15686d";
+ sha256 = "f72bf80190d3bf1a4b81aa06f6f0a7ea25267302747ead42a505461d4cd63e35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fi/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fi/firefox-80.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "61e0d7ee1d4b0d8dfbea3869766497d88dcbf0c467d41d07ea45309d03839a49";
+ sha256 = "44aef7c10ed8815634d62bb60b7d5412901dd016ef7439b28a84219546b702b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fr/firefox-80.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "9c502d317ae781e82a69a80c864958ea23eeed18b215b9f08a7ecc024bcc6249";
+ sha256 = "a347e36231516c410e756e55fa8e03c660635a70c8315ec14e9b2c68deae9db8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fy-NL/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fy-NL/firefox-80.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "05ed05024ebdb58eb2c178c30da5d0f013299ffbf42c26b7e28c0bd1053106f5";
+ sha256 = "d53d4fad373b633e287db03675f89279e44b80c28ab50c238a05b286abb916b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ga-IE/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ga-IE/firefox-80.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "101f512b07c22c24d55fab970b1d5140f6f7a54d470652511e8d053d5d3ba265";
+ sha256 = "279f93b6e57dbaa443df2221217e4ef60be015c0a4e6fad8806e97f46f074f9e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gd/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gd/firefox-80.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "2a7998045852b8f3bcc86aecf40b5582724da71eb14d1fa612184dacdc751fcc";
+ sha256 = "b3c89bb8b8e4f9bae3686e601de8ad7c065940f8852d63a8e503095b0674e931";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gl/firefox-80.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "0aa2c2ca4cdffedc5d17e4223c2cc6e96ce89bc69989ae10be683bcd61f4a143";
+ sha256 = "cc9687f4d35a62ba0be5c362bf0d55ed1acdc4d1b4e0284cc4db04553c36786b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gn/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gn/firefox-80.0.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "4e9f93db434ef45712c11ef5e3e812dba5927183d73da81db3b9698f35c51585";
+ sha256 = "c3d4cec222d099bd2a9f66c543c97d1c18c0abfa087c19fac3da08579c60d103";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gu-IN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gu-IN/firefox-80.0.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "f2c3cbef250bfdac654ec2eaf438f51c059521b6a0d1694427013b949a323cdd";
+ sha256 = "7af5a56a90bd0eadf93ffeb2b61f08232996b560588fa52d55ffe3023e08b3e8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/he/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/he/firefox-80.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "3b4d9dc608998b2d76db3ab2f21826983a12284bffa22e76ec60a275c5a54f97";
+ sha256 = "65222595c4df12375837f0994f9fe23a3a8f96fde8ec0d7be980ab16ea19bc71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hi-IN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hi-IN/firefox-80.0.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "840ff442beb5c0599f7c67a00adf840a8f4306f2bc6ac8f2397af0b876304741";
+ sha256 = "ee52e1eaca1e61c5ee1cfd5e86fc0afed242f9162f36027f57052162b88b2500";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hr/firefox-80.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "e0098a3069cb9b86becd2f77a671731bd849a568d2fffb6064528f802e5cd6c6";
+ sha256 = "ae9936bd5b55e92250d73859b1d78505fcc3d3312d0772591720012ea820c367";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hsb/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hsb/firefox-80.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "8322028ef47168ecc2928284e0a96d36c9208dfa2a7f3eae6f7449fb77753e62";
+ sha256 = "55e837eb12417899dbcab8d15f3c8e3604f7a071339b1f2ee608801ad7fe7912";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hu/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hu/firefox-80.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "801b62419499f9ae9fa48848aafdad7258cc95f7b04b1ade6d3cbf6663a6b3dc";
+ sha256 = "710a5e73c34cdc1b7a77e8465724b0e99c4084effb015c3dd71e3fc2f678149c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hy-AM/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hy-AM/firefox-80.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "7b4af441958fbffbf43b7e1ff8e97d62dfd3aef2076bcdf1fb1eda8006093721";
+ sha256 = "7e40874e151c69145db6a812d7050de5ea65b8939a394cbc468c3492abd189fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ia/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ia/firefox-80.0.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "ee2bf28f2cb18a5cdeb51420042d624c40bbaea73e4c567eb801273f0c4c8095";
+ sha256 = "5c6083dd765489f378b6855713e601d50ff84acf95674b8d3b873b29981dda99";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/id/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/id/firefox-80.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "1083dbcab9b2b297869ef7a4a65ee04b63e851805e7fe7f7977fbe6d2f69828c";
+ sha256 = "b8cf9a69b6b52f816e355399e2bf6c1742f56d7d631dbee78a687a1cde9312dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/is/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/is/firefox-80.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "c2c475e280f3f52a134182ac6dc679273c29198605d9214f4ceeb09e57f2cdf5";
+ sha256 = "532793a2e2d761ba36a3bdaa0a257e8828b5516193c4cf1f1ec1735efa510e6f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/it/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/it/firefox-80.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "d7de926e398e6291e031f737da63fe223c7e4c70c01994bf74c8461e04af0840";
+ sha256 = "a5309e5f3c387990ba1aa255684ec73f2e38dca0aa873f998effb7dd7b13e0a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ja/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ja/firefox-80.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "a5f1c6bd8bd5aba351511838c04a35f26aa107ca43d87489ae24bac3831df165";
+ sha256 = "f9dc927612114a5c8d9a4e0ee311356a0e5e819729f4ebd08ee5f03dcda52afd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ka/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ka/firefox-80.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "513c9c885f741162301a980daf84eff5aa42f45aaf766a9b3e1376fea83bb78a";
+ sha256 = "37b82df19bd4897bc2c29eb3f5f94d107b6b97eeb5a1b3ff5ddcaf641dd0fb19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kab/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kab/firefox-80.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "15fd46b89f7ea425121d02aef931bbaf624391e7039d81e646d6551303598579";
+ sha256 = "1ef2b402c518da26838c2c3e0d5c47fa8f3c5d74cb2f9a95999814476d3bc629";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kk/firefox-80.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "82a29718fdff57e6d02f8cc6ae76bb604d0e14374e7881c120ff6e38c4b21995";
+ sha256 = "d152f45918a163fccc9eec97f5543d8c206a3e9ac130de58260943e6aebb19a8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/km/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/km/firefox-80.0.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "406c361b49d9e5cb6eb952e5be0eea3a8b9ff535a3edb6dc1c60ec6171d5ae49";
+ sha256 = "2d9639684b0115f9db6eb73379e1d7b24670db83afd2e7d2bed2a7c62188f54c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kn/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kn/firefox-80.0.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "0839a7af990a70523355047e5cfd24e73d0c8816cd12f2a21aa8cc244d9ef90c";
+ sha256 = "224e41e1c33e60f1de88fe8243742675e0813b7041f1bac3a9a29528c618df3b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ko/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ko/firefox-80.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "2ed856441ea51d642027b800911f134c27207dd8a53ee5a27b9674eb11417b05";
+ sha256 = "16372732d44159e017875ee9d3bdbc5443bfb1eb577d62e8b28a05560caa2650";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lij/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lij/firefox-80.0.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "653c7c4be39dfc49f89e5e6c591ebc953ef0bff5a9d827d348dad26e3f06bcd8";
+ sha256 = "a796e32ed17c08499fc2e459a1bf753c7578f5555e0a7eb62757b4c5d4f6b735";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lt/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lt/firefox-80.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "b61fe55f65029ab661d0b589cc5301c6131b778d55524de6b13779dd2d0d6c35";
+ sha256 = "6687e81d9be17a992e34fbbc9f44edb86be75e1329292122e7978211d4c0b43a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lv/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lv/firefox-80.0.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "2f9a99d7a344984736cb422ccc106db8d175f31c1b1a108852494b7201ff67cc";
+ sha256 = "7c4beca6385caaf9e05eb6f6cf508f51d559094cff3eb60e28d562ec7404d804";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/mk/firefox-80.0.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "0cdde250523fbdbb8b651660fccbe1afe65068c263e03fe7ce26d9758fba7bba";
+ sha256 = "d8da49d2b43467ef4b29f55a15f71125ceb8388a55ded93ccd90e7d484d84feb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/mr/firefox-80.0.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "0df4e48be06d800d1fa308841a1890f7b1c87e63b34901cdd1481a63a7080d24";
+ sha256 = "304c8f8caf6ebdd5d928135f7fb94d490658e0fb6b7b73e2f1618b7b07234de2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ms/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ms/firefox-80.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "3fc1dcbe6c72acbee7a68ebf6a8b08b9961a5a04eb05f0cac86ac8fc56953917";
+ sha256 = "a4cea6625395d522ab3d4000f6774ba5898a1f740c9b70b23f71f52e1231404d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/my/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/my/firefox-80.0.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "aba83f9c9f41dc5660a480b6821dff2c405900d9370c3d1414a892ad0e44161a";
+ sha256 = "1bbb703f65bc5d41174800ec789066d99ca10430605dfb2975b6d788b41c1220";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nb-NO/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nb-NO/firefox-80.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "34e9cfa0bd9a065b58edeffffff690abb6240e90f1d788146ac3976d9e7d9cc7";
+ sha256 = "95592600fbb71a6346fa42f8647460fed047af96f38754a3322eef9bec7a22aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ne-NP/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ne-NP/firefox-80.0.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "8031d15b84eb3baa73064ba592434d4d36ae94c6bb3b7c9fa359f93486be3ea8";
+ sha256 = "f902008b0c6390265e11209e573555b0854b0d0c879eb5c2637f18ce981223fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nl/firefox-80.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "33f19d81143a26b7472b70558c2187a4ed39f67ba95e28332c7e8a8699aa33e9";
+ sha256 = "9ef3bbe6b6975b50013a951559f6beaa34ddd5b183ccb33500c585e3c094fc05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nn-NO/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nn-NO/firefox-80.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "ca27dd578f8054df63b77c314d3504a2277139cc2d54d43f8c202771ad12e76c";
+ sha256 = "783427d27ef6be2bac3a219f72d61a6cc8b6105ec01c94476b06187d83fada90";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/oc/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/oc/firefox-80.0.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "336cfde595de21f8ee355ec4e6a240da8a8946f357a100629ab0d0d883bee335";
+ sha256 = "f5a6af6e4d2bee9ea6c8e27edfe593640f0410766eec4a029c7b6641731cca58";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pa-IN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pa-IN/firefox-80.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "bb51ced0f4993862a7d025b1b504e29fb96e6341336c3fc61ffc6d3ffc18d884";
+ sha256 = "8d45fd730fcbf898062231356d11892eda44a2dc124444fc0623de363a807a73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pl/firefox-80.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "c44b50bc19b0ba7cb198d144f05b10d5f453c110463dd945534ccd180b71c7d1";
+ sha256 = "9c89d3be668a295ef53d1dba84d1b9db230956d5700de6a86a6c8b0dffce5781";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-BR/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pt-BR/firefox-80.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "6cda521f9c8a02c948dd1461fafff84e7e1b793815b6f25697a78751264dc689";
+ sha256 = "8c591df0daa36ce3fd8380d34609cd1e1d26c8116db5bbe22828820c1f7f84aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-PT/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pt-PT/firefox-80.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "56e5ced26db5466aebcd7108dc3f499b243631bf61505a1fffb92b2eeb2cb5cc";
+ sha256 = "e3ea46565734355a779e5b4b083c14e2f13d14f78f7347c36306fce57f4beb16";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/rm/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/rm/firefox-80.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "47913299e22f8b955bd5307241d368cb3c29d6a0bb0d90d5ed7667b85b6aa0e3";
+ sha256 = "c2355ccb07cd804aae65b31270e51d2d0a1ea438db44ab75c22aa57cb1bec71a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ro/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ro/firefox-80.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "528c36c4361f42a3d90f076800b0b73c8c1d630ae97ba33ff59e72d30d203cab";
+ sha256 = "e7b729a18283dabd9f295a436e97c3bd42eb6666e77c42ef1b967598d6e0ae37";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ru/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ru/firefox-80.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "ff1a33da0bd8bb7c2d7f460724c292b7433087ba5596258cc4bbbac2087d81b7";
+ sha256 = "d9b2a3449ca0ed738db8bbd3f316a4973fa318c4abdb63aced9832419b579229";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/si/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/si/firefox-80.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "675d6238f6bcf07751ec5356f3f4824d681ef28ac26255e1bae84cdab23ac0a7";
+ sha256 = "8a43a0b25befbb5f0a9477086ae85d58b1d4c448e06630d1c0ece950d24bb6a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sk/firefox-80.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "141416a2320bf355cf9f3ca33ec3983b5089c5b2c9172cf03e00d21577b570c9";
+ sha256 = "40a4e4b307ebea63a13e8073536c1d039ee400b4eff109a4ed086c5f073c12bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sl/firefox-80.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "6d062305ad9e40add4f8c84d051647df8c6b3e083011e00d9380f3e2eb6f128b";
+ sha256 = "19b163d77a8480099cc356f84c00d51c62cf97095ed2a3f2a16a654abcc0d413";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/son/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/son/firefox-80.0.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "2e2adcfe7f26adac4aa820acbe894fa567f53faf2854eca3febf2d7fb66c97ee";
+ sha256 = "0c9b0546846cde59fc550f2a94abb8e909f1955ff5790aacd3bfdf63a668a1d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sq/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sq/firefox-80.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "eeddc2cb86011cbec49ace8c954ae9724ebb9a800cacd4354cfbee782ce7e481";
+ sha256 = "b153afd0d8efcb4563bf46df1f8d20408e179ecd94a4e294683eb5caa0141228";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sr/firefox-80.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "88081a8c78e039aca0774b1ad61eb3508b9d4bf088cfd27e6b420431dcc6b95a";
+ sha256 = "36a3dbe8a9fec700ab91134344db6d70dfe96d53bfcf366ac83b29ba7f405a35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sv-SE/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sv-SE/firefox-80.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "51096fc91f7bd36b6bf66c57eb870cfbc62c42880ef2b7d3ae8032c49b5dc07d";
+ sha256 = "708b43a83fc88ddec15a87a0f753690048dcb7500aee2a52c59c28912de5f401";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ta/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ta/firefox-80.0.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "06f1af1fff1eff74d3aee7a7bffc7485911d350daf216bc8a3f6462b85ab28e7";
+ sha256 = "e552b1ff45f4b904a7b76af41f44e9e349cf08f20981f44b95d7e89f727d3c12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/te/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/te/firefox-80.0.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "5921702973c5c808f396fad81e736ffe7b9948996997cde5f721e55a6b0c172b";
+ sha256 = "5ea5d027d0b6aacec730a865d8c70e8929c858b26a3ca0f798bb3a405e438aa6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/th/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/th/firefox-80.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "5e8ff4f8b3204ed67545c4c68cc225ef7e28ce9c63108efdfb1ced7c77e2ce6e";
+ sha256 = "32e0e810308c3fdb52b247d086193f0dbf1184ee2f6ac42c2a25766f158ed79c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tl/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/tl/firefox-80.0.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "72b9a9cef7a4d166e9d33e0a89d00a1c270d1e6b4e5039356f6145bab0d8f6a0";
+ sha256 = "d64ff747faf81f626ff91c18f72f786669f48ca84f55df58a25ffeadc1683325";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tr/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/tr/firefox-80.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "38cc4e45e3222633b7f85c59eb1fc8a993f4b77ffe9b50478ae894fb68f67304";
+ sha256 = "22cfc8b33829476e0a058900f5a606020b249225e15c3a78a5baa314ea39a5eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/trs/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/trs/firefox-80.0.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "f82d215f8a1a9b5b07ab71cadf75ef007e57b987d025c14fa671305dc5087182";
+ sha256 = "a7db4c7fc442156414d658b04cb531fe5b4f4ac7b46e3a62229bb7528b40a43d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uk/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/uk/firefox-80.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "014d024f4d14f465393f096147b661919dc1793289e68c4d13b6b01dba42d4d7";
+ sha256 = "072b4d82b5a8c14764f3664ea5fd436aa616984e044e078002ef6c4ab3f5a804";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ur/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ur/firefox-80.0.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "c2b7382f1e511dd7c79b3d5854059c403f633ec4423ec31dd9395d6dca4d31ee";
+ sha256 = "c52f5cb761b5d8f7c6c3646c3fc2a5c4580d5dcaa0d8757f3f37b990a1b61191";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uz/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/uz/firefox-80.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "66e35eb3fe6aef2a3d4986a585072f96b55877b0a15ce81c41096e1f1c001f2a";
+ sha256 = "4bc2ca5751a9d0cd69661799ab5ca6725bdc12055d07c975a6a7f90f44d93182";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/vi/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/vi/firefox-80.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "d1cdb32bfb6f6d8e41d3f32de0c86654660d5d7ca4bfe0e763eeb799c0ead10f";
+ sha256 = "1ce68d3b630754f961264558c424c0c9771d77f01858570ef0d15ed2098e99c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/xh/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xh/firefox-80.0.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "508d17ec13f5b3e1d18641451374efb72331fe68b254f8a71bef4807c318bb9e";
+ sha256 = "b7e4d8f55c8ff78491cf2e65510397f09b3b5995f7f7fd506c7e20027d330ee5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-CN/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/zh-CN/firefox-80.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "cf2f5617c652209daef0e6e5176181f2659e188f9007d7accb4041c030c54fad";
+ sha256 = "3ab8f24ea6809b9a2b1cbecef55caa39dbf4ecd33b287b8ef77e5a76bb617337";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-TW/firefox-79.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/zh-TW/firefox-80.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "ec99c9201151f134d72450513c518816f244fec0af6de2bb4ee08d3286b709f1";
+ sha256 = "4c306d3227ca8dc322780c0eeb8532a62db101c6cde8317acfa824bdddea4d12";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 4ecdec77ddbb3..1f1831d3c9180 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation ({
dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
libnotify xorg.pixman yasm libGLU libGL
- xorg.libXScrnSaver xorg.xorgproto
+ xorg.xorgproto
xorg.libXext unzip makeWrapper
libevent libstartup_notification /* cairo */
libpng jemalloc glib
@@ -141,6 +141,14 @@ stdenv.mkDerivation ({
postPatch = ''
rm -rf obj-x86_64-pc-linux-gnu
+ '' + lib.optionalString (lib.versionAtLeast ffversion "80") ''
+ substituteInPlace dom/system/IOUtils.h \
+ --replace '#include "nspr/prio.h"' '#include "prio.h"'
+
+ substituteInPlace dom/system/IOUtils.cpp \
+ --replace '#include "nspr/prio.h"' '#include "prio.h"' \
+ --replace '#include "nspr/private/pprio.h"' '#include "private/pprio.h"' \
+ --replace '#include "nspr/prtypes.h"' '#include "prtypes.h"'
'';
nativeBuildInputs =
@@ -277,6 +285,7 @@ stdenv.mkDerivation ({
patchelf --set-rpath "${lib.getLib libnotify
}/lib:$(patchelf --print-rpath "$out"/lib/${binaryName}*/libxul.so)" \
"$out"/lib/${binaryName}*/libxul.so
+ patchelf --add-needed ${xorg.libXScrnSaver.out}/lib/libXss.so $out/lib/${binaryName}/${binaryName}
'';
doInstallCheck = true;
diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch
index 7d129dc78f98f..1380c7dc9a2b1 100644
--- a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch
+++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch
@@ -1,3 +1,4 @@
+Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies.
diff -ur firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp firefox-65.0/docshell/base/nsAboutRedirector.cpp
--- firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp 2019-01-23 00:48:28.988747428 +0100
+++ firefox-65.0/docshell/base/nsAboutRedirector.cpp 2019-01-23 00:51:13.378188397 +0100
diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch
index 2fe30980a35c6..3530954ea5c59 100644
--- a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch
+++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch
@@ -1,3 +1,4 @@
+Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies.
diff -ur firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp firefox-65.0/docshell/base/nsAboutRedirector.cpp
--- firefox-76.0.orig/docshell/base/nsAboutRedirector.cpp 2020-05-03 19:01:29.926544735 +0200
+++ firefox-76.0/docshell/base/nsAboutRedirector.cpp 2020-05-03 19:12:00.845035570 +0200
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 62181321cac9f..ce9365f72fe5d 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
- ffversion = "79.0";
+ ffversion = "80.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "0zgf7wdcz992a4dy1rj0ax0k65an7h9p9iihka3jy4jd7w4g2d0x4mxz5iqn2y26hmgnkvjb921zh28biikahgygqja3z2pcx26ic0r";
+ sha512 = "3rw30gs1wvd6m2sgsp1wm29rrbkxyf3jsdy8i0azfz9w7hqcfwnv76j3cdf18xghh954hpn3q6w1hr7pgab3z9zjxzyfcnh2mbabyvc";
};
patches = [
@@ -35,10 +35,10 @@ rec {
firefox-esr-78 = common rec {
pname = "firefox-esr";
- ffversion = "78.1.0esr";
+ ffversion = "78.2.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "223v796vjsvgs3yw442c8qbsbh43l1aniial05rl70hx44rh9sg108ripj8q83p5l9m0sp67x6ixd2xvifizv6461a1zra1rvbb1caa";
+ sha512 = "1dnvr9nyvnv5dkpnjnadff38lf9r7g37gk401c1i22d661ib5xj0gm2rnz1rjyrkvzrnr6p9f7liy3i41varja00g0x1racccj1my9q";
};
patches = [
@@ -63,10 +63,10 @@ rec {
firefox-esr-68 = (common rec {
pname = "firefox-esr";
- ffversion = "68.11.0esr";
+ ffversion = "68.12.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "0zg41jnbnpsa07xaizwfsmfav0cgxdqnh8i4yanxy49a45gigk895zqrx2if7pfsmdnj9zpwj9prj8cpnpsfhv6p62f3g2596aa9kvx";
+ sha512 = "169y4prlb4mi31jciz89kp35rpb1p2gxrk93qkwfzdk4imi9hk8mi2yvxknpr0rni3bn2x0zgrrc6ccr8swv5895sqvv1sc5r1056w3";
};
patches = [
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 8d711b6de2fab..fa19c4efa9d8f 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -119,9 +119,13 @@ in stdenv.mkDerivation {
--replace /opt $out/share \
--replace $out/share/google/$appname/google-$appname $exe
- for icon_file in $out/share/google/chrome*/product_logo_*[0-9].png; do
+ for icon_file in $out/share/google/chrome*/product_logo_[0-9]*.png; do
num_and_suffix="''${icon_file##*logo_}"
- icon_size="''${num_and_suffix%.*}"
+ if [ $dist = "stable" ]; then
+ icon_size="''${num_and_suffix%.*}"
+ else
+ icon_size="''${num_and_suffix%_*}"
+ fi
logo_output_prefix="$out/share/icons/hicolor"
logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
mkdir -p "$logo_output_path"
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index 0312c3b6895e5..0db521f8ef59d 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
}:
stdenv.mkDerivation rec {
- version = "2.20.2";
+ version = "2.21";
pname = "links2";
src = fetchurl {
url = "${meta.homepage}/download/links-${version}.tar.bz2";
- sha256 = "097ll98ympzfx7qfdyhc52yzvsp167x5nnjs6v8ih496wv80fksb";
+ sha256 = "0qqdcghsdqm7l6kyi0k752ws3ak5crw85pqkcb11wy67j62yspi8";
};
buildInputs = with stdenv.lib;
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 76b4884aae5e6..bec18edea3700 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -74,7 +74,7 @@ let
in
stdenv.mkDerivation rec {
pname = "flashplayer";
- version = "32.0.0.403";
+ version = "32.0.0.414";
src = fetchurl {
url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
- "0nx0fxa6l438hvzgsxa561nrin8lx7l9ccqscjn9mdg42yw36k63"
+ "184qy9zxk9ynp6avz1j0ca5mxqqqlhrc0m7d1cjxv39jfdiyz51i"
else
- "0vbg4ijsbmn71kq5mynx0hfhazy10ghcxsxwbwaxdl11ilxikrli"
+ "1m8fay452zps5yw1qpsc6irxxdvqjhkwxg066ckxkjf68gln7cmn"
else
if arch == "x86_64" then
- "1paz9y3pcisw5ck3v6a740sr7plmsbg6bjqrj2yfqdixf95fk2pl"
+ "0ng04yig7msq4mv01ngfsh7mkxia18j3k9clnp0y0sbpr60z8s83"
else
- "1b2r20yc94ibsw0vpr6xl1x1vbjgjw6qzxzr374ppck8famikyj2";
+ "0fndnhznqz28wfmm32fafx30pi517vvkxy1isp4krsfvyl7fmzhn";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 5c4f85ee7172a..7a5c676ccb041 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -50,7 +50,7 @@
stdenv.mkDerivation {
pname = "flashplayer-standalone";
- version = "32.0.0.403";
+ version = "32.0.0.414";
src = fetchurl {
url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
- "164cah1h78vs068y19v0c40243sy2ip1n4jc6qvzv9acawy12ckw"
+ "1sfvxi0ngk1ny912hw1zp0l3v6md6qqpvnyab3h45562m2fm6vqz"
else
- "0508jzaji3z52dyp49xx2m7impz1fdpp20af0h8dwdph1q3mxn32";
+ "0pxb3fhwvajvb28w11iylx5rp0h1f4s2aiii53gz28sq082w9br4";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 686ffee91488d..eefe7af26a1b3 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -47,11 +47,11 @@ let
in stdenv.mkDerivation rec {
pname = "opera";
- version = "67.0.3575.31";
+ version = "68.0.3618.63";
src = fetchurl {
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
- sha256 = "1ghygin7xf5lwd77s8f6bag339di4alwlkqwjzlq20wzwx4lns4w";
+ sha256 = "1643043ywz94x2yr7xyw7krfq53iwkr8qxlbydzq6zb2zina7jxd";
};
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
@@ -104,7 +104,7 @@ in stdenv.mkDerivation rec {
# This is a little tricky. Without it the app starts then crashes. Then it
# brings up the crash report, which also crashes. `strace -f` hints at a
# missing libudev.so.0.
- systemd.lib
+ (lib.getLib systemd)
];
installPhase = ''
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 911030dee5319..c59d23ecdba11 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, makeDesktopItem
+{ stdenv, lib, fetchFromGitHub, writeScript, desktop-file-utils
, pkgconfig, autoconf213, alsaLib, bzip2, cairo
, dbus, dbus-glib, ffmpeg_3, file, fontconfig, freetype
, gnome2, gnum4, gtk2, hunspell, libevent, libjpeg
@@ -16,35 +16,33 @@ let
in stdenv.mkDerivation rec {
pname = "palemoon";
- version = "28.10.0";
+ version = "28.12.0";
- src = fetchgit {
- url = "https://github.com/MoonchildProductions/Pale-Moon.git";
+ src = fetchFromGitHub {
+ owner = "MoonchildProductions";
+ repo = "Pale-Moon";
rev = "${version}_Release";
- sha256 = "0c64vmrp46sbl1dgl9dq2vkmpgz9gvgd59dk02jqwyhx4lln1g2l";
+ sha256 = "1cc75972nhmxkkynkky1m2fijbf3qlzvpxsd98mxlx0b7h4d3l5l";
fetchSubmodules = true;
};
- desktopItem = makeDesktopItem {
- name = "palemoon";
- exec = "palemoon %U";
- icon = "palemoon";
- desktopName = "Pale Moon";
- genericName = "Web Browser";
- categories = "Network;WebBrowser;";
- mimeType = lib.concatStringsSep ";" [
- "text/html"
- "text/xml"
- "application/xhtml+xml"
- "application/vnd.mozilla.xul+xml"
- "x-scheme-handler/http"
- "x-scheme-handler/https"
- "x-scheme-handler/ftp"
- ];
- };
+ passthru.updateScript = writeScript "update-${pname}" ''
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i bash -p common-updater-scripts curl libxml2
+
+ set -eu -o pipefail
+
+ # Only release note announcement == finalized release
+ version="$(
+ curl -s 'http://www.palemoon.org/releasenotes.shtml' |
+ xmllint --html --xpath 'html/body/table/tbody/tr/td/h3/text()' - 2>/dev/null | head -n1 |
+ sed 's/v\(\S*\).*/\1/'
+ )"
+ update-source-version ${pname} "$version"
+ '';
nativeBuildInputs = [
- file gnum4 makeWrapper perl pkgconfig python2 wget which
+ desktop-file-utils file gnum4 makeWrapper perl pkgconfig python2 wget which
];
buildInputs = [
@@ -106,7 +104,7 @@ in stdenv.mkDerivation rec {
ac_add_options --prefix=$out
- mk_add_options MOZ_MAKE_FLAGS="-j$NIX_BUILD_CORES"
+ mk_add_options MOZ_MAKE_FLAGS="-j${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"}"
mk_add_options AUTOCONF=${autoconf213}/bin/autoconf
'
'';
@@ -116,14 +114,13 @@ in stdenv.mkDerivation rec {
installPhase = ''
$src/mach install
- mkdir -p $out/share/applications
- cp ${desktopItem}/share/applications/* $out/share/applications
+ desktop-file-install --dir=$out/share/applications \
+ $src/palemoon/branding/official/palemoon.desktop
- for n in 16 22 24 32 48 256; do
+ for iconname in default{16,22,24,32,48,256} mozicon128; do
+ n=''${iconname//[^0-9]/}
size=$n"x"$n
- mkdir -p $out/share/icons/hicolor/$size/apps
- cp $src/palemoon/branding/official/default$n.png \
- $out/share/icons/hicolor/$size/apps/palemoon.png
+ install -Dm644 $src/palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png
done
wrapProgram $out/lib/palemoon-${version}/palemoon \
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 21a34539b86ee..ab528a2c1cb86 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -91,19 +91,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "9.5.3";
+ version = "9.5.4";
lang = "en-US";
srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
- sha256 = "1kqvr0sag94xdkq85k426qq1hz2b52m315yz51w6hvc87d8332b4";
+ sha256 = "sha256-XW2B2wTgqMU2w9XhPJNcUjGLrHykQIngMcG/fFTWb04=";
};
i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
- sha256 = "179g00xw964d6x11wvzs84r7d6rcczx7ganqrxrs499yklscc46b";
+ sha256 = "sha256-EyDyAxB5Og1Cn04tuBF9ob8BxqULy2Ur07BuDxZlmqQ=";
};
};
in
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
index 567a75a31aba1..f9a2693f24303 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
+{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
# default dependencies
, bzip2, flac, speex, libopus
@@ -197,7 +197,7 @@ let
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
chrome/browser/shell_integration_linux.cc
- sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
+ sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
device/udev_linux/udev?_loader.cc
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix
index 54da49b9e3019..239a6282a6756 100644
--- a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix
@@ -44,11 +44,11 @@ let
flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi";
- version = "32.0.0.403";
+ version = "32.0.0.414";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "1xirngiqypylgm8f3ddvny2ghqxgj8i98bm1carcj2vryw53wwal";
+ sha256 = "0wzf5i6qf5wgjm905kd3qh97rj47fybl9g7z72vasilbx8q5wfwk";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index aca523545adb2..96767f63653e9 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -2,17 +2,19 @@
buildGoModule rec {
pname = "cloudflared";
- version = "2020.5.1";
+ version = "2020.6.1";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = version;
- sha256 = "0r1n3a8h8gyww4p2amb24jmp8zkyxy1ava3nbqgwlfjr3zagga00";
+ sha256 = "09jdgpglm4v7pivx8016zzdvj0xkdhaa8xl71p2akc2jn8i8i6gb";
};
vendorSha256 = null;
+ doCheck = false;
+
buildFlagsArray = "-ldflags=-X main.Version=${version}";
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index 3dc96f5a5e3d7..72c3955f90f34 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -19,16 +19,18 @@ let
in
buildGoModule rec {
pname = "argo";
- version = "2.9.5";
+ version = "2.10.1";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
- sha256 = "1x44mgvnbn47a33xnhnh9bxxvj1vsr32lvh9bq6w5hpmxb7qbq4f";
+ sha256 = "1k023rq4p0hvq5famxm83csp3zsijrki8myk6v83xyfigwxc8sia";
};
- vendorSha256 = "1vqmzz76lcwwnw89n4lyg4jjf7wbdgn9sdzwsgrjwkj8ax7d48cv";
+ vendorSha256 = "0fqdxs3r4249qxlc9cac0lpbqf2aifkcah07v0cckb9rxfyiwhjz";
+
+ doCheck = false;
subPackages = [ "cmd/argo" ];
diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix
index 834503484a0ed..505de3c080214 100644
--- a/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/pkgs/applications/networking/cluster/argocd/default.nix
@@ -14,6 +14,8 @@ buildGoModule rec {
vendorSha256 = "0r2nh7v00m6zbdnhsgjn01q9pkiz41ckkqgfnpqmkxaqmjz31iyj";
+ doCheck = false;
+
nativeBuildInputs = [ packr ];
patches = [ ./use-go-module.patch ];
diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix
index 3cab2a9cedff6..d3e18ce691f1b 100644
--- a/pkgs/applications/networking/cluster/atlantis/default.nix
+++ b/pkgs/applications/networking/cluster/atlantis/default.nix
@@ -2,23 +2,24 @@
buildGoModule rec {
pname = "atlantis";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "runatlantis";
repo = "atlantis";
rev = "v${version}";
- sha256 = "1g1bh1v3yd3dz80ckjrhspmsf78nw8hc907hh9jzbq62psqg4459";
+ sha256 = "0nb0dm4yn6f5pw7clgb2d1khcwcxiidqyc0sdh38wwqg0zyil0cz";
};
vendorSha256 = null;
+ doCheck = false;
+
subPackages = [ "." ];
meta = with stdenv.lib; {
homepage = "https://github.com/runatlantis/atlantis";
description = "Terraform Pull Request Automation";
- platforms = platforms.all;
license = licenses.asl20;
maintainers = with maintainers; [ jpotier ];
};
diff --git a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix
deleted file mode 100644
index aac0dd10e15ab..0000000000000
--- a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, curl}:
-
-stdenv.mkDerivation {
- name = "chronos-maven-deps";
- builder = ./fetch-chronos-deps.sh;
-
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "0mm2sb1p5zz6b0z2s4zhdlix6fafydsxmqjy8zbkwzw4f6lazzyl";
-
- nativeBuildInputs = [ curl ];
-
- impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
-}
diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/pkgs/applications/networking/cluster/chronos/default.nix
deleted file mode 100644
index e0cc780841bfa..0000000000000
--- a/pkgs/applications/networking/cluster/chronos/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, lib, makeWrapper, fetchgit, curl, jdk, maven, nodejs, mesos }:
-
-stdenv.mkDerivation rec {
- pname = "chronos";
- version = "286b2ccb8e4695f8e413406ceca85b60d3a87e22";
-
- src = fetchgit {
- url = "https://github.com/airbnb/chronos";
- rev = version;
- sha256 = "0hrln3ad2g2cq2xqmy5mq32cdxxb9vb6v6jp6kcq03f8km6v3g9c";
- };
-
- buildInputs = [ makeWrapper curl jdk maven nodejs mesos ];
-
- mavenRepo = import ./chronos-deps.nix { inherit stdenv curl; };
-
- buildPhase = ''
- ln -s $mavenRepo .m2
- mvn package -Dmaven.repo.local=$(pwd)/.m2
- '';
-
- installPhase = ''
- mkdir -p $out/{bin,libexec/chronos}
- cp target/chronos*.jar $out/libexec/chronos/${pname}-${version}.jar
-
- makeWrapper ${jdk.jre}/bin/java $out/bin/chronos \
- --add-flags "-Xmx384m -Xms384m -cp $out/libexec/chronos/${pname}-${version}.jar com.airbnb.scheduler.Main" \
- --prefix "MESOS_NATIVE_LIBRARY" : "$MESOS_NATIVE_LIBRARY"
- '';
-
- meta = with lib; {
- homepage = "http://airbnb.github.io/chronos";
- license = licenses.asl20;
- description = "Fault tolerant job scheduler for Mesos which handles dependencies and ISO8601 based schedules";
- maintainers = with maintainers; [ offline ];
- platforms = platforms.unix;
- broken = true; # doesn't build https://hydra.nixos.org/build/25768319
- };
-}
diff --git a/pkgs/applications/networking/cluster/chronos/fetch-chronos-deps.sh b/pkgs/applications/networking/cluster/chronos/fetch-chronos-deps.sh
deleted file mode 100644
index 2e337076107d6..0000000000000
--- a/pkgs/applications/networking/cluster/chronos/fetch-chronos-deps.sh
+++ /dev/null
@@ -1,1672 +0,0 @@
-source $stdenv/setup
-header "fetching Chronos maven repo"
-
-function fetchArtifact {
- repoPath="$1"
- echo "fetching $repoPath"
- mkdir -p $(dirname $out/$repoPath)
- curl --fail --location --insecure --max-redirs 20 "http://repo.maven.apache.org/maven2/$repoPath" --output "$out/$repoPath" ||
- curl --fail --location --insecure --max-redirs 20 "https://repository.apache.org/content/repositories/release/$repoPath" --output "$out/$repoPath" ||
- curl --fail --location --insecure --max-redirs 20 "http://downloads.mesosphere.io/maven/$repoPath" --output "$out/$repoPath"
-}
-
-fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom
-fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom
-fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar.sha1
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar.sha1
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar
-fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom
-fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom.sha1
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1
-fetchArtifact commons-io/commons-io/2.2/commons-io-2.2.pom
-fetchArtifact commons-io/commons-io/2.2/commons-io-2.2.jar
-fetchArtifact commons-io/commons-io/2.2/commons-io-2.2.jar.sha1
-fetchArtifact commons-io/commons-io/2.2/commons-io-2.2.pom.sha1
-fetchArtifact aopalliance/aopalliance/1.0/aopalliance-1.0.jar
-fetchArtifact aopalliance/aopalliance/1.0/aopalliance-1.0.pom.sha1
-fetchArtifact aopalliance/aopalliance/1.0/aopalliance-1.0.pom
-fetchArtifact aopalliance/aopalliance/1.0/aopalliance-1.0.jar.sha1
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar
-fetchArtifact net/kencochrane/raven/raven-all/4.1.2/raven-all-4.1.2.pom
-fetchArtifact net/kencochrane/raven/raven-all/4.1.2/raven-all-4.1.2.pom.sha1
-fetchArtifact net/kencochrane/raven/raven/4.1.2/raven-4.1.2.jar
-fetchArtifact net/kencochrane/raven/raven/4.1.2/raven-4.1.2.pom
-fetchArtifact net/kencochrane/raven/raven/4.1.2/raven-4.1.2.jar.sha1
-fetchArtifact net/kencochrane/raven/raven/4.1.2/raven-4.1.2.pom.sha1
-fetchArtifact net/kencochrane/raven/raven-getsentry/4.1.2/raven-getsentry-4.1.2.jar.sha1
-fetchArtifact net/kencochrane/raven/raven-getsentry/4.1.2/raven-getsentry-4.1.2.jar
-fetchArtifact net/kencochrane/raven/raven-getsentry/4.1.2/raven-getsentry-4.1.2.pom.sha1
-fetchArtifact net/kencochrane/raven/raven-getsentry/4.1.2/raven-getsentry-4.1.2.pom
-fetchArtifact net/liftweb/lift-markdown_2.11/2.6-M4/lift-markdown_2.11-2.6-M4.jar.sha1
-fetchArtifact net/liftweb/lift-markdown_2.11/2.6-M4/lift-markdown_2.11-2.6-M4.pom
-fetchArtifact net/liftweb/lift-markdown_2.11/2.6-M4/lift-markdown_2.11-2.6-M4.jar
-fetchArtifact net/liftweb/lift-markdown_2.11/2.6-M4/lift-markdown_2.11-2.6-M4.pom.sha1
-fetchArtifact net/java/jvnet-parent/4/jvnet-parent-4.pom
-fetchArtifact net/java/jvnet-parent/4/jvnet-parent-4.pom.sha1
-fetchArtifact net/java/jvnet-parent/1/jvnet-parent-1.pom
-fetchArtifact net/java/jvnet-parent/1/jvnet-parent-1.pom.sha1
-fetchArtifact net/java/jvnet-parent/3/jvnet-parent-3.pom.sha1
-fetchArtifact net/java/jvnet-parent/3/jvnet-parent-3.pom
-fetchArtifact net/alchim31/maven/scala-maven-plugin/3.1.0/scala-maven-plugin-3.1.0.jar.sha1
-fetchArtifact net/alchim31/maven/scala-maven-plugin/3.1.0/scala-maven-plugin-3.1.0.pom.sha1
-fetchArtifact net/alchim31/maven/scala-maven-plugin/3.1.0/scala-maven-plugin-3.1.0.pom
-fetchArtifact net/alchim31/maven/scala-maven-plugin/3.1.0/scala-maven-plugin-3.1.0.jar
-fetchArtifact net/jpountz/lz4/lz4/1.2.0/lz4-1.2.0.jar
-fetchArtifact net/jpountz/lz4/lz4/1.2.0/lz4-1.2.0.pom
-fetchArtifact net/jpountz/lz4/lz4/1.2.0/lz4-1.2.0.jar.sha1
-fetchArtifact net/jpountz/lz4/lz4/1.2.0/lz4-1.2.0.pom.sha1
-fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom
-fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom.sha1
-fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar.sha1
-fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1
-fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom
-fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar
-fetchArtifact xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.pom.sha1
-fetchArtifact xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.pom
-fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom.sha1
-fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom
-fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar
-fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1
-fetchArtifact io/dropwizard/metrics/metrics-core/3.1.0/metrics-core-3.1.0.pom
-fetchArtifact io/dropwizard/metrics/metrics-core/3.1.0/metrics-core-3.1.0.jar
-fetchArtifact io/dropwizard/metrics/metrics-core/3.1.0/metrics-core-3.1.0.jar.sha1
-fetchArtifact io/dropwizard/metrics/metrics-core/3.1.0/metrics-core-3.1.0.pom.sha1
-fetchArtifact io/dropwizard/metrics/metrics-graphite/3.1.0/metrics-graphite-3.1.0.jar.sha1
-fetchArtifact io/dropwizard/metrics/metrics-graphite/3.1.0/metrics-graphite-3.1.0.jar
-fetchArtifact io/dropwizard/metrics/metrics-graphite/3.1.0/metrics-graphite-3.1.0.pom.sha1
-fetchArtifact io/dropwizard/metrics/metrics-graphite/3.1.0/metrics-graphite-3.1.0.pom
-fetchArtifact io/dropwizard/metrics/metrics-parent/3.1.0/metrics-parent-3.1.0.pom.sha1
-fetchArtifact io/dropwizard/metrics/metrics-parent/3.1.0/metrics-parent-3.1.0.pom
-fetchArtifact io/netty/netty/3.7.0.Final/netty-3.7.0.Final.jar.sha1
-fetchArtifact io/netty/netty/3.7.0.Final/netty-3.7.0.Final.pom
-fetchArtifact io/netty/netty/3.7.0.Final/netty-3.7.0.Final.jar
-fetchArtifact io/netty/netty/3.7.0.Final/netty-3.7.0.Final.pom.sha1
-fetchArtifact io/netty/netty/3.9.0.Final/netty-3.9.0.Final.pom.sha1
-fetchArtifact io/netty/netty/3.9.0.Final/netty-3.9.0.Final.jar
-fetchArtifact io/netty/netty/3.9.0.Final/netty-3.9.0.Final.pom
-fetchArtifact io/netty/netty/3.9.0.Final/netty-3.9.0.Final.jar.sha1
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom
-fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1
-fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar.sha1
-fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar
-fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1
-fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom
-fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1
-fetchArtifact log4j/log4j/1.2.16/log4j-1.2.16.jar.sha1
-fetchArtifact log4j/log4j/1.2.16/log4j-1.2.16.pom.sha1
-fetchArtifact log4j/log4j/1.2.16/log4j-1.2.16.jar
-fetchArtifact log4j/log4j/1.2.16/log4j-1.2.16.pom
-fetchArtifact log4j/log4j/1.2.17/log4j-1.2.17.pom.sha1
-fetchArtifact log4j/log4j/1.2.17/log4j-1.2.17.jar
-fetchArtifact log4j/log4j/1.2.17/log4j-1.2.17.jar.sha1
-fetchArtifact log4j/log4j/1.2.17/log4j-1.2.17.pom
-fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom
-fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom
-fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar
-fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1
-fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom
-fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
-fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom
-fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom.sha1
-fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom.sha1
-fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar
-fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar.sha1
-fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom
-fetchArtifact com/google/inject/guice-parent/3.0/guice-parent-3.0.pom.sha1
-fetchArtifact com/google/inject/guice-parent/3.0/guice-parent-3.0.pom
-fetchArtifact com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.pom.sha1
-fetchArtifact com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar
-fetchArtifact com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar.sha1
-fetchArtifact com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.pom
-fetchArtifact com/google/inject/extensions/extensions-parent/3.0/extensions-parent-3.0.pom.sha1
-fetchArtifact com/google/inject/extensions/extensions-parent/3.0/extensions-parent-3.0.pom
-fetchArtifact com/google/inject/guice/3.0/guice-3.0.jar
-fetchArtifact com/google/inject/guice/3.0/guice-3.0.jar.sha1
-fetchArtifact com/google/inject/guice/3.0/guice-3.0.pom.sha1
-fetchArtifact com/google/inject/guice/3.0/guice-3.0.pom
-fetchArtifact com/google/google/1/google-1.pom
-fetchArtifact com/google/google/1/google-1.pom.sha1
-fetchArtifact com/google/google/5/google-5.pom.sha1
-fetchArtifact com/google/google/5/google-5.pom
-fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom
-fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1
-fetchArtifact com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.pom
-fetchArtifact com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.jar.sha1
-fetchArtifact com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.jar
-fetchArtifact com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.pom.sha1
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar
-fetchArtifact com/google/guava/guava-parent/15.0/guava-parent-15.0.pom
-fetchArtifact com/google/guava/guava-parent/15.0/guava-parent-15.0.pom.sha1
-fetchArtifact com/google/guava/guava-parent/13.0.1/guava-parent-13.0.1.pom.sha1
-fetchArtifact com/google/guava/guava-parent/13.0.1/guava-parent-13.0.1.pom
-fetchArtifact com/google/guava/guava-parent/17.0/guava-parent-17.0.pom.sha1
-fetchArtifact com/google/guava/guava-parent/17.0/guava-parent-17.0.pom
-fetchArtifact com/google/guava/guava-parent/16.0.1/guava-parent-16.0.1.pom
-fetchArtifact com/google/guava/guava-parent/16.0.1/guava-parent-16.0.1.pom.sha1
-fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom
-fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1
-fetchArtifact com/google/guava/guava/15.0/guava-15.0.pom.sha1
-fetchArtifact com/google/guava/guava/15.0/guava-15.0.pom
-fetchArtifact com/google/guava/guava/13.0.1/guava-13.0.1.pom
-fetchArtifact com/google/guava/guava/13.0.1/guava-13.0.1.pom.sha1
-fetchArtifact com/google/guava/guava/17.0/guava-17.0.pom
-fetchArtifact com/google/guava/guava/17.0/guava-17.0.pom.sha1
-fetchArtifact com/google/guava/guava/16.0.1/guava-16.0.1.pom.sha1
-fetchArtifact com/google/guava/guava/16.0.1/guava-16.0.1.pom
-fetchArtifact com/google/guava/guava/16.0.1/guava-16.0.1.jar
-fetchArtifact com/google/guava/guava/16.0.1/guava-16.0.1.jar.sha1
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1
-fetchArtifact com/github/spullara/mustache/java/compiler/0.8.12/compiler-0.8.12.pom
-fetchArtifact com/github/spullara/mustache/java/compiler/0.8.12/compiler-0.8.12.pom.sha1
-fetchArtifact com/github/spullara/mustache/java/compiler/0.8.12/compiler-0.8.12.jar
-fetchArtifact com/github/spullara/mustache/java/compiler/0.8.12/compiler-0.8.12.jar.sha1
-fetchArtifact com/github/spullara/mustache/java/mustache.java/0.8.12/mustache.java-0.8.12.pom
-fetchArtifact com/github/spullara/mustache/java/mustache.java/0.8.12/mustache.java-0.8.12.pom.sha1
-fetchArtifact com/codahale/metrics/metrics-servlets/3.0.2/metrics-servlets-3.0.2.jar
-fetchArtifact com/codahale/metrics/metrics-servlets/3.0.2/metrics-servlets-3.0.2.pom.sha1
-fetchArtifact com/codahale/metrics/metrics-servlets/3.0.2/metrics-servlets-3.0.2.jar.sha1
-fetchArtifact com/codahale/metrics/metrics-servlets/3.0.2/metrics-servlets-3.0.2.pom
-fetchArtifact com/codahale/metrics/metrics-annotation/3.0.2/metrics-annotation-3.0.2.jar.sha1
-fetchArtifact com/codahale/metrics/metrics-annotation/3.0.2/metrics-annotation-3.0.2.pom
-fetchArtifact com/codahale/metrics/metrics-annotation/3.0.2/metrics-annotation-3.0.2.pom.sha1
-fetchArtifact com/codahale/metrics/metrics-annotation/3.0.2/metrics-annotation-3.0.2.jar
-fetchArtifact com/codahale/metrics/metrics-jvm/3.0.2/metrics-jvm-3.0.2.pom
-fetchArtifact com/codahale/metrics/metrics-jvm/3.0.2/metrics-jvm-3.0.2.pom.sha1
-fetchArtifact com/codahale/metrics/metrics-jvm/3.0.2/metrics-jvm-3.0.2.jar.sha1
-fetchArtifact com/codahale/metrics/metrics-jvm/3.0.2/metrics-jvm-3.0.2.jar
-fetchArtifact com/codahale/metrics/metrics-json/3.0.2/metrics-json-3.0.2.jar.sha1
-fetchArtifact com/codahale/metrics/metrics-json/3.0.2/metrics-json-3.0.2.pom
-fetchArtifact com/codahale/metrics/metrics-json/3.0.2/metrics-json-3.0.2.jar
-fetchArtifact com/codahale/metrics/metrics-json/3.0.2/metrics-json-3.0.2.pom.sha1
-fetchArtifact com/codahale/metrics/metrics-jersey/3.0.2/metrics-jersey-3.0.2.pom.sha1
-fetchArtifact com/codahale/metrics/metrics-jersey/3.0.2/metrics-jersey-3.0.2.jar
-fetchArtifact com/codahale/metrics/metrics-jersey/3.0.2/metrics-jersey-3.0.2.jar.sha1
-fetchArtifact com/codahale/metrics/metrics-jersey/3.0.2/metrics-jersey-3.0.2.pom
-fetchArtifact com/codahale/metrics/metrics-jetty8/3.0.2/metrics-jetty8-3.0.2.pom.sha1
-fetchArtifact com/codahale/metrics/metrics-jetty8/3.0.2/metrics-jetty8-3.0.2.jar
-fetchArtifact com/codahale/metrics/metrics-jetty8/3.0.2/metrics-jetty8-3.0.2.jar.sha1
-fetchArtifact com/codahale/metrics/metrics-jetty8/3.0.2/metrics-jetty8-3.0.2.pom
-fetchArtifact com/codahale/metrics/metrics-healthchecks/3.0.2/metrics-healthchecks-3.0.2.jar.sha1
-fetchArtifact com/codahale/metrics/metrics-healthchecks/3.0.2/metrics-healthchecks-3.0.2.pom.sha1
-fetchArtifact com/codahale/metrics/metrics-healthchecks/3.0.2/metrics-healthchecks-3.0.2.jar
-fetchArtifact com/codahale/metrics/metrics-healthchecks/3.0.2/metrics-healthchecks-3.0.2.pom
-fetchArtifact com/codahale/metrics/metrics-parent/3.0.2/metrics-parent-3.0.2.pom.sha1
-fetchArtifact com/codahale/metrics/metrics-parent/3.0.2/metrics-parent-3.0.2.pom
-fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.4.1/jackson-jaxrs-base-2.4.1.pom
-fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.4.1/jackson-jaxrs-base-2.4.1.pom.sha1
-fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.4.1/jackson-jaxrs-base-2.4.1.jar
-fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.4.1/jackson-jaxrs-base-2.4.1.jar.sha1
-fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.4.1/jackson-jaxrs-json-provider-2.4.1.pom.sha1
-fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.4.1/jackson-jaxrs-json-provider-2.4.1.jar.sha1
-fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.4.1/jackson-jaxrs-json-provider-2.4.1.pom
-fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.4.1/jackson-jaxrs-json-provider-2.4.1.jar
-fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-providers/2.4.1/jackson-jaxrs-providers-2.4.1.pom.sha1
-fetchArtifact com/fasterxml/jackson/jaxrs/jackson-jaxrs-providers/2.4.1/jackson-jaxrs-providers-2.4.1.pom
-fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.1/jackson-annotations-2.4.1.jar
-fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.1/jackson-annotations-2.4.1.pom
-fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.1/jackson-annotations-2.4.1.pom.sha1
-fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.1/jackson-annotations-2.4.1.jar.sha1
-fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.0/jackson-annotations-2.4.0.pom
-fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.4.0/jackson-annotations-2.4.0.pom.sha1
-fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.2.2/jackson-annotations-2.2.2.pom
-fetchArtifact com/fasterxml/jackson/core/jackson-annotations/2.2.2/jackson-annotations-2.2.2.pom.sha1
-fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1/jackson-databind-2.4.1.pom.sha1
-fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1/jackson-databind-2.4.1.pom
-fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1.1/jackson-databind-2.4.1.1.jar.sha1
-fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1.1/jackson-databind-2.4.1.1.jar
-fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1.1/jackson-databind-2.4.1.1.pom.sha1
-fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.4.1.1/jackson-databind-2.4.1.1.pom
-fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.2.2/jackson-databind-2.2.2.pom.sha1
-fetchArtifact com/fasterxml/jackson/core/jackson-databind/2.2.2/jackson-databind-2.2.2.pom
-fetchArtifact com/fasterxml/jackson/core/jackson-core/2.3.0/jackson-core-2.3.0.pom
-fetchArtifact com/fasterxml/jackson/core/jackson-core/2.3.0/jackson-core-2.3.0.jar.sha1
-fetchArtifact com/fasterxml/jackson/core/jackson-core/2.3.0/jackson-core-2.3.0.pom.sha1
-fetchArtifact com/fasterxml/jackson/core/jackson-core/2.3.0/jackson-core-2.3.0.jar
-fetchArtifact com/fasterxml/jackson/core/jackson-core/2.4.1/jackson-core-2.4.1.pom.sha1
-fetchArtifact com/fasterxml/jackson/core/jackson-core/2.4.1/jackson-core-2.4.1.pom
-fetchArtifact com/fasterxml/jackson/core/jackson-core/2.2.2/jackson-core-2.2.2.pom
-fetchArtifact com/fasterxml/jackson/core/jackson-core/2.2.2/jackson-core-2.2.2.pom.sha1
-fetchArtifact com/fasterxml/jackson/jackson-parent/2.4/jackson-parent-2.4.pom
-fetchArtifact com/fasterxml/jackson/jackson-parent/2.4/jackson-parent-2.4.pom.sha1
-fetchArtifact com/fasterxml/jackson/module/jackson-module-scala_2.11/2.4.1/jackson-module-scala_2.11-2.4.1.pom
-fetchArtifact com/fasterxml/jackson/module/jackson-module-scala_2.11/2.4.1/jackson-module-scala_2.11-2.4.1.jar
-fetchArtifact com/fasterxml/jackson/module/jackson-module-scala_2.11/2.4.1/jackson-module-scala_2.11-2.4.1.pom.sha1
-fetchArtifact com/fasterxml/jackson/module/jackson-module-scala_2.11/2.4.1/jackson-module-scala_2.11-2.4.1.jar.sha1
-fetchArtifact com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.1/jackson-module-jaxb-annotations-2.4.1.jar
-fetchArtifact com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.1/jackson-module-jaxb-annotations-2.4.1.pom.sha1
-fetchArtifact com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.1/jackson-module-jaxb-annotations-2.4.1.jar.sha1
-fetchArtifact com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.1/jackson-module-jaxb-annotations-2.4.1.pom
-fetchArtifact com/fasterxml/oss-parent/16/oss-parent-16.pom
-fetchArtifact com/fasterxml/oss-parent/16/oss-parent-16.pom.sha1
-fetchArtifact com/fasterxml/oss-parent/11/oss-parent-11.pom.sha1
-fetchArtifact com/fasterxml/oss-parent/11/oss-parent-11.pom
-fetchArtifact com/fasterxml/oss-parent/10/oss-parent-10.pom.sha1
-fetchArtifact com/fasterxml/oss-parent/10/oss-parent-10.pom
-fetchArtifact com/fasterxml/classmate/1.0.0/classmate-1.0.0.pom.sha1
-fetchArtifact com/fasterxml/classmate/1.0.0/classmate-1.0.0.jar
-fetchArtifact com/fasterxml/classmate/1.0.0/classmate-1.0.0.pom
-fetchArtifact com/fasterxml/classmate/1.0.0/classmate-1.0.0.jar.sha1
-fetchArtifact com/datastax/cassandra/cassandra-driver-core/2.1.0/cassandra-driver-core-2.1.0.jar
-fetchArtifact com/datastax/cassandra/cassandra-driver-core/2.1.0/cassandra-driver-core-2.1.0.pom.sha1
-fetchArtifact com/datastax/cassandra/cassandra-driver-core/2.1.0/cassandra-driver-core-2.1.0.pom
-fetchArtifact com/datastax/cassandra/cassandra-driver-core/2.1.0/cassandra-driver-core-2.1.0.jar.sha1
-fetchArtifact com/datastax/cassandra/cassandra-driver-parent/2.1.0/cassandra-driver-parent-2.1.0.pom.sha1
-fetchArtifact com/datastax/cassandra/cassandra-driver-parent/2.1.0/cassandra-driver-parent-2.1.0.pom
-fetchArtifact com/typesafe/sbt/compiler-interface/0.12.0/compiler-interface-0.12.0.pom.sha1
-fetchArtifact com/typesafe/sbt/compiler-interface/0.12.0/compiler-interface-0.12.0-sources.jar
-fetchArtifact com/typesafe/sbt/compiler-interface/0.12.0/compiler-interface-0.12.0.pom
-fetchArtifact com/typesafe/sbt/compiler-interface/0.12.0/compiler-interface-0.12.0-sources.jar.sha1
-fetchArtifact com/typesafe/sbt/sbt-interface/0.12.0/sbt-interface-0.12.0.jar.sha1
-fetchArtifact com/typesafe/sbt/sbt-interface/0.12.0/sbt-interface-0.12.0.jar
-fetchArtifact com/typesafe/sbt/sbt-interface/0.12.0/sbt-interface-0.12.0.pom
-fetchArtifact com/typesafe/sbt/sbt-interface/0.12.0/sbt-interface-0.12.0.pom.sha1
-fetchArtifact com/typesafe/sbt/incremental-compiler/0.12.0/incremental-compiler-0.12.0.jar.sha1
-fetchArtifact com/typesafe/sbt/incremental-compiler/0.12.0/incremental-compiler-0.12.0.pom.sha1
-fetchArtifact com/typesafe/sbt/incremental-compiler/0.12.0/incremental-compiler-0.12.0.jar
-fetchArtifact com/typesafe/sbt/incremental-compiler/0.12.0/incremental-compiler-0.12.0.pom
-fetchArtifact com/typesafe/config/1.2.1/config-1.2.1.pom.sha1
-fetchArtifact com/typesafe/config/1.2.1/config-1.2.1.jar.sha1
-fetchArtifact com/typesafe/config/1.2.1/config-1.2.1.pom
-fetchArtifact com/typesafe/config/1.2.1/config-1.2.1.jar
-fetchArtifact com/typesafe/zinc/zinc/0.1.0/zinc-0.1.0.jar
-fetchArtifact com/typesafe/zinc/zinc/0.1.0/zinc-0.1.0.pom.sha1
-fetchArtifact com/typesafe/zinc/zinc/0.1.0/zinc-0.1.0.pom
-fetchArtifact com/typesafe/zinc/zinc/0.1.0/zinc-0.1.0.jar.sha1
-fetchArtifact com/typesafe/akka/akka-actor_2.11/2.3.6/akka-actor_2.11-2.3.6.pom.sha1
-fetchArtifact com/typesafe/akka/akka-actor_2.11/2.3.6/akka-actor_2.11-2.3.6.jar.sha1
-fetchArtifact com/typesafe/akka/akka-actor_2.11/2.3.6/akka-actor_2.11-2.3.6.pom
-fetchArtifact com/typesafe/akka/akka-actor_2.11/2.3.6/akka-actor_2.11-2.3.6.jar
-fetchArtifact com/thoughtworks/paranamer/paranamer-parent/2.6/paranamer-parent-2.6.pom.sha1
-fetchArtifact com/thoughtworks/paranamer/paranamer-parent/2.6/paranamer-parent-2.6.pom
-fetchArtifact com/thoughtworks/paranamer/paranamer/2.6/paranamer-2.6.pom
-fetchArtifact com/thoughtworks/paranamer/paranamer/2.6/paranamer-2.6.jar.sha1
-fetchArtifact com/thoughtworks/paranamer/paranamer/2.6/paranamer-2.6.pom.sha1
-fetchArtifact com/thoughtworks/paranamer/paranamer/2.6/paranamer-2.6.jar
-fetchArtifact com/sun/jersey/jersey-server/1.18.1/jersey-server-1.18.1.pom
-fetchArtifact com/sun/jersey/jersey-server/1.18.1/jersey-server-1.18.1.jar.sha1
-fetchArtifact com/sun/jersey/jersey-server/1.18.1/jersey-server-1.18.1.pom.sha1
-fetchArtifact com/sun/jersey/jersey-server/1.18.1/jersey-server-1.18.1.jar
-fetchArtifact com/sun/jersey/jersey-server/1.17.1/jersey-server-1.17.1.pom.sha1
-fetchArtifact com/sun/jersey/jersey-server/1.17.1/jersey-server-1.17.1.pom
-fetchArtifact com/sun/jersey/jersey-servlet/1.18.1/jersey-servlet-1.18.1.jar.sha1
-fetchArtifact com/sun/jersey/jersey-servlet/1.18.1/jersey-servlet-1.18.1.jar
-fetchArtifact com/sun/jersey/jersey-servlet/1.18.1/jersey-servlet-1.18.1.pom
-fetchArtifact com/sun/jersey/jersey-servlet/1.18.1/jersey-servlet-1.18.1.pom.sha1
-fetchArtifact com/sun/jersey/jersey-core/1.18.1/jersey-core-1.18.1.pom.sha1
-fetchArtifact com/sun/jersey/jersey-core/1.18.1/jersey-core-1.18.1.jar
-fetchArtifact com/sun/jersey/jersey-core/1.18.1/jersey-core-1.18.1.pom
-fetchArtifact com/sun/jersey/jersey-core/1.18.1/jersey-core-1.18.1.jar.sha1
-fetchArtifact com/sun/jersey/jersey-core/1.17.1/jersey-core-1.17.1.pom
-fetchArtifact com/sun/jersey/jersey-core/1.17.1/jersey-core-1.17.1.pom.sha1
-fetchArtifact com/sun/jersey/jersey-project/1.18.1/jersey-project-1.18.1.pom.sha1
-fetchArtifact com/sun/jersey/jersey-project/1.18.1/jersey-project-1.18.1.pom
-fetchArtifact com/sun/jersey/jersey-project/1.17.1/jersey-project-1.17.1.pom.sha1
-fetchArtifact com/sun/jersey/jersey-project/1.17.1/jersey-project-1.17.1.pom
-fetchArtifact com/sun/jersey/contribs/jersey-guice/1.18.1/jersey-guice-1.18.1.pom.sha1
-fetchArtifact com/sun/jersey/contribs/jersey-guice/1.18.1/jersey-guice-1.18.1.jar.sha1
-fetchArtifact com/sun/jersey/contribs/jersey-guice/1.18.1/jersey-guice-1.18.1.jar
-fetchArtifact com/sun/jersey/contribs/jersey-guice/1.18.1/jersey-guice-1.18.1.pom
-fetchArtifact com/sun/jersey/contribs/jersey-contribs/1.18.1/jersey-contribs-1.18.1.pom
-fetchArtifact com/sun/jersey/contribs/jersey-contribs/1.18.1/jersey-contribs-1.18.1.pom.sha1
-fetchArtifact com/sun/mail/all/1.4.5/all-1.4.5.pom
-fetchArtifact com/sun/mail/all/1.4.5/all-1.4.5.pom.sha1
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1
-fetchArtifact jgraph/jgraph/5.13.0.0/jgraph-5.13.0.0.jar
-fetchArtifact jgraph/jgraph/5.13.0.0/jgraph-5.13.0.0.pom
-fetchArtifact jgraph/jgraph/5.13.0.0/jgraph-5.13.0.0.pom.sha1
-fetchArtifact jgraph/jgraph/5.13.0.0/jgraph-5.13.0.0.jar.sha1
-fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom
-fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1
-fetchArtifact asm/asm-parent/3.1/asm-parent-3.1.pom.sha1
-fetchArtifact asm/asm-parent/3.1/asm-parent-3.1.pom
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1
-fetchArtifact asm/asm/3.1/asm-3.1.pom.sha1
-fetchArtifact asm/asm/3.1/asm-3.1.pom
-fetchArtifact jline/jline/0.9.94/jline-0.9.94.pom
-fetchArtifact jline/jline/0.9.94/jline-0.9.94.pom.sha1
-fetchArtifact jline/jline/0.9.94/jline-0.9.94.jar.sha1
-fetchArtifact jline/jline/0.9.94/jline-0.9.94.jar
-fetchArtifact xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.pom
-fetchArtifact xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.pom.sha1
-fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom
-fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom.sha1
-fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom
-fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.sha1
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1
-fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom
-fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1
-fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom
-fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1
-fetchArtifact org/vafer/jdependency/0.9/jdependency-0.9.jar
-fetchArtifact org/vafer/jdependency/0.9/jdependency-0.9.jar.sha1
-fetchArtifact org/vafer/jdependency/0.9/jdependency-0.9.pom
-fetchArtifact org/vafer/jdependency/0.9/jdependency-0.9.pom.sha1
-fetchArtifact org/joda/joda-convert/1.7/joda-convert-1.7.jar.sha1
-fetchArtifact org/joda/joda-convert/1.7/joda-convert-1.7.jar
-fetchArtifact org/joda/joda-convert/1.7/joda-convert-1.7.pom
-fetchArtifact org/joda/joda-convert/1.7/joda-convert-1.7.pom.sha1
-fetchArtifact org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.pom
-fetchArtifact org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.jar.sha1
-fetchArtifact org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.pom.sha1
-fetchArtifact org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.jar
-fetchArtifact org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.jar
-fetchArtifact org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.pom.sha1
-fetchArtifact org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.pom
-fetchArtifact org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.jar.sha1
-fetchArtifact org/javabits/jgrapht/jgrapht-ext/0.9.1/jgrapht-ext-0.9.1.pom.sha1
-fetchArtifact org/javabits/jgrapht/jgrapht-ext/0.9.1/jgrapht-ext-0.9.1.jar
-fetchArtifact org/javabits/jgrapht/jgrapht-ext/0.9.1/jgrapht-ext-0.9.1.pom
-fetchArtifact org/javabits/jgrapht/jgrapht-ext/0.9.1/jgrapht-ext-0.9.1.jar.sha1
-fetchArtifact org/javabits/jgrapht/jgrapht-core/0.9.1/jgrapht-core-0.9.1.pom
-fetchArtifact org/javabits/jgrapht/jgrapht-core/0.9.1/jgrapht-core-0.9.1.jar
-fetchArtifact org/javabits/jgrapht/jgrapht-core/0.9.1/jgrapht-core-0.9.1.jar.sha1
-fetchArtifact org/javabits/jgrapht/jgrapht-core/0.9.1/jgrapht-core-0.9.1.pom.sha1
-fetchArtifact org/javabits/jgrapht/jgrapht/0.9.1/jgrapht-0.9.1.pom.sha1
-fetchArtifact org/javabits/jgrapht/jgrapht/0.9.1/jgrapht-0.9.1.pom
-fetchArtifact org/scala-lang/scala-compiler/2.11.2/scala-compiler-2.11.2.pom
-fetchArtifact org/scala-lang/scala-compiler/2.11.2/scala-compiler-2.11.2.jar.sha1
-fetchArtifact org/scala-lang/scala-compiler/2.11.2/scala-compiler-2.11.2.jar
-fetchArtifact org/scala-lang/scala-compiler/2.11.2/scala-compiler-2.11.2.pom.sha1
-fetchArtifact org/scala-lang/scala-compiler/2.11.0-RC3/scala-compiler-2.11.0-RC3.jar.sha1
-fetchArtifact org/scala-lang/scala-compiler/2.11.0-RC3/scala-compiler-2.11.0-RC3.jar
-fetchArtifact org/scala-lang/scala-compiler/2.11.0-RC3/scala-compiler-2.11.0-RC3.pom.sha1
-fetchArtifact org/scala-lang/scala-compiler/2.11.0-RC3/scala-compiler-2.11.0-RC3.pom
-fetchArtifact org/scala-lang/scala-compiler/2.9.2/scala-compiler-2.9.2.jar
-fetchArtifact org/scala-lang/scala-compiler/2.9.2/scala-compiler-2.9.2.pom.sha1
-fetchArtifact org/scala-lang/scala-compiler/2.9.2/scala-compiler-2.9.2.pom
-fetchArtifact org/scala-lang/scala-compiler/2.9.2/scala-compiler-2.9.2.jar.sha1
-fetchArtifact org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.jar.sha1
-fetchArtifact org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.jar
-fetchArtifact org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.pom
-fetchArtifact org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.pom.sha1
-fetchArtifact org/scala-lang/scala-library/2.11.2/scala-library-2.11.2.pom.sha1
-fetchArtifact org/scala-lang/scala-library/2.11.2/scala-library-2.11.2.jar.sha1
-fetchArtifact org/scala-lang/scala-library/2.11.2/scala-library-2.11.2.pom
-fetchArtifact org/scala-lang/scala-library/2.11.2/scala-library-2.11.2.jar
-fetchArtifact org/scala-lang/scala-library/2.11.0-RC3/scala-library-2.11.0-RC3.pom
-fetchArtifact org/scala-lang/scala-library/2.11.0-RC3/scala-library-2.11.0-RC3.pom.sha1
-fetchArtifact org/scala-lang/scala-library/2.11.0-RC3/scala-library-2.11.0-RC3.jar
-fetchArtifact org/scala-lang/scala-library/2.11.0-RC3/scala-library-2.11.0-RC3.jar.sha1
-fetchArtifact org/scala-lang/scala-library/2.11.0/scala-library-2.11.0.pom
-fetchArtifact org/scala-lang/scala-library/2.11.0/scala-library-2.11.0.pom.sha1
-fetchArtifact org/scala-lang/scala-library/2.9.2/scala-library-2.9.2.pom.sha1
-fetchArtifact org/scala-lang/scala-library/2.9.2/scala-library-2.9.2.pom
-fetchArtifact org/scala-lang/scala-library/2.9.2/scala-library-2.9.2.jar.sha1
-fetchArtifact org/scala-lang/scala-library/2.9.2/scala-library-2.9.2.jar
-fetchArtifact org/scala-lang/scala-reflect/2.11.1/scala-reflect-2.11.1.pom.sha1
-fetchArtifact org/scala-lang/scala-reflect/2.11.1/scala-reflect-2.11.1.pom
-fetchArtifact org/scala-lang/scala-reflect/2.11.2/scala-reflect-2.11.2.jar
-fetchArtifact org/scala-lang/scala-reflect/2.11.2/scala-reflect-2.11.2.jar.sha1
-fetchArtifact org/scala-lang/scala-reflect/2.11.2/scala-reflect-2.11.2.pom
-fetchArtifact org/scala-lang/scala-reflect/2.11.2/scala-reflect-2.11.2.pom.sha1
-fetchArtifact org/scala-lang/scala-reflect/2.11.0-RC3/scala-reflect-2.11.0-RC3.pom.sha1
-fetchArtifact org/scala-lang/scala-reflect/2.11.0-RC3/scala-reflect-2.11.0-RC3.jar.sha1
-fetchArtifact org/scala-lang/scala-reflect/2.11.0-RC3/scala-reflect-2.11.0-RC3.pom
-fetchArtifact org/scala-lang/scala-reflect/2.11.0-RC3/scala-reflect-2.11.0-RC3.jar
-fetchArtifact org/scala-lang/scala-reflect/2.11.0/scala-reflect-2.11.0.pom.sha1
-fetchArtifact org/scala-lang/scala-reflect/2.11.0/scala-reflect-2.11.0.pom
-fetchArtifact org/scala-lang/modules/scala-xml_2.11.0-RC3/1.0.1/scala-xml_2.11.0-RC3-1.0.1.pom
-fetchArtifact org/scala-lang/modules/scala-xml_2.11.0-RC3/1.0.1/scala-xml_2.11.0-RC3-1.0.1.pom.sha1
-fetchArtifact org/scala-lang/modules/scala-xml_2.11.0-RC3/1.0.1/scala-xml_2.11.0-RC3-1.0.1.jar
-fetchArtifact org/scala-lang/modules/scala-xml_2.11.0-RC3/1.0.1/scala-xml_2.11.0-RC3-1.0.1.jar.sha1
-fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11.0-RC3/1.0.1/scala-parser-combinators_2.11.0-RC3-1.0.1.jar.sha1
-fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11.0-RC3/1.0.1/scala-parser-combinators_2.11.0-RC3-1.0.1.jar
-fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11.0-RC3/1.0.1/scala-parser-combinators_2.11.0-RC3-1.0.1.pom
-fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11.0-RC3/1.0.1/scala-parser-combinators_2.11.0-RC3-1.0.1.pom.sha1
-fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.pom.sha1
-fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.pom
-fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.jar.sha1
-fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.jar
-fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.2/scala-parser-combinators_2.11-1.0.2.jar.sha1
-fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.2/scala-parser-combinators_2.11-1.0.2.jar
-fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.2/scala-parser-combinators_2.11-1.0.2.pom.sha1
-fetchArtifact org/scala-lang/modules/scala-parser-combinators_2.11/1.0.2/scala-parser-combinators_2.11-1.0.2.pom
-fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.1/scala-xml_2.11-1.0.1.jar.sha1
-fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.1/scala-xml_2.11-1.0.1.pom
-fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.1/scala-xml_2.11-1.0.1.jar
-fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.1/scala-xml_2.11-1.0.1.pom.sha1
-fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.pom.sha1
-fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.jar.sha1
-fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.pom
-fetchArtifact org/scala-lang/modules/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.jar
-fetchArtifact org/scala-sbt/test-interface/1.0/test-interface-1.0.jar.sha1
-fetchArtifact org/scala-sbt/test-interface/1.0/test-interface-1.0.pom.sha1
-fetchArtifact org/scala-sbt/test-interface/1.0/test-interface-1.0.pom
-fetchArtifact org/scala-sbt/test-interface/1.0/test-interface-1.0.jar
-fetchArtifact org/specs2/specs2_2.11.0-RC3/2.3.10/specs2_2.11.0-RC3-2.3.10.jar.sha1
-fetchArtifact org/specs2/specs2_2.11.0-RC3/2.3.10/specs2_2.11.0-RC3-2.3.10.pom.sha1
-fetchArtifact org/specs2/specs2_2.11.0-RC3/2.3.10/specs2_2.11.0-RC3-2.3.10.pom
-fetchArtifact org/specs2/specs2_2.11.0-RC3/2.3.10/specs2_2.11.0-RC3-2.3.10.jar
-fetchArtifact org/specs2/classycle/1.4.3/classycle-1.4.3.jar
-fetchArtifact org/specs2/classycle/1.4.3/classycle-1.4.3.pom
-fetchArtifact org/specs2/classycle/1.4.3/classycle-1.4.3.jar.sha1
-fetchArtifact org/specs2/classycle/1.4.3/classycle-1.4.3.pom.sha1
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1
-fetchArtifact org/jboss/shrinkwrap/shrinkwrap-bom/1.0.1/shrinkwrap-bom-1.0.1.pom
-fetchArtifact org/jboss/shrinkwrap/shrinkwrap-bom/1.0.1/shrinkwrap-bom-1.0.1.pom.sha1
-fetchArtifact org/jboss/shrinkwrap/descriptors/shrinkwrap-descriptors-bom/2.0.0-alpha-3/shrinkwrap-descriptors-bom-2.0.0-alpha-3.pom.sha1
-fetchArtifact org/jboss/shrinkwrap/descriptors/shrinkwrap-descriptors-bom/2.0.0-alpha-3/shrinkwrap-descriptors-bom-2.0.0-alpha-3.pom
-fetchArtifact org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-bom/1.0.0-beta-7/shrinkwrap-resolver-bom-1.0.0-beta-7.pom
-fetchArtifact org/jboss/shrinkwrap/resolver/shrinkwrap-resolver-bom/1.0.0-beta-7/shrinkwrap-resolver-bom-1.0.0-beta-7.pom.sha1
-fetchArtifact org/jboss/jboss-parent/9/jboss-parent-9.pom.sha1
-fetchArtifact org/jboss/jboss-parent/9/jboss-parent-9.pom
-fetchArtifact org/jboss/logging/jboss-logging/3.1.3.GA/jboss-logging-3.1.3.GA.pom
-fetchArtifact org/jboss/logging/jboss-logging/3.1.3.GA/jboss-logging-3.1.3.GA.jar
-fetchArtifact org/jboss/logging/jboss-logging/3.1.3.GA/jboss-logging-3.1.3.GA.jar.sha1
-fetchArtifact org/jboss/logging/jboss-logging/3.1.3.GA/jboss-logging-3.1.3.GA.pom.sha1
-fetchArtifact org/jboss/arquillian/arquillian-bom/1.0.2.Final/arquillian-bom-1.0.2.Final.pom
-fetchArtifact org/jboss/arquillian/arquillian-bom/1.0.2.Final/arquillian-bom-1.0.2.Final.pom.sha1
-fetchArtifact org/rogach/scallop_2.11/0.9.5/scallop_2.11-0.9.5.jar.sha1
-fetchArtifact org/rogach/scallop_2.11/0.9.5/scallop_2.11-0.9.5.pom
-fetchArtifact org/rogach/scallop_2.11/0.9.5/scallop_2.11-0.9.5.pom.sha1
-fetchArtifact org/rogach/scallop_2.11/0.9.5/scallop_2.11-0.9.5.jar
-fetchArtifact org/scalacheck/scalacheck_2.11.0-RC3/1.11.3/scalacheck_2.11.0-RC3-1.11.3.pom
-fetchArtifact org/scalacheck/scalacheck_2.11.0-RC3/1.11.3/scalacheck_2.11.0-RC3-1.11.3.jar.sha1
-fetchArtifact org/scalacheck/scalacheck_2.11.0-RC3/1.11.3/scalacheck_2.11.0-RC3-1.11.3.jar
-fetchArtifact org/scalacheck/scalacheck_2.11.0-RC3/1.11.3/scalacheck_2.11.0-RC3-1.11.3.pom.sha1
-fetchArtifact org/tinyjee/jgraphx/jgraphx/2.0.0.1/jgraphx-2.0.0.1.jar.sha1
-fetchArtifact org/tinyjee/jgraphx/jgraphx/2.0.0.1/jgraphx-2.0.0.1.pom
-fetchArtifact org/tinyjee/jgraphx/jgraphx/2.0.0.1/jgraphx-2.0.0.1.jar
-fetchArtifact org/tinyjee/jgraphx/jgraphx/2.0.0.1/jgraphx-2.0.0.1.pom.sha1
-fetchArtifact org/hibernate/hibernate-validator/5.1.2.Final/hibernate-validator-5.1.2.Final.jar
-fetchArtifact org/hibernate/hibernate-validator/5.1.2.Final/hibernate-validator-5.1.2.Final.pom
-fetchArtifact org/hibernate/hibernate-validator/5.1.2.Final/hibernate-validator-5.1.2.Final.jar.sha1
-fetchArtifact org/hibernate/hibernate-validator/5.1.2.Final/hibernate-validator-5.1.2.Final.pom.sha1
-fetchArtifact org/hibernate/hibernate-validator-parent/5.1.2.Final/hibernate-validator-parent-5.1.2.Final.pom.sha1
-fetchArtifact org/hibernate/hibernate-validator-parent/5.1.2.Final/hibernate-validator-parent-5.1.2.Final.pom
-fetchArtifact org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.pom.sha1
-fetchArtifact org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.pom
-fetchArtifact org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar
-fetchArtifact org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.pom
-fetchArtifact org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.pom.sha1
-fetchArtifact org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar.sha1
-fetchArtifact org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.pom
-fetchArtifact org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.pom.sha1
-fetchArtifact org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar
-fetchArtifact org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.pom
-fetchArtifact org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.pom.sha1
-fetchArtifact org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar.sha1
-fetchArtifact org/slf4j/jul-to-slf4j/1.7.7/jul-to-slf4j-1.7.7.jar.sha1
-fetchArtifact org/slf4j/jul-to-slf4j/1.7.7/jul-to-slf4j-1.7.7.pom.sha1
-fetchArtifact org/slf4j/jul-to-slf4j/1.7.7/jul-to-slf4j-1.7.7.pom
-fetchArtifact org/slf4j/jul-to-slf4j/1.7.7/jul-to-slf4j-1.7.7.jar
-fetchArtifact org/slf4j/slf4j-parent/1.7.5/slf4j-parent-1.7.5.pom
-fetchArtifact org/slf4j/slf4j-parent/1.7.5/slf4j-parent-1.7.5.pom.sha1
-fetchArtifact org/slf4j/slf4j-parent/1.7.7/slf4j-parent-1.7.7.pom
-fetchArtifact org/slf4j/slf4j-parent/1.7.7/slf4j-parent-1.7.7.pom.sha1
-fetchArtifact org/slf4j/slf4j-parent/1.7.6/slf4j-parent-1.7.6.pom.sha1
-fetchArtifact org/slf4j/slf4j-parent/1.7.6/slf4j-parent-1.7.6.pom
-fetchArtifact org/slf4j/slf4j-parent/1.6.1/slf4j-parent-1.6.1.pom
-fetchArtifact org/slf4j/slf4j-parent/1.6.1/slf4j-parent-1.6.1.pom.sha1
-fetchArtifact org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.jar
-fetchArtifact org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.pom
-fetchArtifact org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.jar.sha1
-fetchArtifact org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.pom.sha1
-fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1
-fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom
-fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom.sha1
-fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom
-fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1
-fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom
-fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom
-fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1
-fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom.sha1
-fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar
-fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom.sha1
-fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom
-fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom.sha1
-fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom
-fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom
-fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom.sha1
-fetchArtifact org/apache/ant/ant-launcher/1.8.2/ant-launcher-1.8.2.jar.sha1
-fetchArtifact org/apache/ant/ant-launcher/1.8.2/ant-launcher-1.8.2.jar
-fetchArtifact org/apache/ant/ant-launcher/1.8.2/ant-launcher-1.8.2.pom
-fetchArtifact org/apache/ant/ant-launcher/1.8.2/ant-launcher-1.8.2.pom.sha1
-fetchArtifact org/apache/ant/ant/1.8.2/ant-1.8.2.jar
-fetchArtifact org/apache/ant/ant/1.8.2/ant-1.8.2.pom.sha1
-fetchArtifact org/apache/ant/ant/1.8.2/ant-1.8.2.pom
-fetchArtifact org/apache/ant/ant/1.8.2/ant-1.8.2.jar.sha1
-fetchArtifact org/apache/ant/ant-parent/1.8.2/ant-parent-1.8.2.pom.sha1
-fetchArtifact org/apache/ant/ant-parent/1.8.2/ant-parent-1.8.2.pom
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.6/maven-resources-plugin-2.6.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.6/maven-resources-plugin-2.6.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.6/maven-resources-plugin-2.6.pom
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.6/maven-resources-plugin-2.6.jar
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.3/maven-shade-plugin-2.3.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.3/maven-shade-plugin-2.3.jar
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.3/maven-shade-plugin-2.3.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.3/maven-shade-plugin-2.3.pom
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.3.2/maven-compiler-plugin-2.3.2.pom
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.3.2/maven-compiler-plugin-2.3.2.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.3.2/maven-compiler-plugin-2.3.2.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.3.2/maven-compiler-plugin-2.3.2.jar
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar
-fetchArtifact org/apache/maven/plugins/maven-antrun-plugin/1.7/maven-antrun-plugin-1.7.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-antrun-plugin/1.7/maven-antrun-plugin-1.7.pom
-fetchArtifact org/apache/maven/plugins/maven-antrun-plugin/1.7/maven-antrun-plugin-1.7.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-antrun-plugin/1.7/maven-antrun-plugin-1.7.jar
-fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom
-fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom
-fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom
-fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-plugins/25/maven-plugins-25.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-plugins/25/maven-plugins-25.pom
-fetchArtifact org/apache/maven/plugins/maven-plugins/23/maven-plugins-23.pom
-fetchArtifact org/apache/maven/plugins/maven-plugins/23/maven-plugins-23.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-surefire-report-plugin/2.14.1/maven-surefire-report-plugin-2.14.1.pom
-fetchArtifact org/apache/maven/plugins/maven-surefire-report-plugin/2.14.1/maven-surefire-report-plugin-2.14.1.jar
-fetchArtifact org/apache/maven/plugins/maven-surefire-report-plugin/2.14.1/maven-surefire-report-plugin-2.14.1.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-surefire-report-plugin/2.14.1/maven-surefire-report-plugin-2.14.1.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.14.1/maven-surefire-plugin-2.14.1.jar
-fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.14.1/maven-surefire-plugin-2.14.1.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.14.1/maven-surefire-plugin-2.14.1.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.14.1/maven-surefire-plugin-2.14.1.pom
-fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom
-fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom
-fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.jar
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.pom
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-filtering/1.1/maven-filtering-1.1.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-filtering/1.1/maven-filtering-1.1.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-filtering/1.1/maven-filtering-1.1.pom
-fetchArtifact org/apache/maven/shared/maven-filtering/1.1/maven-filtering-1.1.jar
-fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom
-fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom
-fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar
-fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar
-fetchArtifact org/apache/maven/shared/maven-shared-utils/0.4/maven-shared-utils-0.4.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-utils/0.4/maven-shared-utils-0.4.jar
-fetchArtifact org/apache/maven/shared/maven-shared-utils/0.4/maven-shared-utils-0.4.pom
-fetchArtifact org/apache/maven/shared/maven-shared-utils/0.4/maven-shared-utils-0.4.jar.sha1
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom
-fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom
-fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.10/maven-artifact-manager-2.0.10.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.10/maven-artifact-manager-2.0.10.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.11/maven-artifact-manager-2.0.11.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.11/maven-artifact-manager-2.0.11.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/plugin-tools/maven-plugin-tools/3.2/maven-plugin-tools-3.2.pom
-fetchArtifact org/apache/maven/plugin-tools/maven-plugin-tools/3.2/maven-plugin-tools-3.2.pom.sha1
-fetchArtifact org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2.pom.sha1
-fetchArtifact org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2.jar
-fetchArtifact org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2.pom
-fetchArtifact org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2.jar.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom
-fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom
-fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom
-fetchArtifact org/apache/maven/maven-profile/2.0.10/maven-profile-2.0.10.pom
-fetchArtifact org/apache/maven/maven-profile/2.0.10/maven-profile-2.0.10.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom
-fetchArtifact org/apache/maven/maven-profile/2.0.11/maven-profile-2.0.11.pom
-fetchArtifact org/apache/maven/maven-profile/2.0.11/maven-profile-2.0.11.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar
-fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom
-fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom
-fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom
-fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom
-fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.10/maven-project-2.0.10.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.10/maven-project-2.0.10.pom
-fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom
-fetchArtifact org/apache/maven/maven-project/2.0.11/maven-project-2.0.11.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.11/maven-project-2.0.11.pom
-fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom
-fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar
-fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom
-fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom
-fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom
-fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom
-fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.10/maven-model-2.0.10.pom
-fetchArtifact org/apache/maven/maven-model/2.0.10/maven-model-2.0.10.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom
-fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.11/maven-model-2.0.11.pom
-fetchArtifact org/apache/maven/maven-model/2.0.11/maven-model-2.0.11.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom
-fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar
-fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire/2.14.1/surefire-2.14.1.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire/2.14.1/surefire-2.14.1.pom
-fetchArtifact org/apache/maven/surefire/surefire-report-parser/2.14.1/surefire-report-parser-2.14.1.jar
-fetchArtifact org/apache/maven/surefire/surefire-report-parser/2.14.1/surefire-report-parser-2.14.1.jar.sha1
-fetchArtifact org/apache/maven/surefire/surefire-report-parser/2.14.1/surefire-report-parser-2.14.1.pom
-fetchArtifact org/apache/maven/surefire/surefire-report-parser/2.14.1/surefire-report-parser-2.14.1.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire-junit4/2.14.1/surefire-junit4-2.14.1.pom
-fetchArtifact org/apache/maven/surefire/surefire-junit4/2.14.1/surefire-junit4-2.14.1.jar.sha1
-fetchArtifact org/apache/maven/surefire/surefire-junit4/2.14.1/surefire-junit4-2.14.1.jar
-fetchArtifact org/apache/maven/surefire/surefire-junit4/2.14.1/surefire-junit4-2.14.1.pom.sha1
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.14.1/maven-surefire-common-2.14.1.jar.sha1
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.14.1/maven-surefire-common-2.14.1.pom
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.14.1/maven-surefire-common-2.14.1.pom.sha1
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.14.1/maven-surefire-common-2.14.1.jar
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.14.1/surefire-booter-2.14.1.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.14.1/surefire-booter-2.14.1.jar
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.14.1/surefire-booter-2.14.1.pom
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.14.1/surefire-booter-2.14.1.jar.sha1
-fetchArtifact org/apache/maven/surefire/surefire-api/2.14.1/surefire-api-2.14.1.pom
-fetchArtifact org/apache/maven/surefire/surefire-api/2.14.1/surefire-api-2.14.1.jar
-fetchArtifact org/apache/maven/surefire/surefire-api/2.14.1/surefire-api-2.14.1.jar.sha1
-fetchArtifact org/apache/maven/surefire/surefire-api/2.14.1/surefire-api-2.14.1.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire-providers/2.14.1/surefire-providers-2.14.1.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire-providers/2.14.1/surefire-providers-2.14.1.pom
-fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom
-fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.10/maven-repository-metadata-2.0.10.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.10/maven-repository-metadata-2.0.10.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.11/maven-repository-metadata-2.0.11.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.11/maven-repository-metadata-2.0.11.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom
-fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom
-fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom
-fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom
-fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom
-fetchArtifact org/apache/maven/maven/2.0.10/maven-2.0.10.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.10/maven-2.0.10.pom
-fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom
-fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom
-fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom
-fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.11/maven-2.0.11.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.11/maven-2.0.11.pom
-fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom
-fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom
-fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.10/maven-artifact-2.0.10.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.10/maven-artifact-2.0.10.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom
-fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom
-fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.11/maven-artifact-2.0.11.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.11/maven-artifact-2.0.11.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar
-fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom
-fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.10/maven-settings-2.0.10.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.10/maven-settings-2.0.10.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.11/maven-settings-2.0.11.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.11/maven-settings-2.0.11.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar
-fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom
-fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom
-fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.10/maven-plugin-registry-2.0.10.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.10/maven-plugin-registry-2.0.10.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.11/maven-plugin-registry-2.0.11.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.11/maven-plugin-registry-2.0.11.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar
-fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom
-fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/4/maven-parent-4.pom
-fetchArtifact org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom
-fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/22/maven-parent-22.pom
-fetchArtifact org/apache/maven/maven-parent/22/maven-parent-22.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom
-fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/24/maven-parent-24.pom
-fetchArtifact org/apache/maven/maven-parent/24/maven-parent-24.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom
-fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom
-fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom
-fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom
-fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/12/maven-parent-12.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/12/maven-parent-12.pom
-fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom
-fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom
-fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom
-fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom
-fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom
-fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom
-fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom
-fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom
-fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom
-fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.1/maven-reporting-impl-2.1.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.1/maven-reporting-impl-2.1.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.1/maven-reporting-impl-2.1.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.1/maven-reporting-impl-2.1.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom
-fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom
-fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.10/maven-plugin-api-2.0.10.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.10/maven-plugin-api-2.0.10.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.11/maven-plugin-api-2.0.11.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.11/maven-plugin-api-2.0.11.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar
-fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom
-fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1
-fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom
-fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.1.4/doxia-modules-1.1.4.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.1.4/doxia-modules-1.1.4.pom
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.1.2/doxia-modules-1.1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.1.2/doxia-modules-1.1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.4/doxia-decoration-model-1.1.4.pom
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.4/doxia-decoration-model-1.1.4.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.4/doxia-decoration-model-1.1.4.jar
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.4/doxia-decoration-model-1.1.4.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.2/doxia-decoration-model-1.1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.1.2/doxia-decoration-model-1.1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.4/doxia-module-fml-1.1.4.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.4/doxia-module-fml-1.1.4.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.4/doxia-module-fml-1.1.4.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.4/doxia-module-fml-1.1.4.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.2/doxia-module-fml-1.1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.1.2/doxia-module-fml-1.1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.1.4/doxia-sitetools-1.1.4.pom
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.1.4/doxia-sitetools-1.1.4.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.1.2/doxia-sitetools-1.1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.1.2/doxia-sitetools-1.1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.1.4/doxia-core-1.1.4.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.1.4/doxia-core-1.1.4.jar
-fetchArtifact org/apache/maven/doxia/doxia-core/1.1.4/doxia-core-1.1.4.pom
-fetchArtifact org/apache/maven/doxia/doxia-core/1.1.4/doxia-core-1.1.4.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.1.2/doxia-core-1.1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-core/1.1.2/doxia-core-1.1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.4/doxia-logging-api-1.1.4.jar
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.4/doxia-logging-api-1.1.4.pom
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.4/doxia-logging-api-1.1.4.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.4/doxia-logging-api-1.1.4.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.2/doxia-logging-api-1.1.2.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.2/doxia-logging-api-1.1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.2/doxia-logging-api-1.1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.1.2/doxia-logging-api-1.1.2.jar
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.4/doxia-sink-api-1.1.4.pom
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.4/doxia-sink-api-1.1.4.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.4/doxia-sink-api-1.1.4.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.4/doxia-sink-api-1.1.4.jar
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.2/doxia-sink-api-1.1.2.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.2/doxia-sink-api-1.1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.2/doxia-sink-api-1.1.2.jar
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.1.2/doxia-sink-api-1.1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.4/doxia-module-xhtml-1.1.4.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.4/doxia-module-xhtml-1.1.4.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.4/doxia-module-xhtml-1.1.4.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.4/doxia-module-xhtml-1.1.4.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.2/doxia-module-xhtml-1.1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.1.2/doxia-module-xhtml-1.1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.1.4/doxia-1.1.4.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.1.4/doxia-1.1.4.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.1.2/doxia-1.1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.1.2/doxia-1.1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.4/doxia-site-renderer-1.1.4.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.4/doxia-site-renderer-1.1.4.jar
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.4/doxia-site-renderer-1.1.4.pom
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.4/doxia-site-renderer-1.1.4.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.2/doxia-site-renderer-1.1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.1.2/doxia-site-renderer-1.1.2.pom.sha1
-fetchArtifact org/apache/apache/7/apache-7.pom
-fetchArtifact org/apache/apache/7/apache-7.pom.sha1
-fetchArtifact org/apache/apache/4/apache-4.pom
-fetchArtifact org/apache/apache/4/apache-4.pom.sha1
-fetchArtifact org/apache/apache/1/apache-1.pom
-fetchArtifact org/apache/apache/1/apache-1.pom.sha1
-fetchArtifact org/apache/apache/9/apache-9.pom
-fetchArtifact org/apache/apache/9/apache-9.pom.sha1
-fetchArtifact org/apache/apache/14/apache-14.pom.sha1
-fetchArtifact org/apache/apache/14/apache-14.pom
-fetchArtifact org/apache/apache/13/apache-13.pom
-fetchArtifact org/apache/apache/13/apache-13.pom.sha1
-fetchArtifact org/apache/apache/3/apache-3.pom
-fetchArtifact org/apache/apache/3/apache-3.pom.sha1
-fetchArtifact org/apache/apache/5/apache-5.pom
-fetchArtifact org/apache/apache/5/apache-5.pom.sha1
-fetchArtifact org/apache/apache/6/apache-6.pom.sha1
-fetchArtifact org/apache/apache/6/apache-6.pom
-fetchArtifact org/apache/apache/11/apache-11.pom
-fetchArtifact org/apache/apache/11/apache-11.pom.sha1
-fetchArtifact org/apache/apache/10/apache-10.pom
-fetchArtifact org/apache/apache/10/apache-10.pom.sha1
-fetchArtifact org/apache/mesos/mesos/0.20.1/mesos-0.20.1.pom
-fetchArtifact org/apache/mesos/mesos/0.20.1/mesos-0.20.1.pom.sha1
-fetchArtifact org/apache/mesos/mesos/0.20.1/mesos-0.20.1.jar.sha1
-fetchArtifact org/apache/mesos/mesos/0.20.1/mesos-0.20.1.jar
-fetchArtifact org/apache/zookeeper/zookeeper/3.4.6/zookeeper-3.4.6.pom
-fetchArtifact org/apache/zookeeper/zookeeper/3.4.6/zookeeper-3.4.6.jar
-fetchArtifact org/apache/zookeeper/zookeeper/3.4.6/zookeeper-3.4.6.pom.sha1
-fetchArtifact org/apache/zookeeper/zookeeper/3.4.6/zookeeper-3.4.6.jar.sha1
-fetchArtifact org/apache/curator/apache-curator/2.6.0/apache-curator-2.6.0.pom
-fetchArtifact org/apache/curator/apache-curator/2.6.0/apache-curator-2.6.0.pom.sha1
-fetchArtifact org/apache/curator/curator-framework/2.6.0/curator-framework-2.6.0.pom.sha1
-fetchArtifact org/apache/curator/curator-framework/2.6.0/curator-framework-2.6.0.jar
-fetchArtifact org/apache/curator/curator-framework/2.6.0/curator-framework-2.6.0.pom
-fetchArtifact org/apache/curator/curator-framework/2.6.0/curator-framework-2.6.0.jar.sha1
-fetchArtifact org/apache/curator/curator-client/2.6.0/curator-client-2.6.0.jar
-fetchArtifact org/apache/curator/curator-client/2.6.0/curator-client-2.6.0.jar.sha1
-fetchArtifact org/apache/curator/curator-client/2.6.0/curator-client-2.6.0.pom.sha1
-fetchArtifact org/apache/curator/curator-client/2.6.0/curator-client-2.6.0.pom
-fetchArtifact org/apache/curator/curator-test/2.6.0/curator-test-2.6.0.pom.sha1
-fetchArtifact org/apache/curator/curator-test/2.6.0/curator-test-2.6.0.jar
-fetchArtifact org/apache/curator/curator-test/2.6.0/curator-test-2.6.0.pom
-fetchArtifact org/apache/curator/curator-test/2.6.0/curator-test-2.6.0.jar.sha1
-fetchArtifact org/apache/curator/curator-recipes/2.6.0/curator-recipes-2.6.0.jar.sha1
-fetchArtifact org/apache/curator/curator-recipes/2.6.0/curator-recipes-2.6.0.pom.sha1
-fetchArtifact org/apache/curator/curator-recipes/2.6.0/curator-recipes-2.6.0.pom
-fetchArtifact org/apache/curator/curator-recipes/2.6.0/curator-recipes-2.6.0.jar
-fetchArtifact org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.pom
-fetchArtifact org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar.sha1
-fetchArtifact org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar
-fetchArtifact org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.pom.sha1
-fetchArtifact org/apache/commons/commons-math/2.2/commons-math-2.2.jar.sha1
-fetchArtifact org/apache/commons/commons-math/2.2/commons-math-2.2.pom
-fetchArtifact org/apache/commons/commons-math/2.2/commons-math-2.2.jar
-fetchArtifact org/apache/commons/commons-math/2.2/commons-math-2.2.pom.sha1
-fetchArtifact org/apache/commons/commons-email/1.3.2/commons-email-1.3.2.jar
-fetchArtifact org/apache/commons/commons-email/1.3.2/commons-email-1.3.2.jar.sha1
-fetchArtifact org/apache/commons/commons-email/1.3.2/commons-email-1.3.2.pom.sha1
-fetchArtifact org/apache/commons/commons-email/1.3.2/commons-email-1.3.2.pom
-fetchArtifact org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.jar
-fetchArtifact org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.pom.sha1
-fetchArtifact org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.pom
-fetchArtifact org/apache/commons/commons-exec/1.0.1/commons-exec-1.0.1.jar.sha1
-fetchArtifact org/apache/commons/commons-parent/28/commons-parent-28.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/28/commons-parent-28.pom
-fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom
-fetchArtifact org/apache/commons/commons-parent/22/commons-parent-22.pom
-fetchArtifact org/apache/commons/commons-parent/22/commons-parent-22.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom
-fetchArtifact org/apache/commons/commons-parent/24/commons-parent-24.pom
-fetchArtifact org/apache/commons/commons-parent/24/commons-parent-24.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom
-fetchArtifact org/apache/commons/commons-parent/32/commons-parent-32.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/32/commons-parent-32.pom
-fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom
-fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/18/commons-parent-18.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/18/commons-parent-18.pom
-fetchArtifact org/apache/commons/commons-parent/11/commons-parent-11.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/11/commons-parent-11.pom
-fetchArtifact org/apache/commons/commons-math3/3.2/commons-math3-3.2.pom.sha1
-fetchArtifact org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar.sha1
-fetchArtifact org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar
-fetchArtifact org/apache/commons/commons-math3/3.2/commons-math3-3.2.pom
-fetchArtifact org/codehaus/jackson/jackson-mapper-asl/1.6.1/jackson-mapper-asl-1.6.1.pom
-fetchArtifact org/codehaus/jackson/jackson-mapper-asl/1.6.1/jackson-mapper-asl-1.6.1.jar
-fetchArtifact org/codehaus/jackson/jackson-mapper-asl/1.6.1/jackson-mapper-asl-1.6.1.pom.sha1
-fetchArtifact org/codehaus/jackson/jackson-mapper-asl/1.6.1/jackson-mapper-asl-1.6.1.jar.sha1
-fetchArtifact org/codehaus/jackson/jackson-core-asl/1.6.1/jackson-core-asl-1.6.1.jar
-fetchArtifact org/codehaus/jackson/jackson-core-asl/1.6.1/jackson-core-asl-1.6.1.pom.sha1
-fetchArtifact org/codehaus/jackson/jackson-core-asl/1.6.1/jackson-core-asl-1.6.1.pom
-fetchArtifact org/codehaus/jackson/jackson-core-asl/1.6.1/jackson-core-asl-1.6.1.jar.sha1
-fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
-fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.8.1/plexus-compiler-javac-1.8.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.8.1/plexus-compiler-javac-1.8.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.8.1/plexus-compiler-javac-1.8.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.8.1/plexus-compiler-javac-1.8.1.jar
-fetchArtifact org/codehaus/plexus/plexus-compilers/1.8.1/plexus-compilers-1.8.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compilers/1.8.1/plexus-compilers-1.8.1.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.1/plexus-interpolation-1.1.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.1/plexus-interpolation-1.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.1/plexus-interpolation-1.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.1/plexus-interpolation-1.1.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.8.1/plexus-compiler-api-1.8.1.jar
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.8.1/plexus-compiler-api-1.8.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.8.1/plexus-compiler-api-1.8.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.8.1/plexus-compiler-api-1.8.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.8.1/plexus-compiler-manager-1.8.1.jar
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.8.1/plexus-compiler-manager-1.8.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.8.1/plexus-compiler-manager-1.8.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.8.1/plexus-compiler-manager-1.8.1.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom
-fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom
-fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom
-fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
-fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom
-fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler/1.8.1/plexus-compiler-1.8.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler/1.8.1/plexus-compiler-1.8.1.pom.sha1
-fetchArtifact org/parboiled/parboiled-java/1.1.4/parboiled-java-1.1.4.pom.sha1
-fetchArtifact org/parboiled/parboiled-java/1.1.4/parboiled-java-1.1.4.pom
-fetchArtifact org/parboiled/parboiled-java/1.1.4/parboiled-java-1.1.4.jar.sha1
-fetchArtifact org/parboiled/parboiled-java/1.1.4/parboiled-java-1.1.4.jar
-fetchArtifact org/parboiled/parboiled-core/1.1.4/parboiled-core-1.1.4.jar
-fetchArtifact org/parboiled/parboiled-core/1.1.4/parboiled-core-1.1.4.jar.sha1
-fetchArtifact org/parboiled/parboiled-core/1.1.4/parboiled-core-1.1.4.pom
-fetchArtifact org/parboiled/parboiled-core/1.1.4/parboiled-core-1.1.4.pom.sha1
-fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1
-fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom
-fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar
-fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar.sha1
-fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1
-fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom
-fetchArtifact org/eclipse/jetty/jetty-server/8.1.11.v20130520/jetty-server-8.1.11.v20130520.pom
-fetchArtifact org/eclipse/jetty/jetty-server/8.1.11.v20130520/jetty-server-8.1.11.v20130520.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-server/8.1.15.v20140411/jetty-server-8.1.15.v20140411.jar
-fetchArtifact org/eclipse/jetty/jetty-server/8.1.15.v20140411/jetty-server-8.1.15.v20140411.pom
-fetchArtifact org/eclipse/jetty/jetty-server/8.1.15.v20140411/jetty-server-8.1.15.v20140411.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-server/8.1.15.v20140411/jetty-server-8.1.15.v20140411.jar.sha1
-fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.11.v20130520/jetty-continuation-8.1.11.v20130520.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.11.v20130520/jetty-continuation-8.1.11.v20130520.pom
-fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.15.v20140411/jetty-continuation-8.1.15.v20140411.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.15.v20140411/jetty-continuation-8.1.15.v20140411.pom
-fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.15.v20140411/jetty-continuation-8.1.15.v20140411.jar
-fetchArtifact org/eclipse/jetty/jetty-continuation/8.1.15.v20140411/jetty-continuation-8.1.15.v20140411.jar.sha1
-fetchArtifact org/eclipse/jetty/jetty-security/8.1.15.v20140411/jetty-security-8.1.15.v20140411.jar
-fetchArtifact org/eclipse/jetty/jetty-security/8.1.15.v20140411/jetty-security-8.1.15.v20140411.jar.sha1
-fetchArtifact org/eclipse/jetty/jetty-security/8.1.15.v20140411/jetty-security-8.1.15.v20140411.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-security/8.1.15.v20140411/jetty-security-8.1.15.v20140411.pom
-fetchArtifact org/eclipse/jetty/jetty-util/8.1.11.v20130520/jetty-util-8.1.11.v20130520.pom
-fetchArtifact org/eclipse/jetty/jetty-util/8.1.11.v20130520/jetty-util-8.1.11.v20130520.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-util/8.1.15.v20140411/jetty-util-8.1.15.v20140411.jar.sha1
-fetchArtifact org/eclipse/jetty/jetty-util/8.1.15.v20140411/jetty-util-8.1.15.v20140411.pom
-fetchArtifact org/eclipse/jetty/jetty-util/8.1.15.v20140411/jetty-util-8.1.15.v20140411.jar
-fetchArtifact org/eclipse/jetty/jetty-util/8.1.15.v20140411/jetty-util-8.1.15.v20140411.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-project/8.1.11.v20130520/jetty-project-8.1.11.v20130520.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-project/8.1.11.v20130520/jetty-project-8.1.11.v20130520.pom
-fetchArtifact org/eclipse/jetty/jetty-project/8.1.15.v20140411/jetty-project-8.1.15.v20140411.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-project/8.1.15.v20140411/jetty-project-8.1.15.v20140411.pom
-fetchArtifact org/eclipse/jetty/jetty-http/8.1.11.v20130520/jetty-http-8.1.11.v20130520.pom
-fetchArtifact org/eclipse/jetty/jetty-http/8.1.11.v20130520/jetty-http-8.1.11.v20130520.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-http/8.1.15.v20140411/jetty-http-8.1.15.v20140411.jar.sha1
-fetchArtifact org/eclipse/jetty/jetty-http/8.1.15.v20140411/jetty-http-8.1.15.v20140411.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-http/8.1.15.v20140411/jetty-http-8.1.15.v20140411.jar
-fetchArtifact org/eclipse/jetty/jetty-http/8.1.15.v20140411/jetty-http-8.1.15.v20140411.pom
-fetchArtifact org/eclipse/jetty/jetty-parent/20/jetty-parent-20.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-parent/20/jetty-parent-20.pom
-fetchArtifact org/eclipse/jetty/jetty-parent/18/jetty-parent-18.pom
-fetchArtifact org/eclipse/jetty/jetty-parent/18/jetty-parent-18.pom.sha1
-fetchArtifact org/eclipse/jetty/orbit/jetty-orbit/1/jetty-orbit-1.pom
-fetchArtifact org/eclipse/jetty/orbit/jetty-orbit/1/jetty-orbit-1.pom.sha1
-fetchArtifact org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar
-fetchArtifact org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.pom.sha1
-fetchArtifact org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar.sha1
-fetchArtifact org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.pom
-fetchArtifact org/eclipse/jetty/jetty-servlet/8.1.15.v20140411/jetty-servlet-8.1.15.v20140411.pom
-fetchArtifact org/eclipse/jetty/jetty-servlet/8.1.15.v20140411/jetty-servlet-8.1.15.v20140411.jar
-fetchArtifact org/eclipse/jetty/jetty-servlet/8.1.15.v20140411/jetty-servlet-8.1.15.v20140411.jar.sha1
-fetchArtifact org/eclipse/jetty/jetty-servlet/8.1.15.v20140411/jetty-servlet-8.1.15.v20140411.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-io/8.1.11.v20130520/jetty-io-8.1.11.v20130520.pom
-fetchArtifact org/eclipse/jetty/jetty-io/8.1.11.v20130520/jetty-io-8.1.11.v20130520.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-io/8.1.15.v20140411/jetty-io-8.1.15.v20140411.pom
-fetchArtifact org/eclipse/jetty/jetty-io/8.1.15.v20140411/jetty-io-8.1.15.v20140411.pom.sha1
-fetchArtifact org/eclipse/jetty/jetty-io/8.1.15.v20140411/jetty-io-8.1.15.v20140411.jar
-fetchArtifact org/eclipse/jetty/jetty-io/8.1.15.v20140411/jetty-io-8.1.15.v20140411.jar.sha1
-fetchArtifact org/scalaz/scalaz-core_2.11.0-RC3/7.0.6/scalaz-core_2.11.0-RC3-7.0.6.pom.sha1
-fetchArtifact org/scalaz/scalaz-core_2.11.0-RC3/7.0.6/scalaz-core_2.11.0-RC3-7.0.6.pom
-fetchArtifact org/scalaz/scalaz-core_2.11.0-RC3/7.0.6/scalaz-core_2.11.0-RC3-7.0.6.jar
-fetchArtifact org/scalaz/scalaz-core_2.11.0-RC3/7.0.6/scalaz-core_2.11.0-RC3-7.0.6.jar.sha1
-fetchArtifact org/scalaz/scalaz-effect_2.11.0-RC3/7.0.6/scalaz-effect_2.11.0-RC3-7.0.6.jar.sha1
-fetchArtifact org/scalaz/scalaz-effect_2.11.0-RC3/7.0.6/scalaz-effect_2.11.0-RC3-7.0.6.pom.sha1
-fetchArtifact org/scalaz/scalaz-effect_2.11.0-RC3/7.0.6/scalaz-effect_2.11.0-RC3-7.0.6.jar
-fetchArtifact org/scalaz/scalaz-effect_2.11.0-RC3/7.0.6/scalaz-effect_2.11.0-RC3-7.0.6.pom
-fetchArtifact org/scalaz/scalaz-concurrent_2.11.0-RC3/7.0.6/scalaz-concurrent_2.11.0-RC3-7.0.6.jar
-fetchArtifact org/scalaz/scalaz-concurrent_2.11.0-RC3/7.0.6/scalaz-concurrent_2.11.0-RC3-7.0.6.pom
-fetchArtifact org/scalaz/scalaz-concurrent_2.11.0-RC3/7.0.6/scalaz-concurrent_2.11.0-RC3-7.0.6.jar.sha1
-fetchArtifact org/scalaz/scalaz-concurrent_2.11.0-RC3/7.0.6/scalaz-concurrent_2.11.0-RC3-7.0.6.pom.sha1
-fetchArtifact org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar
-fetchArtifact org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
-fetchArtifact org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom.sha1
-fetchArtifact org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar.sha1
-fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom
-fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom.sha1
-fetchArtifact org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
-fetchArtifact org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom.sha1
-fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom.sha1
-fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom
-fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom.sha1
-fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom
-fetchArtifact org/sonatype/oss/oss-parent/5/oss-parent-5.pom
-fetchArtifact org/sonatype/oss/oss-parent/5/oss-parent-5.pom.sha1
-fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar.sha1
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom
-fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom
-fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom
-fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom
-fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom
-fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom
-fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom
-fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom
-fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar.sha1
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar.sha1
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom
-fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom
-fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom
-fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom
-fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar
-fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar.sha1
-fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom
-fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom.sha1
-fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1
-fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar
-fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom
-fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar.sha1
-fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom.sha1
-fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1
-fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar
-fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom
-fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom
-fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom
-fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom
-fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom
-fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar
-fetchArtifact org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.pom
-fetchArtifact org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.pom.sha1
-fetchArtifact org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar.sha1
-fetchArtifact org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar
-fetchArtifact org/ow2/asm/asm-parent/5.0.2/asm-parent-5.0.2.pom.sha1
-fetchArtifact org/ow2/asm/asm-parent/5.0.2/asm-parent-5.0.2.pom
-fetchArtifact org/ow2/asm/asm-parent/4.1/asm-parent-4.1.pom
-fetchArtifact org/ow2/asm/asm-parent/4.1/asm-parent-4.1.pom.sha1
-fetchArtifact org/ow2/asm/asm-analysis/5.0.2/asm-analysis-5.0.2.jar
-fetchArtifact org/ow2/asm/asm-analysis/5.0.2/asm-analysis-5.0.2.pom.sha1
-fetchArtifact org/ow2/asm/asm-analysis/5.0.2/asm-analysis-5.0.2.pom
-fetchArtifact org/ow2/asm/asm-analysis/5.0.2/asm-analysis-5.0.2.jar.sha1
-fetchArtifact org/ow2/asm/asm-analysis/4.1/asm-analysis-4.1.pom
-fetchArtifact org/ow2/asm/asm-analysis/4.1/asm-analysis-4.1.jar
-fetchArtifact org/ow2/asm/asm-analysis/4.1/asm-analysis-4.1.pom.sha1
-fetchArtifact org/ow2/asm/asm-analysis/4.1/asm-analysis-4.1.jar.sha1
-fetchArtifact org/ow2/asm/asm/5.0.2/asm-5.0.2.jar.sha1
-fetchArtifact org/ow2/asm/asm/5.0.2/asm-5.0.2.pom.sha1
-fetchArtifact org/ow2/asm/asm/5.0.2/asm-5.0.2.pom
-fetchArtifact org/ow2/asm/asm/5.0.2/asm-5.0.2.jar
-fetchArtifact org/ow2/asm/asm/4.1/asm-4.1.jar.sha1
-fetchArtifact org/ow2/asm/asm/4.1/asm-4.1.pom.sha1
-fetchArtifact org/ow2/asm/asm/4.1/asm-4.1.pom
-fetchArtifact org/ow2/asm/asm/4.1/asm-4.1.jar
-fetchArtifact org/ow2/asm/asm-util/5.0.2/asm-util-5.0.2.pom
-fetchArtifact org/ow2/asm/asm-util/5.0.2/asm-util-5.0.2.jar
-fetchArtifact org/ow2/asm/asm-util/5.0.2/asm-util-5.0.2.pom.sha1
-fetchArtifact org/ow2/asm/asm-util/5.0.2/asm-util-5.0.2.jar.sha1
-fetchArtifact org/ow2/asm/asm-util/4.1/asm-util-4.1.jar
-fetchArtifact org/ow2/asm/asm-util/4.1/asm-util-4.1.pom
-fetchArtifact org/ow2/asm/asm-util/4.1/asm-util-4.1.pom.sha1
-fetchArtifact org/ow2/asm/asm-util/4.1/asm-util-4.1.jar.sha1
-fetchArtifact org/ow2/asm/asm-tree/5.0.2/asm-tree-5.0.2.jar
-fetchArtifact org/ow2/asm/asm-tree/5.0.2/asm-tree-5.0.2.jar.sha1
-fetchArtifact org/ow2/asm/asm-tree/5.0.2/asm-tree-5.0.2.pom
-fetchArtifact org/ow2/asm/asm-tree/5.0.2/asm-tree-5.0.2.pom.sha1
-fetchArtifact org/ow2/asm/asm-tree/4.1/asm-tree-4.1.jar
-fetchArtifact org/ow2/asm/asm-tree/4.1/asm-tree-4.1.pom.sha1
-fetchArtifact org/ow2/asm/asm-tree/4.1/asm-tree-4.1.jar.sha1
-fetchArtifact org/ow2/asm/asm-tree/4.1/asm-tree-4.1.pom
-fetchArtifact org/ow2/asm/asm-commons/5.0.2/asm-commons-5.0.2.pom
-fetchArtifact org/ow2/asm/asm-commons/5.0.2/asm-commons-5.0.2.jar
-fetchArtifact org/ow2/asm/asm-commons/5.0.2/asm-commons-5.0.2.jar.sha1
-fetchArtifact org/ow2/asm/asm-commons/5.0.2/asm-commons-5.0.2.pom.sha1
-fetchArtifact org/ow2/ow2/1.3/ow2-1.3.pom.sha1
-fetchArtifact org/ow2/ow2/1.3/ow2-1.3.pom
-fetchArtifact org/glassfish/web/javax.el/2.2.5/javax.el-2.2.5.jar.sha1
-fetchArtifact org/glassfish/web/javax.el/2.2.5/javax.el-2.2.5.jar
-fetchArtifact org/glassfish/web/javax.el/2.2.5/javax.el-2.2.5.pom
-fetchArtifact org/glassfish/web/javax.el/2.2.5/javax.el-2.2.5.pom.sha1
-fetchArtifact org/pegdown/pegdown/1.2.1/pegdown-1.2.1.jar.sha1
-fetchArtifact org/pegdown/pegdown/1.2.1/pegdown-1.2.1.pom
-fetchArtifact org/pegdown/pegdown/1.2.1/pegdown-1.2.1.pom.sha1
-fetchArtifact org/pegdown/pegdown/1.2.1/pegdown-1.2.1.jar
-fetchArtifact junit/junit/4.11/junit-4.11.jar
-fetchArtifact junit/junit/4.11/junit-4.11.pom
-fetchArtifact junit/junit/4.11/junit-4.11.jar.sha1
-fetchArtifact junit/junit/4.11/junit-4.11.pom.sha1
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1
-fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom
-fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1
-fetchArtifact joda-time/joda-time/2.3/joda-time-2.3.pom
-fetchArtifact joda-time/joda-time/2.3/joda-time-2.3.jar.sha1
-fetchArtifact joda-time/joda-time/2.3/joda-time-2.3.jar
-fetchArtifact joda-time/joda-time/2.3/joda-time-2.3.pom.sha1
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1
-fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom
-fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1
-fetchArtifact javax/inject/javax.inject/1/javax.inject-1.pom
-fetchArtifact javax/inject/javax.inject/1/javax.inject-1.jar
-fetchArtifact javax/inject/javax.inject/1/javax.inject-1.jar.sha1
-fetchArtifact javax/inject/javax.inject/1/javax.inject-1.pom.sha1
-fetchArtifact javax/el/javax.el-api/2.2.4/javax.el-api-2.2.4.pom.sha1
-fetchArtifact javax/el/javax.el-api/2.2.4/javax.el-api-2.2.4.jar.sha1
-fetchArtifact javax/el/javax.el-api/2.2.4/javax.el-api-2.2.4.jar
-fetchArtifact javax/el/javax.el-api/2.2.4/javax.el-api-2.2.4.pom
-fetchArtifact javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.pom
-fetchArtifact javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar.sha1
-fetchArtifact javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.pom.sha1
-fetchArtifact javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar
-fetchArtifact javax/mail/mail/1.4.5/mail-1.4.5.pom.sha1
-fetchArtifact javax/mail/mail/1.4.5/mail-1.4.5.jar
-fetchArtifact javax/mail/mail/1.4.5/mail-1.4.5.pom
-fetchArtifact javax/mail/mail/1.4.5/mail-1.4.5.jar.sha1
-fetchArtifact javax/activation/activation/1.1/activation-1.1.pom.sha1
-fetchArtifact javax/activation/activation/1.1/activation-1.1.pom
-fetchArtifact javax/activation/activation/1.1.1/activation-1.1.1.jar.sha1
-fetchArtifact javax/activation/activation/1.1.1/activation-1.1.1.pom
-fetchArtifact javax/activation/activation/1.1.1/activation-1.1.1.jar
-fetchArtifact javax/activation/activation/1.1.1/activation-1.1.1.pom.sha1
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom
-fetchArtifact mesosphere/chaos_2.11/0.6.1/chaos_2.11-0.6.1.jar
-fetchArtifact mesosphere/chaos_2.11/0.6.1/chaos_2.11-0.6.1.pom
-fetchArtifact mesosphere/chaos_2.11/0.6.1/chaos_2.11-0.6.1.jar.sha1
-fetchArtifact mesosphere/chaos_2.11/0.6.1/chaos_2.11-0.6.1.pom.sha1
-fetchArtifact mesosphere/mesos-utils_2.11/0.20.1-1/mesos-utils_2.11-0.20.1-1.jar.sha1
-fetchArtifact mesosphere/mesos-utils_2.11/0.20.1-1/mesos-utils_2.11-0.20.1-1.pom
-fetchArtifact mesosphere/mesos-utils_2.11/0.20.1-1/mesos-utils_2.11-0.20.1-1.pom.sha1
-fetchArtifact mesosphere/mesos-utils_2.11/0.20.1-1/mesos-utils_2.11-0.20.1-1.jar
-fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom
-fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1
-fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom.sha1
-fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar
diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix
index 5bbd101412590..02f5fc18d13a9 100644
--- a/pkgs/applications/networking/cluster/cni/default.nix
+++ b/pkgs/applications/networking/cluster/cni/default.nix
@@ -18,6 +18,6 @@ buildGoPackage rec {
license = licenses.asl20;
homepage = "https://github.com/containernetworking/cni";
maintainers = with maintainers; [ offline vdemeester ];
- platforms = [ "x86_64-linux" ];
+ platforms = [ "x86_64-linux" "aarch64-linux" ];
};
}
diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix
index 4aa15b218df74..fb7d2e2d6a5a8 100644
--- a/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -2,19 +2,21 @@
buildGoModule rec {
pname = "cni-plugins";
- version = "0.8.6";
+ version = "0.8.7";
src = fetchFromGitHub {
owner = "containernetworking";
repo = "plugins";
rev = "v${version}";
- sha256 = "0f1cqxjf26sy1c4aw6y7pyd9lrz0vknby4q5j6xj77a1pab9073m";
+ sha256 = "1sjk0cghldygx1jgx4bqv83qky7shk64n6xkkfxl92f12wyvsq9j";
};
vendorSha256 = null;
+ doCheck = false;
+
buildFlagsArray = [
- "-ldflags=-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=${version}"
+ "-ldflags=-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=v${version}"
];
subPackages = [
@@ -36,7 +38,7 @@ buildGoModule rec {
"plugins/meta/tuning"
];
- passthru.tests.podman = nixosTests.podman;
+ passthru.tests = { inherit (nixosTests) cri-o podman; };
meta = with lib; {
description = "Some standard networking plugins, maintained by the CNI team";
diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
index 71996e43a9b91..a9cdbf790774c 100644
--- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
@@ -1,7 +1,7 @@
{ lib, buildGoModule, minikube }:
buildGoModule rec {
- inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256;
+ inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 doCheck;
pname = "docker-machine-hyperkit";
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
index 4092a5b5d3b08..172370d25e930 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
@@ -1,7 +1,7 @@
{ lib, buildGoModule, minikube }:
buildGoModule rec {
- inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256;
+ inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 doCheck;
pname = "docker-machine-kvm2";
diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix
index 97557fa98953a..44e21de0a0398 100644
--- a/pkgs/applications/networking/cluster/fluxctl/default.nix
+++ b/pkgs/applications/networking/cluster/fluxctl/default.nix
@@ -1,22 +1,33 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "fluxctl";
- version = "1.20.0";
+ version = "1.20.2";
src = fetchFromGitHub {
owner = "weaveworks";
repo = "flux";
rev = version;
- sha256 = "0bfib5pg2cbip6fw45slb0h3a7qpikxsfpclzr86bcnjq60pshl1";
+ sha256 = "1a44lmrvi5f9jr04rblhcsg3zvqzvdp9wyw4m4h4scsqp5g7dfb7";
};
- vendorSha256 = "0a5sv11pb2i6r0ffwaiqdhc0m7gz679yfmqw6ix9imk4ybhf4jp9";
+ vendorSha256 = "1yzh6iglrzd43yqs1b6qh1i62b6qaz3232lgxyg3gmc81p0i5kr0";
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ doCheck = false;
subPackages = [ "cmd/fluxctl" ];
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+ postInstall = ''
+ for shell in bash fish zsh; do
+ $out/bin/fluxctl completion $shell > fluxctl.$shell
+ installShellCompletion fluxctl.$shell
+ done
+ '';
+
meta = with stdenv.lib; {
description = "CLI client for Flux, the GitOps Kubernetes operator";
homepage = "https://github.com/fluxcd/flux";
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index bcea26746a2ec..bb76ad6988217 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,15 +2,17 @@
buildGoModule rec {
pname = "helm";
- version = "3.2.4";
+ version = "3.3.0";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
- sha256 = "1plpk8qnv11d47qz93h57abjchyp6ahgyazyp0c6rv24vb9fp9zi";
+ sha256 = "0bp2yscrvdm46w2nxas5zs9mcvdn2yp05k0wmcjl7gh42fs6hmcs";
};
- vendorSha256 = "0j25m56cwzjd9b75v7xlb26q81bsmln77k23h9n8v2f2gqwwpkrl";
+ vendorSha256 = "0lccglh5qpm5kp8xp1pn7y4cfxjpax83gyzjmnhh9h5y9zwgqp03";
+
+ doCheck = false;
subPackages = [ "cmd/helm" ];
buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ];
diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index 02390c081493a..f713d8a8a6d45 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -2,16 +2,18 @@
buildGoModule rec {
pname = "helmfile";
- version = "0.125.1";
+ version = "0.125.7";
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
- sha256 = "0ym9q1rww3r54czkrckdd1ahlym6n61l2563nmj48hkn5d4qxqbm";
+ sha256 = "1m030gjrd98z4vbj7l927qi55vgr11czrb8wmw56ifkqwfi6h9hi";
};
- vendorSha256 = "04mga3jc2c01daygjcn245mv30lc2ibax0mpb1wjk3s8lkl4cxcz";
+ vendorSha256 = "0w72nlf26k64cq1hrqycks0pyp18y4wh3h40jpn5qnysi5pb2ndj";
+
+ doCheck = false;
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix
index 840a46ebf663f..19c7234e11b4f 100644
--- a/pkgs/applications/networking/cluster/helmsman/default.nix
+++ b/pkgs/applications/networking/cluster/helmsman/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl";
+ doCheck = false;
+
meta = with lib; {
description = "Helm Charts (k8s applications) as Code tool";
homepage = "https://github.com/Praqma/helmsman";
diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
index 2c17f411474cb..7409d71fe8ff2 100644
--- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix
+++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "1jh2f66ys6rmrrwrf5zqfprgcvziyq6l4z8bfqwxgf1ysnxx525h";
+ doCheck = false;
+
buildFlagsArray = ''
-ldflags=
-X github.com/xetys/hetzner-kube/cmd.version=${version}
diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix
index e04d799248ef7..59be45bb53688 100644
--- a/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/pkgs/applications/networking/cluster/istioctl/default.nix
@@ -2,15 +2,17 @@
buildGoModule rec {
pname = "istioctl";
- version = "1.6.6";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
- sha256 = "0njchcb58lxk0cixk2rz4qj7b0zpp6zf3i5dda43j4hfsb37mifj";
+ sha256 = "0541j1wdhlbm2spl1w3m0hig7lqn05xk1xws8748wfzbr8wkir31";
};
- vendorSha256 = "0cc0lmjsxrn3f78k95wklf3yn5k7h8slwnwmssy1i1h0bkcg1bai";
+ vendorSha256 = "0sz92nspfclqxnx0mf80jxqqwxanqsx9nl9hg7f9izks7jw544vx";
+
+ doCheck = false;
nativeBuildInputs = [ go-bindata installShellFiles ];
diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix
index c9b63b49d4240..52e483424f1a7 100644
--- a/pkgs/applications/networking/cluster/jx/default.nix
+++ b/pkgs/applications/networking/cluster/jx/default.nix
@@ -2,16 +2,18 @@
buildGoModule rec {
pname = "jx";
- version = "2.1.121";
+ version = "2.1.127";
src = fetchFromGitHub {
owner = "jenkins-x";
repo = "jx";
rev = "v${version}";
- sha256 = "0bjpnh962w5wz4gj5my9g52dawxj8zccvpkxlxy1n7c3dkzjxx5j";
+ sha256 = "01dfpnqgbrn8b6h2irq080xdm76b4jx6sd80f8x4zmyaz6hf5vlv";
};
- vendorSha256 = "0l9djgvnrgdnw7nsf05yq7qpzzzm3gasgh9a7dyc16pp2kxvza6k";
+ vendorSha256 = "0la92a8720l8my5r4wsbgv74y6m19ikmm0wv3l4m4w5gjyplfsxb";
+
+ doCheck = false;
subPackages = [ "cmd/jx" ];
diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix
index 6664886277160..3c793cc9ec34e 100644
--- a/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/pkgs/applications/networking/cluster/k9s/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
- version = "0.21.2";
+ version = "0.21.7";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
- sha256 = "06yjc4lrqr3y7428xkfcgfg3aal71r437ij2hqd2yjxsq8r7zvif";
+ sha256 = "1rw1vzxfjzklzdpcxz7mplvlmggavaym260s7vzvbgvd1snf38cb";
};
buildFlagsArray = ''
@@ -18,7 +18,9 @@ buildGoModule rec {
-X github.com/derailed/k9s/cmd.commit=${src.rev}
'';
- vendorSha256 = "1hmqvcvlffd8cpqcnn2f9mnyiwdhw8k46sl2p6rk16yrj06la9mr";
+ vendorSha256 = "05rsbi40pihdh212d5zn6cchnkrqd6rsyl3vfsw77ksybwakrbf7";
+
+ doCheck = false;
meta = with stdenv.lib; {
description = "Kubernetes CLI To Manage Your Clusters In Style.";
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 282890ada5b54..d751c8ca18e83 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -3,8 +3,8 @@
let
goPackagePath = "k8s.io/kops";
- generic = { version, sha256, ...}@attrs:
- let attrs' = builtins.removeAttrs attrs ["version" "sha256"] ; in
+ generic = { version, sha256, rev ? version, ...}@attrs:
+ let attrs' = builtins.removeAttrs attrs ["version" "sha256" "rev"] ; in
buildGoPackage {
pname = "kops";
inherit version;
@@ -12,7 +12,7 @@ let
inherit goPackagePath;
src = fetchFromGitHub {
- rev = version;
+ rev = rev;
owner = "kubernetes";
repo = "kops";
inherit sha256;
@@ -51,11 +51,6 @@ in rec {
mkKops = generic;
- kops_1_15 = mkKops {
- version = "1.15.3";
- sha256 = "0pzgrsl61nw8pm3s032lj020fw13x3fpzlj7lknsnd581f0gg4df";
- };
-
kops_1_16 = mkKops {
version = "1.16.4";
sha256 = "0qi80hzd5wc8vn3y0wsckd7pq09xcshpzvcr7rl5zd4akxb0wl3f";
@@ -65,4 +60,10 @@ in rec {
version = "1.17.1";
sha256 = "1km6nwanmhfx8rl1wp445z9ib50jr2f86rd92vilm3q4rs9kig1h";
};
+
+ kops_1_18 = mkKops rec {
+ version = "1.18.0";
+ sha256 = "16zbjxxv08j31y7lhkqx2bnx0pc3r0vpfrlhdjs26z22p5rc4rrh";
+ rev = "v${version}";
+ };
}
diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix
index c92b98d813948..c370d12270350 100644
--- a/pkgs/applications/networking/cluster/kpt/default.nix
+++ b/pkgs/applications/networking/cluster/kpt/default.nix
@@ -2,20 +2,18 @@
buildGoModule rec {
pname = "kpt";
- version = "0.32.0";
+ version = "0.33.0";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = pname;
rev = "v${version}";
- sha256 = "1pgv15zgv30dpv148bn6x0anv9q6x78y6ldmzarb9fbjpk6j0wxl";
+ sha256 = "1lvfbpxxddm1pk4mb4sm0chw15dalsfyhgy86npz94xjf1jssyh8";
};
- vendorSha256 = "0l8xdnv2m6byd5dwvs3zgcj1lsci7ax4xvx178a8a78sgkqalvmq";
+ vendorSha256 = "1xkjgzy9z7v5z4kl1769dgrrr0ljr0fdxfdj7xbic9hl6nm94kif";
- postInstall = ''
- rm $out/bin/{mdtogo,formula}
- '';
+ subPackages = [ "." ];
meta = with lib; {
description = "A toolkit to help you manage, manipulate, customize, and apply Kubernetes Resource configuration data files";
diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 12d74121dc897..0c1f452ea5b4c 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -2,17 +2,16 @@
buildGoModule rec {
pname = "kube3d";
- version = "3.0.0";
+ version = "3.0.1";
k3sVersion = "1.18.6-k3s1";
- goPackagePath = "github.com/rancher/k3d";
excludedPackages = ''tools'';
src = fetchFromGitHub {
owner = "rancher";
repo = "k3d";
rev = "v${version}";
- sha256 = "1p4rqzi67cr8vf1ih7zqxkpssqq0vy4pb5crvkxbbf5ad5mwrjri";
+ sha256 = "1l6mh0dpf2bw9sxpn14iivv3pr8mj4favzx2hhn8k1j71cm1w4rj";
};
buildFlagsArray = ''
@@ -32,6 +31,8 @@ buildGoModule rec {
vendorSha256 = null;
+ doCheck = false;
+
meta = with stdenv.lib; {
homepage = "https://github.com/rancher/k3d";
description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container";
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 0e9e34fd26155..91fa9e8b4ff32 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -15,13 +15,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "kubernetes";
- version = "1.18.6";
+ version = "1.18.8";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "0ijcssalzb0gx23va23q6q6haj2m9dy36l9i7lq1726m75fa5yjv";
+ sha256 = "1dswgxxbybwllf2lf89saarsrn4pkb2617wycim07cd7i1l1dv5n";
};
nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix
index 7af4f787a86c5..0bd1967aec8f9 100644
--- a/pkgs/applications/networking/cluster/kubeseal/default.nix
+++ b/pkgs/applications/networking/cluster/kubeseal/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = null;
+ doCheck = false;
+
subPackages = [ "cmd/kubeseal" ];
buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];
diff --git a/pkgs/applications/networking/cluster/kubespy/default.nix b/pkgs/applications/networking/cluster/kubespy/default.nix
index 17f66881ad6e0..e71e598e23d5d 100644
--- a/pkgs/applications/networking/cluster/kubespy/default.nix
+++ b/pkgs/applications/networking/cluster/kubespy/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "0q85is01cbgxflnqdvxc9w5iqdizgvsc44h8z21j712bm2w7blqq";
+ doCheck = false;
+
# TODO: enable after https://github.com/pulumi/kubespy/issues/72 is addressed.
# postInstall = ''
# for shell in bash zsh; do
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index f537b238ae8f3..72dfe3ecc33fc 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -13,11 +13,12 @@ buildGoModule rec {
vendorSha256 = "1kpwvi84i3h1yjprd6m6hn8l9j235931871y3qk9cl0g8q0hv9ja";
+ doCheck = false;
+
meta = with lib; {
description = "Validate your Kubernetes configuration files";
homepage = "https://github.com/instrumenta/kubeval";
license = licenses.asl20;
maintainers = with maintainers; [ johanot nicknovitski ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix
index c8cc0246cd18b..70aeb7841593e 100644
--- a/pkgs/applications/networking/cluster/linkerd/default.nix
+++ b/pkgs/applications/networking/cluster/linkerd/default.nix
@@ -13,6 +13,8 @@ buildGoModule {
vendorSha256 = "0vls58ld50jca5yn73kvg3lx4z83cc7skky54a90pkbj737y58pz";
+ doCheck = false;
+
subPackages = [ "cli/cmd" ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix
index f69082bff3a78..98b71cfe112eb 100644
--- a/pkgs/applications/networking/cluster/luigi/default.nix
+++ b/pkgs/applications/networking/cluster/luigi/default.nix
@@ -1,15 +1,22 @@
-{ lib, python3Packages }:
+{ lib, python3 }:
-python3Packages.buildPythonApplication rec {
+let
+ python = python3.override {
+ self = python;
+ packageOverrides = self: super: {
+ tornado = super.tornado_5;
+ };
+ };
+in with python.pkgs; buildPythonApplication rec {
pname = "luigi";
version = "3.0.1";
- src = python3Packages.fetchPypi {
+ src = fetchPypi {
inherit pname version;
sha256 = "02c480f5pjgqsvqnkaw7f6n4nhdspmhq5w7lw8sgg2v3jghg8n7i";
};
- propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ];
+ propagatedBuildInputs = [ dateutil tornado_5 python-daemon boto3 ];
# Requires tox, hadoop, and google cloud
doCheck = false;
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
deleted file mode 100644
index df571f4cf8690..0000000000000
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, makeWrapper, jdk, mesos, fetchurl }:
-
-stdenv.mkDerivation rec {
- pname = "marathon";
- version = "1.4.2";
-
- src = fetchurl {
- url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz";
- sha256 = "6eab65a95c87a989e922aca2b49ba872b50a94e46a8fd4831d1ab41f319d6932";
- };
-
- buildInputs = [ makeWrapper jdk mesos ];
-
- installPhase = ''
- mkdir -p $out/{bin,libexec/marathon}
- cp target/scala-*/marathon*.jar $out/libexec/marathon/${pname}-${version}.jar
-
- makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \
- --add-flags "-Xmx512m -jar $out/libexec/marathon/${pname}-${version}.jar" \
- --set "MESOS_NATIVE_JAVA_LIBRARY" "$MESOS_NATIVE_JAVA_LIBRARY"
- '';
-
- meta = with stdenv.lib; {
- homepage = "https://mesosphere.github.io/marathon";
- description = "Cluster-wide init and control system for services in cgroups or Docker containers";
- license = licenses.asl20;
- maintainers = with maintainers; [ kamilchm pradeepchhetri ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
deleted file mode 100644
index ac1feee5d72bb..0000000000000
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ /dev/null
@@ -1,263 +0,0 @@
-{ stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh
-, unzip, gnutar, jdk, python, wrapPython
-, setuptools, boto, pythonProtobuf, apr, subversion, gzip
-, leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent
-, ethtool, coreutils, which, iptables, maven
-, bash, autoreconfHook
-, utf8proc, lz4
-, withJava ? !stdenv.isDarwin
-}:
-
-let
- mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; };
- # `tar -z` requires gzip on $PATH, so wrap tar.
- # At some point, we should try to patch mesos so we add gzip to the PATH when
- # tar is invoked. I think that only needs to be done here:
- # src/common/command_utils.cpp
- # https://github.com/NixOS/nixpkgs/issues/13783
- tarWithGzip = lib.overrideDerivation gnutar (oldAttrs: {
- # Original builder is bash 4.3.42 from bootstrap tools, too old for makeWrapper.
- builder = "${bash}/bin/bash";
- buildInputs = (oldAttrs.buildInputs or []) ++ [ makeWrapper ];
- postInstall = (oldAttrs.postInstall or "") + ''
- wrapProgram $out/bin/tar --prefix PATH ":" "${gzip}/bin"
- '';
- });
-
-in stdenv.mkDerivation rec {
- version = "1.4.1";
- pname = "mesos";
-
- enableParallelBuilding = true;
- dontDisableStatic = true;
-
- src = fetchurl {
- url = "mirror://apache/mesos/${version}/${pname}-${version}.tar.gz";
- sha256 = "1c7l0rim9ija913gpppz2mcms08ywyqhlzbbspqsi7wwfdd7jwsr";
- };
-
- patches = [
- # https://reviews.apache.org/r/36610/
- # TODO: is this still needed?
- ./rb36610.patch
-
- # see https://github.com/cstrahan/mesos/tree/nixos-${version}
- ./nixos.patch
- ];
- nativeBuildInputs = [
- autoreconfHook
- ];
- buildInputs = [
- makeWrapper curl sasl
- python wrapPython boto setuptools leveldb
- subversion apr glog openssl libevent
- utf8proc lz4
- ] ++ lib.optionals stdenv.isLinux [
- libnl
- ] ++ lib.optionals withJava [
- jdk maven
- ];
-
- propagatedBuildInputs = [
- pythonProtobuf
- ];
-
- NIX_CFLAGS_COMPILE = "-Wno-error=format-overflow -Wno-error=class-memaccess";
-
- preConfigure = ''
- # https://issues.apache.org/jira/browse/MESOS-6616
- configureFlagsArray+=(
- "CXXFLAGS=-O2 -Wno-error=strict-aliasing"
- )
-
- substituteInPlace 3rdparty/stout/include/stout/jsonify.hpp \
- --replace '' ''
- # Fix cases where makedev(),major(),minor() are referenced through
- # instead of
- sed 1i'#include ' -i src/linux/fs.cpp
- sed 1i'#include ' -i src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
- substituteInPlace 3rdparty/stout/include/stout/os/posix/chown.hpp \
- --subst-var-by chown ${coreutils}/bin/chown
-
- substituteInPlace 3rdparty/stout/Makefile.am \
- --replace "-lprotobuf" \
- "${pythonProtobuf.protobuf}/lib/libprotobuf.a"
-
- substituteInPlace 3rdparty/stout/include/stout/os/posix/fork.hpp \
- --subst-var-by sh ${bash}/bin/bash
-
- substituteInPlace 3rdparty/stout/include/stout/posix/os.hpp \
- --subst-var-by tar ${tarWithGzip}/bin/tar
-
- substituteInPlace src/cli/mesos-scp \
- --subst-var-by scp ${openssh}/bin/scp
-
- substituteInPlace src/common/command_utils.cpp \
- --subst-var-by curl ${curl}/bin/curl \
- --subst-var-by gzip ${gzip}/bin/gzip \
- --subst-var-by sha512sum ${coreutils}/bin/sha512sum \
- --subst-var-by tar ${tarWithGzip}/bin/tar
-
- substituteInPlace src/launcher/fetcher.cpp \
- --subst-var-by cp ${coreutils}/bin/cp \
- --subst-var-by gzip ${gzip}/bin/gzip \
- --subst-var-by tar ${tarWithGzip}/bin/tar \
- --subst-var-by unzip ${unzip}/bin/unzip
-
- substituteInPlace src/python/cli/src/mesos/cli.py \
- --subst-var-by mesos-resolve $out/bin/mesos-resolve
-
- substituteInPlace src/python/native_common/ext_modules.py.in \
- --replace "-lprotobuf" \
- "${pythonProtobuf.protobuf}/lib/libprotobuf.a"
-
- substituteInPlace src/slave/containerizer/mesos/isolators/gpu/volume.cpp \
- --subst-var-by cp ${coreutils}/bin/cp \
- --subst-var-by which ${which}/bin/which
-
- substituteInPlace src/slave/containerizer/mesos/isolators/posix/disk.cpp \
- --subst-var-by du ${coreutils}/bin/du
-
- substituteInPlace src/slave/containerizer/mesos/provisioner/backends/copy.cpp \
- --subst-var-by cp ${coreutils}/bin/cp \
- --subst-var-by rm ${coreutils}/bin/rm
-
- substituteInPlace src/uri/fetchers/copy.cpp \
- --subst-var-by cp ${coreutils}/bin/cp
-
- substituteInPlace src/uri/fetchers/curl.cpp \
- --subst-var-by curl ${curl}/bin/curl
-
- substituteInPlace src/uri/fetchers/docker.cpp \
- --subst-var-by curl ${curl}/bin/curl
-
- substituteInPlace src/Makefile.am \
- --subst-var-by mavenRepo ${mavenRepo} \
- --replace "-lprotobuf" \
- "${pythonProtobuf.protobuf}/lib/libprotobuf.a"
-
- '' + lib.optionalString stdenv.isLinux ''
-
- substituteInPlace src/linux/perf.cpp \
- --subst-var-by perf ${perf}/bin/perf
-
- substituteInPlace src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp \
- --subst-var-by mount ${utillinux}/bin/mount
-
- substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/linux.cpp \
- --subst-var-by mount ${utillinux}/bin/mount
-
- substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/shared.cpp \
- --subst-var-by mount ${utillinux}/bin/mount
-
- substituteInPlace src/slave/containerizer/mesos/isolators/gpu/isolator.cpp \
- --subst-var-by mount ${utillinux}/bin/mount
-
- substituteInPlace src/slave/containerizer/mesos/isolators/namespaces/pid.cpp \
- --subst-var-by mount ${utillinux}/bin/mount
-
- substituteInPlace src/slave/containerizer/mesos/isolators/network/cni/cni.cpp \
- --subst-var-by mount ${utillinux}/bin/mount
-
- substituteInPlace src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp \
- --subst-var-by iptables ${iptables}/bin/iptables
-
- substituteInPlace src/slave/containerizer/mesos/isolators/network/port_mapping.cpp \
- --subst-var-by ethtool ${ethtool}/sbin/ethtool \
- --subst-var-by ip ${iproute}/bin/ip \
- --subst-var-by mount ${utillinux}/bin/mount \
- --subst-var-by tc ${iproute}/bin/tc
-
- substituteInPlace src/slave/containerizer/mesos/isolators/volume/image.cpp \
- --subst-var-by mount ${utillinux}/bin/mount
-
- substituteInPlace src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp \
- --subst-var-by mount ${utillinux}/bin/mount
- '';
-
- configureFlags = [
- "--sbindir=\${out}/bin"
- "--with-apr=${apr.dev}"
- "--with-svn=${subversion.dev}"
- "--with-leveldb=${leveldb}"
- "--with-glog=${glog}"
- "--enable-optimize"
- "--disable-python-dependency-install"
- "--enable-ssl"
- "--with-ssl=${openssl.dev}"
- "--enable-libevent"
- "--with-libevent=${libevent.dev}"
- "--with-protobuf=${pythonProtobuf.protobuf}"
- "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar"
- (if withJava then "--enable-java" else "--disable-java")
- ] ++ lib.optionals stdenv.isLinux [
- "--with-network-isolator"
- "--with-nl=${libnl.dev}"
- ];
-
- postInstall = ''
- rm -rf $out/var
- rm $out/bin/*.sh
-
- # Inspired by: pkgs/development/python-modules/generic/default.nix
- pushd src/python
- mkdir -p $out/lib/${python.libPrefix}/site-packages
- export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
- ${python}/bin/${python.executable} setup.py install \
- --install-lib=$out/lib/${python.libPrefix}/site-packages \
- --old-and-unmanageable \
- --prefix="$out"
- rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
- popd
-
- # optional python dependency for mesos cli
- pushd src/python/cli
- ${python}/bin/${python.executable} setup.py install \
- --install-lib=$out/lib/${python.libPrefix}/site-packages \
- --old-and-unmanageable \
- --prefix="$out"
- popd
- '' + stdenv.lib.optionalString withJava ''
- mkdir -p $out/share/java
- cp src/java/target/mesos-*.jar $out/share/java
-
- MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary}
-
- mkdir -p $out/nix-support
- touch $out/nix-support/setup-hook
- echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook
- echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook
- '';
-
- postFixup = ''
- if test -e $out/nix-support/propagated-build-inputs; then
- ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
- fi
-
- for inputsfile in propagated-build-inputs propagated-native-build-inputs; do
- if test -e $out/nix-support/$inputsfile; then
- createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)"
- fi
- done
-
- for f in $out/libexec/mesos/python/mesos/*.py; do
- ${python}/bin/${python.executable} -c "import py_compile; py_compile.compile('$f')"
- done
-
- # wrap the python programs
- for prog in mesos-cat mesos-ps mesos-scp mesos-tail; do
- wrapProgram "$out/bin/$prog" \
- --prefix PYTHONPATH ":" "$out/lib/${python.libPrefix}/site-packages"
- true
- done
- '';
-
- meta = with lib; {
- homepage = "http://mesos.apache.org";
- license = licenses.asl20;
- description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks";
- maintainers = with maintainers; [ cstrahan offline ];
- platforms = platforms.unix;
- broken = true; # Broken since 2019-10-22 (https://hydra.nixos.org/build/115475123)
- };
-}
diff --git a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
deleted file mode 100644
index 1e2840017b344..0000000000000
--- a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
+++ /dev/null
@@ -1,1359 +0,0 @@
-source $stdenv/setup
-header "fetching Apache Mesos maven repo"
-
-function fetchArtifact {
- repoPath="$1"
- echo "Fetching $repoPath"
- url="https://repo.maven.apache.org/maven2/$repoPath"
- mkdir -p $(dirname $out/$repoPath)
- curl --fail --location --insecure --retry 3 --max-redirs 20 "$url" --output "$out/$repoPath"
-}
-
-fetchArtifact org/apache/apache/11/apache-11.pom
-fetchArtifact org/apache/apache/11/apache-11.pom.sha1
-fetchArtifact org/apache/apache/10/apache-10.pom
-fetchArtifact org/apache/apache/10/apache-10.pom.sha1
-fetchArtifact org/apache/apache/7/apache-7.pom
-fetchArtifact org/apache/apache/7/apache-7.pom.sha1
-fetchArtifact org/apache/apache/9/apache-9.pom
-fetchArtifact org/apache/apache/9/apache-9.pom.sha1
-fetchArtifact org/apache/apache/13/apache-13.pom
-fetchArtifact org/apache/apache/13/apache-13.pom.sha1
-fetchArtifact org/apache/apache/3/apache-3.pom
-fetchArtifact org/apache/apache/3/apache-3.pom.sha1
-fetchArtifact org/apache/apache/6/apache-6.pom
-fetchArtifact org/apache/apache/6/apache-6.pom.sha1
-fetchArtifact org/apache/apache/4/apache-4.pom
-fetchArtifact org/apache/apache/4/apache-4.pom.sha1
-fetchArtifact org/apache/apache/2/apache-2.pom
-fetchArtifact org/apache/apache/2/apache-2.pom.sha1
-fetchArtifact org/apache/apache/5/apache-5.pom
-fetchArtifact org/apache/apache/5/apache-5.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom
-fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar
-fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom
-fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom
-fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom
-fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom
-fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom
-fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar
-fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom
-fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar
-fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom
-fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar
-fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom
-fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar
-fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar
-fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar
-fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom
-fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar
-fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar
-fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom
-fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar
-fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar
-fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar.sha1
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom.sha1
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar
-fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar.sha1
-fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom
-fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom
-fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom
-fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom
-fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom
-fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom
-fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom
-fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom
-fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom
-fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom
-fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom
-fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom
-fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom
-fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1
-fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom
-fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom
-fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar
-fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar.sha1
-fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom
-fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom.sha1
-fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar
-fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar.sha1
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom.sha1
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar
-fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom
-fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar
-fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom
-fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom
-fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom
-fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom
-fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom
-fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom
-fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom
-fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom
-fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1
-fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom
-fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom
-fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom
-fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom
-fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar
-fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom
-fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom
-fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar
-fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom
-fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.jar
-fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.jar.sha1
-fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom
-fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom
-fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom
-fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom
-fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom
-fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar
-fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom
-fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom
-fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar
-fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom
-fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom
-fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.jar
-fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.jar.sha1
-fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom
-fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar
-fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom
-fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar
-fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom
-fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar
-fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom
-fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom
-fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom
-fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar
-fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom
-fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom
-fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar
-fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom
-fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom
-fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.jar
-fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.jar.sha1
-fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom
-fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.jar
-fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.jar.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom
-fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar
-fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom
-fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar
-fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar
-fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom
-fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar
-fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom
-fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom
-fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1
-fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom
-fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.jar
-fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.jar.sha1
-fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom
-fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar
-fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom
-fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom
-fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar
-fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom
-fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.jar
-fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.jar.sha1
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar
-fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom.sha1
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar
-fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom
-fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom
-fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar.sha1
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar
-fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar
-fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar
-fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom
-fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1
-fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar
-fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.jar.sha1
-fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom
-fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.sha1
-fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom
-fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar
-fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom
-fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar
-fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom
-fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar
-fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom
-fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar
-fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom
-fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar
-fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar
-fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar
-fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar
-fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar.sha1
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar
-fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom
-fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar
-fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar
-fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1
-fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom
-fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1
-fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar
-fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.jar.sha1
-fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom
-fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1
-fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.jar
-fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.jar.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar
-fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom
-fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar
-fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom
-fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar
-fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom
-fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom.sha1
-fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar
-fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar.sha1
-fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom
-fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar
-fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar.sha1
-fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom
-fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom
-fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom
-fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom
-fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom
-fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar
-fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.jar.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar
-fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.jar.sha1
-fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom
-fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar
-fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar.sha1
-fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom
-fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar
-fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar.sha1
-fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom
-fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar
-fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar.sha1
-fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom
-fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1
-fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar
-fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.jar.sha1
-fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom
-fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom.sha1
-fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar
-fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar.sha1
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar
-fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1
-fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom
-fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom.sha1
-fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom
-fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom.sha1
-fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar
-fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar.sha1
-fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom
-fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom
-fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom
-fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom
-fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom
-fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom.sha1
-fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom
-fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1
-fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar
-fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar.sha1
-fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom
-fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom.sha1
-fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar
-fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1
-fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom
-fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom.sha1
-fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom
-fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom.sha1
-fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom
-fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom.sha1
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar
-fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1
-fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom
-fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1
-fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom
-fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom.sha1
-fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar
-fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar.sha1
-fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom
-fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom.sha1
-fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom
-fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom.sha1
-fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom
-fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom.sha1
-fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar
-fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar.sha1
-fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom
-fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom.sha1
-fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar
-fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar.sha1
-fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom
-fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom.sha1
-fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom
-fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1
-fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom
-fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom.sha1
-fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar
-fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar.sha1
-fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom
-fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom.sha1
-fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
-fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar
-fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom
-fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom
-fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom
-fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom
-fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom
-fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom
-fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom
-fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom
-fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom
-fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom
-fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar
-fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar
-fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom
-fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom
-fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom
-fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar
-fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar
-fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar
-fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar
-fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar
-fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom
-fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom
-fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar
-fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom
-fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar
-fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar
-fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom
-fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom
-fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom
-fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar
-fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1
-fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom
-fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.sha1
-fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom
-fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom
-fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom
-fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom
-fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom.sha1
-fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom
-fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom
-fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom
-fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom
-fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom
-fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom.sha1
-fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom
-fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom.sha1
-fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom
-fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom.sha1
-fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar
-fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar.sha1
-fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom
-fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom.sha1
-fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar
-fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1
-fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom
-fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1
-fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar
-fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar.sha1
-fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom
-fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom.sha1
-fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom
-fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom
-fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar
-fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar.sha1
-fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom
-fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom
-fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom
-fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom
-fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar
-fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar.sha1
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom.sha1
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar
-fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar.sha1
-fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom
-fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar
-fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar.sha1
-fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom
-fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar
-fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar.sha1
-fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom
-fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar
-fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar.sha1
-fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom
-fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom.sha1
-fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar
-fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar.sha1
-fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom
-fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom.sha1
-fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar
-fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar.sha1
-fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom
-fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom.sha1
-fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom
-fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom.sha1
-fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar
-fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar.sha1
-fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom
-fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom.sha1
-fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom
-fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom.sha1
-fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar
-fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar.sha1
-fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom
-fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom.sha1
-fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom
-fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom.sha1
-fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom
-fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.sha1
-fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom
-fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom.sha1
-fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar
-fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar.sha1
-fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom
-fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom.sha1
-fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar
-fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar.sha1
-fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom
-fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom.sha1
-fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom
-fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1
-fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar
-fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar.sha1
-fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom
-fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1
-fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom
-fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom.sha1
-fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar
-fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar.sha1
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar
-fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar
-fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1
-fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom
-fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom.sha1
-fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar
-fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1
-fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.pom
-fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.pom.sha1
-fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar
-fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar.sha1
-fetchArtifact com/google/protobuf/protobuf-parent/3.3.0/protobuf-parent-3.3.0.pom
-fetchArtifact com/google/protobuf/protobuf-parent/3.3.0/protobuf-parent-3.3.0.pom.sha1
-fetchArtifact com/google/google/1/google-1.pom
-fetchArtifact com/google/google/1/google-1.pom.sha1
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar
-fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1
-fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom
-fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar
-fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1
-fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom
-fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1
-fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom
-fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom.sha1
-fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar
-fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar.sha1
-fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom
-fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom.sha1
-fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar
-fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar.sha1
-fetchArtifact junit/junit/4.10/junit-4.10.pom
-fetchArtifact junit/junit/4.10/junit-4.10.pom.sha1
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar
-fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1
-fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom
-fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1
-fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom
-fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1
-fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar
-fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar.sha1
-fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom
-fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom.sha1
-fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.jar
-fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.jar.sha1
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar
-fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1
-fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom
-fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom
-fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar
-fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar.sha1
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar
-fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar.sha1
-fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom
-fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1
-fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom
-fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar
-fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar.sha1
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar
-fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar
-fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1
-fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom
-fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom.sha1
-fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar
-fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar.sha1
-fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom
-fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1
-fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar
-fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar.sha1
-fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom
-fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom.sha1
-fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar
-fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1
-fetchArtifact velocity/velocity/1.5/velocity-1.5.pom
-fetchArtifact velocity/velocity/1.5/velocity-1.5.pom.sha1
-fetchArtifact velocity/velocity/1.5/velocity-1.5.jar
-fetchArtifact velocity/velocity/1.5/velocity-1.5.jar.sha1
-fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom
-fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom.sha1
-fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar
-fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1
-fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom
-fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom.sha1
-fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar
-fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar.sha1
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar
-fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1
-fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom
-fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
-fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar
-fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar.sha1
-fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom
-fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom
-fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom
-fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom
-fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1
-fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar
-fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1
-fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom
-fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom.sha1
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar
-fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1
-fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom
-fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1
-fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar
-fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar.sha1
-fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom
-fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.sha1
-fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar
-fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar.sha1
-fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom
-fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom.sha1
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar
-fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1
-fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom
-fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1
-fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom
-fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom.sha1
-fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar
-fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar.sha1
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar
-fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1
-fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom
-fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1
-fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom
-fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom.sha1
-fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar
-fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar.sha1
-fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom
-fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom.sha1
-fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom
-fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.sha1
-fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom
-fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom.sha1
-fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar
-fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar.sha1
-fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom
-fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.sha1
-fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar
-fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar.sha1
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar
-fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1
-fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom
-fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom.sha1
-fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar
-fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar.sha1
-fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom
-fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom.sha1
-fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar
-fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar.sha1
-fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom
-fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom.sha1
-fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar
-fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar.sha1
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom.sha1
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar
-fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1
-fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom
-fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom.sha1
-fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar
-fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar.sha1
-fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom
-fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1
-fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar
-fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar.sha1
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar
-fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1
-fetchArtifact asm/asm/3.2/asm-3.2.pom
-fetchArtifact asm/asm/3.2/asm-3.2.pom.sha1
-fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom
-fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1
-fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom
-fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom.sha1
-fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom
-fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom.sha1
-fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar
-fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar.sha1
-fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom
-fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom.sha1
-fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom
-fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom.sha1
-fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar
-fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar.sha1
-fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom
-fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom.sha1
-fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom
-fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom.sha1
-fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar
-fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar.sha1
-fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom
-fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom.sha1
-fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar
-fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar.sha1
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar
-fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1
-
-stopNest
diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
deleted file mode 100644
index 1cf819870f4ef..0000000000000
--- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, curl}:
-
-stdenv.mkDerivation {
- name = "mesos-maven-deps";
- builder = ./fetch-mesos-deps.sh;
-
- outputHashAlgo = "sha256";
- outputHashMode = "recursive";
- outputHash = "10h0qs7svw0cqjkyxs8z6s3qraa8ga920zfrr59rdlanbwg4klly";
-
- nativeBuildInputs = [ curl ];
-
- impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
-}
diff --git a/pkgs/applications/networking/cluster/mesos/nixos.patch b/pkgs/applications/networking/cluster/mesos/nixos.patch
deleted file mode 100644
index a6fea024b087e..0000000000000
--- a/pkgs/applications/networking/cluster/mesos/nixos.patch
+++ /dev/null
@@ -1,731 +0,0 @@
-diff --git i/3rdparty/stout/include/stout/os/posix/fork.hpp w/3rdparty/stout/include/stout/os/posix/fork.hpp
-index a29967d..290b98b 100644
---- i/3rdparty/stout/include/stout/os/posix/fork.hpp
-+++ w/3rdparty/stout/include/stout/os/posix/fork.hpp
-@@ -369,7 +369,7 @@ private:
- if (exec.isSome()) {
- // Execute the command (via '/bin/sh -c command').
- const char* command = exec.get().command.c_str();
-- execlp("sh", "sh", "-c", command, (char*) nullptr);
-+ execlp("@sh@", "sh", "-c", command, (char*) nullptr);
- EXIT(EXIT_FAILURE)
- << "Failed to execute '" << command << "': " << os::strerror(errno);
- } else if (wait.isSome()) {
-diff --git i/3rdparty/stout/include/stout/posix/os.hpp w/3rdparty/stout/include/stout/posix/os.hpp
-index 8511dfd..1e7be01 100644
---- i/3rdparty/stout/include/stout/posix/os.hpp
-+++ w/3rdparty/stout/include/stout/posix/os.hpp
-@@ -366,7 +366,7 @@ inline Try> pids(Option group, Option session)
- inline Try tar(const std::string& path, const std::string& archive)
- {
- Try tarOut =
-- os::shell("tar %s %s %s", "-czf", archive.c_str(), path.c_str());
-+ os::shell("@tar@ %s %s %s", "-czf", archive.c_str(), path.c_str());
-
- if (tarOut.isError()) {
- return Error("Failed to archive " + path + ": " + tarOut.error());
-diff --git i/src/Makefile.am w/src/Makefile.am
-index 68fff14..c572f92 100644
---- i/src/Makefile.am
-+++ w/src/Makefile.am
-@@ -1775,7 +1775,7 @@ if HAS_JAVA
-
- $(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom
- @echo "Building mesos-$(PACKAGE_VERSION).jar ..."
-- @cd $(abs_top_builddir)/src/java && $(MVN) -B -f mesos.pom clean package
-+ @cd $(abs_top_builddir)/src/java && $(MVN) -B -f mesos.pom -Dmaven.repo.local=@mavenRepo@ clean package
-
- # Convenience library for JNI bindings.
- # TODO(Charles Reiss): We really should be building the Java library
-diff --git i/src/cli/mesos-scp w/src/cli/mesos-scp
-index a71ab07..1043d1b 100755
---- i/src/cli/mesos-scp
-+++ w/src/cli/mesos-scp
-@@ -19,7 +19,8 @@ if sys.version_info < (2,6,0):
-
-
- def scp(host, src, dst):
-- cmd = 'scp -pr %s %s' % (src, host + ':' + dst)
-+ cmd = '@scp@ -pr %s %s' % (src, host + ':' + dst)
-+
- try:
- process = subprocess.Popen(
- cmd,
-diff --git i/src/common/command_utils.cpp w/src/common/command_utils.cpp
-index c50be76..388cc53 100644
---- i/src/common/command_utils.cpp
-+++ w/src/common/command_utils.cpp
-@@ -142,7 +142,7 @@ Future tar(
-
- argv.emplace_back(input);
-
-- return launch("tar", argv)
-+ return launch("@tar@", argv)
- .then([]() { return Nothing(); });
- }
-
-@@ -164,7 +164,7 @@ Future untar(
- argv.emplace_back(directory.get());
- }
-
-- return launch("tar", argv)
-+ return launch("@tar@", argv)
- .then([]() { return Nothing(); });
- }
-
-@@ -172,7 +172,7 @@ Future untar(
- Future sha512(const Path& input)
- {
- #ifdef __linux__
-- const string cmd = "sha512sum";
-+ const string cmd = "@sha512sum@";
- vector argv = {
- cmd,
- input // Input file to compute shasum.
-@@ -208,7 +208,7 @@ Future gzip(const Path& input)
- input
- };
-
-- return launch("gzip", argv)
-+ return launch("@gzip@", argv)
- .then([]() { return Nothing(); });
- }
-
-@@ -221,7 +221,7 @@ Future decompress(const Path& input)
- input
- };
-
-- return launch("gzip", argv)
-+ return launch("@gzip@", argv)
- .then([]() { return Nothing(); });
- }
-
-diff --git i/src/launcher/fetcher.cpp w/src/launcher/fetcher.cpp
-index 42980f5..3aebeed 100644
---- i/src/launcher/fetcher.cpp
-+++ w/src/launcher/fetcher.cpp
-@@ -80,17 +80,17 @@ static Try extract(
- strings::endsWith(sourcePath, ".tar.bz2") ||
- strings::endsWith(sourcePath, ".txz") ||
- strings::endsWith(sourcePath, ".tar.xz")) {
-- command = {"tar", "-C", destinationDirectory, "-xf", sourcePath};
-+ command = {"@tar@", "-C", destinationDirectory, "-xf", sourcePath};
- } else if (strings::endsWith(sourcePath, ".gz")) {
- string pathWithoutExtension = sourcePath.substr(0, sourcePath.length() - 3);
- string filename = Path(pathWithoutExtension).basename();
- string destinationPath = path::join(destinationDirectory, filename);
-
-- command = {"gunzip", "-d", "-c"};
-+ command = {"@gunzip@", "-d", "-c"};
- in = Subprocess::PATH(sourcePath);
- out = Subprocess::PATH(destinationPath);
- } else if (strings::endsWith(sourcePath, ".zip")) {
-- command = {"unzip", "-o", "-d", destinationDirectory, sourcePath};
-+ command = {"@unzip@", "-o", "-d", destinationDirectory, sourcePath};
- } else {
- return false;
- }
-@@ -193,7 +193,7 @@ static Try copyFile(
- const string& sourcePath,
- const string& destinationPath)
- {
-- int status = os::spawn("cp", {"cp", sourcePath, destinationPath});
-+ int status = os::spawn("cp", {"@cp@", sourcePath, destinationPath});
-
- if (status == -1) {
- return ErrnoError("Failed to copy '" + sourcePath + "'");
-diff --git i/src/linux/perf.cpp w/src/linux/perf.cpp
-index b301e25..356a2cf 100644
---- i/src/linux/perf.cpp
-+++ w/src/linux/perf.cpp
-@@ -128,7 +128,7 @@ private:
- // NOTE: The supervisor childhook places perf in its own process group
- // and will kill the perf process when the parent dies.
- Try _perf = subprocess(
-- "perf",
-+ "@perf@",
- argv,
- Subprocess::PIPE(),
- Subprocess::PIPE(),
-diff --git i/src/linux/systemd.cpp w/src/linux/systemd.cpp
-index 6318f48..394d88d 100644
---- i/src/linux/systemd.cpp
-+++ w/src/linux/systemd.cpp
-@@ -196,13 +196,21 @@ bool exists()
- // This is static as the init system should not change while we are running.
- static const bool exists = []() -> bool {
- // (1) Test whether `/sbin/init` links to systemd.
-- const Result realpath = os::realpath("/sbin/init");
-- if (realpath.isError() || realpath.isNone()) {
-- LOG(WARNING) << "Failed to test /sbin/init for systemd environment: "
-- << (realpath.isError() ? realpath.error()
-- : "does not exist");
--
-- return false;
-+ // cstrahan(nixos): first assume we're on NixOS, then try non-NixOS
-+ Result realpath = os::realpath("/run/current-system/systemd/lib/systemd/systemd");
-+ Result realpathNixOS = realpath;
-+ if (realpathNixOS.isError() || realpathNixOS.isNone()) {
-+ Result realpathNonNixOS = realpath = os::realpath("/sbin/init");
-+ if (realpathNonNixOS.isError() || realpathNonNixOS.isNone()) {
-+ LOG(WARNING) << "Failed to test /run/current-system/systemd/lib/systemd/systemd for systemd environment: "
-+ << (realpathNixOS.isError() ? realpathNixOS.error()
-+ : "does not exist");
-+ LOG(WARNING) << "Failed to test /sbin/init for systemd environment: "
-+ << (realpathNonNixOS.isError() ? realpathNonNixOS.error()
-+ : "does not exist");
-+
-+ return false;
-+ }
- }
-
- CHECK_SOME(realpath);
-@@ -278,6 +286,10 @@ Path hierarchy()
-
- Try daemonReload()
- {
-+ // cstrahan(nixos): should we patch these `systemctl`s?
-+ // probably don't want to hard-code a particular systemd store path here,
-+ // but if we use /run/current-system/sw/bin/systemctl,
-+ // we won't be able to support non-NixOS distros.
- Try daemonReload = os::shell("systemctl daemon-reload");
- if (daemonReload.isError()) {
- return Error("Failed to reload systemd daemon: " + daemonReload.error());
-diff --git i/src/python/cli/src/mesos/cli.py w/src/python/cli/src/mesos/cli.py
-index 4a9b558..c08a8b9 100644
---- i/src/python/cli/src/mesos/cli.py
-+++ w/src/python/cli/src/mesos/cli.py
-@@ -40,7 +40,7 @@ def resolve(master):
- import subprocess
-
- process = subprocess.Popen(
-- ['mesos-resolve', master],
-+ ['@mesos-resolve@', master],
- stdin=None,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
-diff --git i/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp w/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
-index 5b630c1..d63ad69 100644
---- i/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
-+++ w/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
-@@ -499,7 +499,7 @@ Future> DockerVolumeIsolatorProcess::_prepare(
- // unsafe arbitrary commands).
- CommandInfo* command = launchInfo.add_pre_exec_commands();
- command->set_shell(false);
-- command->set_value("mount");
-+ command->set_value("@mount@");
- command->add_arguments("mount");
- command->add_arguments("-n");
- command->add_arguments("--rbind");
-diff --git i/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp w/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
-index d7fe9a8..1361a4e 100644
---- i/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
-+++ w/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
-@@ -154,9 +154,9 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags)
- // here because 'create' will only be invoked during
- // initialization.
- Try mount = os::shell(
-- "mount --bind %s %s && "
-- "mount --make-private %s && "
-- "mount --make-shared %s",
-+ "@mount@ --bind %s %s && "
-+ "@mount@ --make-private %s && "
-+ "@mount@ --make-shared %s",
- workDir->c_str(),
- workDir->c_str(),
- workDir->c_str(),
-@@ -175,8 +175,8 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags)
- LOG(INFO) << "Making '" << workDir.get() << "' a shared mount";
-
- Try mount = os::shell(
-- "mount --make-private %s && "
-- "mount --make-shared %s",
-+ "@mount@ --make-private %s && "
-+ "@mount@ --make-shared %s",
- workDir->c_str(),
- workDir->c_str());
-
-@@ -422,7 +422,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands(
-
- CommandInfo command;
- command.set_shell(false);
-- command.set_value("mount");
-+ command.set_value("@mount@");
- command.add_arguments("mount");
- command.add_arguments("-n");
- command.add_arguments("--rbind");
-@@ -610,7 +610,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands(
- // TODO(jieyu): Consider the mode in the volume.
- CommandInfo command;
- command.set_shell(false);
-- command.set_value("mount");
-+ command.set_value("@mount@");
- command.add_arguments("mount");
- command.add_arguments("-n");
- command.add_arguments("--rbind");
-diff --git i/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp w/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
-index 927d95b..576dc63 100644
---- i/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
-+++ w/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
-@@ -208,7 +208,7 @@ Future> SharedFilesystemIsolatorProcess::prepare(
- }
-
- launchInfo.add_pre_exec_commands()->set_value(
-- "mount -n --bind " + hostPath + " " + volume.container_path());
-+ "@mount@ -n --bind " + hostPath + " " + volume.container_path());
- }
-
- return launchInfo;
-diff --git i/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp w/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
-index 25636b5..33ec315 100644
---- i/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
-+++ w/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
-@@ -401,7 +401,7 @@ Future> NvidiaGpuIsolatorProcess::_prepare(
- }
-
- launchInfo.add_pre_exec_commands()->set_value(
-- "mount --no-mtab --rbind --read-only " +
-+ "@mount@ --no-mtab --rbind --read-only " +
- volume.HOST_PATH() + " " + target);
- }
-
-diff --git i/src/slave/containerizer/mesos/isolators/gpu/volume.cpp w/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
-index 536a3c7..e2819dd 100644
---- i/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
-+++ w/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
-@@ -274,7 +274,7 @@ Try NvidiaVolume::create()
- string path = path::join(hostPath, "bin", binary);
-
- if (!os::exists(path)) {
-- string command = "which " + binary;
-+ string command = "@which@ " + binary;
- Try which = os::shell(command);
-
- if (which.isSome()) {
-@@ -288,7 +288,7 @@ Try NvidiaVolume::create()
- : "No such file or directory"));
- }
-
-- command = "cp " + realpath.get() + " " + path;
-+ command = "@cp@ " + realpath.get() + " " + path;
- Try cp = os::shell(command);
- if (cp.isError()) {
- return Error("Failed to os::shell '" + command + "': " + cp.error());
-@@ -360,7 +360,7 @@ Try NvidiaVolume::create()
- Path(realpath.get()).basename());
-
- if (!os::exists(libraryPath)) {
-- string command = "cp " + realpath.get() + " " + libraryPath;
-+ string command = "@cp@ " + realpath.get() + " " + libraryPath;
- Try cp = os::shell(command);
- if (cp.isError()) {
- return Error("Failed to os::shell '" + command + "':"
-diff --git i/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp w/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
-index 42bc2e1..2f9066e 100644
---- i/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
-+++ w/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
-@@ -131,7 +131,7 @@ Future> NamespacesPidIsolatorProcess::prepare(
- //
- // TOOD(jieyu): Consider unmount the existing /proc.
- launchInfo.add_pre_exec_commands()->set_value(
-- "mount -n -t proc proc /proc -o nosuid,noexec,nodev");
-+ "@mount@ -n -t proc proc /proc -o nosuid,noexec,nodev");
-
- return launchInfo;
- }
-diff --git i/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp w/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
-index fc68f04..267b040 100644
---- i/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
-+++ w/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
-@@ -205,9 +205,9 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags)
- // here because 'create' will only be invoked during
- // initialization.
- Try mount = os::shell(
-- "mount --bind %s %s && "
-- "mount --make-private %s && "
-- "mount --make-shared %s",
-+ "@mount@ --bind %s %s && "
-+ "@mount@ --make-private %s && "
-+ "@mount@ --make-shared %s",
- rootDir->c_str(),
- rootDir->c_str(),
- rootDir->c_str(),
-@@ -227,8 +227,8 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags)
- LOG(INFO) << "Making '" << rootDir.get() << "' a shared mount";
-
- Try mount = os::shell(
-- "mount --make-private %s && "
-- "mount --make-shared %s",
-+ "@mount@ --make-private %s && "
-+ "@mount@ --make-shared %s",
- rootDir->c_str(),
- rootDir->c_str());
-
-diff --git i/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp w/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
-index 43cf3e4..94bad8b 100644
---- i/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
-+++ w/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
-@@ -301,7 +301,7 @@ Try PortMapper::addPortMapping(
- # Check if the `chain` exists in the iptable. If it does not
- # exist go ahead and install the chain in the iptables NAT
- # table.
-- iptables -w -t nat --list %s
-+ @iptables@ -w -t nat --list %s
- if [ $? -ne 0 ]; then
- # NOTE: When we create the chain, there is a possibility of a
- # race due to which a container launch can fail. This can
-@@ -315,25 +315,25 @@ Try PortMapper::addPortMapping(
- # since it can happen only when the chain is created the first
- # time and two commands for creation of the chain are executed
- # simultaneously.
-- (iptables -w -t nat -N %s || exit 1)
-+ (@iptables@ -w -t nat -N %s || exit 1)
-
- # Once the chain has been installed add a rule in the PREROUTING
- # chain to jump to this chain for any packets that are
- # destined to a local address.
-- (iptables -w -t nat -A PREROUTING \
-+ (@iptables@ -w -t nat -A PREROUTING \
- -m addrtype --dst-type LOCAL -j %s || exit 1)
-
- # For locally generated packets we need a rule in the OUTPUT
- # chain as well, since locally generated packets directly hit
- # the output CHAIN, bypassing PREROUTING.
-- (iptables -w -t nat -A OUTPUT \
-+ (@iptables@ -w -t nat -A OUTPUT \
- ! -d 127.0.0.0/8 -m addrtype \
- --dst-type LOCAL -j %s || exit 1)
- fi
-
- # Within the `chain` go ahead and install the DNAT rule, if it
- # does not exist.
-- (iptables -w -t nat -C %s || iptables -t nat -A %s))~",
-+ (@iptables@ -w -t nat -C %s || @iptables@ -t nat -A %s))~",
- chain,
- chain,
- chain,
-@@ -360,7 +360,7 @@ Try PortMapper::delPortMapping()
- # The iptables command searches for the DNAT rules with tag
- # "container_id: ", and if it exists goes ahead
- # and deletes it.
-- iptables -w -t nat -S %s | sed "/%s/ s/-A/iptables -w -t nat -D/e")~",
-+ @iptables@ -w -t nat -S %s | sed "/%s/ s/-A/@iptables@ -w -t nat -D/e")~",
- chain,
- getIptablesRuleTag()).get();
-
-diff --git i/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp w/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
-index 57d4ccd..68c9577 100644
---- i/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
-+++ w/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
-@@ -1394,19 +1394,19 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
- // Check the availability of a few Linux commands that we will use.
- // We use the blocking os::shell here because 'create' will only be
- // invoked during initialization.
-- Try checkCommandTc = os::shell("tc filter show");
-+ Try checkCommandTc = os::shell("@tc@ filter show");
- if (checkCommandTc.isError()) {
- return Error("Check command 'tc' failed: " + checkCommandTc.error());
- }
-
- // NOTE: loopback device always exists.
-- Try checkCommandEthtool = os::shell("ethtool -k lo");
-+ Try checkCommandEthtool = os::shell("@ethtool@ -k lo");
- if (checkCommandEthtool.isError()) {
- return Error("Check command 'ethtool' failed: "
- + checkCommandEthtool.error());
- }
-
-- Try checkCommandIp = os::shell("ip link show");
-+ Try checkCommandIp = os::shell("@ip@ link show");
- if (checkCommandIp.isError()) {
- return Error("Check command 'ip' failed: " + checkCommandIp.error());
- }
-@@ -1940,9 +1940,9 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
- // visible. It's OK to use the blocking os::shell here because
- // 'create' will only be invoked during initialization.
- Try mount = os::shell(
-- "mount --bind %s %s && "
-- "mount --make-slave %s && "
-- "mount --make-shared %s",
-+ "@mount@ --bind %s %s && "
-+ "@mount@ --make-slave %s && "
-+ "@mount@ --make-shared %s",
- bindMountRoot->c_str(),
- bindMountRoot->c_str(),
- bindMountRoot->c_str(),
-@@ -1959,8 +1959,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
- // shared mount yet (possibly due to slave crash while preparing
- // the work directory mount). It's safe to re-do the following.
- Try mount = os::shell(
-- "mount --make-slave %s && "
-- "mount --make-shared %s",
-+ "@mount@ --make-slave %s && "
-+ "@mount@ --make-shared %s",
- bindMountRoot->c_str(),
- bindMountRoot->c_str());
-
-@@ -1979,8 +1979,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
- // so that they are in different peer groups.
- if (entry.shared() == bindMountEntry->shared()) {
- Try mount = os::shell(
-- "mount --make-slave %s && "
-- "mount --make-shared %s",
-+ "@mount@ --make-slave %s && "
-+ "@mount@ --make-shared %s",
- bindMountRoot->c_str(),
- bindMountRoot->c_str());
-
-@@ -3927,6 +3927,8 @@ Try PortMappingIsolatorProcess::removeHostIPFilters(
- // TODO(jieyu): Use the Subcommand abstraction to remove most of the
- // logic here. Completely remove this function once we can assume a
- // newer kernel where 'setns' works for mount namespaces.
-+// cstrahan(nixos): this is executed in the container,
-+// so we don't want to substitute paths here.
- string PortMappingIsolatorProcess::scripts(Info* info)
- {
- ostringstream script;
-@@ -3937,7 +3939,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
- // Mark the mount point PORT_MAPPING_BIND_MOUNT_ROOT() as slave
- // mount so that changes in the container will not be propagated to
- // the host.
-- script << "mount --make-rslave " << bindMountRoot << "\n";
-+ script << "@mount@ --make-rslave " << bindMountRoot << "\n";
-
- // Disable IPv6 when IPv6 module is loaded as IPv6 packets won't be
- // forwarded anyway.
-@@ -3945,7 +3947,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
- << " echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6\n";
-
- // Configure lo and eth0.
-- script << "ip link set " << lo << " address " << hostMAC
-+ script << "@ip@ link set " << lo << " address " << hostMAC
- << " mtu " << hostEth0MTU << " up\n";
-
- // NOTE: This is mostly a kernel issue: in veth_xmit() the kernel
-@@ -3954,12 +3956,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
- // when we receive a packet with a bad checksum. Disabling rx
- // checksum offloading ensures the TCP layer will checksum and drop
- // it.
-- script << "ethtool -K " << eth0 << " rx off\n";
-- script << "ip link set " << eth0 << " address " << hostMAC << " up\n";
-- script << "ip addr add " << hostIPNetwork << " dev " << eth0 << "\n";
-+ script << "@ethtool@ -K " << eth0 << " rx off\n";
-+ script << "@ip@ link set " << eth0 << " address " << hostMAC << " up\n";
-+ script << "@ip@ addr add " << hostIPNetwork << " dev " << eth0 << "\n";
-
- // Set up the default gateway to match that of eth0.
-- script << "ip route add default via " << hostDefaultGateway << "\n";
-+ script << "@ip@ route add default via " << hostDefaultGateway << "\n";
-
- // Restrict the ephemeral ports that can be used by the container.
- script << "echo " << info->ephemeralPorts.lower() << " "
-@@ -3988,19 +3990,19 @@ string PortMappingIsolatorProcess::scripts(Info* info)
- }
-
- // Set up filters on lo and eth0.
-- script << "tc qdisc add dev " << lo << " ingress\n";
-- script << "tc qdisc add dev " << eth0 << " ingress\n";
-+ script << "@tc@ qdisc add dev " << lo << " ingress\n";
-+ script << "@tc@ qdisc add dev " << eth0 << " ingress\n";
-
- // Allow talking between containers and from container to host.
- // TODO(chzhcn): Consider merging the following two filters.
-- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE
-+ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE
- << " protocol ip"
- << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32"
- << " flowid ffff:0"
- << " match ip dst " << hostIPNetwork.address()
- << " action mirred egress redirect dev " << eth0 << "\n";
-
-- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE
-+ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE
- << " protocol ip"
- << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32"
- << " flowid ffff:0"
-@@ -4011,7 +4013,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
- foreach (const PortRange& range,
- getPortRanges(info->nonEphemeralPorts + info->ephemeralPorts)) {
- // Local traffic inside a container will not be redirected to eth0.
-- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE
-+ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE
- << " protocol ip"
- << " prio " << Priority(IP_FILTER_PRIORITY, HIGH).get() << " u32"
- << " flowid ffff:0"
-@@ -4020,7 +4022,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
-
- // Traffic going to host loopback IP and ports assigned to this
- // container will be redirected to lo.
-- script << "tc filter add dev " << eth0 << " parent " << ingress::HANDLE
-+ script << "@tc@ filter add dev " << eth0 << " parent " << ingress::HANDLE
- << " protocol ip"
- << " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32"
- << " flowid ffff:0"
-@@ -4032,14 +4034,14 @@ string PortMappingIsolatorProcess::scripts(Info* info)
- }
-
- // Do not forward the ICMP packet if the destination IP is self.
-- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE
-+ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE
- << " protocol ip"
- << " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32"
- << " flowid ffff:0"
- << " match ip protocol 1 0xff"
- << " match ip dst " << hostIPNetwork.address() << "\n";
-
-- script << "tc filter add dev " << lo << " parent " << ingress::HANDLE
-+ script << "@tc@ filter add dev " << lo << " parent " << ingress::HANDLE
- << " protocol ip"
- << " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32"
- << " flowid ffff:0"
-@@ -4048,9 +4050,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
- << net::IP::Network::LOOPBACK_V4().address() << "\n";
-
- // Display the filters created on eth0 and lo.
-- script << "tc filter show dev " << eth0
-+ script << "@tc@ filter show dev " << eth0
- << " parent " << ingress::HANDLE << "\n";
-- script << "tc filter show dev " << lo
-+ script << "@tc@ filter show dev " << lo
- << " parent " << ingress::HANDLE << "\n";
-
- // If throughput limit for container egress traffic exists, use HTB
-@@ -4062,9 +4064,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
- // throughput. TBF requires other parameters such as 'burst' that
- // HTB already has default values for.
- if (egressRateLimitPerContainer.isSome()) {
-- script << "tc qdisc add dev " << eth0 << " root handle "
-+ script << "@tc@ qdisc add dev " << eth0 << " root handle "
- << CONTAINER_TX_HTB_HANDLE << " htb default 1\n";
-- script << "tc class add dev " << eth0 << " parent "
-+ script << "@tc@ class add dev " << eth0 << " parent "
- << CONTAINER_TX_HTB_HANDLE << " classid "
- << CONTAINER_TX_HTB_CLASS_ID << " htb rate "
- << egressRateLimitPerContainer.get().bytes() * 8 << "bit\n";
-@@ -4075,12 +4077,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
- // fq_codel, which has a larger buffer and better control on
- // buffer bloat.
- // TODO(cwang): Verity that fq_codel qdisc is available.
-- script << "tc qdisc add dev " << eth0
-+ script << "@tc@ qdisc add dev " << eth0
- << " parent " << CONTAINER_TX_HTB_CLASS_ID << " fq_codel\n";
-
- // Display the htb qdisc and class created on eth0.
-- script << "tc qdisc show dev " << eth0 << "\n";
-- script << "tc class show dev " << eth0 << "\n";
-+ script << "@tc@ qdisc show dev " << eth0 << "\n";
-+ script << "@tc@ class show dev " << eth0 << "\n";
- }
-
- return script.str();
-diff --git i/src/slave/containerizer/mesos/isolators/posix/disk.cpp w/src/slave/containerizer/mesos/isolators/posix/disk.cpp
-index eb23025..db268ea 100644
---- i/src/slave/containerizer/mesos/isolators/posix/disk.cpp
-+++ w/src/slave/containerizer/mesos/isolators/posix/disk.cpp
-@@ -572,7 +572,7 @@ private:
- // NOTE: The supervisor childhook will watch the parent process and kill
- // the 'du' process in case that the parent die.
- Try s = subprocess(
-- "du",
-+ "@du@",
- command,
- Subprocess::PATH(os::DEV_NULL),
- Subprocess::PIPE(),
-diff --git i/src/slave/containerizer/mesos/isolators/volume/image.cpp w/src/slave/containerizer/mesos/isolators/volume/image.cpp
-index 35966aa..b62fc86 100644
---- i/src/slave/containerizer/mesos/isolators/volume/image.cpp
-+++ w/src/slave/containerizer/mesos/isolators/volume/image.cpp
-@@ -231,7 +231,7 @@ Future> VolumeImageIsolatorProcess::_prepare(
-
- CommandInfo* command = launchInfo.add_pre_exec_commands();
- command->set_shell(false);
-- command->set_value("mount");
-+ command->set_value("@mount@");
- command->add_arguments("mount");
- command->add_arguments("-n");
- command->add_arguments("--rbind");
-diff --git i/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp w/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
-index b321b86..8ed3e78 100644
---- i/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
-+++ w/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
-@@ -265,7 +265,7 @@ Future> VolumeSandboxPathIsolatorProcess::prepare(
-
- CommandInfo* command = launchInfo.add_pre_exec_commands();
- command->set_shell(false);
-- command->set_value("mount");
-+ command->set_value("@mount@");
- command->add_arguments("mount");
- command->add_arguments("-n");
- command->add_arguments("--rbind");
-diff --git i/src/slave/containerizer/mesos/provisioner/backends/copy.cpp w/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
-index 69faa03..01a3ed6 100644
---- i/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
-+++ w/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
-@@ -266,7 +266,7 @@ Future CopyBackendProcess::_provision(
- #endif // __APPLE__ || __FreeBSD__
-
- Try s = subprocess(
-- "cp",
-+ "@cp@",
- args,
- Subprocess::PATH(os::DEV_NULL),
- Subprocess::PATH(os::DEV_NULL),
-@@ -313,7 +313,7 @@ Future CopyBackendProcess::destroy(const string& rootfs)
- vector argv{"rm", "-rf", rootfs};
-
- Try s = subprocess(
-- "rm",
-+ "@rm@",
- argv,
- Subprocess::PATH(os::DEV_NULL),
- Subprocess::FD(STDOUT_FILENO),
-diff --git i/src/uri/fetchers/copy.cpp w/src/uri/fetchers/copy.cpp
-index 17f69be..831b08a 100644
---- i/src/uri/fetchers/copy.cpp
-+++ w/src/uri/fetchers/copy.cpp
-@@ -97,8 +97,8 @@ Future CopyFetcherPlugin::fetch(
- VLOG(1) << "Copying '" << uri.path() << "' to '" << directory << "'";
-
- #ifndef __WINDOWS__
-- const char* copyCommand = "cp";
-- const vector argv = {"cp", "-a", uri.path(), directory};
-+ const char* copyCommand = "@cp@";
-+ const vector argv = {"@cp@", "-a", uri.path(), directory};
- #else // __WINDOWS__
- const char* copyCommand = os::Shell::name;
- const vector argv =
-diff --git i/src/uri/fetchers/curl.cpp w/src/uri/fetchers/curl.cpp
-index f34daf2..6a50341 100644
---- i/src/uri/fetchers/curl.cpp
-+++ w/src/uri/fetchers/curl.cpp
-@@ -109,7 +109,7 @@ Future CurlFetcherPlugin::fetch(
- };
-
- Try s = subprocess(
-- "curl",
-+ "@curl@",
- argv,
- Subprocess::PATH(os::DEV_NULL),
- Subprocess::PIPE(),
-diff --git i/src/uri/fetchers/docker.cpp w/src/uri/fetchers/docker.cpp
-index 91db13b..82a7fc4 100644
---- i/src/uri/fetchers/docker.cpp
-+++ w/src/uri/fetchers/docker.cpp
-@@ -114,7 +114,7 @@ static Future curl(
-
- // TODO(jieyu): Kill the process if discard is called.
- Try s = subprocess(
-- "curl",
-+ "@curl@",
- argv,
- Subprocess::PATH(os::DEV_NULL),
- Subprocess::PIPE(),
-@@ -229,7 +229,7 @@ static Future download(
-
- // TODO(jieyu): Kill the process if discard is called.
- Try s = subprocess(
-- "curl",
-+ "@curl@",
- argv,
- Subprocess::PATH(os::DEV_NULL),
- Subprocess::PIPE(),
diff --git a/pkgs/applications/networking/cluster/mesos/rb36610.patch b/pkgs/applications/networking/cluster/mesos/rb36610.patch
deleted file mode 100644
index bee578cc3e931..0000000000000
--- a/pkgs/applications/networking/cluster/mesos/rb36610.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/linux/fs.cpp b/src/linux/fs.cpp
-index 913e233..c2917a6 100644
---- a/src/linux/fs.cpp
-+++ b/src/linux/fs.cpp
-@@ -17,6 +17,7 @@
- #include
- #include
- #include
-+#include
-
- #include
- #include
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 01dc86db97ab1..00b314b6cbbc3 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -11,15 +11,17 @@
buildGoModule rec {
pname = "minikube";
- version = "1.12.2";
+ version = "1.12.3";
- vendorSha256 = "0smjj2sq09k1ai79lk74gi056hfls7qy8x08wkq2g24fxi06cr94";
+ vendorSha256 = "014zgkh1l6838s5bmcxpvvyap96sd8ammrz5d7fncx0afik7zc4m";
+
+ doCheck = false;
src = fetchFromGitHub {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "1x28s6d2nibm76qd3kjsa7wkyhqvnwdy9rfwk9xf45hzrx9700sm";
+ sha256 = "0z8hinhx521rphcm0cd5lli5jy09lw1jw63q2a4fqlmhpw39qrj9";
};
nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];
diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix
index 652518d892a80..3ff0e4b397cf8 100644
--- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix
+++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix
@@ -2,17 +2,19 @@
buildGoModule rec {
pname = "node-problem-detector";
- version = "0.8.2";
+ version = "0.8.3";
src = fetchFromGitHub {
owner = "kubernetes";
repo = pname;
rev = "v${version}";
- sha256 = "0cphlaf9k2va879jgqd6fzdgkscpwg29j1cpr677i3zj3hfgaw1g";
+ sha256 = "1sga5l8bvqgm0j71yj3l1ykqvchxa7cg8pkfvjsrqlikgrfb54f3";
};
vendorSha256 = null;
+ doCheck = false;
+
# Optionally, a log counter binary can be created to parse journald logs.
# The binary is dynamically linked against systemd libraries, making it a
# Linux-only feature. See 'ENABLE_JOURNALD' upstream:
diff --git a/pkgs/applications/networking/cluster/nomad/0.11.nix b/pkgs/applications/networking/cluster/nomad/0.11.nix
new file mode 100644
index 0000000000000..9d0f2248ddc5a
--- /dev/null
+++ b/pkgs/applications/networking/cluster/nomad/0.11.nix
@@ -0,0 +1,6 @@
+{ callPackage }:
+
+callPackage ./generic.nix {
+ version = "0.11.4";
+ sha256 = "1sykp9sji6f564s7bz0cvnr9w5x92n0l1r1djf1bl7jvv2mi1mcb";
+}
diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix
new file mode 100644
index 0000000000000..ae131702df6ef
--- /dev/null
+++ b/pkgs/applications/networking/cluster/nomad/0.12.nix
@@ -0,0 +1,6 @@
+{ callPackage }:
+
+callPackage ./generic.nix {
+ version = "0.12.2";
+ sha256 = "1gc286ag6plk5kxw7jzr32cp3n5rwydj1z7rds1rfd0fyq7an404";
+}
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/generic.nix
similarity index 86%
rename from pkgs/applications/networking/cluster/nomad/default.nix
rename to pkgs/applications/networking/cluster/nomad/generic.nix
index 990679a86688e..0bfdb0b27f6e6 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/generic.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, version, sha256 }:
buildGoPackage rec {
pname = "nomad";
- version = "0.11.3";
+ inherit version;
rev = "v${version}";
goPackagePath = "github.com/hashicorp/nomad";
@@ -11,8 +11,7 @@ buildGoPackage rec {
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
- inherit rev;
- sha256 = "1p7g7x2gl77h1w7aip3xji3s530fj46gspargz4j3i6h4wkyvafb";
+ inherit rev sha256;
};
# ui:
diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix
index 94924822b1415..60e79ed6690a7 100644
--- a/pkgs/applications/networking/cluster/prow/default.nix
+++ b/pkgs/applications/networking/cluster/prow/default.nix
@@ -15,6 +15,8 @@ buildGoModule rec {
vendorSha256 = "16fdc5r28andm8my4fxj0f1yygx6j2mvn92i6xdfhbcra0lvr4ql";
+ doCheck = false;
+
subPackages = [
"prow/cmd/admission"
"prow/cmd/branchprotector"
diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix
index c75e48d97dbb9..508e0b656d6fe 100644
--- a/pkgs/applications/networking/cluster/qbec/default.nix
+++ b/pkgs/applications/networking/cluster/qbec/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "15hbjghi2ifylg7nr85qlk0alsy97h9zj6hf5w84m76dla2bcjf3";
+ doCheck = false;
+
buildFlagsArray = ''
-ldflags=
-s -w
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 162585851d0c6..53856ce9e2fea 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -1,6 +1,5 @@
{ stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils, hadoop
, RSupport? true, R
-, mesosSupport ? true, mesos
}:
with stdenv.lib;
@@ -12,12 +11,11 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
- sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g";
+ sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g";
};
buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
- ++ optional RSupport R
- ++ optional mesosSupport mesos;
+ ++ optional RSupport R;
untarDir = "${pname}-${version}-bin-without-hadoop";
installPhase = ''
@@ -37,8 +35,6 @@ stdenv.mkDerivation rec {
${optionalString RSupport
''export SPARKR_R_SHELL="${R}/bin/R"
export PATH=$PATH:"${R}/bin/R"''}
- ${optionalString mesosSupport
- ''export MESOS_NATIVE_LIBRARY="$MESOS_NATIVE_LIBRARY"''}
EOF
for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do
diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix
index 0835d268cd79b..c6f9217b35b88 100644
--- a/pkgs/applications/networking/cluster/ssm-agent/default.nix
+++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix
@@ -1,22 +1,56 @@
-{ stdenv, fetchFromGitHub, buildGoPackage }:
+{ stdenv, fetchFromGitHub, buildGoPackage, bash, makeWrapper }:
buildGoPackage rec {
pname = "amazon-ssm-agent";
- version = "2.0.633.0";
+ version = "2.3.1319.0";
goPackagePath = "github.com/aws/${pname}";
- subPackages = [ "agent" ];
+ subPackages = [
+ "agent"
+ "agent/framework/processor/executer/outofproc/worker"
+ "agent/framework/processor/executer/outofproc/worker"
+ "agent/framework/processor/executer/outofproc/sessionworker"
+ "agent/session/logging"
+ "agent/cli-main"
+ ];
+
+ buildInputs = [ makeWrapper ];
src = fetchFromGitHub {
- rev = "v${version}";
+ rev = version;
owner = "aws";
repo = pname;
- sha256 = "10arshfn2k3m3zzgw8b3xc6ywd0ss73746nq5srh2jir7mjzi4xv";
+ sha256 = "1yiyhj7ckqa32b1rnbwn7zx89rsj00m5imn1xlpsw002ywxsxbnv";
};
preBuild = ''
mv go/src/${goPackagePath}/vendor strange-vendor
mv strange-vendor/src go/src/${goPackagePath}/vendor
+
+ cd go/src/${goPackagePath}
+ echo ${version} > VERSION
+
+ substituteInPlace agent/plugins/inventory/gatherers/application/dataProvider.go \
+ --replace '"github.com/aws/amazon-ssm-agent/agent/plugins/configurepackage/localpackages"' ""
+
+ go run agent/version/versiongenerator/version-gen.go
+ substituteInPlace agent/appconfig/constants_unix.go \
+ --replace /usr/bin/ssm-document-worker $bin/bin/ssm-document-worker \
+ --replace /usr/bin/ssm-session-worker $bin/bin/ssm-session-worker \
+ --replace /usr/bin/ssm-session-logger $bin/bin/ssm-session-logger
+ cd -
+ '';
+
+ postBuild = ''
+ mv go/bin/agent go/bin/amazon-ssm-agent
+ mv go/bin/worker go/bin/ssm-document-worker
+ mv go/bin/sessionworker go/bin/ssm-session-worker
+ mv go/bin/logging go/bin/ssm-session-logger
+ mv go/bin/cli-main go/bin/ssm-cli
+ '';
+
+ postInstall = ''
+ wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bash}/bin
'';
meta = with stdenv.lib; {
@@ -24,7 +58,6 @@ buildGoPackage rec {
homepage = "https://github.com/aws/amazon-ssm-agent";
license = licenses.asl20;
platforms = platforms.unix;
- maintainers = with maintainers; [ copumpkin ];
+ maintainers = with maintainers; [ copumpkin manveru ];
};
}
-
diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix
new file mode 100644
index 0000000000000..1793af1085a9c
--- /dev/null
+++ b/pkgs/applications/networking/cluster/tanka/default.nix
@@ -0,0 +1,34 @@
+{ buildGoModule, fetchFromGitHub, lib, installShellFiles }:
+
+buildGoModule rec {
+ pname = "tanka";
+ version = "0.11.1";
+
+ src = fetchFromGitHub {
+ owner = "grafana";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0hp10qgalglsdhh6z6v4azh2hsr89mdrv1g5lssfl5jyink409yd";
+ };
+
+ vendorSha256 = "15x8fqz2d2793ivgxpd9jyr34njzi1xpyxdlfyj1b01n2vr3xg4m";
+
+ doCheck = false;
+
+ buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ echo "complete -C $out/bin/tk tk" > tk.bash
+ installShellCompletion tk.bash
+ '';
+
+ meta = with lib; {
+ description = "Flexible, reusable and concise configuration for Kubernetes";
+ homepage = "https://github.com/grafana/tanka/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ mikefaille ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix
index 38fbd1b428656..72e717d916623 100644
--- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix
@@ -21,7 +21,6 @@ buildGoPackage rec {
meta = with stdenv.lib; {
homepage = "https://github.com/adammck/terraform-inventory";
description = "Terraform state to ansible inventory adapter";
- platforms = platforms.all;
license = licenses.mit;
maintainers = with maintainers; [ htr ];
};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 1952aac880219..686b9ef95007f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -140,8 +140,9 @@ let
# Packages that don't fit the default model
ansible = callPackage ./ansible {};
- gandi = callPackage ./gandi {};
elasticsearch = callPackage ./elasticsearch {};
+ gandi = callPackage ./gandi {};
+ keycloak = callPackage ./keycloak {};
libvirt = callPackage ./libvirt {};
lxd = callPackage ./lxd {};
shell = callPackage ./shell {};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
index 4a3d0bc16b3ac..6eaaa05106d12 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
@@ -12,6 +12,8 @@ buildGoModule rec {
vendorSha256 = "1rdvyypdl3fk6af66gfjhyl271cnlx5xgrl1w68sc6sbvq00bqkd";
+ doCheck = false;
+
subPackages = [ "." ];
# Terraform allow checking the provider versions, but this breaks
diff --git a/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix b/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix
new file mode 100644
index 0000000000000..0fc717bda76eb
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, fetchFromGitHub
+, buildGoModule
+}:
+
+buildGoModule rec {
+ name = "terraform-provider-keycloak-${version}";
+ version = "1.20.0";
+
+ src = fetchFromGitHub {
+ owner = "mrparkers";
+ repo = "terraform-provider-keycloak";
+ rev = version;
+ sha256 = "1h8780k8345pf0s14k1pmwdjbv2j08h4rq3jwds81mmv6qgj1r2n";
+ };
+
+ vendorSha256 = "12iary7p5qsbl4xdhfd1wh92mvf2fiylnb3m1d3m7cdcn32rfimq";
+
+ doCheck = false;
+
+ postInstall = "mv $out/bin/terraform-provider-keycloak{,_v${version}}";
+
+ meta = with stdenv.lib; {
+ description = "Terraform provider for keycloak";
+ homepage = "https://github.com/mrparkers/terraform-provider-keycloak";
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ eonpatapon ];
+ };
+
+}
diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
index 217dacc0ef7eb..d64178b1e6585 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "1shdpl1zsbbpc3mfs0l65ykq2h15ggvqylaixcap4j4lfl7m9my0";
+ doCheck = false;
+
postBuild = "mv ../go/bin/terraform-provider-lxd{,_v${version}}";
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix
index 2da6ae9e73203..c0ee431fa4057 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix
@@ -12,6 +12,8 @@ buildGoModule rec {
vendorSha256 = "1p2ja6cw3dl7mx41svri6frjpgb9pxsrl7sq0rk1d3sviw0f88sg";
+ doCheck = false;
+
subPackages = [ "." ];
# Terraform allows checking the provider versions, but this breaks
diff --git a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix
index 2832580287b11..a4167d2b099ef 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix
@@ -12,6 +12,8 @@ buildGoModule rec {
vendorSha256 = "0j90fnzba23mwf9bzf9w5h0hszkl3h61p5i780s9v9c0hbzhbqsh";
+ doCheck = false;
+
subPackages = [ "." ];
# Terraform allow checking the provider versions, but this breaks
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 74aa881c999ca..f29508ffe3800 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -132,8 +132,8 @@ in rec {
});
terraform_0_13 = pluggable (generic {
- version = "0.13.0-rc1";
- sha256 = "1lja2s9viz5ja40qmlf49p6hk3rwdz6q0rw3ff1894b464zbsnk2";
+ version = "0.13.2";
+ sha256 = "04pm57l29j3ai6dvh2343q4yhskkxqj8ayr2hdw2qqjch52p8mrw";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 4ba54dbb8c71c..14744f188b0bc 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,16 +2,18 @@
buildGoModule rec {
pname = "terragrunt";
- version = "0.23.32";
+ version = "0.23.33";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
- sha256 = "1pa3k0hjdb5bj0bp4aj3lfcgz98l3wd9kfa12rn9zzbcmp087kih";
+ sha256 = "0fsyvmdg2llnzy0yzmiihnb865ccq2sn6d3i935dflppnjyp01p4";
};
- vendorSha256 = "1xn7c6y32vpanqvf1sfpw6bs73dbjniavjbf00j0vx83bfyklsr4";
+ vendorSha256 = "05p72l724qqf61dn0frahf4awvkkcw8cpl6nhwlacd1jw8c14fjl";
+
+ doCheck = false;
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index 13f2c3d9bd9e4..c3ec58df35d4a 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -1,24 +1,23 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "tilt";
/* Do not use "dev" as a version. If you do, Tilt will consider itself
- running in development environment and try to serve assets from the
- source tree, which is not there once build completes. */
- version = "0.11.3";
+ running in development environment and try to serve assets from the
+ source tree, which is not there once build completes. */
+ version = "0.17.2";
src = fetchFromGitHub {
- owner = "windmilleng";
+ owner = "tilt-dev";
repo = pname;
rev = "v${version}";
- sha256 = "035czgr0rn6gcv24vnlr35n9yvy0fwq4spdzsc76gfxckcbcmzz0";
+ sha256 = "0wiqnlam4f7085n3djvb5phhvw9df61bj8w6c5rcpffykg33vhmi";
};
-
- goPackagePath = "github.com/windmilleng/tilt";
+ vendorSha256 = null;
subPackages = [ "cmd/tilt" ];
- buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2020-01-25");
+ buildFlagsArray = [ "-ldflags=-X main.version=${version}" ];
meta = with stdenv.lib; {
description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production";
diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix
index 92af28c9c93be..896904b0cac2d 100644
--- a/pkgs/applications/networking/feedreaders/newsflash/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix
@@ -19,16 +19,16 @@
rustPlatform.buildRustPackage rec {
pname = "newsflash";
- version = "1.0.2";
+ version = "1.0.5";
src = fetchFromGitLab {
owner = "news-flash";
repo = "news_flash_gtk";
rev = version;
- sha256 = "17a8fd5rhs56qrqlfj9ckv45hwfcjhdb8j4cxlnvy7s770s225gd";
+ sha256 = "0kh1xqvxfz58gnrl8av0zkig9vcgmx9iaxw5p6gdm8a7gv18nvp3";
};
- cargoSha256 = "1p0m7la59fn9r2rr26q9mfd1nvyvxb630qiwj96x91p77xv1i30i";
+ cargoSha256 = "059sppidbxzjk8lmjq41d5qbymp9j9v2qr0jxd7xg9avr0klwc2s";
patches = [
./no-post-install.patch
@@ -65,7 +65,7 @@ rustPlatform.buildRustPackage rec {
# SVG support for gdk-pixbuf
librsvg
] ++ (with gst_all_1; [
- # Audio & video & support for webkitgtk WebView
+ # Audio & video support for webkitgtk WebView
gstreamer
gst-plugins-base
gst-plugins-good
@@ -84,6 +84,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://gitlab.com/news-flash/news_flash_gtk";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ metadark ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix
index b852eb02feca1..977b71ebc50d2 100644
--- a/pkgs/applications/networking/feedreaders/rss2email/default.nix
+++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix
@@ -4,14 +4,14 @@ with pythonPackages;
buildPythonApplication rec {
pname = "rss2email";
- version = "3.12.1";
+ version = "3.12.2";
propagatedBuildInputs = [ feedparser html2text ];
checkInputs = [ beautifulsoup4 ];
src = fetchurl {
url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz";
- sha256 = "0zqpibh31rl6xlfw9y66d9hfhwrnzy5cjzbksczyw3lh4dfzsql0";
+ sha256 = "12w6x80wsw6xm17fxyymnl45aavsagg932zw621wcjz154vjghjr";
};
outputs = [ "out" "man" "doc" ];
diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix
index c6e8ab5c887b1..16b2b7454bf5f 100644
--- a/pkgs/applications/networking/firehol/default.nix
+++ b/pkgs/applications/networking/firehol/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://firehol.org/";
license = licenses.gpl2;
- maintainers = with maintainers; [ geistesk ];
+ maintainers = with maintainers; [ oxzi ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/applications/networking/firehol/iprange.nix
index e47afba02945e..75b4d5b40a6b2 100644
--- a/pkgs/applications/networking/firehol/iprange.nix
+++ b/pkgs/applications/networking/firehol/iprange.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
description = "manage IP ranges";
homepage = "https://github.com/firehol/iprange";
license = licenses.gpl2;
- maintainers = with maintainers; [ geistesk ];
+ maintainers = with maintainers; [ oxzi ];
};
}
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 7e69158288157..c599879614547 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FlexGet";
- version = "3.1.59";
+ version = "3.1.67";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "19vp2395sl6gdv54zn0k4vf1j6b902khvm44q5hfr805jd3fc11h";
+ sha256 = "d3f4b7bebff80a3a3aa00daf60145a6bc3d12847d7339b39846b2341bca75ef3";
};
postPatch = ''
@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
flask-cors
flask_login
flask-restful
- flask-restplus
+ flask-restx
flask
guessit
html5lib
diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix
index 1be44cbb25029..a32da469719be 100644
--- a/pkgs/applications/networking/gmailctl/default.nix
+++ b/pkgs/applications/networking/gmailctl/default.nix
@@ -16,6 +16,8 @@ buildGoModule rec {
vendorSha256 = "0qp8n7z3vcsbc6safp7i18i0i3r4hy4nidzwl85i981sg12vcg6b";
+ doCheck = false;
+
meta = with stdenv.lib; {
description = "Declarative configuration for Gmail filters";
homepage = "https://github.com/mbrt/gmailctl";
diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix
index cdccdddbf3847..cf872b77b8d14 100644
--- a/pkgs/applications/networking/hydroxide/default.nix
+++ b/pkgs/applications/networking/hydroxide/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "1r5qg5cx48yw1l5nil28y4a82fc7g52jmy9pckaxygppmmn539pc";
+ doCheck = false;
+
subPackages = [ "cmd/hydroxide" ];
meta = with lib; {
diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
index 8fe856f9773f7..a0e6433a2028f 100644
--- a/pkgs/applications/networking/ids/zeek/default.nix
+++ b/pkgs/applications/networking/ids/zeek/default.nix
@@ -1,19 +1,35 @@
-{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, zlib, file, curl
-, libmaxminddb, gperftools, python, swig, fetchpatch }:
+{ stdenv
+, fetchurl
+, cmake
+, flex
+, bison
+, openssl
+, libpcap
+, zlib
+, file
+, curl
+, libmaxminddb
+, gperftools
+, python
+, swig
+, gettext
+, fetchpatch
+}:
let
preConfigure = (import ./script.nix);
in
stdenv.mkDerivation rec {
pname = "zeek";
- version = "3.1.2";
+ version = "3.2.0";
src = fetchurl {
url = "https://download.zeek.org/zeek-${version}.tar.gz";
- sha256 = "18aa4pfwav8m6vq7cr4bhfg243da54ak933rqbriljnhsrgp4n0q";
+ sha256 = "0ky4485z0gpaj1z75y7jr5bn9wr8x8w3v637aqq4v9a0a5iyagmg";
};
nativeBuildInputs = [ cmake flex bison file ];
- buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig ];
+ buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ gettext ];
#see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files.
inherit preConfigure;
@@ -24,8 +40,8 @@ stdenv.mkDerivation rec {
# Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604
(fetchpatch {
url = "https://github.com/pybind/pybind11/commit/759221f5c56939f59d8f342a41f8e2d2cacbc8cf.patch";
- sha256 = "0l8z7d7chq1awd8dnfarj4c40wx36hkhcan0702p5l89x73wqk54";
- extraPrefix = "aux/broker/bindings/python/3rdparty/pybind11/";
+ sha256 = "17qznp8yavnv84fjsbghv3d59z6k6rx74j49w0izakmgw5a95w84";
+ extraPrefix = "auxil/broker/bindings/python/3rdparty/pybind11/";
stripLen = 1;
})
];
diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index 0143e401c194c..f8bcdc4bef7cb 100644
--- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -1,4 +1,5 @@
{ stdenv
+, lib
, fetchurl
, rpmextract
, libnotify
@@ -62,7 +63,7 @@ stdenv.mkDerivation rec {
expat
gdk-pixbuf
dbus
- udev.lib
+ (lib.getLib udev)
freetype
nspr
glib
diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
index 553b466b12f9c..8fd0128ef2ca3 100644
--- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
+++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
@@ -2,12 +2,12 @@
mkDerivation rec {
pname = "chatterino2";
- version = "unstable-2019-05-11";
+ version = "2.1.7";
src = fetchFromGitHub {
owner = "fourtf";
repo = pname;
- rev = "8c46cbf571dc8fd77287bf3186445ff52b1d1aaf";
- sha256 = "0i2385hamhd9i7jdy906cfrd81cybw524j92l87c8pzrkxphignk";
+ rev = "v${version}";
+ sha256 = "0bbdzainfa7hlz5p0jfq4y04i3wix7z3i6w193906bi4gr9wilpg";
fetchSubmodules = true;
};
nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
diff --git a/pkgs/applications/networking/instant-messengers/cordless/default.nix b/pkgs/applications/networking/instant-messengers/cordless/default.nix
new file mode 100644
index 0000000000000..a262b04874646
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/cordless/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "cordless";
+ version = "2020-08-30";
+
+ src = fetchFromGitHub {
+ owner = "Bios-Marcel";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-CwOI7Ah4+sxD9We+Va5a6jYat5mjOeBk2EsOfwskz6k=";
+ };
+
+ subPackages = [ "." ];
+
+ vendorSha256 = "sha256-01I7GrZkaskuz20kVK2YwqvP7ViPMlQ3BFaoLHwgvOE=";
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/Bios-Marcel/cordless";
+ description = "Discord terminal client";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ colemickens ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index b10e2ed1a1db3..eadf90a0bae4d 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
- version = "0.0.106";
+ version = "0.0.111";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
- sha256 = "1bqlf7iixdy6c7lhbva4lizvhd6w0xqn69izxcy26wk35xcqgfh8";
+ sha256 = "0ngmb40pwfwydvxyfby89yp17lsvmv642jci9b12cyc3hlkf85n4";
};
};
}.${branch}
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index 148e06fa88e58..610cb328d6627 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
- "version": "1.7.3",
+ "version": "1.7.5",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -61,7 +61,7 @@
},
"build": {
"appId": "im.riot.app",
- "electronVersion": "9.0.5",
+ "electronVersion": "9.1.2",
"files": [
"package.json",
{
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index 4bcde89fefea4..46e859076bee4 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -8,12 +8,12 @@
let
executableName = "element-desktop";
- version = "1.7.2";
+ version = "1.7.5";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
- sha256 = "1b3ckmqbhbkfghlkckb3ixr4i2pzdisz6pi929q5qj91f3ihxv4x";
+ sha256 = "0781yg15bzkw5bpfzbdkqix239djgsc7kjdvbilv1d1xxqz3462y";
};
electron = electron_9;
diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix
index 03990f166ae0b..1ed5a6261f1a0 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
- version = "1.7.3";
+ version = "1.7.5";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "0vlh89kilnpg90kdxlikfak03zdwhwj754xskgb27jal0iaw0r8s";
+ sha256 = "07qc4hymdp1r2zn9gsgkpwxf6knk6xr88dc3iihlhipmlk46m58b";
};
installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index a516c0a251d19..2abd733b27763 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -9,7 +9,7 @@
, rustc
, python3
, rustPlatform
-, pkgconfig
+, pkg-config
, gtksourceview4
, glib
, libhandy
@@ -26,24 +26,24 @@
rustPlatform.buildRustPackage rec {
pname = "fractal";
- version = "4.2.2";
+ version = "4.4.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "fractal";
rev = version;
- sha256 = "0r98km3c8naj3mdr1wppzj823ir7jnsia7r3cbg3vsq8q52i480r";
+ sha256 = "DSNVd9YvI7Dd3s3+M0+wE594tmL1yPNMnD1W9wLhSuw=";
};
- cargoSha256 = "10fgw9m6gdazrca73g43sgvsghhac7xc3bg7hr0vpynzqyfigwa9";
+ cargoSha256 = "xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc=";
nativeBuildInputs = [
cargo
gettext
meson
ninja
- pkgconfig
+ pkg-config
python3
rustc
wrapGAppsHook
diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix
index d1206cdf9b256..3f05e3d7a5d3e 100644
--- a/pkgs/applications/networking/instant-messengers/franz/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix
@@ -1,4 +1,5 @@
{ stdenv
+, lib
, makeWrapper
, wrapGAppsHook
, autoPatchelfHook
@@ -64,7 +65,7 @@ stdenv.mkDerivation {
expat
stdenv.cc.cc
];
- runtimeDependencies = [ udev.lib libnotify ];
+ runtimeDependencies = [ (lib.getLib udev) libnotify ];
unpackPhase = "dpkg-deb -x $src .";
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 930d288c365fc..2ee017dfdbaf3 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -2,12 +2,13 @@
# Native dependencies
, python3, gtk3, gobject-introspection, gnome3
+, glib-networking
# Test dependencies
, xvfb_run, dbus
# Optional dependencies
-, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly, libnice
+, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-good, libnice
, enableE2E ? true
, enableSecrets ? true, libsecret
, enableRST ? true, docutils
@@ -19,32 +20,33 @@
python3.pkgs.buildPythonApplication rec {
pname = "gajim";
- majorVersion = "1.1";
- version = "${majorVersion}.3";
+ version = "1.2.2";
src = fetchurl {
- url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2";
- sha256 = "0bzxwcpdd4ydh6d6mzpr0gxwhcb0x9ympk55fpvm1hcw9d28a716";
+ url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
+ sha256 = "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx";
};
- postPatch = ''
- # This test requires network access
- echo "" > test/integration/test_resolver.py
- '';
-
buildInputs = [
- gobject-introspection gtk3 gnome3.adwaita-icon-theme wrapGAppsHook
- ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly libnice ]
+ gobject-introspection gtk3 gnome3.adwaita-icon-theme
+ glib-networking
+ ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ]
++ lib.optional enableSecrets libsecret
++ lib.optional enableSpelling gspell
++ lib.optional enableUPnP gupnp-igd;
nativeBuildInputs = [
- gettext
+ gettext wrapGAppsHook
];
+ dontWrapGApps = true;
+
+ preFixup = ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
+
propagatedBuildInputs = with python3.pkgs; [
- nbxmpp pyasn1 pygobject3 dbus-python pillow cssutils precis-i18n keyring setuptools
+ nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools
] ++ lib.optionals enableE2E [ pycrypto python-gnupg ]
++ lib.optional enableRST docutils
++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
diff --git a/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/pkgs/applications/networking/instant-messengers/go-neb/default.nix
index 769e5cf55159e..04418dc64fcfe 100644
--- a/pkgs/applications/networking/instant-messengers/go-neb/default.nix
+++ b/pkgs/applications/networking/instant-messengers/go-neb/default.nix
@@ -16,6 +16,8 @@ buildGoModule {
vendorSha256 = "1k3980yf6zl00dkd1djwhm2f9nnffzrsbs3kq3alpw2gm0aln739";
+ doCheck = false;
+
passthru.tests.go-neb = nixosTests.go-neb;
meta = with lib; {
diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index c2402f989333d..8df4e4b3ea35b 100644
--- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -4,8 +4,6 @@ buildGoModule rec {
pname = "gomuks";
version = "0.1.2";
- goPackagePath = "maunium.net/go/gomuks";
-
src = fetchFromGitHub {
owner = "tulir";
repo = pname;
@@ -15,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "11rk7pma6dr6fsyz8hpjyr7nc2c7ichh5m7ds07m89gzk6ar55gb";
+ doCheck = false;
+
buildInputs = [ olm ];
postInstall = ''
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index dad995b25578f..63bcc58ac3ebf 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
comment = "VoIP and Instant Messaging client";
desktopName = "Jitsi";
genericName = "Instant Messaging";
- categories = "X-Internet;";
+ categories = "Chat";
};
libPath = lib.makeLibraryPath ([
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
index e477bdfe2fd41..07b16b9199620 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
+++ b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
@@ -11,7 +11,7 @@
# Get architecture
ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/`
-@@ -6,7 +11,9 @@
+@@ -6,10 +11,12 @@
# Additionnal JVM arguments
CLIENTARGS=""
diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix
new file mode 100644
index 0000000000000..1101d6f9b06ea
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix
@@ -0,0 +1,57 @@
+{ lib, mkDerivation, fetchFromGitHub
+, qmake, pkgconfig, olm, wrapQtAppsHook
+, qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects
+, python3Packages, pyotherside
+}:
+
+let
+ pypkgs = with python3Packages; [
+ aiofiles filetype matrix-nio appdirs cairosvg
+ pymediainfo setuptools html-sanitizer mistune blist
+ pyotherside
+ ];
+in
+mkDerivation rec {
+ pname = "mirage";
+ version = "0.5.2";
+
+ src = fetchFromGitHub {
+ owner = "mirukana";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0i891fafdncdz1xg6nji80jb86agsrbdvai9nwf1yy126q7piryv";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ pkgconfig qmake wrapQtAppsHook python3Packages.wrapPython ];
+
+ buildInputs = [
+ qtbase qtmultimedia
+ qtquickcontrols2
+ qtkeychain qtgraphicaleffects
+ olm pyotherside
+ ];
+
+ propagatedBuildInputs = pypkgs;
+
+ pythonPath = pypkgs;
+
+ qmakeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+ dontWrapQtApps = true;
+ postInstall = ''
+ buildPythonPath "$out $pythonPath"
+ wrapProgram $out/bin/mirage \
+ --prefix PYTHONPATH : "$PYTHONPATH" \
+ "''${qtWrapperArgs[@]}"
+ '';
+
+ meta = with lib; {
+ description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication.";
+ homepage = "https://github.com/mirukana/mirage";
+ license = licenses.lgpl3;
+ maintainers = with maintainers; [ colemickens ];
+ inherit (qtbase.meta) platforms;
+ inherit version;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
index d58688565fdf8..a751501376ff5 100644
--- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
@@ -10,7 +10,7 @@
buildPythonApplication rec {
pname = "pantalaimon";
- version = "0.6.5";
+ version = "0.7.0";
disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonApplication rec {
owner = "matrix-org";
repo = pname;
rev = version;
- sha256 = "1pjrq71fkpvsc79nwhxhwjkqvqhj5wsnnwvsgslghaajdaw3n6wd";
+ sha256 = "0cx8sqajf5lh8w61yy1l6ry67rv1b45xp264zkw3s7ip80i4ylb2";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
index cae84c054e89f..7bb2517a1887a 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pidgin-skypeweb";
- version = "1.5";
+ version = "1.6";
src = fetchFromGitHub {
owner = "EionRobb";
repo = "skype4pidgin";
rev = version;
- sha256 = "1bd9gd36yhrbrww0dvai9rnzxxj1c9sb4003c72wg27w12y47xfv";
+ sha256 = "1q3m8hyr77mxm4y0zify2xhjp9d8y4pgwvqyfly4zcpmyd2argi1";
};
setSourceRoot = ''
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 86e760d497ce5..52172bd8be778 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl
, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid
-, cmocka, libmicrohttpd, stabber, expat, libmesode
+, cmocka, libmicrohttpd, expat, sqlite, libmesode
, autoconf-archive
, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
@@ -22,16 +22,18 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "profanity";
- version = "0.8.1";
+ version = "0.9.5";
src = fetchFromGitHub {
owner = "profanity-im";
repo = "profanity";
rev = version;
- sha256 = "0fg5xcdlvhsi7a40w4jcxyj7m7wl42jy1cvsa8fi2gb6g9y568k8";
+ sha256 = "14vbblf639f90bb4npg2xv53cpvk9am9ic4pmc1vnv4m3zsndjg5";
};
- patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ];
+ patches = [
+ ./patches/packages-osx.patch
+ ];
enableParallelBuilding = true;
@@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [
expect readline libuuid glib openssl expat ncurses libotr
- curl libmesode cmocka libmicrohttpd stabber
+ curl libmesode cmocka libmicrohttpd sqlite
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
++ optionals notifySupport [ libnotify gdk-pixbuf ]
++ optionals traySupport [ gnome2.gtk ]
diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch b/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch
deleted file mode 100644
index 9ef4e7bebe547..0000000000000
--- a/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 1e55b1cc..0832a387 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -83,12 +81,12 @@ elif test "x$enable_python_plugins" != xno; then
- AM_CONDITIONAL([BUILD_PYTHON_API], [true])
- AC_DEFINE([HAVE_PYTHON], [1], [Python support])
- else
-- if test "x$enable_python_plugins" = xyes; then
-- AC_MSG_ERROR([Python not found, cannot enable Python plugins.])
-- else
-- AM_CONDITIONAL([BUILD_PYTHON_API], [false])
-- AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.])
-- fi
-+ AS_IF(
-+ [test "x$enable_python_plugins" = xyes],
-+ [],
-+ [AM_CONDITIONAL([BUILD_PYTHON_API], [false])
-+ AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.])]
-+ )
- fi
- AS_IF([test "x$PLATFORM" = xosx], [rm -f Python.framework])
- else
-@@ -107,7 +105,7 @@ else
- [AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])],
- [AS_IF(
- [test "x$enable_c_plugins" = xyes],
-- [AC_MSG_ERROR([dl library needed to run C plugins])],
-+ [],
- [AM_CONDITIONAL([BUILD_C_API], [false])])
- ])
- else
-@@ -116,7 +114,6 @@ else
- fi
-
- # threading
--ACX_PTHREAD([], [AC_MSG_ERROR([pthread is required])])
- LIBS="$PTHREAD_LIBS $LIBS"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- AS_IF([test "x$PTHREAD_CC" != x], [ CC="$PTHREAD_CC" ])
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index ba10ab1626760..430a7cc4ca778 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "psi-plus";
- version = "1.4.1407";
+ version = "1.4.1473";
src = fetchFromGitHub {
owner = "psi-plus";
repo = "psi-plus-snapshots";
rev = version;
- sha256 = "0gp5rk7km2fzw109wil6s9x49x5q1qbw9mnkjs58dpzvxn74ylhw";
+ sha256 = "03f28zwbjn6fnsm0fqg8lmc11rpfdfvzjf7k7xydc3lzy8pxbds5";
};
cmakeFlags = [
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 6bf3efa536407..e6f80de821f49 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook
+{ stdenv, lib, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook
, libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify, wrapGAppsHook
}:
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ];
buildInputs = [ libXtst libXScrnSaver gtk3 nss alsaLib ];
- runtimeDependencies = [ udev.lib libnotify ];
+ runtimeDependencies = [ (lib.getLib udev) libnotify ];
unpackPhase = "dpkg-deb -x $src .";
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 90e2b201ebbe1..c4eef754cd427 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -2,7 +2,9 @@
, gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig
, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
-, cups, expat, systemd, libnotify, libuuid, at-spi2-core, libappindicator-gtk3
+, cups, expat, libuuid, at-spi2-core, libappindicator-gtk3
+# Runtime dependencies:
+, systemd, libnotify, libdbusmenu
# Unfortunately this also overwrites the UI language (not just the spell
# checking language!):
, hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE"
@@ -23,7 +25,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
- version = "1.34.5"; # Please backport all updates to the stable channel.
+ version = "1.35.1"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -33,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "1s8nksrkfivsf9r460ifxsf8l7bnc1zix5yj39kvnx0mbync8lg1";
+ sha256 = "1nxj7h8yrp2sbxxd49q9xdh1zsqixcd01i83lr492f4322cg1yjf";
};
nativeBuildInputs = [
@@ -79,8 +81,9 @@ in stdenv.mkDerivation rec {
];
runtimeDependencies = [
- systemd.lib
+ (lib.getLib systemd)
libnotify
+ libdbusmenu
];
unpackPhase = "dpkg-deb -x $src .";
diff --git a/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix b/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix
index fda83066a843f..5806a269104bc 100644
--- a/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix
@@ -20,6 +20,5 @@ buildGoPackage rec {
homepage = "https://github.com/shazow/ssh-chat";
license = licenses.mit;
maintainers = with maintainers; [ luc65r ];
- platforms = platforms.all;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix
index e3b664e5fc231..d58e27cc62bb8 100644
--- a/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
];
runtimeDependencies = [
- systemd.lib
+ (lib.getLib systemd)
pulseaudio
];
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 3f5b0811a0f32..7e932d74abc5e 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -19,12 +19,12 @@ with lib;
mkDerivation rec {
pname = "telegram-desktop";
- version = "2.2.0";
+ version = "2.3.0";
# Telegram-Desktop with submodules
src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
- sha256 = "1chikb02df4qqnickcmx96lcx481b14kmksjsp7h94g0d223ypq0";
+ sha256 = "0yga4p36jrc5m3d8q2y2g0505c2v540w5hgcscapl4xj9hyb21dw";
};
postPatch = ''
@@ -52,14 +52,15 @@ mkDerivation rec {
cmakeFlags = [
"-Ddisable_autoupdate=ON"
- # TODO: Officiall API credentials for Nixpkgs
- # (see: https://github.com/NixOS/nixpkgs/issues/55271):
- "-DTDESKTOP_API_TEST=ON"
+ # We're allowed to used the API ID of the Snap package:
+ "-DTDESKTOP_API_ID=611335"
+ "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c"
"-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF"
"-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF"
"-DDESKTOP_APP_USE_PACKAGED_GSL=OFF"
"-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON"
"-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF"
+ "-DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION=ON"
#"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""'
"-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default
];
diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
index bece4e467a357..2910c389daace 100644
--- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, rpmextract, autoPatchelfHook
+{ stdenv, lib, fetchurl, rpmextract, autoPatchelfHook
, xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify
, wrapGAppsHook }:
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
]) ++ [
gtk3 nss alsaLib
];
- runtimeDependencies = [ udev.lib libnotify ];
+ runtimeDependencies = [ (lib.getLib udev) libnotify ];
unpackPhase = ''
rpmextract $src
diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
index 1cd2df4c7ac11..bdc8aabf61cf7 100644
--- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
@@ -40,7 +40,7 @@ in stdenv.mkDerivation {
alsaLib gtk3 nss
];
- runtimeDependencies = [ udev.lib libnotify ];
+ runtimeDependencies = [ (getLib udev) libnotify ];
installPhase = ''
mkdir -p $out/bin $out/opt/wavebox
diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 532eeb1d03879..48eb1ef202c04 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -5,6 +5,7 @@
, makeDesktopItem
, makeWrapper
, stdenv
+, lib
, udev
, wrapGAppsHook
, cpio
@@ -107,7 +108,7 @@ let
'';
runtimeDependencies = [
- udev.lib
+ (lib.getLib udev)
];
postFixup = ''
diff --git a/pkgs/applications/networking/instant-messengers/ytalk/default.nix b/pkgs/applications/networking/instant-messengers/ytalk/default.nix
new file mode 100644
index 0000000000000..8cb22aabc69bf
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/ytalk/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+ pname = "ytalk";
+ version = "3.3.0";
+
+ src = fetchurl {
+ url = "ftp://ftp.ourproject.org/pub/ytalk/${pname}-${version}.tar.gz";
+ sha256 = "1d3jhnj8rgzxyxjwfa22vh45qwzjvxw1qh8fz6b7nfkj3zvk9jvf";
+ };
+
+ buildInputs = [ ncurses ];
+
+ meta = {
+ homepage = "http://ytalk.ourproject.org";
+ description = "A terminal based talk client";
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ taeer ];
+ license = stdenv.lib.licenses.gpl2Plus;
+ };
+}
diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix
index 261e1e718a5a8..09ab75aae94cc 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@@ -7,6 +7,8 @@ buildGoModule rec {
vendorSha256 = "00fkyxxi4iz16v0j33270x8qrspqpsv9j6csnikjy0klyb038pfq";
+ doCheck = false;
+
src = fetchFromGitHub {
owner = "ipfs";
repo = "ipfs-cluster";
diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix
index c4c893f699cb5..4b1d1213b015a 100644
--- a/pkgs/applications/networking/ipfs-migrator/default.nix
+++ b/pkgs/applications/networking/ipfs-migrator/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = null;
+ doCheck = false;
+
subPackages = [ "." ];
meta = with lib; {
diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix
index d137fcf296fac..f16031e9dc826 100644
--- a/pkgs/applications/networking/ipget/default.nix
+++ b/pkgs/applications/networking/ipget/default.nix
@@ -13,6 +13,8 @@ buildGoModule rec {
vendorSha256 = "0vy21pdqk6q5fw7wlcv51myhh9y79n2qhvy61rmblwhxlrkh6sdv";
+ doCheck = false;
+
meta = with stdenv.lib; {
description = "Retrieve files over IPFS and save them locally";
homepage = "https://ipfs.io/";
diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix
index 6adcaa7b3d6a2..7a30737c04712 100644
--- a/pkgs/applications/networking/irc/convos/default.nix
+++ b/pkgs/applications/networking/irc/convos/default.nix
@@ -6,13 +6,13 @@ with stdenv.lib;
perlPackages.buildPerlPackage rec {
pname = "convos";
- version = "4.29";
+ version = "4.33";
src = fetchFromGitHub {
owner = "Nordaaker";
repo = pname;
rev = version;
- sha256 = "07m9lhwgqq77hi4n2zrya7n8apkjv8xi166bxa0n7pnlknlp74ar";
+ sha256 = "0mxq4jpjk4vvhi5lqslj614dvk84iq12rsdyykxr8h9cnjjs57im";
};
nativeBuildInputs = [ makeWrapper ]
@@ -33,6 +33,10 @@ perlPackages.buildPerlPackage rec {
'';
preCheck = ''
+ # Remove online test
+ #
+ rm t/web-pwa.t
+
# A test fails since gethostbyaddr(127.0.0.1) fails to resolve to localhost in
# the sandbox, we replace the this out from a substitution expression
#
diff --git a/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch b/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch
new file mode 100644
index 0000000000000..6c40dc8dd8954
--- /dev/null
+++ b/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch
@@ -0,0 +1,37 @@
+From ac9387271b2420a71f7d172f44354fc35adac504 Mon Sep 17 00:00:00 2001
+From: Manuel Nickschas