diff --git a/lib/licenses.nix b/lib/licenses.nix
index 993783db3ed..46ac0443a03 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -603,6 +603,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({
free = false;
};
+ odbl = spdx {
+ spdxId = "ODbL-1.0";
+ fullName = "Open Data Commons Open Database License v1.0";
+ };
+
ofl = spdx {
spdxId = "OFL-1.1";
fullName = "SIL Open Font License 1.1";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9efca53200f..592b74e294f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1859,6 +1859,12 @@
fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C";
}];
};
+ collares = {
+ email = "mauricio@collares.org";
+ github = "collares";
+ githubId = 244239;
+ name = "Mauricio Collares";
+ };
copumpkin = {
email = "pumpkingod@gmail.com";
github = "copumpkin";
@@ -2889,6 +2895,12 @@
githubId = 3787281;
name = "Erik Rybakken";
};
+ erin = {
+ name = "Erin van der Veen";
+ email = "erin@erinvanderveen.nl";
+ github = "ErinvanderVeen";
+ githubId = 10973664;
+ };
erosennin = {
email = "ag@sologoc.com";
github = "erosennin";
@@ -4153,6 +4165,12 @@
github = "j0hax";
githubId = 3802620;
};
+ j4m3s = {
+ name = "James Landrein";
+ email = "github@j4m3s.eu";
+ github = "j4m3s-s";
+ githubId = 9413812;
+ };
jacg = {
name = "Jacek Generowicz";
email = "jacg@my-post-office.net";
@@ -6987,6 +7005,12 @@
githubId = 3359345;
name = "obadz";
};
+ obsidian-systems-maintenance = {
+ name = "Obsidian Systems Maintenance";
+ email = "maintainer@obsidian.systems";
+ github = "obsidian-systems-maintenance";
+ githubId = 80847921;
+ };
odi = {
email = "oliver.dunkl@gmail.com";
github = "odi";
diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py
index 79c79c0f093..9ac1ccffb78 100644
--- a/maintainers/scripts/pluginupdate.py
+++ b/maintainers/scripts/pluginupdate.py
@@ -514,7 +514,7 @@ def update_plugins(editor: Editor):
)
for plugin_line in args.add_plugins:
- rewrite_input(args.input_fil, editor.deprecated, append=(plugin_line + "\n",))
+ rewrite_input(args.input_file, editor.deprecated, append=(plugin_line + "\n",))
update()
plugin = fetch_plugin_from_pluginline(plugin_line)
commit(
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 7d778a8ae30..0575b87b747 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -134,6 +134,7 @@ with lib.maintainers; {
timokau
omasanori
raskin
+ collares
];
scope = "Maintain SageMath and the dependencies that are likely to break it.";
};
diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl
index 44040217b02..bef08dc4020 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixos/modules/config/update-users-groups.pl
@@ -288,7 +288,7 @@ foreach my $u (values %usersOut) {
push @shadowNew, join(":", $u->{name}, $hashedPassword, "1::::::") . "\n";
}
-updateFile("/etc/shadow", \@shadowNew, 0600);
+updateFile("/etc/shadow", \@shadowNew, 0640);
{
my $uid = getpwnam "root";
my $gid = getgrnam "shadow";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3a1907ee201..21f421abfec 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -177,6 +177,7 @@
./programs/tmux.nix
./programs/traceroute.nix
./programs/tsm-client.nix
+ ./programs/turbovnc.nix
./programs/udevil.nix
./programs/usbtop.nix
./programs/vim.nix
@@ -882,6 +883,7 @@
./services/web-apps/atlassian/confluence.nix
./services/web-apps/atlassian/crowd.nix
./services/web-apps/atlassian/jira.nix
+ ./services/web-apps/bookstack.nix
./services/web-apps/convos.nix
./services/web-apps/cryptpad.nix
./services/web-apps/documize.nix
diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix
index 038d76c6c92..107e783c0c2 100644
--- a/nixos/modules/programs/sway.nix
+++ b/nixos/modules/programs/sway.nix
@@ -90,7 +90,7 @@ in {
rxvt-unicode # For backward compatibility (old default terminal)
];
defaultText = literalExample ''
- with pkgs; [ swaylock swayidle xwayland rxvt-unicode dmenu ];
+ with pkgs; [ swaylock swayidle rxvt-unicode alacritty dmenu ];
'';
example = literalExample ''
with pkgs; [
diff --git a/nixos/modules/programs/turbovnc.nix b/nixos/modules/programs/turbovnc.nix
new file mode 100644
index 00000000000..e6f8836aa36
--- /dev/null
+++ b/nixos/modules/programs/turbovnc.nix
@@ -0,0 +1,54 @@
+# Global configuration for the SSH client.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.turbovnc;
+in
+{
+ options = {
+
+ programs.turbovnc = {
+
+ ensureHeadlessSoftwareOpenGL = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to set up NixOS such that TurboVNC's built-in software OpenGL
+ implementation works.
+
+ This will enable so that OpenGL
+ programs can find Mesa's llvmpipe drivers.
+
+ Setting this option to false does not mean that software
+ OpenGL won't work; it may still work depending on your system
+ configuration.
+
+ This option is also intended to generate warnings if you are using some
+ configuration that's incompatible with using headless software OpenGL
+ in TurboVNC.
+ '';
+ };
+
+ };
+
+ };
+
+ config = mkIf cfg.ensureHeadlessSoftwareOpenGL {
+
+ # TurboVNC has builtin support for Mesa llvmpipe's `swrast`
+ # software rendering to implemnt GLX (OpenGL on Xorg).
+ # However, just building TurboVNC with support for that is not enough
+ # (it only takes care of the X server side part of OpenGL);
+ # the indiviudual applications (e.g. `glxgears`) also need to directly load
+ # the OpenGL libs.
+ # Thus, this creates `/run/opengl-driver` populated by Mesa so that the applications
+ # can find the llvmpipe `swrast.so` software rendering DRI lib via `libglvnd`.
+ # This comment exists to explain why `hardware.` is involved,
+ # even though 100% software rendering is used.
+ hardware.opengl.enable = true;
+
+ };
+}
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 7363441e538..0b52f8afed8 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -274,6 +274,15 @@ in
'';
};
+ etcSlurm = mkOption {
+ type = types.path;
+ internal = true;
+ default = etcSlurm;
+ description = ''
+ Path to directory with slurm config files. This option is set by default from the
+ Slurm module and is meant to make the Slurm config file available to other modules.
+ '';
+ };
};
@@ -308,7 +317,7 @@ in
#!/bin/sh
if [ -z "$SLURM_CONF" ]
then
- SLURM_CONF="${etcSlurm}/slurm.conf" "$EXE" "\$@"
+ SLURM_CONF="${cfg.etcSlurm}/slurm.conf" "$EXE" "\$@"
else
"$EXE" "\$0"
fi
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix b/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix
index 1ece73a1159..dd3bec8ec16 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/postgres.nix
@@ -30,12 +30,49 @@ in
Whether to run the exporter as the local 'postgres' super user.
'';
};
+
+ # TODO perhaps LoadCredential would be more appropriate
+ environmentFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/root/prometheus-postgres-exporter.env";
+ description = ''
+ Environment file as defined in
+ systemd.exec5
+ .
+
+ Secrets may be passed to the service without adding them to the
+ world-readable Nix store, by specifying placeholder variables as
+ the option value in Nix and setting these variables accordingly in the
+ environment file.
+
+ Environment variables from this file will be interpolated into the
+ config file using envsubst with this syntax:
+ $ENVIRONMENT ''${VARIABLE}
+
+ The main use is to set the DATA_SOURCE_NAME that contains the
+ postgres password
+
+ note that contents from this file will override dataSourceName
+ if you have set it from nix.
+
+
+ # Content of the environment file
+ DATA_SOURCE_NAME=postgresql://username:password@localhost:5432/postgres?sslmode=disable
+
+
+ Note that this file needs to be available on the host on which
+ this exporter is running.
+ '';
+ };
+
};
serviceOpts = {
environment.DATA_SOURCE_NAME = cfg.dataSourceName;
serviceConfig = {
DynamicUser = false;
User = mkIf cfg.runAsLocalSuperUser (mkForce "postgres");
+ EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
ExecStart = ''
${pkgs.prometheus-postgres-exporter}/bin/postgres_exporter \
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
diff --git a/nixos/modules/services/web-apps/bookstack.nix b/nixos/modules/services/web-apps/bookstack.nix
new file mode 100644
index 00000000000..83d05ffbad9
--- /dev/null
+++ b/nixos/modules/services/web-apps/bookstack.nix
@@ -0,0 +1,365 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.bookstack;
+ bookstack = pkgs.bookstack.override {
+ dataDir = cfg.dataDir;
+ };
+ db = cfg.database;
+ mail = cfg.mail;
+
+ user = cfg.user;
+ group = cfg.group;
+
+ # shell script for local administration
+ artisan = pkgs.writeScriptBin "bookstack" ''
+ #! ${pkgs.runtimeShell}
+ cd ${bookstack}
+ sudo=exec
+ if [[ "$USER" != ${user} ]]; then
+ sudo='exec /run/wrappers/bin/sudo -u ${user}'
+ fi
+ $sudo ${pkgs.php}/bin/php artisan $*
+ '';
+
+
+in {
+ options.services.bookstack = {
+
+ enable = mkEnableOption "BookStack";
+
+ user = mkOption {
+ default = "bookstack";
+ description = "User bookstack runs as.";
+ type = types.str;
+ };
+
+ group = mkOption {
+ default = "bookstack";
+ description = "Group bookstack runs as.";
+ type = types.str;
+ };
+
+ appKeyFile = mkOption {
+ description = ''
+ A file containing the AppKey.
+ Used for encryption where needed. Can be generated with head -c 32 /dev/urandom| base64 and must be prefixed with base64:.
+ '';
+ example = "/run/keys/bookstack-appkey";
+ type = types.path;
+ };
+
+ appURL = mkOption {
+ description = ''
+ The root URL that you want to host BookStack on. All URLs in BookStack will be generated using this value.
+ If you change this in the future you may need to run a command to update stored URLs in the database. Command example: php artisan bookstack:update-url https://old.example.com https://new.example.com
+ '';
+ example = "https://example.com";
+ type = types.str;
+ };
+
+ cacheDir = mkOption {
+ description = "BookStack cache directory";
+ default = "/var/cache/bookstack";
+ type = types.path;
+ };
+
+ dataDir = mkOption {
+ description = "BookStack data directory";
+ default = "/var/lib/bookstack";
+ type = types.path;
+ };
+
+ database = {
+ host = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = "Database host address.";
+ };
+ port = mkOption {
+ type = types.port;
+ default = 3306;
+ description = "Database host port.";
+ };
+ name = mkOption {
+ type = types.str;
+ default = "bookstack";
+ description = "Database name.";
+ };
+ user = mkOption {
+ type = types.str;
+ default = user;
+ defaultText = "\${user}";
+ description = "Database username.";
+ };
+ passwordFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ example = "/run/keys/bookstack-dbpassword";
+ description = ''
+ A file containing the password corresponding to
+ .
+ '';
+ };
+ createLocally = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Create the database and database user locally.";
+ };
+ };
+
+ mail = {
+ driver = mkOption {
+ type = types.enum [ "smtp" "sendmail" ];
+ default = "smtp";
+ description = "Mail driver to use.";
+ };
+ host = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = "Mail host address.";
+ };
+ port = mkOption {
+ type = types.port;
+ default = 1025;
+ description = "Mail host port.";
+ };
+ fromName = mkOption {
+ type = types.str;
+ default = "BookStack";
+ description = "Mail \"from\" name.";
+ };
+ from = mkOption {
+ type = types.str;
+ default = "mail@bookstackapp.com";
+ description = "Mail \"from\" email.";
+ };
+ user = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ example = "bookstack";
+ description = "Mail username.";
+ };
+ passwordFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ example = "/run/keys/bookstack-mailpassword";
+ description = ''
+ A file containing the password corresponding to
+ .
+ '';
+ };
+ encryption = mkOption {
+ type = with types; nullOr (enum [ "tls" ]);
+ default = null;
+ description = "SMTP encryption mechanism to use.";
+ };
+ };
+
+ maxUploadSize = mkOption {
+ type = types.str;
+ default = "18M";
+ example = "1G";
+ description = "The maximum size for uploads (e.g. images).";
+ };
+
+ poolConfig = mkOption {
+ type = with types; attrsOf (oneOf [ str int bool ]);
+ default = {
+ "pm" = "dynamic";
+ "pm.max_children" = 32;
+ "pm.start_servers" = 2;
+ "pm.min_spare_servers" = 2;
+ "pm.max_spare_servers" = 4;
+ "pm.max_requests" = 500;
+ };
+ description = ''
+ Options for the bookstack PHP pool. See the documentation on php-fpm.conf
+ for details on configuration directives.
+ '';
+ };
+
+ nginx = mkOption {
+ type = types.submodule (
+ recursiveUpdate
+ (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) {}
+ );
+ default = {};
+ example = {
+ serverAliases = [
+ "bookstack.\${config.networking.domain}"
+ ];
+ # To enable encryption and let let's encrypt take care of certificate
+ forceSSL = true;
+ enableACME = true;
+ };
+ description = ''
+ With this option, you can customize the nginx virtualHost settings.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.nullOr types.lines;
+ default = null;
+ example = ''
+ ALLOWED_IFRAME_HOSTS="https://example.com"
+ WKHTMLTOPDF=/home/user/bins/wkhtmltopdf
+ '';
+ description = ''
+ Lines to be appended verbatim to the BookStack configuration.
+ Refer to for details on supported values.
+ '';
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+
+ assertions = [
+ { assertion = db.createLocally -> db.user == user;
+ message = "services.bookstack.database.user must be set to ${user} if services.mediawiki.database.createLocally is set true.";
+ }
+ { assertion = db.createLocally -> db.passwordFile == null;
+ message = "services.bookstack.database.passwordFile cannot be specified if services.bookstack.database.createLocally is set to true.";
+ }
+ ];
+
+ environment.systemPackages = [ artisan ];
+
+ services.mysql = mkIf db.createLocally {
+ enable = true;
+ package = mkDefault pkgs.mariadb;
+ ensureDatabases = [ db.name ];
+ ensureUsers = [
+ { name = db.user;
+ ensurePermissions = { "${db.name}.*" = "ALL PRIVILEGES"; };
+ }
+ ];
+ };
+
+ services.phpfpm.pools.bookstack = {
+ inherit user;
+ inherit group;
+ phpOptions = ''
+ log_errors = on
+ post_max_size = ${cfg.maxUploadSize}
+ upload_max_filesize = ${cfg.maxUploadSize}
+ '';
+ settings = {
+ "listen.mode" = "0660";
+ "listen.owner" = user;
+ "listen.group" = group;
+ } // cfg.poolConfig;
+ };
+
+ services.nginx = {
+ enable = mkDefault true;
+ virtualHosts.bookstack = mkMerge [ cfg.nginx {
+ root = mkForce "${bookstack}/public";
+ extraConfig = optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;";
+ locations = {
+ "/" = {
+ index = "index.php";
+ extraConfig = ''try_files $uri $uri/ /index.php?$query_string;'';
+ };
+ "~ \.php$" = {
+ extraConfig = ''
+ try_files $uri $uri/ /index.php?$query_string;
+ include ${pkgs.nginx}/conf/fastcgi_params;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param REDIRECT_STATUS 200;
+ fastcgi_pass unix:${config.services.phpfpm.pools."bookstack".socket};
+ ${optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"}
+ '';
+ };
+ "~ \.(js|css|gif|png|ico|jpg|jpeg)$" = {
+ extraConfig = "expires 365d;";
+ };
+ };
+ }];
+ };
+
+ systemd.services.bookstack-setup = {
+ description = "Preperation tasks for BookStack";
+ before = [ "phpfpm-bookstack.service" ];
+ after = optional db.createLocally "mysql.service";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ Type = "oneshot";
+ User = user;
+ WorkingDirectory = "${bookstack}";
+ };
+ script = ''
+ # create .env file
+ echo "
+ APP_KEY=base64:$(head -n1 ${cfg.appKeyFile})
+ APP_URL=${cfg.appURL}
+ DB_HOST=${db.host}
+ DB_PORT=${toString db.port}
+ DB_DATABASE=${db.name}
+ DB_USERNAME=${db.user}
+ MAIL_DRIVER=${mail.driver}
+ MAIL_FROM_NAME=\"${mail.fromName}\"
+ MAIL_FROM=${mail.from}
+ MAIL_HOST=${mail.host}
+ MAIL_PORT=${toString mail.port}
+ ${optionalString (mail.user != null) "MAIL_USERNAME=${mail.user};"}
+ ${optionalString (mail.encryption != null) "MAIL_ENCRYPTION=${mail.encryption};"}
+ ${optionalString (db.passwordFile != null) "DB_PASSWORD=$(head -n1 ${db.passwordFile})"}
+ ${optionalString (mail.passwordFile != null) "MAIL_PASSWORD=$(head -n1 ${mail.passwordFile})"}
+ APP_SERVICES_CACHE=${cfg.cacheDir}/services.php
+ APP_PACKAGES_CACHE=${cfg.cacheDir}/packages.php
+ APP_CONFIG_CACHE=${cfg.cacheDir}/config.php
+ APP_ROUTES_CACHE=${cfg.cacheDir}/routes-v7.php
+ APP_EVENTS_CACHE=${cfg.cacheDir}/events.php
+ ${optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "SESSION_SECURE_COOKIE=true"}
+ ${toString cfg.extraConfig}
+ " > "${cfg.dataDir}/.env"
+ # set permissions
+ chmod 700 "${cfg.dataDir}/.env"
+
+ # migrate db
+ ${pkgs.php}/bin/php artisan migrate --force
+
+ # create caches
+ ${pkgs.php}/bin/php artisan config:cache
+ ${pkgs.php}/bin/php artisan route:cache
+ ${pkgs.php}/bin/php artisan view:cache
+ '';
+ };
+
+ systemd.tmpfiles.rules = [
+ "d ${cfg.cacheDir} 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir} 0710 ${user} ${group} - -"
+ "d ${cfg.dataDir}/public 0750 ${user} ${group} - -"
+ "d ${cfg.dataDir}/public/uploads 0750 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/app 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/fonts 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework/cache 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework/sessions 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework/views 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/logs 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/uploads 0700 ${user} ${group} - -"
+ ];
+
+ users = {
+ users = mkIf (user == "bookstack") {
+ bookstack = {
+ inherit group;
+ isSystemUser = true;
+ };
+ "${config.services.nginx.user}".extraGroups = [ group ];
+ };
+ groups = mkIf (group == "bookstack") {
+ bookstack = {};
+ };
+ };
+
+ };
+
+ meta.maintainers = with maintainers; [ ymarkus ];
+}
diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix
index 2dbf15031a0..6051a428574 100644
--- a/nixos/modules/system/boot/systemd-lib.nix
+++ b/nixos/modules/system/boot/systemd-lib.nix
@@ -182,7 +182,18 @@ in rec {
# upstream unit.
for i in ${toString (mapAttrsToList (n: v: v.unit) units)}; do
fn=$(basename $i/*)
- if [ -e $out/$fn ]; then
+
+ case $fn in
+ # if file name is a template specialization, use the template's name
+ *@?*.service)
+ # remove @foo.service and replace it with @.service
+ ofn="''${fn%@*.service}@.service"
+ ;;
+ *)
+ ofn="$fn"
+ esac
+
+ if [ -e $out/$ofn ]; then
if [ "$(readlink -f $i/$fn)" = /dev/null ]; then
ln -sfn /dev/null $out/$fn
else
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 251f24a9a08..3ce71b0abe6 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -408,6 +408,7 @@ in
trickster = handleTest ./trickster.nix {};
trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {};
tuptime = handleTest ./tuptime.nix {};
+ turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {};
ucg = handleTest ./ucg.nix {};
udisks2 = handleTest ./udisks2.nix {};
unbound = handleTest ./unbound.nix {};
diff --git a/nixos/tests/systemd-template-override.nix b/nixos/tests/systemd-template-override.nix
new file mode 100644
index 00000000000..d8ef4a6c1c9
--- /dev/null
+++ b/nixos/tests/systemd-template-override.nix
@@ -0,0 +1,41 @@
+import ./make-test-python.nix {
+ name = "systemd-template-override";
+
+ machine = { pkgs, lib, ... }: let
+ touchTmp = pkgs.writeTextFile {
+ name = "touch-tmp@.service";
+ text = ''
+ [Service]
+ Type=oneshot
+ ExecStart=${pkgs.coreutils}/bin/touch /tmp/%I
+ '';
+ destination = "/etc/systemd/system/touch-tmp@.service";
+ };
+ in {
+ systemd.packages = [ touchTmp ];
+
+ systemd.services."touch-tmp@forbidden" = {
+ serviceConfig.ExecStart = [ "" ''
+ ${pkgs.coreutils}/bin/true
+ ''];
+ };
+
+ systemd.services."touch-tmp@intercept" = {
+ serviceConfig.ExecStart = [ "" ''
+ ${pkgs.coreutils}/bin/touch /tmp/renamed
+ ''];
+ };
+ };
+
+ testScript = ''
+ machine.wait_for_unit("default.target")
+
+ machine.succeed("systemctl start touch-tmp@normal")
+ machine.succeed("systemctl start touch-tmp@forbbidden")
+ machine.succeed("systemctl start touch-tmp@intercept")
+
+ machine.succeed("[ -e /tmp/normal ]")
+ machine.succeed("[ ! -e /tmp/forbidden ]")
+ machine.succeed("[ -e /tmp/renamed ]")
+ '';
+}
diff --git a/nixos/tests/turbovnc-headless-server.nix b/nixos/tests/turbovnc-headless-server.nix
new file mode 100644
index 00000000000..35da9a53d2d
--- /dev/null
+++ b/nixos/tests/turbovnc-headless-server.nix
@@ -0,0 +1,171 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
+ name = "turbovnc-headless-server";
+ meta = {
+ maintainers = with lib.maintainers; [ nh2 ];
+ };
+
+ machine = { pkgs, ... }: {
+
+ environment.systemPackages = with pkgs; [
+ glxinfo
+ procps # for `pkill`, `pidof` in the test
+ scrot # for screenshotting Xorg
+ turbovnc
+ ];
+
+ programs.turbovnc.ensureHeadlessSoftwareOpenGL = true;
+
+ networking.firewall = {
+ # Reject instead of drop, for failures instead of hangs.
+ rejectPackets = true;
+ allowedTCPPorts = [
+ 5900 # VNC :0, for seeing what's going on in the server
+ ];
+ };
+
+ # So that we can ssh into the VM, see e.g.
+ # http://blog.patapon.info/nixos-local-vm/#accessing-the-vm-with-ssh
+ services.openssh.enable = true;
+ services.openssh.permitRootLogin = "yes";
+ users.extraUsers.root.password = "";
+ users.mutableUsers = false;
+ };
+
+ testScript = ''
+ def wait_until_terminated_or_succeeds(
+ termination_check_shell_command,
+ success_check_shell_command,
+ get_detail_message_fn,
+ retries=60,
+ retry_sleep=0.5,
+ ):
+ def check_success():
+ command_exit_code, _output = machine.execute(success_check_shell_command)
+ return command_exit_code == 0
+
+ for _ in range(retries):
+ exit_check_exit_code, _output = machine.execute(termination_check_shell_command)
+ is_terminated = exit_check_exit_code != 0
+ if is_terminated:
+ if check_success():
+ return
+ else:
+ details = get_detail_message_fn()
+ raise Exception(
+ f"termination check ({termination_check_shell_command}) triggered without command succeeding ({success_check_shell_command}); details: {details}"
+ )
+ else:
+ if check_success():
+ return
+ time.sleep(retry_sleep)
+
+ if not check_success():
+ details = get_detail_message_fn()
+ raise Exception(
+ f"action timed out ({success_check_shell_command}); details: {details}"
+ )
+
+
+ # Below we use the pattern:
+ # (cmd | tee stdout.log) 3>&1 1>&2 2>&3 | tee stderr.log
+ # to capture both stderr and stdout while also teeing them, see:
+ # https://unix.stackexchange.com/questions/6430/how-to-redirect-stderr-and-stdout-to-different-files-and-also-display-in-termina/6431#6431
+
+
+ # Starts headless VNC server, backgrounding it.
+ def start_xvnc():
+ xvnc_command = " ".join(
+ [
+ "Xvnc",
+ ":0",
+ "-iglx",
+ "-auth /root/.Xauthority",
+ "-geometry 1240x900",
+ "-depth 24",
+ "-rfbwait 5000",
+ "-deferupdate 1",
+ "-verbose",
+ "-securitytypes none",
+ # We don't enforce localhost listening such that we
+ # can connect from outside the VM using
+ # env QEMU_NET_OPTS=hostfwd=tcp::5900-:5900 $(nix-build nixos/tests/turbovnc-headless-server.nix -A driver)/bin/nixos-test-driver
+ # for testing purposes, and so that we can in the future
+ # add another test case that connects the TurboVNC client.
+ # "-localhost",
+ ]
+ )
+ machine.execute(
+ # Note trailing & for backgrounding.
+ f"({xvnc_command} | tee /tmp/Xvnc.stdout) 3>&1 1>&2 2>&3 | tee /tmp/Xvnc.stderr &",
+ )
+
+
+ # Waits until the server log message that tells us that GLX is ready
+ # (requires `-verbose` above), avoiding screenshoting racing below.
+ def wait_until_xvnc_glx_ready():
+ machine.wait_until_succeeds("test -f /tmp/Xvnc.stderr")
+ wait_until_terminated_or_succeeds(
+ termination_check_shell_command="pidof Xvnc",
+ success_check_shell_command="grep 'GLX: Initialized DRISWRAST' /tmp/Xvnc.stderr",
+ get_detail_message_fn=lambda: "Contents of /tmp/Xvnc.stderr:\n"
+ + machine.succeed("cat /tmp/Xvnc.stderr"),
+ )
+
+
+ # Checks that we detect glxgears failing when
+ # `LIBGL_DRIVERS_PATH=/nonexistent` is set
+ # (in which case software rendering should not work).
+ def test_glxgears_failing_with_bad_driver_path():
+ machine.execute(
+ # Note trailing & for backgrounding.
+ "(env DISPLAY=:0 LIBGL_DRIVERS_PATH=/nonexistent glxgears -info | tee /tmp/glxgears-should-fail.stdout) 3>&1 1>&2 2>&3 | tee /tmp/glxgears-should-fail.stderr &"
+ )
+ machine.wait_until_succeeds("test -f /tmp/glxgears-should-fail.stderr")
+ wait_until_terminated_or_succeeds(
+ termination_check_shell_command="pidof glxgears",
+ success_check_shell_command="grep 'libGL error: failed to load driver: swrast' /tmp/glxgears-should-fail.stderr",
+ get_detail_message_fn=lambda: "Contents of /tmp/glxgears-should-fail.stderr:\n"
+ + machine.succeed("cat /tmp/glxgears-should-fail.stderr"),
+ )
+ machine.wait_until_fails("pidof glxgears")
+
+
+ # Starts glxgears, backgrounding it. Waits until it prints the `GL_RENDERER`.
+ # Does not quit glxgears.
+ def test_glxgears_prints_renderer():
+ machine.execute(
+ # Note trailing & for backgrounding.
+ "(env DISPLAY=:0 glxgears -info | tee /tmp/glxgears.stdout) 3>&1 1>&2 2>&3 | tee /tmp/glxgears.stderr &"
+ )
+ machine.wait_until_succeeds("test -f /tmp/glxgears.stderr")
+ wait_until_terminated_or_succeeds(
+ termination_check_shell_command="pidof glxgears",
+ success_check_shell_command="grep 'GL_RENDERER' /tmp/glxgears.stdout",
+ get_detail_message_fn=lambda: "Contents of /tmp/glxgears.stderr:\n"
+ + machine.succeed("cat /tmp/glxgears.stderr"),
+ )
+
+
+ with subtest("Start Xvnc"):
+ start_xvnc()
+ wait_until_xvnc_glx_ready()
+
+ with subtest("Ensure bad driver path makes glxgears fail"):
+ test_glxgears_failing_with_bad_driver_path()
+
+ with subtest("Run 3D application (glxgears)"):
+ test_glxgears_prints_renderer()
+
+ # Take screenshot; should display the glxgears.
+ machine.succeed("scrot --display :0 /tmp/glxgears.png")
+
+ # Copy files down.
+ machine.copy_from_vm("/tmp/glxgears.png")
+ machine.copy_from_vm("/tmp/glxgears.stdout")
+ machine.copy_from_vm("/tmp/glxgears-should-fail.stdout")
+ machine.copy_from_vm("/tmp/glxgears-should-fail.stderr")
+ machine.copy_from_vm("/tmp/Xvnc.stdout")
+ machine.copy_from_vm("/tmp/Xvnc.stderr")
+ '';
+
+})
diff --git a/pkgs/applications/audio/ardour/5.nix b/pkgs/applications/audio/ardour/5.nix
index 4a0656ed9ce..9e8c075bfb0 100644
--- a/pkgs/applications/audio/ardour/5.nix
+++ b/pkgs/applications/audio/ardour/5.nix
@@ -8,7 +8,6 @@
, doxygen
, fftwSinglePrec
, flac
-, glibc
, glibmm
, graphviz
, gtkmm2
diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix
index d742961939f..6529cd860c8 100644
--- a/pkgs/applications/audio/callaudiod/default.nix
+++ b/pkgs/applications/audio/callaudiod/default.nix
@@ -11,14 +11,14 @@
stdenv.mkDerivation rec {
pname = "callaudiod";
- version = "0.0.4";
+ version = "0.1.0";
src = fetchFromGitLab {
domain = "gitlab.com";
owner = "mobian1";
repo = pname;
rev = version;
- sha256 = "07k7xp5a9c4d4lq7amaj6cg6b3gsd77x9wvf7nzcf4vpaph4yiyj";
+ sha256 = "087589z45xvldn2m1g79y0xbwzylwkjmfk83s5xjixyq0wqmfppd";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/cheesecutter/default.nix b/pkgs/applications/audio/cheesecutter/default.nix
index 84f6b183033..6c14cc67f81 100644
--- a/pkgs/applications/audio/cheesecutter/default.nix
+++ b/pkgs/applications/audio/cheesecutter/default.nix
@@ -8,13 +8,13 @@
}:
stdenv.mkDerivation rec {
pname = "cheesecutter";
- version = "unstable-2020-04-03";
+ version = "unstable-2021-02-27";
src = fetchFromGitHub {
owner = "theyamo";
repo = "CheeseCutter";
- rev = "68d6518f0e6249a2a5d122fc80201578337c1277";
- sha256 = "0xspzjhc6cp3m0yd0mwxncg8n1wklizamxvidrnn21jgj3mnaq2q";
+ rev = "84450d3614b8fb2cabda87033baab7bedd5a5c98";
+ sha256 = "sha256:0q4a791nayya6n01l0f4kk497rdq6kiq0n72fqdpwqy138pfwydn";
};
patches = [
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
index 6524700ae15..f4099f49ecf 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -75,5 +75,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = teams.gnome.members;
platforms = platforms.unix;
+ # couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2)
+ broken = true;
};
}
diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix
index a26af9023a8..cb682f91b6d 100644
--- a/pkgs/applications/audio/plexamp/default.nix
+++ b/pkgs/applications/audio/plexamp/default.nix
@@ -2,13 +2,13 @@
let
pname = "plexamp";
- version = "3.4.3";
+ version = "3.4.4";
name = "${pname}-${version}";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage";
- sha256 = "1rzhrc5yr5f6bxydgmcjwrg85vkbkn6lqj72512lyhq5gg7zmm1w";
+ sha256 = "1iz6qi12ljafb49l73rba5rwi5sdbd8ck5h2r6jiy260lgr2iiyk";
};
appimageContents = appimageTools.extractType2 {
@@ -32,7 +32,7 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/";
- changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/25";
+ changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/26";
license = licenses.unfree;
maintainers = with maintainers; [ killercup synthetica ];
platforms = [ "x86_64-linux" ];
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index 45f4e76bf5e..fd9a9f00502 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
}
else
releasePath
- else throw "Platform is not supported by Renoise";
+ else throw "Platform is not supported. Use instalation native to your platform https://www.renoise.com/";
buildInputs = [ alsaLib libjack2 libX11 libXcursor libXext libXrandr ];
@@ -47,6 +47,16 @@ stdenv.mkDerivation rec {
mkdir $out/bin
ln -s $out/renoise $out/bin/renoise
+
+ # Desktop item
+ mkdir -p $out/share/applications
+ cp -r Installer/renoise.desktop $out/share/applications/renoise.desktop
+
+ # Desktop item icons
+ mkdir -p $out/share/icons/hicolor/{48x48,64x64,128x128}/apps
+ cp Installer/renoise-48.png $out/share/icons/hicolor/48x48/apps/renoise.png
+ cp Installer/renoise-64.png $out/share/icons/hicolor/64x64/apps/renoise.png
+ cp Installer/renoise-128.png $out/share/icons/hicolor/128x128/apps/renoise.png
'';
postFixup = ''
@@ -61,6 +71,9 @@ stdenv.mkDerivation rec {
--set-rpath $out/lib \
$path
done
+
+ substituteInPlace $out/share/applications/renoise.desktop \
+ --replace Exec=renoise Exec=$out/bin/renoise
'';
meta = {
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index eb7aac16c64..fc13c8862cb 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.8.5";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
- sha256 = "sha256-+ZQ80J94Teqt4Gy6fw/pS7FwILK/TPehtJDy72Bdy1E=";
+ sha256 = "sha256-1aXHMvjLK5WiE0mut/a3ynuMfNHgPbUzAZdmaVJBDXQ=";
};
buildInputs = [
diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix
index ce775abeb42..ef7133630b5 100644
--- a/pkgs/applications/audio/sunvox/default.nix
+++ b/pkgs/applications/audio/sunvox/default.nix
@@ -44,5 +44,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.warmplace.ru/soft/sunvox/";
maintainers = with maintainers; [ puffnfresh ];
platforms = [ "i686-linux" "x86_64-linux" ];
+ # hash mismatch
+ broken = true;
};
}
diff --git a/pkgs/applications/audio/surge/default.nix b/pkgs/applications/audio/surge/default.nix
index 83125324694..ed15d49cfe0 100644
--- a/pkgs/applications/audio/surge/default.nix
+++ b/pkgs/applications/audio/surge/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "surge";
- version = "1.7.1";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "surge-synthesizer";
repo = pname;
rev = "release_${version}";
- sha256 = "1b3ccc78vrpzy18w7070zfa250dnd1bww147xxcnj457vd6n065s";
+ sha256 = "0lla860g7zgn9n1zgy14g4j72d5n5y7isyxz2w5xy2fzdpdg24ql";
leaveDotGit = true; # for SURGE_VERSION
fetchSubmodules = true;
};
@@ -20,9 +20,10 @@ stdenv.mkDerivation rec {
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
+ patchShebangs scripts/linux/emit-vector-piggy
+ patchShebangs scripts/linux/generate-lv2-ttl
'';
installPhase = ''
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 8c928cafa52..2dea189dca4 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.23.0";
+ version = "2.24.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
- sha256 = "0id9zbpfq3knv8qwkhplbl9pwrvdkn212pafwh4vpjbbp4yimhq5";
+ sha256 = "1xdqj825vwh3kg35v7568zr1jhvldb4wcazzgzcaawkr4qzfdb2n";
};
appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
index 9bf1ca586c2..5f430bc8869 100644
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/pkgs/applications/blockchains/monero-gui/default.nix
@@ -10,15 +10,13 @@
, randomx, zeromq, libgcrypt, libgpgerror
, hidapi, rapidjson, quirc
, trezorSupport ? true
-, libusb1 ? null
-, protobuf ? null
-, python3 ? null
+, libusb1
+, protobuf
+, python3
}:
with lib;
-assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
-
let
arch = if stdenv.isx86_64 then "x86-64"
else if stdenv.isi686 then "i686"
diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix
index 94bb1a0d286..7ef81a4ebc0 100644
--- a/pkgs/applications/editors/edit/default.nix
+++ b/pkgs/applications/editors/edit/default.nix
@@ -2,39 +2,39 @@
stdenv.mkDerivation {
pname = "edit-nightly";
- version = "20160425";
+ version = "20180228";
src = fetchgit {
url = "git://c9x.me/ed.git";
- rev = "323d49b68c5e804ed3b8cada0e2274f1589b3484";
- sha256 = "0wv8i3ii7cd9bqhjpahwp2g5fcmyk365nc7ncmvl79cxbz3f7y8v";
+ rev = "77d96145b163d79186c722a7ffccfff57601157c";
+ sha256 = "0rsmp7ydmrq3xx5q19566is9a2v2w5yfsphivfc7j4ljp32jlyyy";
};
- nativeBuildInputs = [ unzip ];
- buildInputs = [
- pkg-config
- ncurses
- libX11
- libXft
- cwebbin
+ nativeBuildInputs = [
+ unzip
+ pkg-config
+ cwebbin
];
- buildPhase = ''
+ buildInputs = [
+ ncurses
+ libX11
+ libXft
+ ];
+
+ preBuild = ''
ctangle *.w
- make
'';
installPhase = ''
- mkdir -p $out/bin/
- cp obj/edit $out/bin/edit
+ install -Dm755 obj/edit -t $out/bin
'';
meta = with lib; {
description = "A relaxing mix of Vi and ACME";
- homepage = "http://c9x.me/edit";
+ homepage = "https://c9x.me/edit";
license = licenses.publicDomain;
maintainers = [ maintainers.vrthra ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
-
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 31551f1b724..7f36bc35cb5 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -337,7 +337,7 @@ in
name = "mps-${version}";
version = "2020.3.1"; /* updated by script */
description = "Create your own domain-specific language";
- license = lib.licenses.unfree;
+ license = lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/mps/2020.3/MPS-${version}.tar.gz";
sha256 = "0qvl724mm53rxfhafl6561rhpwppcadmwr9sh0hpsfgsprh2xznv"; /* updated by script */
diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl
index b4a96228db4..6f0a451849a 100755
--- a/pkgs/applications/editors/jetbrains/update.pl
+++ b/pkgs/applications/editors/jetbrains/update.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i perl -p perl perlPackages.LWPProtocolhttps perlPackages.FileSlurp
+#!nix-shell -i perl -p perl perlPackages.LWPProtocolHttps perlPackages.FileSlurp
use strict;
use List::Util qw(reduce);
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 39ed4e8032e..370d5b1561c 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, makeDesktopItem
-, unzip, libsecret, libXScrnSaver, wrapGAppsHook
+, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook
, gtk2, atomEnv, at-spi2-atk, autoPatchelfHook
, systemd, fontconfig, libdbusmenu
@@ -60,7 +60,7 @@ in
'';
};
- buildInputs = [ libsecret libXScrnSaver ]
+ buildInputs = [ libsecret libXScrnSaver libxshmfence ]
++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages);
runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ];
diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix
index 49e8fee513d..04ac87c55da 100644
--- a/pkgs/applications/graphics/fondo/default.nix
+++ b/pkgs/applications/graphics/fondo/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "fondo";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchFromGitHub {
owner = "calo001";
repo = pname;
rev = version;
- sha256 = "sha256-eGHgZm9Q6JnY6OQNAyrFvRsuyuFnruMJNckOCCiO4Ug=";
+ sha256 = "sha256-EATZRmYSGUzWYaPqFT4mLTGGvwUp+Mn93yMF2JsPaYo=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index 57d1f794d0f..07ac5b32e5f 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -1,48 +1,113 @@
-{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d,
-xercesc, ode, eigen, qtbase, qttools, qtwebengine, qtxmlpatterns, wrapQtAppsHook,
-opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig,
-gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkg-config, mpi,
-spaceNavSupport ? true, libspnav, qtx11extras }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, ninja
+, GitPython
+, boost
+, coin3d
+, eigen
+, gfortran
+, gts
+, hdf5
+, libGLU
+, libXmu
+, libf2c
+, libspnav
+, matplotlib
+, medfile
+, mpi
+, ode
+, opencascade-occt
+, pivy
+, pkg-config
+, pycollada
+, pyside2
+, pyside2-tools
+, python
+, pyyaml
+, qtbase
+, qttools
+, qtwebengine
+, qtx11extras
+, qtxmlpatterns
+, scipy
+, shiboken2
+, soqt
+, spaceNavSupport ? true
+, swig
+, vtk
+, wrapQtAppsHook
+, xercesc
+, zlib
+}:
-let
- pythonPackages = python3Packages;
-in mkDerivation rec {
- pname = "freecad-unstable";
- version = "2020-12-08";
+mkDerivation rec {
+ pname = "freecad";
+ version = "0.19.1";
src = fetchFromGitHub {
owner = "FreeCAD";
repo = "FreeCAD";
- rev = "daea30341ea2d5eaf2bfb65614128a5fa2abc8b7";
- sha256 = "1fza64lygqq35v7kzgqmiq5dvl5rpgkhlzv06f9dszdz44hznina";
+ rev = version;
+ hash = "sha256-itIrO+/mKXOPNs+2POKT8u4YZuqx/QAwVBWrHgKP1qQ=";
};
nativeBuildInputs = [
cmake
ninja
pkg-config
- pythonPackages.pyside2-tools
+ pyside2-tools
wrapQtAppsHook
];
buildInputs = [
- coin3d xercesc ode eigen opencascade-occt gts
- zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
- libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns
- ] ++ (with pythonPackages; [
- matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost
GitPython # for addon manager
- scipy pyyaml # (at least for) PyrateWorkbench
- ]) ++ lib.optionals spaceNavSupport [ libspnav qtx11extras ];
+ boost
+ coin3d
+ eigen
+ gfortran
+ gts
+ hdf5
+ libGLU
+ libXmu
+ libf2c
+ matplotlib
+ medfile
+ mpi
+ ode
+ opencascade-occt
+ pivy
+ pycollada
+ pyside2
+ pyside2-tools
+ python
+ pyyaml # (at least for) PyrateWorkbench
+ qtbase
+ qttools
+ qtwebengine
+ qtxmlpatterns
+ scipy
+ shiboken2
+ soqt
+ swig
+ vtk
+ xercesc
+ zlib
+ ] ++ lib.optionals spaceNavSupport [
+ libspnav
+ qtx11extras
+ ];
cmakeFlags = [
"-DBUILD_QT5=ON"
- "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include"
+ "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include"
"-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
- ("-DPYSIDE_INCLUDE_DIR=${pythonPackages.pyside2}/include"
- + ";${pythonPackages.pyside2}/include/PySide2/QtCore"
- + ";${pythonPackages.pyside2}/include/PySide2/QtWidgets"
- + ";${pythonPackages.pyside2}/include/PySide2/QtGui"
+ ("-DPYSIDE_INCLUDE_DIR=${pyside2}/include"
+ + ";${pyside2}/include/PySide2/QtCore"
+ + ";${pyside2}/include/PySide2/QtWidgets"
+ + ";${pyside2}/include/PySide2/QtGui"
)
"-DPYSIDE_LIBRARY=PySide2::pyside2"
];
@@ -65,13 +130,31 @@ in mkDerivation rec {
postFixup = ''
mv $out/share/doc $out
+ ln -s $out/bin/FreeCAD $out/bin/freecad
+ ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd
'';
meta = with lib; {
- description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
homepage = "https://www.freecadweb.org/";
+ description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
+ longDescription = ''
+ FreeCAD is an open-source parametric 3D modeler made primarily to design
+ real-life objects of any size. Parametric modeling allows you to easily
+ modify your design by going back into your model history and changing its
+ parameters.
+
+ FreeCAD allows you to sketch geometry constrained 2D shapes and use them
+ as a base to build other objects. It contains many components to adjust
+ dimensions or extract design details from 3D models to create high quality
+ production ready drawings.
+
+ FreeCAD is designed to fit a wide range of uses including product design,
+ mechanical engineering and architecture. Whether you are a hobbyist, a
+ programmer, an experienced CAD user, a student or a teacher, you will feel
+ right at home with FreeCAD.
+ '';
license = licenses.lgpl2Plus;
- maintainers = with maintainers; [ viric gebner ];
+ maintainers = with maintainers; [ viric gebner AndersonTorres ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 62f1a362771..2491d8d3a8a 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
+, fetchpatch
, substituteAll
, autoreconfHook
, pkg-config
@@ -72,6 +73,12 @@ in stdenv.mkDerivation rec {
# Use absolute paths instead of relying on PATH
# to make sure plug-ins are loaded by the correct interpreter.
./hardcode-plugin-interpreters.patch
+
+ # Fix crash without dot.
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/f83fd22c4b8701ffc4ce14383e5e22756a4bce04.patch";
+ sha256 = "POuvBhOSStO7hBGp4HgNx5F9pElFRoqN3W+i3u4zOnk=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
index 39a287900a9..9c16e23ebb5 100644
--- a/pkgs/applications/graphics/leocad/default.nix
+++ b/pkgs/applications/graphics/leocad/default.nix
@@ -1,31 +1,53 @@
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, fetchurl
+, qmake
+, qttools
+, zlib
+}:
+
/*
To use aditional parts libraries
set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/
*/
-{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }:
+let
+ parts = fetchurl {
+ url = "https://web.archive.org/web/20190715142541/https://www.ldraw.org/library/updates/complete.zip";
+ sha256 = "sha256-PW3XCbFwRaNkx4EgCnl2rXH7QgmpNgjTi17kZ5bladA=";
+ };
-stdenv.mkDerivation rec {
+in
+mkDerivation rec {
pname = "leocad";
- version = "19.07.1";
+ version = "21.03";
src = fetchFromGitHub {
owner = "leozide";
repo = "leocad";
rev = "v${version}";
- sha256 = "02kv1m18g6s4dady9jv4sjivfkrp192bmdw2a3d9lzlp60zks0p2";
+ sha256 = "sha256-69Ocfk5dBXwcRqAZWEP9Xg41o/tAQo76dIOk9oYhCUE=";
};
- nativeBuildInputs = [ qmake4Hook ];
- buildInputs = [ qt4 zlib ];
- postPatch = ''
- export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out"
- '';
+ nativeBuildInputs = [ qmake qttools ];
+
+ buildInputs = [ zlib ];
+
+ qmakeFlags = [
+ "INSTALL_PREFIX=${placeholder "out"}"
+ "DISABLE_UPDATE_CHECK=1"
+ ];
+
+ qtWrapperArgs = [
+ "--set-default LEOCAD_LIB ${parts}"
+ ];
meta = with lib; {
description = "CAD program for creating virtual LEGO models";
homepage = "https://www.leocad.org/";
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix
index 8de0ceeae65..42c0f7d05fd 100644
--- a/pkgs/applications/misc/bemenu/default.nix
+++ b/pkgs/applications/misc/bemenu/default.nix
@@ -2,12 +2,12 @@
, pango, fribidi, harfbuzz, pcre, pkg-config
, ncursesSupport ? true, ncurses ? null
, waylandSupport ? true, wayland ? null, wayland-protocols ? null
-, x11Support ? true, xlibs ? null, xorg ? null
+, x11Support ? true, xorg ? null
}:
assert ncursesSupport -> ncurses != null;
assert waylandSupport -> ! lib.elem null [wayland wayland-protocols];
-assert x11Support -> xlibs != null && xorg != null;
+assert x11Support -> xorg != null;
stdenv.mkDerivation rec {
pname = "bemenu";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
] ++ optional ncursesSupport ncurses
++ optionals waylandSupport [ wayland wayland-protocols ]
++ optionals x11Support [
- xlibs.libX11 xlibs.libXinerama xlibs.libXft
+ xorg.libX11 xorg.libXinerama xorg.libXft
xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb
];
diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix
index ce8db160a75..f007fb71377 100644
--- a/pkgs/applications/misc/birdtray/default.nix
+++ b/pkgs/applications/misc/birdtray/default.nix
@@ -36,11 +36,15 @@ mkDerivation rec {
--subst-var-by qttranslations ${qttranslations}
'';
+ # Wayland support is broken.
+ # https://github.com/gyunaev/birdtray/issues/113#issuecomment-621742315
+ qtWrapperArgs = [ "--set QT_QPA_PLATFORM xcb" ];
+
meta = with lib; {
description = "Mail system tray notification icon for Thunderbird";
homepage = "https://github.com/gyunaev/birdtray";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ Flakebi ];
+ maintainers = with maintainers; [ Flakebi oxalica ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/extract_url/default.nix b/pkgs/applications/misc/extract_url/default.nix
index 9daaf7268c3..35ea33bde3a 100644
--- a/pkgs/applications/misc/extract_url/default.nix
+++ b/pkgs/applications/misc/extract_url/default.nix
@@ -5,7 +5,7 @@
let
perlDeps =
- [ perlPackages.MIMEtools perlPackages.HTMLParser ]
+ [ perlPackages.MIMETools perlPackages.HTMLParser ]
++ lib.optional cursesSupport perlPackages.CursesUI
++ lib.optional uriFindSupport perlPackages.URIFind;
diff --git a/pkgs/applications/misc/gcstar/default.nix b/pkgs/applications/misc/gcstar/default.nix
index f482b8af289..f77bf04c2c8 100644
--- a/pkgs/applications/misc/gcstar/default.nix
+++ b/pkgs/applications/misc/gcstar/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
JSON
ImageExifTool
librelative
- LWPUserAgent
+ LWP
LWPProtocolHttps
MP3Info
MP3Tag
diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix
index 8d2cabb5b8b..7a5615bf40d 100644
--- a/pkgs/applications/misc/jrnl/default.nix
+++ b/pkgs/applications/misc/jrnl/default.nix
@@ -18,14 +18,14 @@
buildPythonApplication rec {
pname = "jrnl";
- version = "2.7";
+ version = "2.7.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "jrnl-org";
repo = pname;
rev = "v${version}";
- sha256 = "1hyjjw9mxy73n3pkliaaif135h2sd4iy43pw9d5zynid5abnr3yz";
+ sha256 = "1m1shgnvwzzs0g6ph7rprwxd7w8zj0x4sbgiqsv9z41k6li7xj4r";
};
nativeBuildInputs = [ poetry ];
diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix
index 83a7aabaef7..c98d40ab2e1 100644
--- a/pkgs/applications/misc/marktext/default.nix
+++ b/pkgs/applications/misc/marktext/default.nix
@@ -25,7 +25,7 @@ appimageTools.wrapType2 rec {
multiPkgs = null; # no 32bit needed
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
p.libsecret
- p.xlibs.libxkbfile
+ p.xorg.libxkbfile
];
# Strip version from binary name.
diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix
new file mode 100644
index 00000000000..de715bf315f
--- /dev/null
+++ b/pkgs/applications/misc/metadata-cleaner/default.nix
@@ -0,0 +1,61 @@
+{ lib
+, python3
+, fetchFromGitLab
+, appstream
+, desktop-file-utils
+, glib
+, gobject-introspection
+, gtk3
+, libhandy
+, librsvg
+, meson
+, ninja
+, pkg-config
+, poppler_gi
+, wrapGAppsHook
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "metadata-cleaner";
+ version = "1.0.3";
+
+ format = "other";
+
+ src = fetchFromGitLab {
+ owner = "rmnvgr";
+ repo = "metadata-cleaner";
+ rev = "v${version}";
+ sha256 = "06dzfcnjb1xd8lk0r7bi4i784gfj8r7habbjbk2c4vn2847v71lf";
+ };
+
+ nativeBuildInputs = [
+ appstream
+ desktop-file-utils
+ glib
+ gtk3
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gobject-introspection
+ gtk3
+ libhandy
+ librsvg
+ poppler_gi
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ mat2
+ pygobject3
+ ];
+
+ meta = with lib; {
+ description = "Python GTK application to view and clean metadata in files, using mat2";
+ homepage = "https://gitlab.com/rmnvgr/metadata-cleaner";
+ license = with licenses; [ gpl3Plus cc-by-sa-40 ];
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix
index c6b9d82bcf4..6b2418ab57c 100644
--- a/pkgs/applications/misc/qcad/default.nix
+++ b/pkgs/applications/misc/qcad/default.nix
@@ -15,16 +15,17 @@
mkDerivationWith stdenv.mkDerivation rec {
pname = "qcad";
- version = "3.25.2.0";
+ version = "3.26.0.1";
src = fetchFromGitHub {
owner = "qcad";
repo = "qcad";
rev = "v${version}";
- sha256 = "1lz6q9n2p0l7k8rwqsdj6av9p3426423g5avc4y6s7nbk36280mz";
+ sha256 = "sha256-V+QlwM8BWmcarwZtqJfc+MYHOZgIH1W5R8m2EHhNJls=";
};
patches = [
+ # Patch directory lookup, remove __DATE__ and executable name
./application-dir.patch
];
@@ -90,12 +91,10 @@ mkDerivationWith stdenv.mkDerivation rec {
qttools
];
- enableParallelBuilding = true;
-
meta = with lib; {
description = "2D CAD package based on Qt";
homepage = "https://qcad.org";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ yvesf ];
platforms = qtbase.meta.platforms;
};
diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix
index eac131d6ef7..b7eb2367528 100644
--- a/pkgs/applications/misc/regextester/default.nix
+++ b/pkgs/applications/misc/regextester/default.nix
@@ -6,7 +6,7 @@
, pkg-config
, glib
, gtk3
-, gnome3
+, libgee
, meson
, ninja
, gobject-introspection
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
pantheon.elementary-icon-theme
pantheon.granite
glib
- gnome3.libgee
+ libgee
gsettings-desktop-schemas
gtk3
];
diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix
index fb6bfc6efe3..601380fc6cb 100644
--- a/pkgs/applications/misc/tickrs/default.nix
+++ b/pkgs/applications/misc/tickrs/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tickrs";
- version = "0.14.2";
+ version = "0.14.3";
src = fetchFromGitHub {
owner = "tarkah";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-8m4mIXTqc6rDMIjODbHJL7ipH5Y4WwgsWcSmw/SaiIo=";
+ sha256 = "sha256-mHMBhYI9pJkuK/6tCg1fXPjTfGFe0gkMzplesuFvl5M=";
};
- cargoSha256 = "sha256-ZcRFQT2CxqpO35UqK79g2Jq5SPOLZ88WiG36issC5kY=";
+ cargoSha256 = "sha256-XmLobbVTYO8dA8YVtI/ntlD1RB9sO3poP6NBdDOPIlE=";
nativeBuildInputs = [ perl ];
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index d787705be15..05f6c2b6a65 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -6,7 +6,7 @@
, jbig2dec
, libjpeg
, mupdf
-, openjpeg_2
+, openjpeg
, pkg-config
, zathura_core
}:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
jbig2dec
libjpeg
mupdf
- openjpeg_2
+ openjpeg
zathura_core
] ++ lib.optional stdenv.isDarwin gtk-mac-integration;
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 12848b96896..f544660913f 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.21.76";
+ version = "1.21.77";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "JFZaPS9NmwZeyEdDqOrKG9VEQP7wIyqkR/Sk44GVxps=";
+ sha256 = "Q7paeGAvdmc4+FP28ASLlJhN1ui7M5fDpxnrh+gbEm4=";
};
dontConfigure = true;
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index c4a5508b753..989368f198c 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -89,5 +89,6 @@ mkChromiumDerivation (base: rec {
then ["aarch64-linux" "x86_64-linux"]
else [];
timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
+ broken = elem channel [ "beta" "dev" ]; # Build requires LLVM 12
};
})
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 78d70cc7ab4..667d872ac62 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,9 +18,9 @@
}
},
"beta": {
- "version": "90.0.4430.19",
- "sha256": "174isyx4g62d8ggn9imp41dfklcbxi3y5nfprm4jbjmn5cb7v8xa",
- "sha256bin64": "0z665iykdsmjrjbijsrcq80y2anvcfykasznf8w4brg9l9k59wv8",
+ "version": "90.0.4430.30",
+ "sha256": "01b6naziii72pvw35wphfqz3inih75is038yf1mdp1847jbvxpwp",
+ "sha256bin64": "0k48mfzmyjb0w75fkm2j7ll340qgmzvmskz12awc2l19hgnw1s8p",
"deps": {
"gn": {
"version": "2021-02-09",
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 07a2caca85d..5a71b9d7071 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 = "86.0";
+ version = "86.0.1";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ach/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ach/firefox-86.0.1.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "96cf6afb631f36dd18f0d109bfc31abbff5960e7972b59e4fa51ac0c2c81f9ed";
+ sha256 = "b9006b2c0251ae2264a60be3763dcf9610f3a8569f2a05f266e59c8232400e8c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/af/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/af/firefox-86.0.1.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "38d4588b8498917717ea58419a35751c6c3ae987372ee6a37590a7630eb68c35";
+ sha256 = "7f4268d613acee2e003fe8042dc2e969bd0f6f14b906b35ce6b8c727fbb13d76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/an/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/an/firefox-86.0.1.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "942c9cf4dc6f5baa6c5225a15a2856bd72c7366bcb6224b8ba5a1428cfd974f6";
+ sha256 = "8a892626b4f34413423f4da61d7e0099e215bc9e597092bbd625445e27998d17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ar/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ar/firefox-86.0.1.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "a616e3dfac2bcae832bc6538692a9d811604aadb71079641f77f9b3db105fabd";
+ sha256 = "c837e97ca8b46de448fbc9fd2120ffbb735474ade8a6f64f7ded8dbdfc4c7406";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ast/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ast/firefox-86.0.1.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "0e026de4affddbdf9e5915818c02acb018b214cd005c5122593e86e821919016";
+ sha256 = "8c3b990b899d70c46827ac5a7f32faf9cf44bfba195283bf47d277ccc8da8cbe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/az/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/az/firefox-86.0.1.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "761e129a070f017b28ce51c1f96fa95be8d98e687b44e9e97d95d18db85ad9aa";
+ sha256 = "8fa2a9e6cb6c70fd92b43e2ae145956337f87dd21b468ac375a90a7d18551bce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/be/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/be/firefox-86.0.1.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "9e80115c8a78ab5ff3eec38e31c1ec29decba3660ebc95cb909aedf3db4390ab";
+ sha256 = "dddbf1e9eb8ecc928b534ef5fd77cb52edd0c67f68a522bbc377d5943cfaaa90";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bg/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/bg/firefox-86.0.1.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "b5149b21a8ae9b08ee3abfa2fdb894582e620464af36037c43c2cd0b6667c174";
+ sha256 = "c4eac8234b58f40b40ec5be3fc37817f768d35804f2f923b9d0effa5cf906782";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/bn/firefox-86.0.1.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "0b5ed8e2859e54ce7d64ac8b0626c69229209cfadf14e8d55225272f702a6f8f";
+ sha256 = "41efed647c468ad3da21090e11a4bb861d26106471e0543c3709016d1ca2bd06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/br/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/br/firefox-86.0.1.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "7fb1cdb85510bb8e41f2ce5e856a0ef93c83c430bbe64079a2e3c362bd557ab0";
+ sha256 = "53076688c25034f02b3c30455fbdbea0287bfdd8d5100c0f5edb77ad32955f36";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/bs/firefox-86.0.1.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "2259ddd7f35d5a8d8830a429f0dec92da5ee101d5c42ff5d9f8ff003f76e5b8a";
+ sha256 = "304d9fa41a95f6abf61c16f765ec4651a159af0cabb09b1ce76f805d27746dc4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ca-valencia/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ca-valencia/firefox-86.0.1.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "5214a48525eabc0ae4cda08e70ceba59b0e9fd51976d578f512b02fefbf48b8c";
+ sha256 = "e845d6cbff2cd88b9e1f7526e8aa9eac4aa53c116301ba861e1beb04f9deb4e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ca/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ca/firefox-86.0.1.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "250f4bf5659a04dfb20a651899a92bccd9d24c2e9d3186bb17acc4f452b0b648";
+ sha256 = "5159eb68a571fb035c4621cbeae9d7a88d40172876a00b3ab6512a8701f43f59";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cak/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/cak/firefox-86.0.1.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "959c3cf7aace0b80adc6ae2bedc578b74de66adf261de7b67654e0c57e6ee2f5";
+ sha256 = "efab62e54fa41a65d5989078ee594dc2c2e8c355bd656828321cc342cc167def";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/cs/firefox-86.0.1.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "aaed7891e891ba8926ed5904a798e6201cbc355ba11c341546f779e0f2815abc";
+ sha256 = "1cc3e58c1c2790bd13346b752b2209bc8db08a9470960e06857913a70a7826dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cy/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/cy/firefox-86.0.1.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "064c2419e8fd43e350e055d7bcd4ae1689c4f7667b51996be9037bc4d1c529a3";
+ sha256 = "230d79e979cdc350164fe37ea4ba84183db935ba973efab1ab14b56f0a12344f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/da/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/da/firefox-86.0.1.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "484f1bdd24689a7a7dd7a8b4556b2f32aeb50509aa3f9d645e151dbfaab9e71b";
+ sha256 = "04d50be5260cafde33729aca15cd9731f6fb1550da2db86719e6d672639607fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/de/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/de/firefox-86.0.1.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "12670011be25e5420a5721e23d1e37592e4d1ca9a2efac85db02545398454e65";
+ sha256 = "a4b5c447cb34b91ac5053153e73520d9f5fc8b06a390f5694cda6bc2131efe12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/dsb/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/dsb/firefox-86.0.1.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "2851664d7d9dd90f8e444e13b5c9f20bd6271b6e77ae857db1e3aa55429b8b83";
+ sha256 = "eea691c668126056cb1e4137cf4f6e8d40fe46f79a00c73ccd59723cfb63e404";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/el/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/el/firefox-86.0.1.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "ec24c6634f20da95f820623c32d92f492f2b939280a49e327a1f465b0046632f";
+ sha256 = "d6774ba0cdc0e89091cb57bc1669927f58ed9811617cfbd358567e2a85f977d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-CA/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/en-CA/firefox-86.0.1.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "6c5a19ac4ac5f174569483ee5c1f053e692efc189edfca7e78f9428f05454338";
+ sha256 = "8cb49ea8e3db760de1f3d97f1583f4219c3039d09632f5ef186311145aa2c3c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-GB/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/en-GB/firefox-86.0.1.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "919d6e6c731d53ade97bbb330cd2e425f70565c330233a86ffe9295ff3692001";
+ sha256 = "2ee2ead0c7765e9e5744dff5d7bdfe2ac890cb6859362426bf8244e393f1bb5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-US/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/en-US/firefox-86.0.1.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "c643dd519fe8b0b6d2d2241b5c241aa1b43ece397f49268865b4d1888c19173e";
+ sha256 = "d419da5168312f5d023481668fb4767a27799f02248b4ea90fef98a54ab73b86";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/eo/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/eo/firefox-86.0.1.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "d20b007ba86bdfdd7aa4bdaae08b283107a4464d88a4a9fc34bd4c95781f48d3";
+ sha256 = "0b73a3695f0291c3afdc1635976e6129f94d72d9a9a422ebd3a0cfbbb9343697";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-AR/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-AR/firefox-86.0.1.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "3d4ed05801d31a92c072384e660d7b874be835edd3b6b37741b71bec32a0fa6f";
+ sha256 = "4fe2c2428ce205054d16ee33f432dd865e4d919b63f7c2f0a458bd5b80c9c0b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-CL/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-CL/firefox-86.0.1.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "8ec51d79baefe2808024c33105fd4c1a8e4f5061b72530a4c01bc8a23d6b6cd5";
+ sha256 = "f5d1850c5c10051b04a445001a2991e52a3c1b93002b3534030e85ee0a3c6b5f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-ES/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-ES/firefox-86.0.1.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "38781952508f86d9b4aa7a0c4fae927494e207970e54ba1070943008283c2e23";
+ sha256 = "b99f0532bdc3ab04c421442cf0ea4c24db19a87104ad7d2eff51acb0a383b154";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-MX/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-MX/firefox-86.0.1.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "29817ccf3aad1e38f195f18ab628bca8f9bc4dcd931919cdd9d5d22c6461ce87";
+ sha256 = "56bc322d4c7c160fe1bf095039b5b6e31fcfa234bd5d66ba0995f22af49f5bae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/et/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/et/firefox-86.0.1.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "d4ddde9103e9355a91186e0343315f99bf0eb53b2502abb80b8fcb1056ea82e2";
+ sha256 = "962dcd00ed62c5ca6ef86ede3e965e699f403435de9ce933457dac940141c293";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/eu/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/eu/firefox-86.0.1.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "85744b3d7e3bcd5de92ca4ec5a0ade8421689dda5a3c53e361656f3de3178a91";
+ sha256 = "2ba0643490d449ad39b07e98713f8693ecc16b368cc459a9ea89a35a1ed74978";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fa/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fa/firefox-86.0.1.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "60e6ebb40f1e11a61ad63d2543acd7d83cef58c0fd4dc22f1c553749a36e3fb8";
+ sha256 = "11566ef20d466b2930841f4fce2f92960ceeb1771b82449c274f6a4fcfb85e0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ff/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ff/firefox-86.0.1.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "878d7155fe73ff6585e8566399416361a39080cb54afd61448e1bd0e191046a0";
+ sha256 = "110cbb0d3662bbc73273535abd2846091bb16dda3c221a60a2f7023ef756f764";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fi/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fi/firefox-86.0.1.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "d02f24944f5bbd57273e05aa4fe701b375ad8d8905d0070ec9396a55d104203d";
+ sha256 = "decb87ed765911a9564e15dd97fc7e35164b0af1ab84167dcd598689c8972d30";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fr/firefox-86.0.1.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "ac6497f8a4bfa4e37798840bf4dc9b84463bf095074d2ba3c931e89a402a3fc8";
+ sha256 = "31fa08ae30af62b65b39c16718ee6c6f132cb157a92fc149a3d36870016abde1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fy-NL/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fy-NL/firefox-86.0.1.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "456ff8a1bed8769cd9fc05b29ed23edd29c48514dda4e73ac8e8663593cc3b4b";
+ sha256 = "f75d128c1c6a1b3171132f20f42aca2b798180e1d58f20e264d4defa0e4508d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ga-IE/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ga-IE/firefox-86.0.1.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "b0778c1217f9ee6e631c62ef024991212cb679a43394e07401a5f61ca2b88459";
+ sha256 = "9902efeb4b30b0935be5dec5a7f85c4ec659b8d8f236e012b2d1187a52f3b667";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gd/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gd/firefox-86.0.1.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "37eba79d0db2bf84faa2d89efa0c5b9b34f7fc732636f4b436a3e118792ba610";
+ sha256 = "42c779be313524a365dd59013f5486e79b0378d0dc4fe805b5a6769d44ac98d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gl/firefox-86.0.1.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "ef06e70653f712c4ab594a00c4d571ba098db740ff508cf78e08e859123096dc";
+ sha256 = "cc5d2239946d4b01e31b6da4604a75862f501cc529aecd7962956d4af4dcc970";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gn/firefox-86.0.1.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "c7bbe33c8f839b24ee6928d74d5b0cff18918ab5f2a55e4b3bc1319049b19e4b";
+ sha256 = "4a94e0f10f9002721ac57e622da7ab43cd1788683288564e87f667069fdac427";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gu-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gu-IN/firefox-86.0.1.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "71ceee81509cb6d505b836dd494eb9dba73857aa2c976ec1aab2fa57a50f1519";
+ sha256 = "f81a85e1bea666d339774e0cadd316fccf52752c11a0b5a53a82ac22d6d8dabf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/he/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/he/firefox-86.0.1.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "cca354d947d83c616035fdd64019b50d1bb86c3d01e05090eae2d07953ae566b";
+ sha256 = "347130466e2f42d06707d56e486b4f262874e50c36b69e2badcb7287ff73376b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hi-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hi-IN/firefox-86.0.1.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "a151d3a3d85f0cf96837f51b2a0df9a0a9652148dbcb53733025e15686451669";
+ sha256 = "9600a709b7e4b2bb8f0c57cde08627aff892341cd68edda563cb4d0366ca13f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hr/firefox-86.0.1.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "00e3301bef430e243c6516d5c94e0b5fe6e27ca58fd0192955423956395fb2d4";
+ sha256 = "bea906c0745f77fc99a830594a2eef1ce609b03596a93cefaaf49044edd483c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hsb/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hsb/firefox-86.0.1.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "34c2666668499c8034e732565b244fc5b0cc7b0f544296be1e86942aa62b9167";
+ sha256 = "56bf66c8f38567771b57e9f6008b0e86845cd71873b8ee4aa2c056e2c47d3f9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hu/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hu/firefox-86.0.1.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "d33f5467d9be5a2c6317a10fbd5285c4db7ed4191ceddc317d4ec923bd6ef7df";
+ sha256 = "e7da1098e56e1ad7e1baa3b6075defc6169e28306846c77c8f26c424c748f565";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hy-AM/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hy-AM/firefox-86.0.1.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "a008343614e5fa43d8ce90ac5f2afc0bec98419d28efc191b836ce835b6f48a1";
+ sha256 = "ce3660bf256ed1cccb9c73d0c895907c68104f7f1cc28e7163363a060a747036";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ia/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ia/firefox-86.0.1.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "9140874f06ed6e135ae70fa40600b4e1e570b6dc6901191658870916f73d1c17";
+ sha256 = "b6ebccd0e4c84d71e7da95ae99d6fa2e1a95fe94d6ed200fbf23ea7ff22aff70";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/id/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/id/firefox-86.0.1.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "c1dea9043a7f06708498acfda90a7b166b1f7bf839bf86dc2fbb90cf7a00269f";
+ sha256 = "7d6844743e6a3e56a29f9d5ee599850bdef09f449de70f14e03664c02bebb31a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/is/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/is/firefox-86.0.1.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "50a804f9b7dd594b8c449ce6dd137b5f2bce41ab29baa35f6a14977a5c7af486";
+ sha256 = "28bc14cf54090b9f52ae8fcbc7703f201407520e72f5aa6cd0b9f953d4db1777";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/it/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/it/firefox-86.0.1.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "3ea5e01722a7a03a5dc498977410fd2cde90352b026489669bcb7ebaa571ffdf";
+ sha256 = "1d1a9a7108ebcc0cb796dadbdd9ddf0d8943e5d21c6d56588f33c583e7517b8a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ja/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ja/firefox-86.0.1.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "efac929a1ace0484b5bce056bbd3d3ff4f26f897d4b1739f128d1dfd91c3c375";
+ sha256 = "64342a2674eba04cda7f38e7382b7b2fa93efa1b5c555f0a01e6c59314913f31";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ka/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ka/firefox-86.0.1.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "95261b88327b5b20739d8adb2a99bb0de5d1311099e2d3fc0999405fbc918ae6";
+ sha256 = "38fd38b9a257ba42928e72fed0c3047e000d2a603d37eba1d879ac1d3a87c371";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kab/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/kab/firefox-86.0.1.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "f7b4f440f27ab9141b24f2673e4b850193744d1fc03451c2134a6890b4884f37";
+ sha256 = "24570eeeaf5129ce8891320efe6a77203a3eb213285c71c9f2312da1c1d15303";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/kk/firefox-86.0.1.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "652aeb8d66ffb884983a043ff1d2ba10ff3a03aafe8cd55217a8f6a8068a3e59";
+ sha256 = "cbc294b8e6988e2e010d08608fd1a822f05cf54bb3b3d6772eea13f1a17ee491";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/km/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/km/firefox-86.0.1.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "39deb82ca935780959e4a0f71d85cee3b90c6228237a508b239ad2a1f5a35a07";
+ sha256 = "ba9acd0c686ea2ef2d6d8af279c6cd75852021d16aa9e6d8a0bb429de605d8fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/kn/firefox-86.0.1.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "886370871c27c6637a74e4d8ced9ef2a9ec5062a8aae45fad5fea1dc358e38f4";
+ sha256 = "bba2d328021359961fc0bdf7f5676fe47d72476b4bdb54cd41b09506f49ef0c5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ko/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ko/firefox-86.0.1.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "9acea882760a961e228344c2cac9dfdb8d40c6c4c874744a4f2fffc356f6499c";
+ sha256 = "983f9e165840452aae854b780a480c215f3e030801ff8184424d53b541e1c8b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lij/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/lij/firefox-86.0.1.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "fd76e82cda32813d43d80ae4acaed5610882162d68e98b4ae47dd1ddc8487d82";
+ sha256 = "d57f27ef2a5ab4d8032cb823fa9cb6fc566baced92517dca8ed61560641af96d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lt/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/lt/firefox-86.0.1.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "afcc203f0d080560364277e7cca0f4080c74011dfc0fe07c751124e341e5b729";
+ sha256 = "1866f926855aed60846004450b34fb341faddc992cfc603ad2b689019e888c8c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lv/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/lv/firefox-86.0.1.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "1b8a5cc4941d669f12593dc078d6658751609bd094a3704e9a9949341413ba9d";
+ sha256 = "ac79432c516df059b15737c1bb492a3eec6dcd5261a2ebe17698720ae7085cae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/mk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/mk/firefox-86.0.1.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "72d374b828e3316f119d592bde6ebfe91ac4907d63cde43f6391d4be81119bc4";
+ sha256 = "5d9eefd2926d1554d1feb4526c460506315a805c7e149ca4f87e0ebcb24b3d12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/mr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/mr/firefox-86.0.1.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "17a2dec82a1d89fe74e71f924a21bb175cdb89d801ba50e5f0f0b4625fdabc1d";
+ sha256 = "a5095a4eeea48bea9c52b843023756a9912a979aa8441aa2160785287bdefd1a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ms/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ms/firefox-86.0.1.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "9af2d0b5f81d573c8fed4ff54446b2f3a77080ccec5138b1d0e707fb1c37e164";
+ sha256 = "47b1bc88d7a5f3d0feddbdb0d9e30a5cd9e420b85f3fb360bd6429a4ca1e4bc2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/my/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/my/firefox-86.0.1.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "3a2815eed7a1288991c769045614cc50ec3fed2810ff143652092cd32aef5e1b";
+ sha256 = "420e4b3ef4b31bd850374fdd4098e41d455d02ab2bbf52b5c575d28ea6350afe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nb-NO/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/nb-NO/firefox-86.0.1.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "a8255d1dffb5dcba012a15d5b0f62b9e6e4e60720ae6dc139c23f77aaf6ea99e";
+ sha256 = "6f6656a5370de01fc90eeeab8088d69d71c2e55cd9793b285f0bb88b61d44131";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ne-NP/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ne-NP/firefox-86.0.1.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "e1c563748ae230a44939d27d7fa246e63ad49d242df236082af2eb0c38af8046";
+ sha256 = "e7ac9e8e6914624349fd4cbb230faa96eed54502ec8019cdf2032606654e4464";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/nl/firefox-86.0.1.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "56ab4fedc5c3a71b91693d33eb70f79ba3f0095dda66eae44e3e15f885491d5c";
+ sha256 = "a425e62f533d9e360ec2690946cd9ec5fa4f7da9ce6891558fb50a1bf3be6adc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nn-NO/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/nn-NO/firefox-86.0.1.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "216e2d4434c66fd4361114467ed5e4635342ed53b74eae287d1d69ba63ac85d6";
+ sha256 = "69c939c97646fcd628fe3facd0643c2d43790d7997b902a921190b6269dbf88e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/oc/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/oc/firefox-86.0.1.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "0f6822824131d1709c09de64643a9f6e3b03e30741d079f66229efdfb5096e21";
+ sha256 = "6a4c2ace18b9e00ee25a4600e115af847d305e60d89335203209d5a519ce89fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pa-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pa-IN/firefox-86.0.1.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "9a15f3ea177314500e72ef123ed9dc36bfb9e10b92e5ab20cdaa6e7e1fa3367f";
+ sha256 = "d81d8fda4acd4ccad2cae15a47123cecdd91afa66f93cd635ea13ed6af074fa8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pl/firefox-86.0.1.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "18d19ed1597d3862d08d6daf52dd1bfb8f21c005f7cc44ce4d2e8177b4509aee";
+ sha256 = "cb4b300ff0e8e8b0d874dce5349202b8b29e5a4ff79ab6044df74a53f5c72dc8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pt-BR/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pt-BR/firefox-86.0.1.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "287c3c117532b23e45d726d4541ee726056139e976bf43210f35b529834c3884";
+ sha256 = "654cc5d0a0e35823733e6c9d440c43e4483233a4423c6c9bcaf91cb8fcbeb5ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pt-PT/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pt-PT/firefox-86.0.1.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "26915b7725a325db052cbc165454c34f19e7a1346aa400b1306234707bccdf9b";
+ sha256 = "a944bf18dc7490ce80779af4cce82c20521b48ddb691ed5504d70075116af0d7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/rm/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/rm/firefox-86.0.1.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "4d5c14e2607efc653f5cae75290332229286b5ee606da635871dc04e20495fc3";
+ sha256 = "674921eeca942cc77b08e8c33a273d327357d90df7be91140e468517a59a7cbd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ro/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ro/firefox-86.0.1.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "a41bab63866e22712861a825aae272e3468470783f92c23117e1c116b9d66771";
+ sha256 = "8cbc8f6246455b6deae4a8e619f065ba218b59e711747033b08adffbed8498d1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ru/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ru/firefox-86.0.1.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "edec67a8079f55c5f22b6928bf1d55a2e1d31aff931c9e41e503ff1b7acf2ecf";
+ sha256 = "6d2f6c1d4d8503ee78769c69c97a3cbefa6544a8a1ffb662f10460b6d78fa209";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/si/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/si/firefox-86.0.1.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "0357b913e6528214f30ff5ffd4a0f1c0e26bf079d3afdc166a82ee24e8c099ad";
+ sha256 = "af33afea872e8e2b8825a01d5fcbc40a5b7674813b60735855b5fd0b886c57ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sk/firefox-86.0.1.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "5a38f953d93cf4cb8b4e2dbb0206fc0a9fa3262c55d91fa4cfc3a8605098403e";
+ sha256 = "7ecd39362865c864d6a5412bed20f8946019e3cb845923ce2ee30112d8e6444b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sl/firefox-86.0.1.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "0c2c41f6d7c3f72e56cb84c921207a606f959993ec6a3cc5619bbb894ce6ef8a";
+ sha256 = "93c000e695b37f389356d4f3c48c55de6839688826c507e0cf76fee105409dfa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/son/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/son/firefox-86.0.1.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "cfdedeaacf244b3bc63343f76ed817a165a15b2a727f04327581cd373e76ac86";
+ sha256 = "25df54b6e83be77fa22622905d17667a5db613eca263582daffea9c0079031cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sq/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sq/firefox-86.0.1.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "daac917a1e105b7871a0361db364558251b931898e08c36515c64269c760d6b4";
+ sha256 = "6c8eb230a6de1b5056e530bd76ef0d6f6f35ee29a9d814440c6c2a32460b2de1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sr/firefox-86.0.1.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "c1993cabde0e7df92e45101bd62cd14a86d023763c48c18a7e00018dcfea282f";
+ sha256 = "a7b82f4383608dae512dd528068d9b4b2d4ca194f118098b328fd1b817bed14c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sv-SE/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sv-SE/firefox-86.0.1.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "eb04be61ab3d029437f57dedbf1b66d0bfc6c0a9b29e41fe4fb7aec7b5ab47b0";
+ sha256 = "dd856d068f32271ad024649c945ea4665faabf81a4057a8c7efe4f1cce302eb2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ta/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ta/firefox-86.0.1.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "fbd105183afb74dc7887dfe5cc0e518e96cb8bf79c53fc502d154bbaededacd7";
+ sha256 = "9cb7ec3e3150a3594ae1a460b70d81ce1ddb9fe42696710a0e7eb1baf7c5aa17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/te/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/te/firefox-86.0.1.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "e049b79ce8a81749caa83d6b42ae710414fe08ae2f28a2c1af7c7d47f83b24e0";
+ sha256 = "a3960a97ab3a7a28fe8c218457fe36a5f72827d602ebced3ff74d02f9941100a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/th/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/th/firefox-86.0.1.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "2b3ca062e1e53d5fca726e5c5a9eb7a3a639e4f6e7f5b455bf33e305eda475cc";
+ sha256 = "c342893afcc7b68ba09c8875a55bec4ef2a8c5af40c0ae96a13a662eb0d73115";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/tl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/tl/firefox-86.0.1.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "0fce4ea1fc379ab87c0f565c12f8ee16205108048d7fe89d7850802653247c16";
+ sha256 = "3b0de00b254c2d984bbece1d3ca3acaffdc316a44d7270f4cff4c35425310913";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/tr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/tr/firefox-86.0.1.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "e0a1c0a5d31225fb6af2b5b2c4d7386dc10d9c5c56081c1282615cc8d5da51ba";
+ sha256 = "db36a0260fe69a99d3c834e526a6bdd305334490dd3e644dbd8a48606487209e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/trs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/trs/firefox-86.0.1.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "129d9b5d54cc807664a27fba1fd4f003430bdccf0385cbb53ea77517ce30879f";
+ sha256 = "94bc2723028e39d161bb7e95a27e9ce935671c80646674aecc871205a6c602ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/uk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/uk/firefox-86.0.1.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "d50f3c3f21af6c805bc8c86f886af9f1be2b2d5cb5ad061a000633fa9b7e2641";
+ sha256 = "7ad9a53018e54fcdb860cacc5fad9eb34a08e879ab69d47af21eb31f3d6c2803";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ur/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ur/firefox-86.0.1.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "ac9240e7896f695f48526ad275d887ddef7eb98aa3dd94800a1b4da081110876";
+ sha256 = "6d333e34bb8a332efbff91b9f7d69092b69e377c324693b765eb48b49a7ba108";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/uz/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/uz/firefox-86.0.1.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "94bd2d3f2f95e32381f6b945f4b1149f355dffcc27ec829fd0849ec4895a6da7";
+ sha256 = "5d111ce8b55637ab03c94fef0ed2e5737bbeee4f80a1ca4ff1847c2e9133c31d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/vi/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/vi/firefox-86.0.1.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "e7c8034074e6d1f8f6987321e24dffdbe8acfa11d6784b8c8d033e690a5ed145";
+ sha256 = "7fafefae0afc2142a01d7304cfeda60ce1f6302c29abe2d906391dcafea0f25a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/xh/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/xh/firefox-86.0.1.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "b8f0f3ee8aeeec6fdac5ee15cf688735809994c71cbe4f01b238a3cc1386006a";
+ sha256 = "0d177c264ec9b357be2e616fb02958b4c9d7c6baf292f3c76bbeae84fd2202bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/zh-CN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/zh-CN/firefox-86.0.1.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "47b4f3411306839882f5755b3eb2038f9c7bfd1c2ae72927db54c4816c97217d";
+ sha256 = "2203d75b4a62bfe3cbb51c02665420700ea00686b7b9d4002b9a9a6ddca13f36";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/zh-TW/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/zh-TW/firefox-86.0.1.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "5fb11410c30a813fd0db58c928fb07c488405776308eacf64b238daa0fbffbc1";
+ sha256 = "7d19a8791c79c0bd9fa03ea568f896221cf6432c826f4a59f99ec78139966817";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ach/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ach/firefox-86.0.1.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "06d2dbe0f799d22e98b715528b54566b167a22db4d16d3ad60d84a6e6a8b9e5e";
+ sha256 = "caa9485d62e682e5b06e39528857975d1c862ef23e62c9f4147c5db4027c867f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/af/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/af/firefox-86.0.1.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "536fdd221aa5f872cc8028f39fcfa7b9eecfe09a215da3d50fbfa9e256a1394d";
+ sha256 = "ea114ce9ca7f2c4e5675d25224ffaf7805ec9361097ff47649bd4371937032f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/an/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/an/firefox-86.0.1.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "ba6eff6a355361862fc78879264965f5f1c0adebefe934d1b6d51994023d3bc4";
+ sha256 = "c022590875868195664c4920a3da7bec6bf9942a233190176827d603529a74f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ar/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ar/firefox-86.0.1.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "0b465097dcfd4f2a50eba984b0bb30fedceb1a409e2a98f22c45709cdd1117ae";
+ sha256 = "66ac4afbde7ed45e1d0239e3364c62f788ac26c8bd652b5c571a9f965ae632ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ast/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ast/firefox-86.0.1.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "614241f31f38a71782faf76f0a31cd81d2520523ff85d8a5dfee32a77e48829b";
+ sha256 = "3962d9728bc8a0fde06ab64d6da1f40328938db7689db7b402919191c5286f3e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/az/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/az/firefox-86.0.1.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "4fd682f83c0eee3031c6e452d1c7cde3e54d0e52bb8316b0e2224360665d4fc4";
+ sha256 = "84e786225936123aec5c0f2bb27df9dafcd1ceb2e50e8235749dbc081adfd4eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/be/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/be/firefox-86.0.1.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "c15417c21f42212337bd921c869b05124a720c6d8730e4a16d30ddd9c10aca97";
+ sha256 = "0cfac785cbb8f0c179788dca2a54484473cdfd5e0618894665bbc70d4c2e36f5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bg/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/bg/firefox-86.0.1.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "fda51760d2dfa07d559673605120a34706f8a6546dc4e673dab55b71cbc501ec";
+ sha256 = "8c99908f307fa77fe6e92e58d26ea295471e6421181218fd0ca022c767e1f5f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/bn/firefox-86.0.1.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "f61419c6dd7b20cbdc48cb0faf51cc831fa90f37a721a162bf32753d85a40aff";
+ sha256 = "28b303305691ea7f8228580135acde6c17d745719a96e82c60b8d6738fdf2bde";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/br/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/br/firefox-86.0.1.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "7d60c5f6be2270e9b40612dfb1072ab5d29bd02d070f463f1df915f8d13873d3";
+ sha256 = "83a76a0e7dad03453178dbb3a792aab03500359b623851b9a6ec9a4c1e0af084";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/bs/firefox-86.0.1.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "4707568c61df2d2050e3f1c18d3a2dee1c5bcfd091f32bd615f2e75ed06949fc";
+ sha256 = "0700c7d655136ac51134a6da9def1747a27d84ee21b523dfcc6f30042f9b8632";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ca-valencia/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ca-valencia/firefox-86.0.1.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "fe52cf8f5f531143ef28e728753610b442443de53f34a4a8d6318d5124a10caf";
+ sha256 = "d7738e186c6bd3f4a35c53bc6cf39876ad7774a45bbb3a44529c322f48a490b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ca/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ca/firefox-86.0.1.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "8e6baa8ac94878448f65598042d47b9789352fba55d4e4f91cbe319f9676780e";
+ sha256 = "ca63b150369c02a048ddbfaaa2f2faeb2729fb46086937c97a93d684975e2837";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cak/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/cak/firefox-86.0.1.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "006a887bfaea07c40ee0f67ebccb1aa538f56e28f625cf2b085242c26ebe7bf0";
+ sha256 = "2a8a8ebe18dce87a021c71e87e2815b227b03e3251d141f044c083d7a4c942dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/cs/firefox-86.0.1.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "27f1c5634e101d3681885a8d2d572b73f8c9db2215e4836a6cd71fbcd0a5b8dc";
+ sha256 = "5e60175642fa8260c4125b90412564fbd49b8f91ca204c30dc687108273184db";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cy/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/cy/firefox-86.0.1.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "9e56e8f88baae2a4c99ae12041ed9c766dedc99b7ffd75bffbba92a7c19d98b9";
+ sha256 = "ee6e49cc30f01f5604cdb317801ced10c24809ed64f6505f44b6a33cb359641a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/da/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/da/firefox-86.0.1.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "eb317f12d74ac8b636c87dfe9c1cb0ce267a15ffeedb79956e1c15e971d1b7e4";
+ sha256 = "8c447626d889aa067bd758a56e4dce720f01192e283c7e01997c6f85f0265f89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/de/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/de/firefox-86.0.1.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "8a736a3a9c257f2b4509e3ec2f74259f655369159981cfedf8468de9cb1fb22a";
+ sha256 = "12d52ecbf5c4b9313c3e9cb61a353f812319142c6b20594f7fbee01a339d98ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/dsb/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/dsb/firefox-86.0.1.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "a8fbd4dd6d1172f67744e9283efb6cb644421cb07e3568cae0d3c68c479d653b";
+ sha256 = "5064e20ca27adaf48d5c4041c12db3738c95b9143f667ddbc28230ef9387b28e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/el/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/el/firefox-86.0.1.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "59baec30ea1d8e30982f52279003b6e1be0148c02f38fdf283325c53ad900ee5";
+ sha256 = "a625d2caf3be1a5039a90c3515d1598b5acb87a4e4df4e0ea22f0a63b0405ae7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-CA/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/en-CA/firefox-86.0.1.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "a4e0ea60acf339a61c19272170d2efdb4f519325bf2f71bcbf82af70ca304af0";
+ sha256 = "cc1c18c8d4d53495fc4236c95b353bbe40c3de16ded002b2bb991a824fc67210";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-GB/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/en-GB/firefox-86.0.1.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "6c82da02a7560977faad1ca3d4c3973d08583fc0ce75e1de6e5aee2c9d372b38";
+ sha256 = "c76f7607b28bfee12eebf2aae7590fea71ed2a4f3bb0ce3903f0331187640122";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-US/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/en-US/firefox-86.0.1.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "eeec3b446c30c65d4af72d04d58c6d5ddb04c13e871a5351921a737f7e1cf234";
+ sha256 = "fe6bb788d3c5264943ae5a287cee691f6aea8b3502f11e386f6d723a08dc545f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/eo/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/eo/firefox-86.0.1.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "4cbb1144cadfd901082829f8e67e311c51df96ecd08aa2082772421d6445f2fa";
+ sha256 = "39af3debe06726ddd02a4914bfecda2d023d9445e7c735e8974ad73f45955298";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-AR/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-AR/firefox-86.0.1.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "c875473caefc7e18a4f7a0a3e7d44ce659a2271fc1b21d435a70c921092b8af4";
+ sha256 = "2d66f2f28958157da1dfda56827f5330f6d7b9fb192899b2ad60ecd6d18e9505";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-CL/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-CL/firefox-86.0.1.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "d1bf9c2a1df028b5d6eca5b41c975afc6378701c6f33d888b46511da5ce5e498";
+ sha256 = "cb69afb6ac3b47721176934047ec9ab3b1127b7d36da7b9ae9af9aec72bb8289";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-ES/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-ES/firefox-86.0.1.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "5ee1967bc61259869441f61061fec2f24ee3a4179c64b245768387e94acafdce";
+ sha256 = "3c0ae2ce17078ef568ac71d5cf8ceb0769fdb8298ce17c58468cf57ab7a95af8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-MX/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-MX/firefox-86.0.1.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "6b4669581f26a18fbd0bda8d605b9d22b3aa98eb193ea81f7ebce1db4d39a263";
+ sha256 = "cd07a75c8c96ac8d31cb988d9d394e5e2eb9bb6cfd6df33d6e60d38a6406a4a8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/et/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/et/firefox-86.0.1.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "0c41ec2c1df4cbd295d349a7b6ad7a7e974662319d4a1d458e9f6bd31c4830c0";
+ sha256 = "cced1ea2d54c9d305b61ff1d1025aaa5f23bfe86fca3b0e915f2dcde1384d042";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/eu/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/eu/firefox-86.0.1.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "e7bb380e013f5cf35edba5b698a5e3fafd7af63593c663e0029e2754f6854b4f";
+ sha256 = "9105eebe6f606292b82eda26eb68b399dd13e1756f1ca88395f0b7714089ea4a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fa/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fa/firefox-86.0.1.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "d2601f3b84b31d9852a3f2ec35ae8b43f8640da18976f5f4c8a77cf7ad360a22";
+ sha256 = "9956fc5949d1e111265dfcd71373d8ada4cb2f554b9ffa2dbda0c430296ece56";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ff/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ff/firefox-86.0.1.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "a13ee0463fc23cff51f88072d527a6b758fd313276cc7e5f3c8a0c4c8d5f5404";
+ sha256 = "02a6a2f711db26b74094744e9f198ddc05a1188fef0fa330949e9e5056c7ffba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fi/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fi/firefox-86.0.1.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "76a153c9e398eb259c69b30d15782b7d7a9ebd156283f1034c20182cd72e13f7";
+ sha256 = "368c2a59f1446d61a7a27892ddaaa5f933cbbcb9e3f238db5f9e9cb77873e37c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fr/firefox-86.0.1.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "6f5d6e07251f75d6355f52558f2734d2788bb87e1e53ccfb800e03173094f765";
+ sha256 = "d543125a0e0402245064dc763eafcb3b00237c217a929b04f44db6755319ae2d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fy-NL/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fy-NL/firefox-86.0.1.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "785a30a785e55158c7251e623683350ed4840bb4b6f002d34cdee82d91b33d10";
+ sha256 = "ad28252c39eac70b9ce15631c65dfe520950d36212a547587978c635bf835187";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ga-IE/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ga-IE/firefox-86.0.1.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "f32f8a0e5f0b5fd2a1dd147b32880605186a4b9435e39a53fc87f42eb8706979";
+ sha256 = "a16c0117757cadacc408f95a81e38b7f7e9489a4b6ceef30b8a65796fa6a2ca2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gd/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gd/firefox-86.0.1.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "2893dd13353b3504a00e02f65f0b2a0a72dd43771148d45cca271aa752a0c520";
+ sha256 = "83b61f8e5801607f7b71fe2fa5fd7aede2cd56e4b46b25057935afb23f28ba01";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gl/firefox-86.0.1.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "b5bcf0eff53f6bda0e394be3e483c3f314d962a919473492a7d1005b6976b861";
+ sha256 = "a603031b44679e8e9dfa14c2094690c786b4ded18d736bb16d683e978346fefe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gn/firefox-86.0.1.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "c979d766174b2e4df72de6a375084b509e879f11a13c1972c97b5ba0accb67d7";
+ sha256 = "5146bded3c264c6a77a9e4e9a1c5523e63858eed5077e8ded56d52b94fafa7fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gu-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gu-IN/firefox-86.0.1.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "0e053f93d56a8fd9c07bfef4e93f1f338f951f519be669f5ff18157ca4216025";
+ sha256 = "d177f05815889cd026879d6ddb3c03d3c62bb3b2787ca68a97902671977400e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/he/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/he/firefox-86.0.1.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "05435889024f622f69d82a0007c19b50b1842f2cfa558748b39859a94a7addaf";
+ sha256 = "c3534b56a9fb43e959c8c6055f6af0c1ce9e512bee8786fa4a1028ba0813cd73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hi-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hi-IN/firefox-86.0.1.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "7fb87408064c024305295c38938c42b34a0c627b177cacb00ed9e79a0ff974c8";
+ sha256 = "a4885b1515cee1352bd534de17742af432502169d8cf2f34426950a5482647cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hr/firefox-86.0.1.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "924141a867793aa4fb3d2b87b75c1d60cc39bb3a3591eaaf6ee3381fcf28fcc6";
+ sha256 = "1d9d49b4360efa296ec8b6750aaf8e09a24d749e3694d30dca446480b350a733";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hsb/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hsb/firefox-86.0.1.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "7ce0f09c144462f9c94dc6805165543d12afbf0e44e327dae4554fecf272601e";
+ sha256 = "65b890ced9ffc672d92d8fe998ff4f5deb485f22ec4d1525525fac81ed30c2e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hu/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hu/firefox-86.0.1.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "8997e6d5620e0f565939cd8f127c4e86da0c46828c66fab7333073c3cbb8054e";
+ sha256 = "90e32c53ad910ecce1558c99f10514775b72efc207451e9c61127051c92fe450";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hy-AM/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hy-AM/firefox-86.0.1.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "aeff6c4b8c7d164b63bf22808ea234236f893e6da2b3d9142f95d89e9ec7178e";
+ sha256 = "02c1dc969487809e432f4053b39b996ffcf51c81c7827146d3cd7a25ff050abf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ia/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ia/firefox-86.0.1.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "0590e0469ac2e562325d786dcb68e2ca2111aa8ae1ff3717ef8db2259e6ec149";
+ sha256 = "81d027c3facbe67258151046d9aa53a7d832d1a120aa671532524c87b79efe80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/id/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/id/firefox-86.0.1.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "ef8dc62e52df3e6b1d37aea5f9b9a214a26e51ef9fd378f56ac8b2245de54613";
+ sha256 = "7a54acb6b8f14cac3d2a7e21fba5990dbaab9d4efef8d2a55642ff120905cbd9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/is/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/is/firefox-86.0.1.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "aeabfd51aa160ba259850b7fac88829f81bcc0dd8ccc9168c7add07ce0d4efc3";
+ sha256 = "c1611ebeceaf431883e5dd61b15aef2954007feaea3cc7503573216ba4cbcb0e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/it/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/it/firefox-86.0.1.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "c6069c0a86344af00150be03cb0f2c26984b713ad386352f5a10b39b79b13cac";
+ sha256 = "76042e19b820c69b1d7d39f3be87069142a4fb6c0327b8f67f78b87821454cc9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ja/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ja/firefox-86.0.1.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "9be7b40e66723583b17657ea805919955dda703957ba21d541baa22390a1befe";
+ sha256 = "6e2d8fe15275935a02e3f07ebf14b61f657a35cdff262d50e3a0f10e3ff587be";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ka/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ka/firefox-86.0.1.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "2e8a57b44b3bec627793f46df84f7f25ab0aedd0f8b1f08202c75cc58d7e14c1";
+ sha256 = "93f59b3150795ee6a1d5cd446cd0147f5ccee359939fcecae63a262f28eea0ca";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kab/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/kab/firefox-86.0.1.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "5777a6b5eb3055ab2c93f98bc597343f13bff7d0a846809d24c97e9ba1a0ca7d";
+ sha256 = "d71c30914f32b0f5f25c1492e94d0a397997f946f1ff58c85997d9c6c55ddd4e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/kk/firefox-86.0.1.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "84a8fbf2a859d81aae2aae6bc95f12a8e2982cff77090072a01d28daccbf21f9";
+ sha256 = "9c3b1b80d46c75526c5c9b53229e74aa7cb7219a3110218ecbd099e1d05037ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/km/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/km/firefox-86.0.1.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "55982f15b467ddea6203fbcf98081496d0e313d3cd281f807d2bb75b4e79077e";
+ sha256 = "95b59cdaa6caeb5cfbcfc673faed614650dbd44458c79684ca7f2ee4ef678e4f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kn/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/kn/firefox-86.0.1.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "18aedab4f324448da412ddebd1da9b01be51edcd5052c9455672a763ae1f673b";
+ sha256 = "31d79f5609140fb213e19b60d638811ef576bb3db8be533aa92a02ffd22d4df5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ko/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ko/firefox-86.0.1.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "5baa361fb97a76d12bfbf5b87c092cbe8079d34dd08842dae9def133383f587a";
+ sha256 = "f05215e9004a651b239475bf02de19709fb2ceacd99f0da22ba4ae91dfd899f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lij/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/lij/firefox-86.0.1.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "35bf3aeba596135231b1ddff2e2550ab2a3e0c5bc796d7b628c5f78ac46ce40f";
+ sha256 = "309ce372ace38efc2cd907df32d18fad97e8fe66728c52efcbc36a36e91163f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lt/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/lt/firefox-86.0.1.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "eedf7ba2cf4634ab18c2f2926266845a29c9bce8ba747554d413b276445b9eb1";
+ sha256 = "1426fae07194ec4dde7fd797631cbb561726af5b1c255b72c13a96b54034a440";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lv/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/lv/firefox-86.0.1.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "a1c5f04c16f6d50a0797e466d6a8836de40219567f04928cda7f64d967d8afa7";
+ sha256 = "48be4205b0d9ba8de2545a73950a4c2836db3d046707ae5db7e2cba0dadaa3a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/mk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/mk/firefox-86.0.1.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "8de29502640b51ac9f586ae7713903612911cf01cd7aecb6d74175a816cce6a3";
+ sha256 = "6cc5019e2d41510a67cec8850451fa16e868da753dceb8a38a0cec893814f07a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/mr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/mr/firefox-86.0.1.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "f4cb4ddcac3b5ede422e54c69c05902506be788b45a79cfee6e21a0b7b8c3ca5";
+ sha256 = "ba73c1ceac1ad36912f6367a23bcdc4455627d16f2bb589cde4abb5304b06d67";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ms/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ms/firefox-86.0.1.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "aa09b472e21b453f6875e25dc7922ca062934527a306f3b338cd32636076c021";
+ sha256 = "09935a83eb75eb9f89847d9b279c5728c524bef37d063969ec3e44346ef74c12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/my/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/my/firefox-86.0.1.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "4a4ad99aac0614aa25fd77c4c740c49f509db2333c37f797018362b15f38d1d4";
+ sha256 = "55b7adcbe1bb47dc49e1d51d99fa3b3a9aa3028a56fe2c53848ec9591503360a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nb-NO/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/nb-NO/firefox-86.0.1.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "45814c2d731cd8435a92c31e9311c333d4357dc38e9196fbc24358289004df8b";
+ sha256 = "87e7f1d1ecb402f9484e40078a3460b18aa41d88f0bedf61edeb937474ab3e69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ne-NP/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ne-NP/firefox-86.0.1.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "008ecc3d7bf7932a320b6ec12404a5259032930539a65e60f8aa2f98f9018524";
+ sha256 = "0c5e84344df03c41ab835c3af847772d13fe48d3395fc2aeef020eab04f76baa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/nl/firefox-86.0.1.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "0202adc844602502b48d078a665b1e9012c65172deda406ac9db972e05456fc7";
+ sha256 = "75f54fc189ee6f43277066a2600bd340375fa5820e64dc340a3ac93a1f0a6ea0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nn-NO/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/nn-NO/firefox-86.0.1.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "28f34c957628178a112ad6a7c16d9dd20e58bc3a9068fb1e59ef5e656ac8f02f";
+ sha256 = "e1dd0adfc33ac73890d849c685d3072a8bfbe6ad3b5ad0bcfa0a04c9ec817c1c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/oc/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/oc/firefox-86.0.1.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "4645cc6de115ff73444dfa4165a82b3ba1b0adbe3c4eff6fd854c9ec594a7bbb";
+ sha256 = "2eea8f40976373fa98d7d32c016dbf0e05fb8f53f3c0f038a087220ea91999a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pa-IN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pa-IN/firefox-86.0.1.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "3fbe8e5c7b4fb420a6a6c62475bd01fead342d7431578b96f391a829cf184be4";
+ sha256 = "03c1dface09201be51bd8df92a420b67ce885a712231754dec5e42a4e5cb8cd8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pl/firefox-86.0.1.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "6850d14c02c152fb6252b08a111ff6bccbaee6a6ff76a99c018b497a8a014ab0";
+ sha256 = "1d4fad5713d1b6606551aa9b9527c4919e548fc9fb50b921404609dd7a43c76f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pt-BR/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pt-BR/firefox-86.0.1.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "a0aac09a39302df30a48c54e64ae422166eb781ef349dbc58927e077310fae5f";
+ sha256 = "53defe8219ee88152a542e24526a3bb9d75e0117e606a3e976d798f441acd64e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pt-PT/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pt-PT/firefox-86.0.1.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "e577444bd6ef376b0277cc2181bf50bc1ac3e377bed171f30616f536fa2d516b";
+ sha256 = "d91483eca2e1972ce6a0ac97b0393a9cf28a36eb1e923cd863d37b8fc66f4edd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/rm/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/rm/firefox-86.0.1.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "2a4f5f35caa3ec5b9f20c1160dd038ce3d689593650771c3e63246cc53b23cfe";
+ sha256 = "926234371843aae60cc81886ab7ebaca7bceb6f705ab9d2560ddf996e46f6aa3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ro/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ro/firefox-86.0.1.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "c68f195f10bcd7d19aa76084450419008068ee5d30c34acc02d7621ea250211a";
+ sha256 = "9c63bcf8b603b65f355460d0de6827e363ec0797bddb9d446e116b641a5f430e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ru/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ru/firefox-86.0.1.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "e6e7dcc74dac1c331d3202a141df71dbe2e5a398e2b97c9da1358707823d76b4";
+ sha256 = "f4cb8e70dd3c0b2bb97b28c6f85654786f65daf6705559a3dba87a5aa4f0ae18";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/si/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/si/firefox-86.0.1.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "1bf321805bd46e0214568921b89eaf5ea4d394e43fb1d475ee61c7de8439d997";
+ sha256 = "b305cfa2be37591ae0bf49de8da37ffa3a5c69b242196073d84124dd02dd094e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sk/firefox-86.0.1.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "221667dd6eead982d13e911e0ee9d6fb0e6288d689c59c7adc403e8eeab6fd4f";
+ sha256 = "23772e40241f955d20a1579f283c6d648e180ae7da21ef0a914156733f89e6a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sl/firefox-86.0.1.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "5df6f40394d0c2561c5103cb0600d3566b2bf42dca4d6a3194bee725577f1dad";
+ sha256 = "7213f902b853bbce4594db2f5555e437a82adaeb506a9d1421ff9015d29a9659";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/son/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/son/firefox-86.0.1.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "8ce2f3d67ea7e1889fce2f534e90320403350b27bd63e97263a9c14544d7f212";
+ sha256 = "7b45520bd7305b28803bd4e2f22d41216707754ef46cf6981f0c299b03efeedc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sq/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sq/firefox-86.0.1.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "a4f403eefa8da37d7308bda7a10cf62dbe9ff74f848e9e3603d9b787c1629b05";
+ sha256 = "11b0b971a705d483f3dd7fab066d034f0a30dd95e16bb7d7aece44d8ccabf450";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sr/firefox-86.0.1.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "7f3d5fb8cb77c2405403f9899257d41f4e9fcdb45a1af945e337228d7648f79d";
+ sha256 = "07369958e98d1959be2e52b33145ed1075dd85220de38fcaf617d207217a0066";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sv-SE/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sv-SE/firefox-86.0.1.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "261886fc3f3c9c40123a6b6ae0040fffb281d90cbc34506f85bcd73cb94276f2";
+ sha256 = "7671a24d1b81b26c34a21cedea05b6c132963045d3cbc28ee264f9c56302cefd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ta/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ta/firefox-86.0.1.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "3df7b4c5eb395b123d8c9a67d58e2eda268bd931394e38941545cded144b97e7";
+ sha256 = "bf605ceac99dfc2ed058ada9bb9fbd7ae56fdea3453d7dea23ca13dc284391bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/te/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/te/firefox-86.0.1.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "b27fe9f6d6e4920e5714a74f439900238900e164cce584f1a1548a02105caa10";
+ sha256 = "8aea95f2069a59cbb575f386a7e90d04ecd0f4c4139aefc6dcba54b9b56e7aac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/th/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/th/firefox-86.0.1.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "e4eadb2885d09a082c40e27eb41e5a8f721ddd45ef79ed0ccba02f18d7fc3d6a";
+ sha256 = "4985ee399155bd0854c9b9068fa747f396855b1251610c3261fc5c7da5e5894c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/tl/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/tl/firefox-86.0.1.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "392368f316cf89668e2ff9a42e0b170b55bfc610c84b0a605866914a39273fce";
+ sha256 = "d328338029e0282ca5e3c7e0bcff73faddfbb4bdcb47a2978622c80e2dd8d0b3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/tr/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/tr/firefox-86.0.1.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "e9c7f55b656860dc6d2b28fcca66dbc6e7290d2f418da238ca06ccfe68fdd579";
+ sha256 = "a438f5504b0fb62173a8a739645e7f269647e33316a35a96c5dce71d9d87bb0a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/trs/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/trs/firefox-86.0.1.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "9cd24da9a1dbc0665b589ea8d1f5e5a3546a8b7babbd0f9f2f27641d5c81eeaf";
+ sha256 = "41c90f6a5de249fc5b0dcec21d5d2684b5d3be2767d6073529101f31bec569a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/uk/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/uk/firefox-86.0.1.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "0bbd4c03dd422901bf2ff1a6e000ec4c6ed798bfa66ade8db03551f5509efc40";
+ sha256 = "06419fe5e671a6476500a8ecfe736237adbafdb39148d56d514fc7f07ff09e87";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ur/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ur/firefox-86.0.1.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "c0f807c2c7365f281d921fd347a173ce2538fce79b1e74beedf928f392422236";
+ sha256 = "f5c1729584fc7843da5febf2411196d4615d4d5b490dc9a0f7b0709496b61ad0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/uz/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/uz/firefox-86.0.1.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "f561501fdf1a0edf9f58289fe608b9d47c00ef666c7f980972f0f3112470ad27";
+ sha256 = "a1a898dae70288fac86c0ff36b92731e7b3400652b5bef485db73cd8ed933e8b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/vi/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/vi/firefox-86.0.1.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "12ce7eae83ef3100039871e82784ba7a63742ef8f132c48ceccac22641074c1e";
+ sha256 = "7c12e8fe3b30ae8b8bb106a3ce866b23dcdcdb7924ca41e8c9b3d541e0300963";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/xh/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/xh/firefox-86.0.1.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "9def9420b6e6e252839268167e978cc357add46e54e77a0f5bf8e03a2183a855";
+ sha256 = "97f40f99c9d0204db12d1da1e58088dac2fcd02be6f4fd5c477d20f0149d1f56";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/zh-CN/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/zh-CN/firefox-86.0.1.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "03cea12f34a9eb22e730d6b28f294bc2a1578e9c357a15bcf189ab1fb925e337";
+ sha256 = "309e7670632171133fef52c1426a1f42fb4e14c4d99a8f9543439b21105425f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/zh-TW/firefox-86.0.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/zh-TW/firefox-86.0.1.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "cf5e5cdf7230bf231f63750b3747b625d64026194c29b36c3d00ff9851960745";
+ sha256 = "5993ffa86327a42ea91aa884e90bdb8626d4108a8299acb2f80623e8aaf3ed3e";
}
];
}
diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix
index fcd27eceaa8..8937404e91d 100644
--- a/pkgs/applications/networking/calls/default.nix
+++ b/pkgs/applications/networking/calls/default.nix
@@ -3,7 +3,6 @@
, fetchFromGitLab
, meson
, ninja
-, cmake
, pkg-config
, libhandy
, modemmanager
@@ -13,35 +12,46 @@
, feedbackd
, callaudiod
, evolution-data-server
+, glib
, folks
, desktop-file-utils
+, appstream-glib
, libpeas
, dbus
, vala
, wrapGAppsHook
, xvfb_run
+, gtk-doc
+, docbook-xsl-nons
+, docbook_xml_dtd_43
+, gobject-introspection
}:
stdenv.mkDerivation rec {
pname = "calls";
- version = "0.2.0";
+ version = "0.3.1";
src = fetchFromGitLab {
domain = "source.puri.sm";
owner = "Librem5";
repo = pname;
rev = "v${version}";
- sha256 = "1qmjdhnr95dawccw1ss8hc3lk0cypj86xg2amjq7avzn86ryd76l";
+ sha256 = "0igap5ynq269xqaky6fqhdg2dpsvxa008z953ywa4s5b5g5dk3dd";
};
+ outputs = [ "out" "devdoc" ];
+
nativeBuildInputs = [
meson
ninja
pkg-config
desktop-file-utils
+ appstream-glib
vala
- cmake
wrapGAppsHook
+ gtk-doc
+ docbook-xsl-nons
+ docbook_xml_dtd_43
];
buildInputs = [
@@ -62,10 +72,10 @@ stdenv.mkDerivation rec {
xvfb_run
];
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
mesonFlags = [
- # docs fail to build
- # https://source.puri.sm/Librem5/calls/issues/99
- "-Dgtk_doc=false"
+ "-Dgtk_doc=true"
];
doCheck = true;
@@ -73,6 +83,7 @@ stdenv.mkDerivation rec {
checkPhase = ''
runHook preCheck
NO_AT_BRIDGE=1 \
+ XDG_DATA_DIRS=${folks}/share/gsettings-schemas/${folks.name} \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
meson test --print-errorlogs
diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix
index e0ae7636f60..852088ec47a 100644
--- a/pkgs/applications/networking/cluster/fluxctl/default.nix
+++ b/pkgs/applications/networking/cluster/fluxctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fluxctl";
- version = "1.21.2";
+ version = "1.22.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = "flux";
rev = version;
- sha256 = "sha256-pI/LGAjTWFXiDKSV+dZl0wXK/TZmN9DuWf5Nu8EYNYc=";
+ sha256 = "sha256-7uS8704YZ7lQTSSnbVvc6T5iadl02TeVpwVPf2uS9L4=";
};
- vendorSha256 = "sha256-Q8gIhJSZqdjBXrIcJfCd25BniDScwVzUwZ9Vc8p/z3c=";
+ vendorSha256 = "sha256-oqfJaQA8ybh0UNWYJ2ukoWkwdgORwvXzRCquGstwA4M=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix
index 656badfe5a0..6b303ce0f40 100644
--- a/pkgs/applications/networking/cluster/lens/default.nix
+++ b/pkgs/applications/networking/cluster/lens/default.nix
@@ -2,12 +2,12 @@
let
pname = "lens";
- version = "3.6.7";
+ version = "4.1.4";
name = "${pname}-${version}";
src = fetchurl {
- url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.AppImage";
- sha256 = "0var7d31ab6lq2vq6brk2dnhlnhqjp2gdqhygif567cdmcpn4vz8";
+ url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.x86_64.AppImage";
+ sha256 = "0g7k3sld6m31qi0zc9z5gydi60waw7ykwz48qnyg77xz1cpm6z5x";
name="${pname}.AppImage";
};
diff --git a/pkgs/applications/networking/cluster/nixops/shell.nix b/pkgs/applications/networking/cluster/nixops/shell.nix
index 6d298b8df83..3fc06b0bc73 100644
--- a/pkgs/applications/networking/cluster/nixops/shell.nix
+++ b/pkgs/applications/networking/cluster/nixops/shell.nix
@@ -3,7 +3,7 @@
pkgs.mkShell {
buildInputs = [
pkgs.poetry2nix.cli
- pkgs.pkgconfig
+ pkgs.pkg-config
pkgs.libvirt
pkgs.poetry
];
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index f65bc869382..c7097f6868f 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terragrunt";
- version = "0.28.12";
+ version = "0.28.15";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-oHujPgnS76FYihzZV5ZzPP+4+77zNtYozH9jhqJJyVI=";
+ sha256 = "sha256-PhTFgYoSaGv54uak8QB7p963OBSgo9s1UM9/XBmYC8g=";
};
- vendorSha256 = "sha256-SVrDBDGK809O+RaE3gOa9U1agY6hSGI/k3FUCgm+5PA=";
+ vendorSha256 = "sha256-vHKqowc3euQQyvgfaTbIgSXOhPcf2nSoteQK0a574Kc=";
doCheck = false;
diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix
index f28754005ec..7675dc0de88 100644
--- a/pkgs/applications/networking/cluster/waypoint/default.nix
+++ b/pkgs/applications/networking/cluster/waypoint/default.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "waypoint";
- version = "0.2.3";
+ version = "0.2.4";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-FTBBDKFUoyC+Xdm3+2QWXK57fLwitYrFP89OvAyHHVY=";
+ sha256 = "sha256-6sV2e/m0qVSRWgdvVZ9VxEL/J57nTcTClxHF5X8/8PQ=";
};
deleteVendor = true;
- vendorSha256 = "sha256-ihelAumTRgLALevJdVq3V3SISitiRPCQZUh2h5/eczA=";
+ vendorSha256 = "sha256-NPE3YHulqllWDGrxQgPmy/KKE7xFPOUorLQNIU8cP50=";
nativeBuildInputs = [ go-bindata ];
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 877cdec4ca8..b4c1e95087e 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "filezilla";
- version = "3.51.0";
+ version = "3.52.2";
src = fetchurl {
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
- sha256 = "0k3c7gm16snc6dr9a3xgq14ajyqj4hxcrd6hk6jk5fsi9x51rgl2";
+ sha256 = "sha256-wHiIFpKKJuiGPH3CaxWGROcb7ylAbffS7aN9xIENbN8=";
};
# https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769
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 caf80c2460f..19c499b3199 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.22",
+ "version": "1.7.23",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index f147918cdc5..30dffe0c16f 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.22";
+ version = "1.7.23";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
- sha256 = "152ggkkk997pg3xdcdzn3samv3vsb6qifgkyl82bnwchy8y3611d";
+ sha256 = "0vvjbh81h6sg6dbm9d6ffav0dim9sadvs67jcm702677qgigkc53";
};
in mkYarnPackage rec {
name = "element-desktop-${version}";
diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix
index a75b02ef8a5..be3c075db7a 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.22";
+ version = "1.7.23";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
- sha256 = "1aaa986h38kkrnyhb1y65d73idsxmkmi201511az9zlz9210ih59";
+ sha256 = "10n899gc3qcjy2cskk0whwz60pnvh500x1b57kn22l9bhkg9xkvp";
};
installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index 9f5cd6f69bf..ca6537fdfb5 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -87,8 +87,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Matrix group messaging app";
homepage = "https://gitlab.gnome.org/GNOME/fractal";
- license = licenses.gpl3Plus;
- broken = stdenv.isDarwin;
+ license = licenses.gpl3;
+ # couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2)
+ broken = true;
maintainers = with maintainers; [ dtzWill worldofpeace ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index c373d23948b..5aaed6eb211 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -4,7 +4,7 @@
, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
, notifySupport ? true, libnotify ? null, gdk-pixbuf ? null
-, traySupport ? true, gnome2 ? null
+, traySupport ? true, gtk2 ? null
, pgpSupport ? true, gpgme ? null
, pythonPluginSupport ? true, python ? null
, omemoSupport ? true, libsignal-protocol-c ? null, libgcrypt ? null
@@ -12,7 +12,7 @@
assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
assert notifySupport -> libnotify != null && gdk-pixbuf != null;
-assert traySupport -> gnome2 != null;
+assert traySupport -> gtk2 != null;
assert pgpSupport -> gpgme != null;
assert pythonPluginSupport -> python != null;
assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null;
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
curl libmesode cmocka libmicrohttpd sqlite
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
++ optionals notifySupport [ libnotify gdk-pixbuf ]
- ++ optionals traySupport [ gnome2.gtk ]
+ ++ optionals traySupport [ gtk2 ]
++ optionals pgpSupport [ gpgme ]
++ optionals pythonPluginSupport [ python ]
++ optionals omemoSupport [ libsignal-protocol-c libgcrypt ];
diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix
index 0ce5f764128..47027da9a91 100644
--- a/pkgs/applications/networking/instant-messengers/stride/default.nix
+++ b/pkgs/applications/networking/instant-messengers/stride/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
-, freetype, gdk-pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }:
+, freetype, gdk-pixbuf, glib, gnome2, gtk2, nspr, nss, pango, udev, xorg }:
let
fullPath = lib.makeLibraryPath [
alsaLib
@@ -13,7 +13,7 @@ let
gdk-pixbuf
glib
gnome2.GConf
- gnome2.gtk
+ gtk2
nspr
nss
pango
diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix
index 9e7a1f8154b..aaa00e031d1 100644
--- a/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams/default.nix
@@ -82,6 +82,11 @@ stdenv.mkDerivation rec {
echo "Adding runtime dependencies to RPATH of Node module $mod"
patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod"
done;
+
+ # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406
+ # while we create the wrapper ourselves, gappsWrapperArgs leads to the same issue
+ # another option would be to introduce gappsWrapperAppendedArgs, to allow control of positioning
+ substituteInPlace "$out/bin/teams" --replace '.teams-wrapped" --disable-namespace-sandbox --disable-setuid-sandbox "$@"' '.teams-wrapped" "$@" --disable-namespace-sandbox --disable-setuid-sandbox'
'';
meta = with lib; {
diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 09a5d781c44..1abedf58026 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -22,13 +22,13 @@ let
pname = "wire-desktop";
version = {
- x86_64-darwin = "3.21.3959";
- x86_64-linux = "3.22.2937";
+ x86_64-darwin = "3.23.4046";
+ x86_64-linux = "3.23.2938";
}.${system} or throwSystem;
sha256 = {
- x86_64-darwin = "0fgzzqf1wnkjbcr0j0vjn6sggkz0z1kx6w4gi7gk4c4markdicm1";
- x86_64-linux = "1pl2dsrgckkd8mm0cpxrz8i8rn4jfx7b9lvdyc8392sbq4chjcb7";
+ x86_64-darwin = "19k8102chh4yphk89kiz83yarawnzdnsq0hbsqpjdhbmarqjcd9s";
+ x86_64-linux = "1cx5azl5dvya1hf0gayafm4rg6ccmmq978xsgm6lf0rlb4kirj65";
}.${system} or throwSystem;
meta = with lib; {
diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix
index 9a42d0aa99b..6a7fe4b4757 100644
--- a/pkgs/applications/networking/irc/convos/default.nix
+++ b/pkgs/applications/networking/irc/convos/default.nix
@@ -28,7 +28,7 @@ perlPackages.buildPerlPackage rec {
propagatedBuildInputs = [ openssl ];
- checkInputs = with perlPackages; [ TestDeep TestMore ];
+ checkInputs = with perlPackages; [ TestDeep ];
postPatch = ''
patchShebangs script/convos
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 02131b41ea4..d8f53f4b256 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -9,11 +9,11 @@ let
in stdenv.mkDerivation rec {
pname = "msmtp";
- version = "1.8.14";
+ version = "1.8.15";
src = fetchurl {
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
- sha256 = "1W8GXXEUhunCNGGFFaAqSKSNq0BRs08+EI++y2+3c7Q=";
+ sha256 = "sha256-ImXcY56/Lt8waf/+CjvXZ0n4tY9AAdXN6uGYc5SQmc4=";
};
patches = [
diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix
index 4090814b3da..2532671bc25 100644
--- a/pkgs/applications/networking/p2p/gnunet/gtk.nix
+++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
-, gnome3
+, glade
, gnunet
, gnutls
, gtk3
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome3.glade
+ glade
gnunet
gnutls
gtk3
@@ -39,5 +39,7 @@ stdenv.mkDerivation rec {
meta = gnunet.meta // {
description = "GNUnet GTK User Interface";
homepage = "https://git.gnunet.org/gnunet-gtk.git";
+ # configure: error: compiling gnunet-gtk requires GNUnet core headers
+ broken = true;
};
}
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 8cc674b1ea7..7e8b6b671cd 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -12,7 +12,7 @@
, pcre
# Build options
, enableGTK3 ? false
-, gnome3
+, gtk3
, xorg
, wrapGAppsHook
, enableQt ? false
@@ -65,7 +65,7 @@ in stdenv.mkDerivation {
pcre
]
++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ]
- ++ lib.optionals enableGTK3 [ gnome3.gtk xorg.libpthreadstubs ]
+ ++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ]
++ lib.optionals enableSystemd [ systemd ]
++ lib.optionals stdenv.isLinux [ inotify-tools ]
;
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 6e2533621e6..3aa5b4a8da8 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -85,5 +85,6 @@ stdenv.mkDerivation rec {
description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
license = licenses.lgpl21;
platforms = platforms.linux;
+ broken = true; # 2021-03-17 see https://github.com/NixOS/nixpkgs/issues/93053
};
}
diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix
index 4229fef4fe6..08a8bc98e1a 100644
--- a/pkgs/applications/networking/pcloud/default.nix
+++ b/pkgs/applications/networking/pcloud/default.nix
@@ -21,7 +21,7 @@
# Runtime dependencies;
# A few additional ones (e.g. Node) are already shipped together with the
# AppImage, so we don't have to duplicate them here.
- alsaLib, dbus-glib, fuse, gnome3, libdbusmenu-gtk2, udev, nss
+ alsaLib, dbus-glib, fuse, gnome3, gtk3, libdbusmenu-gtk2, udev, nss
}:
let
@@ -56,7 +56,7 @@ in stdenv.mkDerivation {
alsaLib
dbus-glib
fuse
- gnome3.gtk
+ gtk3
libdbusmenu-gtk2
nss
udev
@@ -92,7 +92,7 @@ in stdenv.mkDerivation {
# This is required for the file picker dialog - otherwise pcloud just
# crashes
- export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gnome3.gtk}/share/gsettings-schemas/${gnome3.gtk.name}:$XDG_DATA_DIRS"
+ export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
exec "$out/app/pcloud"
EOF
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 10b3f2d175a..8e0f4dde816 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -18,13 +18,13 @@ let
in stdenv.mkDerivation rec {
pname = "freerdp";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = version;
- sha256 = "sha256-qKvzxIFUiRoX/fCTDoGOGFMfzMTCRq+A5b9K2J2Wnwk=";
+ sha256 = "sha256-qqpdMBDcVfXm/KB54zv23O8raGqBhAKqXo6Kj2VaI8w=";
};
postPatch = ''
diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix
index ec983276de8..300214e58b7 100644
--- a/pkgs/applications/networking/sync/onedrive/default.nix
+++ b/pkgs/applications/networking/sync/onedrive/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "onedrive";
- version = "2.4.7";
+ version = "2.4.10";
src = fetchFromGitHub {
owner = "abraunegg";
repo = pname;
rev = "v${version}";
- sha256 = "12g2z6c4f65y8cc7vyhk9nlg1mpbsmlsj7ghlny452qhr13m7qpn";
+ sha256 = "sha256:0dvxjkni66g82j9wr6yy07sn7d7yr7bbc0py89pxybvsbid88l65";
};
nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];
diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix
index 711c90879b5..bfd3c3529e7 100644
--- a/pkgs/applications/office/onlyoffice-bin/default.nix
+++ b/pkgs/applications/office/onlyoffice-bin/default.nix
@@ -15,7 +15,7 @@
, gdk-pixbuf
, glib
, glibc
-, gnome3
+, gsettings-desktop-schemas
, gst_all_1
, gtk2
, gtk3
@@ -95,7 +95,7 @@ in stdenv.mkDerivation rec {
fontconfig
gdk-pixbuf
glib
- gnome3.gsettings_desktop_schemas
+ gsettings-desktop-schemas
gst_all_1.gst-plugins-base
gst_all_1.gstreamer
gtk2
diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix
index 95d4ef34afb..73cd5d7cd6c 100644
--- a/pkgs/applications/office/portfolio/default.nix
+++ b/pkgs/applications/office/portfolio/default.nix
@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
- version = "0.51.1";
+ version = "0.51.2";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "sha256-sQisFv+MVGod/gmF0/EWNDvYzkpF3qbDuL5eDr7w0Bs=";
+ sha256 = "sha256-5wBzGj4DkTOqtN7X8/EBDoiBtbYB6vGJJ5IkuME7a9A=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix
index e74cc551d49..a9f5fc991ff 100644
--- a/pkgs/applications/radio/dablin/default.nix
+++ b/pkgs/applications/radio/dablin/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
-, mpg123, SDL2, gnome3, faad2, pcre
+, mpg123, SDL2, gtkmm3, faad2, pcre
} :
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ faad2 mpg123 SDL2 gnome3.gtkmm pcre ];
+ buildInputs = [ faad2 mpg123 SDL2 gtkmm3 pcre ];
meta = with lib; {
description = "Play DAB/DAB+ from ETI-NI aligned stream";
diff --git a/pkgs/applications/science/biology/sambamba/default.nix b/pkgs/applications/science/biology/sambamba/default.nix
index 8802736efac..7b5141302f7 100644
--- a/pkgs/applications/science/biology/sambamba/default.nix
+++ b/pkgs/applications/science/biology/sambamba/default.nix
@@ -1,18 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, python3, which, dmd, ldc, zlib }:
+{ lib, stdenv, fetchFromGitHub, python3, which, ldc, zlib }:
stdenv.mkDerivation rec {
pname = "sambamba";
- version = "0.7.1";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "biod";
repo = "sambamba";
rev = "v${version}";
- sha256 = "0k5wy06zrbsc40x6answgz7rz2phadyqwlhi9nqxbfqanbg9kq20";
+ sha256 = "sha256:0kx5a0fmvv9ldz2hnh7qavgf7711kqc73zxf51k4cca4hr58zxr9";
fetchSubmodules = true;
};
- nativeBuildInputs = [ which python3 dmd ldc ];
+ nativeBuildInputs = [ which python3 ldc ];
buildInputs = [ zlib ];
# Upstream's install target is broken; copy manually
diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix
index ef68eb999fa..dee0a851bf8 100644
--- a/pkgs/applications/science/electronics/horizon-eda/default.nix
+++ b/pkgs/applications/science/electronics/horizon-eda/default.nix
@@ -6,7 +6,7 @@
, epoxy
, fetchFromGitHub
, glm
-, gnome3
+, gtkmm3
, lib
, libgit2
, librsvg
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
curl
epoxy
glm
- gnome3.gtkmm
+ gtkmm3
libgit2
librsvg
libuuid
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index dcf51e657c4..b91b5ad14a9 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv
, fetchFromGitLab
, gnome3
+, dconf
, wxGTK30
, wxGTK31
, makeWrapper
@@ -186,12 +187,12 @@ stdenv.mkDerivation rec {
makeWrapperArgs = with passthru.libraries; [
"--prefix XDG_DATA_DIRS : ${base}/share"
"--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share"
- "--prefix XDG_DATA_DIRS : ${gnome3.defaultIconTheme}/share"
+ "--prefix XDG_DATA_DIRS : ${gnome3.adwaita-icon-theme}/share"
"--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}"
"--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
# wrapGAppsHook did these two as well, no idea if it matters...
"--prefix XDG_DATA_DIRS : ${cups}/share"
- "--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules"
+ "--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules"
"--set-default KISYSMOD ${footprints}/share/kicad/modules"
"--set-default KICAD_SYMBOL_DIR ${symbols}/share/kicad/library"
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 8713abe4bcf..2ac5a7dd671 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -127,7 +127,7 @@ self = stdenv.mkDerivation {
buildInputs = [ ncurses ] ++ ocamlBuildInputs
++ optionals buildIde
(if versionAtLeast "8.10"
- then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ]
+ then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.adwaita-icon-theme wrapGAppsHook ]
else [ ocamlPackages.lablgtk ]);
postPatch = ''
diff --git a/pkgs/applications/science/math/gfm/default.nix b/pkgs/applications/science/math/gfm/default.nix
index a8031b3e8a3..1078be99c3a 100644
--- a/pkgs/applications/science/math/gfm/default.nix
+++ b/pkgs/applications/science/math/gfm/default.nix
@@ -5,6 +5,7 @@
, pkg-config
, autoreconfHook
, gnome2
+, gtk2
, glib
, libtifiles2
, libticables2
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome2.gtk
+ gtk2
gnome2.libglade
glib
libtifiles2
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index 1c2235bf71b..822cb0a2bd5 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -32,7 +32,6 @@
, ntl
, numpy
, pari
-, pkgconfig
, pkg-config
, planarity
, ppl
@@ -86,7 +85,6 @@ buildPythonPackage rec {
cypari2
jinja2
numpy
- pkgconfig
boost
arb
brial
diff --git a/pkgs/applications/science/math/tilp2/default.nix b/pkgs/applications/science/math/tilp2/default.nix
index 1b46f982b41..ebcca69f094 100644
--- a/pkgs/applications/science/math/tilp2/default.nix
+++ b/pkgs/applications/science/math/tilp2/default.nix
@@ -7,6 +7,7 @@
, intltool
, glib
, gnome2
+, gtk2
, gfm
, libticables2
, libticalcs2
@@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
- gnome2.gtk
+ gtk2
gnome2.libglade
gfm
libticables2
diff --git a/pkgs/applications/terminal-emulators/evilvte/default.nix b/pkgs/applications/terminal-emulators/evilvte/default.nix
index 06dafe09168..5d5ce5d772e 100644
--- a/pkgs/applications/terminal-emulators/evilvte/default.nix
+++ b/pkgs/applications/terminal-emulators/evilvte/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, makeWrapper, pkg-config,
- gnome2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg,
+ gnome2, gtk2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg,
configH ? ""
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
};
buildInputs = [
- gnome2.vte glib pango gnome2.gtk cairo gdk-pixbuf atk freetype xorg.libX11
+ gnome2.vte glib pango gtk2 cairo gdk-pixbuf atk freetype xorg.libX11
xorg.xorgproto xorg.libXext makeWrapper pkg-config
];
diff --git a/pkgs/applications/terminal-emulators/kgx/default.nix b/pkgs/applications/terminal-emulators/kgx/default.nix
index 9f8b3444ffb..4e8cf06c1fd 100644
--- a/pkgs/applications/terminal-emulators/kgx/default.nix
+++ b/pkgs/applications/terminal-emulators/kgx/default.nix
@@ -4,6 +4,7 @@
, fetchFromGitLab
, gettext
, gnome3
+, libgtop
, gtk3
, libhandy
, pcre2
@@ -33,7 +34,7 @@ stdenv.mkDerivation {
buildInputs = [
gettext
- gnome3.libgtop
+ libgtop
gnome3.nautilus
gtk3
libhandy
diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix
index 80956a51244..c0f4ea32576 100644
--- a/pkgs/applications/terminal-emulators/tilix/default.nix
+++ b/pkgs/applications/terminal-emulators/tilix/default.nix
@@ -5,7 +5,7 @@
, ninja
, python3
, pkg-config
-, dmd
+, ldc
, dconf
, dbus
, gsettings-desktop-schemas
@@ -16,17 +16,18 @@
, glib
, wrapGAppsHook
, libunwind
+, appstream
}:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "tilix";
- version = "unstable-2019-10-02";
+ version = "1.9.4";
src = fetchFromGitHub {
owner = "gnunn1";
repo = "tilix";
- rev = "ffcd31e3c0e1a560ce89468152d8726065e8fb1f";
- sha256 = "1bzv7xiqhyblz1rw8ln4zpspmml49vnshn1zsv9di5q7kfgpqrgq";
+ rev = "${version}";
+ sha256 = "sha256:020gr4q7kmqq8vnsh8rw97gf1p2n1yq4d7ncyjjh9l13zkaxqqv9";
};
# Default upstream else LDC fails to link
@@ -36,12 +37,13 @@ stdenv.mkDerivation {
nativeBuildInputs = [
desktop-file-utils
- dmd
+ ldc
meson
ninja
pkg-config
python3
wrapGAppsHook
+ appstream
];
buildInputs = [
diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix
index a9138fa0c87..856ee616efb 100644
--- a/pkgs/applications/version-management/git-and-tools/lab/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "lab";
- version = "0.20.0";
+ version = "0.21.0";
src = fetchFromGitHub {
owner = "zaquestion";
repo = "lab";
rev = "v${version}";
- sha256 = "sha256-EQqbWM/4CInFNndfD+k7embPUFLXgxRT44e/+Ik2TDs=";
+ sha256 = "sha256-mkhJmrKpIISd0m0m8fQ9vKuEr6h23BBxK6yo5fB+xcA=";
};
subPackages = [ "." ];
- vendorSha256 = "sha256-T6kGhje3K2HnR8xRuio6AsYbSwIdbWvAk3ZSnbm1NsA=";
+ vendorSha256 = "sha256-cf+DVnGjSNV2eZ8S/Vk+VPlykoSjngrQuPeA9IshBUg=";
doCheck = false;
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 001d0b158b2..b3a5d25c930 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,11 +1,11 @@
{
- "version": "13.8.5",
- "repo_hash": "0dpyqynd6rscg07s58y0cjn7vfj2h21h51ja0fm6ll76wb02sbm6",
+ "version": "13.8.6",
+ "repo_hash": "0izzvr4bw86nbrqkf44gkcf63ham10cw4vp5yk0ylgm7w0kimv8v",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v13.8.5-ee",
+ "rev": "v13.8.6-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "13.8.5",
+ "GITALY_SERVER_VERSION": "13.8.6",
"GITLAB_PAGES_VERSION": "1.34.0",
"GITLAB_SHELL_VERSION": "13.15.1",
"GITLAB_WORKHORSE_VERSION": "8.59.2"
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index a201d79a12a..db2ac513b21 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -33,14 +33,14 @@ let
};
};
in buildGoModule rec {
- version = "13.8.5";
+ version = "13.8.6";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "sha256-hKIjKltPPmz50Ru7elpHdeoyGAqgp+txR3fKleqY7hM=";
+ sha256 = "sha256-6ocP4SMafvLI2jfvcB8jk1AemAI/TiBQ1iaVxK7I54A=";
};
vendorSha256 = "sha256-oVw6vXI3CyOn4l02PkYx3HVpZfzQPi3yBuf9tRvoWoM=";
diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
index 8ecc5bf9ac8..d7ec4a86463 100644
--- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
+++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
@@ -2,8 +2,6 @@
, yacc, libtool, fontconfig, pango, gd, libwebp
}:
-assert libpng != null && libjpeg != null && expat != null;
-
stdenv.mkDerivation rec {
name = "graphviz-2.0";
diff --git a/pkgs/applications/video/kodi-packages/addon-update-script/default.nix b/pkgs/applications/video/kodi-packages/addon-update-script/default.nix
new file mode 100644
index 00000000000..17c1d45783f
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/addon-update-script/default.nix
@@ -0,0 +1,23 @@
+{ writeShellScript
+, nix
+, curl
+, gzip
+, xmlstarlet
+, common-updater-scripts
+}:
+
+{ attrPath }:
+
+let
+ url = "http://mirrors.kodi.tv/addons/matrix/addons.xml.gz";
+ updateScript = writeShellScript "update.sh" ''
+ set -ex
+
+ attrPath=$1
+ namespace=$(${nix}/bin/nix-instantiate $systemArg --eval -E "with import ./. {}; $attrPath.namespace" | tr -d '"')
+ version=$(${curl}/bin/curl -s -L ${url} | ${gzip}/bin/gunzip -c | ${xmlstarlet}/bin/xml select -T -t -m "//addons/addon[@id='$namespace']" -v @version)
+
+ ${common-updater-scripts}/bin/update-source-version "$attrPath" "$version"
+ '';
+in
+ [ updateScript attrPath ]
diff --git a/pkgs/applications/video/kodi-packages/certifi/default.nix b/pkgs/applications/video/kodi-packages/certifi/default.nix
new file mode 100644
index 00000000000..bfce47b7b2c
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/certifi/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "certifi";
+ namespace = "script.module.certifi";
+ version = "2019.11.28+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "0vsd68izv1ix0hb1gm74qq3zff0sxmhfhjyh7y9005zzp2gpi62v";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.certifi";
+ };
+
+ meta = with lib; {
+ homepage = "https://certifi.io";
+ description = "Python package for providing Mozilla's CA Bundle";
+ license = licenses.mpl20;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/chardet/default.nix b/pkgs/applications/video/kodi-packages/chardet/default.nix
new file mode 100644
index 00000000000..1e37f6b46e2
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/chardet/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "chardet";
+ namespace = "script.module.chardet";
+ version = "3.0.4+matrix.3";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "05928dj4fsj2zg8ajdial3sdf8izddq64sr0al3zy1gqw91jp80f";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.chardet";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/Freso/script.module.chardet";
+ description = "Universal encoding detector";
+ license = licenses.lgpl2Only;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/controllers/default.nix b/pkgs/applications/video/kodi-packages/controllers/default.nix
new file mode 100644
index 00000000000..bd29b7c0f7c
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/controllers/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchFromGitHub, controller }:
+buildKodiAddon rec {
+ pname = "game-controller-${controller}";
+ namespace = "game.controller.${controller}";
+ version = "1.0.3";
+
+ sourceDir = "addons/" + namespace;
+
+ src = fetchFromGitHub {
+ owner = "kodi-game";
+ repo = "kodi-game-controllers";
+ rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18";
+ sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb";
+ };
+
+ meta = with lib; {
+ description = "Add support for different gaming controllers.";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/idna/default.nix b/pkgs/applications/video/kodi-packages/idna/default.nix
new file mode 100644
index 00000000000..abe5635e828
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/idna/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "idna";
+ namespace = "script.module.idna";
+ version = "2.8.1+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "02s75fhfmbs3a38wvxba51aj3lv5bidshjdkl6yjfji6waxpr9xh";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.idna";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/Freso/script.module.idna";
+ description = "Internationalized Domain Names for Python";
+ license = licenses.bsd3;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
new file mode 100644
index 00000000000..cd4c5aca117
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, expat, glib, nspr, nss }:
+buildKodiBinaryAddon rec {
+ pname = "inputstream-adaptive";
+ namespace = "inputstream.adaptive";
+ version = "2.6.7";
+
+ src = fetchFromGitHub {
+ owner = "peak3d";
+ repo = "inputstream.adaptive";
+ rev = "${version}-${rel}";
+ sha256 = "1pwqmbr78wp12jn6rwv63npdfc456adwz0amlxf6gvgg43li6p7s";
+ };
+
+ extraBuildInputs = [ expat ];
+
+ extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ];
+
+ extraInstallPhase = let n = namespace; in ''
+ ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/peak3d/inputstream.adaptive";
+ description = "Kodi inputstream addon for several manifest types";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ sephalon ];
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix
new file mode 100644
index 00000000000..2bbcc6d9d2c
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "inputstreamhelper";
+ namespace = "script.module.inputstreamhelper";
+ version = "0.5.2+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "18lkksljfa57w69yklbldf7dgyykrm84pd10mdjdqdm88fdiiijk";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.inputstreamhelper";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/emilsvennesson/script.module.inputstreamhelper";
+ description = "A simple Kodi module that makes life easier for add-on developers relying on InputStream based add-ons and DRM playback";
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/joystick/default.nix b/pkgs/applications/video/kodi-packages/joystick/default.nix
new file mode 100644
index 00000000000..321ddce905f
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/joystick/default.nix
@@ -0,0 +1,21 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, tinyxml, udev }:
+buildKodiBinaryAddon rec {
+ pname = namespace;
+ namespace = "peripheral.joystick";
+ version = "1.7.1";
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = namespace;
+ rev = "${version}-${rel}";
+ sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914";
+ };
+
+ meta = with lib; {
+ description = "Binary addon for raw joystick input.";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+
+ extraBuildInputs = [ tinyxml udev ];
+}
diff --git a/pkgs/applications/video/kodi-packages/kodi-platform/default.nix b/pkgs/applications/video/kodi-packages/kodi-platform/default.nix
new file mode 100644
index 00000000000..6d458f7377d
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/kodi-platform/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchFromGitHub, cmake, kodi, libcec_platform, tinyxml }:
+stdenv.mkDerivation rec {
+ pname = "kodi-platform";
+ version = "17.1";
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = pname;
+ rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
+ sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ kodi libcec_platform tinyxml ];
+}
diff --git a/pkgs/applications/video/kodi-packages/myconnpy/default.nix b/pkgs/applications/video/kodi-packages/myconnpy/default.nix
new file mode 100644
index 00000000000..a1b25576524
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/myconnpy/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "myconnpy";
+ namespace = "script.module.myconnpy";
+ version = "8.0.18+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "1cx3qdzw9lkkmbyvyrmc2i193is20fihn2sfl7kmv43f708vam0k";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.myconnpy";
+ };
+
+ meta = with lib; {
+ homepage = "http://dev.mysql.com/doc/connector-python/en/index.html";
+ description = "MySQL Connector/Python";
+ license = licenses.gpl2Only;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/netflix/default.nix b/pkgs/applications/video/kodi-packages/netflix/default.nix
new file mode 100644
index 00000000000..20440153f76
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/netflix/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildKodiAddon, fetchFromGitHub, signals, inputstreamhelper, requests, myconnpy }:
+buildKodiAddon rec {
+ pname = "netflix";
+ namespace = "plugin.video.netflix";
+ version = "1.14.1";
+
+ src = fetchFromGitHub {
+ owner = "CastagnaIT";
+ repo = namespace;
+ rev = "v${version}";
+ sha256 = "0vv3234gg4brp0gvrsl4vdskmpfbyk4z7cjmmj31zn4m8j33japn";
+ };
+
+ propagatedBuildInputs = [
+ signals
+ inputstreamhelper
+ requests
+ myconnpy
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/CastagnaIT/plugin.video.netflix";
+ description = "Netflix VOD Services Add-on";
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/osmc-skin/default.nix b/pkgs/applications/video/kodi-packages/osmc-skin/default.nix
new file mode 100644
index 00000000000..c83fd66a433
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/osmc-skin/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchFromGitHub }:
+buildKodiAddon rec {
+ pname = "osmc-skin";
+ namespace = "skin.osmc";
+ version = "18.0.0";
+
+ src = fetchFromGitHub {
+ owner = "osmc";
+ repo = namespace;
+ rev = "40a6c318641e2cbeac58fb0e7dde9c2beac737a0";
+ sha256 = "1l7hyfj5zvjxjdm94y325bmy1naak455b9l8952sb0gllzrcwj6s";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/osmc/skin.osmc";
+ description = "The default skin for OSMC";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ worldofpeace ];
+ license = licenses.cc-by-nc-sa-30;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/pdfreader/default.nix b/pkgs/applications/video/kodi-packages/pdfreader/default.nix
new file mode 100644
index 00000000000..430b9be3fd4
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/pdfreader/default.nix
@@ -0,0 +1,19 @@
+{ lib, buildKodiAddon, fetchFromGitHub }:
+buildKodiAddon rec {
+ pname = "pdfreader";
+ namespace = "plugin.image.pdf";
+ version = "2.0.2";
+
+ src = fetchFromGitHub {
+ owner = "i96751414";
+ repo = "plugin.image.pdfreader";
+ rev = "v${version}";
+ sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml";
+ };
+
+ meta = with lib; {
+ homepage = "https://forum.kodi.tv/showthread.php?tid=187421";
+ description = "A comic book reader";
+ maintainers = with maintainers; [ edwtjo ];
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix b/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix
new file mode 100644
index 00000000000..3920120b90a
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix
@@ -0,0 +1,22 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, jsoncpp, libhdhomerun }:
+buildKodiBinaryAddon rec {
+ pname = "pvr-hdhomerun";
+ namespace = "pvr.hdhomerun";
+ version = "7.1.0";
+
+ src = fetchFromGitHub {
+ owner = "kodi-pvr";
+ repo = "pvr.hdhomerun";
+ rev = "${version}-${rel}";
+ sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/kodi-pvr/pvr.hdhomerun";
+ description = "Kodi's HDHomeRun PVR client addon";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ titanous ];
+ };
+
+ extraBuildInputs = [ jsoncpp libhdhomerun ];
+}
diff --git a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix
new file mode 100644
index 00000000000..935238758a6
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix
@@ -0,0 +1,21 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub }:
+buildKodiBinaryAddon rec {
+ pname = "pvr-hts";
+ namespace = "pvr.hts";
+ version = "8.2.2";
+
+ src = fetchFromGitHub {
+ owner = "kodi-pvr";
+ repo = "pvr.hts";
+ rev = "${version}-${rel}";
+ sha256 = "0jnn9gfjl556acqjf92wzzn371gxymhbbi665nqgg2gjcan0a49q";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/kodi-pvr/pvr.hts";
+ description = "Kodi's Tvheadend HTSP client addon";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ cpages ];
+ };
+
+}
diff --git a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
new file mode 100644
index 00000000000..b508eae8c7e
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
@@ -0,0 +1,22 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, zlib, pugixml }:
+buildKodiBinaryAddon rec {
+ pname = "pvr-iptvsimple";
+ namespace = "pvr.iptvsimple";
+ version = "7.4.2";
+
+ src = fetchFromGitHub {
+ owner = "kodi-pvr";
+ repo = "pvr.iptvsimple";
+ rev = "${version}-${rel}";
+ sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/kodi-pvr/pvr.iptvsimple";
+ description = "Kodi's IPTV Simple client addon";
+ platforms = platforms.all;
+ license = licenses.gpl2Plus;
+ };
+
+ extraBuildInputs = [ zlib pugixml ];
+}
diff --git a/pkgs/applications/video/kodi-packages/requests/default.nix b/pkgs/applications/video/kodi-packages/requests/default.nix
new file mode 100644
index 00000000000..05288b74b6c
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/requests/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript, certifi, chardet, idna, urllib3 }:
+buildKodiAddon rec {
+ pname = "requests";
+ namespace = "script.module.requests";
+ version = "2.22.0+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "09576galkyzhw8fhy2h4aablm5rm2v08g0mdmg9nn55dlxhkkljq";
+ };
+
+ propagatedBuildInputs = [
+ certifi
+ chardet
+ idna
+ urllib3
+ ];
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.requests";
+ };
+
+ meta = with lib; {
+ homepage = "http://python-requests.org";
+ description = "Python HTTP for Humans";
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/signals/default.nix b/pkgs/applications/video/kodi-packages/signals/default.nix
new file mode 100644
index 00000000000..9d49e632721
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/signals/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "signals";
+ namespace = "script.module.addon.signals";
+ version = "0.0.6+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "1qcjbakch8hvx02wc01zv014nmzgn6ahc4n2bj5mzr114ppd3hjs";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.signals";
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/ruuk/script.module.addon.signals";
+ description = "Provides signal/slot mechanism for inter-addon communication";
+ license = licenses.lgpl21Only;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/steam-controller/default.nix b/pkgs/applications/video/kodi-packages/steam-controller/default.nix
new file mode 100644
index 00000000000..5eee0eff941
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/steam-controller/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildKodiBinaryAddon, fetchFromGitHub, libusb1 }:
+buildKodiBinaryAddon rec {
+ pname = namespace;
+ namespace = "peripheral.steamcontroller";
+ version = "0.11.0";
+
+ src = fetchFromGitHub {
+ owner = "kodi-game";
+ repo = namespace;
+ rev = "f68140ca44f163a03d3a625d1f2005a6edef96cb";
+ sha256 = "09lm8i119xlsxxk0c64rnp8iw0crr90v7m8iwi9r31qdmxrdxpmg";
+ };
+
+ extraBuildInputs = [ libusb1 ];
+
+ meta = with lib; {
+ description = "Binary addon for steam controller.";
+ platforms = platforms.all;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+
+}
diff --git a/pkgs/applications/video/kodi-packages/steam-launcher/default.nix b/pkgs/applications/video/kodi-packages/steam-launcher/default.nix
new file mode 100644
index 00000000000..cb140b4fb4d
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/steam-launcher/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildKodiAddon, fetchFromGitHub, steam }:
+buildKodiAddon {
+ pname = "steam-launcher";
+ namespace = "script.steam.launcher";
+ version = "3.5.1";
+
+ src = fetchFromGitHub rec {
+ owner = "teeedubb";
+ repo = owner + "-xbmc-repo";
+ rev = "8260bf9b464846a1f1965da495d2f2b7ceb81d55";
+ sha256 = "1fj3ry5s44nf1jzxk4bmnpa4b9p23nrpmpj2a4i6xf94h7jl7p5k";
+ };
+
+ propagatedBuildInputs = [ steam ];
+
+ meta = with lib; {
+ homepage = "https://forum.kodi.tv/showthread.php?tid=157499";
+ description = "Launch Steam in Big Picture Mode from Kodi";
+ longDescription = ''
+ This add-on will close/minimise Kodi, launch Steam in Big
+ Picture Mode and when Steam BPM is exited (either by quitting
+ Steam or returning to the desktop) Kodi will
+ restart/maximise. Running pre/post Steam scripts can be
+ configured via the addon.
+ '';
+ maintainers = with maintainers; [ edwtjo ];
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/svtplay/default.nix b/pkgs/applications/video/kodi-packages/svtplay/default.nix
new file mode 100644
index 00000000000..cc7d350fa31
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/svtplay/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildKodiAddon, fetchFromGitHub }:
+buildKodiAddon rec {
+ pname = "svtplay";
+ namespace = "plugin.video.svtplay";
+ version = "5.1.12";
+
+ src = fetchFromGitHub {
+ owner = "nilzen";
+ repo = "xbmc-" + pname;
+ rev = "v${version}";
+ sha256 = "04j1nhm7mh9chs995lz6bv1vsq5xzk7a7c0lmk4bnfv8jrfpj0w6";
+ };
+
+ meta = with lib; {
+ homepage = "https://forum.kodi.tv/showthread.php?tid=67110";
+ description = "Watch content from SVT Play";
+ longDescription = ''
+ With this addon you can stream content from SVT Play
+ (svtplay.se). The plugin fetches the video URL from the SVT
+ Play website and feeds it to the Kodi video player. HLS (m3u8)
+ is the preferred video format by the plugin.
+ '';
+ platforms = platforms.all;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/urllib3/default.nix b/pkgs/applications/video/kodi-packages/urllib3/default.nix
new file mode 100644
index 00000000000..e8146987913
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/urllib3/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+buildKodiAddon rec {
+ pname = "urllib3";
+ namespace = "script.module.urllib3";
+ version = "1.25.8+matrix.1";
+
+ src = fetchzip {
+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+ sha256 = "080yq8ns0sag6rmdag1hjwi0whcmp35wzqjp3by92m81cpszs75q";
+ };
+
+ passthru.updateScript = addonUpdateScript {
+ attrPath = "kodi.packages.urllib3";
+ };
+
+ meta = with lib; {
+ homepage = "https://urllib3.readthedocs.io/en/latest/";
+ description = "HTTP library with thread-safe connection pooling, file post, and more";
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix b/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix
new file mode 100644
index 00000000000..13100b0dd35
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix
@@ -0,0 +1,22 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, libarchive, lzma, bzip2, zlib, lz4, lzo, openssl }:
+buildKodiBinaryAddon rec {
+ pname = namespace;
+ namespace = "vfs.libarchive";
+ version = "2.0.0";
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = namespace;
+ rev = "${version}-${rel}";
+ sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5";
+ };
+
+ meta = with lib; {
+ description = "LibArchive Virtual Filesystem add-on for Kodi";
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ minijackson ];
+ };
+
+ extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ];
+}
diff --git a/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix b/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix
new file mode 100644
index 00000000000..7910ab640e9
--- /dev/null
+++ b/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix
@@ -0,0 +1,22 @@
+{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, openssl, libssh, zlib }:
+buildKodiBinaryAddon rec {
+ pname = namespace;
+ namespace = "vfs.sftp";
+ version = "2.0.0";
+
+ src = fetchFromGitHub {
+ owner = "xbmc";
+ repo = namespace;
+ rev = "${version}-${rel}";
+ sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk";
+ };
+
+ meta = with lib; {
+ description = "SFTP Virtual Filesystem add-on for Kodi";
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ minijackson ];
+ };
+
+ extraBuildInputs = [ openssl libssh zlib ];
+}
diff --git a/pkgs/applications/video/kodi/build-kodi-addon.nix b/pkgs/applications/video/kodi/build-kodi-addon.nix
new file mode 100644
index 00000000000..cd768b6fa99
--- /dev/null
+++ b/pkgs/applications/video/kodi/build-kodi-addon.nix
@@ -0,0 +1,21 @@
+{ stdenv, toKodiAddon, addonDir }:
+{ name ? "${attrs.pname}-${attrs.version}"
+, namespace
+, sourceDir ? ""
+, ... } @ attrs:
+toKodiAddon (stdenv.mkDerivation ({
+ name = "kodi-" + name;
+
+ dontStrip = true;
+
+ extraRuntimeDependencies = [ ];
+
+ installPhase = ''
+ cd $src/$sourceDir
+ d=$out${addonDir}/${namespace}
+ mkdir -p $d
+ sauce="."
+ [ -d ${namespace} ] && sauce=${namespace}
+ cp -R "$sauce/"* $d
+ '';
+} // attrs))
diff --git a/pkgs/applications/video/kodi/build-kodi-binary-addon.nix b/pkgs/applications/video/kodi/build-kodi-binary-addon.nix
new file mode 100644
index 00000000000..74ce508ab6a
--- /dev/null
+++ b/pkgs/applications/video/kodi/build-kodi-binary-addon.nix
@@ -0,0 +1,31 @@
+{ stdenv, toKodiAddon, addonDir, cmake, kodi, kodi-platform, libcec_platform }:
+{ name ? "${attrs.pname}-${attrs.version}"
+, namespace
+, version
+, extraBuildInputs ? []
+, extraRuntimeDependencies ? []
+, extraInstallPhase ? "", ... } @ attrs:
+toKodiAddon (stdenv.mkDerivation ({
+ name = "kodi-" + name;
+
+ dontStrip = true;
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ kodi kodi-platform libcec_platform ] ++ extraBuildInputs;
+
+ inherit extraRuntimeDependencies;
+
+ # disables check ensuring install prefix is that of kodi
+ cmakeFlags = [
+ "-DOVERRIDE_PATHS=1"
+ ];
+
+ # kodi checks for addon .so libs existance in the addon folder (share/...)
+ # and the non-wrapped kodi lib/... folder before even trying to dlopen
+ # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
+ installPhase = let n = namespace; in ''
+ make install
+ ln -s $out/lib/addons/${n}/${n}.so.${version} $out${addonDir}/${n}/${n}.so.${version}
+ ${extraInstallPhase}
+ '';
+} // attrs))
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 55ba84cc454..3f382efff11 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
let
unwrapped = callPackage ./unwrapped.nix (removeAttrs args [ "callPackage" ]);
- kodiPackages = callPackage ./packages.nix { kodi = unwrapped; };
+ kodiPackages = callPackage ../../../top-level/kodi-packages.nix { kodi = unwrapped; };
in
unwrapped.overrideAttrs (oldAttrs: {
passthru = oldAttrs.passthru // {
diff --git a/pkgs/applications/video/kodi/packages.nix b/pkgs/applications/video/kodi/packages.nix
deleted file mode 100644
index 8e0ecbf9b9b..00000000000
--- a/pkgs/applications/video/kodi/packages.nix
+++ /dev/null
@@ -1,560 +0,0 @@
-{ lib, stdenv, callPackage, fetchFromGitHub
-, cmake, kodi, libcec_platform, tinyxml, pugixml
-, steam, udev, libusb1, jsoncpp, libhdhomerun, zlib
-, python3Packages, expat, glib, nspr, nss, openssl
-, libssh, libarchive, lzma, bzip2, lz4, lzo }:
-
-with lib;
-
-let self = rec {
-
- addonDir = "/share/kodi/addons";
- rel = "Matrix";
-
- inherit kodi;
-
- # Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix
- toKodiAddon = drv: drv.overrideAttrs(oldAttrs: {
- # Use passthru in order to prevent rebuilds when possible.
- passthru = (oldAttrs.passthru or {})// {
- kodiAddonFor = kodi;
- requiredKodiAddons = requiredKodiAddons drv.propagatedBuildInputs;
- };
- });
-
- # Check whether a derivation provides a Kodi addon.
- hasKodiAddon = drv: drv ? kodiAddonFor && drv.kodiAddonFor == kodi;
-
- # Get list of required Kodi addons given a list of derivations.
- requiredKodiAddons = drvs: let
- modules = filter hasKodiAddon drvs;
- in unique (modules ++ concatLists (catAttrs "requiredKodiAddons" modules));
-
- kodi-platform = stdenv.mkDerivation rec {
- project = "kodi-platform";
- version = "17.1";
- name = "${project}-${version}";
-
- src = fetchFromGitHub {
- owner = "xbmc";
- repo = project;
- rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
- sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
- };
-
- nativeBuildInputs = [ cmake ];
- buildInputs = [ kodi libcec_platform tinyxml ];
- };
-
- buildKodiAddon =
- { name ? "${attrs.pname}-${attrs.version}"
- , namespace
- , sourceDir ? ""
- , ... } @ attrs:
- toKodiAddon (stdenv.mkDerivation ({
- name = "kodi-" + name;
-
- dontStrip = true;
-
- extraRuntimeDependencies = [ ];
-
- installPhase = ''
- cd $src/$sourceDir
- d=$out${addonDir}/${namespace}
- mkdir -p $d
- sauce="."
- [ -d ${namespace} ] && sauce=${namespace}
- cp -R "$sauce/"* $d
- '';
- } // attrs));
-
- buildKodiBinaryAddon =
- { name ? "${attrs.pname}-${attrs.version}"
- , namespace
- , version
- , extraBuildInputs ? []
- , extraRuntimeDependencies ? []
- , extraInstallPhase ? "", ... } @ attrs:
- toKodiAddon (stdenv.mkDerivation ({
- name = "kodi-" + name;
-
- dontStrip = true;
-
- nativeBuildInputs = [ cmake ];
- buildInputs = [ kodi kodi-platform libcec_platform ] ++ extraBuildInputs;
-
- inherit extraRuntimeDependencies;
-
- # disables check ensuring install prefix is that of kodi
- cmakeFlags = [
- "-DOVERRIDE_PATHS=1"
- ];
-
- # kodi checks for addon .so libs existance in the addon folder (share/...)
- # and the non-wrapped kodi lib/... folder before even trying to dlopen
- # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
- installPhase = let n = namespace; in ''
- make install
- ln -s $out/lib/addons/${n}/${n}.so.${version} $out${addonDir}/${n}/${n}.so.${version}
- ${extraInstallPhase}
- '';
- } // attrs));
-
- advanced-launcher = buildKodiAddon rec {
-
- pname = "advanced-launcher";
- namespace = "plugin.program.advanced.launcher";
- version = "2.5.8";
-
- src = fetchFromGitHub {
- owner = "edwtjo";
- repo = pname;
- rev = version;
- sha256 = "142vvgs37asq5m54xqhjzqvgmb0xlirvm0kz6lxaqynp0vvgrkx2";
- };
-
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=85724";
- description = "A program launcher for Kodi";
- longDescription = ''
- Advanced Launcher allows you to start any Linux, Windows and
- macOS external applications (with command line support or not)
- directly from the Kodi GUI. Advanced Launcher also give you
- the possibility to edit, download (from Internet resources)
- and manage all the meta-data (informations and images) related
- to these applications.
- '';
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- broken = true; # requires port to python3
- };
-
- };
-
- advanced-emulator-launcher = buildKodiAddon rec {
-
- pname = "advanced-emulator-launcher";
- namespace = "plugin.program.advanced.emulator.launcher";
- version = "0.9.6";
-
- src = fetchFromGitHub {
- owner = "Wintermute0110";
- repo = namespace;
- rev = version;
- sha256 = "1sv9z77jj6bam6llcnd9b3dgkbvhwad2m1v541rv3acrackms2z2";
- };
-
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=287826";
- description = "A program launcher for Kodi";
- longDescription = ''
- Advanced Emulator Launcher is a multi-emulator front-end for Kodi
- scalable to collections of thousands of ROMs. Includes offline scrapers
- for MAME and No-Intro ROM sets and also supports scrapping ROM metadata
- and artwork online. ROM auditing for No-Intro ROMs using No-Intro XML
- DATs. Launching of games and standalone applications is also available.
- '';
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- broken = true; # requires port to python3
- };
-
- };
-
- controllers = let
- pname = "game-controller";
- version = "1.0.3";
-
- src = fetchFromGitHub {
- owner = "kodi-game";
- repo = "kodi-game-controllers";
- rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18";
- sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb";
- };
-
- meta = {
- description = "Add support for different gaming controllers.";
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- };
-
- mkController = controller: {
- ${controller} = buildKodiAddon rec {
- pname = pname + "-" + controller;
- namespace = "game.controller." + controller;
- sourceDir = "addons/" + namespace;
- inherit version src meta;
- };
- };
- in (mkController "default")
- // (mkController "dreamcast")
- // (mkController "gba")
- // (mkController "genesis")
- // (mkController "mouse")
- // (mkController "n64")
- // (mkController "nes")
- // (mkController "ps")
- // (mkController "snes");
-
- hyper-launcher = let
- pname = "hyper-launcher";
- version = "1.5.2";
- src = fetchFromGitHub rec {
- name = pname + "-" + version + ".tar.gz";
- owner = "teeedubb";
- repo = owner + "-xbmc-repo";
- rev = "f958ba93fe85b9c9025b1745d89c2db2e7dd9bf6";
- sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5";
- };
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=258159";
- description = "A ROM launcher for Kodi that uses HyperSpin assets.";
- maintainers = with maintainers; [ edwtjo ];
- broken = true; # requires port to python3
- };
- in {
- service = buildKodiAddon {
- pname = pname + "-service";
- version = "1.2.1";
- namespace = "service.hyper.launcher";
- inherit src meta;
- };
- plugin = buildKodiAddon {
- namespace = "plugin.hyper.launcher";
- inherit pname version src meta;
- };
- };
-
- joystick = buildKodiBinaryAddon rec {
- pname = namespace;
- namespace = "peripheral.joystick";
- version = "1.7.1";
-
- src = fetchFromGitHub {
- owner = "xbmc";
- repo = namespace;
- rev = "${version}-${rel}";
- sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914";
- };
-
- meta = {
- description = "Binary addon for raw joystick input.";
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- };
-
- extraBuildInputs = [ tinyxml udev ];
- };
-
- simpleplugin = buildKodiAddon rec {
- pname = "simpleplugin";
- namespace = "script.module.simpleplugin";
- version = "2.3.2";
-
- src = fetchFromGitHub {
- owner = "romanvm";
- repo = namespace;
- rev = "v.${version}";
- sha256 = "0myar8dqjigb75pcc8zx3i5z79p1ifgphgb82s5syqywk0zaxm3j";
- };
-
- meta = {
- homepage = src.meta.homepage;
- description = "Simpleplugin API";
- license = licenses.gpl3;
- broken = true; # requires port to python3
- };
- };
-
- svtplay = buildKodiAddon rec {
-
- pname = "svtplay";
- namespace = "plugin.video.svtplay";
- version = "5.1.12";
-
- src = fetchFromGitHub {
- name = pname + "-" + version + ".tar.gz";
- owner = "nilzen";
- repo = "xbmc-" + pname;
- rev = "v${version}";
- sha256 = "04j1nhm7mh9chs995lz6bv1vsq5xzk7a7c0lmk4bnfv8jrfpj0w6";
- };
-
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=67110";
- description = "Watch content from SVT Play";
- longDescription = ''
- With this addon you can stream content from SVT Play
- (svtplay.se). The plugin fetches the video URL from the SVT
- Play website and feeds it to the Kodi video player. HLS (m3u8)
- is the preferred video format by the plugin.
- '';
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- };
-
- };
-
- steam-controller = buildKodiBinaryAddon rec {
- pname = namespace;
- namespace = "peripheral.steamcontroller";
- version = "0.11.0";
-
- src = fetchFromGitHub {
- owner = "kodi-game";
- repo = namespace;
- rev = "f68140ca44f163a03d3a625d1f2005a6edef96cb";
- sha256 = "09lm8i119xlsxxk0c64rnp8iw0crr90v7m8iwi9r31qdmxrdxpmg";
- };
-
- extraBuildInputs = [ libusb1 ];
-
- meta = {
- description = "Binary addon for steam controller.";
- platforms = platforms.all;
- maintainers = with maintainers; [ edwtjo ];
- };
-
- };
-
- steam-launcher = buildKodiAddon {
-
- pname = "steam-launcher";
- namespace = "script.steam.launcher";
- version = "3.5.1";
-
- src = fetchFromGitHub rec {
- owner = "teeedubb";
- repo = owner + "-xbmc-repo";
- rev = "8260bf9b464846a1f1965da495d2f2b7ceb81d55";
- sha256 = "1fj3ry5s44nf1jzxk4bmnpa4b9p23nrpmpj2a4i6xf94h7jl7p5k";
- };
-
- propagatedBuildInputs = [ steam ];
-
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=157499";
- description = "Launch Steam in Big Picture Mode from Kodi";
- longDescription = ''
- This add-on will close/minimise Kodi, launch Steam in Big
- Picture Mode and when Steam BPM is exited (either by quitting
- Steam or returning to the desktop) Kodi will
- restart/maximise. Running pre/post Steam scripts can be
- configured via the addon.
- '';
- maintainers = with maintainers; [ edwtjo ];
- };
- };
-
- pdfreader = buildKodiAddon rec {
- pname = "pdfreader";
- namespace = "plugin.image.pdf";
- version = "2.0.2";
-
- src = fetchFromGitHub {
- owner = "i96751414";
- repo = "plugin.image.pdfreader";
- rev = "v${version}";
- sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml";
- };
-
- meta = {
- homepage = "https://forum.kodi.tv/showthread.php?tid=187421";
- description = "A comic book reader";
- maintainers = with maintainers; [ edwtjo ];
- };
- };
-
- pvr-hts = buildKodiBinaryAddon rec {
-
- pname = "pvr-hts";
- namespace = "pvr.hts";
- version = "8.2.2";
-
- src = fetchFromGitHub {
- owner = "kodi-pvr";
- repo = "pvr.hts";
- rev = "${version}-${rel}";
- sha256 = "0jnn9gfjl556acqjf92wzzn371gxymhbbi665nqgg2gjcan0a49q";
- };
-
- meta = {
- homepage = "https://github.com/kodi-pvr/pvr.hts";
- description = "Kodi's Tvheadend HTSP client addon";
- platforms = platforms.all;
- maintainers = with maintainers; [ cpages ];
- };
-
- };
-
- pvr-hdhomerun = buildKodiBinaryAddon rec {
-
- pname = "pvr-hdhomerun";
- namespace = "pvr.hdhomerun";
- version = "7.1.0";
-
- src = fetchFromGitHub {
- owner = "kodi-pvr";
- repo = "pvr.hdhomerun";
- rev = "${version}-${rel}";
- sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm";
- };
-
- meta = {
- homepage = "https://github.com/kodi-pvr/pvr.hdhomerun";
- description = "Kodi's HDHomeRun PVR client addon";
- platforms = platforms.all;
- maintainers = with maintainers; [ titanous ];
- };
-
- extraBuildInputs = [ jsoncpp libhdhomerun ];
-
- };
-
- pvr-iptvsimple = buildKodiBinaryAddon rec {
-
- pname = "pvr-iptvsimple";
- namespace = "pvr.iptvsimple";
- version = "7.4.2";
-
- src = fetchFromGitHub {
- owner = "kodi-pvr";
- repo = "pvr.iptvsimple";
- rev = "${version}-${rel}";
- sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr";
- };
-
- meta = {
- homepage = "https://github.com/kodi-pvr/pvr.iptvsimple";
- description = "Kodi's IPTV Simple client addon";
- platforms = platforms.all;
- maintainers = with maintainers; [ ];
- license = licenses.gpl2Plus;
- };
-
- extraBuildInputs = [ zlib pugixml ];
- };
-
- osmc-skin = buildKodiAddon rec {
-
- pname = "osmc-skin";
- namespace = "skin.osmc";
- version = "18.0.0";
-
- src = fetchFromGitHub {
- owner = "osmc";
- repo = namespace;
- rev = "40a6c318641e2cbeac58fb0e7dde9c2beac737a0";
- sha256 = "1l7hyfj5zvjxjdm94y325bmy1naak455b9l8952sb0gllzrcwj6s";
- };
-
- meta = {
- homepage = "https://github.com/osmc/skin.osmc";
- description = "The default skin for OSMC";
- platforms = platforms.all;
- maintainers = with maintainers; [ worldofpeace ];
- license = licenses.cc-by-nc-sa-30;
- };
- };
-
- yatp = python3Packages.toPythonModule (buildKodiAddon rec {
- pname = "yatp";
- namespace = "plugin.video.yatp";
- version = "3.3.2";
-
- src = fetchFromGitHub {
- owner = "romanvm";
- repo = "kodi.yatp";
- rev = "v.${version}";
- sha256 = "12g1f57sx7dy6wy7ljl7siz2qs1kxcmijcg7xx2xpvmq61x9qa2d";
- };
-
- patches = [ ./yatp/dont-monkey.patch ];
-
- propagatedBuildInputs = [
- simpleplugin
- python3Packages.requests
- python3Packages.libtorrent-rasterbar
- ];
-
- meta = {
- homepage = src.meta.homepage;
- description = "Yet Another Torrent Player: libtorrent-based torrent streaming for Kodi";
- license = licenses.gpl3;
- broken = true; # requires port to python3
- };
- });
-
- inputstream-adaptive = buildKodiBinaryAddon rec {
-
- pname = "inputstream-adaptive";
- namespace = "inputstream.adaptive";
- version = "2.6.7";
-
- src = fetchFromGitHub {
- owner = "peak3d";
- repo = "inputstream.adaptive";
- rev = "${version}-${rel}";
- sha256 = "1pwqmbr78wp12jn6rwv63npdfc456adwz0amlxf6gvgg43li6p7s";
- };
-
- extraBuildInputs = [ expat ];
-
- extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ];
-
- extraInstallPhase = let n = namespace; in ''
- ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so
- '';
-
- meta = {
- homepage = "https://github.com/peak3d/inputstream.adaptive";
- description = "Kodi inputstream addon for several manifest types";
- platforms = platforms.all;
- maintainers = with maintainers; [ sephalon ];
- };
- };
-
- vfs-sftp = buildKodiBinaryAddon rec {
- pname = namespace;
- namespace = "vfs.sftp";
- version = "2.0.0";
-
- src = fetchFromGitHub {
- owner = "xbmc";
- repo = namespace;
- rev = "${version}-${rel}";
- sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk";
- };
-
- meta = with lib; {
- description = "SFTP Virtual Filesystem add-on for Kodi";
- license = licenses.gpl2Plus;
- platforms = platforms.all;
- maintainers = with maintainers; [ minijackson ];
- };
-
- extraBuildInputs = [ openssl libssh zlib ];
- };
-
- vfs-libarchive = buildKodiBinaryAddon rec {
- pname = namespace;
- namespace = "vfs.libarchive";
- version = "2.0.0";
-
- src = fetchFromGitHub {
- owner = "xbmc";
- repo = namespace;
- rev = "${version}-${rel}";
- sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5";
- };
-
- meta = with lib; {
- description = "LibArchive Virtual Filesystem add-on for Kodi";
- license = licenses.gpl2Plus;
- platforms = platforms.all;
- maintainers = with maintainers; [ minijackson ];
- };
-
- extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ];
- };
-}; in self
diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index 2b4abbb500a..86164682138 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -1,5 +1,10 @@
{ lib, makeWrapper, buildEnv, kodi, addons }:
+let
+ # linux distros are supposed to provide pillow and pycryptodome
+ requiredPythonPackages = with kodi.pythonPackages; [ pillow pycryptodome] ++ addons;
+in
+
buildEnv {
name = "${kodi.name}-env";
@@ -13,7 +18,7 @@ buildEnv {
for exe in kodi{,-standalone}
do
makeWrapper ${kodi}/bin/$exe $out/bin/$exe \
- --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath addons} \
+ --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath requiredPythonPackages} \
--prefix KODI_HOME : $out/share/kodi \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
(lib.concatMap
diff --git a/pkgs/applications/video/kodi/yatp/dont-monkey.patch b/pkgs/applications/video/kodi/yatp/dont-monkey.patch
deleted file mode 100644
index 62d5d0c0d4c..00000000000
--- a/pkgs/applications/video/kodi/yatp/dont-monkey.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/plugin.video.yatp/server.py b/plugin.video.yatp/server.py
-index 1adcbb5..488b72c 100644
---- a/plugin.video.yatp/server.py
-+++ b/plugin.video.yatp/server.py
-@@ -20,24 +20,8 @@ addon = Addon()
- _ = addon.initialize_gettext()
- addon.log_notice('Starting Torrent Server...')
-
--# A monkey-patch to set the necessary librorrent version
--librorrent_addon = Addon('script.module.libtorrent')
--orig_custom_version = librorrent_addon.get_setting('custom_version', False)
--orig_set_version = librorrent_addon.get_setting('set_version', False)
--librorrent_addon.set_setting('custom_version', 'true')
--if addon.libtorrent_version == '1.0.9':
-- librorrent_addon.set_setting('set_version', '4')
--elif addon.libtorrent_version == '1.1.0':
-- librorrent_addon.set_setting('set_version', '5')
--elif addon.libtorrent_version == '1.1.1':
-- librorrent_addon.set_setting('set_version', '6')
--else:
-- librorrent_addon.set_setting('set_version', '0')
--
- from libs.server import wsgi_app
-
--librorrent_addon.set_setting('custom_version', orig_custom_version)
--librorrent_addon.set_setting('set_version', orig_set_version)
- # ======
-
- if addon.enable_limits:
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 9fdb78c7038..caeffa56b17 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -17,6 +17,7 @@
, libv4l
, x264
, curl
+, wayland
, xorg
, makeWrapper
, pkg-config
@@ -67,6 +68,7 @@ in mkDerivation rec {
qtx11extras
qtsvg
speex
+ wayland
x264
libvlc
makeWrapper
diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix
index ac3dd320d3a..7660edcc768 100644
--- a/pkgs/applications/video/webtorrent_desktop/default.nix
+++ b/pkgs/applications/video/webtorrent_desktop/default.nix
@@ -1,6 +1,6 @@
{
alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype,
- gdk-pixbuf, glib, gnome3, libX11, libXScrnSaver, libXcomposite, libXcursor,
+ gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor,
libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst,
libxcb, nspr, nss, lib, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core
}:
@@ -19,7 +19,7 @@
freetype
gdk-pixbuf
glib
- gnome3.gtk
+ gtk3
pango
libuuid
libX11
diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix
index a9e332e2a4c..c050057678d 100644
--- a/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/pkgs/applications/virtualization/docker-compose/default.nix
@@ -21,12 +21,12 @@ buildPythonApplication rec {
nativeBuildInputs = [ installShellFiles ];
checkInputs = [ mock pytest nose ];
propagatedBuildInputs = [
- pyyaml backports_ssl_match_hostname colorama dockerpty docker
+ pyyaml colorama dockerpty docker
ipaddress jsonschema requests six texttable websocket_client
docopt cached-property paramiko distro python-dotenv
- ] ++
- lib.optional (pythonOlder "3.4") enum34 ++
- lib.optional (pythonOlder "3.2") functools32;
+ ] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname
+ ++ lib.optional (pythonOlder "3.4") enum34
+ ++ lib.optional (pythonOlder "3.2") functools32;
postPatch = ''
# Remove upper bound on requires, see also
diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix
index d6ac6aeb84e..9d524019ad5 100644
--- a/pkgs/applications/window-managers/wayfire/wcm.nix
+++ b/pkgs/applications/window-managers/wayfire/wcm.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, wrapGAppsHook
-, gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell
+, gtk3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ];
buildInputs = [
- gnome3.gtk libevdev libxml2 wayfire wayland
+ gtk3 libevdev libxml2 wayfire wayland
wayland-protocols wf-config wf-shell
];
diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix
index 3948e9a32ab..cc99e79fca8 100644
--- a/pkgs/applications/window-managers/wayfire/wf-shell.nix
+++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git
-, alsaLib, gnome3, gtk-layer-shell, pulseaudio, wayfire, wf-config
+, alsaLib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config
}:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wayland ];
buildInputs = [
- alsaLib gnome3.gtkmm gtk-layer-shell pulseaudio wayfire wf-config
+ alsaLib gtkmm3 gtk-layer-shell pulseaudio wayfire wf-config
];
mesonFlags = [ "--sysconfdir" "/etc" ];
diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix
index a2b67a22e2d..e09ad70f146 100644
--- a/pkgs/data/fonts/cascadia-code/default.nix
+++ b/pkgs/data/fonts/cascadia-code/default.nix
@@ -1,13 +1,13 @@
{ lib, fetchzip }:
let
- version = "2102.03";
+ version = "2102.25";
in
fetchzip {
name = "cascadia-code-${version}";
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip";
- sha256 = "076l44cyyp3cf15qyn2hzx34kzqm73d218fgwf8n69m8a1v34hs2";
+ sha256 = "14qhawcf1jmv68zdfbi2zfqdw4cf8fpk7plxzphmkqsp7hlw9pzx";
postFetch = ''
mkdir -p $out/share/fonts/
diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix
index 19f02a16f47..f4ab4c05851 100644
--- a/pkgs/data/misc/spdx-license-list-data/default.nix
+++ b/pkgs/data/misc/spdx-license-list-data/default.nix
@@ -2,25 +2,28 @@
stdenv.mkDerivation rec {
pname = "spdx-license-list-data";
- version = "3.11";
+ version = "3.12";
src = fetchFromGitHub {
owner = "spdx";
repo = "license-list-data";
rev = "v${version}";
- sha256 = "1iwyqhh6lh51a47mhfy98zvjan8yjsvlym8qz0isx2i1zzxlj47a";
+ sha256 = "09xci8dzblg3d30jf7s43zialbcxlxly03zrkiymcvnzixg8v48f";
};
- phases = [ "unpackPhase" "installPhase" ];
-
installPhase = ''
+ runHook preInstall
+
install -vDt $out/json json/licenses.json
+
+ runHook postInstall
'';
- meta = {
+ meta = with lib; {
description = "Various data formats for the SPDX License List";
homepage = "https://github.com/spdx/license-list-data";
- license = lib.licenses.cc0;
- platforms = lib.platforms.all;
+ license = licenses.cc0;
+ maintainers = with maintainers; [ oxzi ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix
index f8121958e29..e360bb05f40 100644
--- a/pkgs/development/compilers/clean/default.nix
+++ b/pkgs/development/compilers/clean/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "clean-3.0";
+ pname = "clean";
+ version = "3.0";
src =
if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
@@ -45,8 +46,8 @@ stdenv.mkDerivation {
'';
homepage = "http://wiki.clean.cs.ru.nl/Clean";
- license = lib.licenses.lgpl21;
- maintainers = [ lib.maintainers.kkallio ];
+ license = lib.licenses.bsd2;
+ maintainers = [ lib.maintainers.erin ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index b3be2bb220c..f101f596743 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -214,6 +214,8 @@ let
license = licenses.asl20;
maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ];
platforms = builtins.attrNames archs;
+ # Error running at_exit handler: Nil assertion failed
+ broken = lib.versions.minor version == "32" && stdenv.isDarwin;
};
})
);
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index 074646f5f41..51f30dbabda 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -4,10 +4,10 @@
, targetPackages, fetchpatch, bash
, dmdBootstrap ? callPackage ./bootstrap.nix { }
, HOST_DMD ? "${dmdBootstrap}/bin/dmd"
-, version ? "2.091.1"
-, dmdSha256 ? "0brz0n84jdkhr4sq4k91w48p739psbhbb1jk2pi9q60psmx353yr"
-, druntimeSha256 ? "0smgpmfriffh110ksski1s5j921kmxbc2zjy0dyj9ksyrxbzklbl"
-, phobosSha256 ? "1n00anajgibrfs1xzvrmag28hvbvkc0w1fwlimqbznvhf28rhrxs"
+, version ? "2.095.1"
+, dmdSha256 ? "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk"
+, druntimeSha256 ? "sha256:0ad4pa5llr9m9wqbvfv4yrcra4zz9qxlh5kx43mrv48f9bcxm2ha"
+, phobosSha256 ? "sha256:04w6jw4izix2vbw62j13wvz6q3pi7vivxnmxqj0g8904j5g0cxjl"
}:
let
@@ -53,18 +53,6 @@ stdenv.mkDerivation rec {
})
];
- patchFlags = [ "--directory=dmd" "-p1" "-F3" ];
- patches = [
- (fetchpatch {
- url = "https://github.com/dlang/dmd/commit/4157298cf04f7aae9f701432afd1de7b7e05c30f.patch";
- sha256 = "0v4xgqmrx5r8vbx5a4v88s0xnm23mam9nm99yfga7s2sxr0hi5p2";
- })
- (fetchpatch {
- url = "https://github.com/dlang/dmd/commit/1b8a4c90b040bf2f0b68a2739de4991315580b13.patch";
- sha256 = "1iih6aalv4fsw9mbrlrybhngkkchzzrzg7q8zl047w36c0x397cs";
- })
- ];
-
sourceRoot = ".";
# https://issues.dlang.org/show_bug.cgi?id=19553
@@ -76,6 +64,16 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash"
+
+ rm dmd/test/runnable/gdb1.d
+ rm dmd/test/runnable/gdb10311.d
+ rm dmd/test/runnable/gdb14225.d
+ rm dmd/test/runnable/gdb14276.d
+ rm dmd/test/runnable/gdb14313.d
+ rm dmd/test/runnable/gdb14330.d
+ rm dmd/test/runnable/gdb15729.sh
+ rm dmd/test/runnable/gdb4149.d
+ rm dmd/test/runnable/gdb4181.d
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
@@ -171,5 +169,7 @@ stdenv.mkDerivation rec {
license = licenses.boost;
maintainers = with maintainers; [ ThomasMader lionello ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+ # many tests are failing
+ broken = true;
};
}
diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix
index cd33baad993..e608a25462c 100644
--- a/pkgs/development/compilers/gnu-smalltalk/default.nix
+++ b/pkgs/development/compilers/gnu-smalltalk/default.nix
@@ -1,6 +1,6 @@
{ config, lib, stdenv, fetchurl, pkg-config, libtool
, zip, libffi, libsigsegv, readline, gmp
-, gnutls, gnome2, cairo, SDL, sqlite
+, gnutls, gtk2, cairo, SDL, sqlite
, emacsSupport ? config.emacsSupport or false, emacs ? null }:
assert emacsSupport -> (emacs != null);
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
# http://smalltalk.gnu.org/download
nativeBuildInputs = [ pkg-config ];
buildInputs = [
- libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk
+ libtool zip libffi libsigsegv-shared readline gmp gnutls gtk2
cairo SDL sqlite
]
++ lib.optional emacsSupport emacs;
diff --git a/pkgs/development/compilers/go/binary.nix b/pkgs/development/compilers/go/binary.nix
index 9a0dc343546..7eb8f8f7b98 100644
--- a/pkgs/development/compilers/go/binary.nix
+++ b/pkgs/development/compilers/go/binary.nix
@@ -8,8 +8,8 @@ let
"i686" = "386";
"x86_64" = "amd64";
"aarch64" = "arm64";
- "armv6l" = "arm";
- "armv7l" = "arm";
+ "armv6l" = "armv6l";
+ "armv7l" = "armv6l";
"powerpc64le" = "ppc64le";
}.${platform.parsed.cpu.name} or (throw "Unsupported CPU ${platform.parsed.cpu.name}");
diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index e0a689c7fa0..a199747546a 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -1,4 +1,4 @@
import ./generic.nix {
- version = "1.24.0";
- ldcSha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx";
+ version = "1.25.1";
+ ldcSha256 = "sha256-DjcW/pknvpEmTR/eXEEHECb2xEJic16evaU4CJthLUA=";
}
diff --git a/pkgs/development/compilers/xa/dxa.nix b/pkgs/development/compilers/xa/dxa.nix
index e0ff060de8d..03f2d054cc8 100644
--- a/pkgs/development/compilers/xa/dxa.nix
+++ b/pkgs/development/compilers/xa/dxa.nix
@@ -18,9 +18,8 @@ stdenv.mkDerivation rec {
dontConfigure = true;
postPatch = ''
- substituteInPlace \
- --replace "CC = gcc" "CC = cc' \
- Makefile
+ substituteInPlace Makefile \
+ --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc"
'';
installPhase = ''
diff --git a/pkgs/development/compilers/xa/xa.nix b/pkgs/development/compilers/xa/xa.nix
index 163b0bba513..c445940f5cd 100644
--- a/pkgs/development/compilers/xa/xa.nix
+++ b/pkgs/development/compilers/xa/xa.nix
@@ -15,13 +15,12 @@ stdenv.mkDerivation rec {
dontConfigure = true;
postPatch = ''
- substitueInPlace \
+ substituteInPlace Makefile \
--replace "DESTDIR" "PREFIX" \
- --replace "CC = gcc" "CC = cc" \
- --replace "LDD = gcc" "LDD = ld" \
+ --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \
+ --replace "LDD = gcc" "LDD = ${stdenv.cc.targetPrefix}cc" \
--replace "CFLAGS = -O2" "CFLAGS ?=" \
- --replace "LDFLAGS = -lc" "LDFLAGS ?= -lc" \
- Makefile
+ --replace "LDFLAGS = -lc" "LDFLAGS ?= -lc"
'';
makeFlags = [ "PREFIX=${placeholder "out"}" ];
diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix
index b57671d8637..2a6bfc7ad36 100644
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -12,10 +12,11 @@ in mkCoqDerivation {
owner = "LPCIC";
inherit version;
defaultVersion = lib.switch coq.coq-version [
- { case = "8.13"; out = "1.9.3"; }
+ { case = "8.13"; out = "1.9.4"; }
{ case = "8.12"; out = "1.8.0"; }
{ case = "8.11"; out = "1.6.0_8.11"; }
] null;
+ release."1.9.4".sha256 = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq";
release."1.9.3".sha256 = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z";
release."1.9.2".sha256 = "1rr2fr8vjkc0is7vh1461aidz2iwkigdkp6bqss4hhv0c3ijnn07";
release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r";
diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix
index aa3abc65534..01d1b61cb80 100644
--- a/pkgs/development/interpreters/bats/default.nix
+++ b/pkgs/development/interpreters/bats/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bats";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchzip {
url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz";
- hash = "sha256-grB/rJaDU0fuw4Hm3/9nI2px8KZnSWqRjTJPd7Mmb7s=";
+ hash = "sha256-+dboExOx2YELxV8Cwk9SVwk9G3p8EoP0LdaJ3o7GT6c=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -22,6 +22,9 @@ stdenv.mkDerivation rec {
inherit doCheck;
checkPhase = ''
+ # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows
+ sed -i '/test works even if PATH is reset/a skip' test/bats.bats
+
# test generates file with absolute shebang dynamically
substituteInPlace test/install.bats --replace \
"/usr/bin/env bash" "${bash}/bin/bash"
diff --git a/pkgs/development/interpreters/elixir/1.11.nix b/pkgs/development/interpreters/elixir/1.11.nix
index 4e50c737e39..6e5a30a9dd7 100644
--- a/pkgs/development/interpreters/elixir/1.11.nix
+++ b/pkgs/development/interpreters/elixir/1.11.nix
@@ -3,7 +3,7 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
mkDerivation {
- version = "1.11.3";
- sha256 = "sha256-DqmKpMLxrXn23fsX/hrjDsYCmhD5jbVtvOX8EwKBakc=";
+ version = "1.11.4";
+ sha256 = "sha256-qCX6hRWUbW+E5xaUhcYxRAnhnvncASUJck8lESlcDvk=";
minimumOTPVersion = "21";
}
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 99a812905d4..358b8663196 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rakudo";
- version = "2020.12";
+ version = "2021.02.1";
src = fetchurl {
url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
- sha256 = "1g3ciwhlac85d6l2kqslw8pm4bjjd1z79m1c5ll0fxmr6awgpk67";
+ sha256 = "1xwqx4357bw7h5pdmwxm5wxh8wjvrcdk4rvr3wyrhg1wzy5qvsn8";
};
buildInputs = [ icu zlib gmp perl ];
diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index f833c153b96..e5baacf5c29 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "moarvm";
- version = "2020.12";
+ version = "2021.02";
src = fetchurl {
url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
- sha256 = "18iys1bdb92asggrsz7sg1hh76j7kq63c3fgg33fnla18qf4z488";
+ sha256 = "08ri9mvbk97qfxcy6lj4cb7j3a789ck052m2vqfhis3vkrkw780r";
};
buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index b4b41fa8804..cd60bb3b790 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nqp";
- version = "2020.12";
+ version = "2021.02";
src = fetchurl {
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
- sha256 = "13h64d41fwggc3lg4bpllg4jrp64clm7nmnw4g2jyjl47cy5ni7x";
+ sha256 = "1vyl6x811f8mbdnp34yj6kfmfpxp2yfrr8cqf1w47rzmr741sjyj";
};
buildInputs = [ perl ];
diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix
deleted file mode 100644
index 968c395d701..00000000000
--- a/pkgs/development/libraries/concurrencykit/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- pname = "concurrencykit";
- version = "0.6.0";
-
- src = fetchurl {
- url = "http://concurrencykit.org/releases/ck-${version}.tar.gz";
- sha256 = "1pv21p7sjwwmbs2xblpy1lqk53r2i212yrqyjlr5dr3rlv87vqnp";
- };
-
- #Deleting this line causes "Unknown option --disable-static"
- configurePhase = "./configure --prefix=$out";
-
- enableParallelBuilding = true;
-
- meta = with lib; {
- description = "A library of safe, high-performance concurrent data structures";
- homepage = "http://concurrencykit.org";
- license = licenses.bsd2;
- platforms = platforms.unix;
- maintainers = [ maintainers.thoughtpolice ];
- };
-}
diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix
index c3fd6ffb940..5588e27356f 100644
--- a/pkgs/development/libraries/ftgl/default.nix
+++ b/pkgs/development/libraries/ftgl/default.nix
@@ -1,40 +1,47 @@
-{ lib, stdenv, fetchurl, freetype, libGL, libGLU, OpenGL }:
+{ lib
+, stdenv
+, fetchurl
+, freetype
+, libGL
+, libGLU
+, OpenGL
+}:
-let
- name = "ftgl-2.1.3-rc5";
-in
-stdenv.mkDerivation {
- inherit name;
+stdenv.mkDerivation rec {
+ pname = "ftgl";
+ version = "2.1.3-rc5";
src = fetchurl {
- url = "mirror://sourceforge/ftgl/${name}.tar.gz";
- sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l";
+ url = "mirror://sourceforge/${pname}-${version}.tar.gz";
+ hash = "sha256-VFjWISJFSGlXLTn4qoV0X8BdVRgAG876Y71su40mVls=";
};
- buildInputs = [ freetype ]
- ++ (if stdenv.isDarwin then
- [ OpenGL ]
- else
- [ libGL libGLU ])
- ;
+ buildInputs = [
+ freetype
+ ] ++ (if stdenv.isDarwin then [
+ OpenGL
+ ] else [
+ libGL
+ libGLU
+ ]);
- configureFlags = [ "--with-ft-prefix=${lib.getDev freetype}" ];
+ configureFlags = [
+ "--with-ft-prefix=${lib.getDev freetype}"
+ ];
enableParallelBuilding = true;
- meta = {
+ meta = with lib; {
homepage = "https://sourceforge.net/apps/mediawiki/ftgl/";
description = "Font rendering library for OpenGL applications";
- license = lib.licenses.gpl3Plus;
-
longDescription = ''
- FTGL is a free cross-platform Open Source C++ library that uses
- Freetype2 to simplify rendering fonts in OpenGL applications. FTGL
- supports bitmaps, pixmaps, texture maps, outlines, polygon mesh,
- and extruded polygon rendering modes.
+ FTGL is a free cross-platform Open Source C++ library that uses Freetype2
+ to simplify rendering fonts in OpenGL applications. FTGL supports bitmaps,
+ pixmaps, texture maps, outlines, polygon mesh, and extruded polygon
+ rendering modes.
'';
-
- platforms = lib.platforms.unix;
- maintainers = [];
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/glpng/default.nix b/pkgs/development/libraries/glpng/default.nix
new file mode 100644
index 00000000000..1194d988c07
--- /dev/null
+++ b/pkgs/development/libraries/glpng/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, stdenv
+, fetchFromRepoOrCz
+, cmake
+, libGL
+, libpng
+, pkg-config
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "glpng";
+ version = "1.46";
+
+ src = fetchFromRepoOrCz {
+ repo = "glpng";
+ rev = "v${version}";
+ hash = "sha256-C7EHaBN0PE/HJB6zcIaYU63+o7/MEz4WU1xr/kIOanM=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
+ buildInputs = [
+ libGL
+ libpng
+ zlib
+ ];
+
+ meta = with lib; {
+ homepage = "https://repo.or.cz/glpng.git/blob_plain/HEAD:/glpng.htm";
+ description = "PNG loader for OpenGL";
+ license = licenses.mit;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix
index c5846b523cd..824d5c38318 100644
--- a/pkgs/development/libraries/gnome-online-accounts/default.nix
+++ b/pkgs/development/libraries/gnome-online-accounts/default.nix
@@ -30,7 +30,7 @@
stdenv.mkDerivation rec {
pname = "gnome-online-accounts";
- version = "3.38.0";
+ version = "3.38.1";
# https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
src = fetchFromGitLab {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "GNOME";
repo = "gnome-online-accounts";
rev = version;
- sha256 = "sha256-NRGab/CMJxe31rr20+5wYZF2rOzoSNdztfNVojBd5ag=";
+ sha256 = "sha256-th7P++MC3GXX+349PJFEwHGGeMhxsGgoEDGnSYpY7E4=";
};
outputs = [ "out" "man" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index d544dd7625d..64b5be2e2d3 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "goffice";
- version = "0.10.48";
+ version = "0.10.49";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4";
+ sha256 = "X/wY27OF7fuFtsYlS55bTLPS/6MEK5Ms286ON/SzB+k=";
};
nativeBuildInputs = [ pkg-config intltool ];
diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index ccaceabd4e9..a3aa18b058a 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg
+{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome3, gst_all_1, librsvg
, glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }:
let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
stripRoot = false;
};
- nativeBuildInputs = [ dmd pkg-config which ];
+ nativeBuildInputs = [ ldc pkg-config which ];
propagatedBuildInputs = [
atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview4
libgda libpeas librsvg pango vte
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 804749bbdb5..3e81b45362f 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python2, perl, yacc, flex
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, perl, yacc, flex
, texinfo, perlPackages
, openldap, libcap_ng, sqlite, openssl, db, libedit, pam
, CoreFoundation, Security, SystemConfiguration
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
patches = [ ./heimdal-make-missing-headers.patch ];
- nativeBuildInputs = [ autoreconfHook pkg-config python2 perl yacc flex texinfo ]
+ nativeBuildInputs = [ autoreconfHook pkg-config python3 perl yacc flex texinfo ]
++ (with perlPackages; [ JSON ]);
buildInputs = optionals (stdenv.isLinux) [ libcap_ng ]
++ [ db sqlite openssl libedit openldap pam]
diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix
index c7d48468336..53b0dca0912 100644
--- a/pkgs/development/libraries/libayatana-appindicator/default.nix
+++ b/pkgs/development/libraries/libayatana-appindicator/default.nix
@@ -4,7 +4,7 @@
, gtkVersion ? "3"
, gtk2, libayatana-indicator-gtk2, libdbusmenu-gtk2
, gtk3, libayatana-indicator-gtk3, libdbusmenu-gtk3
-, dbus-glib, python2, python2Packages
+, dbus-glib,
}:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "1sba0w455rdkadkhxrx4fr63m0d9blsbb1q1hcshxw1k1z2nh1gk";
};
- nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection python2 python2Packages.pygtk dbus-glib ];
+ nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ];
buildInputs =
lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2
diff --git a/pkgs/development/libraries/libck/default.nix b/pkgs/development/libraries/libck/default.nix
index accb6556011..a46a7b33900 100644
--- a/pkgs/development/libraries/libck/default.nix
+++ b/pkgs/development/libraries/libck/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
license = with licenses; [ asl20 bsd2 ];
homepage = "http://concurrencykit.org/";
platforms = platforms.unix;
- maintainers = with maintainers; [ chessai ];
+ maintainers = with maintainers; [ chessai thoughtpolice ];
};
}
diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index f54929c5378..648eb89a514 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch
-, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }:
+, gnome3, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }:
let
pname = "libhttpseverywhere";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ];
- buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ];
+ buildInputs = [ glib libgee json-glib libsoup libarchive ];
# Fixes build with vala >=0.42
patches = [
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index b7724d27a06..3dffccf5f41 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -64,7 +64,12 @@ let
in {
libressl_3_1 = generic {
- version = "3.1.4";
- sha256 = "1dnbbnr43jashxivnafmh9gnn57c7ayva788ba03z633k6f18k21";
+ version = "3.1.5";
+ sha256 = "1504a1sf43frw43j14pij0q1f48rm5q86ggrlxxhw708qp7ds4rc";
+ };
+
+ libressl_3_2 = generic {
+ version = "3.2.5";
+ sha256 = "1zkwrs3b19s1ybz4q9hrb7pqsbsi8vxcs44qanfy11fkc7ynb2kr";
};
}
diff --git a/pkgs/development/libraries/libseat/default.nix b/pkgs/development/libraries/libseat/default.nix
new file mode 100644
index 00000000000..bdefb51b50f
--- /dev/null
+++ b/pkgs/development/libraries/libseat/default.nix
@@ -0,0 +1,37 @@
+{ fetchFromSourcehut
+, lib
+, meson
+, ninja
+, pkg-config
+, stdenv
+, systemd
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libseat";
+ version = "0.5.0";
+
+ src = fetchFromSourcehut {
+ owner = "~kennylevinsen";
+ repo = "seatd";
+ rev = version;
+ sha256 = "sha256-JwlJLHkRgSRqfQEhXbzuFTmhxfbwKVdLICPbTDbC9M0=";
+ };
+
+ nativeBuildInputs = [ meson ninja pkg-config ];
+
+ buildInputs = [
+ systemd
+ ];
+
+ mesonFlags = [ "-Dserver=disabled" "-Dseatd=disabled" "-Dlogind=enabled"];
+
+ meta = with lib; {
+ description = "A universal seat management library";
+ changelog = "https://git.sr.ht/~kennylevinsen/seatd/refs/${version}";
+ homepage = "https://sr.ht/~kennylevinsen/seatd/";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ emantor ];
+ };
+}
diff --git a/pkgs/development/libraries/md4c/default.nix b/pkgs/development/libraries/md4c/default.nix
new file mode 100644
index 00000000000..a711ecb7c76
--- /dev/null
+++ b/pkgs/development/libraries/md4c/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
+ pname = "md4c";
+ version = "0.4.7";
+
+ src = fetchFromGitHub {
+ owner = "mity";
+ repo = pname;
+ rev = "release-${version}";
+ hash = "sha256-nfMXUP1wu3ifn1QVTO/+XcfFRsThG8PlmYRv+b8AYlQ=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/mity/md4c";
+ description = "Markdown parser made in C";
+ longDescription = ''
+ MD4C is Markdown parser implementation in C, with the following features:
+
+ - Compliance: Generally, MD4C aims to be compliant to the latest version
+ of CommonMark specification. Currently, we are fully compliant to
+ CommonMark 0.29.
+ - Extensions: MD4C supports some commonly requested and accepted
+ extensions. See below.
+ - Performance: MD4C is very fast.
+ - Compactness: MD4C parser is implemented in one source file and one
+ header file. There are no dependencies other than standard C library.
+ - Embedding: MD4C parser is easy to reuse in other projects, its API is
+ very straightforward: There is actually just one function, md_parse().
+ - Push model: MD4C parses the complete document and calls few callback
+ functions provided by the application to inform it about a start/end of
+ every block, a start/end of every span, and with any textual contents.
+ - Portability: MD4C builds and works on Windows and POSIX-compliant
+ OSes. (It should be simple to make it run also on most other platforms,
+ at least as long as the platform provides C standard library, including
+ a heap memory management.)
+ - Encoding: MD4C by default expects UTF-8 encoding of the input
+ document. But it can be compiled to recognize ASCII-only control
+ characters (i.e. to disable all Unicode-specific code), or (on Windows)
+ to expect UTF-16 (i.e. what is on Windows commonly called just
+ "Unicode"). See more details below.
+ - Permissive license: MD4C is available under the MIT license.
+ '';
+ license = licenses.mit;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.all;
+ };
+}
+# TODO: enable tests (needs Python)
diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix
index 916303f00ce..87e2ae9631c 100644
--- a/pkgs/development/libraries/physics/fastnlo/default.nix
+++ b/pkgs/development/libraries/physics/fastnlo/default.nix
@@ -1,4 +1,15 @@
-{ lib, stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }:
+{ lib
+, stdenv
+, fetchurl
+, boost
+, fastjet
+, gfortran
+, lhapdf
+, python2
+, root
+, yoda
+, zlib
+}:
stdenv.mkDerivation rec {
pname = "fastnlo_toolkit";
@@ -9,8 +20,19 @@ stdenv.mkDerivation rec {
sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl";
};
- buildInputs = [ boost fastjet gfortran gfortran.cc.lib lhapdf python2 root yoda ];
- propagatedBuildInputs = [ zlib ];
+ buildInputs = [
+ boost
+ fastjet
+ gfortran
+ gfortran.cc.lib
+ lhapdf
+ python2
+ root
+ yoda
+ ];
+ propagatedBuildInputs = [
+ zlib
+ ];
preConfigure = ''
substituteInPlace ./fastnlotoolkit/Makefile.in \
@@ -23,11 +45,22 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
- description = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes";
- license = lib.licenses.gpl3;
- homepage = "http://fastnlo.hepforge.org";
- platforms = lib.platforms.unix;
- maintainers = with lib.maintainers; [ veprbl ];
+ meta = with lib; {
+ homepage = "http://fastnlo.hepforge.org";
+ description = "Fast pQCD calculations for hadron-induced processes";
+ longDescription = ''
+ The fastNLO project provides computer code to create and evaluate fast
+ interpolation tables of pre-computed coefficients in perturbation theory
+ for observables in hadron-induced processes.
+
+ This allows fast theory predictions of these observables for arbitrary
+ parton distribution functions (of regular shape), renormalization or
+ factorization scale choices, and/or values of alpha_s(Mz) as e.g. needed
+ in PDF fits or in systematic studies. Very time consuming complete
+ recalculations are thus avoided.
+ '';
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ veprbl ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index 7a9818bce97..0d7483d3c2e 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, zlib, perl, pkg-config, python, openssl }:
+{ lib, stdenv, fetchFromGitHub, zlib, pkg-config, python3, openssl }:
stdenv.mkDerivation rec {
pname = "rdkafka";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-EoNzxwuLiYi6sMhyqD/x+ku6BKA+i5og4XsUy2JBN0U=";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config python3 ];
- buildInputs = [ zlib perl python openssl ];
+ buildInputs = [ zlib openssl ];
NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix
index 566a17c6147..d9c19e6790c 100644
--- a/pkgs/development/libraries/science/math/cudnn/generic.nix
+++ b/pkgs/development/libraries/science/math/cudnn/generic.nix
@@ -8,6 +8,14 @@
, cudatoolkit
, fetchurl
, addOpenGLRunpath
+, # The distributed version of CUDNN includes both dynamically liked .so files,
+ # as well as statically linked .a files. However, CUDNN is quite large
+ # (multiple gigabytes), so you can save some space in your nix store by
+ # removing the statically linked libraries if you are not using them.
+ #
+ # Setting this to true removes the statically linked .a files.
+ # Setting this to false keeps these statically linked .a files.
+ removeStatic ? false
}:
stdenv.mkDerivation {
@@ -23,6 +31,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ addOpenGLRunpath ];
installPhase = ''
+ runHook preInstall
+
function fixRunPath {
p=$(patchelf --print-rpath $1)
patchelf --set-rpath "''${p:+$p:}${lib.makeLibraryPath [ stdenv.cc.cc ]}:\$ORIGIN/" $1
@@ -35,6 +45,10 @@ stdenv.mkDerivation {
mkdir -p $out
cp -a include $out/include
cp -a lib64 $out/lib64
+ '' + lib.optionalString removeStatic ''
+ rm -f $out/lib64/*.a
+ '' + ''
+ runHook postInstall
'';
# Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
diff --git a/pkgs/development/libraries/science/math/cutensor/default.nix b/pkgs/development/libraries/science/math/cutensor/default.nix
new file mode 100644
index 00000000000..1b5895b02bb
--- /dev/null
+++ b/pkgs/development/libraries/science/math/cutensor/default.nix
@@ -0,0 +1,37 @@
+{ callPackage
+, cudatoolkit_10_1, cudatoolkit_10_2
+, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
+}:
+
+rec {
+ cutensor_cudatoolkit_10_1 = callPackage ./generic.nix rec {
+ version = "1.2.2.5";
+ libPath = "lib/10.1";
+ cudatoolkit = cudatoolkit_10_1;
+ # 1.2.2 is compatible with CUDA 11.0, 11.1, and 11.2:
+ # ephemeral doc at https://developer.nvidia.com/cutensor/downloads
+ sha256 = "1dl9bd71frhac9cb8lvnh71zfsnqxbxbfhndvva2zf6nh0my4klm";
+ };
+
+ cutensor_cudatoolkit_10_2 = cutensor_cudatoolkit_10_1.override {
+ libPath = "lib/10.2";
+ cudatoolkit = cudatoolkit_10_2;
+ };
+
+ cutensor_cudatoolkit_10 = cutensor_cudatoolkit_10_2;
+
+ cutensor_cudatoolkit_11_0 = cutensor_cudatoolkit_10_2.override {
+ libPath = "lib/11";
+ cudatoolkit = cudatoolkit_11_0;
+ };
+
+ cutensor_cudatoolkit_11_1 = cutensor_cudatoolkit_11_0.override {
+ cudatoolkit = cudatoolkit_11_1;
+ };
+
+ cutensor_cudatoolkit_11_2 = cutensor_cudatoolkit_11_0.override {
+ cudatoolkit = cudatoolkit_11_2;
+ };
+
+ cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_2;
+}
diff --git a/pkgs/development/libraries/science/math/cutensor/generic.nix b/pkgs/development/libraries/science/math/cutensor/generic.nix
new file mode 100644
index 00000000000..0b2bd31b2c3
--- /dev/null
+++ b/pkgs/development/libraries/science/math/cutensor/generic.nix
@@ -0,0 +1,69 @@
+{ stdenv
+, lib
+, libPath
+, cudatoolkit
+, fetchurl
+, autoPatchelfHook
+, addOpenGLRunpath
+
+, version
+, sha256
+}:
+
+let
+ mostOfVersion = builtins.concatStringsSep "."
+ (lib.take 3 (lib.versions.splitVersion version));
+in
+
+stdenv.mkDerivation {
+ pname = "cudatoolkit-${cudatoolkit.majorVersion}-cutensor";
+ inherit version;
+
+ src = fetchurl {
+ url = "https://developer.download.nvidia.com/compute/cutensor/${mostOfVersion}/local_installers/libcutensor-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}-${version}.tar.gz";
+ inherit sha256;
+ };
+
+ outputs = [ "out" "dev" ];
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ addOpenGLRunpath
+ ];
+
+ buildInputs = [
+ stdenv.cc.cc.lib
+ ];
+
+ propagatedBuildInputs = [
+ cudatoolkit
+ ];
+
+ # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
+ # See the explanation in addOpenGLRunpath.
+ installPhase = ''
+ mkdir -p "$out" "$dev"
+ mv include "$dev"
+ mv ${libPath} "$out/lib"
+
+ function finalRPathFixups {
+ for lib in $out/lib/lib*.so; do
+ addOpenGLRunpath $lib
+ done
+ }
+ postFixupHooks+=(finalRPathFixups)
+ '';
+
+ passthru = {
+ inherit cudatoolkit;
+ majorVersion = lib.versions.major version;
+ };
+
+ meta = with lib; {
+ description = "cuTENSOR: A High-Performance CUDA Library For Tensor Primitives";
+ homepage = "https://developer.nvidia.com/cutensor";
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ obsidian-systems-maintenance ];
+ };
+}
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index cb29e721de1..50563f2745a 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -10,7 +10,7 @@ let
version = "3.9.0";
in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "liblapack";
inherit version;
@@ -23,6 +23,9 @@ stdenv.mkDerivation {
nativeBuildInputs = [ gfortran cmake ];
+ # Configure stage fails on aarch64-darwin otherwise, due to either clang 11 or gfortran 10.
+ hardeningDisable = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "stackprotector" ];
+
cmakeFlags = [
"-DCMAKE_Fortran_FLAGS=-fPIC"
"-DLAPACKE=ON"
@@ -33,6 +36,26 @@ stdenv.mkDerivation {
doCheck = true;
+ # Some CBLAS related tests fail on Darwin:
+ # 14 - CBLAS-xscblat2 (Failed)
+ # 15 - CBLAS-xscblat3 (Failed)
+ # 17 - CBLAS-xdcblat2 (Failed)
+ # 18 - CBLAS-xdcblat3 (Failed)
+ # 20 - CBLAS-xccblat2 (Failed)
+ # 21 - CBLAS-xccblat3 (Failed)
+ # 23 - CBLAS-xzcblat2 (Failed)
+ # 24 - CBLAS-xzcblat3 (Failed)
+ #
+ # Upstream issue to track:
+ # * https://github.com/Reference-LAPACK/lapack/issues/440
+ ctestArgs = lib.optionalString stdenv.isDarwin "-E '^(CBLAS-(x[sdcz]cblat[23]))$'";
+
+ checkPhase = ''
+ runHook preCheck
+ ctest ${ctestArgs}
+ runHook postCheck
+ '';
+
meta = with lib; {
inherit version;
description = "Linear Algebra PACKage";
diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix
index 241eb5a3721..481836a4e11 100644
--- a/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -8,8 +8,8 @@
, fixDarwinDylibNames
, cudaSupport
-, cudatoolkit_10_2
-, cudnn_cudatoolkit_10_2
+, cudatoolkit_11_1
+, cudnn_cudatoolkit_11_1
}:
let
@@ -38,7 +38,7 @@ in stdenv.mkDerivation {
installPhase = ''
# Copy headers and CMake files.
- install -Dm755 -t $dev/lib lib/*.a
+ mkdir -p $dev
cp -r include $dev
cp -r share $dev
@@ -109,8 +109,8 @@ in stdenv.mkDerivation {
passthru.tests.cmake = callPackage ./test {
inherit cudaSupport;
- cudatoolkit = cudatoolkit_10_2;
- cudnn = cudnn_cudatoolkit_10_2;
+ cudatoolkit = cudatoolkit_11_1;
+ cudnn = cudnn_cudatoolkit_11_1;
};
meta = with lib; {
diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
index bfb708531df..208e0b7adab 100644
--- a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
+++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
@@ -8,7 +8,7 @@ version: {
hash = "sha256-xBaNyI7eiQnSArHMITonrQQLZnZCZK/SWKOTWnxzdpc=";
};
x86_64-linux-cuda = {
- url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-${version}.zip";
- hash = "sha256-rNEyE4+jfeX7cU0aNYd5b0pZGYT0PNPnDnS1PIsrMeM=";
+ url = "https://download.pytorch.org/libtorch/cu111/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcu111.zip";
+ hash = "sha256-uQ7ptOuzowJ0JSPIvJHyNotBfpsqAnxpMDLq7Vl6L00=";
};
}
diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix
index d99026bc565..d4f16d230e6 100644
--- a/pkgs/development/libraries/science/math/primesieve/default.nix
+++ b/pkgs/development/libraries/science/math/primesieve/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "primesieve";
- version = "7.5";
+ version = "7.6";
nativeBuildInputs = [cmake];
src = fetchurl {
url = "https://github.com/kimwalisch/primesieve/archive/v${version}.tar.gz";
- sha256 = "0g60br3p8di92jx3pr2bb51xh15gg57l7qvwzwn7xf7l585hgi7v";
+ sha256 = "sha256-SFZp6Pmmx05SiUfSdN9wXxPKrydtRg0PA3uNvAycCpk=";
};
meta = with lib; {
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index e85b6d4cbf4..b6ec4842e07 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -39,11 +39,11 @@ let
throw "You need to enable at least one output module.";
in stdenv.mkDerivation rec {
pname = "speech-dispatcher";
- version = "0.10.1";
+ version = "0.10.2";
src = fetchurl {
url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz";
- sha256 = "0j2lfzkmbsxrrgjw6arzvnfd4jn5pxab28xsk2djssr2ydb9x309";
+ sha256 = "sha256-sGMZ8gHhXlbGKWZTr1vPwwDLNI6XLVF9+LBurHfq4tw=";
};
patches = [
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 412fd4b8dee..79a799f76fb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -225,7 +225,7 @@ $out/lib/common-lisp/query-fs"
x.deps;
};
cl-cffi-gtk-glib = addNativeLibs [pkgs.glib];
- cl-cffi-gtk-gdk-pixbuf = addNativeLibs [pkgs.gdk_pixbuf];
+ cl-cffi-gtk-gdk-pixbuf = addNativeLibs [pkgs.gdk-pixbuf];
cl-cffi-gtk-cairo = addNativeLibs [pkgs.cairo];
cl-cffi-gtk-pango = addNativeLibs [pkgs.pango];
cl-cffi-gtk-gdk = addNativeLibs [pkgs.gtk3];
diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix
index 0201491f4cc..a8ed246e6f8 100644
--- a/pkgs/development/lisp-modules/shell.nix
+++ b/pkgs/development/lisp-modules/shell.nix
@@ -11,6 +11,6 @@ self = rec {
lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
];
CPATH = "${libfixposix}/include";
- LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib";
+ LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk-pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib";
};
in stdenv.mkDerivation self
diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix
index e08078ea672..c8fce166aa7 100644
--- a/pkgs/development/mobile/androidenv/emulator.nix
+++ b/pkgs/development/mobile/androidenv/emulator.nix
@@ -5,16 +5,16 @@ deployAndroidPackage {
buildInputs = [ autoPatchelfHook makeWrapper ]
++ lib.optional (os == "linux") [
pkgs.glibc
- pkgs.xlibs.libX11
- pkgs.xlibs.libXext
- pkgs.xlibs.libXdamage
- pkgs.xlibs.libXfixes
- pkgs.xlibs.libxcb
- pkgs.xlibs.libXcomposite
- pkgs.xlibs.libXcursor
- pkgs.xlibs.libXi
- pkgs.xlibs.libXrender
- pkgs.xlibs.libXtst
+ pkgs.xorg.libX11
+ pkgs.xorg.libXext
+ pkgs.xorg.libXdamage
+ pkgs.xorg.libXfixes
+ pkgs.xorg.libxcb
+ pkgs.xorg.libXcomposite
+ pkgs.xorg.libXcursor
+ pkgs.xorg.libXi
+ pkgs.xorg.libXrender
+ pkgs.xorg.libXtst
pkgs.libcxx
pkgs.libGL
pkgs.libpulseaudio
diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/pkgs/development/mobile/androidenv/tools/26.nix
index 0234c9f3d04..a768a120547 100644
--- a/pkgs/development/mobile/androidenv/tools/26.nix
+++ b/pkgs/development/mobile/androidenv/tools/26.nix
@@ -4,7 +4,7 @@ deployAndroidPackage {
name = "androidsdk";
inherit os package;
buildInputs = [ autoPatchelfHook makeWrapper ]
- ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ];
+ ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXrender pkgs.xorg.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.xorg.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ];
patchInstructions = ''
${lib.optionalString (os == "linux") ''
@@ -27,7 +27,7 @@ deployAndroidPackage {
# Wrap monitor script
wrapProgram $PWD/monitor \
--prefix PATH : ${pkgs.jdk8}/bin \
- --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]}
+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]}
# Patch all script shebangs
patchShebangs .
diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix
index 240f287003b..2023cbfbfa0 100644
--- a/pkgs/development/node-packages/default.nix
+++ b/pkgs/development/node-packages/default.nix
@@ -107,7 +107,7 @@ let
mirakurun = super.mirakurun.override rec {
nativeBuildInputs = with pkgs; [ makeWrapper ];
postInstall = let
- runtimeDeps = [ nodejs ] ++ (with pkgs; [ bash which v4l_utils ]);
+ runtimeDeps = [ nodejs ] ++ (with pkgs; [ bash which v4l-utils ]);
in
''
substituteInPlace $out/lib/node_modules/mirakurun/processes.json \
diff --git a/pkgs/development/ocaml-modules/encore/default.nix b/pkgs/development/ocaml-modules/encore/default.nix
index 95eb75ee7ca..5924845c4f4 100644
--- a/pkgs/development/ocaml-modules/encore/default.nix
+++ b/pkgs/development/ocaml-modules/encore/default.nix
@@ -3,13 +3,13 @@
buildDunePackage rec {
pname = "encore";
- version = "0.7";
+ version = "0.8";
minimumOCamlVersion = "4.07";
src = fetchurl {
url = "https://github.com/mirage/encore/releases/download/v${version}/encore-v${version}.tbz";
- sha256 = "0cwmhkj5jmk3z5y0agmkf5ygpgxynjkq2d7d50jgzmnqs7f6g7nh";
+ sha256 = "a406bc9863b04bb424692045939d6c170a2bb65a98521ae5608d25b0559344f6";
};
useDune2 = true;
diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix
index 65ea4d4b82e..3ee09b2d51c 100644
--- a/pkgs/development/ocaml-modules/labltk/default.nix
+++ b/pkgs/development/ocaml-modules/labltk/default.nix
@@ -56,6 +56,10 @@ let param =
version = "8.06.9";
sha256 = "1k42k3bjkf22gk39lwwzqzfhgjyhxnclslldrzpg5qy1829pbnc0";
};
+ "4.12" = mkNewParam {
+ version = "8.06.10";
+ sha256 = "06cck7wijq4zdshzhxm6jyl8k3j0zglj2axsyfk6q1sq754zyf4a";
+ };
}.${builtins.substring 0 4 ocaml.version};
in
diff --git a/pkgs/development/ocaml-modules/lru/default.nix b/pkgs/development/ocaml-modules/lru/default.nix
index e5c7937b27a..035d612cfe2 100644
--- a/pkgs/development/ocaml-modules/lru/default.nix
+++ b/pkgs/development/ocaml-modules/lru/default.nix
@@ -1,9 +1,11 @@
-{ lib, fetchurl, buildDunePackage, psq }:
+{ lib, fetchurl, buildDunePackage, ocaml, psq, qcheck-alcotest }:
buildDunePackage rec {
pname = "lru";
version = "0.3.0";
+ useDune2 = true;
+
src = fetchurl {
url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-v${version}.tbz";
sha256 = "1ab9rd7cq15ml8x0wjl44wy99h5z7x4g9vkkz4i2d7n84ghy7vw4";
@@ -11,6 +13,9 @@ buildDunePackage rec {
propagatedBuildInputs = [ psq ];
+ doCheck = lib.versionAtLeast ocaml.version "4.05";
+ checkInputs = [ qcheck-alcotest ];
+
meta = {
homepage = "https://github.com/pqwy/lru";
description = "Scalable LRU caches for OCaml";
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
index 0391498c37a..46c84d8d70d 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
@@ -14,10 +14,10 @@
, lib
}:
let
- version = "1.4.0";
+ version = "1.4.1";
src = fetchzip {
url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz";
- sha256 = "16vvwq3d9xmr91r6yv5i2gyqcdliji7asyq4g6iygi617233fa33";
+ sha256 = "0hzpw17qfhb0cxgwah1fv4k300r363dy1kv0977anl44dlanx1v5";
};
# unvendor some (not all) dependencies.
@@ -73,6 +73,6 @@ buildDunePackage {
description = "OCaml Language Server Protocol implementation";
license = lib.licenses.isc;
platforms = platforms.unix;
- maintainers = [ maintainers.symphorien ];
+ maintainers = [ maintainers.symphorien maintainers.marsam ];
};
}
diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix
index 80fa01066f1..6e639f984cb 100644
--- a/pkgs/development/ocaml-modules/tcpip/default.nix
+++ b/pkgs/development/ocaml-modules/tcpip/default.nix
@@ -1,5 +1,5 @@
{ lib, buildDunePackage, fetchurl
-, bisect_ppx, ppx_cstruct
+, bisect_ppx, ppx_cstruct, pkg-config
, rresult, cstruct, cstruct-lwt, mirage-net, mirage-clock
, mirage-random, mirage-stack, mirage-protocols, mirage-time
, ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt
@@ -11,18 +11,23 @@
buildDunePackage rec {
pname = "tcpip";
- version = "6.0.0";
+ version = "6.1.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
- sha256 = "0wbrs8jz1vw3zdrqmqcwawxh4yhc2gy30rw7gz4w116cblkvnb8s";
+ sha256 = "e81c98a6e80e05f9fa4e5fbee50e6c247f6011254c7b1d9a0e58bae318c1f0c8";
};
+ patches = [
+ ./no-opam-pkg-config-path.patch
+ ];
+
nativeBuildInputs = [
bisect_ppx
ppx_cstruct
+ pkg-config
];
propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch b/pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch
new file mode 100644
index 00000000000..a7e9155ce5a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch
@@ -0,0 +1,21 @@
+diff --git a/freestanding/Makefile b/freestanding/Makefile
+index f22d220d..4bb3ac57 100644
+--- a/freestanding/Makefile
++++ b/freestanding/Makefile
+@@ -1,6 +1,4 @@
+-PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig
+-
+-EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?)
++EXISTS := $(shell pkg-config --exists ocaml-freestanding; echo $$?)
+
+ .PHONY: all clean
+ all: libtcpip_freestanding_stubs.a
+@@ -10,7 +8,7 @@ libtcpip_freestanding_stubs.a:
+ touch $@
+ else
+ CC ?= cc
+-FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding)
++FREESTANDING_CFLAGS := $(shell pkg-config --cflags ocaml-freestanding)
+ CFLAGS := $(FREESTANDING_CFLAGS)
+
+ OBJS=checksum_stubs.o
diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix
index 0f1a297e6ac..0dc576fca49 100644
--- a/pkgs/development/python-modules/aiolyric/default.nix
+++ b/pkgs/development/python-modules/aiolyric/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "aiolyric";
- version = "1.0.5";
+ version = "1.0.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "timmo001";
repo = pname;
rev = "v${version}";
- sha256 = "00kq3dsjcfhjzn585phb3g168dbg53wrqq7g8a4gljs49c2mf5qx";
+ sha256 = "1lnzsdw6kvgk0762f3vyw4xfzn7qkvsff16q61gm0ryjqg9j8whx";
};
propagatedBuildInputs = [ aiohttp ];
diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix
index 9c677650555..414f8a6d9a6 100644
--- a/pkgs/development/python-modules/aiorun/default.nix
+++ b/pkgs/development/python-modules/aiorun/default.nix
@@ -1,25 +1,24 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, isPy27
+, pythonOlder
, pygments
, pytestCheckHook
-, pytestcov
+, pytest-cov
, uvloop
}:
buildPythonPackage rec {
pname = "aiorun";
- version = "2020.6.1";
+ version = "2020.12.1";
format = "flit";
-
- disabled = isPy27;
+ disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "cjrh";
repo = pname;
rev = "v${version}";
- sha256 = "00mq5ylhhdfdqrh7zdqabf3wy85jrkqvgfb1421ll46fsjim2d14";
+ sha256 = "sha256-ktc2cmoPNYcsVyKCWs+ivhV5onywFIrdDRBiBKrdiF4=";
};
propagatedBuildInputs = [
@@ -28,7 +27,7 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
- pytestcov
+ pytest-cov
uvloop
];
@@ -43,6 +42,6 @@ buildPythonPackage rec {
description = "Boilerplate for asyncio applications";
homepage = "https://github.com/cjrh/aiorun";
license = licenses.asl20;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/ajsonrpc/default.nix b/pkgs/development/python-modules/ajsonrpc/default.nix
new file mode 100644
index 00000000000..e5a81d9cfa6
--- /dev/null
+++ b/pkgs/development/python-modules/ajsonrpc/default.nix
@@ -0,0 +1,24 @@
+{ lib, pythonOlder, buildPythonPackage, fetchPypi, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "ajsonrpc";
+ version = "1.1.0";
+
+ disabled = pythonOlder "3.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1b5r8975wdnk3qnc1qjnn4lkxmqcir3brbwnxml9ii90dnsw408a";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "ajsonrpc" ];
+
+ meta = with lib; {
+ description = "Async JSON-RPC 2.0 protocol + asyncio server";
+ homepage = "https://github.com/pavlov99/ajsonrpc";
+ license = licenses.mit;
+ maintainers = with maintainers; [ oxzi ];
+ };
+}
diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix
index 7ce389f984d..fe055d7f197 100644
--- a/pkgs/development/python-modules/asyncwhois/default.nix
+++ b/pkgs/development/python-modules/asyncwhois/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "asyncwhois";
- version = "0.3.0";
+ version = "0.3.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pogzyb";
repo = pname;
rev = "v${version}";
- sha256 = "1514fz942yix7fh4yg982mxjp8c0qb6a0i4fw5wsc3xx4g86zcdg";
+ sha256 = "1wp6pwnc1inzzn9nhkwq9m9ab1aylw0hzq94w6p2dsm2njfqma8h";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
index 91f420f11ae..8454d4463f4 100644
--- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datafactory";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "d4f3984eca74b1e3691467aadc09626e578ed1fc5ef410872d474f3e7653916a";
+ sha256 = "433ad8e83bd8df4abc5af47a0e3a7a4515f79931db4036f2bccd65b5a9e88bfb";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
index ec1caa5c3e4..35dc7ef05ab 100644
--- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
@@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
- version = "1.0.0";
+ version = "2.0.0";
pname = "azure-mgmt-netapp";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "e2c0cecd634c0a106e389f39ad767bfd1d718d90692e4e3c9664b1fe9a792ade";
+ sha256 = "ff3b663e36c961e86fc0cdbd6f9fb9fb863d3e7db9035fe713af7299e809ee5e";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
index d6fecfbdfb9..a7403e16123 100644
--- a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
+++ b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
@@ -1,8 +1,9 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi, pythonAtLeast }:
buildPythonPackage rec {
pname = "backports.ssl_match_hostname";
version = "3.7.0.1";
+ disabled = pythonAtLeast "3.7";
src = fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index 38390e8377e..f229beb2b04 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -1,14 +1,16 @@
-{ lib, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }:
+{ lib, buildPythonPackage, isPy3k, fetchPypi
+, bluez, dbus-next, pytestCheckHook, pytest-cov
+}:
buildPythonPackage rec {
pname = "bleak";
- version = "0.10.0";
+ version = "0.11.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "5c3a873965f2910865895e572e7a4f10533d6e150e6ba17936397426bf8d1eee";
+ sha256 = "1zs5lz3r17a2xn19i4na132iccyjsl9navj0d3v7gks7hlcad5kp";
};
postPatch = ''
@@ -19,10 +21,11 @@ buildPythonPackage rec {
--replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\"
'';
- propagatedBuildInputs = [ txdbus ];
- checkInputs = [ pytest pytestcov ];
+ propagatedBuildInputs = [ dbus-next ];
- checkPhase = "AGENT_OS=linux py.test";
+ checkInputs = [ pytestCheckHook pytest-cov ];
+
+ pythonImportsCheck = [ "bleak" ];
meta = with lib; {
description = "Bluetooth Low Energy platform Agnostic Klient for Python";
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 7c412836ad0..cdd6af447b4 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.17.27"; # N.B: if you change this, change botocore and awscli to a matching version
+ version = "1.17.30"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-+kGYf59xNoATdnMG2VIrYnlGoBtIQ5OKJvsZzIrbBsA=";
+ sha256 = "sha256-05wEtR5gGX9VA/hInwQ7yQSYFWfMhDHTiTZ3Z9w/1a4=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index bdb15199e36..ca8ef220c9f 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.20.27"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.20.30"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-RHeAPwdkn02AsX0FSCDnoJuyyweS0N7MKBIQi8N1nEo=";
+ sha256 = "sha256-mP8eshDTlKH/5zazPIp75o8w8KA1ULVZxbtv3wwpMo0=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index ea4910712ce..3946170c78c 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -3,7 +3,7 @@
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial,
isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins,
- parameterized, git, openssh, glibcLocales, nixosTests }:
+ parameterized, git, openssh, glibcLocales, ldap3, nixosTests }:
let
withPlugins = plugins: buildPythonPackage {
@@ -25,11 +25,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
- version = "3.0.0";
+ version = "3.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0li47fpm398dk69q6g2zjaxx46w00g3n0jszz88kf57sakri553y";
+ sha256 = "0iywcvq1sx9z5f37pw7g9qqm19fr3bymzawb0i2afm737hxr2xfp";
};
propagatedBuildInputs = [
@@ -67,6 +67,9 @@ let
git
openssh
glibcLocales
+ # optional dependency that was accidentally made required for tests
+ # https://github.com/buildbot/buildbot/pull/5857
+ ldap3
];
patches = [
diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix
index 71da12049e9..98666faee43 100644
--- a/pkgs/development/python-modules/buildbot/pkg.nix
+++ b/pkgs/development/python-modules/buildbot/pkg.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0ihcxdkbm1lq79fdjmcrj316zh6sjlc3162yynww8nggv2mlnz6v";
+ sha256 = "1vraxisvgnl9q2rgsmfdh1ywja125s97xqicrdx9mbmrwaka2a40";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix
index a9a9538f5b9..b2d7cc38bed 100644
--- a/pkgs/development/python-modules/buildbot/plugins.nix
+++ b/pkgs/development/python-modules/buildbot/plugins.nix
@@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "0pk7h5wwvmdn74ngj5rspz7z9y80ryzgqd2z2qy7kf9chpz7qczk";
+ sha256 = "0lzlghgsb247w0aw0x7vqw4f980kfbbbvjw48fcq9951qcqkr1sf";
};
# Remove unneccessary circular dependency on buildbot
@@ -34,7 +34,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "1y9dpxi7r5r2ya5y0i28b4g5fvla6wrbjz9rffqaqldf4h316jx2";
+ sha256 = "1sqmmxxi0npjcha3xfyy4ldqaks8hmlhilnyvzsfi56n9s96z1cj";
};
buildInputs = [ buildbot-pkg ];
@@ -56,7 +56,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "0vhnqqxl693b2d14ayifpjz8zlg3dngl127svr08amzmbad7irh1";
+ sha256 = "1w4mf8gi71ycf0m93cv1qqly36xnnrmpangzv0pvx23czs96lcms";
};
buildInputs = [ buildbot-pkg ];
@@ -78,7 +78,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "1dgs33z3sjr3s8ymqyxjkx2g6iah3p91ng9hxllmyyp4xpxaxyhk";
+ sha256 = "1a9ssl0plzrs150n958h7aasm0h64whixckfl1y2y3750qy3vrd2";
};
buildInputs = [ buildbot-pkg ];
@@ -100,7 +100,7 @@
src = fetchPypi {
inherit pname version;
- sha256 = "06j6f2k0r8nyh8swh689cy4zq50lmy5glx0pa3zdpnk02k4x3q72";
+ sha256 = "1wcli3vymsqc720jj23ir86lirshb3p8szp7m21lz13g9mpj0idl";
};
buildInputs = [ buildbot-pkg ];
diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix
index 7feb409a26d..d9dea034eab 100644
--- a/pkgs/development/python-modules/buildbot/worker.nix
+++ b/pkgs/development/python-modules/buildbot/worker.nix
@@ -7,7 +7,7 @@ buildPythonPackage (rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0zrd9h9i7fnmh81zvscxzq3rspyvjvidzbgcziq2m0z522krs8qq";
+ sha256 = "1xvn0m8vijzfrm5sdls3n4ca8iyrnxsprl6dj15f7zy9rms4m47p";
};
propagatedBuildInputs = [ twisted future ];
diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix
index 395978396a5..aa1e3d1d864 100644
--- a/pkgs/development/python-modules/bx-python/default.nix
+++ b/pkgs/development/python-modules/bx-python/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "bx-python";
- version = "0.8.10";
+ version = "0.8.11";
disabled = isPy27;
src = fetchFromGitHub {
owner = "bxlab";
repo = "bx-python";
rev = "v${version}";
- sha256 = "09q5nrv0w9b1bclc7g80bih87ikffhvia22d6cpdc747wjrzz8il";
+ sha256 = "0cz5vgw19hmkcg689vr540q2gl2lb3xcf1lphm7zbfp8wmypcadm";
};
nativeBuildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix
index 6d86ccb9543..6057a770e0a 100644
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/pkgs/development/python-modules/casbin/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "casbin";
- version = "0.18.3";
+ version = "0.18.4";
disabled = isPy27;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
- sha256 = "1wbwccwizndiww9a3x1jhixzpcg2qmqlxidk2rqnrzvp04lb8b0q";
+ sha256 = "16yhl1xgrgkyqnmbw9in3y7ypcxvvy21h32v50cd73a3iw4x27d0";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 5c4978a388f..d4b42ac83e8 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -1,7 +1,7 @@
{ lib, buildPythonPackage
, fetchPypi, isPy3k, linuxPackages
, fastrlock, numpy, six, wheel, pytest, mock, setuptools
-, cudatoolkit, cudnn, nccl
+, cudatoolkit, cudnn, cutensor, nccl
}:
buildPythonPackage rec {
@@ -26,6 +26,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
cudatoolkit
cudnn
+ cutensor
linuxPackages.nvidia_x11
nccl
fastrlock
diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix
index fc349cdc277..cc06297c4ea 100644
--- a/pkgs/development/python-modules/datasets/default.nix
+++ b/pkgs/development/python-modules/datasets/default.nix
@@ -3,6 +3,8 @@
, fetchFromGitHub
, dill
, filelock
+, fsspec
+, huggingface-hub
, multiprocess
, numpy
, pandas
@@ -14,18 +16,20 @@
buildPythonPackage rec {
pname = "datasets";
- version = "1.1.2";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = version;
- hash = "sha256-upXZ2rOfmjnJbDo6RMGeHv/fe10RQAf/zwDWWKdt6SA=";
+ hash = "sha256-is8TS84varARWyfeDTbQH0pcYFTk0PcEyK183emB4GE=";
};
propagatedBuildInputs = [
dill
filelock
+ fsspec
+ huggingface-hub
multiprocess
numpy
pandas
@@ -36,7 +40,9 @@ buildPythonPackage rec {
];
postPatch = ''
- substituteInPlace setup.py --replace '"tqdm>=4.27,<4.50.0"' '"tqdm>=4.27"'
+ substituteInPlace setup.py \
+ --replace '"tqdm>=4.27,<4.50.0"' '"tqdm>=4.27"' \
+ --replace "huggingface_hub==0.0.2" "huggingface_hub>=0.0.2"
'';
# Tests require pervasive internet access.
diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix
index ad5cc8bfb03..d656a203b9e 100644
--- a/pkgs/development/python-modules/datashader/default.nix
+++ b/pkgs/development/python-modules/datashader/default.nix
@@ -24,11 +24,11 @@
buildPythonPackage rec {
pname = "datashader";
- version = "0.12.0";
+ version = "0.12.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-CnV6ne3cbMtoVUBDqXf4n3tlEMzuKp7H8Ju7Qrzn9es=";
+ sha256 = "a135612876dc3e4b16ccb9ddb70de50519825c8c1be251b49aefa550bcf8a39a";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix
index 0374bebe4f9..c6e30933528 100644
--- a/pkgs/development/python-modules/deprecated/default.nix
+++ b/pkgs/development/python-modules/deprecated/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "Deprecated";
- version = "1.2.11";
+ version = "1.2.12";
src = fetchPypi {
inherit pname version;
- sha256 = "471ec32b2755172046e28102cd46c481f21c6036a0ec027521eba8521aa4ef35";
+ sha256 = "6d2de2de7931a968874481ef30208fd4e08da39177d61d3d4ebdf4366e7dbca1";
};
propagatedBuildInputs = [ wrapt ];
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index dbc36317228..403ca524792 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -2,36 +2,31 @@
, buildPythonPackage
, isPy3k
, fetchPypi
-, html5lib
, wcwidth
-, setuptools
-, pytest
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "ftfy";
- version = "5.8";
+ version = "5.9";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "081p5z20dirrf1i3nshylc31qd5mbxibjc7gzj8x4isbiizpdisi";
+ sha256 = "8c4fb2863c0b82eae2ab3cf353d9ade268dfbde863d322f78d6a9fd5cefb31e9";
};
propagatedBuildInputs = [
- html5lib
wcwidth
- setuptools
];
checkInputs = [
- pytest
+ pytestCheckHook
];
- # We suffix PATH like this because the tests want the ftfy executable
- checkPhase = ''
- PATH=$out/bin:$PATH pytest
+ preCheck = ''
+ export PATH=$out/bin:$PATH
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix
index 883ff69c6d6..ed677466580 100644
--- a/pkgs/development/python-modules/ftputil/default.nix
+++ b/pkgs/development/python-modules/ftputil/default.nix
@@ -1,13 +1,13 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, freezegun }:
buildPythonPackage rec {
- version = "4.0.0";
+ version = "5.0.0";
pname = "ftputil";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "d494c47f24fd3f8fbe92d40d90e0902c0e04288f200688af2b16d6b46fe441e1";
+ sha256 = "0dc82fa0a8ea385e8222b72bedb1ec31caac07822b6a1a9139adc98b0b051d06";
};
checkInputs = [ pytest freezegun ];
diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix
index c6ccf881156..5563ff94baf 100644
--- a/pkgs/development/python-modules/geventhttpclient/default.nix
+++ b/pkgs/development/python-modules/geventhttpclient/default.nix
@@ -6,6 +6,7 @@
, certifi
, six
, backports_ssl_match_hostname
+, pythonOlder
}:
buildPythonPackage rec {
@@ -18,7 +19,8 @@ buildPythonPackage rec {
};
buildInputs = [ pytest ];
- propagatedBuildInputs = [ gevent certifi six backports_ssl_match_hostname ];
+ propagatedBuildInputs = [ gevent certifi six ]
+ ++ lib.optionals (pythonOlder "3.7") [ backports_ssl_match_hostname ];
# Several tests fail that require network
doCheck = false;
diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
index 8f67fed79d7..ccc8aa83975 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-datatransfer";
- version = "3.0.0";
+ version = "3.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0hmsqvs2srmqcwmli48vd5vw829zax3pwj63fsxig6sdhjlf6j7j";
+ sha256 = "c5669410018eb41cecf6f9c90136d24d0ca9ed141bda8fbb3d52cd3de7162960";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index 2aa615a221f..6f2e6c473a3 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
- version = "2.11.0";
+ version = "2.12.0";
src = fetchPypi {
inherit pname version;
- sha256 = "d8f8464188e3eb03925a4f4acbf4e8fbfbde84a06145bd8a52c6b736113713ae";
+ sha256 = "484bb733e5dd14bb82d28480a5d7f540b8ee59f081fcf32782546b717180d1b8";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix
index ab31a8ee4ed..c266d3e7921 100644
--- a/pkgs/development/python-modules/google-cloud-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-logging/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "google-cloud-logging";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8932ac382eee6af85cd08400a77586dd3139fbf40b61db757c4c492490899741";
+ sha256 = "b5675ce159db4e9c1d755003b76190460766f426a7c3c1519014cdd5ce66e890";
};
propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];
diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
index a143a418c22..2a50fd5fb60 100644
--- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-secret-manager";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "97a46d2318f00c1c6ae1a4ab587e338677c5cc1651d7c6304982d74fa364dd9d";
+ sha256 = "4df4b7e3f83bc12d6bd29e69608172586b6ddfc7586dd2a2fd70cc4f18ed05c7";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix
index 007d4eb2cea..938a472eddf 100644
--- a/pkgs/development/python-modules/googlemaps/default.nix
+++ b/pkgs/development/python-modules/googlemaps/default.nix
@@ -1,28 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, pytest-cov
+, pytestCheckHook
+, pythonOlder
, requests
, responses
-, pytestCheckHook
-, pytestcov
-, isPy27
}:
buildPythonPackage rec {
pname = "googlemaps";
- version = "4.4.2";
- disabled = isPy27;
+ version = "4.4.5";
+ disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "googlemaps";
repo = "google-maps-services-python";
rev = "v${version}";
- sha256 = "DYhW1OGce/0gY7Jmwq6iM45PxLyXIYo4Cfg2u6Xuyg4=";
+ sha256 = "sha256-Rdfp98UqTMbqcOpkzh0Dz8fNSSbuvCnCztCkxiBgaAA=";
};
propagatedBuildInputs = [ requests ];
- checkInputs = [ pytestCheckHook responses pytestcov ];
+ checkInputs = [
+ pytest-cov
+ pytestCheckHook
+ responses
+ ];
disabledTests = [
# touches network
@@ -30,6 +34,8 @@ buildPythonPackage rec {
"test_transit_without_time"
];
+ pythonImportsCheck = [ "googlemaps" ];
+
meta = with lib; {
homepage = "https://github.com/googlemaps/google-maps-services-python";
description = "Python client library for Google Maps API Web Services";
diff --git a/pkgs/development/python-modules/gradient-utils/default.nix b/pkgs/development/python-modules/gradient-utils/default.nix
index cf0ffb6bb41..ee8d1bde622 100644
--- a/pkgs/development/python-modules/gradient-utils/default.nix
+++ b/pkgs/development/python-modules/gradient-utils/default.nix
@@ -1,12 +1,13 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
, fetchFromGitHub
, hyperopt
-, lib
, mock
, numpy
-, poetry
+, poetry-core
, prometheus_client
, pytestCheckHook
+, requests
}:
buildPythonPackage rec {
@@ -24,23 +25,39 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \
- --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"'
+ --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \
+ --replace 'wheel = "^0.35.1"' 'wheel = "*"'
'';
- nativeBuildInputs = [ poetry ];
- checkInputs = [ mock pytestCheckHook ];
- propagatedBuildInputs = [ hyperopt prometheus_client numpy ];
+ nativeBuildInputs = [ poetry-core ];
+
+ propagatedBuildInputs = [
+ hyperopt
+ prometheus_client
+ numpy
+ ];
+
+ checkInputs = [
+ mock
+ requests
+ pytestCheckHook
+ ];
+
+ preCheck = ''
+ export HOSTNAME=myhost-experimentId
+ '';
- preCheck = "export HOSTNAME=myhost-experimentId";
disabledTests = [
"test_add_metrics_pushes_metrics" # requires a working prometheus push gateway
];
+ pythonImportsCheck = [ "gradient_utils" ];
+
meta = with lib; {
- description = "Gradient ML SDK";
- homepage = "https://github.com/Paperspace/gradient-utils";
- license = licenses.mit;
- platforms = platforms.unix;
+ description = "Python utils and helpers library for Gradient";
+ homepage = "https://github.com/Paperspace/gradient-utils";
+ license = licenses.mit;
+ platforms = platforms.unix;
maintainers = with maintainers; [ freezeboy ];
};
}
diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix
index c4c6e3b356c..05a590e52fe 100644
--- a/pkgs/development/python-modules/gradient/default.nix
+++ b/pkgs/development/python-modules/gradient/default.nix
@@ -19,8 +19,9 @@ buildPythonPackage rec {
--replace 'attrs<=' 'attrs>=' \
--replace 'colorama==' 'colorama>=' \
--replace 'PyYAML==' 'PyYAML>=' \
- --replace 'marshmallow<' 'marshmallow>='
- '';
+ --replace 'marshmallow<' 'marshmallow>=' \
+ --replace 'websocket-client==' 'websocket-client>='
+ '';
propagatedBuildInputs = [ attrs boto3 requests gradient_statsd terminaltables
click-completion click-didyoumean click-help-colors requests_toolbelt
diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix
index e66a3f5e9fc..3552b6922fc 100644
--- a/pkgs/development/python-modules/h3/default.nix
+++ b/pkgs/development/python-modules/h3/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "h3";
- version = "3.7.1";
+ version = "3.7.2";
# pypi version does not include tests
src = fetchFromGitHub {
owner = "uber";
repo = "h3-py";
rev = "v${version}";
- sha256 = "sha256-MIVV3kZGsIsaJ/ccJOK3+j1VwkUsZGHS5d1sGOBa1Ec=";
+ sha256 = "00yi5ncfhi2wpakwm9visi1jlnnaaha66y90fjcsfyvi4hkm8xv2";
};
dontConfigure = true;
diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix
index 9fe636c3591..2aba203ea01 100644
--- a/pkgs/development/python-modules/httpx/default.nix
+++ b/pkgs/development/python-modules/httpx/default.nix
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "httpx";
- version = "0.17.0";
+ version = "0.17.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "sha256-pRdhPAxKZOVbRhOm4881Dn+IRtpX5T3oFuYdtWp3cgY=";
+ sha256 = "sha256-P4Uki+vlAgVECBUz9UGvv1ip49jmf0kYbyU2/mkWE3U=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix
new file mode 100644
index 00000000000..0fce65f2b8b
--- /dev/null
+++ b/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pythonOlder
+, filelock
+, importlib-metadata
+, requests
+, tqdm
+}:
+
+buildPythonPackage rec {
+ pname = "huggingface-hub";
+ version = "0.0.6";
+
+ src = fetchFromGitHub {
+ owner = "huggingface";
+ repo = "huggingface_hub";
+ rev = "v${version}";
+ hash = "sha256-0DSgWmodeRmvGq2v3n86BzRx5Xdb8fIQh+G/2O2d+yo=";
+ };
+
+ propagatedBuildInputs = [
+ filelock
+ requests
+ tqdm
+ ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+
+ # Tests require network access.
+ doCheck = false;
+ pythonImportsCheck = [ "huggingface_hub" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/huggingface/huggingface_hub";
+ description = "Download and publish models and other files on the huggingface.co hub";
+ changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/${version}";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ danieldk ];
+ };
+}
diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix
index 7c34235a190..0b52402ed44 100644
--- a/pkgs/development/python-modules/hwi/default.nix
+++ b/pkgs/development/python-modules/hwi/default.nix
@@ -7,28 +7,20 @@
, libusb1
, mnemonic
, pyaes
-, pythonAtLeast
+, typing-extensions
}:
buildPythonPackage rec {
pname = "hwi";
- version = "1.2.1";
- disabled = pythonAtLeast "3.9";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "bitcoin-core";
repo = "HWI";
rev = version;
- sha256 = "0fs3152lw7y5l9ssr5as8gd739m9lb7wxpv1vc5m77k5nw7l8ax5";
+ sha256 = "0m8maxhjpfxnkry2l0x8143m1gmds8mbwyd9flnkfipxz0r0xwbr";
};
- postPatch = ''
- substituteInPlace setup.py \
- --replace "'ecdsa>=0.13.0,<0.14.0'" "'ecdsa'" \
- --replace "'hidapi>=0.7.99,<0.8.0'" "'hidapi'" \
- --replace "'mnemonic>=0.18.0,<0.19.0'" "'mnemonic'"
- '';
-
propagatedBuildInputs = [
bitbox02
ecdsa
@@ -36,6 +28,7 @@ buildPythonPackage rec {
libusb1
mnemonic
pyaes
+ typing-extensions
];
# tests require to clone quite a few firmwares
diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix
index 8ccc7eb4e0c..3f65b9291ae 100644
--- a/pkgs/development/python-modules/ijson/default.nix
+++ b/pkgs/development/python-modules/ijson/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "ijson";
- version = "3.1.3";
+ version = "3.1.4";
src = fetchPypi {
inherit pname version;
- sha256 = "d29977f7235b5bf83c372825c6abd8640ba0e3a8e031d3ffc3b63deaf6ae1487";
+ sha256 = "1d1003ae3c6115ec9b587d29dd136860a81a23c7626b682e2b5b12c9fd30e4ea";
};
doCheck = false; # something about yajl
diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix
index 130b6a49bda..b8ebce462dc 100644
--- a/pkgs/development/python-modules/inflect/default.nix
+++ b/pkgs/development/python-modules/inflect/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "inflect";
- version = "5.2.0";
+ version = "5.3.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "30e9d9d372e693739beaae1345dc53c48871ca70c5c7060edd3e7e77802bf945";
+ sha256 = "41a23f6788962e9775e40e2ecfb1d6455d02de315022afeedd3c5dc070019d73";
};
nativeBuildInputs = [ setuptools_scm toml ];
diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix
index 56436cdd0eb..82153f4b3d9 100644
--- a/pkgs/development/python-modules/influxdb-client/default.nix
+++ b/pkgs/development/python-modules/influxdb-client/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "influxdb-client";
- version = "1.14.0";
+ version = "1.15.0";
disabled = pythonOlder "3.6"; # requires python version >=3.6
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "influxdata";
repo = "influxdb-client-python";
rev = "v${version}";
- sha256 = "1qq727gwz5migr3xlqxj57qxv1y52g7xpkdgggz2wz739w5czffd";
+ sha256 = "1b2xh78v965rgafyj7cdbjm2p96d74f7ifsqllc7242n9wv3k53q";
};
# makes test not reproducible
diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index b5837603103..36b1539834d 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -1,8 +1,9 @@
-{ lib, buildPythonPackage, fetchFromGitHub
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub
, cython
, libxml2
, libxslt
, zlib
+, xcodebuild
}:
buildPythonPackage rec {
@@ -17,7 +18,7 @@ buildPythonPackage rec {
};
# setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs
- nativeBuildInputs = [ libxml2.dev libxslt.dev cython ];
+ nativeBuildInputs = [ libxml2.dev libxslt.dev cython ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ];
buildInputs = [ libxml2 libxslt zlib ];
# tests are meant to be ran "in-place" in the same directory as src
diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix
new file mode 100644
index 00000000000..2e720f8ba7e
--- /dev/null
+++ b/pkgs/development/python-modules/mat2/default.nix
@@ -0,0 +1,98 @@
+{ lib
+, buildPythonPackage
+, python
+, pythonOlder
+, fetchFromGitLab
+, substituteAll
+, bubblewrap
+, exiftool
+, ffmpeg
+, mime-types
+, wrapGAppsHook
+, gdk-pixbuf
+, gobject-introspection
+, librsvg
+, poppler_gi
+, mutagen
+, pygobject3
+, pycairo
+, dolphinIntegration ? false, plasma5Packages
+}:
+
+buildPythonPackage rec {
+ pname = "mat2";
+ version = "0.12.0";
+
+ disabled = pythonOlder "3.5";
+
+ src = fetchFromGitLab {
+ domain = "0xacab.org";
+ owner = "jvoisin";
+ repo = "mat2";
+ rev = version;
+ sha256 = "0amxwwmcf47dakfm6zvsksv6ja7rz7dpmd1z2rsspy8yds6zgxs7";
+ };
+
+ patches = [
+ # hardcode paths to some binaries
+ (substituteAll ({
+ src = ./paths.patch;
+ bwrap = "${bubblewrap}/bin/bwrap";
+ exiftool = "${exiftool}/bin/exiftool";
+ ffmpeg = "${ffmpeg}/bin/ffmpeg";
+ # remove once faf0f8a8a4134edbeec0a73de7f938453444186d is in master
+ mimetypes = "${mime-types}/etc/mime.types";
+ } // lib.optionalAttrs dolphinIntegration {
+ kdialog = "${plasma5Packages.kdialog}/bin/kdialog";
+ }))
+ # the executable shouldn't be called .mat2-wrapped
+ ./executable-name.patch
+ # hardcode path to mat2 executable
+ ./tests.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace dolphin/mat2.desktop \
+ --replace "@mat2@" "$out/bin/mat2" \
+ --replace "@mat2svg@" "$out/share/icons/hicolor/scalable/apps/mat2.svg"
+ '';
+
+ nativeBuildInputs = [
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gdk-pixbuf
+ gobject-introspection
+ librsvg
+ poppler_gi
+ ];
+
+ propagatedBuildInputs = [
+ mutagen
+ pygobject3
+ pycairo
+ ];
+
+ postInstall = ''
+ install -Dm 444 data/mat2.svg -t "$out/share/icons/hicolor/scalable/apps"
+ install -Dm 444 doc/mat2.1 -t "$out/share/man/man1"
+ install -Dm 444 nautilus/mat2.py -t "$out/share/nautilus-python/extensions"
+ buildPythonPath "$out $pythonPath"
+ patchPythonScript "$out/share/nautilus-python/extensions/mat2.py"
+ '' + lib.optionalString dolphinIntegration ''
+ install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus"
+ '';
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover -v
+ '';
+
+ meta = with lib; {
+ description = "A handy tool to trash your metadata";
+ homepage = "https://0xacab.org/jvoisin/mat2";
+ changelog = "https://0xacab.org/jvoisin/mat2/-/blob/${version}/CHANGELOG.md";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/mat2/executable-name.patch b/pkgs/development/python-modules/mat2/executable-name.patch
new file mode 100644
index 00000000000..6eee0a94940
--- /dev/null
+++ b/pkgs/development/python-modules/mat2/executable-name.patch
@@ -0,0 +1,13 @@
+diff --git a/mat2 b/mat2
+index 3b77e1e..b99a633 100755
+--- a/mat2
++++ b/mat2
+@@ -46,7 +46,7 @@ def __check_file(filename: str, mode: int = os.R_OK) -> bool:
+
+
+ def create_arg_parser() -> argparse.ArgumentParser:
+- parser = argparse.ArgumentParser(description='Metadata anonymisation toolkit 2')
++ parser = argparse.ArgumentParser(description='Metadata anonymisation toolkit 2', prog='mat2')
+
+ parser.add_argument('-V', '--verbose', action='store_true',
+ help='show more verbose status information')
diff --git a/pkgs/development/python-modules/mat2/paths.patch b/pkgs/development/python-modules/mat2/paths.patch
new file mode 100644
index 00000000000..e0144be9fef
--- /dev/null
+++ b/pkgs/development/python-modules/mat2/paths.patch
@@ -0,0 +1,111 @@
+diff --git a/dolphin/mat2.desktop b/dolphin/mat2.desktop
+index e623962..5d69ae2 100644
+--- a/dolphin/mat2.desktop
++++ b/dolphin/mat2.desktop
+@@ -7,5 +7,5 @@ Type=Service
+ [Desktop Action cleanMetadata]
+ Name=Clean metadata
+ Name[es]=Limpiar metadatos
+-Icon=/usr/share/icons/hicolor/scalable/apps/mat2.svg
+-Exec=kdialog --yesno "$( mat2 -s %U )" --title "Clean Metadata?" && mat2 %U
++Icon=@mat2svg@
++Exec=@kdialog@ --yesno "$( @mat2@ -s %U )" --title "Clean Metadata?" && @mat2@ %U
+diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py
+index 970d5dd..5d3c0b7 100644
+--- a/libmat2/bubblewrap.py
++++ b/libmat2/bubblewrap.py
+@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError
+
+
+ def _get_bwrap_path() -> str:
+- which_path = shutil.which('bwrap')
+- if which_path:
+- return which_path
+-
+- raise RuntimeError("Unable to find bwrap") # pragma: no cover
++ return '@bwrap@'
+
+
+ def _get_bwrap_args(tempdir: str,
+@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str,
+
+ # XXX: use --ro-bind-try once all supported platforms
+ # have a bubblewrap recent enough to support it.
+- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd]
++ ro_bind_dirs = ['/nix/store', cwd]
+ for bind_dir in ro_bind_dirs:
+ if os.path.isdir(bind_dir): # pragma: no cover
+ ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir])
+
+- ro_bind_files = ['/etc/ld.so.cache']
+- for bind_file in ro_bind_files:
+- if os.path.isfile(bind_file): # pragma: no cover
+- ro_bind_args.extend(['--ro-bind', bind_file, bind_file])
+-
+ args = ro_bind_args + \
+ ['--dev', '/dev',
+ '--proc', '/proc',
+diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py
+index eb65b2a..51a0fa1 100644
+--- a/libmat2/exiftool.py
++++ b/libmat2/exiftool.py
+@@ -1,8 +1,6 @@
+-import functools
+ import json
+ import logging
+ import os
+-import shutil
+ import subprocess
+ from typing import Dict, Union, Set
+
+@@ -70,14 +68,5 @@ class ExiftoolParser(abstract.AbstractParser):
+ return False
+ return True
+
+-@functools.lru_cache()
+ def _get_exiftool_path() -> str: # pragma: no cover
+- which_path = shutil.which('exiftool')
+- if which_path:
+- return which_path
+-
+- # Exiftool on Arch Linux has a weird path
+- if os.access('/usr/bin/vendor_perl/exiftool', os.X_OK):
+- return '/usr/bin/vendor_perl/exiftool'
+-
+- raise RuntimeError("Unable to find exiftool")
++ return '@exiftool@'
+diff --git a/libmat2/parser_factory.py b/libmat2/parser_factory.py
+index 9965432..bd45179 100644
+--- a/libmat2/parser_factory.py
++++ b/libmat2/parser_factory.py
+@@ -8,6 +8,7 @@ from . import abstract, UNSUPPORTED_EXTENSIONS
+
+ T = TypeVar('T', bound='abstract.AbstractParser')
+
++mimetypes.init(['@mimetypes@'])
+ mimetypes.add_type('application/epub+zip', '.epub')
+ mimetypes.add_type('application/x-dtbncx+xml', '.ncx') # EPUB Navigation Control XML File
+
+diff --git a/libmat2/video.py b/libmat2/video.py
+index b4a3232..3dd7ee5 100644
+--- a/libmat2/video.py
++++ b/libmat2/video.py
+@@ -1,6 +1,4 @@
+ import subprocess
+-import functools
+-import shutil
+ import logging
+
+ from typing import Dict, Union
+@@ -135,10 +133,5 @@ class MP4Parser(AbstractFFmpegParser):
+ }
+
+
+-@functools.lru_cache()
+ def _get_ffmpeg_path() -> str: # pragma: no cover
+- which_path = shutil.which('ffmpeg')
+- if which_path:
+- return which_path
+-
+- raise RuntimeError("Unable to find ffmpeg")
++ return '@ffmpeg@'
diff --git a/pkgs/development/python-modules/mat2/tests.patch b/pkgs/development/python-modules/mat2/tests.patch
new file mode 100644
index 00000000000..8958d937dd4
--- /dev/null
+++ b/pkgs/development/python-modules/mat2/tests.patch
@@ -0,0 +1,18 @@
+diff --git a/tests/test_climat2.py b/tests/test_climat2.py
+index cede642..2d5ad77 100644
+--- a/tests/test_climat2.py
++++ b/tests/test_climat2.py
+@@ -10,12 +10,7 @@ import glob
+ from libmat2 import images, parser_factory
+
+
+-mat2_binary = ['./mat2']
+-
+-if 'MAT2_GLOBAL_PATH_TESTSUITE' in os.environ:
+- # Debian runs tests after installing the package
+- # https://0xacab.org/jvoisin/mat2/issues/16#note_153878
+- mat2_binary = ['/usr/bin/env', 'mat2']
++mat2_binary = [os.environ['out'] + '/bin/mat2']
+
+
+ class TestHelp(unittest.TestCase):
diff --git a/pkgs/development/python-modules/mergedeep/default.nix b/pkgs/development/python-modules/mergedeep/default.nix
index cdd19beb68d..46de3405023 100644
--- a/pkgs/development/python-modules/mergedeep/default.nix
+++ b/pkgs/development/python-modules/mergedeep/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "mergedeep";
- version = "1.3.1";
+ version = "1.3.4";
disabled = isPy27;
# PyPI tarball doesn't include tests directory
@@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "clarketm";
repo = "mergedeep";
rev = "v${version}";
- sha256 = "1ryccb64hg438y1wsjlfp4ciq05q4c6khwhllwdnndm8cbkbrgph";
+ sha256 = "1msvvdzk33sxzgyvs4fs8dlsrsi7fjj038z83s0yw5h8m8d78469";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/minidump/default.nix b/pkgs/development/python-modules/minidump/default.nix
index 346430d2392..60440ff4b48 100644
--- a/pkgs/development/python-modules/minidump/default.nix
+++ b/pkgs/development/python-modules/minidump/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "minidump";
- version = "0.0.13";
+ version = "0.0.15";
src = fetchPypi {
inherit pname version;
- sha256 = "1w93yh2dz7llxjgv0jn7gf9praz7d5952is7idgh0lsyj67ri2ms";
+ sha256 = "sha256-IVlzAsnl1KhErxWPi96hUFlIX4IN3Y9t8OicckdYUv0=";
};
# Upstream doesn't have tests
diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix
index 826a4fddae0..e9790db9f5e 100644
--- a/pkgs/development/python-modules/msldap/default.nix
+++ b/pkgs/development/python-modules/msldap/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "msldap";
- version = "0.3.27";
+ version = "0.3.28";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-tAMl1Xkb04Vfh18uS30eKX/IfeXhwER3J1lHXHxHlXY=";
+ sha256 = "sha256-0sMi5PpwMWf/W+Hu0akQVF/1ZkbanfOzYDC3R6lZrSE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix
index 1a60cf70d2d..8aa70b43e66 100644
--- a/pkgs/development/python-modules/notify/default.nix
+++ b/pkgs/development/python-modules/notify/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
configure
'';
- nativeBuildInputs = [ pkgs.pkgconfig ];
+ nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ python pygobject2 pygtk pkgs.libnotify pkgs.glib pkgs.gtk2 pkgs.dbus-glib ];
postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";
diff --git a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
index 2e7666d3ab0..7661295ba23 100644
--- a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
+++ b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
@@ -1,33 +1,39 @@
-{ buildPythonPackage
-, fetchPypi
-, lib
+{ lib
+, buildPythonPackage
, click
-, requests
+, fetchPypi
, packaging
+, pytestCheckHook
+, requests
}:
-with lib;
-
buildPythonPackage rec {
pname = "openwrt-luci-rpc";
- version = "1.1.7";
+ version = "1.1.8";
src = fetchPypi {
inherit pname version;
- sha256 = "8074c1ed24cdd1fadc5a99bd63d9313a0a44703714473ed781ed11e7fb45c96f";
+ sha256 = "sha256-bo9HLT0q0yiLJI7i5v/36G82FHbGCtnAI50iGniyKSU=";
};
- postPatch = ''
- substituteInPlace setup.py --replace "requests==2.21.0" "requests"
- substituteInPlace setup.py --replace "packaging==19.1" "packaging"
- '';
+ propagatedBuildInputs = [
+ click
+ requests
+ packaging
+ ];
- propagatedBuildInputs = [ click requests packaging ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- meta = {
- description = ''
- Python3 module for interacting with the OpenWrt Luci RPC interface.
- Supports 15.X & 17.X & 18.X or newer releases of OpenWrt.
+ pythonImportsCheck = [ "openwrt_luci_rpc" ];
+
+ meta = with lib; {
+ description = "Python module for interacting with the OpenWrt Luci RPC interface";
+ longDescription = ''
+ This module allows you to use the Luci RPC interface to fetch connected devices
+ on your OpenWrt based router. Supports 15.X & 17.X & 18.X or newer releases of
+ OpenWrt.
'';
homepage = "https://github.com/fbradyirl/openwrt-luci-rpc";
license = licenses.asl20;
diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix
index dbf27febeb9..64ae9189559 100644
--- a/pkgs/development/python-modules/pillow/generic.nix
+++ b/pkgs/development/python-modules/pillow/generic.nix
@@ -26,6 +26,9 @@ buildPythonPackage rec {
# pillow-simd
"test_roundtrip"
"test_basic"
+ ] ++ lib.optionals (lib.versions.major version == "6") [
+ # RuntimeError: Error setting from dictionary
+ "test_custom_metadata"
];
propagatedBuildInputs = [ olefile ];
diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix
index 2fca74b33aa..ddf2c9695a4 100644
--- a/pkgs/development/python-modules/pyatv/default.nix
+++ b/pkgs/development/python-modules/pyatv/default.nix
@@ -1,55 +1,58 @@
-{ lib, buildPythonPackage
+{ lib
+, buildPythonPackage
, aiohttp
, aiozeroconf
-, asynctest
, cryptography
, deepdiff
+, fetchFromGitHub
, netifaces
, protobuf
-, pytest
, pytest-aiohttp
, pytest-asyncio
-, pytestrunner
+, pytest-runner
+, pytest-timeout
+, pytestCheckHook
, srptools
, zeroconf
-, fetchFromGitHub
-, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pyatv";
- version = "0.7.6";
+ version = "0.7.7";
+
src = fetchFromGitHub {
owner = "postlund";
repo = pname;
rev = "v${version}";
- sha256 = "1lahv6f97fizgh5b2w5yz9455l8ygn99rslhiygkgjywi2flx3p3";
+ sha256 = "sha256-dPnh8XZN7ZVR2rYNnj7GSYXW5I2GNQwD/KRDTgs2AtI=";
};
- nativeBuildInputs = [ pytestrunner];
+ nativeBuildInputs = [ pytest-runner];
propagatedBuildInputs = [
- aiozeroconf
- srptools
aiohttp
- protobuf
+ aiozeroconf
cryptography
netifaces
+ protobuf
+ srptools
zeroconf
];
checkInputs = [
deepdiff
- pytest
pytest-aiohttp
pytest-asyncio
+ pytest-timeout
pytestCheckHook
];
__darwinAllowLocalNetworking = true;
+ pythonImportsCheck = [ "pyatv" ];
+
meta = with lib; {
- description = "A python client library for the Apple TV";
+ description = "Python client library for the Apple TV";
homepage = "https://github.com/postlund/pyatv";
license = licenses.mit;
maintainers = with maintainers; [ elseym ];
diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix
index 712029b692c..7e06b18e32b 100644
--- a/pkgs/development/python-modules/pycdio/default.nix
+++ b/pkgs/development/python-modules/pycdio/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
patchShebangs .
'';
- nativeBuildInputs = [ nose pkgs.pkgconfig pkgs.swig ];
+ nativeBuildInputs = [ nose pkgs.pkg-config pkgs.swig ];
buildInputs = [ setuptools pkgs.libcdio ]
++ lib.optional stdenv.isDarwin pkgs.libiconv;
diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix
index cd8c566c465..cfe5112ab22 100644
--- a/pkgs/development/python-modules/pyinsteon/default.nix
+++ b/pkgs/development/python-modules/pyinsteon/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "pyinsteon";
- version = "1.0.9";
+ version = "1.0.10";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-+3tA+YdpTKDt7uOSl6Z1G8jTjpBJ8S9gjiQTacQSFTc=";
+ sha256 = "sha256-8b/PvMFHvYGVWw6ycLnL8n972cn+1QW/VTMiblMPam4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix
index 145b405922d..8b390ac12fa 100644
--- a/pkgs/development/python-modules/pymazda/default.nix
+++ b/pkgs/development/python-modules/pymazda/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "pymazda";
- version = "0.0.9";
+ version = "0.0.10";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "15kygabjlxmy3g5kj48ixqdwaz8qrfzxj8ii27cidsp2fq8ph165";
+ sha256 = "sha256-sJj4RkVaELNitcz1H8YitNgIx4f35WeQf7M5miYD5yI=";
};
propagatedBuildInputs = [ aiohttp pycryptodome ];
diff --git a/pkgs/development/python-modules/pymitv/default.nix b/pkgs/development/python-modules/pymitv/default.nix
index ffaabb04a29..32f90d07dcb 100644
--- a/pkgs/development/python-modules/pymitv/default.nix
+++ b/pkgs/development/python-modules/pymitv/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "pymitv";
- version = "1.4.3";
+ version = "1.5.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0jbs1zhqpnsyad3pd8cqy1byv8m5bq17ydc6crmrfkjbp6xvvg3x";
+ sha256 = "sha256-0n4IS5W3nvYwKdl6FVf4upRrFDGdYHohsaXadFy8d8w=";
};
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix
index f46a5d2db82..16a894546e4 100644
--- a/pkgs/development/python-modules/pyparted/default.nix
+++ b/pkgs/development/python-modules/pyparted/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
PATH="${pkgs.parted}/sbin:$PATH"
'';
- nativeBuildInputs = [ pkgs.pkgconfig ];
+ nativeBuildInputs = [ pkgs.pkg-config ];
checkInputs = [ six ];
propagatedBuildInputs = [ pkgs.parted ];
diff --git a/pkgs/development/python-modules/pypoppler/default.nix b/pkgs/development/python-modules/pypoppler/default.nix
index 348f9171502..d325c170dc6 100644
--- a/pkgs/development/python-modules/pypoppler/default.nix
+++ b/pkgs/development/python-modules/pypoppler/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
};
NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/";
- nativeBuildInputs = [ pkgs.pkgconfig ];
+ nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ pkgs.poppler.dev ];
propagatedBuildInputs = [ pycairo pygobject2 ];
diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix
index 206e3671f47..1bb91953983 100644
--- a/pkgs/development/python-modules/pyshark/default.nix
+++ b/pkgs/development/python-modules/pyshark/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pyshark";
- version = "0.4.2.11";
+ version = "0.4.3";
src = fetchFromGitHub {
owner = "KimiNewt";
repo = pname;
rev = "v${version}";
- sha256 = "07dkhkf85cplcj1h3k8mmqzsn4zdkxzr0zg3gvf8yc8p5g5azx9q";
+ sha256 = "sha256-cveiFkkSplfQPgUEVWyV40KKHCtKJZsfvdV8JmEUmE4=";
};
propagatedBuildInputs = [
@@ -29,6 +29,8 @@ buildPythonPackage rec {
wireshark-cli
];
+ pythonImportsCheck = [ "pyshark" ];
+
meta = with lib; {
description = "Python wrapper for tshark, allowing python packet parsing using wireshark dissectors";
homepage = "https://github.com/KimiNewt/pyshark/";
diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 7d9a985e39b..f95696e20b9 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "sagemaker";
- version = "2.29.2";
+ version = "2.30.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-e+yrjtDC6d47+zEFv6WY7xGw9kDfKLrNyMh/IkC/bQs=";
+ sha256 = "sha256-3BxRDoaKxaXlKYGYQqhQ2DUO3XONvf6dlofE0pbXIho=";
};
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/sane/default.nix b/pkgs/development/python-modules/sane/default.nix
index d45c736d8d0..b02feb9e219 100644
--- a/pkgs/development/python-modules/sane/default.nix
+++ b/pkgs/development/python-modules/sane/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
-, saneBackends
+, sane-backends
}:
buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
};
buildInputs = [
- saneBackends
+ sane-backends
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix
index c5df9f7d991..702b0e3e365 100644
--- a/pkgs/development/python-modules/snapcast/default.nix
+++ b/pkgs/development/python-modules/snapcast/default.nix
@@ -1,23 +1,25 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest
-, construct }:
+{ lib
+, buildPythonPackage
+, construct
+, fetchPypi
+, isPy3k
+}:
buildPythonPackage rec {
pname = "snapcast";
- version = "2.1.1";
-
+ version = "2.1.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "c3ecd63d997fbcf6e5322dc47c1f02615f1d9611cba01ec18e9c9f8c14ed824b";
+ sha256 = "sha256-ILBleqxEO7wTxAw/fvDW+4O4H4XWV5m5WWtaNeRBr4g=";
};
- checkInputs = [ pytest ];
-
propagatedBuildInputs = [ construct ];
# no checks from Pypi - https://github.com/happyleavesaoc/python-snapcast/issues/23
doCheck = false;
+ pythonImportsCheck = [ "snapcast" ];
meta = with lib; {
description = "Control Snapcast, a multi-room synchronous audio solution";
diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix
index e86144dff04..a72c413c186 100644
--- a/pkgs/development/python-modules/soco/default.nix
+++ b/pkgs/development/python-modules/soco/default.nix
@@ -30,10 +30,12 @@ buildPythonPackage rec {
sha256 = "sha256-CCgkzUkt9YqTJt9tPBLmYXW6ZuRoMDd7xahYmNXgfM0=";
};
- patches = [(fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch";
- sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4=";
- })];
+ patches = [
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch";
+ sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4=";
+ })
+ ];
# N.B. These exist because:
# 1. Upstream's pinning isn't well maintained, leaving dependency versions no
diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix
index 3ec4246cd02..a6dd6e41dc5 100644
--- a/pkgs/development/python-modules/sqlite-utils/default.nix
+++ b/pkgs/development/python-modules/sqlite-utils/default.nix
@@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "sqlite-utils";
- version = "3.5";
+ version = "3.6";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-i9SnT+DcQOcujV25bD/SNV1uRA2IgfiSWhEWlQC5TiA=";
+ sha256 = "sha256-WCqbz0tssy7i76Sg2PeexjDollypPGnOqqfUJOHAFWA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix
index 540c315c8ff..3a72b5c3102 100644
--- a/pkgs/development/python-modules/tatsu/default.nix
+++ b/pkgs/development/python-modules/tatsu/default.nix
@@ -6,22 +6,16 @@
buildPythonPackage rec {
pname = "TatSu";
- version = "5.0.0";
+ version = "5.5.0";
src = fetchFromGitHub {
owner = "neogeny";
repo = pname;
rev = "v${version}";
- sha256 = "1c16fcxf0xjkh5py9bnj6ljb9krhrj57mkwayl1w1dvzwl5lkgj3";
+ sha256 = "07bmdnwh99p60cgzhlb8s5vwi5v4r5zi8shymxnnarannkc66hzn";
};
- # Since version 5.0.0 only >=3.8 is officially supported, but ics is not
- # compatible with Python 3.8 due to aiohttp:
- disabled = pythonOlder "3.7";
- postPatch = ''
- substituteInPlace setup.py \
- --replace "python_requires='>=3.8'," "python_requires='>=3.7',"
- '';
+ disabled = pythonOlder "3.8";
nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ colorama mypy pyyaml regex ]
diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix
index 9c0e9d35399..9c759f3a2b7 100644
--- a/pkgs/development/python-modules/yapf/default.nix
+++ b/pkgs/development/python-modules/yapf/default.nix
@@ -1,19 +1,46 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
buildPythonPackage rec {
pname = "yapf";
- version = "0.30.0";
+ version = "0.31.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3000abee4c28daebad55da6c85f3cd07b8062ce48e2e9943c8da1b9667d48427";
+ hash = "sha256-QI+5orJUwwL0nbg8WfmqC0sP0OwlvjpcURgTJ5Iv9j0=";
};
+ checkInputs = [
+ nose
+ ];
+
meta = with lib; {
- description = "A formatter for Python code.";
- homepage = "https://github.com/google/yapf";
- license = licenses.asl20;
- maintainers = with maintainers; [ siddharthist ];
- };
+ homepage = "https://github.com/google/yapf";
+ description = "Yet Another Python Formatter";
+ longDescription = ''
+ Most of the current formatters for Python --- e.g., autopep8, and pep8ify
+ --- are made to remove lint errors from code. This has some obvious
+ limitations. For instance, code that conforms to the PEP 8 guidelines may
+ not be reformatted. But it doesn't mean that the code looks good.
+ YAPF takes a different approach. It's based off of 'clang-format',
+ developed by Daniel Jasper. In essence, the algorithm takes the code and
+ reformats it to the best formatting that conforms to the style guide, even
+ if the original code didn't violate the style guide. The idea is also
+ similar to the 'gofmt' tool for the Go programming language: end all holy
+ wars about formatting - if the whole codebase of a project is simply piped
+ through YAPF whenever modifications are made, the style remains consistent
+ throughout the project and there's no point arguing about style in every
+ code review.
+
+ The ultimate goal is that the code YAPF produces is as good as the code
+ that a programmer would write if they were following the style guide. It
+ takes away some of the drudgery of maintaining your code.
+ '';
+ license = licenses.asl20;
+ maintainers = with maintainers; [ AndersonTorres siddharthist ];
+ };
}
diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix
new file mode 100644
index 00000000000..ed4a4165680
--- /dev/null
+++ b/pkgs/development/python-modules/ytmusicapi/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "ytmusicapi";
+ version = "0.14.3";
+
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "83251a95d5bd74116353d29dfda2d0c5055b88276a0876a313a66f8b9c691344";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ ];
+
+ doCheck = false; # requires network access
+
+ pythonImportsCheck = [ "ytmusicapi" ];
+
+ meta = with lib; {
+ description = "Unofficial API for YouTube Music";
+ homepage = "https://github.com/sigma67/ytmusicapi";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index fe823c17d93..24f6e7ccfc4 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -231,7 +231,7 @@ let
};
packagesWithNativeBuildInputs = {
- arrow = [ pkgs.pkgconfig pkgs.arrow-cpp ];
+ arrow = [ pkgs.pkg-config pkgs.arrow-cpp ];
adimpro = [ pkgs.imagemagick ];
animation = [ pkgs.which ];
audio = [ pkgs.portaudio ];
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 5c6fd8e3b90..0c6c9dbad08 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
- version = "0.145.0";
+ version = "0.146.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
- sha256 = "sha256-6fRKXKh+hB/d2CcmZYYSlMzP1IGCl7fLdXCQ1M0wuY4=";
+ sha256 = "0kxws51hri0b4z7k05li6vg1arcdc7i5jzfibi0iplsfyy14159q";
};
installPhase = ''
diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix
index 09a77d0f935..c3c3d2dd2bc 100644
--- a/pkgs/development/tools/analysis/tfsec/default.nix
+++ b/pkgs/development/tools/analysis/tfsec/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "tfsec";
- version = "0.39.6";
+ version = "0.39.8";
src = fetchFromGitHub {
owner = "tfsec";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2P+/y3iP/eMGGc0W1lHWWxO+uMy5gvlvjKzZ/8maJ9o=";
+ sha256 = "sha256-7LC7QT92Ecva/uQPwYEfbLQUpIesxa8pXrauMxIwZ98=";
};
goPackagePath = "github.com/tfsec/tfsec";
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 2df829a0229..fb85c1f3326 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
+{ lib, stdenv, fetchFromGitHub, curl, libevent, rsync, ldc, dcompiler ? ldc }:
+
+assert dcompiler != null;
stdenv.mkDerivation rec {
pname = "dub";
@@ -24,12 +26,23 @@ stdenv.mkDerivation rec {
--replace "dub remove" "\"${dubvar}\" remove"
'';
- nativeBuildInputs = [ dmd libevent rsync ];
+ nativeBuildInputs = [ dcompiler libevent rsync ];
buildInputs = [ curl ];
buildPhase = ''
- export DMD=${dmd.out}/bin/dmd
- ./build.sh
+ for dc_ in dmd ldmd2 gdmd; do
+ echo "... check for D compiler $dc_ ..."
+ dc=$(type -P $dc_ || echo "")
+ if [ ! "$dc" == "" ]; then
+ break
+ fi
+ done
+ if [ "$dc" == "" ]; then
+ exit "Error: could not find D compiler"
+ fi
+ echo "$dc_ found and used as D compiler to build $pname"
+ $dc ./build.d
+ ./build
'';
doCheck = !stdenv.isDarwin;
@@ -37,7 +50,8 @@ stdenv.mkDerivation rec {
checkPhase = ''
export DUB=$NIX_BUILD_TOP/source/bin/dub
export PATH=$PATH:$NIX_BUILD_TOP/source/bin/
- export DC=${dmd.out}/bin/dmd
+ export DC=${dcompiler.out}/bin/${dcompiler.pname}
+ echo "DC out --> $DC"
export HOME=$TMP
rm -rf test/issue502-root-import
@@ -46,7 +60,6 @@ stdenv.mkDerivation rec {
rm test/issue990-download-optional-selected.sh
rm test/issue877-auto-fetch-package-on-run.sh
rm test/issue1037-better-dependency-messages.sh
- rm test/issue1040-run-with-ver.sh
rm test/issue1416-maven-repo-pkg-supplier.sh
rm test/issue1180-local-cache-broken.sh
rm test/issue1574-addcommand.sh
@@ -62,13 +75,73 @@ stdenv.mkDerivation rec {
rm test/version-spec.sh
rm test/0-init-multi.sh
rm test/0-init-multi-json.sh
+ rm test/4-describe-data-1-list.sh
+ rm test/4-describe-data-3-zero-delim.sh
+ rm test/4-describe-import-paths.sh
+ rm test/4-describe-string-import-paths.sh
+ rm test/4-describe-json.sh
+ rm test/5-convert-stdout.sh
+ rm test/issue1003-check-empty-ld-flags.sh
+ rm test/issue103-single-file-package.sh
+ rm test/issue1040-run-with-ver.sh
+ rm test/issue1091-bogus-rebuild.sh
+ rm test/issue1194-warn-wrong-subconfig.sh
+ rm test/issue1277.sh
+ rm test/issue1372-ignore-files-in-hidden-dirs.sh
+ rm test/issue1447-build-settings-vars.sh
+ rm test/issue1531-toolchain-requirements.sh
+ rm test/issue346-redundant-flags.sh
+ rm test/issue361-optional-deps.sh
+ rm test/issue564-invalid-upgrade-dependency.sh
+ rm test/issue586-subpack-dep.sh
+ rm test/issue616-describe-vs-generate-commands.sh
+ rm test/issue686-multiple-march.sh
+ rm test/issue813-fixed-dependency.sh
+ rm test/issue813-pure-sub-dependency.sh
+ rm test/issue820-extra-fields-after-convert.sh
+ rm test/issue923-subpackage-deps.sh
+ rm test/single-file-sdl-default-name.sh
+ rm test/subpackage-common-with-sourcefile-globbing.sh
+ rm test/issue934-path-dep.sh
+ rm -r test/1-dynLib-simple
+ rm -r test/1-exec-simple-package-json
+ rm -r test/1-exec-simple
+ rm -r test/1-staticLib-simple
+ rm -r test/2-dynLib-dep
+ rm -r test/2-staticLib-dep
+ rm -r test/2-dynLib-with-staticLib-dep
+ rm -r test/2-sourceLib-dep/
+ rm -r test/3-copyFiles
+ rm -r test/custom-source-main-bug487
+ rm -r test/custom-unittest
+ rm -r test/issue1262-version-inheritance-diamond
+ rm -r test/issue1003-check-empty-ld-flags
+ rm -r test/ignore-hidden-1
+ rm -r test/ignore-hidden-2
+ rm -r test/issue1427-betterC
+ rm -r test/issue130-unicode-*
+ rm -r test/issue1262-version-inheritance
+ rm -r test/issue1372-ignore-files-in-hidden-dirs
+ rm -r test/issue1350-transitive-none-deps
+ rm -r test/issue1775
+ rm -r test/issue1447-build-settings-vars
+ rm -r test/issue1408-inherit-linker-files
+ rm -r test/issue1551-var-escaping
+ rm -r test/issue754-path-selection-fail
+ rm -r test/issue1788-incomplete-string-import-override
+ rm -r test/subpackage-ref
+ rm -r test/issue777-bogus-path-dependency
+ rm -r test/issue959-path-based-subpack-dep
+ rm -r test/issue97-targettype-none-nodeps
+ rm -r test/issue97-targettype-none-onerecipe
+ rm -r test/path-subpackage-ref
+ rm -r test/sdl-package-simple
./test/run-unittest.sh
'';
installPhase = ''
- mkdir $out
- mkdir $out/bin
+ mkdir -p $out/bin
cp bin/dub $out/bin
'';
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 62d704fccd5..5b3ce3ab162 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
version = "1.4.9";
src = fetchurl {
- url =
- "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
+ url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
sha256 = "sha256-lUaBGfdkFJk2czCmCkuKYhHm6n+L3n1kfGexndj9224=";
};
diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix
index ff47bd0e9f3..f3d9b74181a 100644
--- a/pkgs/development/tools/castxml/default.nix
+++ b/pkgs/development/tools/castxml/default.nix
@@ -1,52 +1,69 @@
-{ lib, stdenv, fetchFromGitHub
-, python3Packages
+{ lib
+, stdenv
+, fetchFromGitHub
+, clang-unwrapped
, cmake
-, llvmPackages
-, libffi, libxml2, zlib
-, withMan ? true
+, libclang
+, libffi
+, libxml2
+, llvm
+, sphinx
+, zlib
+, withManual ? true
+, withHTML ? true
}:
-stdenv.mkDerivation rec {
- pname = "CastXML";
- version = "0.3.4";
+stdenv.mkDerivation rec {
+ pname = "CastXML";
+ version = "0.4.3";
src = fetchFromGitHub {
- owner = pname;
- repo = pname;
- rev = "v${version}";
- sha256 = "0ypj67xrgj228myp7l1gsjw1ja97q68nmj98dsd33srmiayqraj4";
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-MschwCEkZrZmNgr8a1ocdukjXzHbXl2gmkPmygJaA6k=";
};
- nativeBuildInputs = [ cmake ] ++ lib.optionals withMan [ python3Packages.sphinx ];
-
- clangVersion = lib.getVersion llvmPackages.clang;
+ nativeBuildInputs = [
+ cmake
+ llvm
+ ] ++ lib.optionals (withManual || withHTML) [
+ sphinx
+ ];
cmakeFlags = [
- "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${clangVersion}/"
- "-DSPHINX_MAN=${if withMan then "ON" else "OFF"}"
+ "-DCLANG_RESOURCE_DIR=${clang-unwrapped}/lib/clang/${lib.getVersion clang-unwrapped}/"
+ "-DSPHINX_HTML=${if withHTML then "ON" else "OFF"}"
+ "-DSPHINX_MAN=${if withManual then "ON" else "OFF"}"
];
buildInputs = [
- llvmPackages.clang-unwrapped
- llvmPackages.llvm
- libffi libxml2 zlib
+ clang-unwrapped
+ libffi
+ libxml2
+ zlib
];
- propagatedBuildInputs = [ llvmPackages.libclang ];
+ propagatedBuildInputs = [
+ libclang
+ ];
# 97% tests passed, 97 tests failed out of 2881
# mostly because it checks command line and nix append -isystem and all
doCheck = false;
+ # -E exclude 4 tests based on names
+ # see https://github.com/CastXML/CastXML/issues/90
checkPhase = ''
- # -E exclude 4 tests based on names
- # see https://github.com/CastXML/CastXML/issues/90
+ runHook preCheck
ctest -E 'cmd.cc-(gnu|msvc)-((c-src-c)|(src-cxx))-cmd'
+ runHook postCheck
'';
meta = with lib; {
homepage = "https://github.com/CastXML/CastXML";
+ description = "C-family Abstract Syntax Tree XML Output";
license = licenses.asl20;
- description = "Abstract syntax tree XML output tool";
+ maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index daa6d08cd4a..bb5f8a4c9cd 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -2,7 +2,7 @@
, coreutils, git, gnused, nix, nixfmt }:
let
- version = "2.0.13";
+ version = "2.0.14";
zshCompletion = fetchurl {
url =
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url =
"https://github.com/coursier/coursier/releases/download/v${version}/coursier";
- sha256 = "sha256-3FdvoSH/6MZK6KEImXsFteaCoTLO0unK6dp7t+snVt4=";
+ sha256 = "sha256-mGVOg+I42O3VYj7RStEOfZajS9RZo9hLWKap6UdjJCE=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix
index 1c1604db654..7a994df51b4 100644
--- a/pkgs/development/tools/dtools/default.nix
+++ b/pkgs/development/tools/dtools/default.nix
@@ -1,22 +1,22 @@
-{stdenv, lib, fetchFromGitHub, dmd, curl}:
+{stdenv, lib, fetchFromGitHub, ldc, curl}:
stdenv.mkDerivation rec {
pname = "dtools";
- version = "2.085.1";
+ version = "2.095.1";
srcs = [
(fetchFromGitHub {
owner = "dlang";
repo = "dmd";
rev = "v${version}";
- sha256 = "0ccidfcawrcwdpfjwjiln5xwr4ffp8i2hwx52p8zn3xmc5yxm660";
+ sha256 = "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk";
name = "dmd";
})
(fetchFromGitHub {
owner = "dlang";
repo = "tools";
rev = "v${version}";
- sha256 = "1x85w4k2zqgv2bjbvhschxdc6kq8ygp89h499cy8rfqm6q23g0ws";
+ sha256 = "sha256:0rdfk3mh3fjrb0h8pr8skwlq6ac9hdl1fkrkdl7n1fa2806b740b";
name = "dtools";
})
];
@@ -27,14 +27,13 @@ stdenv.mkDerivation rec {
mv dmd dtools
cd dtools
- substituteInPlace posix.mak --replace "\$(DMD) \$(DFLAGS) -unittest -main -run rdmd.d" ""
'';
- nativeBuildInputs = [ dmd ];
+ nativeBuildInputs = [ ldc ];
buildInputs = [ curl ];
makeCmd = ''
- make -f posix.mak DMD_DIR=dmd DMD=${dmd.out}/bin/dmd CC=${stdenv.cc}/bin/cc
+ make -f posix.mak all DMD_DIR=dmd DMD=${ldc.out}/bin/ldmd2 CC=${stdenv.cc}/bin/cc
'';
buildPhase = ''
diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix
index fbbb773519a..437013e1af2 100644
--- a/pkgs/development/tools/ginkgo/default.nix
+++ b/pkgs/development/tools/ginkgo/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "ginkgo";
- version = "1.15.1";
+ version = "1.15.2";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
- sha256 = "sha256-w2eP8mDGHHZGYQUU7lOe7gp3tdr9VO/NP5fFBWOWt/A=";
+ sha256 = "sha256-lZ2PIfZSvBxVIAEpRgsLvTWPFRsh2ZpXkame6pk0Cio=";
};
- vendorSha256 = "sha256-fB9/cf2VOMXWLHnnHJZDmOutIUvPleWBGCirJrypCts=";
+ vendorSha256 = "sha256:1nqam6y2dar8320yb5fg9chsvswq8fb1rrvr5kbcaf4mzmqpy7vw";
doCheck = false;
meta = with lib; {
diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix
index 87213b911a9..88b2f63fd5a 100644
--- a/pkgs/development/tools/literate-programming/Literate/default.nix
+++ b/pkgs/development/tools/literate-programming/Literate/default.nix
@@ -1,16 +1,16 @@
-{ lib, stdenv, fetchgit, dmd, dub }:
+{ lib, stdenv, fetchgit, ldc, dub }:
stdenv.mkDerivation {
pname = "Literate";
- version = "unstable-2020-09-02";
+ version = "unstable-2021-01-22";
src = fetchgit {
url = "https://github.com/zyedidia/Literate.git";
- rev = "533991cca6ec7a608a778396d32d51b35182d944";
- sha256 = "09h1as01z0fw0bj0kf1g9nlhvinya7sqq2x8qb6zmhvqqm6v4n49";
+ rev = "7004dffec0cff3068828514eca72172274fd3f7d";
+ sha256 = "0x4xgrdskybaa7ssv81grmwyc1k167v3nwj320jvp5l59xxlbcvs";
};
- buildInputs = [ dmd dub ];
+ buildInputs = [ ldc dub ];
installPhase = "install -D bin/lit $out/bin/lit";
diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix
index 3ab8800f3c4..055a24f3fe0 100644
--- a/pkgs/development/tools/misc/cwebbin/default.nix
+++ b/pkgs/development/tools/misc/cwebbin/default.nix
@@ -16,7 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj";
};
- buildInputs = [ tie ];
+ # Remove references to __DATE__ and __TIME__
+ postPatch = ''
+ substituteInPlace wmerg-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
+ substituteInPlace ctang-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
+ substituteInPlace ctangle.cxx --replace ' ("__DATE__", "__TIME__")' ""
+ substituteInPlace cweav-patch.ch --replace ' ("__DATE__", "__TIME__")' ""
+ '';
+
+ nativeBuildInputs = [ tie ];
makeFlags = [
"MACROSDIR=$(out)/share/texmf/tex/generic/cweb"
@@ -27,7 +35,7 @@ stdenv.mkDerivation rec {
"CP=cp"
"RM=rm"
"PDFTEX=echo"
- "CC=c++"
+ "CC=${stdenv.cc.targetPrefix}c++"
];
buildPhase = ''
diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix
index ac5fb4118be..dca8d9666af 100644
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -12,11 +12,11 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
stdenv.mkDerivation rec {
pname = "dialog";
- version = "1.3-20210117";
+ version = "1.3-20210306";
src = fetchurl {
url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz";
- sha256 = "PB7Qj0S89vFZ8qpv3nZduU6Jl7Pu+0nYtMhmkWk8Q+E=";
+ hash = "sha256-pz57YHtjX2PAICuzMTEG5wD5H+Sp9NJspwA/brK5yw8=";
};
buildInputs = [ ncurses ];
diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix
index 82b2d2af7cd..b9341609493 100644
--- a/pkgs/development/tools/misc/editorconfig-checker/default.nix
+++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "editorconfig-checker";
- version = "2.3.3";
+ version = "2.3.4";
src = fetchFromGitHub {
owner = "editorconfig-checker";
repo = "editorconfig-checker";
rev = version;
- sha256 = "sha256-u3gTzsAoV4fgQjsnONIIGFE/Y02bKbCTg30O9FTI2/w=";
+ sha256 = "sha256-aTHY9RFFkpTQKv+Erczu5joqvE7L05Ev2GOSiXNxLj8=";
};
- vendorSha256 = "sha256-0Eznh9xXuYf4mVZipyE99fKwkGYeSAorhBLamupGkvw=";
+ vendorSha256 = "sha256-y+wQ6XzX4vmKzesUcF9jgfrKPj5EsCuw/aKizVX/ogI=";
doCheck = false;
diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix
index 764041b6ad4..0df831b579e 100644
--- a/pkgs/development/tools/operator-sdk/default.nix
+++ b/pkgs/development/tools/operator-sdk/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "operator-sdk";
- version = "1.4.2";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "operator-framework";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-wGlxi9X8RrAtvevDfufY1t3en6QgHy5XoSh0K/M/ve4=";
+ sha256 = "sha256-95fTfUKoknGBIoc/ALd5w9X89Tl9DBxapl9EgWENsa0=";
};
- vendorSha256 = "sha256-GRw0u6zox2gseQhrx7n0M3WVu4+yCKZ7D/QHVcBRb30=";
+ vendorSha256 = "sha256-Sp0ml5tnsbnuyk3NkA80dmFj6IOiL/NeYYbEbr7EPRY=";
doCheck = false;
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 88783e4f380..aa58864fed7 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -313,7 +313,7 @@ self: super:
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
buildInputs =
(old.buildInputs or [ ])
- ++ [ pkgs.hdf5 self.pkgconfig self.cython ]
+ ++ [ pkgs.hdf5 self.pkg-config self.cython ]
++ lib.optional mpiSupport mpi
;
propagatedBuildInputs =
@@ -453,7 +453,7 @@ self: super:
);
jsonslicer = super.jsonslicer.overridePythonAttrs (old: {
- nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig ];
+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ];
});
diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/tools/rshell/default.nix
index 4e3e12a8eeb..bcda3c02dd6 100644
--- a/pkgs/development/tools/rshell/default.nix
+++ b/pkgs/development/tools/rshell/default.nix
@@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "rshell";
- version = "0.0.28";
+ version = "0.0.30";
src = fetchPypi {
inherit pname version;
- sha256 = "1crnlv0khplpibl9mj3flrgp877pnr1xz6hnnsi6hk3kfbc6p3nj";
+ sha256 = "d2002d40d735204037d6142a6c2d51beecc763c124faaf759cabf7acd945be95";
};
propagatedBuildInputs = [ pyserial pyudev ];
diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix
index 7cb366c5502..934976f7386 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
- sha256 = "sha256-FWXSEGjTr2DewZ8NidzPdc6jhfNAUdV9qKyR7ZciWio=";
+ sha256 = "sha256-6FjFG4RYvmsV/W7OMxj1ZWvruwUeP9Nvsdiv8toZmTk=";
};
- cargoSha256 = "sha256-uvTxOZPMTCd+3WQJeVfSC5mlJ487hJKs/0Dd2C8cpcM=";
+ cargoSha256 = "sha256-1+A+n5VQS8zJULiR8IWLGo+RnFuVjg6ist8G3eCsXJM=";
meta = with lib; {
description =
diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix
index 569c8f88da2..ced5d7cd583 100644
--- a/pkgs/development/tools/rust/cargo-fuzz/default.nix
+++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-fuzz";
- version = "0.8.0";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "rust-fuzz";
repo = "cargo-fuzz";
rev = version;
- sha256 = "1d4bq9140bri8cd9zcxh5hhc51vr0s6jadjhwkp688w7k10rq7w8";
+ sha256 = "sha256-kBbwE4ToUud5BDDlGoey2qpp2imzO6t3FcIbV3NTFa8=";
};
- cargoSha256 = "0zxhak79f50m8nw95ny733mk4x2f7kyk6q9v4f7jr2rkcldhgrpr";
+ cargoSha256 = "sha256-zqRlB2Kck4icMKzhaeeakEnn6O7zhoKPa5ZWbGooWIg=";
doCheck = false;
diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix
index 642f2e936e1..09e24775a35 100644
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, callPackage }:
+{ pkgs, callPackage, CoreServices }:
{
rust-analyzer-unwrapped = callPackage ./generic.nix rec {
@@ -6,6 +6,8 @@
version = "unstable-${rev}";
sha256 = "150gydm0mg72bbhgjjks8qc5ldiqyzhai9z4yfh4f1s2bwdfh3yf";
cargoSha256 = "10l0lk5p11002q59dqa5yrrz6n6s11i7bmr1wnl141bxqvm873q2";
+
+ inherit CoreServices;
};
rust-analyzer = callPackage ./wrapper.nix {} {
diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix
index ecca83f89a4..ddb834af6c3 100644
--- a/pkgs/development/tools/rust/rust-analyzer/generic.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, cmake
+{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake
+, libiconv
, useMimalloc ? false
, doCheck ? true
@@ -22,8 +23,10 @@ rustPlatform.buildRustPackage {
nativeBuildInputs = lib.optional useMimalloc cmake;
- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin
- [ darwin.apple_sdk.frameworks.CoreServices ];
+ buildInputs = lib.optionals stdenv.isDarwin [
+ CoreServices
+ libiconv
+ ];
RUST_ANALYZER_REV = rev;
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 013b365bce8..17a3ae58f2a 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -1,52 +1,49 @@
-{ lib, stdenv
-, fetchurl
+{ stdenv
+, lib
+, callPackage
, fetchFromGitHub
, rust
, rustPlatform
, installShellFiles
+, libobjc
, Security
, CoreServices
+, Metal
+, Foundation
+, librusty_v8 ? callPackage ./librusty_v8.nix { }
}:
-let
- deps = import ./deps.nix { };
- arch = rust.toRustTarget stdenv.hostPlatform;
- rustyV8Lib = with deps.rustyV8Lib; fetchurl {
- url = "https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${arch}.a";
- sha256 = sha256s."${stdenv.hostPlatform.system}";
- meta = { inherit version; };
- };
-in
+
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.6.3";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "1wmkx458fpsfw57ysawxc0ghxag8v051hiyswm7nnb7gckrm6j8z";
- fetchSubmodules = true;
+ sha256 = "sha256-tyqZ/vjQ9gjLoK+Juj30It3H6+2sT9Fj/s0kEv0HRwI=";
};
- cargoSha256 = "08vzsp53019gmxkn8lpa6l84w3fvbrnr11lzrfgf99nmii6l2hq5";
+ cargoSha256 = "sha256-LpBQztMqw7IbgTJkfiD+6Fcy5XXmN58HO/zhVen3oCI=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
- buildInputs = lib.optionals stdenv.isDarwin [ Security CoreServices ];
+ buildInputs = lib.optionals stdenv.isDarwin [ libobjc Security CoreServices Metal Foundation ];
# The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
# To avoid this we pre-download the file and place it in the locations it will require it in advance
- preBuild = ''
- _rusty_v8_setup() {
- for v in "$@"; do
- dir="target/$v/gn_out/obj"
- mkdir -p "$dir" && cp "${rustyV8Lib}" "$dir/librusty_v8.a"
- done
- }
+ preBuild =
+ let arch = rust.toRustTarget stdenv.hostPlatform; in
+ ''
+ _librusty_v8_setup() {
+ for v in "$@"; do
+ install -D ${librusty_v8} "target/$v/gn_out/obj/librusty_v8.a"
+ done
+ }
- # Copy over the `librusty_v8.a` file inside target/XYZ/gn_out/obj, symlink not allowed
- _rusty_v8_setup "debug" "release" "${arch}/release"
- '';
+ # Copy over the `librusty_v8.a` file inside target/XYZ/gn_out/obj, symlink not allowed
+ _librusty_v8_setup "debug" "release" "${arch}/release"
+ '';
# Tests have some inconsistencies between runs with output integration tests
# Skipping until resolved
@@ -54,7 +51,7 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
# remove test plugin and test server
- rm -rf $out/lib $out/bin/test_server
+ rm -r $out/lib $out/bin/test_server $out/bin/denort
installShellCompletion --cmd deno \
--bash <($out/bin/deno completions bash) \
@@ -62,11 +59,19 @@ rustPlatform.buildRustPackage rec {
--zsh <($out/bin/deno completions zsh)
'';
+ doInstallCheck = true;
+ installCheckPhase = ''
+ runHook preInstallCheck
+ $out/bin/deno --help
+ $out/bin/deno --version | grep "deno ${version}"
+ runHook postInstallCheck
+ '';
+
passthru.updateScript = ./update/update.ts;
meta = with lib; {
homepage = "https://deno.land/";
- changelog = "${src.meta.homepage}/releases/tag/v${version}";
+ changelog = "https://github.com/denoland/deno/releases/tag/v${version}";
description = "A secure runtime for JavaScript and TypeScript";
longDescription = ''
Deno aims to be a productive and secure scripting environment for the modern programmer.
@@ -79,6 +84,6 @@ rustPlatform.buildRustPackage rec {
'';
license = licenses.mit;
maintainers = with maintainers; [ jk ];
- platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
+ platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}
diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix
deleted file mode 100644
index 4426c600df7..00000000000
--- a/pkgs/development/web/deno/deps.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# auto-generated file -- DO NOT EDIT!
-{}:
-rec {
- rustyV8Lib = {
- version = "0.15.0";
- sha256s = {
- x86_64-linux = "1j789pvqh44vsffzl5wg3pp3awrlixjrhbnjx2klsml7jv0lp0mq";
- aarch64-linux = "13srja4vc275ygm806hcsr8mxjnd9qkzaqs58lxnp0702qs5xls6";
- x86_64-darwin = "0aij9yb5i1r3pz0pyl51qdbgfspfdngwbk1qgkp4gxzl3cbnysx1";
- };
- };
-}
diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix
new file mode 100644
index 00000000000..31dbce08922
--- /dev/null
+++ b/pkgs/development/web/deno/librusty_v8.nix
@@ -0,0 +1,21 @@
+# auto-generated file -- DO NOT EDIT!
+{ rust, stdenv, fetchurl }:
+
+let
+ arch = rust.toRustTarget stdenv.hostPlatform;
+ fetch_librusty_v8 = args: fetchurl {
+ name = "librusty_v8-${args.version}";
+ url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a";
+ sha256 = args.shas.${stdenv.hostPlatform.system};
+ meta = { inherit (args) version; };
+ };
+in
+fetch_librusty_v8 {
+ version = "0.20.0";
+ shas = {
+ x86_64-linux = "sha256-pTWNYQzChyYJh+afn1AMw/MxUE+Cv4k2FnM3+KDYCvg=";
+ aarch64-linux = "sha256-SPRtQO0tnuEf49GuSsuo403QO0Y6ioRkOp4cjohXRhw=";
+ x86_64-darwin = "sha256-k0kS5NiITqW/WEFWe/Bnt7Z9HZp2YN19L7DvVlptrj4=";
+ aarch64-darwin = "sha256-CDGxSv7fPR+5kF3+5NVTOH8ugLaM07Kv5mjoEW6/g/8=";
+ };
+}
diff --git a/pkgs/development/web/deno/update/common.ts b/pkgs/development/web/deno/update/common.ts
index d8956b21d16..1b4e3509ea7 100644
--- a/pkgs/development/web/deno/update/common.ts
+++ b/pkgs/development/web/deno/update/common.ts
@@ -3,12 +3,15 @@ interface GHRelease {
}
const decode = (buffer: Uint8Array) => new TextDecoder("utf-8").decode(buffer);
-const run = async (command: string, args: string[]) => {
- const cmd = Deno.run(
- { cmd: [command, ...args], stdout: "piped", stderr: "piped" },
- );
+const decodeTrim = (b: Uint8Array) => decode(b).trimEnd();
+export const run = async (command: string, args: string[]) => {
+ const cmd = Deno.run({
+ cmd: [command, ...args],
+ stdout: "piped",
+ stderr: "piped",
+ });
if (!(await cmd.status()).success) {
- const error = await cmd.stderrOutput().then((b) => decode(b).trimEnd());
+ const error = await cmd.stderrOutput().then(decodeTrim);
// Known error we can ignore
if (error.includes("'allow-unsafe-native-code-during-evaluation'")) {
// Extract the target sha256 out of the error
@@ -23,26 +26,16 @@ const run = async (command: string, args: string[]) => {
}
throw new Error(error);
}
- return cmd.output().then((b) => decode(b).trimEnd());
+ return cmd.output().then(decodeTrim);
};
// Exports
export const versionRegExp = /\d+\.\d+\.\d+/;
-export const sha256RegExp = /[a-z0-9]{52}/;
-
-export async function commit(
- name: string,
- oldVer: string,
- newVer: string,
- files: string[],
-) {
- await run("git", ["add", ...files]);
- await run("git", ["commit", "-m", `${name}: ${oldVer} -> ${newVer}`]);
-}
+export const sha256RegExp = /[a-z0-9]{52}|sha256-.{44}/;
export const getExistingVersion = async (filePath: string) =>
- read(filePath).then((s) =>
- s.match(genValueRegExp("version", versionRegExp))?.shift() || ""
+ read(filePath).then(
+ (s) => s.match(genValueRegExp("version", versionRegExp))?.shift() || "",
);
export const getLatestVersion = (owner: string, repo: string) =>
@@ -58,8 +51,5 @@ export const genValueRegExp = (key: string, regex: RegExp) =>
export const logger = (name: string) =>
(...a: any) => console.log(`[${name}]`, ...a);
-export const nixPrefetch = (args: string[]) => run("nix-prefetch", args);
-export const nixPrefetchURL = (args: string[]) => run("nix-prefetch-url", args);
-
export const read = Deno.readTextFile;
export const write = Deno.writeTextFile;
diff --git a/pkgs/development/web/deno/update/deps.ts b/pkgs/development/web/deno/update/deps.ts
deleted file mode 100644
index beedeade3a8..00000000000
--- a/pkgs/development/web/deno/update/deps.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import {
- getExistingVersion,
- genValueRegExp,
- logger,
- nixPrefetchURL,
- versionRegExp,
- write,
-} from "./common.ts";
-
-const log = logger("deps");
-
-export interface Architecture {
- nix: string;
- rust: string;
-}
-interface PrefetchResult {
- arch: Architecture;
- sha256: string;
-}
-
-const getRustyV8Version = async (
- owner: string,
- repo: string,
- version: string,
-) =>
- fetch(
- `https://github.com/${owner}/${repo}/raw/${version}/core/Cargo.toml`,
- )
- .then((res) => res.text())
- .then((txt) =>
- txt.match(genValueRegExp("rusty_v8", versionRegExp))?.shift()
- );
-
-const archShaTasks = (version: string, arches: Architecture[]) =>
- arches.map(async (arch: Architecture): Promise => {
- log("Fetching:", arch.nix);
- const sha256 = await nixPrefetchURL(
- [`https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${arch.rust}.a`],
- );
- log("Done: ", arch.nix);
- return { arch, sha256 };
- });
-
-const templateDeps = (version: string, deps: PrefetchResult[]) =>
- `# auto-generated file -- DO NOT EDIT!
-{}:
-rec {
- rustyV8Lib = {
- version = "${version}";
- sha256s = {
-${deps.map((d) => ` ${d.arch.nix} = "${d.sha256}";`).join("\n")}
- };
- };
-}
-`;
-
-export async function updateDeps(
- filePath: string,
- owner: string,
- repo: string,
- denoVersion: string,
- arches: Architecture[],
-) {
- log("Starting deps update");
- // 0.0.0
- const version = await getRustyV8Version(owner, repo, denoVersion);
- if (typeof version !== "string") {
- throw "no rusty_v8 version";
- }
- log("rusty_v8 version:", version);
- const existingVersion = await getExistingVersion(filePath);
- if (version === existingVersion) {
- log("Version already matches latest, skipping...");
- return;
- }
- const archShaResults = await Promise.all(archShaTasks(version, arches));
- await write(filePath, templateDeps(version, archShaResults));
- log("Finished deps update");
-}
diff --git a/pkgs/development/web/deno/update/librusty_v8.ts b/pkgs/development/web/deno/update/librusty_v8.ts
new file mode 100644
index 00000000000..dee3277c581
--- /dev/null
+++ b/pkgs/development/web/deno/update/librusty_v8.ts
@@ -0,0 +1,92 @@
+import {
+ genValueRegExp,
+ getExistingVersion,
+ logger,
+ run,
+ versionRegExp,
+ write,
+} from "./common.ts";
+
+const log = logger("librusty_v8");
+
+export interface Architecture {
+ nix: string;
+ rust: string;
+}
+interface PrefetchResult {
+ arch: Architecture;
+ sha256: string;
+}
+
+const getLibrustyV8Version = async (
+ owner: string,
+ repo: string,
+ version: string,
+) =>
+ fetch(`https://github.com/${owner}/${repo}/raw/${version}/core/Cargo.toml`)
+ .then((res) => res.text())
+ .then((txt) =>
+ txt.match(genValueRegExp("rusty_v8", versionRegExp))?.shift()
+ );
+
+const fetchArchShaTasks = (version: string, arches: Architecture[]) =>
+ arches.map(
+ async (arch: Architecture): Promise => {
+ log("Fetching:", arch.nix);
+ const sha256 = await run("nix-prefetch", [
+ `
+{ fetchurl }:
+fetchurl {
+ url = "https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${arch.rust}.a";
+}
+`,
+ ]);
+ log("Done: ", arch.nix);
+ return { arch, sha256 };
+ },
+ );
+
+const templateDeps = (version: string, deps: PrefetchResult[]) =>
+ `# auto-generated file -- DO NOT EDIT!
+{ rust, stdenv, fetchurl }:
+
+let
+ arch = rust.toRustTarget stdenv.hostPlatform;
+ fetch_librusty_v8 = args: fetchurl {
+ name = "librusty_v8-\${args.version}";
+ url = "https://github.com/denoland/rusty_v8/releases/download/v\${args.version}/librusty_v8_release_\${arch}.a";
+ sha256 = args.shas.\${stdenv.hostPlatform.system};
+ meta = { inherit (args) version; };
+ };
+in
+fetch_librusty_v8 {
+ version = "${version}";
+ shas = {
+${deps.map(({ arch, sha256 }) => ` ${arch.nix} = "${sha256}";`).join("\n")}
+ };
+}
+`;
+
+export async function updateLibrustyV8(
+ filePath: string,
+ owner: string,
+ repo: string,
+ denoVersion: string,
+ arches: Architecture[],
+) {
+ log("Starting librusty_v8 update");
+ // 0.0.0
+ const version = await getLibrustyV8Version(owner, repo, denoVersion);
+ if (typeof version !== "string") {
+ throw "no librusty_v8 version";
+ }
+ log("librusty_v8 version:", version);
+ const existingVersion = await getExistingVersion(filePath);
+ if (version === existingVersion) {
+ log("Version already matches latest, skipping...");
+ return;
+ }
+ const archShaResults = await Promise.all(fetchArchShaTasks(version, arches));
+ await write(filePath, templateDeps(version, archShaResults));
+ log("Finished deps update");
+}
diff --git a/pkgs/development/web/deno/update/src.ts b/pkgs/development/web/deno/update/src.ts
index fae15acd0d2..3bfae27c21c 100644
--- a/pkgs/development/web/deno/update/src.ts
+++ b/pkgs/development/web/deno/update/src.ts
@@ -1,8 +1,8 @@
import {
genValueRegExp,
logger,
- nixPrefetch,
read,
+ run,
sha256RegExp,
versionRegExp,
write,
@@ -16,10 +16,11 @@ interface Replacer {
const log = logger("src");
const prefetchSha256 = (nixpkgs: string, version: string) =>
- nixPrefetch(["-f", nixpkgs, "deno.src", "--rev", version]);
+ run("nix-prefetch", ["-f", nixpkgs, "deno.src", "--rev", version]);
const prefetchCargoSha256 = (nixpkgs: string) =>
- nixPrefetch(
- [`{ sha256 }: (import ${nixpkgs} {}).deno.cargoDeps.overrideAttrs (_: { outputHash = sha256; })`],
+ run(
+ "nix-prefetch",
+ [`{ sha256 }: (import ${nixpkgs} {}).deno.cargoDeps.overrideAttrs (_: { inherit sha256; })`],
);
const replace = (str: string, replacers: Replacer[]) =>
@@ -53,7 +54,6 @@ export async function updateSrc(
[
genVerReplacer("version", trimVersion),
genShaReplacer("sha256", sha256),
- genShaReplacer("cargoSha256", ""), // Empty ready for prefetchCargoSha256
],
);
log("Fetching cargoSha256 for:", sha256);
diff --git a/pkgs/development/web/deno/update/update.ts b/pkgs/development/web/deno/update/update.ts
index 18d45148013..27e1d86ee86 100755
--- a/pkgs/development/web/deno/update/update.ts
+++ b/pkgs/development/web/deno/update/update.ts
@@ -2,13 +2,8 @@
/*
#!nix-shell -i "deno run --allow-net --allow-run --allow-read --allow-write" -p deno git nix-prefetch
*/
-import {
- commit,
- getExistingVersion,
- getLatestVersion,
- logger,
-} from "./common.ts";
-import { Architecture, updateDeps } from "./deps.ts";
+import { getExistingVersion, getLatestVersion, logger } from "./common.ts";
+import { Architecture, updateLibrustyV8 } from "./librusty_v8.ts";
import { updateSrc } from "./src.ts";
const log = logger("update");
@@ -19,11 +14,12 @@ const owner = "denoland";
const repo = "deno";
const denoDir = `${nixpkgs}/pkgs/development/web/${repo}`;
const src = `${denoDir}/default.nix`;
-const deps = `${denoDir}/deps.nix`;
+const librusty_v8 = `${denoDir}/librusty_v8.nix`;
const architectures: Architecture[] = [
{ nix: "x86_64-linux", rust: "x86_64-unknown-linux-gnu" },
{ nix: "aarch64-linux", rust: "aarch64-unknown-linux-gnu" },
{ nix: "x86_64-darwin", rust: "x86_64-apple-darwin" },
+ { nix: "aarch64-darwin", rust: "aarch64-apple-darwin" },
];
log("Updating deno");
@@ -41,10 +37,7 @@ if (trimVersion === existingVersion) {
const tasks = [
updateSrc(src, nixpkgs, version),
- updateDeps(deps, owner, repo, version, architectures),
+ updateLibrustyV8(librusty_v8, owner, repo, version, architectures),
];
await Promise.all(tasks);
log("Updating deno complete");
-log("Commiting");
-await commit(repo, existingVersion, trimVersion, [src, deps]);
-log("Done");
diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix
index f564d5bcccb..194bb25cb02 100644
--- a/pkgs/development/web/nodejs/v15.nix
+++ b/pkgs/development/web/nodejs/v15.nix
@@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "15.11.0";
- sha256 = "1lfjm0jgzbr0a874c04pddbjnvjcdyx5vyaakdhp0fa222i92w0s";
+ version = "15.12.0";
+ sha256 = "0c8smzc7gbr7yg4y4z68976wk5741bspggag9h9laykq4i8bxfsy";
}
diff --git a/pkgs/games/chromium-bsu/default.nix b/pkgs/games/chromium-bsu/default.nix
new file mode 100644
index 00000000000..1ab2fb8722b
--- /dev/null
+++ b/pkgs/games/chromium-bsu/default.nix
@@ -0,0 +1,68 @@
+{ lib
+, stdenv
+, fetchurl
+, SDL2
+, SDL2_image
+, SDL2_mixer
+, fontconfig
+, freealut
+, freeglut
+, ftgl
+, gettext
+, glpng
+, libGL
+, libGLU
+, openal
+, pkg-config
+, quesoglc
+}:
+
+stdenv.mkDerivation rec {
+ pname = "chromium-bsu";
+ version = "0.9.16.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/project/chromium-bsu/Chromium%20B.S.U.%20source%20code/${pname}-${version}.tar.gz";
+ hash = "sha256-ocFBo00ZpZYHroEWahmGTrjITPhrFVRi/tMabVbhYko=";
+ };
+
+ nativeBuildInputs = [
+ gettext
+ pkg-config
+ ];
+ buildInputs = [
+ SDL2
+ SDL2_image
+ SDL2_mixer
+ fontconfig
+ freealut
+ freeglut
+ ftgl
+ glpng
+ libGL
+ libGLU
+ openal
+ quesoglc
+ ];
+
+ # Autodetection is somewhat buggy; this is to avoid SLD1 to be loaded
+ configureFlags = [
+ "--disable-sdlimage"
+ "--disable-sdlmixer"
+ ];
+
+
+ postInstall = ''
+ install -D misc/chromium-bsu.png $out/share/pixmaps/chromium-bsu.png
+ install -D misc/chromium-bsu.desktop $out/share/applications/chromium-bsu.desktop
+ '';
+
+ meta = with lib; {
+ homepage = "http://chromium-bsu.sourceforge.net/";
+ description = "A fast paced, arcade-style, top-scrolling space shooter";
+ license = licenses.artistic1;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.unix;
+ };
+}
+# TODO [ AndersonTorres ]: joystick; gothic uralic font
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index fe16a8a0403..fef1a0f0928 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -60,5 +60,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ phreedom qknight domenkozar sorki ];
platforms = platforms.linux;
+ # error: 'snprintf' was not declared in this scope
+ broken = true;
};
}
diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/misc/emulators/tilem/default.nix
index d2252563d0a..bde706e2304 100644
--- a/pkgs/misc/emulators/tilem/default.nix
+++ b/pkgs/misc/emulators/tilem/default.nix
@@ -3,7 +3,7 @@
, lib
, pkg-config
, glib
-, gnome2
+, gtk2
, libticonv
, libtifiles2
, libticables2
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "1ba38xzhp3yf21ip3cgql6jzy49jc34sfnjsl4syxyrd81d269zw";
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ glib gnome2.gtk libticonv libtifiles2 libticables2 libticalcs2 ];
+ buildInputs = [ glib gtk2 libticonv libtifiles2 libticables2 libticalcs2 ];
NIX_CFLAGS_COMPILE = [ "-lm" ];
meta = with lib; {
homepage = "http://lpg.ticalc.org/prj_tilem/";
diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index b59ed85f6bc..17b22ce0723 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -2,11 +2,11 @@
, libXdmcp, libXt }:
stdenv.mkDerivation rec {
- name = "xlockmore-5.65";
+ name = "xlockmore-5.66";
src = fetchurl {
url = "http://sillycycle.com/xlock/${name}.tar.xz";
- sha256 = "0d4l8ibbvc62whlq8rrbvqr3011a7h21l9na93r579g0dfwdbh6d";
+ sha256 = "sha256-WXalw2YoKNFFIskOBvKN3PyOV3iP3gjri3pw6e87q3E=";
curlOpts = "--user-agent 'Mozilla/5.0'";
};
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index da4f37d28a0..08d76932f02 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2021-03-07";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "c21d6afd2fb799013e3894d393bf976d9da31e65";
- sha256 = "1f4s6zq0270mpczwz7chi763rxnm2qk3gjfylwmr8r2ny6f5is1w";
+ rev = "dc40ece3c389804df6d9423e0d52c8da2355ea17";
+ sha256 = "0r4s8mbwa7zr3xa73viw8abvaz4ifvjahnifqd9nkivc2qz6s5x9";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -209,12 +209,12 @@ let
auto-session = buildVimPluginFrom2Nix {
pname = "auto-session";
- version = "2021-03-08";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "auto-session";
- rev = "2bb1fcd8828df1de5c79821b6b01ba929af355f0";
- sha256 = "0xlzq51izzbhsl3jlqj3f719ixcqi7r7y8m8n6291yp1xpmidfwm";
+ rev = "aa1c0b161a82ecf876ca3fc2894e9000225f4adf";
+ sha256 = "13cinglppisp20mki1g23iz3kp5l9bq1yj89yip80y5kzb0aqsbj";
};
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
@@ -257,12 +257,12 @@ let
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar-nvim";
- version = "2021-03-07";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
- rev = "85432f426b7473bb7a4de9f698f91848737b0fd8";
- sha256 = "16ql06swg4flr933bp2qm8g5iy2sjgh650k18pzghc0qc9k517xd";
+ rev = "2d14a46d485363cdfc86c9a723f73b2a3e3930bd";
+ sha256 = "04c516xkr499z7yfpzmab7aa3y60qhid5zx2kf0askancpvxkmvc";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-03-10";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "36bc8699c7fe94d8c184bc2d17382752557bd22e";
- sha256 = "0swcw4cfhshfb6rmq93r5lmr338gn0ci7wmhabvmpxzhwwm28xvr";
+ rev = "9bfc3e5c79577b15be4b4a464573a4225d41184c";
+ sha256 = "0l7jm2v79kisk4xr33wdfm8fsx1g7c217m8dqn6d7bhj9s3nyf47";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -497,24 +497,24 @@ let
coc-fzf = buildVimPluginFrom2Nix {
pname = "coc-fzf";
- version = "2021-02-27";
+ version = "2021-03-13";
src = fetchFromGitHub {
owner = "antoinemadec";
repo = "coc-fzf";
- rev = "3c8ca6127af51768cad8ff1074db5a9713d7fe13";
- sha256 = "17988plg3zrfnfzp4pr292qbk5zi8qgjldkhqsv5w9w38a02gxqj";
+ rev = "4f44d0749bf9ac1e3755c276222a20015c3fe3be";
+ sha256 = "0qrg8m82pmzs8pia16z05pkm9hhcijlw8w79r35silccsicsz8l1";
};
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
};
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
- version = "2021-03-10";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
- rev = "946e8393cd9189f97a50084c2a040966dce0f0cb";
- sha256 = "0d74lk85hkjb0w4fzvsp4gljl224ci749g2l25a1kd6kihyf7f82";
+ rev = "f149d512bd183db51ef0c714568a64d647d3e7ef";
+ sha256 = "0lrbn7rd6w5xqs9z7gsdka8kcaz46azzd9s3ppzdanq7715d8qx4";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
@@ -545,12 +545,12 @@ let
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
- version = "2021-03-09";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "ab4f3f5797754334def047466a998b92f3076db9";
- sha256 = "1wr0v1kgv9km5rfc9g49897043gk3hraf07z8i937144z34qasf1";
+ rev = "d3fa3e2a184c174ccdf68051886782fbe8fb8ade";
+ sha256 = "0ywicgnld69qp4vv0x2aq9xjaks6i3vmzq1lsr4nhss02jgd0ldx";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -593,12 +593,12 @@ let
command-t = buildVimPluginFrom2Nix {
pname = "command-t";
- version = "2021-03-04";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "wincent";
repo = "command-t";
- rev = "7c14a8c0da5127c38f0c5b1b7061491c3cfb5ea3";
- sha256 = "128331ipqjqicb5j8jifmg268faxfd4lwy4b20h5hy9macfyvys6";
+ rev = "a7ce436b211a7ac1f47cfd440370653e33c2a1d5";
+ sha256 = "1yfcbh9q35w1ckdv8isbwjwlgnjnjmqm8yc7bcbfirkx9pjlsw2z";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/wincent/command-t/";
@@ -738,12 +738,12 @@ let
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
- version = "2021-03-09";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
- rev = "3b61d0755a4523a131096c97fb016b102e7b1672";
- sha256 = "1df1zq117vf6w7d9y0l9cdicsw1qw3d497xnckk3c0r0kv8w6hkc";
+ rev = "0c633489b6e6d2282b3abb9c5396c5f4c27afb55";
+ sha256 = "07vdzpy9ws76csgr8qs7m0krb6rkd17fbcn5168lyzcil52d3dwn";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@@ -786,12 +786,12 @@ let
csv-vim = buildVimPluginFrom2Nix {
pname = "csv-vim";
- version = "2021-02-18";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "csv.vim";
- rev = "73c8eeca4c89768e4c53bb7a83cc3741bdcb5c7d";
- sha256 = "0hdcq8acylp8i3gh0agxjr3v34q6c4qmdwnpx1v31y3cy0j8k7v3";
+ rev = "24da62f64e6025be12ad60b16489b561f228e619";
+ sha256 = "0x5z46rzhwrdr1fzq69c6bpn3dnjjj9a64s97wn220n4xwrz1y54";
};
meta.homepage = "https://github.com/chrisbra/csv.vim/";
};
@@ -858,12 +858,12 @@ let
dashboard-nvim = buildVimPluginFrom2Nix {
pname = "dashboard-nvim";
- version = "2021-03-10";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "glepnir";
repo = "dashboard-nvim";
- rev = "6849ecf77a6075e55946c642f07a562fcdcdd579";
- sha256 = "0pyvscibc7ydn294kffwp80gfwk5rk4v63haih79c7acq52xmm0l";
+ rev = "563c8c1885044ad3fbb5339ad5a10439d9899e51";
+ sha256 = "0xp6dpdz45lfqx0s6xhxkgxwnbbdwiaybjvb0qfyh2pziirxdrxm";
};
meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
};
@@ -894,12 +894,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
- version = "2021-03-09";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
- rev = "fc76104d2b7204c016bd8e1750a06150800c4735";
- sha256 = "1ch1g39r2iyd8ma11kfi6fqy0cp0ybqv0laqs1pxphlw2z575jrj";
+ rev = "6224e6981dc33887bc045a7eab7df6f94106c4af";
+ sha256 = "0spj16d6n4swxcq2iv48si5l3pahmx6wypp4yc2mnaj2yxcjr39p";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@@ -942,24 +942,24 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2021-03-03";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "db2d82cfbd85d8b6caafbd967a27f4d1c6ea5fa6";
- sha256 = "173nmv0d729hk9xbz9jdk9h9zlm9dhz89pgda7vggrp9dp8d1z5v";
+ rev = "c1dcff549abba061670a67af69eff7021955733c";
+ sha256 = "0vqdxjadxz1xh5q7i7m6964l9gqss59lv1n4s7109cfjylacmsxx";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
deol-nvim = buildVimPluginFrom2Nix {
pname = "deol-nvim";
- version = "2021-02-22";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deol.nvim";
- rev = "d66c706c9788aa47399485a3ec29a2a76711a188";
- sha256 = "09bj5442xln6a98ncnq1lxkyrl8c973p9sfd02zl1a3f16sms415";
+ rev = "f0f28abb21dba278c041f6cb6c71585d9e3bed00";
+ sha256 = "05q8zm3hmc2rbw7hq0ri0f4jgqjh399dfrm5lpi2jmwf9hkqy0yc";
};
meta.homepage = "https://github.com/Shougo/deol.nvim/";
};
@@ -1184,12 +1184,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
- version = "2021-03-10";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "aa32b3d2e8f4240c7908f098f89359d20063c691";
- sha256 = "1048kb3sxmsbd9xk4s1nxvhgkrfixvpragbj6sm00sy4hx5qfq4j";
+ rev = "b05a60c81572994eb9b4e1aa5c1c5dba98e10349";
+ sha256 = "02dfns6ay9vi580nazzqfj858g0bhi3dwpd5kgg03gk38ybmxvgz";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@@ -1317,12 +1317,12 @@ let
embark-vim = buildVimPluginFrom2Nix {
pname = "embark-vim";
- version = "2021-02-23";
+ version = "2021-03-12";
src = fetchFromGitHub {
owner = "embark-theme";
repo = "vim";
- rev = "d9ea898794c486e2517823f24b9577ce4c488364";
- sha256 = "0l1f9pl8nh8lkswwrsw13s8d10ccq0c1jfd3bpszsxc6ryjm0wqw";
+ rev = "fda8867d405a93938f154fb9d70e4f4a4e6ef8c8";
+ sha256 = "09kvk3wjmpvssv8j5iba2dngnfkv178gkr620pa3k1imb0m9f0bq";
};
meta.homepage = "https://github.com/embark-theme/vim/";
};
@@ -1414,12 +1414,12 @@ let
fern-vim = buildVimPluginFrom2Nix {
pname = "fern-vim";
- version = "2021-02-28";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "fern.vim";
- rev = "c09eb24de7a647a2b4878f8dc86b3d3565b3e8af";
- sha256 = "0mqrrb899bgf13r2klkqh4ycz167fx98kjnrhdg2jhq8gg85i0ih";
+ rev = "31c76b351f6d995009dcd117d7910b80df96928a";
+ sha256 = "1qkf6bsff6cfrqyhdrmn91diq9p53i3i3fvgcb5m9az33p42fqgn";
};
meta.homepage = "https://github.com/lambdalisue/fern.vim/";
};
@@ -1535,24 +1535,24 @@ let
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
- version = "2021-03-06";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
- rev = "711fb41e39e2ad3abec1ec9720782acbac6fb6b4";
- sha256 = "1jfjj20arsikk8alaa7jrp7aakkpakpnjbkk4ri0s95f8ix09wcm";
+ rev = "1ef72b14ccd05fdbdb01d253b91a74c4760ae655";
+ sha256 = "1yrj8dq0n3wfdrl5c93cfzsjyv175b9h65iwxkincag926m6sr06";
};
meta.homepage = "https://github.com/junegunn/fzf.vim/";
};
galaxyline-nvim = buildVimPluginFrom2Nix {
pname = "galaxyline-nvim";
- version = "2021-03-10";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "glepnir";
repo = "galaxyline.nvim";
- rev = "a6c2cbc2218cb2e59fd3353fb827da82b84a248a";
- sha256 = "1vj4f61x5p1zg8cr4a7a90xij810v6zkbzdwpkbksfmyrxfkvqs8";
+ rev = "6a88f1bc181bef0ad2b10e962e30896cb064818a";
+ sha256 = "0gjqfiq0gqbbqd2irb5j0xhjmhriipy3vn8rsls5cmx3mfaxrz1r";
};
meta.homepage = "https://github.com/glepnir/galaxyline.nvim/";
};
@@ -1605,6 +1605,18 @@ let
meta.homepage = "https://github.com/eagletmt/ghcmod-vim/";
};
+ git-blame-nvim = buildVimPluginFrom2Nix {
+ pname = "git-blame-nvim";
+ version = "2021-02-20";
+ src = fetchFromGitHub {
+ owner = "f-person";
+ repo = "git-blame.nvim";
+ rev = "0ae9a1bd371b92e666c55b64447d8f75d5c7665a";
+ sha256 = "0i9gwpi00mn9mn20v8qz4q8v1dq79vq7f2i5f8ssnrgprqmc87zr";
+ };
+ meta.homepage = "https://github.com/f-person/git-blame.nvim/";
+ };
+
git-messenger-vim = buildVimPluginFrom2Nix {
pname = "git-messenger-vim";
version = "2021-02-28";
@@ -1631,12 +1643,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
- version = "2021-03-10";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "6f282d9e99e04780d645e0133c4376486bd16c23";
- sha256 = "0jy682lmafxpippsrd63r46dda5a96vrd1filj1b5xqniqwk4mrz";
+ rev = "89e8320d58b0a2aba32aca576510e4f08d27ae07";
+ sha256 = "1yd6jfakykl467m2glvy3alw7jw461jwgnnvfh47fy2a375rwy65";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -1799,12 +1811,12 @@ let
hop-nvim = buildVimPluginFrom2Nix {
pname = "hop-nvim";
- version = "2021-03-06";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "phaazon";
repo = "hop.nvim";
- rev = "b3224bc6231a6a3543390cdfab4e4226dbfe40a7";
- sha256 = "165csrpk2mq685i13kyf7w935al1qwgqd2myyn2gnznbfpbnlcw1";
+ rev = "ac45488406e2a21735be80d634bf0c218bffddd2";
+ sha256 = "1pzb1mw019wjx174jnaxnivblajrh00776jck7bdcn5rdpk2dmqs";
};
meta.homepage = "https://github.com/phaazon/hop.nvim/";
};
@@ -2064,12 +2076,12 @@ let
kotlin-vim = buildVimPluginFrom2Nix {
pname = "kotlin-vim";
- version = "2021-03-08";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "udalov";
repo = "kotlin-vim";
- rev = "4188c157147fa1f3104edac7f52b41c8f18c6d8b";
- sha256 = "18kb56lwn3xl0xq4h34hr3z3ja1phbjpaxk6281d38wkj8randk8";
+ rev = "4e94ec5d3c821daaeac40c4d243cb55d07924fd2";
+ sha256 = "1vj3pcxn1byggbfqv2k5m09cwpbsphivdbzpw8qs111hda0cv61s";
};
meta.homepage = "https://github.com/udalov/kotlin-vim/";
};
@@ -2232,12 +2244,12 @@ let
lightline-bufferline = buildVimPluginFrom2Nix {
pname = "lightline-bufferline";
- version = "2021-02-28";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "mengelbrecht";
repo = "lightline-bufferline";
- rev = "9cec4e2329324366801e1272305be907d141d77c";
- sha256 = "1xz36jrm3iql6xgznycwf8mxlaw05f788k4p9xbvcrh3i0zck1za";
+ rev = "f1feb5b3b9d1b13ccedae475e9346392e17895a4";
+ sha256 = "1wki7q6w6ld1lx792f62s8k72ikcdl6il3ybsxxlajmnj5mixvkg";
};
meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
};
@@ -2280,12 +2292,12 @@ let
lsp-status-nvim = buildVimPluginFrom2Nix {
pname = "lsp-status-nvim";
- version = "2021-02-14";
+ version = "2021-03-13";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "lsp-status.nvim";
- rev = "925acdab0886fe5f0752561ea49e95b9f02e09c7";
- sha256 = "0rd3gqgz573ll11wnw1r182siamc3cxqqf3cyhqznkiq7bw2g9xh";
+ rev = "0aaf6a68e8668c1baa724c0d31679ad12f27cd47";
+ sha256 = "08dlfm3f9qa4p77zznmgjrmx09yngpcfzmxmyc5z3gp51b6bbixb";
};
meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/";
};
@@ -2316,24 +2328,24 @@ let
lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim";
- version = "2021-03-10";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
- rev = "80c29017e9897280273473956009cc641a0b3709";
- sha256 = "1n08g56qiqq150hkihbwdnij5p1gipfddxh49vh8gs6jq7xk2vc5";
+ rev = "a89d3290ee259c5afca6eb32f236077aa91466f0";
+ sha256 = "0pm6069h1p84jj80jd8jyi0lb6s73qvrqg1hjks88cfgbq5p9ryy";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim";
- version = "2021-03-06";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
- rev = "332f488e2499d0f7a09276adcdd50995b348f7de";
- sha256 = "184csjlaizgd1fi7f3w6j67qvy1cg9sqiy5zjd1qy010bfl1cl46";
+ rev = "62cdc8ec983eb189cfab7481f49e6bf058ff52ac";
+ sha256 = "1p25mpg448abqy1bi568mqzbh75xvvfnf0rgsrfah2rlxz468f5a";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
@@ -2400,12 +2412,12 @@ let
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap-vim";
- version = "2021-03-05";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "wfxr";
repo = "minimap.vim";
- rev = "df3bef57602e9633151c9c4a0ab2b48f1c0d5abc";
- sha256 = "1v4k8nhss8asg2p5jdxkjaqg3z7w1byzxi62vl4k1wkzmp5afpnf";
+ rev = "98c598c4fd067735e16fc78a3d24be605c5d4588";
+ sha256 = "1mzbbfbayihlgd8xbj30vw0nbdyd6fd0wp4v5gnsgbdzfn63qda7";
};
meta.homepage = "https://github.com/wfxr/minimap.vim/";
};
@@ -2712,12 +2724,12 @@ let
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
- version = "2021-03-03";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
- rev = "974f8c51385710a1422e841372848308ca7e615b";
- sha256 = "1n0y4gsjbh4yc5b1smckzx7gy4kzavdp7dpaic03adf23akndm1i";
+ rev = "f60af4296507c453ea74b2557aac8eedd8a432b4";
+ sha256 = "1iby4h6wlkql7r8szahgjwpyzn8r0jh3yg9zdin3b21ywqld0jp0";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@@ -2940,12 +2952,12 @@ let
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
pname = "nvcode-color-schemes-vim";
- version = "2021-03-10";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "ChristianChiarulli";
repo = "nvcode-color-schemes.vim";
- rev = "497d8f8ddc4e7ed339c8afbbfe80fb6a57743297";
- sha256 = "012vnr7s7y3vv3n3fk10yxm7khwxnn7mjrkiixhrjq3lp4cai7xi";
+ rev = "8d26e7cfbc2cd8cdca19432d2048e8e01a751573";
+ sha256 = "007vi49s9la0w31wcikf233f43nkhfdk29dh6bha1z0wrrys20kj";
};
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
};
@@ -2976,12 +2988,12 @@ let
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
- version = "2021-03-08";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
- rev = "0e772b3ffb16ad1b712fe72c95b3b2bddc2c7ade";
- sha256 = "051nly6h78cmx79nppxi86jchdjn90l3q96fx4g99pkgivsbswad";
+ rev = "fae71d14f2cd61becc87bae223f0c3a6fb72245c";
+ sha256 = "054v62pp33kxfx9rcqh7dqa2glpi1fsm0z4gsh9nwf4y60hx0fhs";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
@@ -3000,12 +3012,12 @@ let
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
- version = "2021-03-09";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
- rev = "25170751944b64bb7b65af1e35772361485bc936";
- sha256 = "0vaw5g4iflc0k1xy51rhgn1kb4qzxdd92r5nhnwvbc3fr6xkn464";
+ rev = "f38ab64d66be371aae19495bc9880bd9232db7a8";
+ sha256 = "196nyan70mhh7p3fqdgnyy7hb5pbhg05gq8nlp8xaaas19ai6kqa";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@@ -3024,24 +3036,24 @@ let
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2021-03-04";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "9d2a8bf00b26c2acafdf921f3c81ee2283e5daff";
- sha256 = "1qma3cnh7hm81qpx1x8zx5qbqjh4m0c7n7x7622vs4c0698j9nqc";
+ rev = "492849bf57425d005c4a13ee2a5d6f3c8207cc02";
+ sha256 = "1jspnzkb9371jfkppj77f95zccbnyw6gn0i4jlqpbci2p0ppp0gz";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
nvim-dap-virtual-text = buildVimPluginFrom2Nix {
pname = "nvim-dap-virtual-text";
- version = "2021-01-31";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "nvim-dap-virtual-text";
- rev = "3da747bbbaf3291838d984a26a423cc704794eca";
- sha256 = "1lmcjclvdhd4jq0lsgrzv7y7ry9yiqh6bsinwrla5fbh63rfwkzc";
+ rev = "b26acb69a5a4940f9eb3fd6f4bca8e1cc16fa5ce";
+ sha256 = "16dkgmcfdx1n72khlwrcykwwpcjzz2mdh7dc53vb4j0pbmqmnna2";
};
meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
};
@@ -3072,12 +3084,12 @@ let
nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens";
- version = "2021-03-03";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-hlslens";
- rev = "3ce138f52ba5fb8731899bcee0323594bf0aa7a0";
- sha256 = "042x1s1xqv81ym1jblhpm6ak8nf6s9pax6g340nac639x34zm7bh";
+ rev = "3e975aaaf19af2c11535cfa99fd4765b9836a3fd";
+ sha256 = "1dw1mq461jl3vrq9n920j630sqdbs716lyqs75p94xxdw9rrdd04";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
};
@@ -3096,36 +3108,36 @@ let
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
- version = "2021-03-05";
+ version = "2021-03-12";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
- rev = "8ff60d5e91fe2a4c1dedc6685ef7722e8e7bce78";
- sha256 = "1gaw6pcvgw31dkdpni708l3kcyw3fv3fk05fn3cgs0sdn4xzmnkj";
+ rev = "de1fbbb64f57a5b770812ed0e8d515429f31f564";
+ sha256 = "08dbdmnl56yks8aqjszxi9qs0a47m92q2azhxgsri8566jsc3ny8";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
nvim-lightbulb = buildVimPluginFrom2Nix {
pname = "nvim-lightbulb";
- version = "2021-02-18";
+ version = "2021-03-13";
src = fetchFromGitHub {
owner = "kosayoda";
repo = "nvim-lightbulb";
- rev = "37d427ae1635da7800f7f09f831b35df1185ac38";
- sha256 = "012hd5xpcmmvgxrk6m7m28q288v485w7nzvnayfl4s3dk4jzq8rp";
+ rev = "9c3b264ae2da1d984f0482d5a0dfa43f567fa064";
+ sha256 = "0yjxmnn3a7fw0fjwfqk284zshlw8v7wp8pn16d5m40rvbkk2ipzr";
};
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
};
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2021-03-10";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "11a581d1860a7ad2b6c1ee1e0ebbb000e81b9950";
- sha256 = "0khbp05sgz07sazgkmv4pwrnnisswkagx4gwkw9slawm4qb1k93j";
+ rev = "73691999f77db352823c0e92e7cb083582127dd8";
+ sha256 = "14d3w6gjkvc1pjsj106w34k7qgp92b8gwd9l12rmci805i9l696m";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -3142,6 +3154,18 @@ let
meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/";
};
+ nvim-nonicons = buildVimPluginFrom2Nix {
+ pname = "nvim-nonicons";
+ version = "2021-03-15";
+ src = fetchFromGitHub {
+ owner = "yamatsum";
+ repo = "nvim-nonicons";
+ rev = "62af84ae39407d8afbd6bbc53cbca1167df476f3";
+ sha256 = "0jbdyixpr8s6q3wd6hncc78qvs0rswx1kgmvnv4sl2nzimbpzfkw";
+ };
+ meta.homepage = "https://github.com/yamatsum/nvim-nonicons/";
+ };
+
nvim-peekup = buildVimPluginFrom2Nix {
pname = "nvim-peekup";
version = "2021-03-06";
@@ -3156,12 +3180,12 @@ let
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
- version = "2021-03-09";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
- rev = "16c7c64872d4e6634cd5cf2d7db63474b2e8beda";
- sha256 = "15ig6x9xdl4gz9yvnhhxic106h03xxm95sd6kgmjpdpvibnv448n";
+ rev = "58612e2b4fb4406bad3c916651dd00580cf69a61";
+ sha256 = "162vvgarasbq9x6l5k2b85a0pq1jilswfj7d12wvjczw8w0h2x6r";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@@ -3180,36 +3204,36 @@ let
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
- version = "2021-03-09";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "31ef294d05e1feeb5eb9e8ff3895d09cc93d95e4";
- sha256 = "0vcgvwcibqq5j59nw09z2mc0gb79nyhiwnxny81h0m56mn2v9a6r";
+ rev = "4c46d2b1927590e1bba4ee4656a771e9941b2727";
+ sha256 = "1sjn6fnwc9k0nv2jz88m34g0nyf43knb9f1l53nj69inilxirhmy";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2021-03-10";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "3b8c2ea492917fcb3c0e88ad6682dbd355cc0644";
- sha256 = "083ysgl1xwlfm2ri54m4qr17rvm6a5al95ybzzff6av699v632rb";
+ rev = "df81a91ba9e6ae29a70e168b49e21dc1835c0948";
+ sha256 = "0b8bv36d3wg1qsnfmaa2cwinj196yqly9d9227a298xqdbfq083x";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
- version = "2021-03-10";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "romgrk";
repo = "nvim-treesitter-context";
- rev = "ff4955b250eebc320d32d6459297117004c68d3e";
- sha256 = "0qmhk6mdx00cf0vnz57n512ddifh08js7paxg9qsha374xqwq715";
+ rev = "91869ed307084836e45abcf63a4fc0aee66a2d6e";
+ sha256 = "0z8fxqhnmwldhjdx7z6yzlngisc8zjfsr9n76iz9c20brrazsp9k";
};
meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/";
};
@@ -3228,36 +3252,36 @@ let
nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects";
- version = "2021-03-05";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
- rev = "ffe8dbb0f6ab22ed746ef753535a849e3147d914";
- sha256 = "0bq3416v9wijcx1jw5nqvjgn8md9fr4hgnm7pnf16dyrpvmihf4m";
+ rev = "704f7cbdc464a0bdec2ebcaa5e8400c61bf6a4eb";
+ sha256 = "1a37s6cyk3w0cprrm10qn09165nmg1vddidh5rznl2h6rlxp6rn3";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
- version = "2021-02-12";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
- rev = "3557b7baa9e773fff378235851cb3caac96fd4b9";
- sha256 = "14bz6xwwdypwxfxdxhmbwl0w04ys18l08s1dx40mm5l1627wh465";
+ rev = "f4de826ac4cba3a355f10064d9c3957e8096a884";
+ sha256 = "0hzfiajl02rnhxyz84444jrnc5n6fx6gzkfr9vbvm95ap62bjawr";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
- version = "2021-02-17";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-web-devicons";
- rev = "b840a1f0fc35019998e6f09dfdd8dbb241764458";
- sha256 = "1q3a5ivlvk7ni5b9jxhymdrdssnxhisb6cq07rdwrh1kmfzv90yz";
+ rev = "1fb0962b8c4a217eec8166b03d683aa070115ed7";
+ sha256 = "1rqswcjqrg6ckp7vyzqlncfabkggnhjvp3b0sq7y2g333z925sjm";
};
meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";
};
@@ -3312,12 +3336,12 @@ let
one-nvim = buildVimPluginFrom2Nix {
pname = "one-nvim";
- version = "2021-02-17";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "Th3Whit3Wolf";
repo = "one-nvim";
- rev = "60970d279f5f2a82b1857601c63e6a51f9fd04de";
- sha256 = "1kmjq4kjlflhagasr3n2l47mmv739rwz9bqbzyyv5skxdkkp95lw";
+ rev = "a6fe11693bedb58a4ccf36491e6ce0e70772ff32";
+ sha256 = "04lxrawpkgvfsbd0v3q8ssv0r3x0czlar4q3b5lxm40dv1afz9mi";
};
meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/";
};
@@ -3372,12 +3396,12 @@ let
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
- version = "2021-03-08";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "6a169bec7d15d24c1d680fb75aa24a2921829442";
- sha256 = "01z192y61vls455hjp6im87mzbngyhpn78mpf80c445anpwpb0xf";
+ rev = "6d7be3232ed0dcbbd040bf92ba70b997fe4fd840";
+ sha256 = "0k1ydkplqpizyqn56bdwhpsdib384ikv2lqfmk8j11r7p6m0xvir";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -3468,12 +3492,12 @@ let
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim";
- version = "2021-03-10";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
- rev = "8f2babdd1bb76c2df0a1ef307bb9fe8477d13727";
- sha256 = "14c57pxhq4da8svi11rbzsg3rygcnly7cwjzzhpg2a9id1xxsppq";
+ rev = "2768ba75b32389a460273fab6f45575237b97bc2";
+ sha256 = "14l47j8j5idm170vk92j72ndmkkn0gqjp709yb1b731nsnz9wcjh";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@@ -3492,12 +3516,12 @@ let
popfix = buildVimPluginFrom2Nix {
pname = "popfix";
- version = "2021-02-08";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "RishabhRD";
repo = "popfix";
- rev = "efcd82cbae750aa743619bfae7453fbec9366b87";
- sha256 = "0041c9xnnhw24ablwqw9p9vlcmbfrp9l9r6i4ayh8id666ylsln9";
+ rev = "f3571e676739208871bd38f9fa0fddf554b6a7a8";
+ sha256 = "19hvwxcqca8l6dvlaccfvqc8755bpr0z0hi7l9qiw6rm458bhchi";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/RishabhRD/popfix/";
@@ -3841,12 +3865,12 @@ let
sideways-vim = buildVimPluginFrom2Nix {
pname = "sideways-vim";
- version = "2021-03-02";
+ version = "2021-03-12";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "sideways.vim";
- rev = "3a3210c8f1c4edf884a853631e641ea7c309cea0";
- sha256 = "04x1jfshk2j4mr7l9bybpk2q64ilgh1yf20qjw1fzdh5l395dv6q";
+ rev = "4de948c5fada3ce15a4fc29be8e075131986a199";
+ sha256 = "0gj5ij81kvaalz91hp7ipf9498j6ip5qd9a9an8f3fhfyhfzqv7q";
};
meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
};
@@ -3937,12 +3961,12 @@ let
SpaceCamp = buildVimPluginFrom2Nix {
pname = "SpaceCamp";
- version = "2020-05-14";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "jaredgorski";
repo = "SpaceCamp";
- rev = "23c7a3948cd1861150346762a002dc7fa196c616";
- sha256 = "1sbc9ivczkyfylhk1n4sm2sqzp8vddw03k0xb6z8k475n5vm8mvq";
+ rev = "ce034929763903937396cf6b2c9912eb209e6b39";
+ sha256 = "07a1441gccilbhnk99lz66nvaiv14vdn34ink3jjd27d2mkf3skb";
};
meta.homepage = "https://github.com/jaredgorski/SpaceCamp/";
};
@@ -4118,12 +4142,12 @@ let
syntastic = buildVimPluginFrom2Nix {
pname = "syntastic";
- version = "2021-01-04";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "vim-syntastic";
repo = "syntastic";
- rev = "d97a664b9adbd1a0a9cba6c1c3baf071a1059d1e";
- sha256 = "1azranlzdm1w98ifmczp1zx1w66yrpdi9h3k05v126rwaqkd6bsj";
+ rev = "f2ddb480c5afa1c0f155d78e6fc7853fd20f0420";
+ sha256 = "05ca80alkhnxj1klyy729y81g9ng2n841djxgd7zjg8cpkk94kw3";
};
meta.homepage = "https://github.com/vim-syntastic/syntastic/";
};
@@ -4214,12 +4238,12 @@ let
telescope-frecency-nvim = buildVimPluginFrom2Nix {
pname = "telescope-frecency-nvim";
- version = "2021-02-22";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-frecency.nvim";
- rev = "8b584bd88fbbeac0ce5c52af1ce7c1fecb7155b6";
- sha256 = "0a6sz6gx1qnr0ka9510mchca3b94553liw8ng386h60kh6lbc1k5";
+ rev = "926fbde059d6a7cefcccdd92b40fa866e073ba41";
+ sha256 = "100zi9ncz2b6hb5y9hxcsj5ra81kq8j2b4y8ck56y4yg96yi03pd";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
};
@@ -4251,12 +4275,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
- version = "2021-03-10";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "add7ee394350f268684cff03d844f32f255fec47";
- sha256 = "0rfrgfx9xm02cy4dy40n4j90561ymw1pyqzzw4fawpajm3hmxcfv";
+ rev = "284f38c57539967b25c7d32700acffd46599c49f";
+ sha256 = "14gbwm1184n0nkyhz9zcwd87l141swyrch9dhwwydgnd5m853842";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -4516,12 +4540,12 @@ let
vim-abolish = buildVimPluginFrom2Nix {
pname = "vim-abolish";
- version = "2020-10-30";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-abolish";
- rev = "68bc80c88617672fd41da7a6ace87d29cd3fe1e3";
- sha256 = "1cgaf8nhprm8sligmq4km2p374a2x08fg3isl1k0mac1iz9vz1z8";
+ rev = "2b866c8946b00b2e97bfe12bc2ca0b3d5e5b3276";
+ sha256 = "1k721a7wlrdjnmnfj83v40jxcl8g7la5f15g345b6g3ix1w5yhjr";
};
meta.homepage = "https://github.com/tpope/vim-abolish/";
};
@@ -5044,12 +5068,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2021-03-10";
+ version = "2021-03-13";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "c558950fa5e1aaa9fe4652b37380fffb762fdd09";
- sha256 = "0z0k1596a2wj1ynr4jbh0s53drrkmx1r4ff0ji7scx1jihxpfjqp";
+ rev = "b7b1d078f4556a6829400185bbfb47be171e6828";
+ sha256 = "1vncq3ypp5x3v9vq90zwg12ih45nph6g5mrl0xh2m82llqsp5r7c";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -5186,6 +5210,18 @@ let
meta.homepage = "https://github.com/tpope/vim-commentary/";
};
+ vim-concourse = buildVimPluginFrom2Nix {
+ pname = "vim-concourse";
+ version = "2016-11-21";
+ src = fetchFromGitHub {
+ owner = "luan";
+ repo = "vim-concourse";
+ rev = "7f61ca5d291fddd6d7ff04b03bf347f04bfe4344";
+ sha256 = "0ilf7r0lwx8f7shqxbs9av3gsnary8nbh3xhrfzwsivh8psi7qf6";
+ };
+ meta.homepage = "https://github.com/luan/vim-concourse/";
+ };
+
vim-cool = buildVimPluginFrom2Nix {
pname = "vim-cool";
version = "2020-04-18";
@@ -5284,12 +5320,12 @@ let
vim-dadbod = buildVimPluginFrom2Nix {
pname = "vim-dadbod";
- version = "2021-03-10";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-dadbod";
- rev = "c1f00249cb47dae2457ae8b748284620b622e642";
- sha256 = "0s4srsnxqw0g5k75cqcy709x7jqipsfsvhsic2cj0b0y8m49wqzz";
+ rev = "fc44257bc9f5e41de0f01ff2d1e3907052307463";
+ sha256 = "0mcw8hq5by6k6rdldsn79a3ch2mlkd1ysan91571gr11gsv82k0v";
};
meta.homepage = "https://github.com/tpope/vim-dadbod/";
};
@@ -5690,6 +5726,18 @@ let
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
+ vim-flog = buildVimPluginFrom2Nix {
+ pname = "vim-flog";
+ version = "2021-03-16";
+ src = fetchFromGitHub {
+ owner = "rbong";
+ repo = "vim-flog";
+ rev = "904b964eb0f878e44f47d39898e72fc0b939756b";
+ sha256 = "07x8xafcvpg6dgxlvmf46gh7a9xvnrxj7i326q73g3yfh5xpma6c";
+ };
+ meta.homepage = "https://github.com/rbong/vim-flog/";
+ };
+
vim-flutter = buildVimPluginFrom2Nix {
pname = "vim-flutter";
version = "2020-09-14";
@@ -5728,12 +5776,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2021-03-10";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "753318ef83b685f32c6bda5ae5b65b7b239a29a7";
- sha256 = "0g3l1hb4nqwaz5hhagr6hy4nwv1n1qcwbak27s5sx9fbnsp6npaa";
+ rev = "3eb6f316c09553989e59bb3802da100a6fb7c091";
+ sha256 = "043vbbjaf04hza2bysiggl4bif4mf7pjvwkzbryq4mrwn0zs22y3";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -5776,12 +5824,12 @@ let
vim-git = buildVimPluginFrom2Nix {
pname = "vim-git";
- version = "2020-07-13";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-git";
- rev = "4be54a3e2e300a94f6f7dfa7a6ee9e81245c9886";
- sha256 = "1061l9igdywfbqgwpf2f25yby78phb512hjbyzvqz5l1p7dw1xyd";
+ rev = "0d2b79b7e74e9bd1d48ea91246f3cf3200328acd";
+ sha256 = "0bs7xnkrzni5pcvqfn80if9mlw7idi8g3lsllmgxgk3cjlhg7q19";
};
meta.homepage = "https://github.com/tpope/vim-git/";
};
@@ -5800,12 +5848,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2021-02-22";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "1283ec1670d1f4fce37213c5d66924088b2e730c";
- sha256 = "1h5jh38ihbyy95cm57ppb6m871010pk521ygss2drcriwnx4agd2";
+ rev = "64062dfe022885f6900ba016eb24faee22a72d26";
+ sha256 = "18cjabpm7icxjix58krvanzs1mmqaw80935n6wd3mnfxqj4qln8s";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@@ -5848,12 +5896,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2021-03-10";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "95c79dcdcbc7e8e9165fa7f4a6bf17c08a6bab05";
- sha256 = "0110jifwa485l42cjjf3bbrwiahwm1ddijh4jlybchghrx2b64r2";
+ rev = "fe66df2057a90ae38bd154035b0751f0f50e6752";
+ sha256 = "13hinmg92n19clgnl0dnlcdnw7zh53ag9hhk98xrd3g6sngjyvpm";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -5968,12 +6016,12 @@ let
vim-hcl = buildVimPluginFrom2Nix {
pname = "vim-hcl";
- version = "2021-02-16";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "jvirtanen";
repo = "vim-hcl";
- rev = "047a8643ce346d819ffbd1686fe3ac1a54e42a1e";
- sha256 = "1brwjgxxh8f1q2859lqgdn9jk8h3iip989yirii350kwqvv1wjk6";
+ rev = "92aa0081d0de6876bbbe3758e418d5b4eda3f14b";
+ sha256 = "0v9m83f62v9dqn3jks21vfs3l59rif1f6jsg3f01iknb8ghhwrpi";
};
meta.homepage = "https://github.com/jvirtanen/vim-hcl/";
};
@@ -6498,36 +6546,36 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
- version = "2021-02-28";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
- rev = "801572d71ad05683a4ef57c1d35305f566c09bf5";
- sha256 = "02qj2svrdhhazyr8id0crw1qk0030pivdna28xnm9l7v24g7h9hl";
+ rev = "4b3c07ccedecb101c75ff974e5d1526933f69e03";
+ sha256 = "09vcc0w9fvpz4bqzpfgpw0hvafx1p8pwy4wbrjkn55gg14j4k93i";
};
meta.homepage = "https://github.com/natebosch/vim-lsc/";
};
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2021-03-06";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "eb237a2cedf2c69a44543d2ffaee25470c53e29b";
- sha256 = "1aldjq32cpbd2gkxqvf6gqskyr4br9835vsap4sgjc2fgigmiyla";
+ rev = "8be2f495b8c5801131c8af87a9aa7a30be19ae33";
+ sha256 = "13whd8ydq1vls20nsmjvchbw7k48gdsqjf1508v3pndw1hgj2ps1";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
vim-lsp-cxx-highlight = buildVimPluginFrom2Nix {
pname = "vim-lsp-cxx-highlight";
- version = "2020-12-23";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "jackguo380";
repo = "vim-lsp-cxx-highlight";
- rev = "f42db17e0917e6011a1d3581c3a8f29efab8ed93";
- sha256 = "0n67ap7zi888xin7c7ag8sk7hjrzg36mlpg42rqfgx66k6dm0455";
+ rev = "00818f0d8b7c87d3a1ecd81cc4ff1ab782355c2b";
+ sha256 = "1pjricwcqsbw466anwcndhj97g6qbblk95jaa8yg3a2fs8gdz8iz";
};
meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/";
};
@@ -6595,12 +6643,12 @@ let
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
- version = "2021-03-03";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
- rev = "4f5619fd1ad2b1aa36536b332b058ef6a3387a85";
- sha256 = "0420fmdjbyi037ghs2g49zzxcpfb2vf6dnn3dk4xivl2af2jrr43";
+ rev = "5ce13cec884906819ef21be634b89b0693625b01";
+ sha256 = "0sgxnn9fjcr42hcmyib22vs7y11jxhzk4r99va7wwpsa5k6kn2yr";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@@ -6691,12 +6739,12 @@ let
vim-mucomplete = buildVimPluginFrom2Nix {
pname = "vim-mucomplete";
- version = "2020-11-15";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "lifepillar";
repo = "vim-mucomplete";
- rev = "80b13cbc30d258a4474b053fcdc6baaf199320a1";
- sha256 = "054g80n09mmxxlh8xaic29bn8bgn3clvv732rymljdyvbj1mlhwd";
+ rev = "83cd9b3775438faafc3475f9f9d5fbb8da4dfa5b";
+ sha256 = "1l8rdmy9i81zq2ck0zvlsmqs7hfqpcxa0b8psf5nw72mwhbvv1np";
};
meta.homepage = "https://github.com/lifepillar/vim-mucomplete/";
};
@@ -6967,12 +7015,12 @@ let
vim-pandoc = buildVimPluginFrom2Nix {
pname = "vim-pandoc";
- version = "2021-03-01";
+ version = "2021-03-10";
src = fetchFromGitHub {
owner = "vim-pandoc";
repo = "vim-pandoc";
- rev = "94b6a23b4c0fb3268408a38badd480d974b0919f";
- sha256 = "1dv33anir1pfnnbvj9alf4g13q58hdppry0hspy1d5kqsr5wfpix";
+ rev = "0d4b68eb7f63e43f963a119d60a3e29c2bb822e0";
+ sha256 = "0p7m75f7vqdm0nvg0p3nbzqnsd7wdvbsf3y2mzirdl7c0pbvphqp";
};
meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/";
};
@@ -7315,12 +7363,12 @@ let
vim-rails = buildVimPluginFrom2Nix {
pname = "vim-rails";
- version = "2020-09-29";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-rails";
- rev = "2c42236cf38c0842dd490095ffd6b1540cad2e29";
- sha256 = "0nhf4qd7dchrzjv2ijcddav72qb121c9jkkk06agsv23l9rb31pv";
+ rev = "ee53e8303be8a28234ea97109b4e1ce716f0f2ad";
+ sha256 = "0bjdhkw6ii3z310kjm06g7m03as001cgkzw082mb63kix7hh06x8";
};
meta.homepage = "https://github.com/tpope/vim-rails/";
};
@@ -7339,24 +7387,24 @@ let
vim-rhubarb = buildVimPluginFrom2Nix {
pname = "vim-rhubarb";
- version = "2021-02-11";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-rhubarb";
- rev = "964d48fd11db7c3a3246885993319d544c7c6fd5";
- sha256 = "09xpjd96xd0mkzfwyvinjhbza7xp6v66bdrxwkb0j0n1kgfgkx4l";
+ rev = "3d444b5b4f636408c239a59adb88ee13a56486e0";
+ sha256 = "084k5kz7l8hydw072gzjci3nhrfxymszzyk10s5qkq223986vhvv";
};
meta.homepage = "https://github.com/tpope/vim-rhubarb/";
};
vim-rooter = buildVimPluginFrom2Nix {
pname = "vim-rooter";
- version = "2021-03-01";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-rooter";
- rev = "67d51540a4b173d7c77bcf1db9742b3d50e4bf45";
- sha256 = "0a86qb39c5k1h2mi5qsn03zv598776gcvlsrkgw53f3g23xm6rk5";
+ rev = "544e701066c69bbeb45297d0285c2719e125440b";
+ sha256 = "0mj5zvfsi4n8qi8cq0h99j1zb11xmrpkm31ll4q1bm5mf57kbmxa";
};
meta.homepage = "https://github.com/airblade/vim-rooter/";
};
@@ -7627,12 +7675,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2021-03-09";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "d30f65105e1f73c63c92c22c4afbad51539f5744";
- sha256 = "05qbrdipxpzj7v0n4q3bj8p2sgl28jm952hy7gs76ma3p3g7mnrq";
+ rev = "a8ac81b8922ac621e7043813d98e69ad0ac265a4";
+ sha256 = "0gl77mnajzvmnxwnbzb5fqzzljb59lbfv23gzbz1h493gfm0f04n";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@@ -7699,12 +7747,12 @@ let
vim-startify = buildVimPluginFrom2Nix {
pname = "vim-startify";
- version = "2020-10-07";
+ version = "2021-03-13";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-startify";
- rev = "f2fc11844b234479d37bef37faa7ceb2aade788b";
- sha256 = "18n16hpkqadq18gpgppbr4s516jpc8qwd357vb2c7069q79kfx39";
+ rev = "d663f4db7a572f9a56c39ae17801a5a7eae81d20";
+ sha256 = "1lwpisz91hs7bjsvi4rjczi95s05kq0k241i8h3mblpsnpv8zm33";
};
meta.homepage = "https://github.com/mhinz/vim-startify/";
};
@@ -8024,12 +8072,12 @@ let
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
- version = "2021-03-09";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
- rev = "3f6ed5af76d45cf3d0e7f87cd927866f3640aa22";
- sha256 = "04m652dfwgr52ic2f206s0mq8z10dnaxb90xcywrfjgkdcjd6d10";
+ rev = "327944d0d7824e6de4dda33bc2b008708a6cb447";
+ sha256 = "16nsick3p5nj9vmi6h531l8lc5c6gy2c1zd83xbgav38x655kjws";
};
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
};
@@ -8072,12 +8120,12 @@ let
vim-twiggy = buildVimPluginFrom2Nix {
pname = "vim-twiggy";
- version = "2020-11-14";
+ version = "2021-03-11";
src = fetchFromGitHub {
owner = "sodapopcan";
repo = "vim-twiggy";
- rev = "305fa5ab43514b76b15a57596bc514c072b9cdda";
- sha256 = "1hn42fm9a2dvxwml17j5jvd8758s71dlipspn5vi9l545cg94jjf";
+ rev = "71ad5b657e7dc4e44758e45ccdd0be160cd87161";
+ sha256 = "17mi2fhw97xwgy9a7hyvvn1rmfxchh8xwrpv4x7v7v59pq7fcqi2";
};
meta.homepage = "https://github.com/sodapopcan/vim-twiggy/";
};
@@ -8108,12 +8156,12 @@ let
vim-vinegar = buildVimPluginFrom2Nix {
pname = "vim-vinegar";
- version = "2021-01-25";
+ version = "2021-03-16";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-vinegar";
- rev = "5f48edf4dcc130ae4a658541c0d6f72a558bc70d";
- sha256 = "195l6ly7ry8721rlkcp9103czvfcmqifbgbibdqdi3pjmaafrb9l";
+ rev = "b245f3ab4580eba27616a5ce06a56d5f791e67bd";
+ sha256 = "0lvqfa5drjzk3b877aldnjc9m4jnwlpxlvfvy8s81az92r69f13m";
};
meta.homepage = "https://github.com/tpope/vim-vinegar/";
};
@@ -8216,12 +8264,12 @@ let
vim-wayland-clipboard = buildVimPluginFrom2Nix {
pname = "vim-wayland-clipboard";
- version = "2021-02-17";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "jasonccox";
repo = "vim-wayland-clipboard";
- rev = "2dc05c0f556213068a9ddf37a8b9b2276deccf84";
- sha256 = "16x7dk1x9q8kzjcgapgb9hw8hm4w8v1g6pzpiz6ccsd0ab0jzf40";
+ rev = "1f7f05039c572fde082043915953a88b77c0ddb0";
+ sha256 = "0ihyfdvgiclmcric66nd54ha7ikf2c1pl1slbn4y6mkbxla02yv9";
};
meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/";
};
@@ -8408,14 +8456,14 @@ let
vimsence = buildVimPluginFrom2Nix {
pname = "vimsence";
- version = "2021-03-02";
+ version = "2021-03-12";
src = fetchFromGitHub {
- owner = "hugolgst";
+ owner = "vimsence";
repo = "vimsence";
- rev = "16ce1f653d3ae7b65506f7e35c3723aeea9f758f";
- sha256 = "0rnfmr8qk59dbdwd2jjjlkjwh82w58pmsm7p8b3lr2hhxz0z4sfd";
+ rev = "f04fc0d4c52c29bcf8b0a8bf06d1c10f15261fff";
+ sha256 = "17vc6vqlpqvf1nkvynvh6r9z88fvpxj488ys8y3hbkc9mx43x8lr";
};
- meta.homepage = "https://github.com/hugolgst/vimsence/";
+ meta.homepage = "https://github.com/vimsence/vimsence/";
};
vimshell-vim = buildVimPluginFrom2Nix {
@@ -8432,12 +8480,12 @@ let
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2021-03-05";
+ version = "2021-03-12";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "943ae6c7c9d0f256e444c3ddc5e876156335f997";
- sha256 = "0wfdb89iafpwazgg42wxq1fd5g99gyrmk95nzxvnws2a7fy5hi65";
+ rev = "af2670ef9a631d1719250f0abc71e844f10ec352";
+ sha256 = "1jw6bsc4ynjv76kdmi4y94qyysq93irw4gr6wnmix4mk9ljv15fs";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -8445,12 +8493,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2021-03-09";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "3af88f325e4784bd209df490dbf648a942326d57";
- sha256 = "0zqp4zvl8xqa0lsj6lwc4wlg0n3wknhfn1g1j2gbncgyiw38ax2l";
+ rev = "2bdee8f56ec224e65d18d55f9883b6f71b463fa9";
+ sha256 = "1nn2pfjfzwwdwg9bclps53gvixmpkd50bs1z6y53b6vfx61xdgn5";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@@ -8675,12 +8723,12 @@ let
zephyr-nvim = buildVimPluginFrom2Nix {
pname = "zephyr-nvim";
- version = "2021-03-06";
+ version = "2021-03-14";
src = fetchFromGitHub {
owner = "glepnir";
repo = "zephyr-nvim";
- rev = "a9b4a655b61aeb02229d54ff7cd22395a02a9ee7";
- sha256 = "1dxr4p1ikmqacjb0x9p0ndlcdg812yzqmk56c79dgllf0cr0l7hg";
+ rev = "979f78f024178c1e9aff6fbebc33d291f64b121d";
+ sha256 = "04vfx1axq157qbqj832i04wsd4xk0zwh5bzs4g71q4hxhqdvy678";
};
meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
};
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 1ee91987486..7a0df067f6c 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -731,7 +731,7 @@ self: super: {
libiconv
];
- cargoSha256 = "F+kIVnO7MBuaYRa2MPsD3eQ2d5W5VxHhxHKeo/ic6TE=";
+ cargoSha256 = "u1ryOhwDgRBQ32MBPkWHI6eU6yZqNAZfyKvckr6nvCY=";
};
in
''
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 2076e24423d..a8d58da8efa 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -106,7 +106,7 @@ eikenb/acp
elixir-editors/vim-elixir
elmcast/elm-vim
elzr/vim-json
-embark-theme/vim as embark-vim
+embark-theme/vim@main as embark-vim
embear/vim-localvimrc
enomsg/vim-haskellConcealPlus
enricobacis/vim-airline-clock
@@ -115,6 +115,7 @@ ervandew/supertab
esneider/YUNOcommit.vim
euclidianAce/BetterLua.vim
euclio/vim-markdown-composer
+f-person/git-blame.nvim
farmergreg/vim-lastplace
fatih/vim-go
fcpg/vim-osc52
@@ -177,7 +178,6 @@ hrsh7th/vim-vsnip
hrsh7th/vim-vsnip-integ
hsanson/vim-android
hsitz/VimOrganizer
-hugolgst/vimsence
iamcco/coc-spell-checker
ianks/vim-tsx
idanarye/vim-merginal
@@ -301,6 +301,7 @@ liuchengxu/vim-which-key
liuchengxu/vista.vim
LnL7/vim-nix
lotabout/skim.vim
+luan/vim-concourse
LucHermitte/lh-brackets
LucHermitte/lh-vim-lib
ludovicchabant/vim-gutentags
@@ -485,6 +486,7 @@ raghur/vim-ghost
Raimondi/delimitMate
rakr/vim-one
rbgrouleff/bclose.vim
+rbong/vim-flog
reedes/vim-pencil
reedes/vim-wordy
rhysd/committia.vim
@@ -689,6 +691,7 @@ Vimjas/vim-python-pep8-indent
vimlab/split-term.vim
vimoutliner/vimoutliner
vimpostor/vim-tpipeline
+vimsence/vimsence
vimwiki/vimwiki
vito-c/jq.vim
vmchale/ats-vim
@@ -716,6 +719,7 @@ xolox/vim-easytags
xolox/vim-misc
xuhdev/vim-latex-live-preview
Xuyuanp/nerdtree-git-plugin
+yamatsum/nvim-nonicons@main
ycm-core/YouCompleteMe
Yggdroot/indentLine
Yilin-Yang/vim-markbar
diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix
index e9aa706da2d..29ae1871ddb 100644
--- a/pkgs/os-specific/darwin/binutils/default.nix
+++ b/pkgs/os-specific/darwin/binutils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, binutils-unwrapped, cctools, llvm }:
+{ lib, stdenv, makeWrapper, binutils-unwrapped, cctools, llvm, clang-unwrapped }:
# Make sure both underlying packages claim to have prepended their binaries
# with the same targetPrefix.
@@ -49,8 +49,19 @@ stdenv.mkDerivation {
ln -sv "$path" "$dest_path"
done
done
+ ''
+ # On aarch64-darwin we must use clang, because "as" from cctools just doesn't
+ # handle the arch. Proxying calls to clang produces quite a bit of warnings,
+ # and using clang directly here is a better option than relying on cctools.
+ # On x86_64-darwin the Clang version is too old to support this mode.
+ + lib.optionalString stdenv.isAarch64 ''
+ rm $out/bin/as
+ makeWrapper "${clang-unwrapped}/bin/clang" "$out/bin/as" \
+ --add-flags "-x assembler -integrated-as -c"
'';
+ nativeBuildInputs = lib.optionals stdenv.isAarch64 [ makeWrapper ];
+
passthru = {
inherit targetPrefix;
};
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index bfa7783b6b8..24e23f2b7e9 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -91,13 +91,7 @@ let
self = stdenv.mkDerivation rec {
pname = "fwupd";
- # A regression is present in https://github.com/fwupd/fwupd/commit/fde4b1676a2c64e70bebd88f7720307c62635654
- # released with 1.5.6.
- # Fix for the regression: https://github.com/fwupd/fwupd/pull/2902
- # Maintainer says a new release is to be expected in a few days:
- # https://twitter.com/hughsient/status/1362476792297185289
- # In the mean time, please do not release 1.5.6 and go strait to 1.5.7
- version = "1.5.5";
+ version = "1.5.7";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@@ -106,7 +100,7 @@ let
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
- sha256 = "0c2m9qz1g7zxqc6w90w9hksf8y9hvlh0vyvx06q01x893j5hzxh6";
+ sha256 = "16isrrv6zhdgccbfnz7km5g1cnvfnip7aiidkfhf5dlnrnyb2sxh";
};
patches = [
@@ -189,6 +183,11 @@ let
"-Defi-libdir=${gnu-efi}/lib"
"-Defi-ldsdir=${gnu-efi}/lib"
"-Defi-includedir=${gnu-efi}/include/efi"
+ "-Defi_sbat_distro_id=nixos"
+ "-Defi_sbat_distro_summary=NixOS"
+ "-Defi_sbat_distro_pkgname=fwupd"
+ "-Defi_sbat_distro_version=${version}"
+ "-Defi_sbat_distro_url=https://search.nixos.org/packages?channel=unstable&show=fwupd&from=0&size=50&sort=relevance&query=fwupd"
"--localstatedir=/var"
"--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc"
@@ -236,6 +235,8 @@ let
contrib/get-version.py \
contrib/generate-version-script.py \
meson_post_install.sh \
+ plugins/uefi-capsule/efi/generate_sbat.py \
+ plugins/uefi-capsule/efi/generate_binary.py \
po/make-images \
po/make-images.sh \
po/test-deps
@@ -250,8 +251,8 @@ let
testFw = fetchFromGitHub {
owner = "fwupd";
repo = "fwupd-test-firmware";
- rev = "42b62c62dc85ecfb8e38099fe5de0625af87a722";
- sha256 = "XUpxE003DZSeLJMtyV5UN5CNHH89/nEVKpCbMStm91Q=";
+ rev = "c13bfb26cae5f4f115dd4e08f9f00b3cb9acc25e";
+ sha256 = "US81i7mtLEe85KdWz5r+fQTk61IhqjVkzykBaBPuKL4=";
};
in ''
# These files have weird licenses so they are shipped separately.
@@ -311,6 +312,7 @@ let
# DisabledPlugins key in fwupd/daemon.conf
defaultDisabledPlugins = [
"test"
+ "test_ble"
"invalid"
];
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 9fe7f62ae04..01158d9c4f0 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,32 +1,32 @@
{
"4.14": {
"extra": "-hardened1",
- "name": "linux-hardened-4.14.225-hardened1.patch",
- "sha256": "1khdxny8jzvvhax10xq5kpbnhwrhfs7cxhi9f3rg4fa6c139pjbl",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.225-hardened1/linux-hardened-4.14.225-hardened1.patch"
+ "name": "linux-hardened-4.14.226-hardened1.patch",
+ "sha256": "12h42fsr1sc2zgr1cb2ais0aivg4hpg9x4gc762r7cd4l40fyyg9",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.226-hardened1/linux-hardened-4.14.226-hardened1.patch"
},
"4.19": {
"extra": "-hardened1",
- "name": "linux-hardened-4.19.180-hardened1.patch",
- "sha256": "1wh01fwghgpbwkmndw5kkjbmav5iwmpk7g208jplhz6q6ymxfdbj",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.180-hardened1/linux-hardened-4.19.180-hardened1.patch"
+ "name": "linux-hardened-4.19.181-hardened1.patch",
+ "sha256": "13j15nwmnzl1s17403icrpx9cdpfpzb5y1pnl6zaj5wsnjda7k5d",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.181-hardened1/linux-hardened-4.19.181-hardened1.patch"
},
"5.10": {
"extra": "-hardened1",
- "name": "linux-hardened-5.10.23-hardened1.patch",
- "sha256": "16mll5ayg7j0zdxciqa9m17zxv6kdm7vn1kp6bsl89nc301fxssc",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.23-hardened1/linux-hardened-5.10.23-hardened1.patch"
+ "name": "linux-hardened-5.10.24-hardened1.patch",
+ "sha256": "0d2kwz01kgh43li6b76b7dhnx37hchzx99rk4h6jdz364272lh1p",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.24-hardened1/linux-hardened-5.10.24-hardened1.patch"
},
"5.11": {
"extra": "-hardened1",
- "name": "linux-hardened-5.11.6-hardened1.patch",
- "sha256": "0gl5irpqindz5d2pdhl0zzxx40xjqk591a20kyfjlnp3kjbg6nfj",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.6-hardened1/linux-hardened-5.11.6-hardened1.patch"
+ "name": "linux-hardened-5.11.7-hardened1.patch",
+ "sha256": "1d3rg722k796qh2zj97fyk30qak9i71yqy7mk2dpbmdpv0ksacax",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.7-hardened1/linux-hardened-5.11.7-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
- "name": "linux-hardened-5.4.105-hardened1.patch",
- "sha256": "1djp2cpsb6kgbz2xvix1p0hd7001qw5bnqigf4gz205pianbpakc",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.105-hardened1/linux-hardened-5.4.105-hardened1.patch"
+ "name": "linux-hardened-5.4.106-hardened1.patch",
+ "sha256": "1hg18p1n26am6y2i459jrpnkq06rv0f5hds1znnm7jw4f61k395f",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.106-hardened1/linux-hardened-5.4.106-hardened1.patch"
}
}
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 4c5dc968950..5052d3754b3 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.14.225";
+ version = "4.14.226";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "09kik0jbfpijb4kylayphr8r2qxx4rlgsnmq300wzcjhxw5yxy3c";
+ sha256 = "09llp8jl5xgxxzj0f2sfx32annwyz82k1zmgd26zy90lz0d09p3s";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 701e25c8ed2..53fb707ab2b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.19.180";
+ version = "4.19.181";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0pxvnyhbcmbbkdrqsrf5hhaz36x9l07s0xmzrmc4ipcdhdy5va0x";
+ sha256 = "1kd967azsq6w41ch8iwpv0i4yjkpijzn5avcipi1141dx4ryw62j";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 966db2b84e4..941a1dda9b9 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.261";
+ version = "4.4.262";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0d9j4j72n8fl3s93qm82cydwk8lvwhvl2357rcsai2vsk5l0k1mc";
+ sha256 = "0yz9qi4i46ndshxmb99kvv7lk6cbb09y7bzagq7sgvqaj4lwaw6j";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index f2f95ba3987..6d9bb6111dc 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.261";
+ version = "4.9.262";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0r5822mj2gk9s8rbc8bazg34y8bwr7svn3nbgcq57y2qch8nych4";
+ sha256 = "1zq77x9zf1wbk8n17rnblm5lfwlkin1xnxb3sxirwb9njm07cbmj";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 6ce16e67cd5..c415fc601c5 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.10.23";
+ version = "5.10.24";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0snvkrs95wbx611kcnap59whfiz6h6mzsnbwswk5py3gxh1irqpn";
+ sha256 = "0gvnplip90gvlzw9rm0cg66z54cfa82gk23icf5xdickb17d1p66";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.11.nix b/pkgs/os-specific/linux/kernel/linux-5.11.nix
index 00576d8d264..319ef0bfea2 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.11.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.11.6";
+ version = "5.11.7";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "02dcq7cqll5c39z8dh9f0xy68hh4a8jsab5k4n9calfldrm7jw79";
+ sha256 = "1cd87v6j8nk89pjqqsaviyzx9lj0d51j46n1in7cjlg18wng3da9";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 2c2bb15a5e8..8823e580883 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.4.105";
+ version = "5.4.106";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1dmq1zkr4idbbvh7wln5hn5sl4d0mcfm1af5bvsmsa44c78lqki4";
+ sha256 = "1ny8b69ngydh0iw53jwlmqlgv31wjhkybkgnqi5kv0n174n3p1yc";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 0740613bad7..7a2eb9fd2cd 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -11,13 +11,13 @@ assert withHyperscan -> stdenv.isx86_64;
stdenv.mkDerivation rec {
pname = "rspamd";
- version = "2.6";
+ version = "2.7";
src = fetchFromGitHub {
owner = "rspamd";
repo = "rspamd";
rev = version;
- sha256 = "0vwa7k2s2bkfb8w78z5izkd6ywjbzqysb0grls898y549hm8ii70";
+ sha256 = "sha256-LMLRDnKfGpApVsIvPNY2nxl+H5+qeVvwvwr3wdyyhjs=";
};
nativeBuildInputs = [ cmake pkg-config perl ];
diff --git a/pkgs/servers/mail/sympa/default.nix b/pkgs/servers/mail/sympa/default.nix
index 4bc969a851c..82d8d302659 100644
--- a/pkgs/servers/mail/sympa/default.nix
+++ b/pkgs/servers/mail/sympa/default.nix
@@ -12,7 +12,6 @@ let
DBI
DateTimeFormatMail
DateTimeTimeZone
- DigestMD5
Encode
FCGI
FileCopyRecursive
@@ -28,7 +27,6 @@ let
libintl_perl
MHonArc
- MIMEBase64
MIMECharset
MIMETools
MIMEEncWords
@@ -56,8 +54,8 @@ let
IOSocketSSL
MailDKIM
NetDNS
- NetLDAP
- NetSMTP
+ perlldap
+ libnet
SOAPLite
]);
in
diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix
index d6e79831329..e27167041c4 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@@ -14,7 +14,13 @@ buildGoModule rec {
vendorSha256 = null;
- subPackages = [ "..." ];
+ subPackages = [
+ # TODO split every executable into its own package
+ "cmd/loki"
+ "cmd/loki-canary"
+ "cmd/promtail"
+ "cmd/logcli"
+ ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = lib.optionals stdenv.isLinux [ systemd.dev ];
diff --git a/pkgs/servers/monitoring/prometheus/cups-exporter.nix b/pkgs/servers/monitoring/prometheus/cups-exporter.nix
deleted file mode 100644
index a02dab88a3a..00000000000
--- a/pkgs/servers/monitoring/prometheus/cups-exporter.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, fetchFromGitHub, python3Packages, nixosTests }:
-
-python3Packages.buildPythonApplication rec {
- pname = "prometheus-cups-exporter-unstable";
- version = "2019-03-17";
-
- format = "other";
-
- src = fetchFromGitHub {
- owner = "ThoreKr";
- repo = "cups_exporter";
- rev = "8fd1c2517e9878b7b7c73a450e5e546f437954a9";
- sha256 = "1cwk2gbw2svqjlzgwv5wqzhq7fxwrwsrr0kkbnqn4mfb0kq6pa8m";
- };
-
- propagatedBuildInputs = with python3Packages; [ prometheus_client pycups ];
-
- installPhase = ''
- mkdir -p $out/share/
- cp cups_exporter.py $out/share/
- '';
-
- fixupPhase = ''
- makeWrapper "${python3Packages.python.interpreter}" "$out/bin/prometheus-cups-exporter" \
- --set PYTHONPATH "$PYTHONPATH" \
- --add-flags "$out/share/cups_exporter.py"
- '';
-
- passthru.tests = { inherit (nixosTests.prometheus-exporters) cups; };
-
- meta = with lib; {
- description = "A simple prometheus exporter for cups implemented in python";
- homepage = "https://github.com/ThoreKr/cups_exporter";
- license = licenses.unfree;
- maintainers = [ maintainers.mmahut ];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix
index d24fe89cc48..06d7a954aa9 100644
--- a/pkgs/servers/nats-server/default.nix
+++ b/pkgs/servers/nats-server/default.nix
@@ -4,7 +4,7 @@ with lib;
buildGoPackage rec {
pname = "nats-server";
- version = "2.1.9";
+ version = "2.2.0";
goPackagePath = "github.com/nats-io/${pname}";
@@ -12,7 +12,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "nats-io";
repo = pname;
- sha256 = "0y92isca1dlvprik0lbiz8ny1w84svy4zn73brqhzrkxnqppcxi2";
+ sha256 = "sha256-CNCdJUug99a9yE8YxSk7/s1CIEYJd9n8Gahz+B3ZyjI=";
};
meta = {
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index 32c5a23a9a7..714cf517457 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -2,20 +2,20 @@
buildGoModule rec {
pname = "tailscale";
- version = "1.4.5";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
- sha256 = "sha256-PMBlvres95UIbd3uqZWPE3OzyrEAGEXit/Z7X1p46GY=";
+ sha256 = "07dzcqd98nsrdv72wp93q6f23mn3pfmpyyi61dx6c26w0j5n4r0p";
};
nativeBuildInputs = [ makeWrapper ];
CGO_ENABLED = 0;
- vendorSha256 = "sha256-WvojOnGQ/ssBkoQwIlOVsaEUJmi2ugqgtTAVKJg8Spk=";
+ vendorSha256 = "0wbw9pc0cv05bw2gsps3099zipwjj3r23vyf87qy6g21r08xrrm8";
doCheck = false;
diff --git a/pkgs/servers/web-apps/bookstack/composer-env.nix b/pkgs/servers/web-apps/bookstack/composer-env.nix
new file mode 100644
index 00000000000..b91be187f55
--- /dev/null
+++ b/pkgs/servers/web-apps/bookstack/composer-env.nix
@@ -0,0 +1,238 @@
+# This file originates from composer2nix
+
+{ stdenv, lib, writeTextFile, fetchurl, php, unzip, phpPackages }:
+
+let
+ inherit (phpPackages) composer;
+ buildZipPackage = { name, src }:
+ stdenv.mkDerivation {
+ inherit name src;
+ buildInputs = [ unzip ];
+ buildCommand = ''
+ unzip $src
+ baseDir=$(find . -type d -mindepth 1 -maxdepth 1)
+ cd $baseDir
+ mkdir -p $out
+ mv * $out
+ '';
+ };
+
+ buildPackage =
+ { name
+ , src
+ , packages ? {}
+ , devPackages ? {}
+ , buildInputs ? []
+ , symlinkDependencies ? false
+ , executable ? false
+ , removeComposerArtifacts ? false
+ , postInstall ? ""
+ , noDev ? false
+ , unpackPhase ? "true"
+ , buildPhase ? "true"
+ , ...}@args:
+
+ let
+ reconstructInstalled = writeTextFile {
+ name = "reconstructinstalled.php";
+ executable = true;
+ text = ''
+ #! ${php}/bin/php
+
+ '';
+ };
+
+ constructBin = writeTextFile {
+ name = "constructbin.php";
+ executable = true;
+ text = ''
+ #! ${php}/bin/php
+
+ '';
+ };
+
+ bundleDependencies = dependencies:
+ lib.concatMapStrings (dependencyName:
+ let
+ dependency = dependencies.${dependencyName};
+ in
+ ''
+ ${if dependency.targetDir == "" then ''
+ vendorDir="$(dirname ${dependencyName})"
+ mkdir -p "$vendorDir"
+ ${if symlinkDependencies then
+ ''ln -s "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"''
+ else
+ ''cp -av "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"''
+ }
+ '' else ''
+ namespaceDir="${dependencyName}/$(dirname "${dependency.targetDir}")"
+ mkdir -p "$namespaceDir"
+ ${if symlinkDependencies then
+ ''ln -s "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"''
+ else
+ ''cp -av "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"''
+ }
+ ''}
+ '') (builtins.attrNames dependencies);
+
+ extraArgs = removeAttrs args [ "name" "packages" "devPackages" "buildInputs" ];
+ in
+ stdenv.mkDerivation ({
+ name = "composer-${name}";
+ buildInputs = [ php composer ] ++ buildInputs;
+
+ inherit unpackPhase buildPhase;
+
+ installPhase = ''
+ ${if executable then ''
+ mkdir -p $out/share/php
+ cp -av $src $out/share/php/$name
+ chmod -R u+w $out/share/php/$name
+ cd $out/share/php/$name
+ '' else ''
+ cp -av $src $out
+ chmod -R u+w $out
+ cd $out
+ ''}
+
+ # Remove unwanted files
+ rm -f *.nix
+
+ export HOME=$TMPDIR
+
+ # Remove the provided vendor folder if it exists
+ rm -Rf vendor
+
+ # If there is no composer.lock file, compose a dummy file.
+ # Otherwise, composer attempts to download the package.json file from
+ # the registry which we do not want.
+ if [ ! -f composer.lock ]
+ then
+ cat > composer.lock < vendor/composer/installed.json
+
+ # Copy or symlink the provided dependencies
+ cd vendor
+ ${bundleDependencies packages}
+ ${lib.optionalString (!noDev) (bundleDependencies devPackages)}
+ cd ..
+
+ # Reconstruct autoload scripts
+ # We use the optimize feature because Nix packages cannot change after they have been built
+ # Using the dynamic loader for a Nix package is useless since there is nothing to dynamically reload.
+ composer dump-autoload --optimize ${lib.optionalString noDev "--no-dev"}
+
+ # Run the install step as a validation to confirm that everything works out as expected
+ composer install --optimize-autoloader ${lib.optionalString noDev "--no-dev"}
+
+ ${lib.optionalString executable ''
+ # Reconstruct the bin/ folder if we deploy an executable project
+ ${constructBin} composer.json
+ ln -s $(pwd)/vendor/bin $out/bin
+ ''}
+
+ ${lib.optionalString (!symlinkDependencies) ''
+ # Patch the shebangs if possible
+ if [ -d $(pwd)/vendor/bin ]
+ then
+ # Look for all executables in bin/
+ for i in $(pwd)/vendor/bin/*
+ do
+ # Look for their location
+ realFile=$(readlink -f "$i")
+
+ # Restore write permissions
+ chmod u+wx "$(dirname "$realFile")"
+ chmod u+w "$realFile"
+
+ # Patch shebang
+ sed -e "s|#!/usr/bin/php|#!${php}/bin/php|" \
+ -e "s|#!/usr/bin/env php|#!${php}/bin/php|" \
+ "$realFile" > tmp
+ mv tmp "$realFile"
+ chmod u+x "$realFile"
+ done
+ fi
+ ''}
+
+ if [ "$removeComposerArtifacts" = "1" ]
+ then
+ # Remove composer stuff
+ rm -f composer.json composer.lock
+ fi
+
+ # Execute post install hook
+ runHook postInstall
+ '';
+ } // extraArgs);
+in
+{
+ composer = lib.makeOverridable composer;
+ buildZipPackage = lib.makeOverridable buildZipPackage;
+ buildPackage = lib.makeOverridable buildPackage;
+}
diff --git a/pkgs/servers/web-apps/bookstack/composition.nix b/pkgs/servers/web-apps/bookstack/composition.nix
new file mode 100644
index 00000000000..0df6cdae4cf
--- /dev/null
+++ b/pkgs/servers/web-apps/bookstack/composition.nix
@@ -0,0 +1,13 @@
+{pkgs ? import {
+ inherit system;
+ }, system ? builtins.currentSystem, noDev ? false}:
+
+let
+ composerEnv = import ./composer-env.nix {
+ inherit (pkgs) stdenv lib writeTextFile fetchurl php unzip phpPackages;
+ };
+in
+import ./php-packages.nix {
+ inherit composerEnv noDev;
+ inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn;
+}
diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix
new file mode 100644
index 00000000000..9ab47ace6ad
--- /dev/null
+++ b/pkgs/servers/web-apps/bookstack/default.nix
@@ -0,0 +1,38 @@
+{ pkgs, system, lib, fetchFromGitHub, dataDir ? "/var/lib/bookstack" }:
+
+let
+ package = (import ./composition.nix {
+ inherit pkgs system;
+ noDev = true; # Disable development dependencies
+ }).overrideAttrs (attrs : {
+ installPhase = attrs.installPhase + ''
+ rm -R $out/storage $out/public/uploads
+ ln -s ${dataDir}/.env $out/.env
+ ln -s ${dataDir}/storage $out/storage
+ ln -s ${dataDir}/public/uploads $out/public/uploads
+ '';
+ });
+
+in package.override rec {
+ name = "bookstack";
+ version = "0.31.7";
+
+ src = fetchFromGitHub {
+ owner = "bookstackapp";
+ repo = name;
+ rev = "v${version}";
+ sha256 = "1jak6g2q4zbr0gxqj0bqhks687whmmw8ylzwm4saws7ikcxkwna4";
+ };
+
+ meta = with lib; {
+ description = "A platform to create documentation/wiki content built with PHP & Laravel";
+ longDescription = ''
+ A platform for storing and organising information and documentation.
+ Details for BookStack can be found on the official website at https://www.bookstackapp.com/.
+ '';
+ homepage = "https://www.bookstackapp.com/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ymarkus ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix
new file mode 100644
index 00000000000..5edd0b68e86
--- /dev/null
+++ b/pkgs/servers/web-apps/bookstack/php-packages.nix
@@ -0,0 +1,897 @@
+{composerEnv, fetchurl, fetchgit ? null, fetchhg ? null, fetchsvn ? null, noDev ? false}:
+
+let
+ packages = {
+ "aws/aws-sdk-php" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "aws-aws-sdk-php-3e6143f5c12986d727307d5d19d6aec21575d903";
+ src = fetchurl {
+ url = https://api.github.com/repos/aws/aws-sdk-php/zipball/3e6143f5c12986d727307d5d19d6aec21575d903;
+ sha256 = "16hbw8gqscbc3bcvnfdsll6x1653lq2s4dga3d5jbpczil3ws9yb";
+ };
+ };
+ };
+ "barryvdh/laravel-dompdf" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "barryvdh-laravel-dompdf-30310e0a675462bf2aa9d448c8dcbf57fbcc517d";
+ src = fetchurl {
+ url = https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/30310e0a675462bf2aa9d448c8dcbf57fbcc517d;
+ sha256 = "1fnan9b2g4xhqqvlfsn3alb4nx5jjlrapgiad2kca13b3gizv7zr";
+ };
+ };
+ };
+ "barryvdh/laravel-snappy" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "barryvdh-laravel-snappy-1903ab84171072b6bff8d98eb58d38b2c9aaf645";
+ src = fetchurl {
+ url = https://api.github.com/repos/barryvdh/laravel-snappy/zipball/1903ab84171072b6bff8d98eb58d38b2c9aaf645;
+ sha256 = "1awr5kwj482qsh5wpg0q44fjqi7a9q26ghcc9wp1n9zm97y0rx7a";
+ };
+ };
+ };
+ "doctrine/cache" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "doctrine-cache-13e3381b25847283a91948d04640543941309727";
+ src = fetchurl {
+ url = https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727;
+ sha256 = "088fxbpjssp8x95qr3ip2iynxrimimrby03xlsvp2254vcyx94c5";
+ };
+ };
+ };
+ "doctrine/dbal" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "doctrine-dbal-47433196b6390d14409a33885ee42b6208160643";
+ src = fetchurl {
+ url = https://api.github.com/repos/doctrine/dbal/zipball/47433196b6390d14409a33885ee42b6208160643;
+ sha256 = "0bcg9494hr31902zcmq5kk7ji78yxk074d5bd9chxn9q0xz4g2h8";
+ };
+ };
+ };
+ "doctrine/event-manager" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "doctrine-event-manager-41370af6a30faa9dc0368c4a6814d596e81aba7f";
+ src = fetchurl {
+ url = https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f;
+ sha256 = "0pn2aiwl4fvv6fcwar9alng2yrqy8bzc58n4bkp6y2jnpw5gp4m8";
+ };
+ };
+ };
+ "doctrine/inflector" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "doctrine-inflector-9cf661f4eb38f7c881cac67c75ea9b00bf97b210";
+ src = fetchurl {
+ url = https://api.github.com/repos/doctrine/inflector/zipball/9cf661f4eb38f7c881cac67c75ea9b00bf97b210;
+ sha256 = "0gkaw5aqkdppd7cz1n46kdms0bv8kzbnpjh75jnhv98p9fik7f24";
+ };
+ };
+ };
+ "doctrine/lexer" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "doctrine-lexer-e864bbf5904cb8f5bb334f99209b48018522f042";
+ src = fetchurl {
+ url = https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042;
+ sha256 = "11lg9fcy0crb8inklajhx3kyffdbx7xzdj8kwl21xsgq9nm9iwvv";
+ };
+ };
+ };
+ "dompdf/dompdf" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "dompdf-dompdf-db91d81866c69a42dad1d2926f61515a1e3f42c5";
+ src = fetchurl {
+ url = https://api.github.com/repos/dompdf/dompdf/zipball/db91d81866c69a42dad1d2926f61515a1e3f42c5;
+ sha256 = "10nsmaiqfk6wgv0l9wjsh7h8nigdfabygkhjk7wdbxdfvlvniddd";
+ };
+ };
+ };
+ "dragonmantank/cron-expression" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "dragonmantank-cron-expression-65b2d8ee1f10915efb3b55597da3404f096acba2";
+ src = fetchurl {
+ url = https://api.github.com/repos/dragonmantank/cron-expression/zipball/65b2d8ee1f10915efb3b55597da3404f096acba2;
+ sha256 = "07yqbhf6n4d818gvla60mgg23gichwiafd5ypd70w4b4dlbcxcpl";
+ };
+ };
+ };
+ "egulias/email-validator" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "egulias-email-validator-0dbf5d78455d4d6a41d186da50adc1122ec066f4";
+ src = fetchurl {
+ url = https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4;
+ sha256 = "00kwb8rhk1fq3a1i152xniipk3y907q1v5r3szqbkq5rz82dwbck";
+ };
+ };
+ };
+ "facade/flare-client-php" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "facade-flare-client-php-ef0f5bce23b30b32d98fd9bb49c6fa37b40eb546";
+ src = fetchurl {
+ url = https://api.github.com/repos/facade/flare-client-php/zipball/ef0f5bce23b30b32d98fd9bb49c6fa37b40eb546;
+ sha256 = "1car7k8zzkgib9wpi9lzw1dj9qgjak8s9dmiimxaigvb7q4bc5vk";
+ };
+ };
+ };
+ "facade/ignition" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "facade-ignition-b6aea4a99303d9d32afd486a285162a89af8a8a3";
+ src = fetchurl {
+ url = https://api.github.com/repos/facade/ignition/zipball/b6aea4a99303d9d32afd486a285162a89af8a8a3;
+ sha256 = "1dx6gf4qz6jf8hds3lyxs09zlr6ndl3d36212w2hr4b15ihmyszw";
+ };
+ };
+ };
+ "facade/ignition-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "facade-ignition-contracts-aeab1ce8b68b188a43e81758e750151ad7da796b";
+ src = fetchurl {
+ url = https://api.github.com/repos/facade/ignition-contracts/zipball/aeab1ce8b68b188a43e81758e750151ad7da796b;
+ sha256 = "0b5hv56758fh2y6fqbygwn94qgqwjan8d2s1i10m242x80h9jjiw";
+ };
+ };
+ };
+ "fideloper/proxy" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "fideloper-proxy-c073b2bd04d1c90e04dc1b787662b558dd65ade0";
+ src = fetchurl {
+ url = https://api.github.com/repos/fideloper/TrustedProxy/zipball/c073b2bd04d1c90e04dc1b787662b558dd65ade0;
+ sha256 = "05jzgjj4fy5p1smqj41b5qxj42zn0mnczvsaacni4fmq174mz4gy";
+ };
+ };
+ };
+ "filp/whoops" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "filp-whoops-df7933820090489623ce0be5e85c7e693638e536";
+ src = fetchurl {
+ url = https://api.github.com/repos/filp/whoops/zipball/df7933820090489623ce0be5e85c7e693638e536;
+ sha256 = "0azpv2r8hc9s5pbk9wh2qk52qzycsbvpijr8w68l311igpcj4f78";
+ };
+ };
+ };
+ "guzzlehttp/guzzle" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "guzzlehttp-guzzle-0aa74dfb41ae110835923ef10a9d803a22d50e79";
+ src = fetchurl {
+ url = https://api.github.com/repos/guzzle/guzzle/zipball/0aa74dfb41ae110835923ef10a9d803a22d50e79;
+ sha256 = "0gba1711dpi147fzi2ab2pg0k1g6zfanm5w5hf4c7w0b3h4ya5gj";
+ };
+ };
+ };
+ "guzzlehttp/promises" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "guzzlehttp-promises-60d379c243457e073cff02bc323a2a86cb355631";
+ src = fetchurl {
+ url = https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631;
+ sha256 = "0lvcr64bx9sb90qggxk7g7fsplz403gm3i8lnlcaifyjrlmdj5wb";
+ };
+ };
+ };
+ "guzzlehttp/psr7" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "guzzlehttp-psr7-53330f47520498c0ae1f61f7e2c90f55690c06a3";
+ src = fetchurl {
+ url = https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3;
+ sha256 = "0948mbbqn1xcz39diajhvlr9a7586vx3091kzx96m0z4ki3lhv7g";
+ };
+ };
+ };
+ "intervention/image" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "intervention-image-abbf18d5ab8367f96b3205ca3c89fb2fa598c69e";
+ src = fetchurl {
+ url = https://api.github.com/repos/Intervention/image/zipball/abbf18d5ab8367f96b3205ca3c89fb2fa598c69e;
+ sha256 = "1msfpr9bip69bmhg23ka2f43phgb6dq5z604j5psjh3xd86r6c5d";
+ };
+ };
+ };
+ "knplabs/knp-snappy" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "knplabs-knp-snappy-7bac60fb729147b7ccd8532c07df3f52a4afa8a4";
+ src = fetchurl {
+ url = https://api.github.com/repos/KnpLabs/snappy/zipball/7bac60fb729147b7ccd8532c07df3f52a4afa8a4;
+ sha256 = "0qbywknz3zwhk91yaqd5p6nf48hzk1zmyqgrc9nb9ys2v6wy6njz";
+ };
+ };
+ };
+ "laravel/framework" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "laravel-framework-d0e4731e92ca88f4a78fe9e0c2c426a3e8c063c8";
+ src = fetchurl {
+ url = https://api.github.com/repos/laravel/framework/zipball/d0e4731e92ca88f4a78fe9e0c2c426a3e8c063c8;
+ sha256 = "15zjpq6lbxs019vd0mm2nbfi91yyw40wsf5fl0jbw3s1ffvaq898";
+ };
+ };
+ };
+ "laravel/socialite" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "laravel-socialite-8d25d574b4f2005411c0b9cb527ef5e745c1b07d";
+ src = fetchurl {
+ url = https://api.github.com/repos/laravel/socialite/zipball/8d25d574b4f2005411c0b9cb527ef5e745c1b07d;
+ sha256 = "0ash56za1flniq9nnk3siyb8l0m2cjwn2n25315qfhmdgbxxjz68";
+ };
+ };
+ };
+ "league/commonmark" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "league-commonmark-11df9b36fd4f1d2b727a73bf14931d81373b9a54";
+ src = fetchurl {
+ url = https://api.github.com/repos/thephpleague/commonmark/zipball/11df9b36fd4f1d2b727a73bf14931d81373b9a54;
+ sha256 = "15chm1sa65b58b47am00ik03s2agnx49i8yww3mhqlijvbrjvxc3";
+ };
+ };
+ };
+ "league/flysystem" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "league-flysystem-9be3b16c877d477357c015cec057548cf9b2a14a";
+ src = fetchurl {
+ url = https://api.github.com/repos/thephpleague/flysystem/zipball/9be3b16c877d477357c015cec057548cf9b2a14a;
+ sha256 = "0mhlr6l75j58xwbadq30x58s67434195zlpdax6ix4nkr7fc907j";
+ };
+ };
+ };
+ "league/flysystem-aws-s3-v3" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "league-flysystem-aws-s3-v3-4e25cc0582a36a786c31115e419c6e40498f6972";
+ src = fetchurl {
+ url = https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972;
+ sha256 = "1q2vkgyaz7h6z3q0z3v3l5rsvhv4xc45prgzr214cgm656i2h1ab";
+ };
+ };
+ };
+ "league/mime-type-detection" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "league-mime-type-detection-3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3";
+ src = fetchurl {
+ url = https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3;
+ sha256 = "0pmq486v2nf6672y2z53cyb3mfrxcc8n7z2ilpzz9zkkf2yb990j";
+ };
+ };
+ };
+ "league/oauth1-client" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "league-oauth1-client-1e7e6be2dc543bf466236fb171e5b20e1b06aee6";
+ src = fetchurl {
+ url = https://api.github.com/repos/thephpleague/oauth1-client/zipball/1e7e6be2dc543bf466236fb171e5b20e1b06aee6;
+ sha256 = "1vmzvghl4c4k9vxza50k0w28hxm88vcrcdspqp7f3vmfg5c1zav2";
+ };
+ };
+ };
+ "monolog/monolog" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "monolog-monolog-1cb1cde8e8dd0f70cc0fe51354a59acad9302084";
+ src = fetchurl {
+ url = https://api.github.com/repos/Seldaek/monolog/zipball/1cb1cde8e8dd0f70cc0fe51354a59acad9302084;
+ sha256 = "1gymdiymwrjw25fjqapq3jlmf6wnp1h26ms74sckd70d53c4m52k";
+ };
+ };
+ };
+ "mtdowling/jmespath.php" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "mtdowling-jmespath.php-42dae2cbd13154083ca6d70099692fef8ca84bfb";
+ src = fetchurl {
+ url = https://api.github.com/repos/jmespath/jmespath.php/zipball/42dae2cbd13154083ca6d70099692fef8ca84bfb;
+ sha256 = "157pdx45dmkxwxyq8vdjfci24fw7kl3yc2gj1cifp9kaia7mwlkk";
+ };
+ };
+ };
+ "nesbot/carbon" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "nesbot-carbon-528783b188bdb853eb21239b1722831e0f000a8d";
+ src = fetchurl {
+ url = https://api.github.com/repos/briannesbitt/Carbon/zipball/528783b188bdb853eb21239b1722831e0f000a8d;
+ sha256 = "18pvfwjvclfj0mrgqvycgrbyx5jfcp1hks4yljc6mp66yxr787x4";
+ };
+ };
+ };
+ "nunomaduro/collision" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "nunomaduro-collision-f7c45764dfe4ba5f2618d265a6f1f9c72732e01d";
+ src = fetchurl {
+ url = https://api.github.com/repos/nunomaduro/collision/zipball/f7c45764dfe4ba5f2618d265a6f1f9c72732e01d;
+ sha256 = "1cazbjxl5rqw4cl783nrymhcvjhvwwwjswr5w0si1wfhmpvr349q";
+ };
+ };
+ };
+ "onelogin/php-saml" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "onelogin-php-saml-a7328b11887660ad248ea10952dd67a5aa73ba3b";
+ src = fetchurl {
+ url = https://api.github.com/repos/onelogin/php-saml/zipball/a7328b11887660ad248ea10952dd67a5aa73ba3b;
+ sha256 = "0ycj3n22k5i3h8p7gn0xff6a7smjypazl2k5qvyzg86fjr7s3vfv";
+ };
+ };
+ };
+ "opis/closure" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "opis-closure-943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5";
+ src = fetchurl {
+ url = https://api.github.com/repos/opis/closure/zipball/943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5;
+ sha256 = "0y47ldgzzv22c5dnsdzqmbrsicq6acjyba0119d3dc6wa3n7zqi6";
+ };
+ };
+ };
+ "paragonie/random_compat" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "paragonie-random_compat-84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95";
+ src = fetchurl {
+ url = https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95;
+ sha256 = "03nsccdvcb79l64b7lsmx0n8ldf5z3v8niqr7bpp6wg401qp9p09";
+ };
+ };
+ };
+ "phenx/php-font-lib" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "phenx-php-font-lib-ca6ad461f032145fff5971b5985e5af9e7fa88d8";
+ src = fetchurl {
+ url = https://api.github.com/repos/PhenX/php-font-lib/zipball/ca6ad461f032145fff5971b5985e5af9e7fa88d8;
+ sha256 = "0grirw04sfg38fd4h0yaks43s49cxr5bisrr4ligjig2q3rjai31";
+ };
+ };
+ };
+ "phenx/php-svg-lib" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "phenx-php-svg-lib-5fa61b65e612ce1ae15f69b3d223cb14ecc60e32";
+ src = fetchurl {
+ url = https://api.github.com/repos/PhenX/php-svg-lib/zipball/5fa61b65e612ce1ae15f69b3d223cb14ecc60e32;
+ sha256 = "1jbkn7wm82y6pbyb7gx989k4yaprsc7xpa49nn4ywscmkz7ckd5y";
+ };
+ };
+ };
+ "php-parallel-lint/php-console-color" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "php-parallel-lint-php-console-color-b6af326b2088f1ad3b264696c9fd590ec395b49e";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/b6af326b2088f1ad3b264696c9fd590ec395b49e;
+ sha256 = "030449mkpxs35y8dk336ls3bfdq3zjnxswnk5khlg45z5147cr3k";
+ };
+ };
+ };
+ "php-parallel-lint/php-console-highlighter" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "php-parallel-lint-php-console-highlighter-21bf002f077b177f056d8cb455c5ed573adfdbb8";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/21bf002f077b177f056d8cb455c5ed573adfdbb8;
+ sha256 = "013phmp5n6hp6mvlpbqbrih0zd8h7xc152dpzxxf49b0jczxh8y4";
+ };
+ };
+ };
+ "phpoption/phpoption" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "phpoption-phpoption-994ecccd8f3283ecf5ac33254543eb0ac946d525";
+ src = fetchurl {
+ url = https://api.github.com/repos/schmittjoh/php-option/zipball/994ecccd8f3283ecf5ac33254543eb0ac946d525;
+ sha256 = "1snrnfvqhnr5z9llf8kbqk9l97gfyp8gghmhi1ng8qx5xzv1anr7";
+ };
+ };
+ };
+ "predis/predis" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "predis-predis-9930e933c67446962997b05201c69c2319bf26de";
+ src = fetchurl {
+ url = https://api.github.com/repos/predis/predis/zipball/9930e933c67446962997b05201c69c2319bf26de;
+ sha256 = "0qnpiyv96gs8yzy3b1ba918yw1pv8bgzw7skcf3k40ffpxsmkxv6";
+ };
+ };
+ };
+ "psr/container" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "psr-container-b7ce3b176482dbbc1245ebf52b181af44c2cf55f";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f;
+ sha256 = "0rkz64vgwb0gfi09klvgay4qnw993l1dc03vyip7d7m2zxi6cy4j";
+ };
+ };
+ };
+ "psr/http-client" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "psr-http-client-2dfb5f6c5eff0e91e20e913f8c5452ed95b86621";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621;
+ sha256 = "0cmkifa3ji1r8kn3y1rwg81rh8g2crvnhbv2am6d688dzsbw967v";
+ };
+ };
+ };
+ "psr/http-message" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "psr-http-message-f6561bf28d520154e4b0ec72be95418abe6d9363";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363;
+ sha256 = "195dd67hva9bmr52iadr4kyp2gw2f5l51lplfiay2pv6l9y4cf45";
+ };
+ };
+ };
+ "psr/log" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "psr-log-0f73288fd15629204f9d42b7055f72dacbe811fc";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc;
+ sha256 = "1npi9ggl4qll4sdxz1xgp8779ia73gwlpjxbb1f1cpl1wn4s42r4";
+ };
+ };
+ };
+ "psr/simple-cache" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "psr-simple-cache-408d5eafb83c57f6365a3ca330ff23aa4a5fa39b";
+ src = fetchurl {
+ url = https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b;
+ sha256 = "1djgzclkamjxi9jy4m9ggfzgq1vqxaga2ip7l3cj88p7rwkzjxgw";
+ };
+ };
+ };
+ "ralouphie/getallheaders" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "ralouphie-getallheaders-120b605dfeb996808c31b6477290a714d356e822";
+ src = fetchurl {
+ url = https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822;
+ sha256 = "1bv7ndkkankrqlr2b4kw7qp3fl0dxi6bp26bnim6dnlhavd6a0gg";
+ };
+ };
+ };
+ "ramsey/uuid" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "ramsey-uuid-7e1633a6964b48589b142d60542f9ed31bd37a92";
+ src = fetchurl {
+ url = https://api.github.com/repos/ramsey/uuid/zipball/7e1633a6964b48589b142d60542f9ed31bd37a92;
+ sha256 = "0s6z2c8jvwjmxzy2kqmxqpz0val9i5r757mdwf2yc7qrwm6bwd15";
+ };
+ };
+ };
+ "robrichards/xmlseclibs" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "robrichards-xmlseclibs-f8f19e58f26cdb42c54b214ff8a820760292f8df";
+ src = fetchurl {
+ url = https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df;
+ sha256 = "01zlpm36rrdj310cfmiz2fnabszxd3fq80fa8x8j3f9ki7dvhh5y";
+ };
+ };
+ };
+ "sabberworm/php-css-parser" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "sabberworm-php-css-parser-d217848e1396ef962fb1997cf3e2421acba7f796";
+ src = fetchurl {
+ url = https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/d217848e1396ef962fb1997cf3e2421acba7f796;
+ sha256 = "17jkly8k02p54qa004spikakxis8syjw3vhwgrsi9g1cb4wsg3g9";
+ };
+ };
+ };
+ "scrivo/highlight.php" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "scrivo-highlight.php-44a3d4136edb5ad8551590bf90f437db80b2d466";
+ src = fetchurl {
+ url = https://api.github.com/repos/scrivo/highlight.php/zipball/44a3d4136edb5ad8551590bf90f437db80b2d466;
+ sha256 = "0p0bj3yqiaa917lgx4ycwic2qqlg3cxka2adhziqzhlq9jqhzi8r";
+ };
+ };
+ };
+ "socialiteproviders/discord" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-discord-c6eddeb07ace7473e82d02d4db852dfacf5ef574";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Discord/zipball/c6eddeb07ace7473e82d02d4db852dfacf5ef574;
+ sha256 = "1w8m7jmlsdk94cqckgd75mwblh3jj6j16w3g4hzysyms25g091xc";
+ };
+ };
+ };
+ "socialiteproviders/gitlab" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-gitlab-a8f67d3b02c9ee8c70c25c6728417c0eddcbbb9d";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/GitLab/zipball/a8f67d3b02c9ee8c70c25c6728417c0eddcbbb9d;
+ sha256 = "1blv2h69dmm0r0djz3h0l0cxkxmzd1fzgg13r3npxx7c80xjpw3a";
+ };
+ };
+ };
+ "socialiteproviders/manager" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-manager-0f5e82af0404df0080bdc5c105cef936c1711524";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Manager/zipball/0f5e82af0404df0080bdc5c105cef936c1711524;
+ sha256 = "0ppmln72khli94ylnsjarnhzkqzpkc32pn3zf3ljahm1yghccczx";
+ };
+ };
+ };
+ "socialiteproviders/microsoft-azure" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-microsoft-azure-7808764f777a01df88be9ca6b14d683e50aaf88a";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/7808764f777a01df88be9ca6b14d683e50aaf88a;
+ sha256 = "1lxsvb5pzqrm467a8737v98sgmsxs6mvxc683p19b2y30g4fyrlj";
+ };
+ };
+ };
+ "socialiteproviders/okta" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-okta-e3ef9f23c7d2f86b3b16a174b82333cf4e2459e8";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Okta/zipball/e3ef9f23c7d2f86b3b16a174b82333cf4e2459e8;
+ sha256 = "1a3anw5di5nqiabvqpmsjv5x0jasmsn4y876qsv77gazxja880ng";
+ };
+ };
+ };
+ "socialiteproviders/slack" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-slack-8efb25c71d98bedf4010a829d1e41ff9fe449bcc";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Slack/zipball/8efb25c71d98bedf4010a829d1e41ff9fe449bcc;
+ sha256 = "0ax3n4s1djidkhgvrcgv1qipv3k0fhfd0cvs273h6wh66bjniq66";
+ };
+ };
+ };
+ "socialiteproviders/twitch" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "socialiteproviders-twitch-7accf30ae7a3139b757b4ca8f34989c09a3dbee7";
+ src = fetchurl {
+ url = https://api.github.com/repos/SocialiteProviders/Twitch/zipball/7accf30ae7a3139b757b4ca8f34989c09a3dbee7;
+ sha256 = "089i4fwxb32zmbxib0544jfs48wzjyp7bsqss2bf2xx89dsrx4ah";
+ };
+ };
+ };
+ "ssddanbrown/htmldiff" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "ssddanbrown-htmldiff-f60d5cc278b60305ab980a6665f46117c5b589c0";
+ src = fetchurl {
+ url = https://api.github.com/repos/ssddanbrown/HtmlDiff/zipball/f60d5cc278b60305ab980a6665f46117c5b589c0;
+ sha256 = "12h3swr8rjf5w78kfgwzkf0zb59b4a8mjwf65fgcgvjg115wha9x";
+ };
+ };
+ };
+ "swiftmailer/swiftmailer" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "swiftmailer-swiftmailer-698a6a9f54d7eb321274de3ad19863802c879fb7";
+ src = fetchurl {
+ url = https://api.github.com/repos/swiftmailer/swiftmailer/zipball/698a6a9f54d7eb321274de3ad19863802c879fb7;
+ sha256 = "1zmyr6szxvbc77rs4q1cp7f3vzw1wfx9rbbj7x9s65gh37z9fd1w";
+ };
+ };
+ };
+ "symfony/console" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-console-24026c44fc37099fa145707fecd43672831b837a";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/console/zipball/24026c44fc37099fa145707fecd43672831b837a;
+ sha256 = "19c5yczwxk0965pdg7ka8sa8wsr569r6l725rj4y9sabfd6mg6jf";
+ };
+ };
+ };
+ "symfony/css-selector" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-css-selector-f907d3e53ecb2a5fad8609eb2f30525287a734c8";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/css-selector/zipball/f907d3e53ecb2a5fad8609eb2f30525287a734c8;
+ sha256 = "19yqy81psz2wh8gy2j3phywsgrw9sbcw83l8lbnxbk5khg8hw3nm";
+ };
+ };
+ };
+ "symfony/debug" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-debug-af4987aa4a5630e9615be9d9c3ed1b0f24ca449c";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/debug/zipball/af4987aa4a5630e9615be9d9c3ed1b0f24ca449c;
+ sha256 = "15y1bgdrzq3859ql37ymx4fsvd28kyck69ncm6zyg84q3fhd8i19";
+ };
+ };
+ };
+ "symfony/deprecation-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-deprecation-contracts-5fa56b4074d1ae755beb55617ddafe6f5d78f665";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665;
+ sha256 = "0ny59x0aaipqaj956wx7ak5f6d5rn90766swp5m18019v9cppg10";
+ };
+ };
+ };
+ "symfony/error-handler" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-error-handler-d603654eaeb713503bba3e308b9e748e5a6d3f2e";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/error-handler/zipball/d603654eaeb713503bba3e308b9e748e5a6d3f2e;
+ sha256 = "15xdk9bbyfdm8yf19jfb3zr1yaj0lprf9pmxgj630vbpbqkgsd8f";
+ };
+ };
+ };
+ "symfony/event-dispatcher" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-event-dispatcher-c352647244bd376bf7d31efbd5401f13f50dad0c";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/event-dispatcher/zipball/c352647244bd376bf7d31efbd5401f13f50dad0c;
+ sha256 = "1cxgn0y83i4qqx757kq96jadwwbc68h11snhvy175xvy8nvsmxkd";
+ };
+ };
+ };
+ "symfony/event-dispatcher-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-event-dispatcher-contracts-84e23fdcd2517bf37aecbd16967e83f0caee25a7";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7;
+ sha256 = "1pcfrlc0rg8vdnp23y3y1p5qzng5nxf5i2c36g9x9f480xrnc1fw";
+ };
+ };
+ };
+ "symfony/finder" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-finder-25d79cfccfc12e84e7a63a248c3f0720fdd92db6";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/finder/zipball/25d79cfccfc12e84e7a63a248c3f0720fdd92db6;
+ sha256 = "04fwddn12sj6vzr5xr4xd25m86cn4l15079490h3q3igprzvrqk8";
+ };
+ };
+ };
+ "symfony/http-client-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-http-client-contracts-41db680a15018f9c1d4b23516059633ce280ca33";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/http-client-contracts/zipball/41db680a15018f9c1d4b23516059633ce280ca33;
+ sha256 = "1iia9rpbri1whp2dw4qfhh90gmkdvxhgjwxi54q7wlnlhijgga81";
+ };
+ };
+ };
+ "symfony/http-foundation" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-http-foundation-8888741b633f6c3d1e572b7735ad2cae3e03f9c5";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/http-foundation/zipball/8888741b633f6c3d1e572b7735ad2cae3e03f9c5;
+ sha256 = "0qs389nxxqc6nwx5x6b9kz8ykdlhdx7k8k6nd2apppxpqalvk6sw";
+ };
+ };
+ };
+ "symfony/http-kernel" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-http-kernel-07ea794a327d7c8c5d76e3058fde9fec6a711cb4";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/http-kernel/zipball/07ea794a327d7c8c5d76e3058fde9fec6a711cb4;
+ sha256 = "0mnay6nn299ljjgaqqbk8kcl431wrzvzsqybvl648pf513mp9vy9";
+ };
+ };
+ };
+ "symfony/mime" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-mime-7dee6a43493f39b51ff6c5bb2bd576fe40a76c86";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/mime/zipball/7dee6a43493f39b51ff6c5bb2bd576fe40a76c86;
+ sha256 = "0931zsmnpx75b9b34a03l0sfp22mailaa2y5az3cgx9v0bkc0vka";
+ };
+ };
+ };
+ "symfony/polyfill-ctype" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-ctype-c6c942b1ac76c82448322025e084cadc56048b4e";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e;
+ sha256 = "0jpk859wx74vm03q5s9z25f4ak2138p2x5q3b587wvy8rq2m4pbd";
+ };
+ };
+ };
+ "symfony/polyfill-iconv" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-iconv-06fb361659649bcfd6a208a0f1fcaf4e827ad342";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342;
+ sha256 = "0glb56w5q4v2j629rkndp2c7v4mcs6xdl14nwaaxy85lr5w4ixnq";
+ };
+ };
+ };
+ "symfony/polyfill-intl-idn" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-intl-idn-2d63434d922daf7da8dd863e7907e67ee3031483";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483;
+ sha256 = "0sk592qrdb6dvk6v8msjva8p672qmhmnzkw1lw53gks0xrc20xjy";
+ };
+ };
+ };
+ "symfony/polyfill-intl-normalizer" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-intl-normalizer-43a0283138253ed1d48d352ab6d0bdb3f809f248";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248;
+ sha256 = "04irkl6aks8zyfy17ni164060liihfyraqm1fmpjbs5hq0b14sc9";
+ };
+ };
+ };
+ "symfony/polyfill-mbstring" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-mbstring-5232de97ee3b75b0360528dae24e73db49566ab1";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1;
+ sha256 = "1mm670fxj2x72a9mbkyzs3yifpp6glravq2ss438bags1xf6psz8";
+ };
+ };
+ };
+ "symfony/polyfill-php72" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-php72-cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9;
+ sha256 = "12dmz2n1b9pqqd758ja0c8h8h5dxdai5ik74iwvaxc5xn86a026b";
+ };
+ };
+ };
+ "symfony/polyfill-php73" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-php73-a678b42e92f86eca04b7fa4c0f6f19d097fb69e2";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2;
+ sha256 = "10rq2x2q9hsdzskrz0aml5qcji27ypxam324044fi24nl60fyzg0";
+ };
+ };
+ };
+ "symfony/polyfill-php80" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-polyfill-php80-dc3063ba22c2a1fd2f45ed856374d79114998f91";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91;
+ sha256 = "1mhfjibk7mqyzlqpz6jjpxpd93fnfw0nik140x3mq1d2blg5cbvd";
+ };
+ };
+ };
+ "symfony/process" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-process-7e950b6366d4da90292c2e7fa820b3c1842b965a";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/process/zipball/7e950b6366d4da90292c2e7fa820b3c1842b965a;
+ sha256 = "07ykgz5bjd45izf5n6jm2n27wcaa7aih2wlsiln1ffj9vqd6l1s4";
+ };
+ };
+ };
+ "symfony/routing" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-routing-87529f6e305c7acb162840d1ea57922038072425";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/routing/zipball/87529f6e305c7acb162840d1ea57922038072425;
+ sha256 = "0qrgacividsp7c61y03qh8lb4vj30g0mvljnm5k60h4zzdmivlgc";
+ };
+ };
+ };
+ "symfony/service-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-service-contracts-d15da7ba4957ffb8f1747218be9e1a121fd298a1";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1;
+ sha256 = "168iq1lp2r5qb5h8j0s17da09iaj2h5hrrdc9rw2p73hq8rvm1w2";
+ };
+ };
+ };
+ "symfony/translation" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-translation-e1d0c67167a553556d9f974b5fa79c2448df317a";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/translation/zipball/e1d0c67167a553556d9f974b5fa79c2448df317a;
+ sha256 = "1b6fj278i1wdf4l7py9n86lmhrqmzvjy7kapjpfkz03adn2ps127";
+ };
+ };
+ };
+ "symfony/translation-contracts" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-translation-contracts-e2eaa60b558f26a4b0354e1bbb25636efaaad105";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/translation-contracts/zipball/e2eaa60b558f26a4b0354e1bbb25636efaaad105;
+ sha256 = "1k26yvgk84rz6ja9ml6l6iwbbi68qsqnq2cpky044g9ymvlg8d5g";
+ };
+ };
+ };
+ "symfony/var-dumper" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "symfony-var-dumper-a1eab2f69906dc83c5ddba4632180260d0ab4f7f";
+ src = fetchurl {
+ url = https://api.github.com/repos/symfony/var-dumper/zipball/a1eab2f69906dc83c5ddba4632180260d0ab4f7f;
+ sha256 = "1yw12jbx6gf5mvg7jrr1v57ah3b2s4hflz2p1m98nayi4qhdp20m";
+ };
+ };
+ };
+ "tijsverkoyen/css-to-inline-styles" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "tijsverkoyen-css-to-inline-styles-b43b05cf43c1b6d849478965062b6ef73e223bb5";
+ src = fetchurl {
+ url = https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/b43b05cf43c1b6d849478965062b6ef73e223bb5;
+ sha256 = "0lc6jviz8faqxxs453dbqvfdmm6l2iczxla22v2r6xhakl58pf3w";
+ };
+ };
+ };
+ "vlucas/phpdotenv" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "vlucas-phpdotenv-5e679f7616db829358341e2d5cccbd18773bdab8";
+ src = fetchurl {
+ url = https://api.github.com/repos/vlucas/phpdotenv/zipball/5e679f7616db829358341e2d5cccbd18773bdab8;
+ sha256 = "05j5wj1hry30vaqna4a232gjlibp89ha3ibhy04x5lbm0c98b73q";
+ };
+ };
+ };
+ };
+ devPackages = {};
+in
+composerEnv.buildPackage {
+ inherit packages devPackages noDev;
+ name = "bookstack";
+ src = ./.;
+ executable = false;
+ symlinkDependencies = false;
+ meta = {
+ license = "MIT";
+ };
+}
diff --git a/pkgs/servers/web-apps/bookstack/update.sh b/pkgs/servers/web-apps/bookstack/update.sh
new file mode 100755
index 00000000000..f61a5110590
--- /dev/null
+++ b/pkgs/servers/web-apps/bookstack/update.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p nix curl jq nix-update
+
+# check if composer2nix is installed
+if ! command -v composer2nix &> /dev/null; then
+ echo "Please install composer2nix (https://github.com/svanderburg/composer2nix) to run this script."
+ exit 1
+fi
+
+CURRENT_VERSION=$(nix eval --raw '(with import ../../../.. {}; bookstack.version)')
+TARGET_VERSION_REMOTE=$(curl https://api.github.com/repos/bookstackapp/bookstack/releases/latest | jq -r ".tag_name")
+TARGET_VERSION=${TARGET_VERSION_REMOTE:1}
+BOOKSTACK=https://github.com/bookstackapp/bookstack/raw/$TARGET_VERSION_REMOTE
+SHA256=$(nix-prefetch-url --unpack "https://github.com/bookstackapp/bookstack/archive/v$TARGET_VERSION/bookstack.tar.gz")
+
+if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then
+ echo "bookstack is up-to-date: ${CURRENT_VERSION}"
+ exit 0
+fi
+
+curl -LO "$BOOKSTACK/composer.json"
+curl -LO "$BOOKSTACK/composer.lock"
+
+composer2nix --name "bookstack" \
+ --composition=composition.nix \
+ --no-dev
+rm composer.json composer.lock
+
+# change version number
+sed -e "s/version =.*;/version = \"$TARGET_VERSION\";/g" \
+ -e "s/sha256 =.*;/sha256 = \"$SHA256\";/g" \
+ -i ./default.nix
+
+# fix composer-env.nix
+sed -e "s/stdenv\.lib/lib/g" \
+ -e '3s/stdenv, writeTextFile/stdenv, lib, writeTextFile/' \
+ -i ./composer-env.nix
+
+# fix composition.nix
+sed -e '7s/stdenv writeTextFile/stdenv lib writeTextFile/' \
+ -i composition.nix
+
+# fix missing newline
+echo "" >> composition.nix
+echo "" >> php-packages.nix
+
+cd ../../../..
+nix-build -A bookstack
+
+exit $?
diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix
index b3fedf9bc5d..4a73c5770d2 100644
--- a/pkgs/servers/web-apps/sogo/default.nix
+++ b/pkgs/servers/web-apps/sogo/default.nix
@@ -1,4 +1,4 @@
-{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python2, lndir
+{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir
, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config }:
with lib; gnustep.stdenv.mkDerivation rec {
pname = "SOGo";
@@ -11,7 +11,7 @@ with lib; gnustep.stdenv.mkDerivation rec {
sha256 = "145hdlwnqds5zmpxbh4yainsbv5vy99ji93d6pl7xkbqwncfi80i";
};
- nativeBuildInputs = [ gnustep.make makeWrapper python2 ];
+ nativeBuildInputs = [ gnustep.make makeWrapper python3 ];
buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkg-config ]
++ optional (openldap != null) openldap;
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 581785beb7a..c467c04c3ff 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -131,7 +131,7 @@ let
fish = stdenv.mkDerivation rec {
pname = "fish";
- version = "3.2.0";
+ version = "3.2.1";
src = fetchurl {
# There are differences between the release tarball and the tarball GitHub
@@ -141,7 +141,7 @@ let
# --version`), as well as the local documentation for all builtins (and
# maybe other things).
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-TwKT7Z9qa3fkfUHvq+YvMxnobvyL+DzFhzMET7xvkhE=";
+ sha256 = "2OSfQJDTd43xfdgl5KKoAZIBVoJCPNndArZnXWXDr1s=";
};
# Fix FHS paths in tests
@@ -214,7 +214,7 @@ let
checkInputs = [
coreutils
- (python3.withPackages(ps: [ps.pexpect]))
+ (python3.withPackages (ps: [ ps.pexpect ]))
procps
];
diff --git a/pkgs/shells/fish/plugins/build-fish-plugin.nix b/pkgs/shells/fish/plugins/build-fish-plugin.nix
index a52c5746492..5bb4ffa243f 100644
--- a/pkgs/shells/fish/plugins/build-fish-plugin.nix
+++ b/pkgs/shells/fish/plugins/build-fish-plugin.nix
@@ -11,8 +11,6 @@ attrs@{
buildPhase ? ":",
preInstall ? "",
postInstall ? "",
- # name of the subdirectory in which to store the plugin
- installPath ? lib.getName pname,
checkInputs ? [],
# plugin packages to add to the vendor paths of the test fish shell
@@ -26,7 +24,15 @@ attrs@{
...
}:
-stdenv.mkDerivation (attrs // {
+let
+ # Do not pass attributes that are only relevant to buildFishPlugin to mkDerivation.
+ drvAttrs = builtins.removeAttrs attrs [
+ "checkPlugins"
+ "checkFunctionDirs"
+ ];
+in
+
+stdenv.mkDerivation (drvAttrs // {
inherit name;
inherit unpackPhase configurePhase buildPhase;
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 063d73fa3e3..6d5000e6f69 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
- version = "2021-03-13";
+ version = "2021-03-15";
pname = "oh-my-zsh";
- rev = "3bb5e97762ee764170cffa6cfd1d179a1ba92ff3";
+ rev = "95a06f3927a286db257dc99791b02caba757fe33";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
- sha256 = "0c9l2a318bmh8amazybwd6nqljymaz16q91xv0khs4agm8ib7qqa";
+ sha256 = "1w0g68rvw17jg085qj1g264dsii25gph6vpp6gpn8wby0972h7n0";
};
installPhase = ''
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 1d5abdc8b4a..7b68c877a6e 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -18,7 +18,7 @@ in rec {
bzip2_ = bzip2.override (args: { linkStatic = true; });
# Avoid messing with libkrb5 and libnghttp2.
- curl_ = curl.override (args: { gssSupport = false; http2Support = false; });
+ curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; });
build = stdenv.mkDerivation {
name = "stdenv-bootstrap-tools";
diff --git a/pkgs/test/cuda/cuda-library-samples/default.nix b/pkgs/test/cuda/cuda-library-samples/default.nix
new file mode 100644
index 00000000000..91095fbd3ac
--- /dev/null
+++ b/pkgs/test/cuda/cuda-library-samples/default.nix
@@ -0,0 +1,42 @@
+{ callPackage
+, cudatoolkit_10_1, cudatoolkit_10_2
+, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
+, cutensor_cudatoolkit_10_1, cutensor_cudatoolkit_10_2
+, cutensor_cudatoolkit_11_0, cutensor_cudatoolkit_11_1, cutensor_cudatoolkit_11_2
+}:
+
+rec {
+
+ cuda-library-samples_cudatoolkit_10_1 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_10_1;
+ cutensor_cudatoolkit = cutensor_cudatoolkit_10_1;
+ };
+
+ cuda-library-samples_cudatoolkit_10_2 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_10_2;
+ cutensor_cudatoolkit = cutensor_cudatoolkit_10_2;
+ };
+
+ cuda-library-samples_cudatoolkit_10 =
+ cuda-library-samples_cudatoolkit_10_2;
+
+ ##
+
+ cuda-library-samples_cudatoolkit_11_0 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_0;
+ cutensor_cudatoolkit = cutensor_cudatoolkit_11_0;
+ };
+
+ cuda-library-samples_cudatoolkit_11_1 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_1;
+ cutensor_cudatoolkit = cutensor_cudatoolkit_11_1;
+ };
+
+ cuda-library-samples_cudatoolkit_11_2 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_2;
+ cutensor_cudatoolkit = cutensor_cudatoolkit_11_2;
+ };
+
+ cuda-library-samples_cudatoolkit_11 =
+ cuda-library-samples_cudatoolkit_11_2;
+}
diff --git a/pkgs/test/cuda/cuda-library-samples/generic.nix b/pkgs/test/cuda/cuda-library-samples/generic.nix
new file mode 100644
index 00000000000..f1ce243bfa6
--- /dev/null
+++ b/pkgs/test/cuda/cuda-library-samples/generic.nix
@@ -0,0 +1,70 @@
+{ lib, stdenv, fetchFromGitHub
+, cmake, addOpenGLRunpath
+, cudatoolkit
+, cutensor_cudatoolkit
+}:
+
+let
+ rev = "5aab680905d853bce0dbad4c488e4f7e9f7b2302";
+ src = fetchFromGitHub {
+ owner = "NVIDIA";
+ repo = "CUDALibrarySamples";
+ inherit rev;
+ sha256 = "0gwgbkq05ygrfgg5hk07lmap7n7ampxv0ha1axrv8qb748ph81xs";
+ };
+ commonAttrs = {
+ version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version;
+ nativeBuildInputs = [ cmake addOpenGLRunpath ];
+ buildInputs = [ cudatoolkit ];
+ enableParallelBuilding = true;
+ postFixup = ''
+ for exe in $out/bin/*; do
+ addOpenGLRunpath $exe
+ done
+ '';
+ meta = {
+ description = "examples of using libraries using CUDA";
+ longDescription = ''
+ CUDA Library Samples contains examples demonstrating the use of
+ features in the math and image processing libraries cuBLAS, cuTENSOR,
+ cuSPARSE, cuSOLVER, cuFFT, cuRAND, NPP and nvJPEG.
+ '';
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ obsidian-systems-maintenance ];
+ };
+ };
+in
+
+{
+ cublas = stdenv.mkDerivation (commonAttrs // {
+ pname = "cuda-library-samples-cublas";
+
+ src = "${src}/cuBLASLt";
+ });
+
+ cusolver = stdenv.mkDerivation (commonAttrs // {
+ pname = "cuda-library-samples-cusolver";
+
+ src = "${src}/cuSOLVER";
+
+ sourceRoot = "cuSOLVER/gesv";
+ });
+
+ cutensor = stdenv.mkDerivation (commonAttrs // {
+ pname = "cuda-library-samples-cutensor";
+
+ src = "${src}/cuTENSOR";
+
+ cmakeFlags = [
+ "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${builtins.placeholder "out"}/bin"
+ ];
+
+ # CUTENSOR_ROOT is double escaped
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace "\''${CUTENSOR_ROOT}/include" "${cutensor_cudatoolkit.dev}/include"
+ '';
+
+ CUTENSOR_ROOT = cutensor_cudatoolkit;
+ });
+}
diff --git a/pkgs/test/cuda/cuda-samples/default.nix b/pkgs/test/cuda/cuda-samples/default.nix
new file mode 100644
index 00000000000..46d4d531690
--- /dev/null
+++ b/pkgs/test/cuda/cuda-samples/default.nix
@@ -0,0 +1,52 @@
+{ callPackage
+, cudatoolkit_9_2
+, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2
+, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
+}:
+
+rec {
+ cuda-samples_cudatoolkit_9_2 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_9_2;
+ sha256 = "1ydankhyigcg99h0rqnmz1z4vc0sl6p9s1s0hbdxh5l1sx9141j6";
+ };
+
+ cuda-samples_cudatoolkit_9 = cuda-samples_cudatoolkit_9_2;
+
+ ##
+
+ cuda-samples_cudatoolkit_10_0 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_10_0;
+ sha256 = "1zvh4xsdyc59m87brpcmssxsjlp9dkynh4asnkcmc3g94f53l0jw";
+ };
+
+ cuda-samples_cudatoolkit_10_1 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_10_1;
+ sha256 = "1s8ka0hznrni36ajhzf2gqpdrl8kd8fi047qijxks5l2abc093qd";
+ };
+
+ cuda-samples_cudatoolkit_10_2 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_10_2;
+ sha256 = "01p1innzgh9siacpld6nsqimj8jkg93rk4gj8q4crn62pa5vhd94";
+ };
+
+ cuda-samples_cudatoolkit_10 = cuda-samples_cudatoolkit_10_2;
+
+ ##
+
+ cuda-samples_cudatoolkit_11_0 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_0;
+ sha256 = "1n3vjc8c7zdig2xgl5fppavrphqzhdiv9m9nk6smh4f99fwi0705";
+ };
+
+ cuda-samples_cudatoolkit_11_1 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_1;
+ sha256 = "1kjixk50i8y1bkiwbdn5lkv342crvkmbvy1xl5j3lsa1ica21kwh";
+ };
+
+ cuda-samples_cudatoolkit_11_2 = callPackage ./generic.nix {
+ cudatoolkit = cudatoolkit_11_2;
+ sha256 = "1p1qjvfbm28l933mmnln02rqrf0cy9kbpsyb488d1haiqzvrazl1";
+ };
+
+ cuda-samples_cudatoolkit_11 = cuda-samples_cudatoolkit_11_2;
+}
diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix
new file mode 100644
index 00000000000..2e3dcc8891f
--- /dev/null
+++ b/pkgs/test/cuda/cuda-samples/generic.nix
@@ -0,0 +1,51 @@
+{ lib, stdenv, fetchFromGitHub
+, pkg-config, addOpenGLRunpath
+, sha256, cudatoolkit
+}:
+
+let
+ pname = "cuda-samples";
+ version = lib.versions.majorMinor cudatoolkit.version;
+in
+
+stdenv.mkDerivation {
+ inherit pname version;
+
+ src = fetchFromGitHub {
+ owner = "NVIDIA";
+ repo = pname;
+ rev = "v${version}";
+ inherit sha256;
+ };
+
+ nativeBuildInputs = [ pkg-config addOpenGLRunpath ];
+
+ buildInputs = [ cudatoolkit ];
+
+ enableParallelBuilding = true;
+
+ preConfigure = ''
+ export CUDA_PATH=${cudatoolkit}
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm755 -t $out/bin bin/${stdenv.hostPlatform.parsed.cpu.name}/${stdenv.hostPlatform.parsed.kernel.name}/release/*
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ for exe in $out/bin/*; do
+ addOpenGLRunpath $exe
+ done
+ '';
+
+ meta = {
+ description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit";
+ # CUDA itself is proprietary, but these sample apps are not.
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ obsidian-systems-maintenance ];
+ };
+}
diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix
new file mode 100644
index 00000000000..9e7eaf8036a
--- /dev/null
+++ b/pkgs/test/cuda/default.nix
@@ -0,0 +1,26 @@
+{ callPackage }:
+
+rec {
+ cuda-samplesPackages = callPackage ./cuda-samples { };
+ inherit (cuda-samplesPackages)
+ cuda-samples_cudatoolkit_9
+ cuda-samples_cudatoolkit_9_2
+ cuda-samples_cudatoolkit_10
+ cuda-samples_cudatoolkit_10_0
+ cuda-samples_cudatoolkit_10_1
+ cuda-samples_cudatoolkit_10_2
+ cuda-samples_cudatoolkit_11
+ cuda-samples_cudatoolkit_11_0
+ cuda-samples_cudatoolkit_11_1
+ cuda-samples_cudatoolkit_11_2;
+
+ cuda-library-samplesPackages = callPackage ./cuda-library-samples { };
+ inherit (cuda-library-samplesPackages)
+ cuda-library-samples_cudatoolkit_10
+ cuda-library-samples_cudatoolkit_10_1
+ cuda-library-samples_cudatoolkit_10_2
+ cuda-library-samples_cudatoolkit_11
+ cuda-library-samples_cudatoolkit_11_0
+ cuda-library-samples_cudatoolkit_11_1
+ cuda-library-samples_cudatoolkit_11_2;
+}
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index f45e981cff0..fa93ceb0721 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -47,5 +47,7 @@ with pkgs;
texlive = callPackage ./texlive {};
+ cuda = callPackage ./cuda { };
+
writers = callPackage ../build-support/writers/test.nix {};
}
diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix
index 34c17a7b518..591edff2add 100644
--- a/pkgs/tools/X11/alttab/default.nix
+++ b/pkgs/tools/X11/alttab/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, ronn, libpng, uthash
-, xorg }:
+{ lib, stdenv, coreutils, fetchFromGitHub, autoconf, automake, pkg-config, procps, ronn,
+libpng, uthash , which, xnee, xorg, python3Packages }:
stdenv.mkDerivation rec {
version = "1.6.0";
@@ -35,10 +35,22 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ doCheck = true;
+
+ checkInputs = [
+ coreutils
+ procps
+ python3Packages.xvfbwrapper
+ which
+ xnee
+ xorg.xeyes
+ xorg.xprop
+ ];
+
meta = with lib; {
homepage = "https://github.com/sagb/alttab";
description = "X11 window switcher designed for minimalistic window managers or standalone X11 session";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.sgraf ];
};
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 2a7d50ec6ff..58d87a033f6 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -28,11 +28,11 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli";
- version = "1.19.27"; # N.B: if you change this, change botocore and boto3 to a matching version too
+ version = "1.19.30"; # N.B: if you change this, change botocore and boto3 to a matching version too
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-xScwrjQaqPqssuFTUrTrLVRIUnnFp1OkHAjAA1MpcJU=";
+ sha256 = "sha256-XD0CwBTDUvCTSL7JrcQCAd8zq+Ve0zSDpfz0Vzi8oeM=";
};
# https://github.com/aws/aws-cli/issues/4837
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 1d585514f7e..1d70fa24fb5 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,18 +21,18 @@ let
sources = name: system: {
x86_64-darwin = {
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
- sha256 = "sha256-aHFwcynt4xQ0T1J+OTSxgttU9W3VFJAqCwmQSdVg8Fk=";
+ sha256 = "09jhcv0ysq37k06b4rw3f9w33spvkkxx7fydraikm3zzvy28l58x";
};
x86_64-linux = {
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
- sha256 = "sha256-MfldToK7ZfdWZiZnI1qKI1o/dSiUcysxzUkTYMVZ5u4=";
+ sha256 = "1971fz8cv69y7kvirgw9n0xr7z9b1yyh4y43mg10lvv3glx46xcy";
};
}.${system};
in stdenv.mkDerivation rec {
pname = "google-cloud-sdk";
- version = "328.0.0";
+ version = "332.0.0";
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
@@ -81,7 +81,8 @@ in stdenv.mkDerivation rec {
# setup bash completion
mkdir -p $out/share/bash-completion/completions
- mv $out/google-cloud-sdk/completion.bash.inc $out/share/bash-completion/completions/gcloud.inc
+ mv $out/google-cloud-sdk/completion.bash.inc $out/share/bash-completion/completions/gcloud
+ ln -s $out/share/bash-completion/completions/gcloud $out/share/bash-completion/completions/gsutil
# This directory contains compiled mac binaries. We used crcmod from
# nixpkgs instead.
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index 592f4cc7648..9a2d8e52fd9 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -39,8 +39,8 @@ python3.pkgs.buildPythonApplication rec {
doCheck = false;
meta = with lib; {
- homepage = "https://saltstack.com/";
- changelog = "https://docs.saltstack.com/en/latest/topics/releases/${version}.html";
+ homepage = "https://saltproject.io/";
+ changelog = "https://docs.saltproject.io/en/latest/topics/releases/${version}.html";
description = "Portable, distributed, remote execution and configuration management system";
maintainers = with maintainers; [ Flakebi ];
license = licenses.asl20;
diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix
index 16ae53d25b9..33d248ffde8 100644
--- a/pkgs/tools/admin/turbovnc/default.nix
+++ b/pkgs/tools/admin/turbovnc/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, nixosTests
# Dependencies
, cmake
@@ -101,6 +102,8 @@ stdenv.mkDerivation rec {
--prefix PATH : ${lib.makeBinPath [ openssh ]}
'';
+ passthru.tests.turbovnc-headless-server = nixosTests.turbovnc-headless-server;
+
meta = {
homepage = "https://turbovnc.org/";
license = lib.licenses.gpl2Plus;
diff --git a/pkgs/tools/archivers/rpm2targz/default.nix b/pkgs/tools/archivers/rpm2targz/default.nix
new file mode 100644
index 00000000000..ac5b132d7ab
--- /dev/null
+++ b/pkgs/tools/archivers/rpm2targz/default.nix
@@ -0,0 +1,55 @@
+{ bzip2
+, coreutils
+, cpio
+, fetchurl
+, gnutar
+, gzip
+, lib
+, stdenv
+, xz
+, zstd
+}:
+
+let
+ shdeps = [
+ bzip2
+ coreutils
+ cpio
+ gnutar
+ gzip
+ xz
+ zstd
+ ];
+
+in stdenv.mkDerivation rec {
+ pname = "rpm2targz";
+ version = "2021.03.16";
+
+ # git repo: https://gitweb.gentoo.org/proj/rpm2targz.git/
+ src = fetchurl {
+ url = "https://dev.gentoo.org/~vapier/dist/${pname}-${version}.tar.xz";
+ hash = "sha256-rcV+o9V2wWKznqSW2rA8xgnpQ02kpK4te6mYvLRC5vQ=";
+ };
+
+ buildInputs = shdeps;
+
+ postPatch = ''
+ substituteInPlace rpm2targz --replace "=\"rpmoffset\"" "=\"$out/bin/rpmoffset\""
+ # rpm2targz relies on the executable name
+ # to guess what compressor it should use
+ # this is more reliable than wrapProgram
+ sed -i -e '2iexport PATH="${lib.makeBinPath shdeps}"' rpm2targz
+ '';
+
+ preBuild = ''
+ makeFlagsArray+=(prefix=$out)
+ '';
+
+ meta = with lib; {
+ description = "Convert a .rpm file to a .tar.gz archive";
+ homepage = "http://slackware.com/config/packages.php";
+ license = licenses.bsd1;
+ maintainers = with maintainers; [ zseri ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/audio/essentia-extractor/default.nix b/pkgs/tools/audio/essentia-extractor/default.nix
index a02cca6a3d6..63ebbb0ffc0 100644
--- a/pkgs/tools/audio/essentia-extractor/default.nix
+++ b/pkgs/tools/audio/essentia-extractor/default.nix
@@ -14,13 +14,13 @@ let
arch = arch_table.${stdenv.system};
sha = sha_table.${stdenv.system};
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
pname = "essentia-extractor";
version = "2.1_beta2";
src = fetchurl {
- url =
- "ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz";
+ url = "ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz";
sha256 = sha;
};
diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix
index af4000dfa44..b90ab80befd 100644
--- a/pkgs/tools/audio/mpd-mpris/default.nix
+++ b/pkgs/tools/audio/mpd-mpris/default.nix
@@ -29,6 +29,6 @@ buildGoModule rec {
homepage = "https://github.com/natsukagami/mpd-mpris";
license = licenses.mit;
maintainers = with maintainers; [ doronbehar ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix
index 9df7ab7657f..26768747a46 100644
--- a/pkgs/tools/cd-dvd/cdi2iso/default.nix
+++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "cdi2iso";
@@ -9,9 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "0fj2fxhpr26z649m0ph71378c41ljflpyk89g87x8r1mc4rbq3kh";
};
+ postPatch = ''
+ substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
+ '';
+
installPhase = ''
- mkdir -p $out/bin/
- cp cdi2iso $out/bin/
+ mkdir -p $out/bin
+ cp cdi2iso $out/bin
'';
meta = with lib; {
@@ -19,6 +23,6 @@ stdenv.mkDerivation rec {
homepage = "https://sourceforge.net/projects/cdi2iso.berlios";
license = licenses.gpl2;
maintainers = with maintainers; [ hrdinka ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/tools/compression/dejsonlz4/default.nix
index 9e6f95aecb8..07b6a5979a4 100644
--- a/pkgs/tools/compression/dejsonlz4/default.nix
+++ b/pkgs/tools/compression/dejsonlz4/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildPhase = ''
- gcc -Wall -o dejsonlz4 src/dejsonlz4.c src/lz4.c
+ ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c
'';
installPhase = ''
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/avih/dejsonlz4";
license = licenses.bsd2;
maintainers = with maintainers; [ mt-caret ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/compression/zdelta/builder.sh b/pkgs/tools/compression/zdelta/builder.sh
deleted file mode 100644
index 03db413181d..00000000000
--- a/pkgs/tools/compression/zdelta/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-source $stdenv/setup
-
-installPhase() {
- mkdir -p $out/bin
- cp -p zdc zdu $out/bin
-}
-
-genericBuild
diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix
index 46760c91306..b30a43f33c1 100644
--- a/pkgs/tools/compression/zdelta/default.nix
+++ b/pkgs/tools/compression/zdelta/default.nix
@@ -1,16 +1,24 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "zdelta-2.1";
- builder = ./builder.sh;
+ pname = "zdelta";
+ version = "2.1";
+
src = fetchurl {
- url = "${meta.homepage}/downloads/${name}.tar.gz";
- sha256 = "0k6y0r9kv5qiglnr2j4a0yvfynjkvm0pyv8ly28j0pr3w6rbxrh3";
+ url = "https://web.archive.org/web/20160316212948/http://cis.poly.edu/zdelta/downloads/zdelta-2.1.tar.gz";
+ sha256 = "sha256-WiQKWxJkINIwRBcdiuVLMDiupQ8gOsiXOEZvHDa5iFg=";
};
+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp -p zdc zdu $out/bin
+ '';
+
meta = with lib; {
- homepage = "http://cis.poly.edu/zdelta";
- platforms = platforms.linux;
+ homepage = "https://web.archive.org/web/20160316212948/http://cis.poly.edu/zdelta/";
+ platforms = platforms.all;
license = licenses.zlib;
};
}
diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix
index 1552505701d..be9349daa27 100644
--- a/pkgs/tools/filesystems/catcli/default.nix
+++ b/pkgs/tools/filesystems/catcli/default.nix
@@ -25,6 +25,6 @@ buildPythonApplication rec {
homepage = "https://github.com/deadc0de6/catcli";
license = licenses.gpl3;
maintainers = with maintainers; [ petersjt014 ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/tools/filesystems/cpcfs/default.nix
index 2aa63208e00..a439e29358f 100644
--- a/pkgs/tools/filesystems/cpcfs/default.nix
+++ b/pkgs/tools/filesystems/cpcfs/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/derikz/cpcfs/" ;
license = licenses.bsd2;
maintainers = [ ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix
index 12a0af7ea4d..0b7ae339053 100644
--- a/pkgs/tools/filesystems/idsk/default.nix
+++ b/pkgs/tools/filesystems/idsk/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/cpcsdk/idsk" ;
license = licenses.mit;
maintainers = [ ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix
index 8052434ff0b..6910f458a17 100644
--- a/pkgs/tools/graphics/epstool/default.nix
+++ b/pkgs/tools/graphics/epstool/default.nix
@@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1pfgqbipwk36clhma2k365jkpvyy75ahswn8jczzys382jalpwgk";
};
+ makeFlags = [
+ "CC=${stdenv.cc.targetPrefix}cc"
+ "CLINK=${stdenv.cc.targetPrefix}cc"
+ "LINK=${stdenv.cc.targetPrefix}cc"
+ ];
+
installPhase = ''
make EPSTOOL_ROOT=$out install
'';
@@ -20,6 +26,6 @@ stdenv.mkDerivation rec {
homepage = "http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm";
license = licenses.gpl2;
maintainers = [ maintainers.asppsa ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix
index 6c9a8471051..977886e90ec 100644
--- a/pkgs/tools/graphics/graphviz/base.nix
+++ b/pkgs/tools/graphics/graphviz/base.nix
@@ -2,9 +2,7 @@
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex
, fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango
-, yacc, fetchpatch, xorg ? null, ApplicationServices ? null }:
-
-assert stdenv.isDarwin -> ApplicationServices != null;
+, yacc, fetchpatch, xorg ? null, ApplicationServices }:
let
inherit (lib) optional optionals optionalString;
diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix
index 8b79e3373a6..30848d7d0dc 100644
--- a/pkgs/tools/graphics/imgurbash2/default.nix
+++ b/pkgs/tools/graphics/imgurbash2/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A shell script that uploads images to imgur";
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = with maintainers; [ abbradar ];
homepage = "https://github.com/ram-on/imgurbash2";
};
diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix
index ae07d0ced2d..5fa2d263962 100644
--- a/pkgs/tools/graphics/nip2/default.nix
+++ b/pkgs/tools/graphics/nip2/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gnome2,
-fftw, gsl, goffice, libgsf }:
+{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gtk2
+, fftw, gsl, goffice, libgsf }:
stdenv.mkDerivation rec {
pname = "nip2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkg-config glib libxml2 flex bison vips
- gnome2.gtk fftw gsl goffice libgsf
+ gtk2 fftw gsl goffice libgsf
];
meta = with lib; {
diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix
index cb5a37527bf..19359698f02 100644
--- a/pkgs/tools/graphics/spirv-cross/default.nix
+++ b/pkgs/tools/graphics/spirv-cross/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
description = "A tool designed for parsing and converting SPIR-V to other shader languages";
homepage = "https://github.com/KhronosGroup/SPIRV-Cross";
changelog = "https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/${version}";
- platforms = platforms.linux;
+ platforms = platforms.all;
license = licenses.asl20;
maintainers = with maintainers; [ Flakebi ];
};
diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix
index dbba2193b14..9493df1c66c 100644
--- a/pkgs/tools/misc/abduco/default.nix
+++ b/pkgs/tools/misc/abduco/default.nix
@@ -1,23 +1,23 @@
{ lib, stdenv, fetchFromGitHub, writeText, conf ? null }:
-with lib;
-
stdenv.mkDerivation rec {
- name = "abduco-2018-05-16";
+ pname = "abduco";
+ version = "2020-04-30";
src = fetchFromGitHub {
owner = "martanne";
repo = "abduco";
- rev = "8f80aa8044d7ecf0e43a0294a09007d056b20e4c";
- sha256 = "0wqcif633nbgnznn46j0sng9l0wncppw1x1c42f75b4p9hrph203";
+ rev = "8c32909a159aaa9484c82b71f05b7a73321eb491";
+ sha256 = "0a3p8xljhpk7zh203s75248blfir15smgw5jmszwbmdpy4mqzd53";
};
- configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
- preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
+ preBuild = lib.optionalString (conf != null)
+ "cp ${writeText "config.def.h" conf} config.def.h";
+ installFlags = [ "install-completion" ];
CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
- meta = {
+ meta = with lib; {
homepage = "http://brain-dump.org/projects/abduco";
license = licenses.isc;
description = "Allows programs to be run independently from its controlling terminal";
diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix
index 7d8de2c1436..d446a2cf0af 100644
--- a/pkgs/tools/misc/apparix/default.nix
+++ b/pkgs/tools/misc/apparix/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
description = "Add directory bookmarks, distant listing, and distant editing to the command line";
maintainers = with maintainers; [ lethalman ];
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/bash_unit/default.nix b/pkgs/tools/misc/bash_unit/default.nix
index 2fd93cb33b9..7541281eeb6 100644
--- a/pkgs/tools/misc/bash_unit/default.nix
+++ b/pkgs/tools/misc/bash_unit/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Bash unit testing enterprise edition framework for professionals";
maintainers = with maintainers; [ pamplemousse ];
- platforms = platforms.linux;
+ platforms = platforms.all;
license = licenses.gpl3Plus;
};
}
diff --git a/pkgs/tools/misc/bbe/default.nix b/pkgs/tools/misc/bbe/default.nix
index fb62b8be894..5cd7326d7b1 100644
--- a/pkgs/tools/misc/bbe/default.nix
+++ b/pkgs/tools/misc/bbe/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
description = "A sed-like editor for binary files";
homepage = "http://bbe-.sourceforge.net/";
license = licenses.gpl2Plus;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = [ maintainers.hhm ];
};
}
diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix
index bc3bbc8276d..099ae294bec 100644
--- a/pkgs/tools/misc/bcunit/default.nix
+++ b/pkgs/tools/misc/bcunit/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.linphone.org/BC/public/bcunit";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ raskin jluttine ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/cicero-tui/default.nix b/pkgs/tools/misc/cicero-tui/default.nix
index e00ceb9517f..dfc79e208ac 100644
--- a/pkgs/tools/misc/cicero-tui/default.nix
+++ b/pkgs/tools/misc/cicero-tui/default.nix
@@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "cicero-tui";
- version = "0.1.4";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "eyeplum";
repo = "cicero-tui";
rev = "v${version}";
- sha256 = "1bz2y37qf9c3fxc73chb42rffdivp5krczhgd9rnwq5r6n6bdgq7";
+ sha256 = "sha256-TNNPTKLO5qjSeCxWb7bB4yV1J4Seu+tBKNs0Oav/pPE=";
};
nativeBuildInputs = [
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
freetype
];
- cargoSha256 = "04359gf9mirczqwh8jv3rf0cc4pp05r8ncqyz0n8r7x5qv77kgcp";
+ cargoSha256 = "sha256-kzU+i5DLmZULdJPURz10URE5sMUG6eQg0pCoEiyfgco=";
meta = with lib; {
description = "Unicode tool with a terminal user interface";
diff --git a/pkgs/tools/misc/fdtools/default.nix b/pkgs/tools/misc/fdtools/default.nix
index d096f903bd1..2a2f44d8182 100644
--- a/pkgs/tools/misc/fdtools/default.nix
+++ b/pkgs/tools/misc/fdtools/default.nix
@@ -23,6 +23,9 @@ in stdenv.mkDerivation {
sed -e 's|gcc|$CC|' \
conf-compile/defaults/host_link.sh \
> conf-compile/host_link.sh
+ sed -e 's|gcc|$CC|' \
+ conf-compile/defaults/host_compile.sh \
+ > conf-compile/host_compile.sh
echo "${skawarePackages.skalibs.lib}/lib/skalibs/sysdeps" \
> conf-compile/depend_skalibs_sysdeps
diff --git a/pkgs/tools/misc/git-fire/default.nix b/pkgs/tools/misc/git-fire/default.nix
index bba1bd65a54..15dc34cd526 100644
--- a/pkgs/tools/misc/git-fire/default.nix
+++ b/pkgs/tools/misc/git-fire/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
'';
homepage = "https://github.com/qw3rtman/git-fire";
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = [ maintainers.swflint ];
};
}
diff --git a/pkgs/tools/misc/ministat/default.nix b/pkgs/tools/misc/ministat/default.nix
index 68670599c1e..0cd3ff3a5c1 100644
--- a/pkgs/tools/misc/ministat/default.nix
+++ b/pkgs/tools/misc/ministat/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
homepage = "https://git.decadent.org.uk/gitweb/?p=ministat.git";
license = licenses.beerware;
maintainers = [ maintainers.dezgeg ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix
index 57e49c88745..93ef69ea2ea 100644
--- a/pkgs/tools/misc/sfeed/default.nix
+++ b/pkgs/tools/misc/sfeed/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.isc;
maintainers = [ maintainers.matthiasbeyer ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/tools/misc/shelldap/default.nix
index 18c5aea3dfd..c782b129200 100644
--- a/pkgs/tools/misc/shelldap/default.nix
+++ b/pkgs/tools/misc/shelldap/default.nix
@@ -6,7 +6,7 @@ perlPackages.buildPerlPackage rec {
url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz";
sha256 = "07gkvvxcgw3pgkfy8p9mmidakciaq1rsq5zhmdqd8zcwgqkrr24i";
};
- buildInputs = with perlPackages; [ perl YAMLSyck NetLDAP AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ];
+ buildInputs = with perlPackages; [ perl YAMLSyck perlldap AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ];
prePatch = ''
touch Makefile.PL
'';
diff --git a/pkgs/tools/misc/tea/default.nix b/pkgs/tools/misc/tea/default.nix
new file mode 100644
index 00000000000..06e54559db9
--- /dev/null
+++ b/pkgs/tools/misc/tea/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildGoModule, fetchgit }:
+
+buildGoModule rec {
+ pname = "tea";
+ version = "0.7.0";
+
+ src = fetchgit {
+ url = "https://gitea.com/gitea/tea";
+ rev = "v${version}";
+ sha256 = "sha256-Kq+A6YELfBJ04t7pPnX8Ulh4NSMFn3AHggplLD9J8MY=";
+ };
+
+ vendorSha256 = null;
+
+ meta = with lib; {
+ description = "Gitea official CLI client";
+ homepage = "https://gitea.com/gitea/tea";
+ license = licenses.mit;
+ maintainers = [ maintainers.j4m3s ];
+ };
+}
diff --git a/pkgs/tools/misc/usbview/default.nix b/pkgs/tools/misc/usbview/default.nix
new file mode 100644
index 00000000000..2f417ea86de
--- /dev/null
+++ b/pkgs/tools/misc/usbview/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, gtk3
+}:
+
+stdenv.mkDerivation rec {
+ pname = "usbview";
+ version = "2.0";
+
+ src = fetchFromGitHub {
+ owner = "gregkh";
+ repo = "usbview";
+ rev = "v${version}";
+ sha256 = "1cw5jjpidjn34rxdjslpdlj99k4dqaq1kz6mplv5hgjdddijvn5p";
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ ];
+
+ buildInputs = [
+ gtk3
+ ];
+
+ meta = with lib; {
+ description = "USB viewer for Linux";
+ license = licenses.gpl2Only;
+ homepage = "http://www.kroah.com/linux-usb/";
+ maintainers = with maintainers; [ shamilton ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix
index 1fbb85f0751..bbab2d64bb0 100644
--- a/pkgs/tools/misc/vimer/default.nix
+++ b/pkgs/tools/misc/vimer/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.mit;
maintainers = [ maintainers.matthiasbeyer ];
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 96a4b8e7fee..fc3b52878b5 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2021.03.03";
+ version = "2021.03.14";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "11z2v8mdii0bl13850mc6hgz80d0kgzb4hdxyikc3wa4jqfwrq7f";
+ sha256 = "1bh74f9q6dv17ah5x8zcxw03dq6jbh959xd39kw374cf9ifrgnd3";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix
index c28df461459..703af40864a 100644
--- a/pkgs/tools/networking/altermime/default.nix
+++ b/pkgs/tools/networking/altermime/default.nix
@@ -1,12 +1,11 @@
-{ lib, stdenv, fetchurl }:
+{ lib, gccStdenv, fetchurl }:
-stdenv.mkDerivation rec {
- baseName = "altermime";
- name = "${baseName}-${version}";
+gccStdenv.mkDerivation rec {
+ pname = "altermime";
version = "0.3.11";
src = fetchurl {
- url = "https://pldaniels.com/${baseName}/${name}.tar.gz";
+ url = "https://pldaniels.com/${pname}/${pname}-${version}.tar.gz";
sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7";
};
@@ -19,14 +18,14 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- sed -i Makefile -e "s@/usr/local@$out@"
- mkdir -p "$out/bin"
+ mkdir -p $out/bin
+ substituteInPlace Makefile --replace "/usr/local" "$out"
'';
meta = with lib; {
description = "MIME alteration tool";
maintainers = [ maintainers.raskin ];
- platforms = platforms.linux;
+ platforms = platforms.all;
license.fullName = "alterMIME LICENSE";
downloadPage = "https://pldaniels.com/altermime/";
};
diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix
index 3995fc295d1..7a7bb0ab517 100644
--- a/pkgs/tools/networking/assh/default.nix
+++ b/pkgs/tools/networking/assh/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "assh";
- version = "2.11.0";
+ version = "2.11.3";
src = fetchFromGitHub {
repo = "advanced-ssh-config";
owner = "moul";
rev = "v${version}";
- sha256 = "sha256-/StB5yee9sbkebuJt6JDI+bp52NG0bBhprzmdepL+ek=";
+ sha256 = "sha256-NH7Dmqsu7uRhKWGFHBnh5GGqsNFOijDxsc+ATt28jtY=";
};
vendorSha256 = "sha256-6OAsO7zWAgPfQWD9k+nYH7hnDDUlKIjTB61ivvoubn0=";
diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix
index 5964c9de3eb..af4ae7ed769 100644
--- a/pkgs/tools/networking/dd-agent/5.nix
+++ b/pkgs/tools/networking/dd-agent/5.nix
@@ -19,10 +19,9 @@ let
requests
websocket_client
ipaddress
- backports_ssl_match_hostname
docker_pycreds
uptime
- ];
+ ] ++ lib.optionals (self.pythonOlder "3.7") [ backports_ssl_match_hostname ];
# due to flake8
doCheck = false;
diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix
index d4255d46096..f1f8cd8b5e4 100644
--- a/pkgs/tools/networking/dhcping/default.nix
+++ b/pkgs/tools/networking/dhcping/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
'';
homepage = "http://www.mavetju.org/unix/general.php";
license = licenses.bsd2;
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix
index e4405670363..671a80e5780 100644
--- a/pkgs/tools/networking/dnsperf/default.nix
+++ b/pkgs/tools/networking/dnsperf/default.nix
@@ -1,17 +1,17 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, pkg-config
-, openssl, ldns
+, openssl, ldns, libck
}:
stdenv.mkDerivation rec {
pname = "dnsperf";
- version = "2.4.0";
+ version = "2.5.0";
# The same as the initial commit of the new GitHub repo (only readme changed).
src = fetchFromGitHub {
owner = "DNS-OARC";
repo = "dnsperf";
rev = "v${version}";
- sha256 = "0q7zmzhhx71v41wf6rhyvpil43ch4a9sx21x47wgcg362lca3cbz";
+ sha256 = "0wcjs512in9w36hbn4mffca02cn5df3s1x7zaj02qv8na5nqq11m";
};
outputs = [ "out" "man" "doc" ];
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [
openssl
ldns # optional for DDNS (but cheap anyway)
+ libck
];
doCheck = true;
diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix
index bc92d465699..375d0dc1625 100644
--- a/pkgs/tools/networking/frp/default.nix
+++ b/pkgs/tools/networking/frp/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "frp";
- version = "0.35.1";
+ version = "0.36.0";
src = fetchFromGitHub {
owner = "fatedier";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-QnD8Yo1GLlOuCnYgzAIGW8JQ5yihmAZGqDFJ412L+W0=";
+ sha256 = "sha256-5BwSRHqsCLAD/p8U0zblAhtkpzkPVzHvS4VaTAYNF9o=";
};
- vendorSha256 = "sha256-odZPXLn5la2x9QIlT3g7+Rxb9tXGhjTycEvJPUPbM2s=";
+ vendorSha256 = "sha256-Q4ZwCH/RTa8cLtSg06s1S790MdZLgfWOvaD+WAt/RBM=";
doCheck = false;
diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/tools/networking/httperf/default.nix
index f5c888dc4bb..ea567f10d48 100644
--- a/pkgs/tools/networking/httperf/default.nix
+++ b/pkgs/tools/networking/httperf/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/httperf/httperf";
maintainers = with maintainers; [ nand0p ];
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix
index dfb64134871..2ff2fd8daec 100644
--- a/pkgs/tools/networking/kapp/default.nix
+++ b/pkgs/tools/networking/kapp/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "kapp";
version = "0.36.0";
@@ -14,6 +14,15 @@ buildGoModule rec {
subPackages = [ "cmd/kapp" ];
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ for shell in bash fish zsh; do
+ $out/bin/kapp completion $shell > kapp.$shell
+ installShellCompletion kapp.$shell
+ done
+ '';
+
meta = with lib; {
description = "CLI tool that encourages Kubernetes users to manage bulk resources with an application abstraction for grouping";
homepage = "https://get-kapp.io";
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 3337a5bbb7d..dd5fa9cbed8 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -3,20 +3,17 @@
, pkg-config
, makeWrapper
, runtimeShell
-, iproute ? null
+, iproute
, lzo
, openssl
, pam
, useSystemd ? stdenv.isLinux
-, systemd ? null
-, util-linux ? null
+, systemd
+, util-linux
, pkcs11Support ? false
-, pkcs11helper ? null
+, pkcs11helper
}:
-assert useSystemd -> (systemd != null);
-assert pkcs11Support -> (pkcs11helper != null);
-
with lib;
let
# Check if the script needs to have other binaries wrapped when changing this.
diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix
index 852cd23360c..7515105948f 100644
--- a/pkgs/tools/networking/v2ray/default.nix
+++ b/pkgs/tools/networking/v2ray/default.nix
@@ -3,22 +3,22 @@
}:
let
- version = "4.35.1";
+ version = "4.36.2";
src = fetchFromGitHub {
owner = "v2fly";
repo = "v2ray-core";
rev = "v${version}";
- sha256 = "07fih1hnnv1a4aj6sb63408vqf10bgk74lhqqv63lvm7gaz73srd";
+ sha256 = "1gvzr4kq4klld8m0jv6mizgrx3xj6s2i69kl9vmh5n355bakb7kk";
};
- vendorSha256 = "sha256-+kI9p0lu4PbLe6jhWqTfRYXHFOOrKmY36LzdcQT9BWw=";
+ vendorSha256 = "sha256-8O0xUNIdu3W//LtwiMZlSs1wkpa6Jt+vFkTavz6TBKU=";
assets = {
# MIT licensed
"geoip.dat" = let
- geoipRev = "202103080146";
- geoipSha256 = "1qwmz5fxqqxcjw5jm9dvgpmbin2q69j9wdx4xv3pm8fc47wzx8w5";
+ geoipRev = "202103170314";
+ geoipSha256 = "147kajdhby92yxsvcpa6bpk11ilzvc4nj7rc0h84wp2f0y692kq2";
in fetchurl {
url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat";
sha256 = geoipSha256;
@@ -26,8 +26,8 @@ let
# MIT licensed
"geosite.dat" = let
- geositeRev = "20210308021214";
- geositeSha256 = "1fp787wlzdjn2gxx4zmqrqqzqcq4xd10pqx8q919fag0kkzdm23s";
+ geositeRev = "20210317031429";
+ geositeSha256 = "0nzd0ll0x7hv75cbh1i3kgmffasi002a8n3mjw22zywj71v2jwmz";
in fetchurl {
url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat";
sha256 = geositeSha256;
diff --git a/pkgs/tools/networking/v2ray/update.sh b/pkgs/tools/networking/v2ray/update.sh
index 3b3a9de7385..f645b8ea093 100755
--- a/pkgs/tools/networking/v2ray/update.sh
+++ b/pkgs/tools/networking/v2ray/update.sh
@@ -65,7 +65,7 @@ vendorSha256=$(
)
[[ "$vendorSha256" ]]
sed --in-place \
- -e "s/vendorSha256 = \".*\"/vendorSha256 = \"$vendorSha256\"/" \
+ -e "s#vendorSha256 = \".*\"#vendorSha256 = \"$vendorSha256\"#" \
"$version_nix"
echo "vendorSha256 updated" >&2
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 687c9d988fb..efb5b5c5b42 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -1,16 +1,15 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchzip
, nixosTests
-, iptables ? null
-, iproute ? null
-, makeWrapper ? null
-, openresolv ? null
-, procps ? null
-, wireguard-go ? null
+, iptables
+, iproute
+, makeWrapper
+, openresolv
+, procps
+, wireguard-go
}:
-with lib;
-
stdenv.mkDerivation rec {
pname = "wireguard-tools";
version = "1.0.20210315";
@@ -37,11 +36,11 @@ stdenv.mkDerivation rec {
postFixup = ''
substituteInPlace $out/lib/systemd/system/wg-quick@.service \
--replace /usr/bin $out/bin
- '' + optionalString stdenv.isLinux ''
+ '' + lib.optionalString stdenv.isLinux ''
for f in $out/bin/*; do
- wrapProgram $f --prefix PATH : ${makeBinPath [procps iproute iptables openresolv]}
+ wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute iptables openresolv ]}
done
- '' + optionalString stdenv.isDarwin ''
+ '' + lib.optionalString stdenv.isDarwin ''
for f in $out/bin/*; do
wrapProgram $f --prefix PATH : ${wireguard-go}/bin
done
@@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
tests = nixosTests.wireguard;
};
- meta = {
+ meta = with lib; {
description = "Tools for the WireGuard secure network tunnel";
downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
homepage = "https://www.wireguard.com/";
diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix
index 2d901103374..c41ef6836a7 100644
--- a/pkgs/tools/package-management/emplace/default.nix
+++ b/pkgs/tools/package-management/emplace/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "emplace";
- version = "1.2.2";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "tversteeg";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-68fOJlDuuVFqGHXojN/y0h8kcPwrg7F480UOr5zrjFg=";
+ sha256 = "sha256-02Pn5saPrw1PIFZXVSCgsnvo/78CdT17/rCtS9R9bvU=";
};
- cargoSha256 = "sha256-KZEtkD/6ygyvkeebdX70vB8n+B7JODWT2h63dUd5CoQ=";
+ cargoSha256 = "sha256-ety50v0jxm45fzzkR9c/rvpJn3mWQUvAOHcHSJTTSd4=";
meta = with lib; {
description = "Mirror installed software on multiple machines";
diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix
index f2df464a907..940086788af 100644
--- a/pkgs/tools/security/bettercap/default.nix
+++ b/pkgs/tools/security/bettercap/default.nix
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "bettercap";
- version = "2.29";
+ version = "2.30";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-hXYsFRYSyYKYJM4gS0Dyiia9aPA07GWSsp9doA0vYGI=";
+ sha256 = "sha256-Ge+fbNEWq+84LypUbNrnNMOxcDJb8rFlP/QUoE7yEds=";
};
- vendorSha256 = "sha256-yIvwYUK+4cnHFwvJS2seDa9vJ/2cQ10Q46hR8U0aSRE=";
+ vendorSha256 = "sha256-fApxHxdzEEc+M+U5f0271VgrkXTGkUD75BpDXpVYd5k=";
doCheck = false;
diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index 53127173f79..edec05272b9 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs
-, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
+, glib , libgee, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ autoconf automake intltool libtool vala glib encfs
- gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE
+ gtk3 libgnome-keyring libgee xorg.libSM xorg.libICE
wrapGAppsHook gobject-introspection ];
patches = [ ./makefile-mkdir.patch ];
diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix
index 2df24e63d89..dd915a36e47 100644
--- a/pkgs/tools/security/nuclei/default.nix
+++ b/pkgs/tools/security/nuclei/default.nix
@@ -1,25 +1,28 @@
-{ buildGoModule
+{ lib
+, buildGoModule
, fetchFromGitHub
-, lib
}:
buildGoModule rec {
pname = "nuclei";
- version = "2.2.0";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "projectdiscovery";
- repo = "nuclei";
+ repo = pname;
rev = "v${version}";
- sha256 = "0xrvza86aczlnb11x58fiqch5g0q6gvpxwsi5dq3akfi95gk3a3x";
+ sha256 = "sha256-NM/Ggd5MKctQKE0MNawyE+Xciuj9++6DXXkMrrpfkhA=";
};
- vendorSha256 = "1v3ax8l1lgp2vs50gsa2fhdd6bvyfdlkd118akrqmwxahyyyqycv";
+ vendorSha256 = "sha256-h+MuMfIKXgXzLU6hNMxfPXawic9UZrwzVlzjjRF7X3o=";
preBuild = ''
mv v2/* .
'';
+ # Test files are not part of the release tarball
+ doCheck = false;
+
meta = with lib; {
description = "Tool for configurable targeted scanning";
longDescription = ''
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 3d966c575cf..2a75c409305 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -1,5 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3
-, IOKit ? null }:
+{ lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3, IOKit }:
stdenv.mkDerivation rec {
pname = "pcsclite";
@@ -19,9 +18,9 @@ stdenv.mkDerivation rec {
"--enable-usbdropdir=/var/lib/pcsc/drivers"
"--enable-confdir=/etc"
] ++ lib.optional stdenv.isLinux
- "--with-systemdsystemunitdir=\${out}/etc/systemd/system"
- ++ lib.optional (!stdenv.isLinux)
- "--disable-libsystemd";
+ "--with-systemdsystemunitdir=\${out}/etc/systemd/system"
+ ++ lib.optional (!stdenv.isLinux)
+ "--disable-libsystemd";
postConfigure = ''
sed -i -re '/^#define *PCSCLITE_HP_DROPDIR */ {
@@ -35,8 +34,10 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkg-config perl ];
- buildInputs = [ python3 ] ++ lib.optionals stdenv.isLinux [ udev dbus ]
- ++ lib.optionals stdenv.isDarwin [ IOKit ];
+
+ buildInputs = [ python3 ]
+ ++ lib.optionals stdenv.isLinux [ udev dbus ]
+ ++ lib.optionals stdenv.isDarwin [ IOKit ];
meta = with lib; {
description = "Middleware to access a smart card using SCard API (PC/SC)";
diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix
index 7cc343b7823..1577b476401 100644
--- a/pkgs/tools/security/sn0int/default.nix
+++ b/pkgs/tools/security/sn0int/default.nix
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "sn0int";
- version = "0.20.0";
+ version = "0.20.1";
src = fetchFromGitHub {
owner = "kpcyrd";
repo = pname;
rev = "v${version}";
- sha256 = "1zjrbrkk7phv8s5qr0gj6fnssa31j3k3m8c55pdfmajh7ry7wwd1";
+ sha256 = "sha256-vnSpItch9RDUyYxERKRwYPmRLwRG9gAI7iIY+7iRs1w=";
};
- cargoSha256 = "1jvaavhjyalnh10vfhrdyqg1jnl8b4a3gnp8a31bgi3mb0v466k3";
+ cargoSha256 = "sha256-1QqNI7rdH5wb1Zge8gkJtzg2Hgd/Vk9DAU9ULk/5wiw=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index cf4ccd9bcdf..d8b99c51de2 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "sudo";
- version = "1.9.6";
+ version = "1.9.6p1";
src = fetchurl {
url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
- sha256 = "sha256-YslYBJLNLn3WJztc/hl1YPLFCKg2SdHOT2HI7gL/OlU=";
+ sha256 = "sha256-qenNwFj6/rnNPr+4ZMgXVeUk2YqgIhUnY/JbzoyjypA=";
};
prePatch = ''
diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/tools/security/teler/default.nix
index f44b7abf523..1c4cba04d56 100644
--- a/pkgs/tools/security/teler/default.nix
+++ b/pkgs/tools/security/teler/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "teler";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "kitabisa";
repo = "teler";
rev = "v${version}";
- sha256 = "sha256-0tx/oyHl6s1mj7NyWMZGCJoSuOeB+BMlBrnGY4IN/i4=";
+ sha256 = "sha256-FZG23j7LUwfJ0dSbU4xW0YyCKJxOjVf1uqkuGlrwnqs=";
};
vendorSha256 = "sha256-KvUnDInUqFW7FypgsppIBQZKNu6HVsEeHtGwdqYtoys=";
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index 88ea30088f5..f60d5374648 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "thc-hydra";
- version = "9.1";
+ version = "9.2";
src = fetchFromGitHub {
owner = "vanhauser-thc";
repo = "thc-hydra";
rev = "v${version}";
- sha256 = "1533h9z5jdlazwy0z7ll2753i507wq55by7rm9lh6y59889p0hps";
+ sha256 = "sha256-V9rr5fbJWm0pa+Kp8g95XvLPo/uWcDwyU2goImnIq58=";
};
postPatch = let
diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix
index f1043790ff6..12f2a2ef07c 100644
--- a/pkgs/tools/system/inxi/default.nix
+++ b/pkgs/tools/system/inxi/default.nix
@@ -22,13 +22,13 @@ let
++ recommendedDisplayInformationPrograms;
in stdenv.mkDerivation rec {
pname = "inxi";
- version = "3.3.02-1";
+ version = "3.3.03-1";
src = fetchFromGitHub {
owner = "smxi";
repo = "inxi";
rev = version;
- sha256 = "sha256-hBFOJxmHtlowe/4AnIRnUVHFYPTjnMV6bswayGcoGlA=";
+ sha256 = "sha256-OFjhMlBR1QUYUvpuFATCWZWZp2dop30Iz8qVCIK2UN0=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/text/m2r/default.nix b/pkgs/tools/text/m2r/default.nix
new file mode 100644
index 00000000000..f6dda712d0b
--- /dev/null
+++ b/pkgs/tools/text/m2r/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, docutils
+, mistune
+, pygments
+}:
+
+buildPythonApplication rec {
+ pname = "m2r";
+ version = "0.2.1";
+
+ src = fetchFromGitHub {
+ owner = "miyakogi";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-JNLPEXMoiISh4RnKP+Afj9/PJp9Lrx9UYHsfuGAL7uI=";
+ };
+
+ buildInputs = [
+ docutils
+ mistune
+ pygments
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/miyakogi/m2r";
+ description = "Markdown-to-RestructuredText converter";
+ license = licenses.mit;
+ maintainers = with maintainers; [ AndersonTorres ];
+ };
+}
diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix
index 93fadfe0ef3..af96b09b14d 100644
--- a/pkgs/tools/text/mark/default.nix
+++ b/pkgs/tools/text/mark/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "mark";
- version = "5.2.2";
+ version = "5.4";
src = fetchFromGitHub {
owner = "kovetskiy";
repo = "mark";
rev = version;
- sha256 = "sha256-CS9xzRxTKvBuDM1vs+p+U7LSMP8W6+cKNb+Sd3wgwig=";
+ sha256 = "sha256-IDW8dd2Bgr936hUKkfkoQ/kBnN+0uacJ1uX4Xhd27Vc=";
};
vendorSha256 = "sha256-nneQ0B7PyHAqiOzrmWqSssZM8B3np4VFUJLBqUvkjZE=";
diff --git a/pkgs/tools/text/xml/xmldiff/default.nix b/pkgs/tools/text/xml/xmldiff/default.nix
new file mode 100644
index 00000000000..5814435e111
--- /dev/null
+++ b/pkgs/tools/text/xml/xmldiff/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, lxml
+, six
+}:
+
+buildPythonApplication rec {
+ pname = "xmldiff";
+ version = "2.4";
+
+ src = fetchFromGitHub {
+ owner = "Shoobx";
+ repo = pname;
+ rev = version;
+ hash = "sha256-xqudHYfwOce2C0pcFzId0JDIIC6R5bllmVKsH+CvTdE=";
+ };
+
+ buildInputs = [
+ lxml
+ six
+ ];
+
+ meta = with lib; {
+ homepage = "https://xmldiff.readthedocs.io/en/stable/";
+ description = "A library and command line utility for diffing xml";
+ longDescription = ''
+ xmldiff is a library and a command-line utility for making diffs out of
+ XML. This may seem like something that doesn't need a dedicated utility,
+ but change detection in hierarchical data is very different from change
+ detection in flat data. XML type formats are also not only used for
+ computer readable data, it is also often used as a format for hierarchical
+ data that can be rendered into human readable formats. A traditional diff
+ on such a format would tell you line by line the differences, but this
+ would not be be readable by a human. xmldiff provides tools to make human
+ readable diffs in those situations.
+ '';
+ license = licenses.mit;
+ maintainers = with maintainers; [ AndersonTorres ];
+ };
+}
diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix
index 1040532eb3e..13606521b88 100644
--- a/pkgs/tools/typesetting/lowdown/default.nix
+++ b/pkgs/tools/typesetting/lowdown/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lowdown";
- version = "0.8.2";
+ version = "0.8.3";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
- sha512 = "07xy6yjs24zkwrr06ly4ln5czvm3azw6iznx6m8gbrmzblkcp3gz1jcl9wclcyl8bs4xhgmyzkf5k67b95s0jndhyb9ap5zy6ixnias";
+ sha512 = "17q1jd2vih26yjjc4f9kg0qihrym8h0ydnli6z8p3h4rdwm4kfnvckrpkwminz5wl0k5z6d65dk7q4pynyfynp31d6s7q4yzkkqy6kc";
};
nativeBuildInputs = [ which ]
diff --git a/pkgs/tools/virtualization/xva-img/default.nix b/pkgs/tools/virtualization/xva-img/default.nix
index b4992947657..4fe2e5bbb40 100644
--- a/pkgs/tools/virtualization/xva-img/default.nix
+++ b/pkgs/tools/virtualization/xva-img/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "xva-img";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "eriklax";
repo = "xva-img";
rev = version;
- sha256 = "1w3wrbrlgv7h2gdix2rmrmpjyla365kam5621a1aqjzwjqhjkwyq";
+ sha256 = "sha256-QHCKGsHSMT2P64No1IUCjenm1XZMSgEvsJGJOyHFZS8=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0a1f3ec73e0..0ba45dd8f89 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -105,6 +105,7 @@ mapAliases ({
codimd = hedgedoc; # added 2020-11-29
compton = picom; # added 2019-12-02
compton-git = compton; # added 2019-05-20
+ concurrencykit = libck; # added 2021-03
conntrack_tools = conntrack-tools; # added 2018-05
cool-old-term = cool-retro-term; # added 2015-01-31
coprthr = throw "coprthr has been removed."; # added 2019-12-08
@@ -561,6 +562,7 @@ mapAliases ({
ppl-address-book = throw "ppl-address-book deprecated on 2019-05-02: abandoned by upstream.";
processing3 = processing; # added 2019-08-16
procps-ng = procps; # added 2018-06-08
+ prometheus-cups-exporter = throw "outdated and broken by design; removed by developer."; # added 2021-03-16
pygmentex = texlive.bin.pygmentex; # added 2019-12-15
pyo3-pack = maturin;
pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # added 2019-12-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17f8ccf44c7..17de1b3c0fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -190,7 +190,10 @@ in
castget = callPackage ../applications/networking/feedreaders/castget { };
- castxml = callPackage ../development/tools/castxml { };
+ castxml = callPackage ../development/tools/castxml {
+ inherit (llvmPackages) clang-unwrapped libclang llvm;
+ inherit (python3Packages) sphinx;
+ };
cen64 = callPackage ../misc/emulators/cen64 { };
@@ -1743,6 +1746,8 @@ in
boringtun = callPackage ../tools/networking/boringtun { };
+ bookstack = callPackage ../servers/web-apps/bookstack { };
+
# Upstream recommends qt5.12 and it doesn't build with qt5.15
boomerang = libsForQt512.callPackage ../development/tools/boomerang { };
@@ -2628,6 +2633,8 @@ in
massren = callPackage ../tools/misc/massren { };
+ mat2 = with python3.pkgs; toPythonApplication mat2;
+
maxcso = callPackage ../tools/archivers/maxcso {};
medusa = callPackage ../tools/security/medusa { };
@@ -3264,8 +3271,6 @@ in
colordiff = callPackage ../tools/text/colordiff { };
- concurrencykit = callPackage ../development/libraries/concurrencykit { };
-
connect = callPackage ../tools/networking/connect { };
conspy = callPackage ../os-specific/linux/conspy {};
@@ -3318,6 +3323,8 @@ in
usbsdmux = callPackage ../development/tools/misc/usbsdmux { };
+ usbview = callPackage ../tools/misc/usbview { };
+
anthy = callPackage ../tools/inputmethods/anthy { };
evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { };
@@ -3538,6 +3545,18 @@ in
cudnn = cudnn_cudatoolkit_10;
+ cutensorPackages = callPackages ../development/libraries/science/math/cutensor { };
+ inherit (cutensorPackages)
+ cutensor_cudatoolkit_10
+ cutensor_cudatoolkit_10_1
+ cutensor_cudatoolkit_10_2
+ cutensor_cudatoolkit_11
+ cutensor_cudatoolkit_11_0
+ cutensor_cudatoolkit_11_1
+ cutensor_cudatoolkit_11_2;
+
+ cutensor = cutensor_cudatoolkit_10;
+
curlFull = curl.override {
ldapSupport = true;
};
@@ -3616,7 +3635,8 @@ in
};
deno = callPackage ../development/web/deno {
- inherit (darwin.apple_sdk.frameworks) Security CoreServices;
+ inherit (darwin) libobjc;
+ inherit (darwin.apple_sdk.frameworks) Security CoreServices Metal Foundation;
};
detox = callPackage ../tools/misc/detox { };
@@ -5710,7 +5730,7 @@ in
lego = callPackage ../tools/admin/lego { };
- leocad = callPackage ../applications/graphics/leocad { };
+ leocad = libsForQt5.callPackage ../applications/graphics/leocad { };
less = callPackage ../tools/misc/less { };
@@ -5836,6 +5856,8 @@ in
mcfly = callPackage ../tools/misc/mcfly { };
+ m2r = python3Packages.callPackage ../tools/text/m2r { };
+
mdbook = callPackage ../tools/text/mdbook {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@@ -7731,6 +7753,8 @@ in
gperf = gperf_3_0;
};
+ rpm2targz = callPackage ../tools/archivers/rpm2targz { };
+
rpmextract = callPackage ../tools/archivers/rpmextract { };
rrdtool = callPackage ../tools/misc/rrdtool { };
@@ -8397,6 +8421,8 @@ in
tdns-cli = callPackage ../tools/networking/tdns-cli { };
+ tea = callPackage ../tools/misc/tea { };
+
ted = callPackage ../tools/typesetting/ted { };
teamviewer = libsForQt514.callPackage ../applications/networking/remote/teamviewer { };
@@ -9305,6 +9331,8 @@ in
xml2 = callPackage ../tools/text/xml/xml2 { };
+ xmldiff = python3Packages.callPackage ../tools/text/xml/xmldiff { };
+
xmlformat = callPackage ../tools/text/xml/xmlformat { };
xmlroff = callPackage ../tools/typesetting/xmlroff { };
@@ -9360,6 +9388,8 @@ in
yafaray-core = callPackage ../tools/graphics/yafaray-core { };
+ yapf = with python3Packages; toPythonApplication yapf;
+
yarn = callPackage ../development/tools/yarn { };
yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { };
@@ -11054,7 +11084,9 @@ in
rustracerd = callPackage ../development/tools/rust/racerd {
inherit (darwin.apple_sdk.frameworks) Security;
};
- inherit (callPackage ../development/tools/rust/rust-analyzer { })
+ inherit (callPackage ../development/tools/rust/rust-analyzer {
+ inherit (darwin.apple_sdk.frameworks) CoreServices;
+ })
rust-analyzer-unwrapped rust-analyzer;
rust-bindgen = callPackage ../development/tools/rust/bindgen { };
rust-cbindgen = callPackage ../development/tools/rust/cbindgen {
@@ -12412,7 +12444,7 @@ in
ffuf = callPackage ../tools/security/ffuf { };
flow = callPackage ../development/tools/analysis/flow {
- ocamlPackages = ocaml-ng.ocamlPackages_4_07;
+ ocamlPackages = ocaml-ng.ocamlPackages_4_09;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@@ -15685,6 +15717,8 @@ in
libsearpc = callPackage ../development/libraries/libsearpc { };
+ libseat = callPackage ../development/libraries/libseat { };
+
libsigcxx = callPackage ../development/libraries/libsigcxx { };
libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { };
@@ -16055,6 +16089,8 @@ in
mdctags = callPackage ../development/tools/misc/mdctags { };
+ md4c = callPackage ../development/libraries/md4c { };
+
mdds = callPackage ../development/libraries/mdds { };
mediastreamer = callPackage ../development/libraries/mediastreamer { };
@@ -16415,11 +16451,12 @@ in
openvdb = callPackage ../development/libraries/openvdb {};
inherit (callPackages ../development/libraries/libressl { })
- libressl_3_1;
+ libressl_3_1
+ libressl_3_2;
# Please keep this pointed to the latest version. See also
# https://discourse.nixos.org/t/nixpkgs-policy-regarding-libraries-available-in-multiple-versions/7026/2
- libressl = libressl_3_1;
+ libressl = libressl_3_2;
boringssl = callPackage ../development/libraries/boringssl { };
@@ -17650,6 +17687,8 @@ in
zziplib = callPackage ../development/libraries/zziplib { };
+ glpng = callPackage ../development/libraries/glpng { };
+
gsignond = callPackage ../development/libraries/gsignond {
plugins = [];
};
@@ -18612,7 +18651,6 @@ in
prometheus-bird-exporter = callPackage ../servers/monitoring/prometheus/bird-exporter.nix { };
prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };
prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
- prometheus-cups-exporter = callPackage ../servers/monitoring/prometheus/cups-exporter.nix { };
prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { };
prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { };
prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { };
@@ -22623,7 +22661,20 @@ in
fractal = callPackage ../applications/networking/instant-messengers/fractal { };
- freecad = libsForQt5.callPackage ../applications/graphics/freecad { };
+ freecad = libsForQt5.callPackage ../applications/graphics/freecad {
+ inherit (python3Packages)
+ GitPython
+ boost
+ matplotlib
+ pivy
+ pycollada
+ pyside2
+ pyside2-tools
+ python
+ pyyaml
+ scipy
+ shiboken2;
+ };
freemind = callPackage ../applications/misc/freemind {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
@@ -23868,6 +23919,8 @@ in
meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };
+ metadata-cleaner = callPackage ../applications/misc/metadata-cleaner { };
+
metersLv2 = callPackage ../applications/audio/meters_lv2 { };
mhwaveedit = callPackage ../applications/audio/mhwaveedit {
@@ -26847,6 +26900,8 @@ in
chiaki = libsForQt5.callPackage ../games/chiaki { };
+ chromium-bsu = callPackage ../games/chromium-bsu { };
+
chocolateDoom = callPackage ../games/chocolate-doom { };
clonehero-unwrapped = pkgs.callPackage ../games/clonehero { };
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 2197f128388..3ece95c5845 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -23,7 +23,7 @@ in
binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
inherit (darwin) cctools;
inherit (pkgs) binutils-unwrapped;
- inherit (pkgs.llvmPackages_7) llvm;
+ inherit (pkgs.llvmPackages_7) llvm clang-unwrapped;
};
binutils = pkgs.wrapBintoolsWith {
diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix
new file mode 100644
index 00000000000..f9b20dd2bc7
--- /dev/null
+++ b/pkgs/top-level/kodi-packages.nix
@@ -0,0 +1,113 @@
+{ lib, newScope, kodi }:
+
+with lib;
+
+let self = rec {
+
+ addonDir = "/share/kodi/addons";
+ rel = "Matrix";
+
+ callPackage = newScope self;
+
+ inherit kodi;
+
+ # Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix
+ toKodiAddon = drv: drv.overrideAttrs (oldAttrs: {
+ # Use passthru in order to prevent rebuilds when possible.
+ passthru = (oldAttrs.passthru or {}) // {
+ kodiAddonFor = kodi;
+ requiredKodiAddons = requiredKodiAddons drv.propagatedBuildInputs;
+ };
+ });
+
+ # Check whether a derivation provides a Kodi addon.
+ hasKodiAddon = drv: drv ? kodiAddonFor && drv.kodiAddonFor == kodi;
+
+ # Get list of required Kodi addons given a list of derivations.
+ requiredKodiAddons = drvs:
+ let
+ modules = filter hasKodiAddon drvs;
+ in
+ unique (modules ++ concatLists (catAttrs "requiredKodiAddons" modules));
+
+ # package update scripts
+
+ addonUpdateScript = callPackage ../applications/video/kodi-packages/addon-update-script { };
+
+ # package builders
+
+ buildKodiAddon = callPackage ../applications/video/kodi/build-kodi-addon.nix { };
+
+ buildKodiBinaryAddon = callPackage ../applications/video/kodi/build-kodi-binary-addon.nix { };
+
+ # regular packages
+
+ kodi-platform = callPackage ../applications/video/kodi-packages/kodi-platform { };
+
+ # addon packages
+
+ controllers = {
+ default = callPackage ../applications/video/kodi-packages/controllers { controller = "default"; };
+
+ dreamcast = callPackage ../applications/video/kodi-packages/controllers { controller = "dreamcast"; };
+
+ gba = callPackage ../applications/video/kodi-packages/controllers { controller = "gba"; };
+
+ genesis = callPackage ../applications/video/kodi-packages/controllers { controller = "genesis"; };
+
+ mouse = callPackage ../applications/video/kodi-packages/controllers { controller = "mouse"; };
+
+ n64 = callPackage ../applications/video/kodi-packages/controllers { controller = "n64"; };
+
+ nes = callPackage ../applications/video/kodi-packages/controllers { controller = "nes"; };
+
+ ps = callPackage ../applications/video/kodi-packages/controllers { controller = "ps"; };
+
+ snes = callPackage ../applications/video/kodi-packages/controllers { controller = "snes"; };
+ };
+
+ joystick = callPackage ../applications/video/kodi-packages/joystick { };
+
+ netflix = callPackage ../applications/video/kodi-packages/netflix { };
+
+ svtplay = callPackage ../applications/video/kodi-packages/svtplay { };
+
+ steam-controller = callPackage ../applications/video/kodi-packages/steam-controller { };
+
+ steam-launcher = callPackage ../applications/video/kodi-packages/steam-launcher { };
+
+ pdfreader = callPackage ../applications/video/kodi-packages/pdfreader { };
+
+ pvr-hts = callPackage ../applications/video/kodi-packages/pvr-hts { };
+
+ pvr-hdhomerun = callPackage ../applications/video/kodi-packages/pvr-hdhomerun { };
+
+ pvr-iptvsimple = callPackage ../applications/video/kodi-packages/pvr-iptvsimple { };
+
+ osmc-skin = callPackage ../applications/video/kodi-packages/osmc-skin { };
+
+ vfs-sftp = callPackage ../applications/video/kodi-packages/vfs-sftp { };
+
+ vfs-libarchive = callPackage ../applications/video/kodi-packages/vfs-libarchive { };
+
+ # addon packages (dependencies)
+
+ certifi = callPackage ../applications/video/kodi-packages/certifi { };
+
+ chardet = callPackage ../applications/video/kodi-packages/chardet { };
+
+ idna = callPackage ../applications/video/kodi-packages/idna { };
+
+ inputstream-adaptive = callPackage ../applications/video/kodi-packages/inputstream-adaptive { };
+
+ inputstreamhelper = callPackage ../applications/video/kodi-packages/inputstreamhelper { };
+
+ myconnpy = callPackage ../applications/video/kodi-packages/myconnpy { };
+
+ requests = callPackage ../applications/video/kodi-packages/requests { };
+
+ signals = callPackage ../applications/video/kodi-packages/signals { };
+
+ urllib3 = callPackage ../applications/video/kodi-packages/urllib3 { };
+
+}; in self
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2e42ce58bb5..e396a510dbc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1843,8 +1843,8 @@ let
url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.016.tar.gz";
sha256 = "0cm399vxqqf05cjgs1j5v3sk4qc6nmws5nfhf52qvpbwc4m82mq8";
};
- propagatedBuildInputs = [ NetLDAP CatalystPluginAuthentication ClassAccessorFast ];
- buildInputs = [ TestMore TestMockObject TestException NetLDAPServerTest ];
+ propagatedBuildInputs = [ perlldap CatalystPluginAuthentication ClassAccessor ];
+ buildInputs = [ TestMockObject TestException NetLDAPServerTest ];
meta = {
description= "Authentication from an LDAP Directory";
license = with lib.licenses; [ artistic1 ];
@@ -8016,6 +8016,7 @@ let
url = "mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.67.tar.gz";
sha256 = "1hpv4aprgypjxjx1kzbjnf6r29a98rw7mndlinixzk62vyz5sy0j";
};
+ perlPreHook = "export LD=$CC";
propagatedBuildInputs = [ PerlIOLayers SubExporterProgressive ];
buildInputs = [ TestFatal TestWarnings ];
meta = {
@@ -9142,10 +9143,6 @@ let
};
buildInputs = [ pkgs.gtk3 ];
propagatedBuildInputs = [ Readonly Gtk3 ];
- # Tests are broken with PerlMagick and imagemagick version 7 as of 2021-02-22.
- # See https://github.com/carygravel/gtk3-imageview/issues/19 and
- # https://github.com/NixOS/nixpkgs/pull/114007#issuecomment-783595659.
- doCheck = false;
checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
checkPhase = ''
${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \
@@ -14866,7 +14863,7 @@ let
url = "mirror://cpan/authors/id/E/ES/ESTRABD/MySQL-Diff-0.60.tar.gz";
sha256 = "5d7080a4bd5714ff9ef536aa774a7adb3c6f0e760215ca6c39d8a3545344f956";
};
- propagatedBuildInputs = [ pkgs.mysql-client FileSlurp StringShellQuote ];
+ propagatedBuildInputs = [ pkgs.mariadb.client FileSlurp StringShellQuote ];
meta = {
homepage = "https://github.com/estrabd/mysqldiff";
description = "Generates a database upgrade instruction set";
@@ -15365,7 +15362,7 @@ let
url = "mirror://cpan/authors/id/A/AA/AAR/Net-LDAP-Server-0.43.tar.gz";
sha256 = "0qmh3cri3fpccmwz6bhwp78yskrb3qmalzvqn0a23hqbsfs4qv6x";
};
- propagatedBuildInputs = [ NetLDAP ConvertASN1 ];
+ propagatedBuildInputs = [ perlldap ConvertASN1 ];
meta = {
description = "LDAP server side protocol handling";
license = with lib.licenses; [ artistic1 ];
@@ -15392,7 +15389,7 @@ let
url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-Server-Test-0.22.tar.gz";
sha256 = "13idip7jky92v4adw60jn2gcc3zf339gsdqlnc9nnvqzbxxp285i";
};
- propagatedBuildInputs = [ NetLDAP NetLDAPServer TestMore DataDump NetLDAPSID ];
+ propagatedBuildInputs = [ perlldap NetLDAPServer DataDump NetLDAPSID ];
meta = {
description= "test Net::LDAP code";
license = with lib.licenses; [ artistic1 ];
@@ -16755,6 +16752,11 @@ let
preConfigure =
''
sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL
+
+ # Enable HDRI support to match the native ImageMagick 7 defaults
+ # See: https://github.com/ImageMagick/ImageMagick/issues/3402#issuecomment-801195538
+ substituteInPlace Makefile.PL \
+ --replace 'MAGICKCORE_HDRI_ENABLE=0' 'MAGICKCORE_HDRI_ENABLE=1'
'';
};
@@ -23070,7 +23072,7 @@ let
sha256 = "582db53a091f8da3670c037733314f2510af5e8ee0ba42a0e391e2f2e3ca7734";
};
prePatch = "rm examples.pl";
- propagatedBuildInputs = [ LWPProtocolhttps ];
+ propagatedBuildInputs = [ LWPProtocolHttps ];
meta = {
description = "Accessing Twilio's REST API with Perl";
license = with lib.licenses; [ artistic1 gpl1Plus ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8be8c025354..12991afcb37 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -340,6 +340,8 @@ in {
ajpy = callPackage ../development/python-modules/ajpy { };
+ ajsonrpc = callPackage ../development/python-modules/ajsonrpc { };
+
alabaster = callPackage ../development/python-modules/alabaster { };
alarmdecoder = callPackage ../development/python-modules/alarmdecoder { };
@@ -1605,6 +1607,7 @@ in {
cudatoolkit = pkgs.cudatoolkit_10_0;
cudnn = pkgs.cudnn_cudatoolkit_10_0;
nccl = pkgs.nccl_cudatoolkit_10;
+ cutensor = pkgs.cutensor_cudatoolkit_10;
};
curio = callPackage ../development/python-modules/curio { };
@@ -3152,6 +3155,8 @@ in {
hug = callPackage ../development/python-modules/hug { };
+ huggingface-hub = callPackage ../development/python-modules/huggingface-hub { };
+
humanfriendly = callPackage ../development/python-modules/humanfriendly { };
humanize = callPackage ../development/python-modules/humanize { };
@@ -4128,6 +4133,8 @@ in {
mask-rcnn = callPackage ../development/python-modules/mask-rcnn { };
+ mat2 = callPackage ../development/python-modules/mat2 { };
+
matchpy = callPackage ../development/python-modules/matchpy { };
mathlibtools = callPackage ../development/python-modules/mathlibtools { };
@@ -7358,7 +7365,7 @@ in {
salmon-mail = callPackage ../development/python-modules/salmon-mail { };
sane = callPackage ../development/python-modules/sane {
- inherit (pkgs) saneBackends;
+ inherit (pkgs) sane-backends;
};
sampledata = callPackage ../development/python-modules/sampledata { };
@@ -8994,6 +9001,8 @@ in {
yt = callPackage ../development/python-modules/yt { };
+ ytmusicapi = callPackage ../development/python-modules/ytmusicapi { };
+
yubico-client = callPackage ../development/python-modules/yubico-client { };
z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { };