diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md
index 83520ae8c5f6..9f221679ce22 100644
--- a/doc/languages-frameworks/php.section.md
+++ b/doc/languages-frameworks/php.section.md
@@ -9,7 +9,7 @@ wide variety of extensions and libraries available.
The different versions of PHP that nixpkgs provides are located under
attributes named based on major and minor version number; e.g.,
-`php81` is PHP 8.1.
+`php84` is PHP 8.4.
Only versions of PHP that are supported by upstream for the entirety
of a given NixOS release will be included in that release of
@@ -22,8 +22,8 @@ NixOS - not necessarily the latest major release from upstream.
All available PHP attributes are wrappers around their respective
binary PHP package and provide commonly used extensions this way. The
-real PHP 8.1 package, i.e. the unwrapped one, is available as
-`php81.unwrapped`; see the next section for more details.
+real PHP 8.4 package, i.e. the unwrapped one, is available as
+`php84.unwrapped`; see the next section for more details.
Interactive tools built on PHP are put in `php.packages`; composer is
for example available at `php.packages.composer`.
diff --git a/lib/licenses.nix b/lib/licenses.nix
index df72299db658..3b2c368b9ba5 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -167,6 +167,11 @@ lib.mapAttrs mkLicense (
fullName = "Apache License 2.0";
};
+ baekmuk = {
+ spdxId = "Baekmuk";
+ fullName = "Baekmuk License";
+ };
+
bitstreamVera = {
spdxId = "Bitstream-Vera";
fullName = "Bitstream Vera Font License";
@@ -182,6 +187,11 @@ lib.mapAttrs mkLicense (
fullName = " BitTorrent Open Source License v1.1";
};
+ boehmGC = {
+ spdxId = "Boehm-GC";
+ fullName = "Boehm-Demers-Weiser GC License";
+ };
+
bola11 = {
url = "https://blitiri.com.ar/p/bola/";
fullName = "Buena Onda License Agreement 1.1";
@@ -586,6 +596,11 @@ lib.mapAttrs mkLicense (
free = false;
};
+ fontException = {
+ spdxId = "Font-exception-2.0";
+ fullName = "Font exception 2.0";
+ };
+
fraunhofer-fdk = {
fullName = "Fraunhofer FDK AAC Codec Library";
spdxId = "FDK-AAC";
@@ -595,6 +610,11 @@ lib.mapAttrs mkLicense (
fullName = "Unspecified free software license";
};
+ freeimage = {
+ spdxId = "FreeImage";
+ fullName = "FreeImage Public License v1.0";
+ };
+
fsl11Mit = {
fullName = "Functional Source License, Version 1.1, MIT Future License";
spdxId = "FSL-1.1-MIT";
@@ -766,6 +786,11 @@ lib.mapAttrs mkLicense (
free = false;
};
+ interbase = {
+ spdxId = "Interbase-1.0";
+ fullName = "Interbase Public License v1.0";
+ };
+
ipa = {
spdxId = "IPA";
fullName = "IPA Font License";
@@ -1042,6 +1067,11 @@ lib.mapAttrs mkLicense (
redistributable = true; # Only if used in Netdata products.
};
+ ngpl = {
+ spdxId = "NGPL";
+ fullName = "Nethack General Public License";
+ };
+
nistSoftware = {
spdxId = "NIST-Software";
fullName = "NIST Software License";
@@ -1134,6 +1164,11 @@ lib.mapAttrs mkLicense (
fullName = "Open Software License 3.0";
};
+ paratype = {
+ fullName = "ParaType Free Font Licensing Agreement";
+ url = "https://web.archive.org/web/20161209023955/http://www.paratype.ru/public/pt_openlicense_eng.asp";
+ };
+
parity70 = {
spdxId = "Parity-7.0.0";
fullName = "Parity Public License 7.0.0";
@@ -1262,6 +1297,11 @@ lib.mapAttrs mkLicense (
redistributable = false; # only free to redistribute "for non-commercial purposes"
};
+ tcpWrappers = {
+ spdxId = "TCP-wrappers";
+ fullName = "TCP Wrappers License";
+ };
+
teamspeak = {
fullName = "Teamspeak client license";
url = "https://www.teamspeak.com/en/privacy-and-terms/";
@@ -1309,6 +1349,11 @@ lib.mapAttrs mkLicense (
# https://github.com/spdx/license-list-XML/issues/2757
};
+ torque11 = {
+ spdxId = "TORQUE-1.1";
+ fullName = "TORQUE v2.5+ Software License v1.1";
+ };
+
tsl = {
shortName = "TSL";
fullName = "Timescale License Agreegment";
@@ -1449,6 +1494,11 @@ lib.mapAttrs mkLicense (
fullName = "X11 License";
};
+ xerox = {
+ spdxId = "Xerox";
+ fullName = "Xerox License";
+ };
+
xfig = {
spdxId = "Xfig";
fullName = "xfig";
diff --git a/lib/sources.nix b/lib/sources.nix
index 5dff2651d354..4d67ea30b62c 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -44,7 +44,14 @@ let
baseName == ".git"
||
type == "directory"
- && (baseName == ".svn" || baseName == "CVS" || baseName == ".hg" || baseName == ".jj")
+ && (
+ baseName == ".svn"
+ || baseName == "CVS"
+ || baseName == ".hg"
+ || baseName == ".jj"
+ || baseName == ".pijul"
+ || baseName == "_darcs"
+ )
)
||
# Filter out editor backup / swap files.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cd20d19d5c32..e22f136b52fd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3918,6 +3918,12 @@
name = "Builditluc";
keys = [ { fingerprint = "FF16E475723B8C1E57A6B2569374074AE2D6F20E"; } ];
};
+ burmudar = {
+ email = "william.bezuidenhout@gmail.com";
+ github = "burmudar";
+ githubId = 1001709;
+ name = "William Bezuidenhout";
+ };
buurro = {
email = "marcoburro98@gmail.com";
github = "buurro";
@@ -14284,6 +14290,11 @@
githubId = 2034420;
name = "Luke Sandell";
};
+ lasantosr = {
+ github = "lasantosr";
+ githubId = 5946707;
+ name = "Luis Santos";
+ };
lassulus = {
email = "lassulus@gmail.com";
matrix = "@lassulus:lassul.us";
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index aefc50cf9063..bf39afd98627 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -127,7 +127,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- [sx](https://github.com/earnestly/sx), a simple alternative to both xinit and startx for starting a Xorg server. Available as [services.xserver.displayManager.sx](#opt-services.xserver.displayManager.sx.enable)
-- [postfixadmin](https://postfixadmin.sourceforge.io/), a web based virtual user administration interface for Postfix mail servers. Available as [postfixadmin](#opt-services.postfixadmin.enable).
+- [postfixadmin](https://postfixadmin.sourceforge.io/), a web based virtual user administration interface for Postfix mail servers.
- [prowlarr](https://wiki.servarr.com/prowlarr), an indexer manager/proxy built on the popular arr .net/reactjs base stack [services.prowlarr](#opt-services.prowlarr.enable).
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index ed583c2541e6..52f05ce45403 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -99,7 +99,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- [input-remapper](https://github.com/sezanzeb/input-remapper), an easy to use tool to change the mapping of your input device buttons. Available at [services.input-remapper](#opt-services.input-remapper.enable).
-- [InvoicePlane](https://invoiceplane.com), web application for managing and creating invoices. Available at [services.invoiceplane](#opt-services.invoiceplane.sites._name_.enable).
+- [InvoicePlane](https://invoiceplane.com), web application for managing and creating invoices. Available at `services.invoiceplane`.
- [k3b](https://userbase.kde.org/K3b), the KDE disk burning application. Available as [programs.k3b](#opt-programs.k3b.enable).
diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 7203addaa835..2a3b4ea5d065 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -328,6 +328,8 @@
Note that system activation will complete before all certificates may have been renewed or acquired.
+- `php81` was removed.
+
- `libvirt` now supports using `nftables` backend.
- The `virtualisation.libvirtd.firewallBackend` option can be used to configure the firewall backend used by libvirtd.
@@ -373,6 +375,8 @@
- `strongSwan` has been updated to 6.0. See [strongSwan 6.0.0 release notes](https://github.com/strongswan/strongswan/releases/tag/6.0.0) for a complete list of changes.
+- `slurm` no longer supports gtk2.
+
- `amdgpu` kernel driver overdrive mode can now be enabled by setting [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable) and customized through [hardware.amdgpu.overdrive.ppfeaturemask](#opt-hardware.amdgpu.overdrive.ppfeaturemask).
This allows for fine-grained control over the GPU's performance and maybe required by overclocking softwares like Corectrl and Lact. These new options replace old options such as {option}`programs.corectrl.gpuOverclock.enable` and {option}`programs.tuxclocker.enableAMD`.
@@ -388,3 +392,5 @@
- `sparkleshare` has been removed as it no longer builds and has been abandoned upstream.
- The `open-webui` package's postgres support have been moved to optional dependencies to comply with upstream changes in 0.6.26.
+
+- `prl-tools` has been moved out of `linuxPackages` because Parallels Guest Tools become driverless since 26.1.0.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c9ac96aa6706..3fcad7ff745d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -752,7 +752,6 @@
./services/mail/pfix-srsd.nix
./services/mail/postfix-tlspol.nix
./services/mail/postfix.nix
- ./services/mail/postfixadmin.nix
./services/mail/postgrey.nix
./services/mail/postsrsd.nix
./services/mail/protonmail-bridge.nix
@@ -1613,7 +1612,6 @@
./services/web-apps/immich-public-proxy.nix
./services/web-apps/immich.nix
./services/web-apps/invidious.nix
- ./services/web-apps/invoiceplane.nix
./services/web-apps/isso.nix
./services/web-apps/jirafeau.nix
./services/web-apps/jitsi-meet.nix
diff --git a/nixos/modules/programs/git-worktree-switcher.nix b/nixos/modules/programs/git-worktree-switcher.nix
index c85ebfbd49cd..e96e57eeb0f2 100644
--- a/nixos/modules/programs/git-worktree-switcher.nix
+++ b/nixos/modules/programs/git-worktree-switcher.nix
@@ -12,17 +12,18 @@ let
shell:
if (shell == "fish") then
''
- ${lib.getExe pkgs.git-worktree-switcher} init ${shell} | source
+ ${lib.getExe cfg.package} init ${shell} | source
''
else
''
- eval "$(${lib.getExe pkgs.git-worktree-switcher} init ${shell})"
+ eval "$(${lib.getExe cfg.package} init ${shell})"
'';
in
{
options = {
programs.git-worktree-switcher = {
enable = lib.mkEnableOption "git-worktree-switcher, switch between git worktrees with speed.";
+ package = lib.mkPackageOption pkgs "git-worktree-switcher" { };
};
};
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 3451c82297ce..e67c2a3726a7 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -394,6 +394,14 @@ in
Consider migrating or switching to Incus, or remove from your configuration.
https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/
'')
+ (mkRemovedOptionModule [ "services" "invoiceplane" ] ''
+ services.invoiceplane has been removed since the service only supported PHP 8.1 which is EOL
+ and removed from nixpkgs.
+ '')
+ (mkRemovedOptionModule [ "services" "postfixadmin" ] ''
+ services.postfixadmin has been removed since it was unmaintained in nixpkgs and the version
+ available only supported PHP 8.1 which is EOL.
+ '')
# Do NOT add any option renames here, see top of the file
];
}
diff --git a/nixos/modules/security/ipa.nix b/nixos/modules/security/ipa.nix
index 6ac406d12971..dd01aaf26b21 100644
--- a/nixos/modules/security/ipa.nix
+++ b/nixos/modules/security/ipa.nix
@@ -43,8 +43,8 @@ in
'';
example = literalExpression ''
pkgs.fetchurl {
- url = http://ipa.example.com/ipa/config/ca.crt;
- sha256 = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+ url = "http://ipa.example.com/ipa/config/ca.crt";
+ hash = lib.fakeHash;
};
'';
};
@@ -191,12 +191,12 @@ in
'';
"ldap.conf".source = ldapConf;
- };
- environment.etc."chromium/policies/managed/freeipa.json" = mkIf cfg.chromiumSupport {
- text = ''
- { "AuthServerWhitelist": "*.${cfg.domain}" }
- '';
+ "chromium/policies/managed/freeipa.json" = mkIf cfg.chromiumSupport {
+ text = builtins.toJSON {
+ AuthServerWhitelist = "*.${cfg.domain}";
+ };
+ };
};
systemd.services."ipa-activation" = {
@@ -207,8 +207,10 @@ in
];
conflicts = [ "shutdown.target" ];
unitConfig.DefaultDependencies = false;
- serviceConfig.Type = "oneshot";
- serviceConfig.RemainAfterExit = true;
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ };
script = ''
# libcurl requires a hard copy of the certificate
if ! ${pkgs.diffutils}/bin/diff ${cfg.certificate} /etc/ipa/ca.crt > /dev/null 2>&1; then
@@ -226,58 +228,61 @@ in
4. Restart sssd systemd service: sudo systemctl restart sssd
EOF
+ # let service fail, to raise awareness
+ exit 1
fi
'';
};
- services.sssd.config = ''
- [domain/${cfg.domain}]
- id_provider = ipa
- auth_provider = ipa
- access_provider = ipa
- chpass_provider = ipa
+ services.sssd = {
+ enable = true;
+ config = ''
+ [domain/${cfg.domain}]
+ id_provider = ipa
+ auth_provider = ipa
+ access_provider = ipa
+ chpass_provider = ipa
- ipa_domain = ${cfg.domain}
- ipa_server = _srv_, ${cfg.server}
- ipa_hostname = ${cfg.ipaHostname}
+ ipa_domain = ${cfg.domain}
+ ipa_server = _srv_, ${cfg.server}
+ ipa_hostname = ${cfg.ipaHostname}
- cache_credentials = ${pyBool cfg.cacheCredentials}
- krb5_store_password_if_offline = ${pyBool cfg.offlinePasswords}
- ${optionalString ((toLower cfg.domain) != (toLower cfg.realm)) "krb5_realm = ${cfg.realm}"}
+ cache_credentials = ${pyBool cfg.cacheCredentials}
+ krb5_store_password_if_offline = ${pyBool cfg.offlinePasswords}
+ ${optionalString ((toLower cfg.domain) != (toLower cfg.realm)) "krb5_realm = ${cfg.realm}"}
- dyndns_update = ${pyBool cfg.dyndns.enable}
- dyndns_iface = ${cfg.dyndns.interface}
+ dyndns_update = ${pyBool cfg.dyndns.enable}
+ dyndns_iface = ${cfg.dyndns.interface}
- ldap_tls_cacert = /etc/ipa/ca.crt
- ldap_user_extra_attrs = mail:mail, sn:sn, givenname:givenname, telephoneNumber:telephoneNumber, lock:nsaccountlock
+ ldap_tls_cacert = /etc/ipa/ca.crt
+ ldap_user_extra_attrs = mail:mail, sn:sn, givenname:givenname, telephoneNumber:telephoneNumber, lock:nsaccountlock
- [sssd]
- services = nss, sudo, pam, ssh, ifp
- domains = ${cfg.domain}
+ [sssd]
+ services = nss, sudo, pam, ssh, ifp
+ domains = ${cfg.domain}
- [nss]
- homedir_substring = /home
+ [nss]
+ homedir_substring = /home
- [pam]
- pam_pwd_expiration_warning = 3
- pam_verbosity = 3
+ [pam]
+ pam_pwd_expiration_warning = 3
+ pam_verbosity = 3
- [sudo]
+ [sudo]
- [autofs]
+ [autofs]
- [ssh]
+ [ssh]
- [pac]
+ [pac]
- [ifp]
- user_attributes = +mail, +telephoneNumber, +givenname, +sn, +lock
- allowed_uids = ${concatStringsSep ", " cfg.ifpAllowedUids}
- '';
+ [ifp]
+ user_attributes = +mail, +telephoneNumber, +givenname, +sn, +lock
+ allowed_uids = ${concatStringsSep ", " cfg.ifpAllowedUids}
+ '';
+ };
- services.ntp.servers = singleton cfg.server;
- services.sssd.enable = true;
- services.ntp.enable = true;
+ networking.timeServers = singleton cfg.server;
security.pki.certificateFiles = singleton cfg.certificate;
};
diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix
index 51065c0bf0bf..1ec1950a0970 100644
--- a/nixos/modules/services/audio/mopidy.nix
+++ b/nixos/modules/services/audio/mopidy.nix
@@ -4,12 +4,14 @@
pkgs,
...
}:
+
let
uid = config.ids.uids.mopidy;
gid = config.ids.gids.mopidy;
cfg = config.services.mopidy;
+ settingsFormat = pkgs.formats.ini { };
- mopidyConf = pkgs.writeText "mopidy.conf" cfg.configuration;
+ mopidyConf = settingsFormat.generate "mopidy.conf" cfg.settings;
mopidyEnv = pkgs.buildEnv {
name = "mopidy-with-extensions-${pkgs.mopidy.version}";
@@ -24,11 +26,14 @@ let
};
in
{
+ imports = [
+ (lib.mkRemovedOptionModule [ "services" "mopidy" "configuration" ] ''
+ Use RFC42-style services.mopidy.settings instead.
+ '')
+ ];
options = {
-
services.mopidy = {
-
enable = lib.mkEnableOption "Mopidy, a music player daemon";
dataDir = lib.mkOption {
@@ -48,11 +53,15 @@ in
'';
};
- configuration = lib.mkOption {
- default = "";
- type = lib.types.lines;
+ settings = lib.mkOption {
+ inherit (settingsFormat) type;
+ example.mpd = {
+ enabled = true;
+ hostname = "::";
+ };
description = ''
The configuration that Mopidy should use.
+ See the upstream documentation for details.
'';
};
@@ -67,8 +76,6 @@ in
};
};
- ###### implementation
-
config = lib.mkIf cfg.enable {
systemd.tmpfiles.settings."10-mopidy".${cfg.dataDir}.d = {
diff --git a/nixos/modules/services/mail/postfixadmin.nix b/nixos/modules/services/mail/postfixadmin.nix
deleted file mode 100644
index bb3a6c81658d..000000000000
--- a/nixos/modules/services/mail/postfixadmin.nix
+++ /dev/null
@@ -1,215 +0,0 @@
-{
- lib,
- config,
- pkgs,
- ...
-}:
-let
- cfg = config.services.postfixadmin;
- fpm = config.services.phpfpm.pools.postfixadmin;
- localDB = cfg.database.host == "localhost";
- pgsql = config.services.postgresql;
- user = if localDB then cfg.database.username else "nginx";
-in
-{
- options.services.postfixadmin = {
- enable = lib.mkOption {
- type = lib.types.bool;
- default = false;
- description = ''
- Whether to enable postfixadmin.
-
- Also enables nginx virtual host management.
- Further nginx configuration can be done by adapting `services.nginx.virtualHosts.`.
- See [](#opt-services.nginx.virtualHosts) for further information.
- '';
- };
-
- hostName = lib.mkOption {
- type = lib.types.str;
- example = "postfixadmin.example.com";
- description = "Hostname to use for the nginx vhost";
- };
-
- adminEmail = lib.mkOption {
- type = lib.types.str;
- example = "postmaster@example.com";
- description = ''
- Defines the Site Admin's email address.
- This will be used to send emails from to create mailboxes and
- from Send Email / Broadcast message pages.
- '';
- };
-
- setupPasswordFile = lib.mkOption {
- type = lib.types.path;
- description = ''
- Password file for the admin.
- Generate with `php -r "echo password_hash('some password here', PASSWORD_DEFAULT);"`
- '';
- };
-
- database = {
- username = lib.mkOption {
- type = lib.types.str;
- default = "postfixadmin";
- description = ''
- Username for the postgresql connection.
- If `database.host` is set to `localhost`, a unix user and group of the same name will be created as well.
- '';
- };
-
- host = lib.mkOption {
- type = lib.types.str;
- default = "localhost";
- description = ''
- Host of the postgresql server. If this is not set to
- `localhost`, you have to create the
- postgresql user and database yourself, with appropriate
- permissions.
- '';
- };
-
- passwordFile = lib.mkOption {
- type = lib.types.path;
- description = "Password file for the postgresql connection. Must be readable by user `nginx`.";
- };
-
- dbname = lib.mkOption {
- type = lib.types.str;
- default = "postfixadmin";
- description = "Name of the postgresql database";
- };
- };
-
- extraConfig = lib.mkOption {
- type = lib.types.lines;
- default = "";
- description = "Extra configuration for the postfixadmin instance, see postfixadmin's config.inc.php for available options.";
- };
- };
-
- config = lib.mkIf cfg.enable {
- environment.etc."postfixadmin/config.local.php".text = ''
- "$RUNTIME_DIRECTORY/password_bcrypt"
+ curl -X PATCH --variable "pw_bcrypt@$RUNTIME_DIRECTORY/password_bcrypt" --expand-json '{ "password": "{{pw_bcrypt}}" }' ${curlAddressArgs "/rest/config/gui"}
+ '')
+ ''
# restart Syncthing if required
if curl ${curlAddressArgs "/rest/config/restart-required"} |
@@ -285,6 +292,14 @@ in
'';
};
+ guiPasswordFile = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Path to file containing the plaintext password for Syncthing's GUI.
+ '';
+ };
+
overrideDevices = mkOption {
type = types.bool;
default = true;
@@ -837,6 +852,12 @@ in
from the configuration, creating path conflicts.
'';
}
+ {
+ assertion = (lib.hasAttrByPath [ "gui" "password" ] cfg.settings) -> cfg.guiPasswordFile == null;
+ message = ''
+ Please use only one of services.syncthing.settings.gui.password or services.syncthing.guiPasswordFile.
+ '';
+ }
];
networking.firewall = mkIf cfg.openDefaultPorts {
diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix
index 68cbdc851f46..74c2b2a5a15c 100644
--- a/nixos/modules/services/web-apps/dokuwiki.nix
+++ b/nixos/modules/services/web-apps/dokuwiki.nix
@@ -56,7 +56,7 @@ let
pkgs.writeTextFile {
inherit name;
text = "
-
- IP_URL=http://${hostName}
- ENABLE_DEBUG=false
- DISABLE_SETUP=false
- REMOVE_INDEXPHP=false
- DB_HOSTNAME=${cfg.database.host}
- DB_USERNAME=${cfg.database.user}
- # NOTE: file_get_contents adds newline at the end of returned string
- DB_PASSWORD=${
- optionalString (
- cfg.database.passwordFile != null
- ) "trim(file_get_contents('${cfg.database.passwordFile}'), \"\\r\\n\")"
- }
- DB_DATABASE=${cfg.database.name}
- DB_PORT=${toString cfg.database.port}
- SESS_EXPIRATION=864000
- ENABLE_INVOICE_DELETION=false
- DISABLE_READ_ONLY=false
- ENCRYPTION_KEY=
- ENCRYPTION_CIPHER=AES-256
- SETUP_COMPLETED=false
- REMOVE_INDEXPHP=true
- '';
-
- mkPhpValue =
- v:
- if isString v then
- escapeShellArg v
- # NOTE: If any value contains a , (comma) this will not get escaped
- else if isList v && strings.isConvertibleWithToString v then
- escapeShellArg (concatMapStringsSep "," toString v)
- else if isInt v then
- toString v
- else if isBool v then
- boolToString v
- else
- abort "The Invoiceplane config value ${lib.generators.toPretty { } v} can not be encoded.";
-
- extraConfig =
- hostName: cfg:
- let
- settings = mapAttrsToList (k: v: "${k}=${mkPhpValue v}") cfg.settings;
- in
- pkgs.writeText "extraConfig.php" (concatStringsSep "\n" settings);
-
- pkg =
- hostName: cfg:
- pkgs.stdenv.mkDerivation rec {
- pname = "invoiceplane-${hostName}";
- version = src.version;
- src = pkgs.invoiceplane;
-
- postPatch = ''
- # Patch index.php file to load additional config file
- substituteInPlace index.php \
- --replace-fail "require __DIR__ . '/vendor/autoload.php';" "require('vendor/autoload.php'); \$dotenv = Dotenv\Dotenv::createImmutable(__DIR__, 'extraConfig.php'); \$dotenv->load();";
- '';
-
- installPhase = ''
- mkdir -p $out
- cp -r * $out/
-
- # symlink uploads and log directories
- rm -r $out/uploads $out/application/logs $out/vendor/mpdf/mpdf/tmp
- ln -sf ${cfg.stateDir}/uploads $out/
- ln -sf ${cfg.stateDir}/logs $out/application/
- ln -sf ${cfg.stateDir}/tmp $out/vendor/mpdf/mpdf/
-
- # symlink the InvoicePlane config
- ln -s ${cfg.stateDir}/ipconfig.php $out/ipconfig.php
-
- # symlink the extraConfig file
- ln -s ${extraConfig hostName cfg} $out/extraConfig.php
-
- # symlink additional templates
- ${concatMapStringsSep "\n" (
- template: "cp -r ${template}/. $out/application/views/invoice_templates/pdf/"
- ) cfg.invoiceTemplates}
- ${concatMapStringsSep "\n" (
- template: "cp -r ${template}/. $out/application/views/quote_templates/pdf/"
- ) cfg.quoteTemplates}
- '';
- };
-
- siteOpts =
- { lib, name, ... }:
- {
- options = {
-
- enable = mkEnableOption "InvoicePlane web application";
-
- stateDir = mkOption {
- type = types.path;
- default = "/var/lib/invoiceplane/${name}";
- description = ''
- This directory is used for uploads of attachments and cache.
- The directory passed here is automatically created and permissions
- adjusted as required.
- '';
- };
-
- 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 = "invoiceplane";
- description = "Database name.";
- };
-
- user = mkOption {
- type = types.str;
- default = "invoiceplane";
- description = "Database user.";
- };
-
- passwordFile = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/run/keys/invoiceplane-dbpassword";
- description = ''
- A file containing the password corresponding to
- {option}`database.user`.
- '';
- };
-
- createLocally = mkOption {
- type = types.bool;
- default = true;
- description = "Create the database and database user locally.";
- };
- };
-
- invoiceTemplates = mkOption {
- type = types.listOf types.path;
- default = [ ];
- description = ''
- List of path(s) to respective template(s) which are copied from the 'invoice_templates/pdf' directory.
-
- ::: {.note}
- These templates need to be packaged before use, see example.
- :::
- '';
- example = literalExpression ''
- let
- # Let's package an example template
- template-vtdirektmarketing = pkgs.stdenv.mkDerivation {
- name = "vtdirektmarketing";
- # Download the template from a public repository
- src = pkgs.fetchgit {
- url = "https://git.project-insanity.org/onny/invoiceplane-vtdirektmarketing.git";
- sha256 = "1hh0q7wzsh8v8x03i82p6qrgbxr4v5fb05xylyrpp975l8axyg2z";
- };
- sourceRoot = ".";
- # Installing simply means copying template php file to the output directory
- installPhase = ""
- mkdir -p $out
- cp invoiceplane-vtdirektmarketing/vtdirektmarketing.php $out/
- "";
- };
- # And then pass this package to the template list like this:
- in [ template-vtdirektmarketing ]
- '';
- };
-
- quoteTemplates = mkOption {
- type = types.listOf types.path;
- default = [ ];
- description = ''
- List of path(s) to respective template(s) which are copied from the 'quote_templates/pdf' directory.
-
- ::: {.note}
- These templates need to be packaged before use, see example.
- :::
- '';
- example = literalExpression ''
- let
- # Let's package an example template
- template-vtdirektmarketing = pkgs.stdenv.mkDerivation {
- name = "vtdirektmarketing";
- # Download the template from a public repository
- src = pkgs.fetchgit {
- url = "https://git.project-insanity.org/onny/invoiceplane-vtdirektmarketing.git";
- sha256 = "1hh0q7wzsh8v8x03i82p6qrgbxr4v5fb05xylyrpp975l8axyg2z";
- };
- sourceRoot = ".";
- # Installing simply means copying template php file to the output directory
- installPhase = ""
- mkdir -p $out
- cp invoiceplane-vtdirektmarketing/vtdirektmarketing.php $out/
- "";
- };
- # And then pass this package to the template list like this:
- in [ template-vtdirektmarketing ]
- '';
- };
-
- 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 InvoicePlane PHP pool. See the documentation on `php-fpm.conf`
- for details on configuration directives.
- '';
- };
-
- settings = mkOption {
- type = types.attrsOf types.anything;
- default = { };
- description = ''
- Structural InvoicePlane configuration. Refer to
-
- for details and supported values.
- '';
- example = literalExpression ''
- {
- SETUP_COMPLETED = true;
- DISABLE_SETUP = true;
- IP_URL = "https://invoice.example.com";
- }
- '';
- };
-
- cron = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enable cron service which periodically runs Invoiceplane tasks.
- Requires key taken from the administration page. Refer to
-
- on how to configure it.
- '';
- };
- key = mkOption {
- type = types.str;
- description = "Cron key taken from the administration page.";
- };
- };
-
- };
-
- };
-in
-{
- # interface
- options = {
- services.invoiceplane = mkOption {
- type = types.submodule {
-
- options.sites = mkOption {
- type = types.attrsOf (types.submodule siteOpts);
- default = { };
- description = "Specification of one or more InvoicePlane sites to serve";
- };
-
- options.webserver = mkOption {
- type = types.enum [
- "caddy"
- "nginx"
- ];
- default = "caddy";
- example = "nginx";
- description = ''
- Which webserver to use for virtual host management.
- '';
- };
- };
- default = { };
- description = "InvoicePlane configuration.";
- };
-
- };
-
- # implementation
- config = mkIf (eachSite != { }) (mkMerge [
- {
-
- assertions = flatten (
- mapAttrsToList (hostName: cfg: [
- {
- assertion = cfg.database.createLocally -> cfg.database.user == user;
- message = ''services.invoiceplane.sites."${hostName}".database.user must be ${user} if the database is to be automatically provisioned'';
- }
- {
- assertion = cfg.database.createLocally -> cfg.database.passwordFile == null;
- message = ''services.invoiceplane.sites."${hostName}".database.passwordFile cannot be specified if services.invoiceplane.sites."${hostName}".database.createLocally is set to true.'';
- }
- {
- assertion = cfg.cron.enable -> cfg.cron.key != null;
- message = ''services.invoiceplane.sites."${hostName}".cron.key must be set in order to use cron service.'';
- }
- ]) eachSite
- );
-
- services.mysql = mkIf (any (v: v.database.createLocally) (attrValues eachSite)) {
- enable = true;
- package = mkDefault pkgs.mariadb;
- ensureDatabases = mapAttrsToList (hostName: cfg: cfg.database.name) eachSite;
- ensureUsers = mapAttrsToList (hostName: cfg: {
- name = cfg.database.user;
- ensurePermissions = {
- "${cfg.database.name}.*" = "ALL PRIVILEGES";
- };
- }) eachSite;
- };
-
- services.phpfpm = {
- phpPackage = pkgs.php81;
- pools = mapAttrs' (
- hostName: cfg:
- (nameValuePair "invoiceplane-${hostName}" {
- inherit user;
- group = webserver.group;
- settings = {
- "listen.owner" = webserver.user;
- "listen.group" = webserver.group;
- }
- // cfg.poolConfig;
- })
- ) eachSite;
- };
-
- }
-
- {
-
- systemd.tmpfiles.rules = flatten (
- mapAttrsToList (hostName: cfg: [
- "d ${cfg.stateDir} 0750 ${user} ${webserver.group} - -"
- "f ${cfg.stateDir}/ipconfig.php 0750 ${user} ${webserver.group} - -"
- "d ${cfg.stateDir}/logs 0750 ${user} ${webserver.group} - -"
- "d ${cfg.stateDir}/uploads 0750 ${user} ${webserver.group} - -"
- "d ${cfg.stateDir}/uploads/archive 0750 ${user} ${webserver.group} - -"
- "d ${cfg.stateDir}/uploads/customer_files 0750 ${user} ${webserver.group} - -"
- "d ${cfg.stateDir}/uploads/temp 0750 ${user} ${webserver.group} - -"
- "d ${cfg.stateDir}/uploads/temp/mpdf 0750 ${user} ${webserver.group} - -"
- "d ${cfg.stateDir}/tmp 0750 ${user} ${webserver.group} - -"
- ]) eachSite
- );
-
- systemd.services.invoiceplane-config = {
- serviceConfig.Type = "oneshot";
- script = concatStrings (
- mapAttrsToList (hostName: cfg: ''
- mkdir -p ${cfg.stateDir}/logs \
- ${cfg.stateDir}/uploads
- if ! grep -q IP_URL "${cfg.stateDir}/ipconfig.php"; then
- cp "${invoiceplane-config hostName cfg}" "${cfg.stateDir}/ipconfig.php"
- fi
- if ! grep -q 'php exit' "${cfg.stateDir}/ipconfig.php"; then
- sed -i "1i # " "${cfg.stateDir}/ipconfig.php"
- fi
- '') eachSite
- );
- wantedBy = [ "multi-user.target" ];
- };
-
- users.users.${user} = {
- group = webserver.group;
- isSystemUser = true;
- };
-
- }
- {
-
- # Cron service implementation
-
- systemd.timers = mapAttrs' (
- hostName: cfg:
- (nameValuePair "invoiceplane-cron-${hostName}" (
- mkIf cfg.cron.enable {
- wantedBy = [ "timers.target" ];
- timerConfig = {
- OnBootSec = "5m";
- OnUnitActiveSec = "5m";
- Unit = "invoiceplane-cron-${hostName}.service";
- };
- }
- ))
- ) eachSite;
-
- systemd.services = mapAttrs' (
- hostName: cfg:
- (nameValuePair "invoiceplane-cron-${hostName}" (
- mkIf cfg.cron.enable {
- serviceConfig = {
- Type = "oneshot";
- User = user;
- ExecStart = "${pkgs.curl}/bin/curl --header 'Host: ${hostName}' http://localhost/invoices/cron/recur/${cfg.cron.key}";
- };
- }
- ))
- ) eachSite;
-
- }
-
- (mkIf (cfg.webserver == "caddy") {
- services.caddy = {
- enable = true;
- virtualHosts = mapAttrs' (
- hostName: cfg:
- (nameValuePair "http://${hostName}" {
- extraConfig = ''
- root * ${pkg hostName cfg}
- file_server
- php_fastcgi unix/${config.services.phpfpm.pools."invoiceplane-${hostName}".socket}
- '';
- })
- ) eachSite;
- };
- })
-
- (mkIf (cfg.webserver == "nginx") {
- services.nginx = {
- enable = true;
- virtualHosts = mapAttrs' (
- hostName: cfg:
- (nameValuePair hostName {
- root = pkg hostName cfg;
- extraConfig = ''
- index index.php index.html index.htm;
-
- if (!-e $request_filename){
- rewrite ^(.*)$ /index.php break;
- }
- '';
-
- locations = {
- "/setup".extraConfig = ''
- rewrite ^(.*)$ http://${hostName}/ redirect;
- '';
-
- "~ .php$" = {
- extraConfig = ''
- fastcgi_split_path_info ^(.+\.php)(/.+)$;
- fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- fastcgi_pass unix:${config.services.phpfpm.pools."invoiceplane-${hostName}".socket};
- include ${config.services.nginx.package}/conf/fastcgi_params;
- include ${config.services.nginx.package}/conf/fastcgi.conf;
- '';
- };
- };
- })
- ) eachSite;
- };
- })
-
- ]);
-}
diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix
index 8d8dd2beac19..f33191419768 100644
--- a/nixos/modules/services/web-apps/limesurvey.nix
+++ b/nixos/modules/services/web-apps/limesurvey.nix
@@ -327,7 +327,7 @@ in
services.phpfpm.pools.limesurvey = {
inherit user group;
- phpPackage = pkgs.php81;
+ phpPackage = pkgs.php83;
phpEnv.DBENGINE = "${cfg.database.dbEngine}";
phpEnv.LIMESURVEY_CONFIG = "${limesurveyConfig}";
# App code cannot access credentials directly since the service starts
@@ -419,8 +419,8 @@ in
environment.LIMESURVEY_CONFIG = limesurveyConfig;
script = ''
# update or install the database as required
- ${pkgs.php81}/bin/php ${cfg.package}/share/limesurvey/application/commands/console.php updatedb || \
- ${pkgs.php81}/bin/php ${cfg.package}/share/limesurvey/application/commands/console.php install admin password admin admin@example.com verbose
+ ${pkgs.php83}/bin/php ${cfg.package}/share/limesurvey/application/commands/console.php updatedb || \
+ ${pkgs.php83}/bin/php ${cfg.package}/share/limesurvey/application/commands/console.php install admin password admin admin@example.com verbose
'';
serviceConfig = {
User = user;
diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix
index 8d4d1851b45d..490a6beab3f6 100644
--- a/nixos/modules/virtualisation/parallels-guest.nix
+++ b/nixos/modules/virtualisation/parallels-guest.nix
@@ -1,6 +1,7 @@
{
config,
lib,
+ pkgs,
...
}:
@@ -27,20 +28,11 @@ in
type = types.bool;
default = false;
description = ''
- This enables Parallels Tools for Linux guests, along with provided
- video, mouse and other hardware drivers.
+ This enables Parallels Tools for Linux guests.
'';
};
- package = mkOption {
- type = types.nullOr types.package;
- default = config.boot.kernelPackages.prl-tools;
- defaultText = "config.boot.kernelPackages.prl-tools";
- example = literalExpression "config.boot.kernelPackages.prl-tools";
- description = ''
- Defines which package to use for prl-tools. Override to change the version.
- '';
- };
+ package = lib.mkPackageOption pkgs "prl-tools" { };
};
};
@@ -53,10 +45,6 @@ in
boot.extraModulePackages = [ prl-tools ];
- boot.kernelModules = [
- "prl_tg"
- ];
-
services.timesyncd.enable = false;
systemd.services.prltoolsd = {
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index f011270baf24..55d1f2e788e3 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -745,7 +745,6 @@ in
installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix { };
intune = runTest ./intune.nix;
invidious = runTest ./invidious.nix;
- invoiceplane = runTest ./invoiceplane.nix;
iodine = runTest ./iodine.nix;
iosched = runTest ./iosched.nix;
ipget = runTest ./ipget.nix;
@@ -1173,10 +1172,6 @@ in
inherit runTest;
php = pkgs.php;
};
- php81 = import ./php/default.nix {
- inherit runTest;
- php = pkgs.php81;
- };
php82 = import ./php/default.nix {
inherit runTest;
php = pkgs.php82;
@@ -1218,7 +1213,6 @@ in
handleTest ./postfix-raise-smtpd-tls-security-level.nix
{ };
postfix-tlspol = runTest ./postfix-tlspol.nix;
- postfixadmin = runTest ./postfixadmin.nix;
postgres-websockets = runTest ./postgres-websockets.nix;
postgresql = handleTest ./postgresql { };
postgrest = runTest ./postgrest.nix;
@@ -1408,12 +1402,16 @@ in
switchTest = runTest ./switch-test.nix;
sx = runTest ./sx.nix;
sympa = runTest ./sympa.nix;
- syncthing = runTest ./syncthing.nix;
- syncthing-folders = runTest ./syncthing-folders.nix;
- syncthing-init = runTest ./syncthing-init.nix;
- syncthing-many-devices = runTest ./syncthing-many-devices.nix;
- syncthing-no-settings = runTest ./syncthing-no-settings.nix;
- syncthing-relay = runTest ./syncthing-relay.nix;
+ syncthing = runTest ./syncthing/main.nix;
+ syncthing-folders = runTest ./syncthing/folders.nix;
+ syncthing-guiPassword = runTest ./syncthing/guiPassword.nix;
+ syncthing-guiPasswordFile = runTest ./syncthing/guiPasswordFile.nix;
+ syncthing-init = runTest ./syncthing/init.nix;
+ # FIXME: Test has been failing since 2025-07-06:
+ # https://github.com/NixOS/nixpkgs/issues/447674
+ # syncthing-many-devices = runTest ./syncthing/many-devices.nix;
+ syncthing-no-settings = runTest ./syncthing/no-settings.nix;
+ syncthing-relay = runTest ./syncthing/relay.nix;
sysfs = runTest ./sysfs.nix;
sysinit-reactivation = runTest ./sysinit-reactivation.nix;
systemd = runTest ./systemd.nix;
@@ -1462,6 +1460,7 @@ in
systemd-machinectl = runTest ./systemd-machinectl.nix;
systemd-misc = runTest ./systemd-misc.nix;
systemd-networkd = runTest ./systemd-networkd.nix;
+ systemd-networkd-batadv = runTest ./systemd-networkd-batadv.nix;
systemd-networkd-bridge = runTest ./systemd-networkd-bridge.nix;
systemd-networkd-dhcpserver = runTest ./systemd-networkd-dhcpserver.nix;
systemd-networkd-dhcpserver-static-leases = runTest ./systemd-networkd-dhcpserver-static-leases.nix;
diff --git a/nixos/tests/frp.nix b/nixos/tests/frp.nix
index 14db56308edc..11a1ce9a78b2 100644
--- a/nixos/tests/frp.nix
+++ b/nixos/tests/frp.nix
@@ -49,7 +49,7 @@
index = "index.php index.html";
};
};
- phpPackage = pkgs.php81;
+ phpPackage = pkgs.php84;
enablePHP = true;
};
@@ -78,8 +78,8 @@
frps.wait_for_open_port(80)
frpc.wait_for_unit("frp.service")
response = frpc.succeed("curl -fvvv -s http://127.0.0.1/")
- assert "PHP Version ${pkgs.php81.version}" in response, "PHP version not detected"
+ assert "PHP Version ${pkgs.php84.version}" in response, "PHP version not detected"
response = frpc.succeed("curl -fvvv -s http://10.0.0.1/")
- assert "PHP Version ${pkgs.php81.version}" in response, "PHP version not detected"
+ assert "PHP Version ${pkgs.php84.version}" in response, "PHP version not detected"
'';
}
diff --git a/nixos/tests/invoiceplane.nix b/nixos/tests/invoiceplane.nix
deleted file mode 100644
index 4ead3ef94ee7..000000000000
--- a/nixos/tests/invoiceplane.nix
+++ /dev/null
@@ -1,116 +0,0 @@
-{ pkgs, ... }:
-
-{
- name = "invoiceplane";
- meta = with pkgs.lib.maintainers; {
- maintainers = [
- onny
- ];
- };
-
- nodes = {
- invoiceplane_caddy =
- { ... }:
- {
- services.invoiceplane.webserver = "caddy";
- services.invoiceplane.sites = {
- "site1.local" = {
- database.name = "invoiceplane1";
- database.createLocally = true;
- enable = true;
- };
- "site2.local" = {
- database.name = "invoiceplane2";
- database.createLocally = true;
- enable = true;
- };
- };
-
- networking.firewall.allowedTCPPorts = [ 80 ];
- networking.hosts."127.0.0.1" = [
- "site1.local"
- "site2.local"
- ];
- };
-
- invoiceplane_nginx =
- { ... }:
- {
- services.invoiceplane.webserver = "nginx";
- services.invoiceplane.sites = {
- "site1.local" = {
- database.name = "invoiceplane1";
- database.createLocally = true;
- enable = true;
- };
- "site2.local" = {
- database.name = "invoiceplane2";
- database.createLocally = true;
- enable = true;
- };
- };
-
- networking.firewall.allowedTCPPorts = [ 80 ];
- networking.hosts."127.0.0.1" = [
- "site1.local"
- "site2.local"
- ];
- };
- };
-
- testScript = ''
- start_all()
-
- invoiceplane_caddy.wait_for_unit("caddy")
- invoiceplane_nginx.wait_for_unit("nginx")
-
- site_names = ["site1.local", "site2.local"]
-
- machines = [invoiceplane_caddy, invoiceplane_nginx]
-
- for machine in machines:
- machine.wait_for_open_port(80)
- machine.wait_for_open_port(3306)
-
- for site_name in site_names:
- machine.wait_for_unit(f"phpfpm-invoiceplane-{site_name}")
-
- with subtest("Website returns welcome screen"):
- assert "Please install InvoicePlane" in machine.succeed(f"curl -L {site_name}")
-
- with subtest("Finish InvoicePlane setup"):
- machine.succeed(
- f"curl -sSfL --cookie-jar cjar {site_name}/setup/language"
- )
- csrf_token = machine.succeed(
- "grep ip_csrf_cookie cjar | cut -f 7 | tr -d '\n'"
- )
- machine.succeed(
- f"curl -sSfL --cookie cjar --cookie-jar cjar -d '_ip_csrf={csrf_token}&ip_lang=english&btn_continue=Continue' {site_name}/setup/language"
- )
- csrf_token = machine.succeed(
- "grep ip_csrf_cookie cjar | cut -f 7 | tr -d '\n'"
- )
- machine.succeed(
- f"curl -sSfL --cookie cjar --cookie-jar cjar -d '_ip_csrf={csrf_token}&btn_continue=Continue' {site_name}/setup/prerequisites"
- )
- csrf_token = machine.succeed(
- "grep ip_csrf_cookie cjar | cut -f 7 | tr -d '\n'"
- )
- machine.succeed(
- f"curl -sSfL --cookie cjar --cookie-jar cjar -d '_ip_csrf={csrf_token}&btn_continue=Continue' {site_name}/setup/configure_database"
- )
- csrf_token = machine.succeed(
- "grep ip_csrf_cookie cjar | cut -f 7 | tr -d '\n'"
- )
- machine.succeed(
- f"curl -sSfl --cookie cjar --cookie-jar cjar -d '_ip_csrf={csrf_token}&btn_continue=Continue' {site_name}/setup/install_tables"
- )
- csrf_token = machine.succeed(
- "grep ip_csrf_cookie cjar | cut -f 7 | tr -d '\n'"
- )
- machine.succeed(
- f"curl -sSfl --cookie cjar --cookie-jar cjar -d '_ip_csrf={csrf_token}&btn_continue=Continue' {site_name}/setup/upgrade_tables"
- )
- '';
-}
diff --git a/nixos/tests/postfixadmin.nix b/nixos/tests/postfixadmin.nix
deleted file mode 100644
index d36bec212c26..000000000000
--- a/nixos/tests/postfixadmin.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ pkgs, ... }:
-{
- name = "postfixadmin";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ globin ];
- };
-
- nodes = {
- postfixadmin =
- { config, pkgs, ... }:
- {
- services.postfixadmin = {
- enable = true;
- hostName = "postfixadmin";
- setupPasswordFile = pkgs.writeText "insecure-test-setup-pw-file" "$2y$10$r0p63YCjd9rb9nHrV9UtVuFgGTmPDLKu.0UIJoQTkWCZZze2iuB1m";
- };
- services.nginx.virtualHosts.postfixadmin = {
- forceSSL = false;
- enableACME = false;
- };
- };
- };
-
- testScript = ''
- postfixadmin.start
- postfixadmin.wait_for_unit("postgresql.target")
- postfixadmin.wait_for_unit("phpfpm-postfixadmin.service")
- postfixadmin.wait_for_unit("nginx.service")
- postfixadmin.succeed(
- "curl -sSfL http://postfixadmin/setup.php -X POST -F 'setup_password=not production'"
- )
- postfixadmin.succeed("curl -sSfL http://postfixadmin/ | grep 'Mail admins login here'")
- '';
-}
diff --git a/nixos/tests/syncthing-folders.nix b/nixos/tests/syncthing/folders.nix
similarity index 100%
rename from nixos/tests/syncthing-folders.nix
rename to nixos/tests/syncthing/folders.nix
diff --git a/nixos/tests/syncthing/guiPassword.nix b/nixos/tests/syncthing/guiPassword.nix
new file mode 100644
index 000000000000..ab802b68f6c0
--- /dev/null
+++ b/nixos/tests/syncthing/guiPassword.nix
@@ -0,0 +1,56 @@
+{ lib, pkgs, ... }:
+{
+ name = "syncthing-guiPassword";
+ meta.maintainers = with lib.maintainers; [ nullcube ];
+ enableOCR = true;
+
+ nodes.machine = {
+ imports = [ ../common/x11.nix ];
+ environment.systemPackages = with pkgs; [
+ syncthing
+ xdotool
+ ];
+
+ programs.firefox = {
+ enable = true;
+ preferences = {
+ # Prevent firefox from asking to save the password
+ "signon.rememberSignons" = false;
+ };
+ };
+
+ services.syncthing = {
+ enable = true;
+ settings.options.urAccepted = -1;
+ settings.gui = {
+ insecureAdminAccess = false;
+ user = "alice";
+ password = "alice_password";
+ };
+ };
+ };
+
+ testScript = ''
+ machine.wait_for_unit("syncthing.service")
+ machine.wait_for_x()
+ machine.execute("xterm -e 'firefox 127.0.0.1:8384' >&2 &")
+ machine.wait_for_window("Syncthing")
+ machine.screenshot("pre-login")
+
+ with subtest("Syncthing requests authentication"):
+ machine.wait_for_text("Authentication Required", 10)
+
+ with subtest("Syncthing password is valid"):
+ machine.execute("xdotool type \"alice\"")
+ machine.execute("xdotool key Tab")
+ machine.execute("xdotool type \"alice_password\"")
+ machine.execute("xdotool key Enter")
+ machine.sleep(2)
+ machine.wait_for_text("This Device", 10)
+ machine.screenshot("post-login")
+
+ with subtest("Plaintext Syncthing password is not in final config"):
+ config = machine.succeed("cat /var/lib/syncthing/.config/syncthing/config.xml")
+ assert "alice_password" not in config
+ '';
+}
diff --git a/nixos/tests/syncthing/guiPasswordFile.nix b/nixos/tests/syncthing/guiPasswordFile.nix
new file mode 100644
index 000000000000..fa25fe946c6a
--- /dev/null
+++ b/nixos/tests/syncthing/guiPasswordFile.nix
@@ -0,0 +1,56 @@
+{ lib, pkgs, ... }:
+{
+ name = "syncthing-guiPasswordFile";
+ meta.maintainers = with lib.maintainers; [ nullcube ];
+ enableOCR = true;
+
+ nodes.machine = {
+ imports = [ ../common/x11.nix ];
+ environment.systemPackages = with pkgs; [
+ syncthing
+ xdotool
+ ];
+
+ programs.firefox = {
+ enable = true;
+ preferences = {
+ # Prevent firefox from asking to save the password
+ "signon.rememberSignons" = false;
+ };
+ };
+
+ services.syncthing = {
+ enable = true;
+ settings.options.urAccepted = -1;
+ settings.gui = {
+ insecureAdminAccess = false;
+ user = "alice";
+ };
+ guiPasswordFile = (pkgs.writeText "syncthing-password-file" ''alice_password'').outPath;
+ };
+ };
+
+ testScript = ''
+ machine.wait_for_unit("syncthing.service")
+ machine.wait_for_x()
+ machine.execute("xterm -e 'firefox 127.0.0.1:8384' >&2 &")
+ machine.wait_for_window("Syncthing")
+ machine.screenshot("pre-login")
+
+ with subtest("Syncthing requests authentication"):
+ machine.wait_for_text("Authentication Required", 10)
+
+ with subtest("Syncthing password is valid"):
+ machine.execute("xdotool type \"alice\"")
+ machine.execute("xdotool key Tab")
+ machine.execute("xdotool type \"alice_password\"")
+ machine.execute("xdotool key Enter")
+ machine.sleep(2)
+ machine.wait_for_text("This Device", 10)
+ machine.screenshot("post-login")
+
+ with subtest("Plaintext Syncthing password is not in final config"):
+ config = machine.succeed("cat /var/lib/syncthing/.config/syncthing/config.xml")
+ assert "alice_password" not in config
+ '';
+}
diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing/init.nix
similarity index 100%
rename from nixos/tests/syncthing-init.nix
rename to nixos/tests/syncthing/init.nix
diff --git a/nixos/tests/syncthing.nix b/nixos/tests/syncthing/main.nix
similarity index 100%
rename from nixos/tests/syncthing.nix
rename to nixos/tests/syncthing/main.nix
diff --git a/nixos/tests/syncthing-many-devices.nix b/nixos/tests/syncthing/many-devices.nix
similarity index 100%
rename from nixos/tests/syncthing-many-devices.nix
rename to nixos/tests/syncthing/many-devices.nix
diff --git a/nixos/tests/syncthing-no-settings.nix b/nixos/tests/syncthing/no-settings.nix
similarity index 100%
rename from nixos/tests/syncthing-no-settings.nix
rename to nixos/tests/syncthing/no-settings.nix
diff --git a/nixos/tests/syncthing-relay.nix b/nixos/tests/syncthing/relay.nix
similarity index 100%
rename from nixos/tests/syncthing-relay.nix
rename to nixos/tests/syncthing/relay.nix
diff --git a/nixos/tests/systemd-networkd-batadv.nix b/nixos/tests/systemd-networkd-batadv.nix
new file mode 100644
index 000000000000..20de645f25c7
--- /dev/null
+++ b/nixos/tests/systemd-networkd-batadv.nix
@@ -0,0 +1,134 @@
+{ lib, ... }:
+{
+ name = "systemd-networkd-batadv";
+
+ meta = with lib.maintainers; {
+ maintainers = [ herbetom ];
+ };
+
+ nodes = {
+ machineA =
+ { config, pkgs, ... }:
+ {
+ virtualisation.vlans = [ 1 ];
+ systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";
+
+ networking = {
+ useNetworkd = true;
+ useDHCP = false;
+ firewall.enable = false;
+ };
+
+ # Use default batman_adv module from kernel
+ boot.extraModulePackages = [ ];
+
+ environment.systemPackages = [
+ pkgs.batctl
+ pkgs.jq
+ ];
+
+ systemd.network = {
+ networks."10-eth1" = {
+ matchConfig.Name = "eth1";
+ networkConfig = {
+ BatmanAdvanced = config.systemd.network.netdevs."20-bat0".netdevConfig.Name;
+ IPv6AcceptRA = false;
+ };
+ };
+ netdevs."20-bat0" = {
+ netdevConfig = {
+ Name = "bat0";
+ Kind = "batadv";
+ MACAddress = "00:00:5e:00:53:00";
+ };
+ batmanAdvancedConfig = {
+ OriginatorIntervalSec = "5";
+ RoutingAlgorithm = "batman-iv";
+ };
+ };
+ networks."20-bat0" = {
+ matchConfig.Name = config.systemd.network.netdevs."20-bat0".netdevConfig.Name;
+ networkConfig.IPv6AcceptRA = false;
+ address = [
+ "10.0.0.1/24"
+ "2001:db8::a/64"
+ ];
+
+ };
+ };
+ };
+ machineB =
+ { config, pkgs, ... }:
+ {
+ virtualisation.vlans = [ 1 ];
+ systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";
+
+ networking = {
+ useNetworkd = true;
+ useDHCP = false;
+ firewall.enable = false;
+ };
+
+ # Use batman_adv module from nixpkgs
+ boot.extraModulePackages = [ config.boot.kernelPackages.batman_adv ];
+
+ environment.systemPackages = [
+ pkgs.batctl
+ pkgs.jq
+ ];
+
+ systemd.network = {
+ networks."10-eth1" = {
+ matchConfig.Name = "eth1";
+ networkConfig = {
+ BatmanAdvanced = config.systemd.network.netdevs."20-bat0".netdevConfig.Name;
+ IPv6AcceptRA = false;
+ };
+ };
+ netdevs."20-bat0" = {
+ netdevConfig = {
+ Name = "bat0";
+ Kind = "batadv";
+ MACAddress = "00:00:5e:00:53:10";
+ };
+ batmanAdvancedConfig = {
+ OriginatorIntervalSec = "5";
+ RoutingAlgorithm = "batman-iv";
+ };
+ };
+ networks."20-bat0" = {
+ matchConfig.Name = config.systemd.network.netdevs."20-bat0".netdevConfig.Name;
+ networkConfig.IPv6AcceptRA = false;
+ address = [
+ "10.0.0.2/24"
+ "2001:db8::b/64"
+ ];
+
+ };
+ };
+ };
+ };
+
+ testScript = ''
+ start_all()
+
+ machineA.wait_for_unit("default.target")
+ machineB.wait_for_unit("default.target")
+
+ print(machineA.succeed("batctl -v").strip())
+ print(machineB.succeed("batctl -v").strip())
+
+ machineA.wait_until_succeeds('batctl neighbors_json | jq -e ".[0].neigh_address | select(length > 0)"')
+
+ print(machineA.succeed("batctl n").strip())
+ print(machineB.succeed("batctl n").strip())
+
+ print(machineA.wait_until_succeeds("batctl ping -c 5 00:00:5e:00:53:10").strip())
+ print(machineB.wait_until_succeeds("batctl ping -c 5 00:00:5e:00:53:00").strip())
+
+ print(machineA.wait_until_succeeds("ping -c 5 2001:db8::b"))
+ print(machineB.wait_until_succeeds("ping -c 5 10.0.0.1"))
+
+ machineA.fail("ping -c 3 10.0.0.99")
+ '';
+}
diff --git a/nixos/tests/web-servers/unit-php.nix b/nixos/tests/web-servers/unit-php.nix
index ae7503ad0ffa..b1e70c1faa80 100644
--- a/nixos/tests/web-servers/unit-php.nix
+++ b/nixos/tests/web-servers/unit-php.nix
@@ -18,15 +18,15 @@ in
services.unit = {
enable = true;
config = pkgs.lib.strings.toJSON {
- listeners."*:9081".application = "php_81";
- applications.php_81 = {
- type = "php 8.1";
+ listeners."*:9081".application = "php_82";
+ applications.php_82 = {
+ type = "php 8.2";
processes = 1;
user = "testuser";
group = "testgroup";
root = "${testdir}/www";
index = "info.php";
- options.file = "${pkgs.unit.usedPhp81}/lib/php.ini";
+ options.file = "${pkgs.unit.usedPhp82}/lib/php.ini";
};
};
};
@@ -49,7 +49,7 @@ in
# Check so we get an evaluated PHP back
response = machine.succeed("curl -f -vvv -s http://127.0.0.1:9081/")
- assert "PHP Version ${pkgs.unit.usedPhp81.version}" in response, "PHP version not detected"
+ assert "PHP Version ${pkgs.unit.usedPhp82.version}" in response, "PHP version not detected"
# Check so we have database and some other extensions loaded
for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:
diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/applications/audio/mellowplayer/default.nix
index 4e272459bcd4..418e80e15c20 100644
--- a/pkgs/applications/audio/mellowplayer/default.nix
+++ b/pkgs/applications/audio/mellowplayer/default.nix
@@ -55,7 +55,7 @@ mkDerivation rec {
# TODO: The tests are failing because it can't locate QT plugins. Is there a better way to do this?
+ (builtins.concatStringsSep "\n" (
lib.lists.flatten (
- builtins.map (pkg: [
+ map (pkg: [
(lib.optionalString (pkg ? qtPluginPrefix) ''
export QT_PLUGIN_PATH="${pkg}/${pkg.qtPluginPrefix}"''${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH
'')
diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix
index 3d654cba8733..fc65c1475f06 100644
--- a/pkgs/applications/audio/pianoteq/default.nix
+++ b/pkgs/applications/audio/pianoteq/default.nix
@@ -84,7 +84,7 @@ let
installPhase = ''
runHook preInstall
mkdir -p $out/bin
- mv -t $out/bin ${builtins.concatStringsSep " " (builtins.map (dir: "Pianoteq*/${dir}/*") archdirs)}
+ mv -t $out/bin ${builtins.concatStringsSep " " (map (dir: "Pianoteq*/${dir}/*") archdirs)}
install -Dm644 ${./pianoteq.svg} $out/share/icons/hicolor/scalable/apps/pianoteq.svg
for size in 16 22 32 48 64 128 256; do
dir=$out/share/icons/hicolor/"$size"x"$size"/apps
diff --git a/pkgs/applications/audio/sonic-pi/update.sh b/pkgs/applications/audio/sonic-pi/update.sh
index 014af49e73a8..1d1cdbc0ff5b 100755
--- a/pkgs/applications/audio/sonic-pi/update.sh
+++ b/pkgs/applications/audio/sonic-pi/update.sh
@@ -19,7 +19,7 @@ vendorhash() {
findpath() {
path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
- outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
+ outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "fetchGit \"$nixpkgs\"")"
if [ -n "$outpath" ]; then
path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}"
diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix
index 49e97d731593..14519496f5f6 100644
--- a/pkgs/applications/blockchains/bitcoin-knots/default.nix
+++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
echo "OK"
'';
in
- builtins.concatStringsSep "\n" (builtins.map script builderKeys);
+ builtins.concatStringsSep "\n" (map script builderKeys);
in
''
pushd $(mktemp -d)
diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix
index 2a1b52daceb7..b79e33beca2b 100644
--- a/pkgs/applications/blockchains/bitcoin/default.nix
+++ b/pkgs/applications/blockchains/bitcoin/default.nix
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
echo "OK"
'';
in
- builtins.concatStringsSep "\n" (builtins.map script builderKeys);
+ builtins.concatStringsSep "\n" (map script builderKeys);
in
''
pushd $(mktemp -d)
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index f80b102c889f..dcf89cbac870 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -20,8 +20,8 @@ let
sha256Hash = "sha256-pet3uTmL4pQ/FxB2qKv+IZNx540gMC7hmfOaQ8iLQpQ=";
};
betaVersion = {
- version = "2025.1.3.6"; # "Android Studio Narwhal 3 Feature Drop | 2025.1.3 RC 2"
- sha256Hash = "sha256-S8KK/EGev0v03fVywIkD6Ym3LrciGKXJVorzyZ1ljdQ=";
+ version = "2025.1.4.7"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 RC 2"
+ sha256Hash = "sha256-KrKUsA7wFeI7IBa9VOp+MERqWIiMnNzLFO8oF0rCiIw=";
};
latestVersion = {
version = "2025.2.1.3"; # "Android Studio Otter | 2025.2.1 Canary 3"
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix
index a4bd5c27198e..4b53e05ffa0d 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix
@@ -21,8 +21,8 @@
let
- appPythonDeps = builtins.map (item: item.eafPythonDeps) enabledApps;
- appOtherDeps = builtins.map (item: item.eafOtherDeps) enabledApps;
+ appPythonDeps = map (item: item.eafPythonDeps) enabledApps;
+ appOtherDeps = map (item: item.eafOtherDeps) enabledApps;
pythonPackageLists = [
(
@@ -38,7 +38,7 @@ let
)
]
++ appPythonDeps;
- pythonPkgs = ps: builtins.concatLists (builtins.map (f: f ps) pythonPackageLists);
+ pythonPkgs = ps: builtins.concatLists (map (f: f ps) pythonPackageLists);
pythonEnv = python3.withPackages pythonPkgs;
otherPackageLists = [
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index f1505d45f4f9..e74e21254b71 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: {
{
backendPath = (
lib.concatStringsSep " " (
- builtins.map (x: ''"-B${x}"'') (
+ map (x: ''"-B${x}"'') (
[
# Paths necessary so the JIT compiler finds its libraries:
"${lib.getLib libgccjit}/lib"
diff --git a/pkgs/applications/editors/jetbrains/plugins/tests.nix b/pkgs/applications/editors/jetbrains/plugins/tests.nix
index 8ebfc4194fc2..f260a8560287 100644
--- a/pkgs/applications/editors/jetbrains/plugins/tests.nix
+++ b/pkgs/applications/editors/jetbrains/plugins/tests.nix
@@ -59,7 +59,7 @@ in
plugins-for =
with lib.asserts;
ide:
- builtins.map (plugin: plugin.name) (
+ map (plugin: plugin.name) (
builtins.filter (
plugin:
(
diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix
index ecf8de4257b0..90f412953372 100644
--- a/pkgs/applications/editors/jetbrains/source/build.nix
+++ b/pkgs/applications/editors/jetbrains/source/build.nix
@@ -185,7 +185,7 @@ let
mkRepoEntry = entry: {
name = ".m2/repository/" + entry.path;
path = fetchurl {
- urls = builtins.map (url: "${url}/${entry.url}") repositories;
+ urls = map (url: "${url}/${entry.url}") repositories;
sha256 = entry.hash;
};
};
diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix
index 00d19b291523..1a2b6a62258b 100644
--- a/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix
+++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/deps.nix
@@ -18,7 +18,7 @@ rec {
{
extraClasspaths ? [ ],
}:
- (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages)
+ (map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages)
++ extraClasspaths;
makeClasspaths =
{
diff --git a/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix b/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix
index 11a615cfba82..15020deb91b4 100644
--- a/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix
+++ b/pkgs/applications/editors/kakoune/plugins/build-kakoune-plugin.nix
@@ -18,7 +18,7 @@ rec {
...
}:
stdenv.mkDerivation (
- (builtins.removeAttrs attrs [
+ (removeAttrs attrs [
"namePrefix"
"path"
])
diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix
index 354b2b0c42fc..8669a4849aba 100644
--- a/pkgs/applications/editors/neovim/utils.nix
+++ b/pkgs/applications/editors/neovim/utils.nix
@@ -230,7 +230,7 @@ let
nvimGrammars = lib.mapAttrsToList (
name: value:
value.origGrammar
- or (builtins.throw "additions to `pkgs.vimPlugins.nvim-treesitter.grammarPlugins` set should be passed through `pkgs.neovimUtils.grammarToPlugin` first")
+ or (throw "additions to `pkgs.vimPlugins.nvim-treesitter.grammarPlugins` set should be passed through `pkgs.neovimUtils.grammarToPlugin` first")
) vimPlugins.nvim-treesitter.grammarPlugins;
isNvimGrammar = x: builtins.elem x nvimGrammars;
diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix
index da26b2a046c7..38452146e105 100644
--- a/pkgs/applications/editors/sublime/3/common.nix
+++ b/pkgs/applications/editors/sublime/3/common.nix
@@ -42,7 +42,7 @@ let
];
downloadUrl = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2";
versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}";
- versionFile = builtins.toString ./packages.nix;
+ versionFile = toString ./packages.nix;
archSha256 = if stdenv.hostPlatform.system == "i686-linux" then x32sha256 else x64sha256;
arch = if stdenv.hostPlatform.system == "i686-linux" then "x32" else "x64";
diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix
index 6aff26de3622..89f155373d16 100644
--- a/pkgs/applications/editors/sublime/4/common.nix
+++ b/pkgs/applications/editors/sublime/4/common.nix
@@ -46,7 +46,7 @@ let
downloadUrl =
arch: "https://download.sublimetext.com/sublime_text_build_${buildVersion}_${arch}.tar.xz";
versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}";
- versionFile = builtins.toString ./packages.nix;
+ versionFile = toString ./packages.nix;
neededLibraries = [
xorg.libX11
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
index fba459a0689d..f9b35edcf583 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
@@ -111,7 +111,7 @@ in
tree-sitter-queries-are-present-for-custom-grammars =
let
pluginsToCheck =
- builtins.map (grammar: grammarToPlugin grammar)
+ map (grammar: grammarToPlugin grammar)
# true is here because there is `recurseForDerivations = true`
(lib.remove true (lib.attrValues tree-sitter-grammars));
in
diff --git a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
index dbe41260ca06..0f6aa0f404fe 100644
--- a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
+++ b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
@@ -202,7 +202,7 @@ let
startWithDeps = findDependenciesRecursively start;
allPlugins = lib.unique (startWithDeps ++ depsOfOptionalPlugins);
allPython3Dependencies =
- ps: lib.flatten (builtins.map (plugin: (plugin.python3Dependencies or (_: [ ])) ps) allPlugins);
+ ps: lib.flatten (map (plugin: (plugin.python3Dependencies or (_: [ ])) ps) allPlugins);
python3Env = python3.withPackages allPython3Dependencies;
packdirStart = vimFarm "pack/${packageName}/start" "packdir-start" allPlugins;
diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
index bc63fed57953..8b0a7831d3d9 100644
--- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "basedpyright";
publisher = "detachhead";
- version = "1.31.4";
- hash = "sha256-KpX268CYGHtBJdDVMzjn5vLYupplikgAHvi5i+FhbHo=";
+ version = "1.31.6";
+ hash = "sha256-kYy3rpDhyE8n0aBRE8tUYz9Ayvh0kzEDmHLclF9pBcc=";
};
meta = {
changelog = "https://github.com/detachhead/basedpyright/releases";
diff --git a/pkgs/applications/editors/vscode/extensions/updateSettings.nix b/pkgs/applications/editors/vscode/extensions/updateSettings.nix
index fe23e099b536..843bcf4fd270 100644
--- a/pkgs/applications/editors/vscode/extensions/updateSettings.nix
+++ b/pkgs/applications/editors/vscode/extensions/updateSettings.nix
@@ -24,7 +24,7 @@ let
)'';
createEmptySettingsCmd = ''mkdir -p .vscode && echo "{}" > ${vscodeSettingsFile}'';
- fileName = builtins.baseNameOf vscodeSettingsFile;
+ fileName = baseNameOf vscodeSettingsFile;
symlinkFromUserSettingCmd = lib.optionalString symlinkFromUserSetting ''&& mkdir -p "${userSettingsFolder}" && ln -sfv "$(pwd)/${vscodeSettingsFile}" "${userSettingsFolder}/" '';
in
diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
index bb15fecc67d2..4719b4ab97dc 100644
--- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
+++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
@@ -127,7 +127,7 @@ let
extensionFromVscodeMarketplace = mktplcExtRefToExtDrv;
extensionsFromVscodeMarketplace =
- mktplcExtRefList: builtins.map extensionFromVscodeMarketplace mktplcExtRefList;
+ mktplcExtRefList: map extensionFromVscodeMarketplace mktplcExtRefList;
vscodeWithConfiguration = import ./vscodeWithConfiguration.nix {
inherit lib extensionsFromVscodeMarketplace writeShellScriptBin;
diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
index 321492ba93d6..7d73845701dd 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mame2003-plus";
- version = "0-unstable-2025-09-20";
+ version = "0-unstable-2025-09-30";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame2003-plus-libretro";
- rev = "a4239124d4da03ae4658610832e425febb0db134";
- hash = "sha256-TPYYFfAGJqlKpfLS1qDpzQXIfSXXFjRj1W/3+FTYMRQ=";
+ rev = "59b8a9fb06a47a3ce6aecd09b07f3f001e3d9b08";
+ hash = "sha256-hfC/6UqUSDd2FWpcCVcw4pkAtyHJGCgvG4UKlkM+fpk=";
};
makefile = "Makefile";
diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix
deleted file mode 100644
index 311ed40220f3..000000000000
--- a/pkgs/applications/graphics/qiv/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- lib,
- stdenv,
- fetchurl,
- pkg-config,
- gtk2,
- imlib2,
- file,
- lcms2,
- libexif,
-}:
-
-stdenv.mkDerivation (rec {
- version = "2.3.3";
- pname = "qiv";
-
- src = fetchurl {
- url = "https://spiegl.de/qiv/download/${pname}-${version}.tgz";
- sha256 = "sha256-7whf/eLUiwWzZlk55a4eNZ06OBAI+4J2hPfW/UxTNwQ=";
- };
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [
- gtk2
- imlib2
- file
- lcms2
- libexif
- ];
-
- preBuild = ''
- substituteInPlace Makefile --replace /usr/local "$out"
- substituteInPlace Makefile --replace /man/ /share/man/
- substituteInPlace Makefile --replace /share/share/ /share/
- '';
-
- meta = with lib; {
- description = "Quick image viewer";
- homepage = "http://spiegl.de/qiv/";
- license = licenses.gpl2;
- platforms = platforms.linux;
- mainProgram = "qiv";
- };
-})
diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix
index a473613ad5e7..361ba67a2678 100644
--- a/pkgs/applications/graphics/sane/backends/default.nix
+++ b/pkgs/applications/graphics/sane/backends/default.nix
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
rmdir $out/share/sane/epjitsu
ln -svT ${scanSnapDriversPackage} $out/share/sane/epjitsu
''
- + lib.concatStrings (builtins.map installFirmware compatFirmware);
+ + lib.concatStrings (map installFirmware compatFirmware);
# parallel install creates a bad symlink at $out/lib/sane/libsane.so.1 which prevents finding plugins
# https://github.com/NixOS/nixpkgs/issues/224569
diff --git a/pkgs/applications/misc/sweethome3d/linux.nix b/pkgs/applications/misc/sweethome3d/linux.nix
index 11d5fee2ffb9..46f24c071cf9 100644
--- a/pkgs/applications/misc/sweethome3d/linux.nix
+++ b/pkgs/applications/misc/sweethome3d/linux.nix
@@ -26,7 +26,7 @@ let
# TODO: Should we move this to `lib`? Seems like its would be useful in many cases.
extensionOf =
- filePath: lib.concatStringsSep "." (lib.tail (lib.splitString "." (builtins.baseNameOf filePath)));
+ filePath: lib.concatStringsSep "." (lib.tail (lib.splitString "." (baseNameOf filePath)));
installIcons =
iconName: icons:
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index feac9db09d2e..491da6c1aba0 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -256,7 +256,7 @@ let
''
else
''
- mkdir -p ${builtins.dirOf path}
+ mkdir -p ${dirOf path}
cp -r ${dep}/. ${path}
''
)
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index e6c2fd10834e..04e4e0cdf046 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,2477 +1,2477 @@
{
- version = "143.0.3";
+ version = "143.0.4";
sources = [
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ach/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ach/firefox-143.0.4.tar.xz";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "a01923c861c629e4c9928814847dada2c1140d60884f51ab4026941aeca48e40";
+ sha256 = "fc9161d7822263f35d83d311086468d11e783acc2460cfe7da3ca5ae949bf81e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/af/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/af/firefox-143.0.4.tar.xz";
locale = "af";
arch = "linux-x86_64";
- sha256 = "b91c7c74e97f5c0e808db502d189e24224059ea768c1a0681307dbcd95eb7b00";
+ sha256 = "1d02eac9faec6a835cf6c053956c5c0439d2863bc35adaaba6b3dfb049d06574";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/an/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/an/firefox-143.0.4.tar.xz";
locale = "an";
arch = "linux-x86_64";
- sha256 = "738655c63ef2558527c2f172c9fba1a3f90942ccfb7df58cac4f615569c27fb6";
+ sha256 = "93a754b23297c5c9c148ef9018e5c8ba5e1069a2ed13367a2e9d83f55926c7fc";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ar/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ar/firefox-143.0.4.tar.xz";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "d7dfd3e601ae23a382df4265bb1f51c5ea5aee3e16042a4467052bc7c6bd2cbf";
+ sha256 = "adfbe476125e4ec3ba9d0f2746fa8bb394d4d33dad76c04096818b8c32c00e82";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ast/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ast/firefox-143.0.4.tar.xz";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "6ae791ba341fb5770bb562e2359dec776d7e7ed3c33fd69889d439e71f22b317";
+ sha256 = "6b027a7d28816eead572d1f3999fc389dbf43cbd17176b27713e21e635ae1fcb";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/az/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/az/firefox-143.0.4.tar.xz";
locale = "az";
arch = "linux-x86_64";
- sha256 = "1dcdfad54da662ff7a50864810081291cc288eb6c82cc6164cbd6b67962a2e36";
+ sha256 = "e9ff601dea1604e8f1f0507c8dd55d42b72c53acc430d5d4c1e74eb10d5b7cdc";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/be/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/be/firefox-143.0.4.tar.xz";
locale = "be";
arch = "linux-x86_64";
- sha256 = "d8c8c024cacb65f3cf9174b1c064ca359c69c23bdc2d1e2138893238335d740e";
+ sha256 = "3233f2d50b77ed77ea49339f0d2352affeb33d70c96ea21395d15cf56eb341ef";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/bg/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/bg/firefox-143.0.4.tar.xz";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "3cb5669ebfdbec9f73d1c58d8daf96a0d4c4d377ddb94ecb9f5b7bf52823811b";
+ sha256 = "5033800a3f6f5f1ca3700c875165e8b6f7d58c4e747d968264b2cfd355ff587a";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/bn/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/bn/firefox-143.0.4.tar.xz";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "162943a9a13077bf5da05497ad0429a01e55d02b4bece2cc17c0e2d131a44f8f";
+ sha256 = "1ede43b96c029fc21fcb77fd7b5f00808f70a59b704f4f5326d2fdc569e8a80c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/br/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/br/firefox-143.0.4.tar.xz";
locale = "br";
arch = "linux-x86_64";
- sha256 = "dd215107f98ae440dab82df5a5fd381c6cc628b4e33bde41e17af598429eeb4d";
+ sha256 = "944079c573399022b388f067132d610a7f5fe55362c067db93507c8468cdc4b5";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/bs/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/bs/firefox-143.0.4.tar.xz";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "b21b44faa183f127348a195cd89ee9940c56a8973b04f2fea3fc15e9989e334c";
+ sha256 = "2740caddaeecdaf3731d9f4e4651d0516953084e8fc51c1a7b4f2b7e09312286";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ca-valencia/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ca-valencia/firefox-143.0.4.tar.xz";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "5f17897abc3b61da2551a89f81135acc6758a473efab4821d72c897d69926566";
+ sha256 = "534d6032f529421bde15a88b7e5edcdb0cec143ba487efda5ba9ce7e89e83e89";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ca/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ca/firefox-143.0.4.tar.xz";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "b367adc555ecc927209185988806ef17f2c1cb0d5cd28f116e1ef930cf0d39be";
+ sha256 = "1cb529f1ecd15576c50f02e2fecb97453bddca6a79c091bd96793a7edd03c61c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/cak/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/cak/firefox-143.0.4.tar.xz";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "561c57bf5484d715d1d55323033854d30951ae12bf954292f6ff2b2998a9ef6b";
+ sha256 = "45e93892d513085cd651851b7ec5648dd411febc38e1523f36ed363bf81026b3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/cs/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/cs/firefox-143.0.4.tar.xz";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "5bb5689b61761742cbf89e5812f105660159cbd5071a1abb7aa858eff69e5fa6";
+ sha256 = "89a7df07cf2dcfcb7da6a4a1a43823ba80b35daa13e72a0a561eaf9c3cce9d6f";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/cy/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/cy/firefox-143.0.4.tar.xz";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "2baf15876e5daf46e34468e4798c74bcf36c83cf13dcde8e07fadf2be05b4dfe";
+ sha256 = "acc8af1e13d5cd7eb109c1dda87741ff572743d0b521474221759b0801d8c16c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/da/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/da/firefox-143.0.4.tar.xz";
locale = "da";
arch = "linux-x86_64";
- sha256 = "3366f5a8ffafb182ebb66c1a41e90ea0ee219568cdff8b2732801d1b1280894c";
+ sha256 = "71717ee7a54c607ec27ea2f27a90397f6653be77589ac45b59db4f8d98df2d40";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/de/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/de/firefox-143.0.4.tar.xz";
locale = "de";
arch = "linux-x86_64";
- sha256 = "45e58ad9e0cc104396f877a08be3e613afa23dfa2e8ea258e4e6fc74f73a7194";
+ sha256 = "cbbca7c2a79b793d440c7d42a8ab37c452de416cde6b37dff1fb85b89d4075b8";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/dsb/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/dsb/firefox-143.0.4.tar.xz";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "a000472cca359af36b83f2a88bb24a86d8fe7c0b3d71db6139a2613253b819db";
+ sha256 = "35854de10dcfa0f068b8dbc9b41da99a33cd860a9dbc13d46cfdaed4848cfdac";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/el/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/el/firefox-143.0.4.tar.xz";
locale = "el";
arch = "linux-x86_64";
- sha256 = "482d5d057becfaf927539b010146662826ac91ab31e105d08d96b2f24124822e";
+ sha256 = "b61e0eaff4c281cc5fb26b15327e6cd3afa2a6b6c39b56175c81fc7d92936ddb";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/en-CA/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/en-CA/firefox-143.0.4.tar.xz";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "274ba64ac473caa91d743295a6bfed4bea090f94d9638be59c0c309c1337cecb";
+ sha256 = "801fba90331b85589b0ecdcde540af217174b9754011c30467d1f7f83c367ec3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/en-GB/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/en-GB/firefox-143.0.4.tar.xz";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "8a1c2b720ebd8453e301a05c14ac86df642cb2b0bde222b36de9d1f12ea9ac0c";
+ sha256 = "ecd5cf7f755311c00eb4be055fe63f074062a3bcaa312e26edfa31e986d19175";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/en-US/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/en-US/firefox-143.0.4.tar.xz";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "c0d70d6e4f2026f0e677addd595b58e0f898a991b0fd9e6ca0cafb048d10f442";
+ sha256 = "2cb91bd5c8755a83d65e4ef46a2ce99cfcc0b94e04673669e5e5384320384339";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/eo/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/eo/firefox-143.0.4.tar.xz";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "6b3c4d8f269bf3b57166e91531d6d2e1fd14d72d24e3b1525ecee304e8de4a86";
+ sha256 = "e97fb2ebbc834f0cccb5b9d998410b4a5bc55398088928d9025d9278b34d81c0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/es-AR/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/es-AR/firefox-143.0.4.tar.xz";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "7f116ee6073e9bb3335743ab957b575af8bf6d8fb180de4bdf01325d389134e0";
+ sha256 = "acdd4d432fca1061f917091cc5a023ef6fc5630e5e61fa32d2862f0f7627b9b1";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/es-CL/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/es-CL/firefox-143.0.4.tar.xz";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "417bdacf574d27783fa7f384d484041916da53055cac4387e7365a3c11f5f80c";
+ sha256 = "5946590c933d55d12c21f6cede6dea3522c73bb9f9a1907383cf40ba4a1a5caa";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/es-ES/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/es-ES/firefox-143.0.4.tar.xz";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "9531074814fb31ffd968bb7719e777a32949521549f313c83d4a93173eb0b762";
+ sha256 = "948eb1d86e9083f8651c830bafc9af6197ec6045fc9623cb0b5d9d1745caa7a1";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/es-MX/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/es-MX/firefox-143.0.4.tar.xz";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "599f2fbd10c27db25c72054ffeea3096a1fd00f1dcee5e50933d8cb89b565931";
+ sha256 = "efe8c8dede7343366ea2ad6c76996489629fba292952cdf0cb2146dc684a3096";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/et/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/et/firefox-143.0.4.tar.xz";
locale = "et";
arch = "linux-x86_64";
- sha256 = "efbd598e08e73af1d9d0877e60481e73b7e02930545d85d9c16c34ce22c28f2f";
+ sha256 = "f640add1fae307274268595ee1a02dcc0fb7555d4e1bc910667a2f23d6ab916d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/eu/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/eu/firefox-143.0.4.tar.xz";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "7108b4d729052e2dc417e93f958e4a9ab577bd0bb8d3edabc0e49c5582736755";
+ sha256 = "8b1ff2150cac975c977f5f513004dbc12be879c412ad10fc5ef3b0e241afe021";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/fa/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/fa/firefox-143.0.4.tar.xz";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "5c53fbc3112bcee74643e3e797c4bb3471bcfe5df9db72140b51e011107b7f22";
+ sha256 = "f17329f4cc037cdeff7a977d893bd7c5090401e5a479fd4e4e0dddcb229aaada";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ff/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ff/firefox-143.0.4.tar.xz";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "540322b5fd036e2b53b2d38282b7eb9fc268d3873fbca32b1484e70fc0c00c7d";
+ sha256 = "05faffc0ca3236af2d79141a53d023b0ae8ae64e2dccbe1040a8d072fbd698f2";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/fi/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/fi/firefox-143.0.4.tar.xz";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "fb589f8b6cd10707a28c8fa9383d2ff00833a3e5dd3afb0adfe1499c430ae91a";
+ sha256 = "b4f81b2c19a66b82939bb3b612d2e55737565501f5cf1bb2e3d797bbf3f335b8";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/fr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/fr/firefox-143.0.4.tar.xz";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "4c481134702543f1627a84564de7f7b3a4273faf3ee4b419aca1899ad07cb0b0";
+ sha256 = "45e09ab585223c385a3fc48b9a7ad5167ba0b8d700a29df7b0a6028bafeb8b89";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/fur/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/fur/firefox-143.0.4.tar.xz";
locale = "fur";
arch = "linux-x86_64";
- sha256 = "fda22987901a37e82a4dd29526cfcf8bc6c7c4976bd3784102d03003a929874b";
+ sha256 = "797406e7a15e0cb0ca41bb1ba16c25e33cf5f9fa9dd26dc4872e00301f587ae7";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/fy-NL/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/fy-NL/firefox-143.0.4.tar.xz";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "a057be21245de0995018a3c3a95d9b29a5124ef5a3b5a2d4ee8feaba8f04a147";
+ sha256 = "0429648fe6efbc190fbedbb455a3e975dc948ea037b0d3dd4b7908d491875705";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ga-IE/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ga-IE/firefox-143.0.4.tar.xz";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "421fa60d35982bf3a23c5114ff542cb8f5a30e1347c2aad23fe5012bb02f1386";
+ sha256 = "b64684f59b63915c4a8b57474307ef2d956912cb69bd95684988cbe493b9ab2d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/gd/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/gd/firefox-143.0.4.tar.xz";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "26c6d0d5f53ff33f1d3efa82d96cf195cadd2c1c57f1b7bc40b71bbb8ea8b903";
+ sha256 = "861bac655d5fb228f860b1fd51eeabcaf75e9b46df00aa5a3cd53983e0b4ae0e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/gl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/gl/firefox-143.0.4.tar.xz";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "4351e7ecd133015acc1f7fff4d49ff50531cfbeff3f9f1a26274f5230be323bc";
+ sha256 = "79832b08438a3550ed0f9b27762c8a2c6a421180154866de1d527ea28d05b88c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/gn/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/gn/firefox-143.0.4.tar.xz";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "8d771f1d2614fa762d2c7f4f0affbe89b4244ba425cbe6537c014bb1e7ef2fa4";
+ sha256 = "27101cbabe0eec5e296ec9ee7fc6ffc72468beecda78ce055d122d4324d60afe";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/gu-IN/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/gu-IN/firefox-143.0.4.tar.xz";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "b7282de46e5351a71507c08a12595625126ab645539716c37fc8731bb18f4077";
+ sha256 = "fb725a226b06eb30782ac32e896ec2aa637f42a94a95dd00f966742eb45eb214";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/he/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/he/firefox-143.0.4.tar.xz";
locale = "he";
arch = "linux-x86_64";
- sha256 = "98d01d5e33148e006f1de0eb97e83f38096a6101978ed955507e57f108ac966c";
+ sha256 = "7dc5c66a2627933810c8be4e5d444819ed86b345b4f0be33da8e2eae8b9b0039";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/hi-IN/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/hi-IN/firefox-143.0.4.tar.xz";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "f4d293101e9d9b869a4f82514568c726f4c5a18463980d137c832c3b318fc16c";
+ sha256 = "ab4b46f9344cdd30f759d70f2cf611afdf3bd55ddaf018674451c941c6cb1906";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/hr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/hr/firefox-143.0.4.tar.xz";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "b430f1f451952bea7b76e4d10657d3cfc3dec9d89aa8e6a0cfdebbb3bc323992";
+ sha256 = "12898c319b5abfbcd409e74c464f72d4318e0d1e992e5c2b7ae72ca203f017b0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/hsb/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/hsb/firefox-143.0.4.tar.xz";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "2d4bb4e450a7cf3bfb35167895514ee64ad97c2cfe3a12465b1bbbd222f39610";
+ sha256 = "a810f600642a1f027140a69e301ae2425c6966b287be06dd8c19bac95e488bc9";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/hu/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/hu/firefox-143.0.4.tar.xz";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "6a246b11ee62084377fef23ce088577ef2a1da4bdc1f4cc2c14ee649df86b1fc";
+ sha256 = "3b0b9914488a18af9940c00dfea57e6f650c74d93590e6b7c33fbe03228493c1";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/hy-AM/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/hy-AM/firefox-143.0.4.tar.xz";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "5833ab0400245d47fe6c2808d4553fb14a88efb78e6157e0f460a3a504b7b274";
+ sha256 = "58f496ff4282229b9dcbaae7224eb157267fa0d7c06f637755c3f57064a4cc2c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ia/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ia/firefox-143.0.4.tar.xz";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "039dcfa668a8b5f1667b50aa259580854f06fa914368099d2af6dc0d536f45fa";
+ sha256 = "c6d7b54a0d14282f0700e0dd090b559a0151a570bdb4ca226e6fb86044cbcde0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/id/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/id/firefox-143.0.4.tar.xz";
locale = "id";
arch = "linux-x86_64";
- sha256 = "e0e3cb60cb58b4df942f681cefe4b053347fa19d3cb4bcc5ebdeecbb0fdb5370";
+ sha256 = "c72606ca633e1db81cb184e2574e47be4cb5357aea6108ed3728b490f1c468fe";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/is/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/is/firefox-143.0.4.tar.xz";
locale = "is";
arch = "linux-x86_64";
- sha256 = "2888d6de9408553dcdadc048c9b5e5a943e187fd2a9514200544fb78da5a6e7a";
+ sha256 = "3aba15f60f482979a6476d4985c8f8eacbfe4f41ebd36fc882305f408d1b6e80";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/it/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/it/firefox-143.0.4.tar.xz";
locale = "it";
arch = "linux-x86_64";
- sha256 = "87a84f1a1f1eb9ba976f3d32965a9d58670f3998e4c529519a21b5c61fe97a2a";
+ sha256 = "26078ba0d5a4a1d2e3d52fed59ec12b1c89e00af86ff2dac536b78a5fbec14eb";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ja/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ja/firefox-143.0.4.tar.xz";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "545bcaed68135a3f4ea36fc9a5b2a95535162a991d240728c1d3f84a073c55b2";
+ sha256 = "b104442c233f111d77856dde60fbfb06f41eec1437b52c5ef95f7089c1cb7748";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ka/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ka/firefox-143.0.4.tar.xz";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "1259b11d8cc8418cdebf438db9ccf5e1857dab1417899ea97dfd1646595ddb21";
+ sha256 = "f62cf8c8e2ef0ae80cd1517aabcd66a8487b9f43d0c94ecfd84498e5942f8bf8";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/kab/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/kab/firefox-143.0.4.tar.xz";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "209607917e233f9ae0ed9697d9fb9d19c9ca5f73062d411985a36fb79f8684c9";
+ sha256 = "b3790896580ba37e2c266907291d11281a4c4e326818681cfde5efe6b928f070";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/kk/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/kk/firefox-143.0.4.tar.xz";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "f9d037fbceb9e5d739612c601c1a8ff0071cbb43114d681472aff67267796f71";
+ sha256 = "77ccf2eeabeae6e94b3dd9ebefbc4c65901df9d0fc50528971819845f043d8a6";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/km/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/km/firefox-143.0.4.tar.xz";
locale = "km";
arch = "linux-x86_64";
- sha256 = "529b64995b7b8845a573224e0bd15276c712d3ee83604240b60499082d799ffd";
+ sha256 = "4b1efa9e752c98e3115e4f942cdc3eabe99c34114121189062f2986c8a24b9e5";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/kn/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/kn/firefox-143.0.4.tar.xz";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "8f7f56b2b0584b52af8a8d05276fee66bf9e69f35077fd525ac349ded111ed21";
+ sha256 = "7b9da13e94539adbc3a70b6a632d1601fdf7a519abd96599e1d06c00b80fd26f";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ko/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ko/firefox-143.0.4.tar.xz";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "eef84bf2539ddf76095fbd51819a7acac72d731ed46f3435b23f6902ca18f947";
+ sha256 = "90376c6d8e169307183316c5e5293d55e8d3406d23764244f65ce5e88c8c71c0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/lij/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/lij/firefox-143.0.4.tar.xz";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "f53d94dad84a083f26dc85124a5e7e50a158ac0584bb55af01ea4b6afffddd56";
+ sha256 = "e3fcff7256966f6b99a2ca08b24f577e4a617943594da5490854067d9bde44bf";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/lt/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/lt/firefox-143.0.4.tar.xz";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "e7d48c6a9e5c99ee8caea09c0784f16a6c6ef9a77e32ee3505b41746f156b4b5";
+ sha256 = "b556bf8d9a58aa2608cb307301c24379e9dd3eae17cc0edd0bddda84ee6ae96e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/lv/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/lv/firefox-143.0.4.tar.xz";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "c23f86769c3ff1b054746c2cf7e1224ae0ece9623cd13f4e57807949faffab36";
+ sha256 = "e563a19786f5095f251a852a625ed88186b85d3c4699d75b9deded832230bf49";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/mk/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/mk/firefox-143.0.4.tar.xz";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "8a004d8ecdf94fe2e286a0d2ad9455ec4e0c60bd376179da255a8ffc203aa7d6";
+ sha256 = "1e651ced38c162c907ae134c056be9a54c7c99843e823e471b746bb165dc2a4a";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/mr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/mr/firefox-143.0.4.tar.xz";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "fbbb8454af5d75245074234a136a4349034666057278781a7063c32e142e3b75";
+ sha256 = "7ae4efd1a4d4c73508b864d4c05f6bcbee92dd6c0817accc538515738d19a408";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ms/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ms/firefox-143.0.4.tar.xz";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "e467bf8a5dab06d145b19a13bfae6a56cbc16518b69347f070a91a1b3b9ff537";
+ sha256 = "abe32c4bbee3cdcf9aac07d8b76605d54cc7a238e35c9bd5d3829c24b55720a5";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/my/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/my/firefox-143.0.4.tar.xz";
locale = "my";
arch = "linux-x86_64";
- sha256 = "23babe6851d3147fa5177b69a9f16ab3c9b2029f479708719c75c2e72e9d81c3";
+ sha256 = "54610832863a2d557531d82ba37a156558dcc1506a196ba4bc2d9ae17d5cc9c2";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/nb-NO/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/nb-NO/firefox-143.0.4.tar.xz";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "1cff623114fe60a1aa2e14c075ded3313a518c5275f45ed5f14b5f4e59420066";
+ sha256 = "83576dd063e2def6ed357ebb01b475c6a5d45d6a4c153b07aac2b952499d34b1";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ne-NP/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ne-NP/firefox-143.0.4.tar.xz";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "3733b901c4e215179416363eaa2c1b074b9a2a2380f5af45e751e1105938e99d";
+ sha256 = "cca54e548ef94f85ed369ee674bff1fd3146ed446e750eb6a1e23365e3bd0afd";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/nl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/nl/firefox-143.0.4.tar.xz";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "e48e4e830f68e166c4aa0def7af4e410162a602d5acbc9c5fdfa46a6e07a874c";
+ sha256 = "6fc4b77b7c03167617fce1257f86b1295bad30c7f9568cc4de76846c35bcb575";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/nn-NO/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/nn-NO/firefox-143.0.4.tar.xz";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "6fbf9d163b02562d499c9f1c533224dab9e9c8052d962c19195e55fc72d81783";
+ sha256 = "e4a8ecd49a0a33ecb4adbbc77d00675107bfbe1f1968ac7f95635fc9e31a136e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/oc/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/oc/firefox-143.0.4.tar.xz";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "cf94b53a437af188f1f277b5f12fb0106d2fc91ff58fb235830a9425755caa88";
+ sha256 = "50345c75555be03750270fa61eff8df4526852d874ba7130dd7ab24b7f5f8bd4";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/pa-IN/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/pa-IN/firefox-143.0.4.tar.xz";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "c1a2c7893a10c578ef4e2f6dc5ee6988d8d95f73e326314f62c0c4d874a6e1a1";
+ sha256 = "94ad9265fb4f1d2feb8caf7c3941f9ad5786fb1f5aa0edb4bd9f25bf4fb1eb0f";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/pl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/pl/firefox-143.0.4.tar.xz";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "e59da0750f9cb869fbe4c30bc5aee342d682c670cf62cafd196ed1e35b742007";
+ sha256 = "318e251982dcdf6f35c7113809a936e74338cc79af7361e098b84f59621d28ce";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/pt-BR/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/pt-BR/firefox-143.0.4.tar.xz";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "c4d525c7d76d1f5dc067702963f61777fadbe4f98efe13201f1eb26b6348f153";
+ sha256 = "42d784d665d9ca1a72559c29b7e3bbd773d9843bd1037c9885c4348051196a95";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/pt-PT/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/pt-PT/firefox-143.0.4.tar.xz";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "79ca83ee6cac833e1f0b15393362b602d649f05f6cfd465b168de55e49ffde87";
+ sha256 = "8e99905b4dbe0f8913054dd400ddaec70a3782c5e1dbe14442b34f2f97c752b5";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/rm/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/rm/firefox-143.0.4.tar.xz";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "a36c062f6e36aac3e38d365f9d59ca44b58e900e1231f325cdc341d5f25f7900";
+ sha256 = "9668977a4ded4e400e932571675a0f9e0e2783adb65fc80b2ec729639321d7cb";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ro/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ro/firefox-143.0.4.tar.xz";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "4308365c40e6a4087799f8516e0af75f7b66d38eef6714621c914194753dc319";
+ sha256 = "2e2047bf900ddb52a2f8f84481fd94043026e3a7b879ccf7354220d9be31d521";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ru/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ru/firefox-143.0.4.tar.xz";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "695f5543a63335ac8dc2c9e34e6e8aea001ea1d0fc0a831141f0f3657a86b669";
+ sha256 = "ecfe3394dfaac31b13639e4d882de64c57f8764e9679317e117d7c40087b97ad";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sat/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/sat/firefox-143.0.4.tar.xz";
locale = "sat";
arch = "linux-x86_64";
- sha256 = "f7918adee19a052ce6aeefd9c9ef8cf5bd0d8c4f101ccc9df5e7f4b25100047f";
+ sha256 = "783f9f0f8a5af74aa30ad99d15e2fd962393097d440e1b454e9aaedefd7bec80";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sc/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/sc/firefox-143.0.4.tar.xz";
locale = "sc";
arch = "linux-x86_64";
- sha256 = "2b4740775570d934fbf505977333771e627159cacb6e135c6689c465527d7fe5";
+ sha256 = "6735666f0ced0894321393f63509a57977f6cb2dc997809e8e5f21b860f2a4cd";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sco/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/sco/firefox-143.0.4.tar.xz";
locale = "sco";
arch = "linux-x86_64";
- sha256 = "56af3f374c2b860fc9c6e362882bc8c756d40cb52281a8f6d45a2249ce487b51";
+ sha256 = "a4cc49adaebf9a48f947b27487df5556142b3995f5879cea6f498661df630efe";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/si/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/si/firefox-143.0.4.tar.xz";
locale = "si";
arch = "linux-x86_64";
- sha256 = "39692ba5cd781a6a2023b99fb26ab3f20208bca1158f2c3de63e21568042fd80";
+ sha256 = "dcf864e73c69fc7509888f0991710080bf79030a410333cfdd094cd2920a424e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sk/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/sk/firefox-143.0.4.tar.xz";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "3041971e483fc9a74c0cab3b0a447ef7bfd79ebcb52ea153a5b7f9035465503d";
+ sha256 = "a1ee927e6c11a0b77cfd66fe707970cc724b97e6ac34c1bc3f778f4e0888c7f5";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/skr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/skr/firefox-143.0.4.tar.xz";
locale = "skr";
arch = "linux-x86_64";
- sha256 = "4aa86dabc7c8a898d615ec4f8cc5293f7a6ccb05d96f18e9abeeeb70b7b8eba7";
+ sha256 = "a0103662780055cb70b15036cecaee4c36d84abc55376dfbc6d676fcf7e1cb3c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/sl/firefox-143.0.4.tar.xz";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "2202be1ef313769dae4a744f5541f8af60a4bcc9b7c0b56069cb7342080e62fd";
+ sha256 = "08cdbabf1b8c29b45bf1935e0df4dade1ffeabd82090bdb5e506b30278f4b46b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/son/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/son/firefox-143.0.4.tar.xz";
locale = "son";
arch = "linux-x86_64";
- sha256 = "d2dcc8dee6d72914f28907e60ae42663668122234268ecc5855a90fdafefaa17";
+ sha256 = "1c31766fbdb57c8af2eb5ec9648aca83c8536804b2995d7abb3bd7221b69def3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sq/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/sq/firefox-143.0.4.tar.xz";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "80e6b1bac173fb8ef91d34acfec509b21544a63dccbeb78894681f1a9d146ba4";
+ sha256 = "b0109024f6c7bedbe46175a4b4a14f1e49f888381fa841ec8cf0233b22480349";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/sr/firefox-143.0.4.tar.xz";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "9a8b73c3bc98354670236b90b7f47063e254e02765a0a1dc058359f8ce7ff56e";
+ sha256 = "102ff4d228f8e2fae42033e28f1a81efe523460ae30dc25724be14f8b0a1513a";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/sv-SE/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/sv-SE/firefox-143.0.4.tar.xz";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "3994e8b13043f3a3f7ef3b2639b2aaf2e183976aa86de8ae13649f380d81659f";
+ sha256 = "25109416d0a5207f08b6440fbad48126df2ed6646032e4de8f8deedddba32a0b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/szl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/szl/firefox-143.0.4.tar.xz";
locale = "szl";
arch = "linux-x86_64";
- sha256 = "84ce4df59819749ef27397b2e3bfc9579bdbec86e9b41d0ad91855f185b201de";
+ sha256 = "240a37e9d1ad218af105d731beea921a5d4efe54b718ca237647d86fa857db2e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ta/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ta/firefox-143.0.4.tar.xz";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "61d0ae973ba8e86c3ec1768b0c957d8218a4f78a1c103ec089277ac8c112a946";
+ sha256 = "311133a69dabe2ae215c8f14f03bd6453793de7b41f6ea117b07877fc24f1389";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/te/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/te/firefox-143.0.4.tar.xz";
locale = "te";
arch = "linux-x86_64";
- sha256 = "0778df80957bdc9f0385f6a313b5791b3336d044fad20aeb42135ef32beab718";
+ sha256 = "f83d4e039fba0f5b967e19cd1b6fb4a67f431417122de6549dd9d324edebdf94";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/tg/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/tg/firefox-143.0.4.tar.xz";
locale = "tg";
arch = "linux-x86_64";
- sha256 = "54a15d2238f8b7f926ae61cca05169309c3d5b2f9aaa764760dc4c56482e27b8";
+ sha256 = "0c4edbc04b13d969716e4d999d7ba7724c2cbac4afc35e18d5063d48841b61e2";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/th/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/th/firefox-143.0.4.tar.xz";
locale = "th";
arch = "linux-x86_64";
- sha256 = "37afd35187a76320b51a2b6a13fe2fd27c92852b3c41ea9942a06911fcdd9bf0";
+ sha256 = "4d135e9867239f40ea357fce183057c91abd2496f06b6f43d3a93cccd6e37a48";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/tl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/tl/firefox-143.0.4.tar.xz";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "fa8c15eb9074d0655eb30635bdb0aefc717dd83d604c9e734d0b93cb5aa329b6";
+ sha256 = "bbc17804e0b6619dd6751c76233c46bc4491a00d10aeba2e0d657570db9699a4";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/tr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/tr/firefox-143.0.4.tar.xz";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "3d3867b58b0a6b6f3ade72bfd69526d529d7e3c696c8f7e865c3e7c6f1469bdf";
+ sha256 = "eed2c3e43ec4b578d1a944976287bece9cc3cbdf89945a601a6709227099cf46";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/trs/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/trs/firefox-143.0.4.tar.xz";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "2a6f1ce8f06f6fff06431ab6b43a6bae3baf57187267e7e39372b627a9a506fb";
+ sha256 = "efce749aadc4a5a9d1d728c377e2c76d036dbe38655ff32c36d22c0c118cbb54";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/uk/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/uk/firefox-143.0.4.tar.xz";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "bbdb0a6b83d3670c65ab51540bd64d60377cfedb6d31b15760e906899e7e60af";
+ sha256 = "509851ae124398d97520743ab094500a47f69be09285ef396349c1aa1c88f28a";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/ur/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/ur/firefox-143.0.4.tar.xz";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "fb9c3bfd618039aee74910f91243f3005fec01880a824df27b71cb501edc16ee";
+ sha256 = "066f23315a9c82705ad2cdd6755d02a6dfec5c13b47d837e15c40e11db53c76a";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/uz/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/uz/firefox-143.0.4.tar.xz";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "31dfcbe572cfe4c951b9c06816e20a9a2b9b2d6bd2243e43537beb938fc92ecb";
+ sha256 = "64469de54eb9227e3b78961f48b4c3f4af62eaa3c2526e6974657abe67d58ac3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/vi/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/vi/firefox-143.0.4.tar.xz";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "71bf154fb82a6374d9d79ebbd45684f95aad04402c6a3065c321540ed896eacd";
+ sha256 = "5ae302ea7f15a8dfa7e110be1e9d8747b5deb5ff8a74b2a24cbc8daf1d15a100";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/xh/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/xh/firefox-143.0.4.tar.xz";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "e87384a9c4ca8daebc11a6db28e8d49408d32684f0c2b3ab66b7695da8899a54";
+ sha256 = "e18ab37eb5afe9ebbab0ba75e1913993518848c738367ab38bcfb40cb4791291";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/zh-CN/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/zh-CN/firefox-143.0.4.tar.xz";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "fc07a3f8bdf1743642b6d54644f2c2c888f63f76602dfb56443a99f9bc12e12b";
+ sha256 = "89f2ffd682e8ae6e302d7a219d1069d46f6d8e16dcc78f441800d3855233ae90";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-x86_64/zh-TW/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-x86_64/zh-TW/firefox-143.0.4.tar.xz";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "b560f9e6aa380f61199239b024ad5068a89d028616688b0b6bf19d5e1e272c0e";
+ sha256 = "dd2da03bfc4a8788f743175a885a3e7ed5499f11e50c29a6ed92981f6bf4bbf8";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ach/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ach/firefox-143.0.4.tar.xz";
locale = "ach";
arch = "linux-i686";
- sha256 = "f20a578274c7a84cc90dcb4e84542539bc0d51bb29c25997ae6f464d746e8d4d";
+ sha256 = "cc22fe2c1b5abf763ee9a6c8a62c77d44af611d3d828c1bc31c069ac5d7206a4";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/af/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/af/firefox-143.0.4.tar.xz";
locale = "af";
arch = "linux-i686";
- sha256 = "c756ef7d3efa41d9f84fc7e944d352b649f07219d53c3991f750175fb1148ac6";
+ sha256 = "193bf559312b5419d5453edeeaf6c851ad7e38eff8fe5f7bba6670c0fe28c676";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/an/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/an/firefox-143.0.4.tar.xz";
locale = "an";
arch = "linux-i686";
- sha256 = "bb2ae4ab3c672a12d3e54d7aa3d28425a3d917e262c5fc9a9b1d1625f65c3167";
+ sha256 = "4b1fec8756c86e91b1a85e2cb5f7a8a8f5821bed0a06c2dfb7fc6d4000fa0d59";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ar/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ar/firefox-143.0.4.tar.xz";
locale = "ar";
arch = "linux-i686";
- sha256 = "1429fec6eb9002221620e843080423d71ddf1b5db9656eb844792f122cd3127f";
+ sha256 = "8b4bf5dba85642349aa434be15f08145638bdf6d9baa76fb50478e259e050e31";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ast/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ast/firefox-143.0.4.tar.xz";
locale = "ast";
arch = "linux-i686";
- sha256 = "85a32eeb6d5d5a3291d81308c932ba4f6e25bbd077c3129c0baf181b71d9fc44";
+ sha256 = "12621fb7874e86bd1baed97fc6aec818c25a137cff87c34a49e37a2855a6b9a3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/az/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/az/firefox-143.0.4.tar.xz";
locale = "az";
arch = "linux-i686";
- sha256 = "da4961c58b772d6441e575a1a6c767749c1ea7aa5164846fae5015f493921e46";
+ sha256 = "53a21f35d21ef6392ba652b01790f44e79a9109df26b2d5037b524e0df8e038a";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/be/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/be/firefox-143.0.4.tar.xz";
locale = "be";
arch = "linux-i686";
- sha256 = "96d92e9d6a28c51af104fb42a7acde1c32c8de145246875044ff6b2b44f411e1";
+ sha256 = "447dfe3177d75e7a3bc7a9b418bf0da05cfb6700917d5d9e45eb5c975bdc246e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/bg/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/bg/firefox-143.0.4.tar.xz";
locale = "bg";
arch = "linux-i686";
- sha256 = "455a73741a1f93032610aad98de820f64c518d89b28a2cf85dab95d9e949f5a8";
+ sha256 = "07b0f135431b54489b2655ccccd923d283e521fff5c83cdb313a6aca71bf3d4a";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/bn/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/bn/firefox-143.0.4.tar.xz";
locale = "bn";
arch = "linux-i686";
- sha256 = "dd19ef50f790709e3a4d1537b862d3536638cd6e5748e5dfce7b491d32e49ab8";
+ sha256 = "c6c27d1599939756f093f96c4221be4024a40e4a5976527f5780c55c143421ca";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/br/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/br/firefox-143.0.4.tar.xz";
locale = "br";
arch = "linux-i686";
- sha256 = "2a883e52f1763df2dd2326873198ca91d192cb902279e3d3abe7b3e85cc9bf40";
+ sha256 = "a00d4f02be1cc796821ec25ac758e2fff7408ea5843f959084cdc81ec1f26ea2";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/bs/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/bs/firefox-143.0.4.tar.xz";
locale = "bs";
arch = "linux-i686";
- sha256 = "4370bff6cd7eb8c420ad5d397f67c7c84beab5043056c8c71236a130e740110e";
+ sha256 = "041096267e27a59ce265a6c87b1e7a3ba4303bd084d2fe74e6cd24287398d229";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ca-valencia/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ca-valencia/firefox-143.0.4.tar.xz";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "15142009db9e86e7dec40df8a31f750480798894224545c0e20c480d97015e5e";
+ sha256 = "834eb2b1e820721a41a883c17a2a42d5ca18c2acc050894a820e878536433e7d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ca/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ca/firefox-143.0.4.tar.xz";
locale = "ca";
arch = "linux-i686";
- sha256 = "974a5a0041c983ff06fbe2f0bb86c7535163e7af67116119b04f121680edcb0d";
+ sha256 = "1c151ffcc190665d0943832df33a0e41e33e2a7a1caaadb99e5b65979cf9a9a4";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/cak/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/cak/firefox-143.0.4.tar.xz";
locale = "cak";
arch = "linux-i686";
- sha256 = "462bf044072dc3ec3c2d681d3cd8ca28c96087b1adccba9f67507a652ce5077a";
+ sha256 = "7344c6f7fdaa0fbf3b987bc265395aa4a427d6f358e6e523e97ccfc4476d7480";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/cs/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/cs/firefox-143.0.4.tar.xz";
locale = "cs";
arch = "linux-i686";
- sha256 = "bd9f722b39b04974bc9f5ef33def65664d653a10f8b89387012e76c879b486e5";
+ sha256 = "40cce8fba78deed2994164f4566c975b8256e19ef731f928d9c75026f6e2bf10";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/cy/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/cy/firefox-143.0.4.tar.xz";
locale = "cy";
arch = "linux-i686";
- sha256 = "2864898ef11b28cffaf03b403107ce0647d9d7c85e6bee7be452625b34f724ed";
+ sha256 = "f030a7063adf0bf14c6df27dbe7a94a2e2117190cb872a7b07494eba3c3bd6a6";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/da/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/da/firefox-143.0.4.tar.xz";
locale = "da";
arch = "linux-i686";
- sha256 = "2046be5001dccbb9dffa72e8771a6b10509101cbb65536a62afc4e3603c0fc99";
+ sha256 = "00c3defeab1d9c25913ae3b03080cc9f5374bd7472aa1c5b133d15d0b49a73a8";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/de/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/de/firefox-143.0.4.tar.xz";
locale = "de";
arch = "linux-i686";
- sha256 = "1b4c719b8735750cef4761c5df65158e56b1bc1be574cfd73ef47c46f483e8a9";
+ sha256 = "7d20c573f3b8bb76bfc0d8f3eebe06559cd388dce305d8912118bf39a4c68e4d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/dsb/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/dsb/firefox-143.0.4.tar.xz";
locale = "dsb";
arch = "linux-i686";
- sha256 = "d4238e172298513c0628afb0f541cf95e5f71470010ef6f8e4615d836abfca5d";
+ sha256 = "e0f4e4288eab3967b7415a48c1c833ec7b757db346de6a1d20abc8c40147301c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/el/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/el/firefox-143.0.4.tar.xz";
locale = "el";
arch = "linux-i686";
- sha256 = "4068d0cbe4a5e4907d77d03530fa364c8e279199d3cf4b00da39887cdc3d8aa0";
+ sha256 = "49364b3895a9984658d7014bfa8009f55694944f91f0a09250c0bc4539020511";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/en-CA/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/en-CA/firefox-143.0.4.tar.xz";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "aa30ad263dc5ad494d8e9017b1134662edd3b05cae4b61f7951957202dc50b9e";
+ sha256 = "9a98f50a7630165cc99b0a625220fd97577a3acf90fc80b2ebea66641ee72d20";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/en-GB/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/en-GB/firefox-143.0.4.tar.xz";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "834f9aa12541b65d757c979d51c0a18958aeb28b427aa3ba7f06f24cf35a336e";
+ sha256 = "f3e7a6c950d22a0c335919d18bd78da88f9eae0aa168e240c27a429b12a8ec65";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/en-US/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/en-US/firefox-143.0.4.tar.xz";
locale = "en-US";
arch = "linux-i686";
- sha256 = "05bf83e98973c08840b2a8b8415cc433451735a5e2688d672d5be4e56d57a38c";
+ sha256 = "87ae36478b35b8bed26ae11d8747a316a3f8a89681b4b42c05b7159d076c67cc";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/eo/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/eo/firefox-143.0.4.tar.xz";
locale = "eo";
arch = "linux-i686";
- sha256 = "ad6fb098fba9a372c7001df8811f5fb47dbf8b8cc19472747eaeec00d3fee436";
+ sha256 = "49b2ddc777f7e1c6c695a2bbda80a8caa50ab0549f73c8722a14a64380d20833";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/es-AR/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/es-AR/firefox-143.0.4.tar.xz";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "42ec0ca57f4bfd2cbbdffce88ad84429460a5f872f3c9f3c2b29191113a15665";
+ sha256 = "7f8222da383bcf69d8d776f4eefb91e18c617435e08e166688b9aec2adfa914d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/es-CL/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/es-CL/firefox-143.0.4.tar.xz";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "1088be092d9e9c9ad50733e28547cd631a3a9c723235c3b1224a1c71fbb87d1b";
+ sha256 = "54224318dbc924c7fc3b8eeb018714c16b94b557829378c11a6da4622b387f3a";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/es-ES/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/es-ES/firefox-143.0.4.tar.xz";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "a72abe312378300d61577558e2eaa49acc70c6921d0d7b413bb524b71ad74b72";
+ sha256 = "1776cf9fef884e89da7c23a7202eef3a5fb460fe23a9010cb81941dc57790821";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/es-MX/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/es-MX/firefox-143.0.4.tar.xz";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "bcd2549dc47232d1f0628a82fe68c9ee40d3265c711785a200a0662c3ce350b3";
+ sha256 = "6fc3754e2da09d42ead8821d496c15feec0aeb6b7b74d39e1759371c2d6b19c3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/et/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/et/firefox-143.0.4.tar.xz";
locale = "et";
arch = "linux-i686";
- sha256 = "9303599c83ed66f1143ec232835b7a9f59ad10f7b7a95326c34ceaf16eeedadb";
+ sha256 = "7c4c424df9a65c28b055abf17b7e507f6a2ca034f879b9c87cf69d7829520166";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/eu/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/eu/firefox-143.0.4.tar.xz";
locale = "eu";
arch = "linux-i686";
- sha256 = "4c36cb3c3527df77a86c446557358d556286834b46e2ef4b3510a3bd0ed2b459";
+ sha256 = "814bee0e5da7017a8c64a1535b78a1ca0ecedfd215843f1895bf59a6eaa3a9b3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/fa/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/fa/firefox-143.0.4.tar.xz";
locale = "fa";
arch = "linux-i686";
- sha256 = "b3bbe87b6427e1764d17c233cdf78e24cf7a9d518832b42ef9c49c4354fff4c9";
+ sha256 = "579a048ff0d91c091d22cdbffc1ed0bb6cd2f76882623def1d22e45d5bd10e98";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ff/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ff/firefox-143.0.4.tar.xz";
locale = "ff";
arch = "linux-i686";
- sha256 = "dfdde6df46668c5feea6735e8f0b390d8d385168d12da4576cbf246e52cbe7cc";
+ sha256 = "35bdb91c90a24237edf41e5e554119fae995912dd9af6d39dc6575a9612702e3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/fi/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/fi/firefox-143.0.4.tar.xz";
locale = "fi";
arch = "linux-i686";
- sha256 = "a872bb14a26af938487fbfd4c99afaac4213c8ba56f44c75d501f1eba9148f27";
+ sha256 = "f37636cd9ee49179eb404b8afa1cbe488ea7212c0f11c3791d1b7bd349322851";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/fr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/fr/firefox-143.0.4.tar.xz";
locale = "fr";
arch = "linux-i686";
- sha256 = "4354d7a4cd1f6e874f177f9cc2d15d609841dcec6a6649b8b1e697cde298dbd4";
+ sha256 = "5d8da72a685525ae00ef23e6d4a737a5ebb96460c2f92818ad8742fe925408d8";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/fur/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/fur/firefox-143.0.4.tar.xz";
locale = "fur";
arch = "linux-i686";
- sha256 = "1f873d08d520f3553e452368bc510721e928f69b54c6196bf5b28b42775c0e6d";
+ sha256 = "e4ba419c609f4b7d36624d65aad5624a5e93f24bb5051b4e286ddee53849ceb1";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/fy-NL/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/fy-NL/firefox-143.0.4.tar.xz";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "ccd33cb513fac96c668e776ddd6330e04a64813e0d5d131881ef93b794690ec3";
+ sha256 = "43733c3375efb8aaedb78690a1ab3640fb6c97c92abc9b112bc4250c989d9245";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ga-IE/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ga-IE/firefox-143.0.4.tar.xz";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "206ac31d2c60bf122a98087931917f670b6618becee7ed3de49d3658fe3bf8b9";
+ sha256 = "a41af3c237bbc502e7e8937098ca4687edb3d44e6af3b3711508804938a77a6b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/gd/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/gd/firefox-143.0.4.tar.xz";
locale = "gd";
arch = "linux-i686";
- sha256 = "00b720be6171f69aff4b5dc194d1e8beed5b2c0ba1cd3867ef153360ef1aabe7";
+ sha256 = "ae776a4645709a4cda17ddc6dc4fb3c51a9f817385bd49462438ee20484a45e9";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/gl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/gl/firefox-143.0.4.tar.xz";
locale = "gl";
arch = "linux-i686";
- sha256 = "67eadaebc0a35e41d93b7e6d261a6e1345a730d3b56821bd99833966560d0ced";
+ sha256 = "d80d714ee426741bfe9752511e712dd5434c871520ba6e5db73c374563734b7b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/gn/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/gn/firefox-143.0.4.tar.xz";
locale = "gn";
arch = "linux-i686";
- sha256 = "610e15a6c06a22544210b01942d2bd33de43180bde56c1713afe5570a78eb987";
+ sha256 = "1ca2ba3f7f0045999ee24beea0c032d390fb829e099cb15234942b9f14cfd244";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/gu-IN/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/gu-IN/firefox-143.0.4.tar.xz";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "db73ce08f4d6aeaa46dce32243b2233ffa11aaa140f2fe869d05f045cc055ee3";
+ sha256 = "4245f1cc1d05c9fee11a4deb6089a01c13a6a1cc13e31a6d48a6eca6ebcc053b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/he/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/he/firefox-143.0.4.tar.xz";
locale = "he";
arch = "linux-i686";
- sha256 = "0b66e9bf41322111477aa039db339ede0bf6e3573c7431ce0f419f6dc4a70ecf";
+ sha256 = "98beb15676cd466e7205a64984b72d4d30c8b80f9e76af6997974661e466a96e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/hi-IN/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/hi-IN/firefox-143.0.4.tar.xz";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "e0571f317bd83a168a8e6e085a47021c9815a1411012ab58cbd5bbaaf489ec02";
+ sha256 = "7b86a0962a8778974854726ccb3500de063f807737d2669021ceef73595e8af2";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/hr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/hr/firefox-143.0.4.tar.xz";
locale = "hr";
arch = "linux-i686";
- sha256 = "5231a4cdadd213a365e9e7ce4e2428f9ba8355cea0b513245442e17853a74b36";
+ sha256 = "20c1a11b77bf44e8fea753b3fab7f70d0edc55a71c3ac5ce67a1e70cf4df9264";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/hsb/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/hsb/firefox-143.0.4.tar.xz";
locale = "hsb";
arch = "linux-i686";
- sha256 = "e2929b118285a5dd7096420495e7a763d96a659707d4549beb1f9abd92bbd2bb";
+ sha256 = "08b57003d444e920bdc0b7bf4b2d82df2d4c6c50fb7e1a26a5d9c6e0424c360e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/hu/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/hu/firefox-143.0.4.tar.xz";
locale = "hu";
arch = "linux-i686";
- sha256 = "cbdcf4aecd7a869797f1bc09e0fc96f82db590172ff434b8af2081ef1d4d0cc8";
+ sha256 = "024a196e1f845a7ed86dccfbc3bcf0658bfdfd014ccb3a9bfe832fae004d4d3b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/hy-AM/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/hy-AM/firefox-143.0.4.tar.xz";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "15c3a3e2b2ba23d62f247ed71554cc7b1b473fbf4e83dcd2a32f393aa426a7db";
+ sha256 = "281a0706d42b164c27338dcf1e833baa21e63d22ba8f5976dd7c598689dbafd0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ia/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ia/firefox-143.0.4.tar.xz";
locale = "ia";
arch = "linux-i686";
- sha256 = "bf035e808769f109a379331f3364e236ecff55a8c311c567c14e3baa7849809d";
+ sha256 = "a9857d35d702c72f52bd0ba2db21db6a1489b2bd2cb5588ca4ead5840cc48eb0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/id/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/id/firefox-143.0.4.tar.xz";
locale = "id";
arch = "linux-i686";
- sha256 = "84dd51f50ab9821d4714c7ba088f0a7e2a5163967ab0d964e3b279d01eebcefb";
+ sha256 = "b60a50b470a1e5d0ff81124dcce830b5aca6991f4313416311390b32be7cbfdb";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/is/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/is/firefox-143.0.4.tar.xz";
locale = "is";
arch = "linux-i686";
- sha256 = "c63104d83b9df221e2bed5aff050345b7dd5193bd31afa8f240206e1e223a918";
+ sha256 = "09dcdc811821da54baf5ae1b5cd08dae6fdc1b7cf04aa6f8696390b655b32f50";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/it/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/it/firefox-143.0.4.tar.xz";
locale = "it";
arch = "linux-i686";
- sha256 = "0275688a3fdb9233d06e1c4215a6a3989898d9b89d1073942d360c888f7403a1";
+ sha256 = "e266ba721000200b1925d76b06cb5871b06fc360725527a0b9f3fb5bc9b1139c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ja/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ja/firefox-143.0.4.tar.xz";
locale = "ja";
arch = "linux-i686";
- sha256 = "b1833b5c393462d0dfd09fb82e6db7f0862a55e072e14a12946f5c9ed0a1afe1";
+ sha256 = "fe85dd4f03c4e3072b930fc945b6cab87dc9dfd2c252bd6e9684e9eafbe68972";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ka/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ka/firefox-143.0.4.tar.xz";
locale = "ka";
arch = "linux-i686";
- sha256 = "3d6df60f90876502ed4211b637597a1fb5b7f8152b75b1efdfaf9142d8d90f2a";
+ sha256 = "759f6932ae0e18cb16274537e859a6af0950cf86e9aea947240d029695b83b12";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/kab/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/kab/firefox-143.0.4.tar.xz";
locale = "kab";
arch = "linux-i686";
- sha256 = "3ff5c571f5bd8cdceb31679c97ce08ceb3136ea110efbf4648339273312550b0";
+ sha256 = "226489ffaae550c16750c64254082926bdc26abbc551343c7571924774d768f3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/kk/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/kk/firefox-143.0.4.tar.xz";
locale = "kk";
arch = "linux-i686";
- sha256 = "1ae7ce453c15e002d004306557cd1330cb7d33a5ba52efaf6aec1daf6a827c9b";
+ sha256 = "a6fc227a07030f726da5f28930e7e8da46c7df2f930a46804be4298273e57bc8";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/km/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/km/firefox-143.0.4.tar.xz";
locale = "km";
arch = "linux-i686";
- sha256 = "5d8e2d5b6fed5847d413cf2f734d6509dd46665975161a33bc0a1733563489c8";
+ sha256 = "1c17cdba83cd3e44950e03d3c862db8f51ea87933d3d2f474db6b29b39ba7ffb";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/kn/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/kn/firefox-143.0.4.tar.xz";
locale = "kn";
arch = "linux-i686";
- sha256 = "189122be2a67808cf28db14f35dbd7d3090a638d67a7b54a6f93da7498759340";
+ sha256 = "f95d0d62081c30f51f0e78a44fd5fba6aa6e3fc6e9d2c6cbf9009cd165ee9f1a";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ko/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ko/firefox-143.0.4.tar.xz";
locale = "ko";
arch = "linux-i686";
- sha256 = "0d3a5ecb485dbffb1ec5807f5c68c9c44b187687e535f75c5d7c04a50bae603b";
+ sha256 = "bc2cc13c49df33d25b05a67bf4616d0e2fc5200ec1d0f477b8b5b185dd60c038";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/lij/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/lij/firefox-143.0.4.tar.xz";
locale = "lij";
arch = "linux-i686";
- sha256 = "58374c75f1320ef785c2587acc5b632ed805bc6d69b740a9d4ff0c8639b2c8c5";
+ sha256 = "0d77fae5d5bc0ac240295c31beffdc6cb5dc018fc5229c8133469e8166da78da";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/lt/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/lt/firefox-143.0.4.tar.xz";
locale = "lt";
arch = "linux-i686";
- sha256 = "43c5ff178076aff633c49e4d52adb6a408352a3b432967ef5e9ce95b9413fcaa";
+ sha256 = "b44257fca08a8d8e7ed3724a88b526e335efea52bdbd971346ef64e22b488e9c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/lv/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/lv/firefox-143.0.4.tar.xz";
locale = "lv";
arch = "linux-i686";
- sha256 = "56eab786da6bb911f746b5afc652708323231fbca32d5c5797d9fe71c9318362";
+ sha256 = "8acd7ed733e3cb46248301323e0758e11a86e598319910d655442b499959bf24";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/mk/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/mk/firefox-143.0.4.tar.xz";
locale = "mk";
arch = "linux-i686";
- sha256 = "444aff7a619a7db477517dd9815a36aefb0efdf27fdd9b4d253e810486c2310e";
+ sha256 = "74e87bb2618d9ea0c124a44a2c4a2815b4504d44e46f00cc6b1ff91937247b05";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/mr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/mr/firefox-143.0.4.tar.xz";
locale = "mr";
arch = "linux-i686";
- sha256 = "acc53a62cc223a03b4f59ba2a66876d43eafddc48389e49197e548ab46e17993";
+ sha256 = "3013baaf7ca85f71cb00f527799ac8501f17e6fe8f0f3ac680fcba4f64cfa73a";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ms/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ms/firefox-143.0.4.tar.xz";
locale = "ms";
arch = "linux-i686";
- sha256 = "df1ded63c2da854e7ac5b960ea20174a140a9cfe59f7843669a5ef86d8b3fa25";
+ sha256 = "1a836eaff017a45b1cc014e105c051782f416e5d945b3f7f90a8593a417eaecc";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/my/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/my/firefox-143.0.4.tar.xz";
locale = "my";
arch = "linux-i686";
- sha256 = "6b4f1f12bfd9b1e482a2619d0d89c1dcccbeed5847a7f618f0a19bf1b0158636";
+ sha256 = "d25f47ac51c82ce5589c9e6fb78f81e261439a8ba019080978958d8d92c60fb0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/nb-NO/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/nb-NO/firefox-143.0.4.tar.xz";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "68f8384b5362a8021d8e64b30991c5741b6e2e1d9a52a409521469824d256d4d";
+ sha256 = "61adadb32b310c485b5c5cd8149f6dfb56cbefbf7af0a6a0569f84e60a5850c5";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ne-NP/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ne-NP/firefox-143.0.4.tar.xz";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "56dda860f988b235c1cd12cf6eed827650257a68af7839b0a1d25909d26e8041";
+ sha256 = "0104f441046853f64bf9c28fb8f48e54654518f2913ae815ca5523ed4832f631";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/nl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/nl/firefox-143.0.4.tar.xz";
locale = "nl";
arch = "linux-i686";
- sha256 = "2736d95a46c5646a5c4168b8519ea56b446842a3c573e9ea6b0b14de14266959";
+ sha256 = "74b812fec76b3de1e66cb058041e5b28350232bf2afd17f16e40d6ececb3a9e7";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/nn-NO/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/nn-NO/firefox-143.0.4.tar.xz";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "d8fd06fb4c4a1b344c2c8783cea8afdf95d7cf64ea71955fc57955b88828796c";
+ sha256 = "1bddc5f45a52f1da1a56eabaf4ee8412f17990370a6beced2b3b1b16c615a599";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/oc/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/oc/firefox-143.0.4.tar.xz";
locale = "oc";
arch = "linux-i686";
- sha256 = "8a436c96f6c711290277f67087f73097248c05d36c4c3298481b24c04deda521";
+ sha256 = "9e3efb11f8dfe5d0282a01231b55c6a2400c0c165f641b6dd41e6dd7998900f3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/pa-IN/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/pa-IN/firefox-143.0.4.tar.xz";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "bc81bee9631122b060612ed55c0281186974e62e5a41622cc83021c17b42cd23";
+ sha256 = "004ae239ae1a89d376ef249061a10af9e8d491a5999a458ac72ebf6275eba5a9";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/pl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/pl/firefox-143.0.4.tar.xz";
locale = "pl";
arch = "linux-i686";
- sha256 = "4d86c53bc1e103400f8b9a17985955fc193e957fa2719189e932be795a5e7226";
+ sha256 = "7d2a4e95873991bed35d88f7d10303a0e36ea4749f824fde9803b6a669ad560f";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/pt-BR/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/pt-BR/firefox-143.0.4.tar.xz";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "16a72c6dc814564a0be6314ad42ae82523ccb3fabda147800d72deaf69a8d69c";
+ sha256 = "f0913ea7cc82c26f133f8b08741fe9c2599b4b661ad947872d273aab990aee00";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/pt-PT/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/pt-PT/firefox-143.0.4.tar.xz";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "7ee4ab35565e79e50a12c2d7d480594ecd434de21b05f145c01fa42359ca4d65";
+ sha256 = "626169a4c99af965b1f80e465f2a557f50d7641b39bb2a9cd1cf7ca309711c59";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/rm/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/rm/firefox-143.0.4.tar.xz";
locale = "rm";
arch = "linux-i686";
- sha256 = "bdad1468f989615765be9025bcb53c84b0c0a920cd14ab4ebce5ad4e0cd3faa9";
+ sha256 = "0e8a38a64e3914304a8a071c871b7bd3fb3978f4e4946a1ebc9964b3783ed6a9";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ro/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ro/firefox-143.0.4.tar.xz";
locale = "ro";
arch = "linux-i686";
- sha256 = "12b9198071a591d92431a6df6d6c447d923da7b28ecb7c7708cb5a9b92e2c390";
+ sha256 = "10cfc7b4231585376a5fdaf3530b5e28b358e7950d6ab588dd3b112ba615e1ee";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ru/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ru/firefox-143.0.4.tar.xz";
locale = "ru";
arch = "linux-i686";
- sha256 = "2179df788ab2f471157a36b122705672cdd7414c0fbc25600cf74ea72f0c731e";
+ sha256 = "66d44c91639c836453445eacf593383e85756518724d5753919f7c21b7d8bb2d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sat/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/sat/firefox-143.0.4.tar.xz";
locale = "sat";
arch = "linux-i686";
- sha256 = "af1ae7aaa710039c54a98ec0e4c8eed7cd8b602d290c601feceb20aeee788870";
+ sha256 = "1555e006c37a21cd19c846f896178d5a089dc63b4b0ad6b5b312358b914d283e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sc/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/sc/firefox-143.0.4.tar.xz";
locale = "sc";
arch = "linux-i686";
- sha256 = "d4d57ccc72ac924713ed46441bef50371e4a169f835c2f58173df653291288ab";
+ sha256 = "466e94532884a2e055dd05d9ee8b4e609d325bbe15281553144a6f4e4a88c360";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sco/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/sco/firefox-143.0.4.tar.xz";
locale = "sco";
arch = "linux-i686";
- sha256 = "4e4f293f330d7fbfc52f11fcebbae62f93058a51d2eaae7a6b4e7f75324fae88";
+ sha256 = "82d20d1d361b0ef5ea5191035347f7e52a7ee2f9088cfeb61f466dd181e84ec0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/si/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/si/firefox-143.0.4.tar.xz";
locale = "si";
arch = "linux-i686";
- sha256 = "9cd110763c21fc4e32e324ddca27c68b9d98b5c9d2e93eaf0094ee99bb0826a0";
+ sha256 = "7b114c28ff2ad15b60b6a52559a82e29c52d8bbd44c161e0b76f62ee7879f6b4";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sk/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/sk/firefox-143.0.4.tar.xz";
locale = "sk";
arch = "linux-i686";
- sha256 = "3c67e3038fc4ba8a6b30b5984e2d27e9f2c33b39ad9d4423a772b1e166151eec";
+ sha256 = "d151796b069f1cd8c8ea8808c9f20b157513dafb45f3e9db7760e93319b76139";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/skr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/skr/firefox-143.0.4.tar.xz";
locale = "skr";
arch = "linux-i686";
- sha256 = "2c99168028a3f8e2cd2d6f34aeec98b92b7812a8075db948f2dff0b4ae15f143";
+ sha256 = "8d43c463c691c31842890daf922054a5d2dc13d98e4334afa56039464b651564";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/sl/firefox-143.0.4.tar.xz";
locale = "sl";
arch = "linux-i686";
- sha256 = "9c4729f51f54bfe504b393139430c2c8f01db340d3abfe40a401919fa8b3e950";
+ sha256 = "9c1ae347cec22267636ce75c62bc59242f0c2a85e362646bf14c1612b85dfe7d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/son/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/son/firefox-143.0.4.tar.xz";
locale = "son";
arch = "linux-i686";
- sha256 = "e8312d8a19617c97ab63052d4006c01ad070bd68670eea9588d16568e0ede486";
+ sha256 = "ac97b493eb3975e8cae1375b978e32f47f1df193af0b1042f96070c9d56741ba";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sq/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/sq/firefox-143.0.4.tar.xz";
locale = "sq";
arch = "linux-i686";
- sha256 = "6331b868423062fb4d3a66aea2f89bd43d7107c8e3f370950f6696fda20fefaa";
+ sha256 = "e572abe2e26d90cb9449684e94581d7c0cbdeab6a8ebcfef59e2935c4a1f8a36";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/sr/firefox-143.0.4.tar.xz";
locale = "sr";
arch = "linux-i686";
- sha256 = "d88381b7ced8b9493e0f6f362e3ad58f8416d0922b34be848bd8610a8f5b8ffa";
+ sha256 = "c6143980f6ac715bc193cdd40b45f0da9d4ad7f830dd17f9b7793316a14fa2c6";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/sv-SE/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/sv-SE/firefox-143.0.4.tar.xz";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "ee666a39fd4374c9efed17a32f19f206244f95c0415f2121f228324afdc61288";
+ sha256 = "58cbe7a13ee5b6fe67267cc6f842bebd8b6cfb3627daa7b58aa769ab062f2ec3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/szl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/szl/firefox-143.0.4.tar.xz";
locale = "szl";
arch = "linux-i686";
- sha256 = "0b4d6af3bd6942c336921f55fe67a9c5186155e21664297c86577ca954ee80c3";
+ sha256 = "af45c7ed9b9df71a354a03f1402c908b04f8889c0bc19682d600a478500daf1c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ta/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ta/firefox-143.0.4.tar.xz";
locale = "ta";
arch = "linux-i686";
- sha256 = "9edf779a416c59bae453a822d7668bf6eaf56b86a137a6048f20ffb08a06b8fc";
+ sha256 = "eed820e42b99ad28d6bde700da47a43c98f83cee2b779bfb7b08f71aea8e2dbd";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/te/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/te/firefox-143.0.4.tar.xz";
locale = "te";
arch = "linux-i686";
- sha256 = "c9d8348257dc0acccc812793d68b274717cb032df2f8a8692b853e4e23bf8eea";
+ sha256 = "498e0210f1ec5eaae0449b9b3d54873ddba2d3f15ed3b9ac21c9322e820fd29d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/tg/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/tg/firefox-143.0.4.tar.xz";
locale = "tg";
arch = "linux-i686";
- sha256 = "b187a5df63c50ef09471eb934f9bcd7863744b27e3ed8ad40b4cc9b21715e849";
+ sha256 = "06c2b9b7e127f6f4bcf23f11116f40ef99a4916df2dba76481935656586a0906";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/th/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/th/firefox-143.0.4.tar.xz";
locale = "th";
arch = "linux-i686";
- sha256 = "440daf9829b258d34ffdf912317c2b7621b3fbf9b687d96a1fcbd40dcb50d5d2";
+ sha256 = "eb1995d5ffee49629acc51bc9ad13e7dc2fab07944bc9993e36d4b9e5e8e1cf0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/tl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/tl/firefox-143.0.4.tar.xz";
locale = "tl";
arch = "linux-i686";
- sha256 = "8977ab2b5933a1db9c9091d9353c42b554995b9748bd6224b4b0de23f3fec220";
+ sha256 = "005864dc09c990a6050358f167cb405560c419fb05333353bbfac9011a97659f";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/tr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/tr/firefox-143.0.4.tar.xz";
locale = "tr";
arch = "linux-i686";
- sha256 = "abe19d4fd8dab151d74065d3a614cc709fc0fa8233e88b368501994406c7462c";
+ sha256 = "8337f8e04680c3a1cde4ada6be5636a8432ef206d70106284a07fce8cefcb4f0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/trs/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/trs/firefox-143.0.4.tar.xz";
locale = "trs";
arch = "linux-i686";
- sha256 = "f922b9a0d2a0c0b568ba8925c6d557b288873b2d43189116ae727dc979b4246e";
+ sha256 = "b777fcaad1826d014c3b885569aa455f1ec4399d149cf65b76ce0470e34b9ab2";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/uk/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/uk/firefox-143.0.4.tar.xz";
locale = "uk";
arch = "linux-i686";
- sha256 = "326b4fec9f4bbe24eae3347c812d509888f2074a8c239171fb943c9e4d5b43ec";
+ sha256 = "b8be29d19231014261d5089c0b544a8c2159e98f530bbbb8825cfa35bda98e75";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/ur/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/ur/firefox-143.0.4.tar.xz";
locale = "ur";
arch = "linux-i686";
- sha256 = "ac89815430adb91dd5e7ce7d136af9505eae906b36095acab406f3f5e90b0c93";
+ sha256 = "0f5cef147deb52403ef1297b6c0f2be536642647f3ea780b510082b564f131a7";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/uz/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/uz/firefox-143.0.4.tar.xz";
locale = "uz";
arch = "linux-i686";
- sha256 = "f63e09736292a39daf2a025a7d5ce1237d668f52adb4aa460a6de1c3e013d5aa";
+ sha256 = "b30aad97b850c08b8035fc6abf3f09a52aa03de35bead2a14959a098b56d277f";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/vi/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/vi/firefox-143.0.4.tar.xz";
locale = "vi";
arch = "linux-i686";
- sha256 = "16cd03096d58a5c65b4517eedf987339547c71d562ab6acaa295dd72d5f3cd58";
+ sha256 = "6f8c6006dab8079ab3fa670fa24a74efc15372d0281843305e412ff24f9103c0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/xh/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/xh/firefox-143.0.4.tar.xz";
locale = "xh";
arch = "linux-i686";
- sha256 = "1d8d988ba6aa2e394086e42f3e718c5abe61ad6ad8b63aa094b65eab8d58679d";
+ sha256 = "f294d0f0e41e1705426d015af25cf4694ec7f325a933835583cc24da90e2a2e3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/zh-CN/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/zh-CN/firefox-143.0.4.tar.xz";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "c4df7ba3b5e0e546f02c2de32bc54ea6de43eb657b535bee999fff35bca70c65";
+ sha256 = "887846288922e60b2ea8f8c6f2e9bfc5364deba7b0c0a572d11245b1c966d31b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-i686/zh-TW/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-i686/zh-TW/firefox-143.0.4.tar.xz";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "b98f584663fa69ea69c2564f157fa7f157a5d6b9e9311aa10416177e6132bd1b";
+ sha256 = "f8c6330b265606ea3e2f9ecf734893e565cd5333f2cd03d8975c42b4cc1811bc";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ach/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ach/firefox-143.0.4.tar.xz";
locale = "ach";
arch = "linux-aarch64";
- sha256 = "8053c4f36bf6eef29a337167693b1f6848be5122e9f0c944ea1422ee4e26daff";
+ sha256 = "3091d2f668c11abdd0c15e73ed4578bf84cc64132095718ab13003c50c4ff494";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/af/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/af/firefox-143.0.4.tar.xz";
locale = "af";
arch = "linux-aarch64";
- sha256 = "7c6e8fcd34d0003da47ebf2e108f23cc7fe4cf3bbdfc889afd7b1dd50a1afef5";
+ sha256 = "0cfacd017363c9f9f9b5732a2da672642cdbd89fd1552573c308e5b816854927";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/an/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/an/firefox-143.0.4.tar.xz";
locale = "an";
arch = "linux-aarch64";
- sha256 = "50d2d78d64f1873439ce9c1c72dda4320941f2393ece551a87e0fa4209531649";
+ sha256 = "7c7a3ce9fe7dc3dde0549f6199b370e148da4712fd013c105aa3ddc8c60a9a2e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ar/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ar/firefox-143.0.4.tar.xz";
locale = "ar";
arch = "linux-aarch64";
- sha256 = "7c2ddd035806634653311311287cb22f88c20515f446cc070e89f908d67b835e";
+ sha256 = "fdd11899f2eef07fe47a442127d7fcd89370fb0ef4a84719d05edd97b61c3213";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ast/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ast/firefox-143.0.4.tar.xz";
locale = "ast";
arch = "linux-aarch64";
- sha256 = "df65e59e0481cc2f2b9b8517ed3af809855ca9ee4a076535d00b3fb28fc18f26";
+ sha256 = "cc9af4fb633203ca786ff3ea578e5d723d415153cad5af46cf48c35df5ebcf80";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/az/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/az/firefox-143.0.4.tar.xz";
locale = "az";
arch = "linux-aarch64";
- sha256 = "60a0c45a2eb4a4a9c0156b7b51d4c05de0c01855d751304d18134535a3206899";
+ sha256 = "5e601de87eb80097ba70d99675d26906a9ad80f9465f7a97766044a201898501";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/be/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/be/firefox-143.0.4.tar.xz";
locale = "be";
arch = "linux-aarch64";
- sha256 = "e1478a69ed96905b166d42151b827b9c6715c92faf0c565f48f4df8e30df495a";
+ sha256 = "020227c7addcd69b4226e0e9726800abeee79e085c8aad11ca4a1287dac292d3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/bg/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/bg/firefox-143.0.4.tar.xz";
locale = "bg";
arch = "linux-aarch64";
- sha256 = "bd7a2aa5818196749912ba6994028fc93fbbe45554eaf701f691b50764f7a8f5";
+ sha256 = "cffc448d0ccf896e19c0f32e078b1ff35641d2434e2d33bc1819786cd830376a";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/bn/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/bn/firefox-143.0.4.tar.xz";
locale = "bn";
arch = "linux-aarch64";
- sha256 = "32cc469fab651e436a92c494cd423d45b64530807bbb2f05cf82b481431ff2b6";
+ sha256 = "53db69f33b2f1b0ed6ca3d0272627d34239f1d8978e547ecabe8de125c721726";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/br/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/br/firefox-143.0.4.tar.xz";
locale = "br";
arch = "linux-aarch64";
- sha256 = "2d0e0a617c7e4b6feea72180f02e1aa12596d2973d3c3cf17cdfe610295af3ae";
+ sha256 = "ef70bf9c660df60d13862ad979ce0824ab81405d9c7331443b1a22b9e9b3673e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/bs/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/bs/firefox-143.0.4.tar.xz";
locale = "bs";
arch = "linux-aarch64";
- sha256 = "612353b2a63548bd3c7470d94062526f3bda7ca7f4a79c86e33c5f5f41ce6142";
+ sha256 = "d16e1c178f4d78621903be24cf2a39a1831a35a4d19ff1dd0b3350d704059d80";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ca-valencia/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ca-valencia/firefox-143.0.4.tar.xz";
locale = "ca-valencia";
arch = "linux-aarch64";
- sha256 = "73001f0e636f4c5859d1ac9e102888634455a94eef814219bc5eaa9c95d6c287";
+ sha256 = "c05fe2b618e7ea2d6cb28b9160c5e54c69abcec5211e1d742843375ce369f68c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ca/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ca/firefox-143.0.4.tar.xz";
locale = "ca";
arch = "linux-aarch64";
- sha256 = "e779da111d878eaa4a5bf24412a19dfe096de2182c9ce316d68a01394b30a377";
+ sha256 = "4d690a57fcd448f7a7a9cf6443b19bc39addddef690c25fec25d4b8145a9fde5";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/cak/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/cak/firefox-143.0.4.tar.xz";
locale = "cak";
arch = "linux-aarch64";
- sha256 = "f252d5fb815b07a5206f53d711baa10345cbfe77e6617d20e1bc5e70d2a4ee41";
+ sha256 = "5459d2441ea80b041260f63dd864b61696e48f088863b99678ee4b5563db7049";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/cs/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/cs/firefox-143.0.4.tar.xz";
locale = "cs";
arch = "linux-aarch64";
- sha256 = "a162e1b93942e4969e1b89cabe77e579b12098529548ae8401157e8d098b5154";
+ sha256 = "d64d30a81bdebc1f366dea8ad0b87a7e6b0605cea34e9380e3221e6e1d4b9bea";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/cy/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/cy/firefox-143.0.4.tar.xz";
locale = "cy";
arch = "linux-aarch64";
- sha256 = "d20337005992a620d0f6ba2f87abc4b135d1d7a42b1cd7af36983f6677eabe43";
+ sha256 = "2f629d021c5f3cdc48aaf2f27979457f4d1991f31b83180660ebe51d2d53402d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/da/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/da/firefox-143.0.4.tar.xz";
locale = "da";
arch = "linux-aarch64";
- sha256 = "18d8b162a76f4d0e5b4306cda8e07b62bfefe9709912e333a10e1133f380ff66";
+ sha256 = "5309943a2228859140ce1cbfcf5b06de7e7974fb9bbb3443d23fce49436c73c0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/de/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/de/firefox-143.0.4.tar.xz";
locale = "de";
arch = "linux-aarch64";
- sha256 = "d677a0eb7358ab5135740c10505456a896a02ccb187830889643bc46bb53a653";
+ sha256 = "74d26f6d6495eaed5fd8e459b1034be9621fc74b6e2a571931e5028479447c2d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/dsb/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/dsb/firefox-143.0.4.tar.xz";
locale = "dsb";
arch = "linux-aarch64";
- sha256 = "d88022d45184ec156773c932ab148b653571e6f5d05677c05a02c76a2c3bfda6";
+ sha256 = "4c3c495dec92c7f1353cb07748ebdd803b86d8a1fbeb74f7e0aa3f47b63f0c5a";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/el/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/el/firefox-143.0.4.tar.xz";
locale = "el";
arch = "linux-aarch64";
- sha256 = "ed5e8620858d52d911277bec13d10a01e49035a74ef399e51e05d42af2c4a55c";
+ sha256 = "20d1b10351e4a7cf7a161a1fe05d2173787ea5271d1588398834a5c4368e3e14";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/en-CA/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/en-CA/firefox-143.0.4.tar.xz";
locale = "en-CA";
arch = "linux-aarch64";
- sha256 = "e144995d391a53c76029ec84e9e244d3a2bfb7f05afbc453749a5c85e65d5ccb";
+ sha256 = "d23780890987629d981dcd71ce3a0c6b8f21b634986d52281d777c9b9e8064d0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/en-GB/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/en-GB/firefox-143.0.4.tar.xz";
locale = "en-GB";
arch = "linux-aarch64";
- sha256 = "f376f19f99ad0b739f5b1cd78e5ea892cb45bfcb31d747055eadf4f85ecd8924";
+ sha256 = "f70e754598f8c127c767ede3c4dd1db1193340adc787ba1d71d9dc6037268a39";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/en-US/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/en-US/firefox-143.0.4.tar.xz";
locale = "en-US";
arch = "linux-aarch64";
- sha256 = "a2f025df6729b7eb7d96a5f5930aa31de9219a145c14ba66f8b48b6426d66357";
+ sha256 = "562e67ccae19f654403390b8e18fce316f928b4ace7312c62086d625e44c0616";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/eo/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/eo/firefox-143.0.4.tar.xz";
locale = "eo";
arch = "linux-aarch64";
- sha256 = "0a7586208a50672c882e97d1def2cf4e631e36238b6fe422d86925595f78a874";
+ sha256 = "084035b5e53f86434264cc7146b5d33bebc849fbe2bf1baae50aa80e1250762f";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/es-AR/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/es-AR/firefox-143.0.4.tar.xz";
locale = "es-AR";
arch = "linux-aarch64";
- sha256 = "c157fdb6a2d16466902fc976b6c399bb1dd9c17ef67bfeedabc93d644e50a16f";
+ sha256 = "39086e709dc1db171d5921ef65fa846ded3daeb4a7c83b841640e8ed2c795b4b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/es-CL/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/es-CL/firefox-143.0.4.tar.xz";
locale = "es-CL";
arch = "linux-aarch64";
- sha256 = "37418bd583f425e2f93e0ae8351569101b8079e213b316f35583a39061c78efd";
+ sha256 = "32103514cccd0436ef961ab85f24d5220e8d20593886a2b09a26adca79aa071c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/es-ES/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/es-ES/firefox-143.0.4.tar.xz";
locale = "es-ES";
arch = "linux-aarch64";
- sha256 = "c5817c1c052147ef069fd7438798ab5ccfbfe59d98543f02d6ce3baaae86f6ff";
+ sha256 = "70731f4746095d6bd0ef2154287ce4f58d27a27ed52164c08237a86fdf99021d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/es-MX/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/es-MX/firefox-143.0.4.tar.xz";
locale = "es-MX";
arch = "linux-aarch64";
- sha256 = "5df8e4ac17917ddf8cd964a2d473e4eccbbddb92c681291c89cff12d407389a5";
+ sha256 = "42751d2bd5873e56533dda423d163f52c9d5a205285b6f35b6d8dbb397c82d3a";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/et/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/et/firefox-143.0.4.tar.xz";
locale = "et";
arch = "linux-aarch64";
- sha256 = "c628cee6962b1c7d30b4aec1eb83ac427385d8606729d54967ad7eef5fb530f7";
+ sha256 = "fdf1431c5e29444725e20f755d5ea0d1ba30958be75eba96398c819c53b9c081";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/eu/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/eu/firefox-143.0.4.tar.xz";
locale = "eu";
arch = "linux-aarch64";
- sha256 = "091053f7f9c681e50964daf16546d16eaf935fedd470cd3802b0f53f7ae0842d";
+ sha256 = "b60180542d1e13a7d321aeee76676d2f88d868cf2dec6b3550924418a49e00b9";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/fa/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/fa/firefox-143.0.4.tar.xz";
locale = "fa";
arch = "linux-aarch64";
- sha256 = "6532e65e22f0c98864c66b8334663b770b5f8fce21ad83be3f4d01eb7385d3ee";
+ sha256 = "6c3c7f705121c2127ed71010586aeedd2222d1b7ff4c2c241af7317bb14aebe0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ff/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ff/firefox-143.0.4.tar.xz";
locale = "ff";
arch = "linux-aarch64";
- sha256 = "722c9544804d2a75ca6f9e5b2a6927eaa3182fe4ea6f027a7b5d6d9131a5bede";
+ sha256 = "93ec9dbb2bf38cd3970a9eb30ac7b52e6f46e2b5d18b0e04fb549f9bdcb6d61c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/fi/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/fi/firefox-143.0.4.tar.xz";
locale = "fi";
arch = "linux-aarch64";
- sha256 = "78c97144b4b51527bd31f8e863f9b215772608d6bc909f210a927ffc392628dd";
+ sha256 = "709d4861dd5021709fbc3c62eb16d9c1715c5828c91cb9b33cfa01c51faf2df2";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/fr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/fr/firefox-143.0.4.tar.xz";
locale = "fr";
arch = "linux-aarch64";
- sha256 = "1b6ec2bbcfa74e8953ae8a4996230512d64942be88dae727dc9aabcbb24a3463";
+ sha256 = "d21f72979b3220badce133ae069f0627e54f57ea36440b54b3b558b58dbbcbe4";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/fur/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/fur/firefox-143.0.4.tar.xz";
locale = "fur";
arch = "linux-aarch64";
- sha256 = "6e8407e88bc7476c7ce9ff8cfb628a782493ef31c9c9609801ae8e65a4f3010e";
+ sha256 = "b64010d95b243c42f65e527a8e26356493a454185b6bf24c2848d7c628d7f652";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/fy-NL/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/fy-NL/firefox-143.0.4.tar.xz";
locale = "fy-NL";
arch = "linux-aarch64";
- sha256 = "99b22ced3a90a6ad58d202d3a7717a9c3b20160bdbc3a2495f828c4f663b741b";
+ sha256 = "13c1c79da352fe7f623670865042adbc44c0faca42df0e239e08f2d0f0497be3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ga-IE/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ga-IE/firefox-143.0.4.tar.xz";
locale = "ga-IE";
arch = "linux-aarch64";
- sha256 = "900e6595700379d7ee88f5d76e8d6bead98d1a03acd92b03d82ffc4d837175e5";
+ sha256 = "c4089f05fbbee1477590e0d3d4394b81cc8b4d4e16137f40e7bdeb88e03c2155";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/gd/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/gd/firefox-143.0.4.tar.xz";
locale = "gd";
arch = "linux-aarch64";
- sha256 = "34a998b312f13865cb0e69a38e655f18561d141ac07bdab9f74af018737e0376";
+ sha256 = "cc6c93d56d6ef751e96ca2d8d7e4b0b5004f21a80948f8d254d18bc07f94fd9d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/gl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/gl/firefox-143.0.4.tar.xz";
locale = "gl";
arch = "linux-aarch64";
- sha256 = "9213682704b2dfb2ead97a63511160a5f41bb34dbd47848d9828d45f693d90bb";
+ sha256 = "ebaa5dd3e90717775fcec6b1ce71c9fff855bcd298024ded38b7b87f7ff6b4d4";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/gn/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/gn/firefox-143.0.4.tar.xz";
locale = "gn";
arch = "linux-aarch64";
- sha256 = "705d088ecd20a18b53403de8658e2ed2adf7f7a35a19aadfc343af59781665f5";
+ sha256 = "56d1d9830f506f262b1bb2ffd17be6f342a89e965a96c373e330f8838705d01f";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/gu-IN/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/gu-IN/firefox-143.0.4.tar.xz";
locale = "gu-IN";
arch = "linux-aarch64";
- sha256 = "21ae47b6a89cea9c6f934e16c10890ad920811aa9cb1d5603615b66009a58397";
+ sha256 = "62992e5d97f4c76ba5b914c55782ee7e3ab6f35aa56b2974459d32ea3f13f672";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/he/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/he/firefox-143.0.4.tar.xz";
locale = "he";
arch = "linux-aarch64";
- sha256 = "3b95def8e58fabe1997048fbe2025818c766ede6a36cc5c1e171f15feccedbae";
+ sha256 = "0cfba77f4b0f78c721a2ed8fc797eac47d8162b6517f1001f9b21274d9809c6f";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/hi-IN/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/hi-IN/firefox-143.0.4.tar.xz";
locale = "hi-IN";
arch = "linux-aarch64";
- sha256 = "fbe9a0b4fcb00a8b7faa0039ad3b218c878a1285f1d436a6f93dbd454b8bfa97";
+ sha256 = "00753f83e1ce70377577aa17189c9671045da61aa48e9cbb25dc238093c9d270";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/hr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/hr/firefox-143.0.4.tar.xz";
locale = "hr";
arch = "linux-aarch64";
- sha256 = "d6b49e83f578793ffce53694abdbdee8b8ddabeeddbd0cd8ffc7f4f2757d49db";
+ sha256 = "d21d151dc8c5f298b377f6ede353087067f9353b71da8bc65bdbc309f48eeb12";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/hsb/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/hsb/firefox-143.0.4.tar.xz";
locale = "hsb";
arch = "linux-aarch64";
- sha256 = "a3db4f506024cfc9302c698dc222d7db2de647ed10816b83813dd0be9b5955a5";
+ sha256 = "1382a62b8cb95689d7e537a6844a129691581a859fc70af023ea5aa8ccd54e7f";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/hu/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/hu/firefox-143.0.4.tar.xz";
locale = "hu";
arch = "linux-aarch64";
- sha256 = "608fae37109b62119365f86945176e3fddf57c9d5dc1d4a4bda6ec514da132da";
+ sha256 = "c3ff36c0cb284e777055e60f85eb8d64c163b04f66a8a2b45b9e4cc0d0319b27";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/hy-AM/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/hy-AM/firefox-143.0.4.tar.xz";
locale = "hy-AM";
arch = "linux-aarch64";
- sha256 = "0c416e3d0ad29a361fcfd3b63be57da124d2842d68ba9d39974998ac7951f725";
+ sha256 = "536a7599aaa8e96b6fcf90a6d1d05155faaa8b61b649da27fcdaec0db4978d60";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ia/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ia/firefox-143.0.4.tar.xz";
locale = "ia";
arch = "linux-aarch64";
- sha256 = "709a56f2001c3def5803e76e03a6c0b33c6d8816a4c3435225cedadbf0de195d";
+ sha256 = "542b5bf240ecb5facdf97949641367f7c65079ada2d8b3e92d77b92913d1a152";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/id/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/id/firefox-143.0.4.tar.xz";
locale = "id";
arch = "linux-aarch64";
- sha256 = "66cacb45e1b803cb7bd9007e631c5d1398533d68dca153b792dbd19d8c12c20c";
+ sha256 = "f18ad3daebbde150dcbf8ced8efb262b93cd8e7b5b5042418c68111170120387";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/is/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/is/firefox-143.0.4.tar.xz";
locale = "is";
arch = "linux-aarch64";
- sha256 = "77b1beaf40c76d92cf8f2428afbd4e5d31968e436caafbfb74f7851fde920464";
+ sha256 = "6569fc9d6c4deb88c6cc32d324e1c0b5881a1d2f51409d3a932b6664a93c7f32";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/it/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/it/firefox-143.0.4.tar.xz";
locale = "it";
arch = "linux-aarch64";
- sha256 = "6066e1e188b04d83b517395dbc47faa8da46c90ae8716635890fdf15fe4d0031";
+ sha256 = "3e8b9eb72fdb92ac247120030523aa3a2d3dced483f9cae9d6619c3edf6b7224";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ja/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ja/firefox-143.0.4.tar.xz";
locale = "ja";
arch = "linux-aarch64";
- sha256 = "ce5ed43c74191dddce14111ac506a796fe2419f1aa17c77b360a61a8d6569b02";
+ sha256 = "4fb948fe4bf768c05e6ed687be66454de54445b07d9579d76b86fa95791bf550";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ka/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ka/firefox-143.0.4.tar.xz";
locale = "ka";
arch = "linux-aarch64";
- sha256 = "80eaa614f74fc17d0093fcbbba5a0b42247a77622318584863fca1f4819289ae";
+ sha256 = "8e7c77982807cf23ebe07184929eb127ffe4692c0b56bd532cc32126172ca37d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/kab/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/kab/firefox-143.0.4.tar.xz";
locale = "kab";
arch = "linux-aarch64";
- sha256 = "46e3c178ba8b3b9c2968f602123df49479d8670acedcbb96b0caa93c33c72f4d";
+ sha256 = "686f3a7a95d08e4c467e5c602a43803cd3daff01146e8e656ef6b6bcb2a978db";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/kk/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/kk/firefox-143.0.4.tar.xz";
locale = "kk";
arch = "linux-aarch64";
- sha256 = "9354d494d91aab8c1baa5332a510c52b22e93b1dc9b5c09c05af8df465acf8b9";
+ sha256 = "a6108d016d8bbb740064fb8955483bc2257d25b7c38806583e2229c1c0cbedd8";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/km/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/km/firefox-143.0.4.tar.xz";
locale = "km";
arch = "linux-aarch64";
- sha256 = "4646c9deee5e81c68ab4e06ede3618fc36cc70a816515952d290bfd659cffe92";
+ sha256 = "dde350fee3d7a37e7171fc6ea18c543c50d0ef7c52b43b657f518308dc8281f2";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/kn/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/kn/firefox-143.0.4.tar.xz";
locale = "kn";
arch = "linux-aarch64";
- sha256 = "ee52f4e1350e9299b4e97c74763ef96f639618ad50e0c201cf374370cb4ea9d1";
+ sha256 = "4aa835dca5d4e48cf9e3b3ee5a410a9efdc0e65307be27230ceacd4ef820ccf2";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ko/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ko/firefox-143.0.4.tar.xz";
locale = "ko";
arch = "linux-aarch64";
- sha256 = "7f04c688319a26de3251122927442e0ec91799786a40d55cb42c8cc8ab038b03";
+ sha256 = "621c1e2e61bfdab890a7c6c65d5da6848e1ef76cf9bf8c0a06be392e4ec11fc2";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/lij/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/lij/firefox-143.0.4.tar.xz";
locale = "lij";
arch = "linux-aarch64";
- sha256 = "a47a3fbc4ff2d2817032ee9a8f8a38ce821f88c19a93f8bed03f5a5fc725c925";
+ sha256 = "b32b42d31276054b57dd36747823c07a8caefebada080c4439c97c5b0443b39d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/lt/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/lt/firefox-143.0.4.tar.xz";
locale = "lt";
arch = "linux-aarch64";
- sha256 = "cb1c959dc4468cda9774d50bf034f063c0b95f72e9708a0b94d0505d5020807f";
+ sha256 = "edacb2ae7ff3cbe6d3f3bc2f6a4d5eed849b04ff1a618cfc2678b54a044d4633";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/lv/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/lv/firefox-143.0.4.tar.xz";
locale = "lv";
arch = "linux-aarch64";
- sha256 = "ce66b3fe1efb75018ad6d0519be6c8a5b8b1676301195550db7a7bb728499bf5";
+ sha256 = "f7d7eb8b3a1f75418cbbe658da07194a4563c988ed950db843b92ea4d39fcba0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/mk/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/mk/firefox-143.0.4.tar.xz";
locale = "mk";
arch = "linux-aarch64";
- sha256 = "fa0519da1363680e1369cee5af18a2962a35f0104980882420eabeb17d310eca";
+ sha256 = "053efa078b49adce741d2e9ebd7aa15279ecb0f89831ba7db542e1c65617849f";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/mr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/mr/firefox-143.0.4.tar.xz";
locale = "mr";
arch = "linux-aarch64";
- sha256 = "16af23ae0b83a8d702c4509101abd6d1d40547d96b9cc22ee51ebeca9f878e52";
+ sha256 = "7a0a3a6a604846f820134e14f5cb387b9902935e50e85e68ea655fb2d2d83e98";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ms/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ms/firefox-143.0.4.tar.xz";
locale = "ms";
arch = "linux-aarch64";
- sha256 = "74de925fbc79a5ce74fd9ffea267040cd1a8a30ac5beeb6d637d92a967f69aaa";
+ sha256 = "31c643433d67c231c12f833f7e8bf54ad8662700f5232335f1180140ee52842b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/my/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/my/firefox-143.0.4.tar.xz";
locale = "my";
arch = "linux-aarch64";
- sha256 = "c483a6fec400040c1f06201c3f9daee3d137dc7807172bac7761aec629743376";
+ sha256 = "0a68a538cbbaaea53e7af76143f3c75c3af7c2407ec72846697630bc890f7d81";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/nb-NO/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/nb-NO/firefox-143.0.4.tar.xz";
locale = "nb-NO";
arch = "linux-aarch64";
- sha256 = "07b875379947dbc02ff335af981742aba09764de3835dcb47ce39e46807d321a";
+ sha256 = "f50f9aab38e5c77ac3831c75aa586cb7f23eb8ce5b0eea9ce1d4aabca3aa956c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ne-NP/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ne-NP/firefox-143.0.4.tar.xz";
locale = "ne-NP";
arch = "linux-aarch64";
- sha256 = "0262231be16a6801bf711430f79869835998c263922f3914b7df1d1d938a6277";
+ sha256 = "cc33e873835f02411f3a1619caafe4ff7e56791ce50ac5082db67ce242bfd578";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/nl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/nl/firefox-143.0.4.tar.xz";
locale = "nl";
arch = "linux-aarch64";
- sha256 = "0f2af8725bd5b8eebde1d01a8a225b560378c7d7e79c56da3e87f6a1c0dc3c75";
+ sha256 = "65b10e9ac4c3bb6a204e08188f83cfbf0d50e015fbacf1747f2037541cd5b9d1";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/nn-NO/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/nn-NO/firefox-143.0.4.tar.xz";
locale = "nn-NO";
arch = "linux-aarch64";
- sha256 = "b6ccfab9b4c337f92cddd178f735adfd89074984e65882523e0744a3213f4c73";
+ sha256 = "b2d69f48d38b63fb2f5bc8694eb25842838f5d9140b646026e06a4e5dd41106b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/oc/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/oc/firefox-143.0.4.tar.xz";
locale = "oc";
arch = "linux-aarch64";
- sha256 = "b68d9c84b9ad59c5bb6ce56bdc16eb388cf40940e7d59053e8c567efcd72fd8f";
+ sha256 = "695699581afa827e00806a7909756d835c67e93a4485426e593ab059b5ef8fd8";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/pa-IN/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/pa-IN/firefox-143.0.4.tar.xz";
locale = "pa-IN";
arch = "linux-aarch64";
- sha256 = "fc89bb7de48f731b116f86bdb30c959697872c6ae7b1133f85320d02fc7fd802";
+ sha256 = "b0657ecf1c75d987c4825f6c3d2a605d6463dddd60c520b9c5a78466c5e034fa";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/pl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/pl/firefox-143.0.4.tar.xz";
locale = "pl";
arch = "linux-aarch64";
- sha256 = "a692d76eb4d73d1db49913f16ef22379eab4b19815f14d23adfb3acf4a95aa41";
+ sha256 = "0b0db3589be6854b8b47da0a7c8dea91c28155d6e9bed26f72b5fda90953c071";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/pt-BR/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/pt-BR/firefox-143.0.4.tar.xz";
locale = "pt-BR";
arch = "linux-aarch64";
- sha256 = "9a28e65e22b450e7970dff508abf7e821457226c433a83577279eb81c3792359";
+ sha256 = "e55e4a12606c764a795bfe3fde36a10485d7be0499ce86cd006f8268e949b786";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/pt-PT/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/pt-PT/firefox-143.0.4.tar.xz";
locale = "pt-PT";
arch = "linux-aarch64";
- sha256 = "4a886ec3078e0dbc90fe572a3f053d2feae734a555145af8689d84e85b53f35b";
+ sha256 = "a5462d35de8895c4a5a45e78667f5afb26668a8edcd287e12429225158104346";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/rm/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/rm/firefox-143.0.4.tar.xz";
locale = "rm";
arch = "linux-aarch64";
- sha256 = "1988b0142dd07ec759b490ced16e3a71faab56bb849ebe6a3329f85726ec5b9f";
+ sha256 = "1d34af45e6aa15c8628b20a483baa72a148c08997a1dad0cdb483664484c8629";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ro/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ro/firefox-143.0.4.tar.xz";
locale = "ro";
arch = "linux-aarch64";
- sha256 = "637b5940cf48185e6a65c8314e00b721ce2ba7598c32bbc6ff85c4d05e85403a";
+ sha256 = "b30b7e152643cce52fe34977eff2f9b35ca9e4a8b68c4c3f57066d468ec4ece7";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ru/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ru/firefox-143.0.4.tar.xz";
locale = "ru";
arch = "linux-aarch64";
- sha256 = "1dd6bd60bedcf18e0f08d2b9371483e01e87617704696c69b82aad74973bcfe7";
+ sha256 = "6728eb45559747ec0487bb6d886886f82041997885b8bd13e40dadbfe61f688d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sat/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/sat/firefox-143.0.4.tar.xz";
locale = "sat";
arch = "linux-aarch64";
- sha256 = "d9f90a4c0090cba274b6b3888a84f6c45de72297e62a5ff5a47cab257c2a3e19";
+ sha256 = "d5bebe4acb45adb7bcf9f34c1ce57e3dcf897c77df402e6e4a6bdf165b560310";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sc/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/sc/firefox-143.0.4.tar.xz";
locale = "sc";
arch = "linux-aarch64";
- sha256 = "92ba301f079d4c18eb4031a924eab1a817bb89819a2fd2c3933489b97886efa1";
+ sha256 = "cc1ae3ae8f54891e71e94275ec529982d42cb30410b4a7e2c504e90f09e5e99b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sco/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/sco/firefox-143.0.4.tar.xz";
locale = "sco";
arch = "linux-aarch64";
- sha256 = "106576d3fa835383c8d64ea33b3b05f4810e2d2168406f56ac9afad07eabaa51";
+ sha256 = "94c22b9ce2ff945457caa51a746f7279415921ee5851f629e92c28644823f6de";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/si/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/si/firefox-143.0.4.tar.xz";
locale = "si";
arch = "linux-aarch64";
- sha256 = "449a9873ca18d231a9260b4fa75f6af8cd1ef8ab92bd7f614c4f6d3b5b2061b4";
+ sha256 = "11282a449ee6d96019e07eb2aaf77beef66017dec97720639cf27ea15d990056";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sk/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/sk/firefox-143.0.4.tar.xz";
locale = "sk";
arch = "linux-aarch64";
- sha256 = "d936894e571eeab7b19fe287aed3f7656f5c9fd4525fc0b4748e89749a1312d0";
+ sha256 = "4fe39acc7861c3d9c8e75032d3d4587463e880b3b52380e4d43b0b9932cc4b13";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/skr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/skr/firefox-143.0.4.tar.xz";
locale = "skr";
arch = "linux-aarch64";
- sha256 = "3dc68ff035968c7ce3a9bdfde39cd2d7a1ec16744068ecf486d149a713991e2f";
+ sha256 = "832720255c257ebea528c6c2b2f8b9ebbdc17869e57218229a7ea2c195eb8091";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/sl/firefox-143.0.4.tar.xz";
locale = "sl";
arch = "linux-aarch64";
- sha256 = "df4d18b8fcd1f4e2ebb03696182f1abf13ccd3d87df2bd98e101edd65262b6fc";
+ sha256 = "eeba378926fa4c207ecbe03629b90999baffd1fef02a09854ea28849a6326e47";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/son/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/son/firefox-143.0.4.tar.xz";
locale = "son";
arch = "linux-aarch64";
- sha256 = "78f7663913b0236c643c5a504d9eaf9d2be0f95a14c4db07b1e648704fc6228d";
+ sha256 = "f2403c08c3f50bdac8425c2309bd261ad579ea2d5cc8fe1ce9a57fea551292ac";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sq/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/sq/firefox-143.0.4.tar.xz";
locale = "sq";
arch = "linux-aarch64";
- sha256 = "3c1f967a341e36634a68c6ce8c7576e73525ea4aa7fd8af3db82688a5b85b373";
+ sha256 = "70203306c0120c37a96bc5766345dfb044b411936c762ffb1daab4efbb486990";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/sr/firefox-143.0.4.tar.xz";
locale = "sr";
arch = "linux-aarch64";
- sha256 = "d8734140f83702ba7ac374872cf368fae84e16bcc05f911b67d26203e36dd979";
+ sha256 = "584930198c8d956e4b06e6dafb439595e5f2f6fd515e6ea310cad3ff950cfe6d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/sv-SE/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/sv-SE/firefox-143.0.4.tar.xz";
locale = "sv-SE";
arch = "linux-aarch64";
- sha256 = "5c7c5e77a3c297873509dce940057208ae0ae7790c4b8408f9d714539776cf33";
+ sha256 = "240e794349b0ab782c549bd0fe76dc97560f18a21e6419f1dbdead94a59d1c9b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/szl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/szl/firefox-143.0.4.tar.xz";
locale = "szl";
arch = "linux-aarch64";
- sha256 = "521e178f8de46507d6783b995135a516ad94cf871e40a79c4baa1ec3479349ca";
+ sha256 = "3ff1d25322af776039f4d3e4e77b7fbe31330b9f60f9253a193ba16be11502a1";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ta/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ta/firefox-143.0.4.tar.xz";
locale = "ta";
arch = "linux-aarch64";
- sha256 = "80b5e8effb3c4767e037c27e42db99747565f7e65ebaa649fc2b1c24446b3061";
+ sha256 = "90925f87ed45a946499e829908a889bc245ce0ae7eb78f748d6293bf027fad17";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/te/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/te/firefox-143.0.4.tar.xz";
locale = "te";
arch = "linux-aarch64";
- sha256 = "e8918cd933cccbfea7608ea2c70379654d2130bdbd0e85274e26f514e9ec17cd";
+ sha256 = "744e1db649ba74b25c1bb7a48c47e1bd7772675f600753a739ee5dd8d55a7d0c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/tg/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/tg/firefox-143.0.4.tar.xz";
locale = "tg";
arch = "linux-aarch64";
- sha256 = "8b2758a66f1722f9fc9aaf3c086f713831f2c01718892993c8fa9a54f6a2d6de";
+ sha256 = "b8fe164772e71513b4c3858caa8036f5f033dfd6673daff946bef6100e516cff";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/th/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/th/firefox-143.0.4.tar.xz";
locale = "th";
arch = "linux-aarch64";
- sha256 = "0f94413a5fa19eee8e2a2edde00e29c230ddc3a9eab82c74fc8b63877154b067";
+ sha256 = "10e89aedb3bf2c2d287581bc0c6140247f4f6fca3527c17211a1ed7d430f3c0e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/tl/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/tl/firefox-143.0.4.tar.xz";
locale = "tl";
arch = "linux-aarch64";
- sha256 = "0d6450446d090268150de81fc69b108f3296ab6faab83e7c7562d746143768e4";
+ sha256 = "2b6b83ef9de2ae3486d8a3e94db1e90829079ad2c981128cb2f7fb67641bf189";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/tr/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/tr/firefox-143.0.4.tar.xz";
locale = "tr";
arch = "linux-aarch64";
- sha256 = "8751c2272a2fd6d7b8efe79ea65ea28b5bc68b014d9e4dcf9576c1a819d7e7f4";
+ sha256 = "b4ddbef42b1090a1b008aead9cf8f6cfcd741bd121dd8e388bc05b7fa2b0d423";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/trs/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/trs/firefox-143.0.4.tar.xz";
locale = "trs";
arch = "linux-aarch64";
- sha256 = "815ff3324e2c10252d0d154f31f2a5731525d0e8be913b712524c2e635ecf1fa";
+ sha256 = "2210dce46dc886e8c7d4a61ad801e5b0351ed28ec7941955c7f7d88015ed5c20";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/uk/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/uk/firefox-143.0.4.tar.xz";
locale = "uk";
arch = "linux-aarch64";
- sha256 = "398344f569b3764f1b51f7730af1a6d770f10362e24436c86bc726a112f2cb44";
+ sha256 = "d601a25d986414ac29ee57229392ffc670eda52f3fd1e38ff864296c0b176d40";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/ur/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/ur/firefox-143.0.4.tar.xz";
locale = "ur";
arch = "linux-aarch64";
- sha256 = "49285e5b56da461dfa2f140f628914f703de86c62a18d082faaf168993cae87d";
+ sha256 = "8fa4def67c6f3286c08ca54f23264461eee2dcf470117c1977b0d1e02c1fec8b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/uz/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/uz/firefox-143.0.4.tar.xz";
locale = "uz";
arch = "linux-aarch64";
- sha256 = "9e8ea2a68b607b858f91cc2578d82f690974b037bd8258e19bc8bffb0ffdb593";
+ sha256 = "5395c8a68e511894b05b170b205dc2b36f74afcf895f8e892bfe649a0fcf9950";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/vi/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/vi/firefox-143.0.4.tar.xz";
locale = "vi";
arch = "linux-aarch64";
- sha256 = "b81b9ddc99a6e3b7d4d486eb93dfae8b6d3459429c435ef40a7625e11f13eab3";
+ sha256 = "1456deefb0ae4fd1dae9ff1babcba4279dd6c44ef073a2bfbbd14dc8b0b04384";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/xh/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/xh/firefox-143.0.4.tar.xz";
locale = "xh";
arch = "linux-aarch64";
- sha256 = "e3b2d4c2967deac1e13cdc36e38ae686e26bd18978f1212058cb182335a33ed9";
+ sha256 = "91d8f47fcba2aeeac3c37bda07d31fc1fb7e917bfd59970bb2473b3ac80bdaf1";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/zh-CN/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/zh-CN/firefox-143.0.4.tar.xz";
locale = "zh-CN";
arch = "linux-aarch64";
- sha256 = "6faab7707dc42e56b4829d025da9e10ad8137e9be118b42bd2eadca0c8ae7685";
+ sha256 = "e1319956bbb1cd20be8cea36672c8f7ee9548df34938a37d6e1ff5cbf2c43c8c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/linux-aarch64/zh-TW/firefox-143.0.3.tar.xz";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/linux-aarch64/zh-TW/firefox-143.0.4.tar.xz";
locale = "zh-TW";
arch = "linux-aarch64";
- sha256 = "b2916017606870eea520cd03db40a54f51c76259a774edf5932ca8c34d381268";
+ sha256 = "3c6408c3ef0849dc416321f464615006383e76201332c1678fb46059b2feae18";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ach/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ach/Firefox%20143.0.4.dmg";
locale = "ach";
arch = "mac";
- sha256 = "12e5e72bd9ade4e96378c417c0e4a118d347e5ef4fe2bdd36a1ee0673bcebdc0";
+ sha256 = "597dbb17b5b4f949528d10d36029123237143c812cdd720e06ed7da2eff239fa";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/af/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/af/Firefox%20143.0.4.dmg";
locale = "af";
arch = "mac";
- sha256 = "c3c90bfbec6fc0b95fb10f037e80aed1d0aa52702920f89537385b4d4bd9d78a";
+ sha256 = "fb3c1d4c3a32c8f9c69f285b203ad4cdf8cc673dd1df7e2d3443ed1de3183791";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/an/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/an/Firefox%20143.0.4.dmg";
locale = "an";
arch = "mac";
- sha256 = "8b14f175a72a64b009417ac6980a093f5b3ec856347f18bd7c0d1ccd7f113769";
+ sha256 = "19d7057862ead1a2b21808612078cb8555de1576b12842829a91c7fa16fdeddc";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ar/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ar/Firefox%20143.0.4.dmg";
locale = "ar";
arch = "mac";
- sha256 = "c5dd3600c8ca0d7dcb09ea230920038d53c1d95c1504391e770ec3d2dfd684d8";
+ sha256 = "8b5d51d0f906d41557192bc5da1130c1f3f68213c5aa0eb72853ec7047bc2e99";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ast/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ast/Firefox%20143.0.4.dmg";
locale = "ast";
arch = "mac";
- sha256 = "b66e98006624305e39581b78ddd5e67013ed01c00001dc1ddce06ba682d571b2";
+ sha256 = "38d9c14c436860cef8ae1d0b21afb3e01fd572f78e7ce51f03f70d955216f239";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/az/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/az/Firefox%20143.0.4.dmg";
locale = "az";
arch = "mac";
- sha256 = "314d408c90a6024ffc23118cecc7a73ceb05ab8230faeacc9f90051c3c449d14";
+ sha256 = "71b5401f27f73f72753b5b474c271645c3c62847b3ab64c0e1cc417442c8bf0d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/be/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/be/Firefox%20143.0.4.dmg";
locale = "be";
arch = "mac";
- sha256 = "2076b201b44200f1449e5e3c7e79e5e70ee5541db533d3951a59ab7cb04c707e";
+ sha256 = "b3e3ef2232965d15b966dbcf1bc6197daf56fec561c9fb4d13645ddce43c34de";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/bg/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/bg/Firefox%20143.0.4.dmg";
locale = "bg";
arch = "mac";
- sha256 = "55f6a7f125cb8abdcbbc093698505b1de26fccb92119766a39aebaaf52ea9104";
+ sha256 = "8f6b5119090e3b21c654daefc5f62fe72f37efb4def0eef642d2e6e179c4e500";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/bn/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/bn/Firefox%20143.0.4.dmg";
locale = "bn";
arch = "mac";
- sha256 = "9e8854e6d67bdae9ffe23aa368902cb4ed81c1da36a2f6bd40b164ee2bbf23cb";
+ sha256 = "bdb3104fc033800bf39875a68ed9f3aa04a61f565819b278e6c4800aea98180c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/br/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/br/Firefox%20143.0.4.dmg";
locale = "br";
arch = "mac";
- sha256 = "49c297d3fb5dd4d16cbcbd4c502364ffceae4d83d23bcefa04579960696d3faf";
+ sha256 = "1bc5bce2aa29f5918a6097f2f34871162680cfcc11411aa88f1fb4ce56c4f57c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/bs/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/bs/Firefox%20143.0.4.dmg";
locale = "bs";
arch = "mac";
- sha256 = "9ae3ad1540030b52eadc6e9763c09cbe422cfc19b3e4a4546467191b2ad32378";
+ sha256 = "c374ee32c08d8660c4ab0b75565282562e89a7e2eb94bd8ea56f4acefa6d598c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ca-valencia/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ca-valencia/Firefox%20143.0.4.dmg";
locale = "ca-valencia";
arch = "mac";
- sha256 = "674f3d42c4e28bcadff386efce477415f5cf3889b5dbf1374752708ab628e9cc";
+ sha256 = "8ebe97e5f1b2ea4595e58e90fea9066d4a1d660d1143084a9efe139eb28b83db";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ca/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ca/Firefox%20143.0.4.dmg";
locale = "ca";
arch = "mac";
- sha256 = "de8f59903f370219247bf30755aed7eaed0461b917b7e8dac66775ce9c959f7f";
+ sha256 = "066af3af2ed7d9817e5842297e2094bf781f24a25788633229ab63587d79b71c";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/cak/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/cak/Firefox%20143.0.4.dmg";
locale = "cak";
arch = "mac";
- sha256 = "5d08830a40b4bde32e08184bae082e0b325626ac1fe9471821fa87bfa3f15d3f";
+ sha256 = "b9a26c3be4501fee3a5729a5342599cf637dfdcf3fec7f8dc5a6fa8725106f18";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/cs/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/cs/Firefox%20143.0.4.dmg";
locale = "cs";
arch = "mac";
- sha256 = "b889fe5334844ab1a1c983a2640b47de3e7d9a59f20273900bb056c9b6a7b0c5";
+ sha256 = "b8d3b36a939c7453a772552826144b53702ade0db3d433c3b47e458d9528e296";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/cy/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/cy/Firefox%20143.0.4.dmg";
locale = "cy";
arch = "mac";
- sha256 = "46ce1a6845aa567a44e7264389453586a85591c2c8f261cf528083c43a915d00";
+ sha256 = "022a7bfc74a80c0e8c5de42d53813c55833283751cc39e6afaa665cc24d8666b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/da/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/da/Firefox%20143.0.4.dmg";
locale = "da";
arch = "mac";
- sha256 = "ed0a779b10465f3e68ba4cc78fb153a4feffc266e5ea57a16dc31fdbb178002a";
+ sha256 = "57ac9f3e71ca67cf42d632745a685c338c26df3746f10931c8ee47d4a3a29754";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/de/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/de/Firefox%20143.0.4.dmg";
locale = "de";
arch = "mac";
- sha256 = "473ff2761c72891fe655f397a69fb7efde5e6af76d0da51720c1982953a7b6e2";
+ sha256 = "df0649835924a5969c413f1ccd973194a689418d29e110e2f748389872b375b6";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/dsb/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/dsb/Firefox%20143.0.4.dmg";
locale = "dsb";
arch = "mac";
- sha256 = "b41be37a7a2e3335518a48d13f6ffad65534529c9215d987bcd53ad8436453d7";
+ sha256 = "40e68a140e2dd64e3ed135fe9ec1240c0bf0657cbf618b553c8f3788dbda5df1";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/el/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/el/Firefox%20143.0.4.dmg";
locale = "el";
arch = "mac";
- sha256 = "9c01e1ff0f3c41f684631e27640c1363fec95321255c39bb0a3c9a28d9b471c4";
+ sha256 = "174e62be9eda5da11325d96cd6b584bb9a492509b34edbc1cc24cb679c1519ac";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/en-CA/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/en-CA/Firefox%20143.0.4.dmg";
locale = "en-CA";
arch = "mac";
- sha256 = "fa2da4d015bd5ae8bbaa511d414797a40dc9c7b7a50e42ce5932881c20e5a636";
+ sha256 = "ee4da5e1523135f6a50f7aa1164bd12973618511479c29d7f8e345db189cd4af";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/en-GB/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/en-GB/Firefox%20143.0.4.dmg";
locale = "en-GB";
arch = "mac";
- sha256 = "e298eda3c8940b0a5f807dd30f388a8687b5f54531c13d13dff69a334fbe9a16";
+ sha256 = "33f03fe88b7076d4f314230c1b61badfedd9fb45f6e621f4f71ceac6eefd9a53";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/en-US/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/en-US/Firefox%20143.0.4.dmg";
locale = "en-US";
arch = "mac";
- sha256 = "ca889a4ae53b93c65a54130b81eca818a08e38d15dd0efe9d06217f899530beb";
+ sha256 = "332ab6fdde189325a8118a401ae445c3caf72d7a696ec3ffd96323a9c11bc8ed";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/eo/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/eo/Firefox%20143.0.4.dmg";
locale = "eo";
arch = "mac";
- sha256 = "c71ec55fa4b1108613789be3bfad9c66261bf9456087caa1a2946ec32411a7db";
+ sha256 = "fc7a11e1e08b8de426aea3d2d420fd05237f4c5885c8dad961422e8e0e26d077";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/es-AR/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/es-AR/Firefox%20143.0.4.dmg";
locale = "es-AR";
arch = "mac";
- sha256 = "0bd1e84c2053f215f792634849b67c34127a392eb75ac4b0e2130d5da70ff844";
+ sha256 = "38378e39501cb918c947069bd1777abcda2fc653dced389dc1892f59b5f61ba6";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/es-CL/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/es-CL/Firefox%20143.0.4.dmg";
locale = "es-CL";
arch = "mac";
- sha256 = "85c4356ba7a541d7501b49d5c3580d33c44fd94e832057d38c89245cfbe4f3b8";
+ sha256 = "041ff14deae6fae7087c4a1561b1b9584a121a42550f155c2ebfad836fc65717";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/es-ES/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/es-ES/Firefox%20143.0.4.dmg";
locale = "es-ES";
arch = "mac";
- sha256 = "3d8222db853b68ae182b209456476a6f2a38d80daba67c7ca24b9f5184f9df24";
+ sha256 = "a33c32255801b1469a1fec42b1ff8fa948fae851db918d683ef7d5fb9704388d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/es-MX/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/es-MX/Firefox%20143.0.4.dmg";
locale = "es-MX";
arch = "mac";
- sha256 = "76090c72df5dcf2d81248fa2b3f4a1f9daf9927cee1cd7916d18e29bd59160e3";
+ sha256 = "955d31b9cd6a9cdf82bbedf85c5921ec0023d8d581869173e7b709b8701e3fbd";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/et/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/et/Firefox%20143.0.4.dmg";
locale = "et";
arch = "mac";
- sha256 = "b25682929543562d5340cb1e4da0c5d0a7df5e45c0be1fb127734b39f8e37e09";
+ sha256 = "7c21159c0429feba8f07da0a65dac734e794468512ca4d5b9870de9ab6facbd5";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/eu/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/eu/Firefox%20143.0.4.dmg";
locale = "eu";
arch = "mac";
- sha256 = "bc1bdc2035fbaca16a1f50d40412236d18cc02c96f9a124f3453a0a7548b613b";
+ sha256 = "5bdeac9807d1e1f24428d04c6ddede18cde9d55fed2862ae65d77cd1ac3718fa";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/fa/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/fa/Firefox%20143.0.4.dmg";
locale = "fa";
arch = "mac";
- sha256 = "56854e26cb350f8ae6803c0855c86890a8b0adc84cbae45713e64ee74da87b79";
+ sha256 = "81e67e539757991c7cf127d346347213db68f1479ca612681a0407b0c73139c5";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ff/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ff/Firefox%20143.0.4.dmg";
locale = "ff";
arch = "mac";
- sha256 = "779496d23e557acfcd21f7207d1c765169f12efa230f8b23ffafbf67082411f9";
+ sha256 = "c74ec35d243739366b71d818aecf2103568fbe32dcac04930a524ebc6b3f37da";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/fi/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/fi/Firefox%20143.0.4.dmg";
locale = "fi";
arch = "mac";
- sha256 = "7e0897eeed7a441fa9daa2fc4c02283eac61ecb545b4da289bf327464e49e5a6";
+ sha256 = "e11f41c5f39d8129c3ff080d372c13c886d4698d54d7df21b50d4707b49a1e94";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/fr/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/fr/Firefox%20143.0.4.dmg";
locale = "fr";
arch = "mac";
- sha256 = "9cdd197b54eae86e58ee513eec128bc6b6a8e4f189f6dc1088b2bc81e34c37c4";
+ sha256 = "1e8c55bc045206cb5ab8c46f1feaa229df826ace8abcc796bddf42bed36b885e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/fur/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/fur/Firefox%20143.0.4.dmg";
locale = "fur";
arch = "mac";
- sha256 = "da3ef44d17bff2aecf35a10c81c04d018d261bebe6d2a52e0c26ca93e77403c0";
+ sha256 = "7e6f3fa90f55d8c296b517e1a0e37181dcfecfc4a7f23f21f7bcfaa7a7612af6";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/fy-NL/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/fy-NL/Firefox%20143.0.4.dmg";
locale = "fy-NL";
arch = "mac";
- sha256 = "69840fe24f6cf7b703ac1b473d13b0ebba148544e04826f1d06a563d283db5a9";
+ sha256 = "cfe291e339a2df0d86aaca3446ab1f28c5a0225d4caa6b4c8d1ee274154fde86";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ga-IE/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ga-IE/Firefox%20143.0.4.dmg";
locale = "ga-IE";
arch = "mac";
- sha256 = "520a7e3f24034015a12948ea689a22727b17449af3a633ee2908251e8ba1ae48";
+ sha256 = "8955741ce868affff997b5b08f31e31c88a5ed9ea94a0298154f94c7f897ec69";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/gd/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/gd/Firefox%20143.0.4.dmg";
locale = "gd";
arch = "mac";
- sha256 = "43479e90ff4550f20c133b4167e83c753d116aeffb1fec7696d6474a647a48e1";
+ sha256 = "863f0d1ebdb24e1f0f7a9b6cb94a4c1a92b26e3a9ef8b07181d99fcaac5ed29b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/gl/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/gl/Firefox%20143.0.4.dmg";
locale = "gl";
arch = "mac";
- sha256 = "cac6a98e48a2556978ecd24df9e0a39693c95f5d1d27a7d7a063b31ac7628afd";
+ sha256 = "4d738623a62e1f5e65fc5595a7bb3153efbe92dbb280731cabe2abf739bbb868";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/gn/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/gn/Firefox%20143.0.4.dmg";
locale = "gn";
arch = "mac";
- sha256 = "3d603292f4ffde754a27eb2b84f37b1fd7e243fa186baea563a212da87ff5ed8";
+ sha256 = "ae94c2dbf64e15ffe6e396b946025d0001c6d6b2e819134521d0a70bada8fdf0";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/gu-IN/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/gu-IN/Firefox%20143.0.4.dmg";
locale = "gu-IN";
arch = "mac";
- sha256 = "cdb7ec69ed13040fb04f658f5ca4eb064215ca136a29d0ac02194ba3e5f3d59b";
+ sha256 = "1b15c3e4db6ac33b29231229d1769cd1463f2fe6b0a4c0ff3c2f9b0cdb41ef31";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/he/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/he/Firefox%20143.0.4.dmg";
locale = "he";
arch = "mac";
- sha256 = "7589b9cd2a912227b71dcb7a2286dcc5e7b402bdcd1e2d91f30112949d1b7cf7";
+ sha256 = "6e8b99af3512c2bbb604d9de6a309e5b0cddabf504ab8b5cf70348bdfb265593";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/hi-IN/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/hi-IN/Firefox%20143.0.4.dmg";
locale = "hi-IN";
arch = "mac";
- sha256 = "a44e32e2c868b31d9959b093a772b4f031d8eebe56e811fef4b22044a9d4e31a";
+ sha256 = "db575fa7b2ee2ff697bf7b989188413e4c47fafec2adabe5c28e8c8f37a01163";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/hr/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/hr/Firefox%20143.0.4.dmg";
locale = "hr";
arch = "mac";
- sha256 = "2819c54d815da89efad29864d487751e6e9c566eaf7e8726acbca860a55a6197";
+ sha256 = "1ec5b4174c5e8d9607564a668bd95da194334dbe4c52a5e31857d38178314b5e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/hsb/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/hsb/Firefox%20143.0.4.dmg";
locale = "hsb";
arch = "mac";
- sha256 = "b329a9398ba93676178245d62b8b053d37e94a66e33a63aaca88be4a1c18c38c";
+ sha256 = "11a75c33c560e6ccaab33ce5e1086d32305825e782df674fb2d7afb285968f6e";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/hu/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/hu/Firefox%20143.0.4.dmg";
locale = "hu";
arch = "mac";
- sha256 = "dad4dfc5f6bc8cb1e33989d7d41c2ecb2dfe070f22a81c4c9a39ceb90de091e2";
+ sha256 = "100d7870f62b959152bf972a61f60156b5de6036ed6b2ab066c346394f4b2b56";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/hy-AM/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/hy-AM/Firefox%20143.0.4.dmg";
locale = "hy-AM";
arch = "mac";
- sha256 = "4769d222e0b9a9c8a55d99d3884c5f23922a9b20c0d99febec8431c1631d9f9b";
+ sha256 = "22a75359c410e0dbc94797c5892722171d4522ccef9ddb72faeb952b944faf7b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ia/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ia/Firefox%20143.0.4.dmg";
locale = "ia";
arch = "mac";
- sha256 = "dd1d1571fa6616cf50ad86079123d54c3016146cc376b395af9b6466cd3a613f";
+ sha256 = "4bc758d2e4f2270a23750778798c0b15b9d943eee7cbf2a317c039ea54f96625";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/id/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/id/Firefox%20143.0.4.dmg";
locale = "id";
arch = "mac";
- sha256 = "6735d3efee7eba68cba8c5e02f4274ea464bb2e91b85434b7e53fb62a27a8492";
+ sha256 = "1ccc57618bbab6365fe065889da456923ee9ccdc563d8cde9f281fa200d173ee";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/is/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/is/Firefox%20143.0.4.dmg";
locale = "is";
arch = "mac";
- sha256 = "686ffc85e6fabd94417d9f3fc74c990a876785651db6b23e14444d51d54fc2cc";
+ sha256 = "e8a4f2c782aa0bd2da35f7731e2fa451ae5161447b19b42bc4950b9dd80ee938";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/it/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/it/Firefox%20143.0.4.dmg";
locale = "it";
arch = "mac";
- sha256 = "e354cd82850d445677a538d00f9ceb8df3338e2f4677d4dddc1fa19e4e990698";
+ sha256 = "a0a6f0c71f309c135f0fa3f60feb25c4250b5e30b8f99a81f14c96c76ed8f512";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ja-JP-mac/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ja-JP-mac/Firefox%20143.0.4.dmg";
locale = "ja-JP-mac";
arch = "mac";
- sha256 = "7c486c36fd796956018de225512bd7d6420f769760fb3c330b484619cff5541a";
+ sha256 = "b8de3884d0c23ac49a9b393e3e3bf15a2e05f5709d0100f83867111d07620199";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ka/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ka/Firefox%20143.0.4.dmg";
locale = "ka";
arch = "mac";
- sha256 = "b60c8f46a95c9f32aff935aafa140f3c532be3d2d061d3fff970cad2428d8350";
+ sha256 = "0c729aeb36319615a59f9b97de944b8802e14c02a46fa63f0df79e5483349bde";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/kab/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/kab/Firefox%20143.0.4.dmg";
locale = "kab";
arch = "mac";
- sha256 = "1591a0ab0c689ce376d80e8f08956eaea22eb38dde525433527024987f9f1fb8";
+ sha256 = "83107355f1e0cb760585aeed2089ffad66ef0a54bb21e4b2ef952fc34d957b87";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/kk/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/kk/Firefox%20143.0.4.dmg";
locale = "kk";
arch = "mac";
- sha256 = "3f996d8cd907f76d9e9395c19cea32d25224cf40f422f8a7daf4cadcec320945";
+ sha256 = "3f3875ace31f0b39d00c6920a1c63e345c22a27aa1048b9a32fb03369be17b64";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/km/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/km/Firefox%20143.0.4.dmg";
locale = "km";
arch = "mac";
- sha256 = "ddb96825f910f82cda0ab90926bf621f9b2133229de97313d0b48353a06504d3";
+ sha256 = "af0a2f24dd8fb4885cb9a41a40b941d79c99282c0cbd5bb69549130dd63240ff";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/kn/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/kn/Firefox%20143.0.4.dmg";
locale = "kn";
arch = "mac";
- sha256 = "ec2bff666898973c9227c442aa3d3aa57adf8c0bceab878a195ccbe70609e6b6";
+ sha256 = "580d899c23cd30a19900bd66570ff43766f9afb4c275ec06ddf2ac78772b9e20";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ko/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ko/Firefox%20143.0.4.dmg";
locale = "ko";
arch = "mac";
- sha256 = "e79a73a794af71863a47936e17e11330cdba7ca4dd48dff7d23c444289beb60c";
+ sha256 = "a5b82c99d4d9f4081bc4e8bafa56b55bbe7f608c4bb1c3956b31a0e5bf62b110";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/lij/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/lij/Firefox%20143.0.4.dmg";
locale = "lij";
arch = "mac";
- sha256 = "18d82058cd71faa3d6b16e9147988046c523dc51d9ff85f07a5faf85446d60d1";
+ sha256 = "ffd396a6e3b4f03537cb1989702840d2898f7a938781f499a2b69b6bc071a6bc";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/lt/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/lt/Firefox%20143.0.4.dmg";
locale = "lt";
arch = "mac";
- sha256 = "3e7038fb93e75f522c184160681175343cd0b7ea64d27602e3acd048b0900388";
+ sha256 = "9e09756f9f6d1bb12e482da02aa48ad3cff23bf715296461ab35ff929103e3ff";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/lv/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/lv/Firefox%20143.0.4.dmg";
locale = "lv";
arch = "mac";
- sha256 = "177628dc4af5a8011644993a7714478fa276e72534be9d97a0e518173d31a661";
+ sha256 = "7d6cc236a4134c79699f46411d6c006503796700745851bcae0cb26d991d7cd4";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/mk/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/mk/Firefox%20143.0.4.dmg";
locale = "mk";
arch = "mac";
- sha256 = "b2dfc734b814393c34472f3f820000c6729756bedc571113fa983dcf1170753f";
+ sha256 = "e11e0142f18c11c040ca77798b917a31bb7da977fae250644c7782285d21a974";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/mr/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/mr/Firefox%20143.0.4.dmg";
locale = "mr";
arch = "mac";
- sha256 = "579f5050d494347d28951479339887772e134606958229cd1d8c6a66fdb7f98a";
+ sha256 = "39c99b1c26c499d26c3867b58dac4a9e9f62fdb2138b5aadd9ed8210124980c9";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ms/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ms/Firefox%20143.0.4.dmg";
locale = "ms";
arch = "mac";
- sha256 = "165d25d694261cfcf4b1c01ff8984e957ad8e81ae41bb5a203dd401e29bc5475";
+ sha256 = "1e40676ae4b9f93bf61c01735f30910f79738da9fb9d9b2b7fb8374ddb6e9bc1";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/my/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/my/Firefox%20143.0.4.dmg";
locale = "my";
arch = "mac";
- sha256 = "74a9761276966b4d526cc43c8f2603a1a092f401e23fdfce0ef8eb73f3e464bf";
+ sha256 = "5269ac2df17c389440852b26011337091f260b0f7e9d4ec0c9aa5c21f1b1f942";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/nb-NO/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/nb-NO/Firefox%20143.0.4.dmg";
locale = "nb-NO";
arch = "mac";
- sha256 = "e9ad3ad106a75316d6b0cf1f255d3d00d3121492e926ba8ed52e2f8b0a851fec";
+ sha256 = "853f688216f77fead44ec51e5100aa1ad6fd9a2df5feaccaf1679e28bf24a25b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ne-NP/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ne-NP/Firefox%20143.0.4.dmg";
locale = "ne-NP";
arch = "mac";
- sha256 = "f058d7c591cf2f3319002bb1f612a2887764cb80cc7f4e003f70b47769d43dd2";
+ sha256 = "76ae52f15676142fcfc694c9db3b3809620b65b523cee79ad9b23e19704a3656";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/nl/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/nl/Firefox%20143.0.4.dmg";
locale = "nl";
arch = "mac";
- sha256 = "53660ce795915ed6eb1e01c0dfeb19dccc9bdb4d30e9a70571a3a021157b9d63";
+ sha256 = "513f728c16970fa8061f65cef30900b699a07404aba7c82a0acbf1908f97c2c6";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/nn-NO/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/nn-NO/Firefox%20143.0.4.dmg";
locale = "nn-NO";
arch = "mac";
- sha256 = "0ee4fc35c14f69da1ca44128ce12b05bad8993b35097ea26cd898662827ce2f4";
+ sha256 = "4fea97720032a19fcdc93f86812754da03cd9173c528544aef87c7d62029e01d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/oc/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/oc/Firefox%20143.0.4.dmg";
locale = "oc";
arch = "mac";
- sha256 = "97500adb9b794e18a10a3fb9fd8bdab77f5e99793faaabe65e88d7f7f5baa4f3";
+ sha256 = "bb53f040dc4182e56b9ca98edcaf0ebe6af92ccbb2c3171de512ba16f41d88af";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/pa-IN/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/pa-IN/Firefox%20143.0.4.dmg";
locale = "pa-IN";
arch = "mac";
- sha256 = "71438f7242685959cef76b9b22f34299afbae0c166e53029b2b0939d4413aa4b";
+ sha256 = "dc789330d155083ea6e767497b4cbc51d325554675bdb9d3b3264b128523cef7";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/pl/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/pl/Firefox%20143.0.4.dmg";
locale = "pl";
arch = "mac";
- sha256 = "ae2399ce00e6ce821b403fbe2a7576a3149c3ea287ca19e4a2230ca9abe6a4a1";
+ sha256 = "dfa9725a6a5fbfbbcefe8f2381dab1e5860d16f2227a07f1641e2e04cda5d8f4";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/pt-BR/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/pt-BR/Firefox%20143.0.4.dmg";
locale = "pt-BR";
arch = "mac";
- sha256 = "4bfe3fa05eb1d16acba01389e17b4a553093061cc0bd314e0ea949d638f41eee";
+ sha256 = "268359d9f6500128eb02f0b612f9c32a366f597ff472702852b647da28896f01";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/pt-PT/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/pt-PT/Firefox%20143.0.4.dmg";
locale = "pt-PT";
arch = "mac";
- sha256 = "f41aaebeb27f5d77cd9c83d88d7339b9d8d10dcd3bba32df29a8b452463abd96";
+ sha256 = "cfcfc464baef914969a0ab7292e4021dc2727fbcd1c291c4e58bee680234ed09";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/rm/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/rm/Firefox%20143.0.4.dmg";
locale = "rm";
arch = "mac";
- sha256 = "c4065dd2bd767ba0433f2526f414b2b35cbc017c763f22406726a6eb9d236a44";
+ sha256 = "16710f9eaf865ddb870fee03416e8503d87d88a65fb7c9c21905025bad6966f1";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ro/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ro/Firefox%20143.0.4.dmg";
locale = "ro";
arch = "mac";
- sha256 = "3115325cb0bd02fd4f760e87c1d7ea7aac91825ff08317e281b5b462160e351a";
+ sha256 = "8486ed4de9256cda992ea5d6efff2664dac86afd6218d3154383549623ee9c06";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ru/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ru/Firefox%20143.0.4.dmg";
locale = "ru";
arch = "mac";
- sha256 = "96f936f255eec9aa58ce1c3a52f0c48a037a74a55580b797bbff05bc049cf5cf";
+ sha256 = "05a9abd79fbf39ed194d6a321061128557e75111d9f5e170eb75db3d7da5f707";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sat/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/sat/Firefox%20143.0.4.dmg";
locale = "sat";
arch = "mac";
- sha256 = "f57bcdb49fb2f10a475ec0e8dfec16faf2f2a2c316d2a531f43dd8d86b3e81f2";
+ sha256 = "b1530800b5d75a37d49f87863acf561d756d0b297f1ed1aaa149abc952c79f41";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sc/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/sc/Firefox%20143.0.4.dmg";
locale = "sc";
arch = "mac";
- sha256 = "49632f810a805892208416194499208f92c4419a9bf20673269b460149cac58c";
+ sha256 = "15a9adabd806c8c7ba6def665bf73293a4754db1cef9f189bd3e10b13081bca4";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sco/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/sco/Firefox%20143.0.4.dmg";
locale = "sco";
arch = "mac";
- sha256 = "1ee0a2437b69da63918653f4086b5bd2103f8842ff2c57ab65078fb202a92741";
+ sha256 = "87e7ea1df91ba58d6e2961f48165471a981857b8785365f5dc5284059d1ba7bf";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/si/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/si/Firefox%20143.0.4.dmg";
locale = "si";
arch = "mac";
- sha256 = "1b7c01bf22f2e5857839c5051a8fdb6c14851f7b2fb4604c509a4a204d860c6a";
+ sha256 = "b90a75ae4534d6f20e936f2256d0dbcffcad2214966492d189593eb02ce1201f";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sk/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/sk/Firefox%20143.0.4.dmg";
locale = "sk";
arch = "mac";
- sha256 = "3e6269866800f5c8a68c48e324b56b199c9ac7545868539a18303140ba4428d9";
+ sha256 = "d09a88eaa12adcaa7e918322bcdc253bbd8cecc1bb48850fe9e5f4224030309b";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/skr/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/skr/Firefox%20143.0.4.dmg";
locale = "skr";
arch = "mac";
- sha256 = "cb2ae1d6b817a65552669c2392f2d1e2f04627e6b4ee38b110fba52c6ffc7317";
+ sha256 = "ddc4fe772005e5bbf56edf37b6855aa9288f7867f7123e014f15155e45c9bea3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sl/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/sl/Firefox%20143.0.4.dmg";
locale = "sl";
arch = "mac";
- sha256 = "d8ee0e2af3945ea95aaff77440912d272d734058ba9faa10c293bca41258eeb4";
+ sha256 = "99ef18cf3ff0be24aae3fca4d5006c65879ec3d4abbe03b825c4e95c2286f6dd";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/son/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/son/Firefox%20143.0.4.dmg";
locale = "son";
arch = "mac";
- sha256 = "ce0f4f685305c92a1107a0cc3ef16eddc39aeaebee17efd1bc198360aecdfff5";
+ sha256 = "76e898600c9cac0414fc8c51df076bb7b54a776654a3633c37fc70c71dfe4475";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sq/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/sq/Firefox%20143.0.4.dmg";
locale = "sq";
arch = "mac";
- sha256 = "31d7647b880828a40b95f660529347926e8fdcd6c0101c6aea8a0a661483521d";
+ sha256 = "0d4937685247db28acf1eb7ec6d92ef6bf2a1a5e2ffcb78f216926e6719180b2";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sr/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/sr/Firefox%20143.0.4.dmg";
locale = "sr";
arch = "mac";
- sha256 = "53df38528396100085a9f01ea9ce575061e0aad397a3d83eac8e01d6ca94a0c3";
+ sha256 = "6422668435e6d22048fc18319a3a2704a59ec893833daae7f73793fdd5bd3b44";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/sv-SE/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/sv-SE/Firefox%20143.0.4.dmg";
locale = "sv-SE";
arch = "mac";
- sha256 = "52236e7093d312d210cd81f493a222c508af2b29b9d312e0e7cabd76eb0d071e";
+ sha256 = "635005750c9a1d962c08b2c68521d8b31c15c388a6597bcc1baae4ca53443754";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/szl/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/szl/Firefox%20143.0.4.dmg";
locale = "szl";
arch = "mac";
- sha256 = "49b921303b123ea43964a3cf907fefeba01f5dbb81e4c069be8c6242cce2177e";
+ sha256 = "5ef933a30a845c2793acb82b4db2b8580e3f83a6ce0fef305fbaf0096c3ee22a";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ta/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ta/Firefox%20143.0.4.dmg";
locale = "ta";
arch = "mac";
- sha256 = "fc70876184e04a1ca576d8afb9a00b7d810b4e53f3435d5df6117cb2b10d7fab";
+ sha256 = "51550a47d48906bd364618f0795725d6a4742806aae4977e475f3e5a5a873257";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/te/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/te/Firefox%20143.0.4.dmg";
locale = "te";
arch = "mac";
- sha256 = "bf1c1c9b52fb088899e49a517c15dd3457794a2bc597546aac3cef03f81d750f";
+ sha256 = "bf60bd681a32ec5ea3b8a4110487504bf4d77ad547eee38570a3e9dc7a1557c3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/tg/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/tg/Firefox%20143.0.4.dmg";
locale = "tg";
arch = "mac";
- sha256 = "ef1bb589f50278b93a40ff9c0e1e15738facd6eaf6813e66af8bac70e00e3798";
+ sha256 = "3717c82a162d543048bdff99a09ecdb1f49bece1acea9e7e3267e543148c0027";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/th/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/th/Firefox%20143.0.4.dmg";
locale = "th";
arch = "mac";
- sha256 = "676ef2796011abc1486e5a8b64ad50ae80822fb13f4b6e1284a8b0cc32614d22";
+ sha256 = "2fd6cf698d23d1c61575192fe7b0fa30948c7e6bea77b7ceab76cb313a8fa651";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/tl/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/tl/Firefox%20143.0.4.dmg";
locale = "tl";
arch = "mac";
- sha256 = "1964fc43c7344e3cf6e9e78a9fa0205095e388b64a6f30547b85bd9108e8e341";
+ sha256 = "670bad8ff47bb3d6146782960a93ea4a30141a632180e1ec596f06ffa411c715";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/tr/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/tr/Firefox%20143.0.4.dmg";
locale = "tr";
arch = "mac";
- sha256 = "624dfb1b3ac8c251b128d66912adf36d8eaf853581223a9edca6a696cecadb86";
+ sha256 = "5762248a2c1245795349ff4f885dcfde3199443cb26c359146e677015523f345";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/trs/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/trs/Firefox%20143.0.4.dmg";
locale = "trs";
arch = "mac";
- sha256 = "e7ab13546d00e67ea2d52398d7c39f86d2b22501739714218eeda15ca367be67";
+ sha256 = "84da5a561d8f53179a7bba85be920cd0de1f4e5949bb3e5f67e6a23b1358683d";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/uk/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/uk/Firefox%20143.0.4.dmg";
locale = "uk";
arch = "mac";
- sha256 = "0eb61bcd90de0ec1ac21c59880fa89a67b1a724130fad9166ba46605e22e23c5";
+ sha256 = "a9f0166b67e7b0b01d4caade6b831ab96402e6fc942054c300df008d40b320a3";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/ur/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/ur/Firefox%20143.0.4.dmg";
locale = "ur";
arch = "mac";
- sha256 = "44be93c26bf8201a1da28225b1db49b396c17765fcad1685089c533217b72e30";
+ sha256 = "d365357a3fda7d11f42d43a8f6d8280f5afdaf9d65c177d611a22ac90572dbef";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/uz/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/uz/Firefox%20143.0.4.dmg";
locale = "uz";
arch = "mac";
- sha256 = "bfb7a55d6f088df98a3c21a6bfa2f215b304e75c3970753aad6505660dd83a2a";
+ sha256 = "add434c6b3dedbb7998e48ea05dbbe046610e93510bedb303226be4f9ff495ec";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/vi/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/vi/Firefox%20143.0.4.dmg";
locale = "vi";
arch = "mac";
- sha256 = "0e450e9070ebd5325cbb5d500f57ed5a8a2238ff0058cd47b0708bad864681c8";
+ sha256 = "89d254aaa494438edacfd7be1ca6975a4f58fd747e8e79c3fcd3146a0186f915";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/xh/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/xh/Firefox%20143.0.4.dmg";
locale = "xh";
arch = "mac";
- sha256 = "a5af3237ff3291302e2f2c1f29927e2e4412f3305f78b65dc6b34ca10bf03a3a";
+ sha256 = "7eb37a1f199f3605f6568a5995dfa66e8e5bbab22cbd1af5d1c6a1a2c5d09e46";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/zh-CN/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/zh-CN/Firefox%20143.0.4.dmg";
locale = "zh-CN";
arch = "mac";
- sha256 = "ce91e029e66c6942424f4b4d1507d597a8722de81a6daf39e76c92103df41848";
+ sha256 = "813d79e1e7a858197bbdc35bfa1e389f82d8748744663e1998079e9a729be746";
}
{
- url = "https://archive.mozilla.org/pub/firefox/releases/143.0.3/mac/zh-TW/Firefox%20143.0.3.dmg";
+ url = "https://archive.mozilla.org/pub/firefox/releases/143.0.4/mac/zh-TW/Firefox%20143.0.4.dmg";
locale = "zh-TW";
arch = "mac";
- sha256 = "703dccec7e82badf95458e2e81769b37c2568e19764bdf67ef679bc4d99321a3";
+ sha256 = "b0a9a77dc4c62022b091604ed74ffbcf1beb313a04628e826444a2d40dafe717";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
index 33304d10dae5..913b2d18e265 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -9,10 +9,10 @@
buildMozillaMach rec {
pname = "firefox";
- version = "143.0.3";
+ version = "143.0.4";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "c092bd3aac79f856a804c908b76d40409ce052b00176269ea3029b5a3a6885d4d21ce26bd76c9ea13827ff75459b6b4b0566f5aa49035ac234ae5890c67845b0";
+ sha512 = "2bcbde4e72ea41e9ccc98836901635350b5dc7b50c618e19ab6103a27adc0f017ca3fa7555378c8af6ee1f3a14d02935289fe2b0d35d840d610f5ac07a88e4b6";
};
meta = {
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index cdb5ff484a9a..be43ccc85ad6 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -76,7 +76,7 @@ let
# PCSC-Lite daemon (services.pcscd) also must be enabled for firefox to access smartcards
smartcardSupport = cfg.smartcardSupport or false;
- allNativeMessagingHosts = builtins.map lib.getBin nativeMessagingHosts;
+ allNativeMessagingHosts = map lib.getBin nativeMessagingHosts;
libs =
lib.optionals stdenv.hostPlatform.isLinux (
@@ -130,7 +130,7 @@ let
usesNixExtensions = nixExtensions != null;
- nameArray = builtins.map (a: a.name) (lib.optionals usesNixExtensions nixExtensions);
+ nameArray = map (a: a.name) (lib.optionals usesNixExtensions nixExtensions);
# Check that every extension has a unique .name attribute
# and an extid attribute
@@ -140,7 +140,7 @@ let
else if browser.requireSigning || !browser.allowAddonSideload then
throw "Nix addons are only supported with signature enforcement disabled and addon sideloading enabled (eg. LibreWolf)"
else
- builtins.map (
+ map (
a:
if !(builtins.hasAttr "extid" a) then
throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchFirefoxAddon"
@@ -516,7 +516,7 @@ let
rm -f "$POL_PATH"
cat ${policiesJson} >> "$POL_PATH"
- extraPoliciesFiles=(${builtins.toString extraPoliciesFiles})
+ extraPoliciesFiles=(${toString extraPoliciesFiles})
for extraPoliciesFile in "''${extraPoliciesFiles[@]}"; do
jq -s '.[0] * .[1]' $extraPoliciesFile "$POL_PATH" > .tmp.json
mv .tmp.json "$POL_PATH"
@@ -533,7 +533,7 @@ let
${mozillaCfg}
EOF
- extraPrefsFiles=(${builtins.toString extraPrefsFiles})
+ extraPrefsFiles=(${toString extraPrefsFiles})
for extraPrefsFile in "''${extraPrefsFiles[@]}"; do
cat "$extraPrefsFile" >> "$libDir/mozilla.cfg"
done
diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index 41dcb8722d34..d26de30846ba 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -129,11 +129,11 @@ let
# bundled into the k3s binary
traefik = {
chart = fetchurl chartVersions.traefik;
- name = builtins.baseNameOf chartVersions.traefik.url;
+ name = baseNameOf chartVersions.traefik.url;
};
traefik-crd = {
chart = fetchurl chartVersions.traefik-crd;
- name = builtins.baseNameOf chartVersions.traefik-crd.url;
+ name = baseNameOf chartVersions.traefik-crd.url;
};
# a shortcut that provides the images archive for the host platform. Currently only supports
diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix
index a758355d32df..c1e6635c0c65 100644
--- a/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/default.nix
@@ -9,7 +9,7 @@ let
# let k3s_1_23 = (callPackage ./path/to/k3s {
# commonK3sArg = ....
# }).k3s_1_23;
- extraArgs = builtins.removeAttrs args [ "callPackage" ];
+ extraArgs = removeAttrs args [ "callPackage" ];
in
{
k3s_1_31 = common (
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 418392b89040..927e6ac75a6a 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -14,7 +14,7 @@ let
...
}@attrs:
let
- attrs' = builtins.removeAttrs attrs [
+ attrs' = removeAttrs attrs [
"version"
"sha256"
"rev"
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index 089958bb7a7b..c21adc70c2b7 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -18,7 +18,7 @@ let
...
}@attrs:
let
- attrs' = builtins.removeAttrs attrs [
+ attrs' = removeAttrs attrs [
"buildGoModule"
"version"
"hash"
diff --git a/pkgs/applications/networking/cluster/rke2/default.nix b/pkgs/applications/networking/cluster/rke2/default.nix
index 31fadb41ac29..3ae92345d3da 100644
--- a/pkgs/applications/networking/cluster/rke2/default.nix
+++ b/pkgs/applications/networking/cluster/rke2/default.nix
@@ -2,7 +2,7 @@
let
common = opts: callPackage (import ./builder.nix lib opts);
- extraArgs = builtins.removeAttrs args [ "callPackage" ];
+ extraArgs = removeAttrs args [ "callPackage" ];
in
rec {
rke2_1_30 = common (
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 900b398c7770..246e88fafce5 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -940,11 +940,11 @@
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
- "hash": "sha256-xj7B4LQZalLA/APIe70JHmqPljRVDbDXfAUb3K2AtFg=",
+ "hash": "sha256-fEvo5R7HutlOmZ6DMvYKQiE0amwk/YPi1T2a55w70hQ=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
- "rev": "v7.19.0",
+ "rev": "v7.21.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 12b0a90ed4b1..5a0224bc33ab 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -21,7 +21,7 @@ let
...
}@attrs:
let
- attrs' = builtins.removeAttrs attrs [
+ attrs' = removeAttrs attrs [
"version"
"hash"
"vendorHash"
diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix
index f7e6833ec59d..d9326450a3f0 100644
--- a/pkgs/applications/networking/instant-messengers/franz/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix
@@ -40,7 +40,7 @@
...
}@args:
let
- cleanedArgs = builtins.removeAttrs args [
+ cleanedArgs = removeAttrs args [
"pname"
"name"
"version"
diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix
index 019b730608a5..1ac3a3dc006d 100644
--- a/pkgs/applications/networking/irc/weechat/wrapper.nix
+++ b/pkgs/applications/networking/irc/weechat/wrapper.nix
@@ -19,7 +19,7 @@ let
{
# Do not include PHP by default, because it bloats the closure, doesn't
# build on Darwin, and there are no official PHP scripts.
- plugins = builtins.attrValues (builtins.removeAttrs availablePlugins [ "php" ]);
+ plugins = builtins.attrValues (removeAttrs availablePlugins [ "php" ]);
},
}:
@@ -122,7 +122,7 @@ let
ln -sf ${weechat}/share $out/share
'')
];
- meta = builtins.removeAttrs weechat.meta [ "outputsToInstall" ];
+ meta = removeAttrs weechat.meta [ "outputsToInstall" ];
};
in
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index fdde80e8f0b5..ca78b5510d27 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -95,7 +95,7 @@ python3Packages.buildPythonApplication rec {
# Actually install plugins
postInstall = ''
- for plug in ${builtins.toString userPlugins}; do
+ for plug in ${toString userPlugins}; do
lndir $plug/${python3Packages.python.sitePackages} $out/${python3Packages.python.sitePackages}
done
'';
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/update.nix b/pkgs/applications/networking/mailreaders/thunderbird/update.nix
index e584a88b7030..789550e80add 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/update.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/update.nix
@@ -7,5 +7,5 @@ callPackage ../../browsers/firefox/update.nix (
{
baseUrl = "https://archive.mozilla.org/pub/thunderbird/releases/";
}
- // (builtins.removeAttrs args [ "callPackage" ])
+ // (removeAttrs args [ "callPackage" ])
)
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 50506a77f795..97b84cd59dbc 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -67,8 +67,10 @@ let
tests = {
inherit (nixosTests)
syncthing
+ syncthing-folders
+ syncthing-guiPassword
+ syncthing-guiPasswordFile
syncthing-init
- syncthing-many-devices
syncthing-no-settings
syncthing-relay
;
diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix
index f5e25e49c69f..54a0b8a221d4 100644
--- a/pkgs/applications/office/libreoffice/darwin/default.nix
+++ b/pkgs/applications/office/libreoffice/darwin/default.nix
@@ -57,8 +57,8 @@ stdenvNoCC.mkDerivation {
passthru.updateScript =
let
- defaultNixFile = builtins.toString ./default.nix;
- updateNix = builtins.toString ./update.nix;
+ defaultNixFile = toString ./default.nix;
+ updateNix = toString ./update.nix;
aarch64Url = dist."aarch64-darwin".url;
x86_64Url = dist."x86_64-darwin".url;
in
diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix
index 8e7eea39e440..59fbc699961d 100644
--- a/pkgs/applications/office/libreoffice/wrapper.nix
+++ b/pkgs/applications/office/libreoffice/wrapper.nix
@@ -67,13 +67,11 @@ let
"--prefix"
"QT_PLUGIN_PATH"
":"
- "${lib.makeSearchPath unwrapped.qtbase.qtPluginPrefix (
- builtins.map lib.getBin unwrapped.qtPackages
- )}"
+ "${lib.makeSearchPath unwrapped.qtbase.qtPluginPrefix (map lib.getBin unwrapped.qtPackages)}"
"--prefix"
"QML2_IMPORT_PATH"
":"
- "${lib.makeSearchPath unwrapped.qtbase.qtQmlPrefix (builtins.map lib.getBin unwrapped.qmlPackages)}"
+ "${lib.makeSearchPath unwrapped.qtbase.qtQmlPrefix (map lib.getBin unwrapped.qmlPackages)}"
]
++ [
# Add dictionaries from all NIX_PROFILES
diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix
index 85c50fc52033..59e7dd7fa5d5 100644
--- a/pkgs/applications/radio/gnuradio/wrapper.nix
+++ b/pkgs/applications/radio/gnuradio/wrapper.nix
@@ -67,7 +67,7 @@ let
(unwrapped.python.pkgs.toPythonModule unwrapped.passthru.uhd)
]
# Add the extraPackages as python modules as well
- ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages)
+ ++ (map unwrapped.python.pkgs.toPythonModule extraPackages)
++ lib.flatten (
lib.mapAttrsToList (
feat: info:
@@ -167,7 +167,7 @@ let
"QT_PLUGIN_PATH"
":"
"${lib.makeSearchPath unwrapped.qt.qtbase.qtPluginPrefix (
- builtins.map lib.getBin (
+ map lib.getBin (
[
unwrapped.qt.qtbase
]
@@ -180,7 +180,7 @@ let
"QML2_IMPORT_PATH"
":"
"${lib.makeSearchPath unwrapped.qt.qtbase.qtQmlPrefix (
- builtins.map lib.getBin (
+ map lib.getBin (
[
unwrapped.qt.qtbase
]
@@ -225,7 +225,7 @@ let
lndir -silent ${unwrapped}
${lib.optionalString (extraPackages != [ ]) (
builtins.concatStringsSep "\n" (
- builtins.map (pkg: ''
+ map (pkg: ''
if [[ -d ${lib.getBin pkg}/bin/ ]]; then
lndir -silent ${pkg}/bin ./bin
fi
diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
index 42f482e9e016..a09f27004e4a 100644
--- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix
+++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
--replace "qe_git_submodule_update(external/d3q)" "" \
--replace "qe_git_submodule_update(external/qe-gipaw)" ""
- ${builtins.toString (
+ ${toString (
builtins.attrValues (
builtins.mapAttrs (name: val: ''
cp -r ${val}/* external/${name}/.
diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix
index 1199a7b71ca9..d7df4da69b12 100644
--- a/pkgs/applications/science/misc/megam/default.nix
+++ b/pkgs/applications/science/misc/megam/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation {
almost every other maxent package out there.
'';
homepage = "http://www.umiacs.umd.edu/~hal/megam";
- license = "non-commercial";
+ license = lib.licenses.unfree;
maintainers = with maintainers; [ leixb ];
platforms = platforms.unix;
};
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
index 3a1151e8ae77..78867cb6f685 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "urxvt plugin that allows to switch color themes during runtime";
homepage = "https://github.com/felixr/urxvt-theme-switch";
- license = "CCBYNC";
+ license = lib.licenses.cc-by-nc-30;
maintainers = [ ];
platforms = platforms.unix;
};
diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix
index f586b7e64cbf..0b1d36fc2d99 100644
--- a/pkgs/applications/version-management/sublime-merge/common.nix
+++ b/pkgs/applications/version-management/sublime-merge/common.nix
@@ -45,7 +45,7 @@ let
downloadUrl =
arch: "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz";
versionUrl = "https://www.sublimemerge.com/${if dev then "dev" else "download"}";
- versionFile = builtins.toString ./default.nix;
+ versionFile = toString ./default.nix;
neededLibraries = [
xorg.libX11
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix
index 27a571d0229d..837de444b22c 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
package: "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${lib.getLib package}/lib/gstreamer-1.0";
in
with gst_all_1;
- builtins.map gstreamerHook [
+ map gstreamerHook [
gstreamer
gst-plugins-base
gst-plugins-bad
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
index debefca16f52..fd7837eb5cc3 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
package: "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${lib.getLib package}/lib/gstreamer-1.0";
in
with gst_all_1;
- builtins.map gstreamerHook [
+ map gstreamerHook [
gstreamer
gst-plugins-base
gst-plugins-bad
diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix
index e0f546dbe956..0b4bffb90528 100644
--- a/pkgs/applications/virtualization/cri-o/wrapper.nix
+++ b/pkgs/applications/virtualization/cri-o/wrapper.nix
@@ -33,7 +33,7 @@ runCommand cri-o-unwrapped.name
preferLocalBuild = true;
- meta = builtins.removeAttrs cri-o-unwrapped.meta [ "outputsToInstall" ];
+ meta = removeAttrs cri-o-unwrapped.meta [ "outputsToInstall" ];
outputs = [
"out"
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 178607421f09..4ceddfa59db5 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -481,7 +481,7 @@ stdenvNoCC.mkDerivation {
libc_dev
libc_lib
;
- default_hardening_flags_str = builtins.toString defaultHardeningFlags;
+ default_hardening_flags_str = toString defaultHardeningFlags;
}
// lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) {
# These will become empty strings when not targeting Darwin.
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 6aaa59df0642..dbeb2a629f20 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -79,7 +79,7 @@ lib.makeOverridable (
[ drv ]
)
# Add any extra outputs specified by the caller of `buildEnv`.
- ++ lib.filter (p: p != null) (builtins.map (outName: drv.${outName} or null) extraOutputsToInstall);
+ ++ lib.filter (p: p != null) (map (outName: drv.${outName} or null) extraOutputsToInstall);
priority = drv.meta.priority or lib.meta.defaultPriority;
}) paths;
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 6d9780b3913c..4484739d0e59 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -980,7 +980,7 @@ stdenvNoCC.mkDerivation {
inherit suffixSalt coreutils_bin bintools;
inherit libc_bin libc_dev libc_lib;
inherit darwinPlatformForCC;
- default_hardening_flags_str = builtins.toString defaultHardeningFlags;
+ default_hardening_flags_str = toString defaultHardeningFlags;
inherit useMacroPrefixMap;
}
// lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) {
diff --git a/pkgs/build-support/compress-drv/default.nix b/pkgs/build-support/compress-drv/default.nix
index 47987f171892..d45c556fcb54 100644
--- a/pkgs/build-support/compress-drv/default.nix
+++ b/pkgs/build-support/compress-drv/default.nix
@@ -66,7 +66,7 @@ let
in
lib.assertMsg (
matches == 1
- ) "compressor ${ext} needs to have exactly one '{}', found ${builtins.toString matches}";
+ ) "compressor ${ext} needs to have exactly one '{}', found ${toString matches}";
mkCmd =
ext: prog:
assert validProg ext prog;
diff --git a/pkgs/build-support/coq/meta-fetch/default.nix b/pkgs/build-support/coq/meta-fetch/default.nix
index 84819993c48a..394809cbea2f 100644
--- a/pkgs/build-support/coq/meta-fetch/default.nix
+++ b/pkgs/build-support/coq/meta-fetch/default.nix
@@ -68,7 +68,7 @@ let
{
ext = "tar.gz";
fmt = "tarball";
- fetchfun = builtins.fetchTarball;
+ fetchfun = fetchTarball;
};
in
with kind;
diff --git a/pkgs/build-support/dart/build-dart-application/default.nix b/pkgs/build-support/dart/build-dart-application/default.nix
index 5b1526b5977e..aa847b0efdf9 100644
--- a/pkgs/build-support/dart/build-dart-application/default.nix
+++ b/pkgs/build-support/dart/build-dart-application/default.nix
@@ -130,7 +130,7 @@ let
baseDerivation = stdenv.mkDerivation (
finalAttrs:
- (builtins.removeAttrs args [
+ (removeAttrs args [
"gitHashes"
"sdkSourceBuilders"
"pubspecLock"
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 1f2c8b26e01b..0d6952465563 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -582,7 +582,7 @@ rec {
...
}@args:
let
- stream = streamLayeredImage (builtins.removeAttrs args [ "compressor" ]);
+ stream = streamLayeredImage (removeAttrs args [ "compressor" ]);
compress = compressorForImage compressor name;
in
runCommand "${baseNameOf name}.tar${compress.ext}" {
@@ -1043,8 +1043,8 @@ rec {
);
contentsList = if builtins.isList contents then contents else [ contents ];
- bind-paths = builtins.toString (
- builtins.map (path: "--bind=${path}:${path}!") [
+ bind-paths = toString (
+ map (path: "--bind=${path}:${path}!") [
"/dev/"
"/proc/"
"/sys/"
@@ -1413,7 +1413,7 @@ rec {
...
}@args:
let
- stream = streamNixShellImage (builtins.removeAttrs args [ "compressor" ]);
+ stream = streamNixShellImage (removeAttrs args [ "compressor" ]);
compress = compressorForImage compressor drv.name;
in
runCommand "${drv.name}-env.tar${compress.ext}" {
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index aa522350a3f2..b904f188a4af 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -699,7 +699,7 @@ rec {
" --program-prefix=layeredImageWithFakeRootCommands-"
];
doCheck = false;
- versionCheckProgram = "${builtins.placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
+ versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
meta = prevAttrs.meta // {
mainProgram = "layeredImageWithFakeRootCommands-hello";
};
diff --git a/pkgs/build-support/dotnet/add-nuget-deps/default.nix b/pkgs/build-support/dotnet/add-nuget-deps/default.nix
index 05cba02f79b7..a2c1fd63cc0e 100644
--- a/pkgs/build-support/dotnet/add-nuget-deps/default.nix
+++ b/pkgs/build-support/dotnet/add-nuget-deps/default.nix
@@ -49,7 +49,7 @@ let
assert (lib.isPath nugetDeps);
callPackage nugetDeps { fetchNuGet = fetchNupkg; }
else
- builtins.map fetchNupkg (lib.importJSON nugetDeps);
+ map fetchNupkg (lib.importJSON nugetDeps);
finalPackage = finalAttrs.finalPackage;
diff --git a/pkgs/build-support/dotnet/build-dotnet-package/default.nix b/pkgs/build-support/dotnet/build-dotnet-package/default.nix
index 582084095e3d..803dc2c7ddfe 100644
--- a/pkgs/build-support/dotnet/build-dotnet-package/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-package/default.nix
@@ -122,4 +122,4 @@ let
'';
};
in
-stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "nativeBuildInputs" ]))
+stdenv.mkDerivation (attrs // (removeAttrs attrsOrig [ "nativeBuildInputs" ]))
diff --git a/pkgs/build-support/dotnet/make-nuget-deps/default.nix b/pkgs/build-support/dotnet/make-nuget-deps/default.nix
index 668ce30404f2..75ff45cd2a27 100644
--- a/pkgs/build-support/dotnet/make-nuget-deps/default.nix
+++ b/pkgs/build-support/dotnet/make-nuget-deps/default.nix
@@ -21,7 +21,7 @@ lib.makeOverridable (
assert (lib.isPath sourceFile);
import sourceFile
else
- { fetchNuGet }: builtins.map fetchNuGet (lib.importJSON sourceFile);
+ { fetchNuGet }: map fetchNuGet (lib.importJSON sourceFile);
in
loadDeps {
fetchNuGet = args: fetchNupkg (args // { inherit installable; });
diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix
index 795c37b3c698..d851f982086d 100644
--- a/pkgs/build-support/fetchdocker/default.nix
+++ b/pkgs/build-support/fetchdocker/default.nix
@@ -29,10 +29,10 @@ assert null == lib.findFirst (c: "/" == c) null (lib.stringToCharacters imageNam
let
# Abuse paths to collapse possible double slashes
- repoTag0 = builtins.toString (/. + "/${stripScheme registry}/${repository}/${imageName}");
+ repoTag0 = toString (/. + "/${stripScheme registry}/${repository}/${imageName}");
repoTag1 = lib.removePrefix "/" repoTag0;
- layers = builtins.map stripNixStore imageLayers;
+ layers = map stripNixStore imageLayers;
manifest = writeText "manifest.json" (
builtins.toJSON [
diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix
index 1da312f5d100..67fcdc48c9c5 100644
--- a/pkgs/build-support/fetchmavenartifact/default.nix
+++ b/pkgs/build-support/fetchmavenartifact/default.nix
@@ -66,7 +66,7 @@ let
else
map mkJarUrl repos;
jar = fetchurl (
- builtins.removeAttrs args [
+ removeAttrs args [
"groupId"
"artifactId"
"version"
diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index 428001bba7ad..d42d7eedcdb1 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -88,8 +88,8 @@ lib.throwIfNot (excludes == [ ] || includes == [ ])
filterdiff \
-p1 \
- ${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \
- ${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \
+ ${toString (map (x: "-x ${lib.escapeShellArg x}") excludes)} \
+ ${toString (map (x: "-i ${lib.escapeShellArg x}") includes)} \
"$tmpfile" > "$out"
if [ ! -s "$out" ]; then
@@ -106,7 +106,7 @@ lib.throwIfNot (excludes == [ ] || includes == [ ])
''
+ postFetch;
}
- // builtins.removeAttrs args [
+ // removeAttrs args [
"relative"
"stripLen"
"decode"
diff --git a/pkgs/build-support/fetchpypi/default.nix b/pkgs/build-support/fetchpypi/default.nix
index cb7e443ab7ef..d291c57429c1 100644
--- a/pkgs/build-support/fetchpypi/default.nix
+++ b/pkgs/build-support/fetchpypi/default.nix
@@ -43,7 +43,7 @@ let
);
in
- compute (builtins.removeAttrs attrs [ "format" ]);
+ compute (removeAttrs attrs [ "format" ]);
in
makeOverridable (
@@ -55,7 +55,7 @@ makeOverridable (
}@attrs:
let
url = computeUrl (
- builtins.removeAttrs attrs [
+ removeAttrs attrs [
"sha256"
"hash"
]
diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix
index 4935806ece18..5bebbb4f1e88 100644
--- a/pkgs/build-support/fetchs3/default.nix
+++ b/pkgs/build-support/fetchs3/default.nix
@@ -6,7 +6,7 @@
lib.fetchers.withNormalizedHash { } (
{
s3url,
- name ? builtins.baseNameOf s3url,
+ name ? baseNameOf s3url,
outputHash,
outputHashAlgo,
region ? "us-east-1",
diff --git a/pkgs/build-support/make-impure-test.nix b/pkgs/build-support/make-impure-test.nix
index 2ff1ed0bcc2d..3a462964b3d2 100644
--- a/pkgs/build-support/make-impure-test.nix
+++ b/pkgs/build-support/make-impure-test.nix
@@ -45,7 +45,7 @@
}@args:
let
- sandboxPathsTests = builtins.map (path: "[[ ! -e '${path}' ]]") sandboxPaths;
+ sandboxPathsTests = map (path: "[[ ! -e '${path}' ]]") sandboxPaths;
sandboxPathsTest = lib.concatStringsSep " || " sandboxPathsTests;
sandboxPathsList = lib.concatStringsSep " " sandboxPaths;
@@ -71,7 +71,7 @@ let
passthru.runScript = runScript;
}
(
- builtins.removeAttrs args [
+ removeAttrs args [
"lib"
"stdenv"
"writeShellScript"
diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix
index ad34882b3891..83dfeca87fce 100644
--- a/pkgs/build-support/mkshell/default.nix
+++ b/pkgs/build-support/mkshell/default.nix
@@ -29,7 +29,7 @@ let
# this leaves actual dependencies of the derivations in `inputsFrom`, but never the derivations themselves
(lib.subtractLists inputsFrom (lib.flatten (lib.catAttrs name inputsFrom)));
- rest = builtins.removeAttrs attrs [
+ rest = removeAttrs attrs [
"name"
"packages"
"inputsFrom"
diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix
index c8c4a9030163..cac50cb7401a 100644
--- a/pkgs/build-support/node/fetch-npm-deps/default.nix
+++ b/pkgs/build-support/node/fetch-npm-deps/default.nix
@@ -24,7 +24,7 @@
filter =
name: type:
let
- name' = builtins.baseNameOf name;
+ name' = baseNameOf name;
in
name' != "default.nix" && name' != "target";
};
diff --git a/pkgs/build-support/node/import-npm-lock/default.nix b/pkgs/build-support/node/import-npm-lock/default.nix
index cfea6ef4e1b5..c299ca46928d 100644
--- a/pkgs/build-support/node/import-npm-lock/default.nix
+++ b/pkgs/build-support/node/import-npm-lock/default.nix
@@ -52,7 +52,7 @@ let
// fetcherOpts
))
else if lib.hasPrefix "git" module.resolved then
- (builtins.fetchGit (
+ (fetchGit (
{
url = module.resolved;
}
diff --git a/pkgs/build-support/ocaml/topkg.nix b/pkgs/build-support/ocaml/topkg.nix
index 4c2d5d26d6c6..4326a61913e9 100644
--- a/pkgs/build-support/ocaml/topkg.nix
+++ b/pkgs/build-support/ocaml/topkg.nix
@@ -32,7 +32,7 @@ lib.throwIf (args ? minimalOCamlVersion && lib.versionOlder ocaml.version args.m
inherit (topkg) buildPhase installPhase;
}
- // (builtins.removeAttrs args [ "minimalOCamlVersion" ])
+ // (removeAttrs args [ "minimalOCamlVersion" ])
// {
name = "ocaml${ocaml.version}-${pname}-${version}";
diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix
index 5abd4e97f327..bce23c7c90e9 100644
--- a/pkgs/build-support/release/source-tarball.nix
+++ b/pkgs/build-support/release/source-tarball.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation (
}
# Then, the caller-supplied attributes.
- // (builtins.removeAttrs args [ "lib" ])
+ // (removeAttrs args [ "lib" ])
//
# And finally, our own stuff.
diff --git a/pkgs/build-support/replace-vars/replace-vars-with.nix b/pkgs/build-support/replace-vars/replace-vars-with.nix
index 42be45b6dcf1..c863c6fb617f 100644
--- a/pkgs/build-support/replace-vars/replace-vars-with.nix
+++ b/pkgs/build-support/replace-vars/replace-vars-with.nix
@@ -72,7 +72,7 @@ let
optionalAttrs =
if (builtins.intersectAttrs attrs forcedAttrs == { }) then
- builtins.removeAttrs attrs [ "replacements" ]
+ removeAttrs attrs [ "replacements" ]
else
throw "Passing any of ${builtins.concatStringsSep ", " (builtins.attrNames forcedAttrs)} to replaceVarsWith is not supported.";
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index e54e76ff8aa4..c931d920d191 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -250,7 +250,7 @@ lib.makeOverridable
"codegenUnits"
"links"
];
- extraDerivationAttrs = builtins.removeAttrs crate processedAttrs;
+ extraDerivationAttrs = removeAttrs crate processedAttrs;
nativeBuildInputs_ = nativeBuildInputs;
buildInputs_ = buildInputs;
extraRustcOpts_ = extraRustcOpts;
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index e2e89d1fa338..208714152c56 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -91,7 +91,7 @@ let
mkTest =
crateArgs:
let
- crate = mkHostCrate (builtins.removeAttrs crateArgs [ "expectedTestOutput" ]);
+ crate = mkHostCrate (removeAttrs crateArgs [ "expectedTestOutput" ]);
hasTests = crateArgs.buildTests or false;
expectedTestOutputs = crateArgs.expectedTestOutputs or null;
binaries = map (v: lib.escapeShellArg v.name) (crateArgs.crateBin or [ ]);
@@ -182,7 +182,7 @@ let
assert (builtins.isList expectedFiles);
let
- crate = mkCrate (builtins.removeAttrs crateArgs [ "expectedTestOutput" ]);
+ crate = mkCrate (removeAttrs crateArgs [ "expectedTestOutput" ]);
crateOutput = if output == null then crate else crate."${output}";
expectedFilesFile = writeTextFile {
name = "expected-files-${name}";
@@ -706,7 +706,7 @@ rec {
rustCargoTomlInTopDir =
let
- withoutCargoTomlSearch = builtins.removeAttrs rustCargoTomlInSubDir [ "workspace_member" ];
+ withoutCargoTomlSearch = removeAttrs rustCargoTomlInSubDir [ "workspace_member" ];
in
withoutCargoTomlSearch
// {
diff --git a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
index 08219db54930..69905245b2d7 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
@@ -73,7 +73,7 @@ rec {
let
members = builtins.attrValues workspaceMembers;
in
- builtins.map (m: m.build) members;
+ map (m: m.build) members;
};
#
@@ -4347,7 +4347,7 @@ rec {
sourceFilter =
name: type:
let
- baseName = builtins.baseNameOf (builtins.toString name);
+ baseName = baseNameOf (toString name);
in
!(
# Filter out git
@@ -4603,7 +4603,7 @@ rec {
let
features = mergedFeatures."${packageId}" or [ ];
crateConfig' = crateConfigs."${packageId}";
- crateConfig = builtins.removeAttrs crateConfig' [
+ crateConfig = removeAttrs crateConfig' [
"resolvedDefaultFeatures"
"devDependencies"
];
@@ -4657,7 +4657,7 @@ rec {
version = package.version;
};
in
- lib.mapAttrs (name: choices: builtins.map versionAndRename choices) grouped;
+ lib.mapAttrs (name: choices: map versionAndRename choices) grouped;
in
buildRustCrateForPkgsFunc pkgs (
crateConfig
@@ -4715,7 +4715,7 @@ rec {
if builtins.isAttrs val then
lib.mapAttrs (n: v: sanitizeForJson v) val
else if builtins.isList val then
- builtins.map sanitizeForJson val
+ map sanitizeForJson val
else if builtins.isFunction val then
"function"
else
@@ -4826,7 +4826,7 @@ rec {
assert (builtins.isAttrs target);
assert (builtins.isBool runTests);
let
- crateConfig = crateConfigs."${packageId}" or (builtins.throw "Package not found: ${packageId}");
+ crateConfig = crateConfigs."${packageId}" or (throw "Package not found: ${packageId}");
expandedFeatures = expandFeatures (crateConfig.features or { }) features;
enabledFeatures = enableFeatures (crateConfig.dependencies or [ ]) expandedFeatures;
depWithResolvedFeatures =
@@ -4984,7 +4984,7 @@ rec {
dependencyPrefix = (dependency.rename or dependency.name) + "/";
dependencyFeatures = builtins.filter (f: lib.hasPrefix dependencyPrefix f) features;
in
- builtins.map (lib.removePrefix dependencyPrefix) dependencyFeatures;
+ map (lib.removePrefix dependencyPrefix) dependencyFeatures;
in
defaultOrNil ++ explicitFeatures ++ additionalDependencyFeatures;
@@ -5002,7 +5002,7 @@ rec {
deprecationWarning =
message: value:
if strictDeprecation then
- builtins.throw "strictDeprecation enabled, aborting: ${message}"
+ throw "strictDeprecation enabled, aborting: ${message}"
else
builtins.trace message value;
diff --git a/pkgs/build-support/rust/fetch-cargo-vendor.nix b/pkgs/build-support/rust/fetch-cargo-vendor.nix
index ff9b8a87ebbf..3297764bb4bb 100644
--- a/pkgs/build-support/rust/fetch-cargo-vendor.nix
+++ b/pkgs/build-support/rust/fetch-cargo-vendor.nix
@@ -86,7 +86,7 @@ let
outputHashAlgo = if hash == "" then "sha256" else null;
outputHashMode = "recursive";
}
- // builtins.removeAttrs args removedArgs
+ // removeAttrs args removedArgs
);
in
diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix
index ded382f42247..a3cd9b825ffc 100644
--- a/pkgs/build-support/rust/import-cargo-lock.nix
+++ b/pkgs/build-support/rust/import-cargo-lock.nix
@@ -16,7 +16,7 @@
# Cargo lock file contents as string
lockFileContents ? null,
- # Allow `builtins.fetchGit` to be used to not require hashes for git dependencies
+ # Allow `fetchGit` to be used to not require hashes for git dependencies
allowBuiltinFetchGit ? false,
# Additional registries to pull sources from
@@ -57,7 +57,7 @@ let
# shadows args.lockFileContents
lockFileContents = if lockFile != null then builtins.readFile lockFile else args.lockFileContents;
- parsedLockFile = builtins.fromTOML lockFileContents;
+ parsedLockFile = fromTOML lockFileContents;
# lockfile v1 and v2 don't have the `version` key, so assume v2
# we can implement more fine-grained detection later, if needed
@@ -75,11 +75,11 @@ let
# Force evaluation of the git SHA -> hash mapping, so that an error is
# thrown if there are stale hashes. We cannot rely on gitShaOutputHash
# being evaluated otherwise, since there could be no git dependencies.
- depCrates = builtins.deepSeq gitShaOutputHash (builtins.map mkCrate depPackages);
+ depCrates = builtins.deepSeq gitShaOutputHash (map mkCrate depPackages);
# Map package name + version to git commit SHA for packages with a git source.
namesGitShas = builtins.listToAttrs (
- builtins.map nameGitSha (builtins.filter (pkg: lib.hasPrefix "git+" pkg.source) depPackages)
+ map nameGitSha (builtins.filter (pkg: lib.hasPrefix "git+" pkg.source) depPackages)
);
nameGitSha =
@@ -188,7 +188,7 @@ let
sha256 = gitShaOutputHash.${gitParts.sha};
}
else if allowBuiltinFetchGit then
- builtins.fetchGit {
+ fetchGit {
inherit (gitParts) url;
rev = gitParts.sha;
allRefs = true;
diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/tests.nix b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/tests.nix
index 72ea53ce45f8..ac95f33b4840 100644
--- a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/tests.nix
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredArray/tests.nix
@@ -33,7 +33,7 @@ let
foo
''
else
- builtins.throw "Invalid scope: ${scope}";
+ throw "Invalid scope: ${scope}";
in
{
name,
diff --git a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/tests.nix b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/tests.nix
index ef77291d64c7..feb585adb508 100644
--- a/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/tests.nix
+++ b/pkgs/build-support/setup-hooks/arrayUtilities/isDeclaredMap/tests.nix
@@ -33,7 +33,7 @@ let
foo
''
else
- builtins.throw "Invalid scope: ${scope}";
+ throw "Invalid scope: ${scope}";
in
{
name,
diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix
index 9bd25940a194..c35e03cada76 100644
--- a/pkgs/build-support/testers/default.nix
+++ b/pkgs/build-support/testers/default.nix
@@ -225,7 +225,7 @@
"testers.hasPkgConfigModule has been deprecated in favor of testers.hasPkgConfigModules. It accepts a list of strings via the moduleNames argument instead of a single moduleName."
(
testers.hasPkgConfigModules (
- builtins.removeAttrs args [ "moduleName" ]
+ removeAttrs args [ "moduleName" ]
// {
moduleNames = [ moduleName ];
}
diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index 2bbf568f79ee..620efd0cfad2 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -94,7 +94,7 @@ rec {
preferLocalBuild = true;
allowSubstitutes = false;
})
- // builtins.removeAttrs derivationArgs [ "passAsFile" ]
+ // removeAttrs derivationArgs [ "passAsFile" ]
);
# Docs in doc/build-helpers/trivial-build-helpers.chapter.md
@@ -182,7 +182,7 @@ rec {
path: text:
writeTextFile {
inherit text;
- name = builtins.baseNameOf path;
+ name = baseNameOf path;
destination = "/${path}";
};
@@ -983,7 +983,7 @@ rec {
# TODO: move copyPathsToStore docs to the Nixpkgs manual
# Copy a list of paths to the Nix store.
- copyPathsToStore = builtins.map copyPathToStore;
+ copyPathsToStore = map copyPathToStore;
# TODO: move applyPatches docs to the Nixpkgs manual
/*
@@ -1009,7 +1009,7 @@ rec {
name ?
(
if builtins.typeOf src == "path" then
- builtins.baseNameOf src
+ baseNameOf src
else if builtins.isAttrs src && builtins.hasAttr "name" src then
src.name
else
diff --git a/pkgs/build-support/trivial-builders/test-overriding.nix b/pkgs/build-support/trivial-builders/test-overriding.nix
index 33823aa0cd25..dbb756579de7 100644
--- a/pkgs/build-support/trivial-builders/test-overriding.nix
+++ b/pkgs/build-support/trivial-builders/test-overriding.nix
@@ -104,7 +104,7 @@ let
runTest =
script:
let
- name = script.name or (builtins.baseNameOf script);
+ name = script.name or (baseNameOf script);
in
writeShellScript "run-${name}" ''
if [ "$(${script})" != "success" ]; then
diff --git a/pkgs/build-support/trivial-builders/test/concat-test.nix b/pkgs/build-support/trivial-builders/test/concat-test.nix
index 583d0910f4bc..bb9983ae908b 100644
--- a/pkgs/build-support/trivial-builders/test/concat-test.nix
+++ b/pkgs/build-support/trivial-builders/test/concat-test.nix
@@ -8,7 +8,7 @@
let
stri = writeText "pathToTest";
txt1 = stri "abc";
- txt2 = stri (builtins.toString hello);
+ txt2 = stri (toString hello);
res = concatText "textToTest" [
txt1
txt2
diff --git a/pkgs/build-support/trivial-builders/test/writeShellApplication.nix b/pkgs/build-support/trivial-builders/test/writeShellApplication.nix
index 3c9e695486c2..1325d18366fc 100644
--- a/pkgs/build-support/trivial-builders/test/writeShellApplication.nix
+++ b/pkgs/build-support/trivial-builders/test/writeShellApplication.nix
@@ -13,7 +13,7 @@ let
checkShellApplication =
args@{ name, expected, ... }:
let
- writeShellApplicationArgs = builtins.removeAttrs args [ "expected" ];
+ writeShellApplicationArgs = removeAttrs args [ "expected" ];
script = writeShellApplication writeShellApplicationArgs;
executable = lib.getExe script;
expected' = writeTextFile {
diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix
index e7bb27f4ac92..bd4e9209ce67 100644
--- a/pkgs/build-support/writers/scripts.nix
+++ b/pkgs/build-support/writers/scripts.nix
@@ -599,7 +599,7 @@ rec {
...
}@args:
makeScriptWriter (
- (builtins.removeAttrs args [
+ (removeAttrs args [
"babashka"
])
// {
@@ -692,7 +692,7 @@ rec {
in
makeScriptWriter
(
- (builtins.removeAttrs config [
+ (removeAttrs config [
"guile"
"libraries"
"r6rs"
@@ -728,7 +728,7 @@ rec {
[ "--no-auto-compile" ]
++ lib.optional r6rs "--r6rs"
++ lib.optional r7rs "--r7rs"
- ++ lib.optional (srfi != [ ]) ("--use-srfi=" + concatMapStringsSep "," builtins.toString srfi)
+ ++ lib.optional (srfi != [ ]) ("--use-srfi=" + concatMapStringsSep "," toString srfi)
++ [ "-s" ]
))
"!#"
@@ -921,7 +921,7 @@ rec {
...
}@args:
makeScriptWriter (
- (builtins.removeAttrs args [ "libraries" ])
+ (removeAttrs args [ "libraries" ])
// {
interpreter =
if libraries == [ ] then "${ruby}/bin/ruby" else "${(ruby.withPackages (ps: libraries))}/bin/ruby";
@@ -963,7 +963,7 @@ rec {
...
}@args:
makeScriptWriter (
- (builtins.removeAttrs args [ "libraries" ])
+ (removeAttrs args [ "libraries" ])
// {
interpreter = lua.interpreter;
# if libraries == []
@@ -1134,7 +1134,7 @@ rec {
...
}@args:
makeScriptWriter (
- (builtins.removeAttrs args [ "libraries" ])
+ (removeAttrs args [ "libraries" ])
// {
interpreter = "${lib.getExe (pkgs.perl.withPackages (p: libraries))}";
}
@@ -1186,7 +1186,7 @@ rec {
"--ignore ${concatMapStringsSep "," escapeShellArg flakeIgnore}";
in
makeScriptWriter (
- (builtins.removeAttrs args [
+ (removeAttrs args [
"libraries"
"flakeIgnore"
"doCheck"
@@ -1333,7 +1333,7 @@ rec {
content:
makeScriptWriter
(
- (builtins.removeAttrs args [
+ (removeAttrs args [
"dotnet-sdk"
"fsi-flags"
"libraries"
diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix
index 1ab0fa692dba..203aac1dbe54 100644
--- a/pkgs/by-name/_1/_1password-cli/package.nix
+++ b/pkgs/by-name/_1/_1password-cli/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation {
doInstallCheck = true;
- versionCheckProgram = "${builtins.placeholder "out"}/bin/op";
+ versionCheckProgram = "${placeholder "out"}/bin/op";
versionCheckProgramArg = "--version";
passthru = {
diff --git a/pkgs/by-name/ab/aba/package.nix b/pkgs/by-name/ab/aba/package.nix
index 50b022ae117f..075de6a1cd24 100644
--- a/pkgs/by-name/ab/aba/package.nix
+++ b/pkgs/by-name/ab/aba/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage {
preBuild = ''
justFlagsArray+=(
- PREFIX=${builtins.placeholder "out"}
+ PREFIX=${placeholder "out"}
MANIFEST_OPTS="--frozen --locked --profile=release"
INSTALL_OPTS="--no-track"
)
diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix
index bbf41d9cfd1d..8db08d541eb0 100644
--- a/pkgs/by-name/al/alfaview/package.nix
+++ b/pkgs/by-name/al/alfaview/package.nix
@@ -27,11 +27,11 @@
stdenv.mkDerivation rec {
pname = "alfaview";
- version = "9.23.1";
+ version = "9.23.2";
src = fetchurl {
url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
- hash = "sha256-T1RsG/8uuPtma7TCNww4V6tKzPK0Ds8zmdjk2duhMEw=";
+ hash = "sha256-0EGjm/EYozGXDM/IvmopN04kzJfPM+6wjMpJesyW55U=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/al/alsa-lib-with-plugins/package.nix b/pkgs/by-name/al/alsa-lib-with-plugins/package.nix
index d1d397132ba5..e26a0be172ce 100644
--- a/pkgs/by-name/al/alsa-lib-with-plugins/package.nix
+++ b/pkgs/by-name/al/alsa-lib-with-plugins/package.nix
@@ -24,9 +24,9 @@ runCommand "${alsa-lib.pname}-${alsa-lib.version}"
}
(
(lib.concatMapStringsSep "\n" (output: ''
- mkdir ${builtins.placeholder output}
+ mkdir ${placeholder output}
${lndir}/bin/lndir ${lib.attrByPath [ output ] null alsa-lib} \
- ${builtins.placeholder output}
+ ${placeholder output}
'') alsa-lib.outputs)
+ ''
cp -r ${merged}/lib/alsa-lib $out/lib
diff --git a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
index 95ff87707a68..cdaf829d7581 100644
--- a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
+++ b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
@@ -43,7 +43,7 @@ buildGoModule rec {
nativeInstallCheckInputs = [ versionCheckHook ];
- versionCheckProgram = "${builtins.placeholder "out"}/bin/amazon-cloudwatch-agent";
+ versionCheckProgram = "${placeholder "out"}/bin/amazon-cloudwatch-agent";
versionCheckProgramArg = "-version";
diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index b379f2b13f1f..93510d9543e7 100644
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@@ -82,6 +82,7 @@ buildNpmPackage (finalAttrs: {
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [
keegancsmith
+ burmudar
];
mainProgram = "amp";
};
diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix
index 1924fd37f68e..cf0e7dd49934 100644
--- a/pkgs/by-name/an/anytype-heart/package.nix
+++ b/pkgs/by-name/an/anytype-heart/package.nix
@@ -26,16 +26,16 @@ buildGoModule (finalAttrs: {
# Use only versions specified in anytype-ts middleware.version file:
# https://github.com/anyproto/anytype-ts/blob/v/middleware.version
- version = "0.43.0-rc02";
+ version = "0.44.1";
src = fetchFromGitHub {
owner = "anyproto";
repo = "anytype-heart";
tag = "v${finalAttrs.version}";
- hash = "sha256-hqDwzW1Tl44ipL1EAwlXUoKaQ0Wvfa2rtZMQy4pgQ8k=";
+ hash = "sha256-Kb5Z484zeKJT8oBmfqbHszcxYPwnx7mvssseNyRDMWE=";
};
- vendorHash = "sha256-Rs+CusvMksyXUplGk09J4CiFgl/D4KtsI9C15dSCjOI=";
+ vendorHash = "sha256-T7CPD6mbxkN1x53oe9jsS2XMqluqWv8VPPd1pnXZvlc=";
subPackages = [ "cmd/grpcserver" ];
tags = [
diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index b63dfebf77e2..c870f19706ba 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -14,23 +14,23 @@
buildNpmPackage (finalAttrs: {
pname = "anytype";
- version = "0.49.2";
+ version = "0.50.3";
src = fetchFromGitHub {
owner = "anyproto";
repo = "anytype-ts";
tag = "v${finalAttrs.version}";
- hash = "sha256-8+x2FmyR5x9Zrm3t71RSyxAKcJCvnR98+fqHXjBE7aU=";
+ hash = "sha256-D2B8DY9VogRc0YP/NKEmg0uVT1ZaqQrOA/4AS845phU=";
};
locales = fetchFromGitHub {
owner = "anyproto";
repo = "l10n-anytype-ts";
- rev = "873b42df7320ebbbc80d7e2477914dac70363ef7";
- hash = "sha256-Mr0KfXn9NO86QqgBhVjSs2przN/GtjuhJHJ9djo8Feg=";
+ rev = "27d713f500ed375aabb57b551dbc0561cd1983b3";
+ hash = "sha256-1SyCVwicUoxj/xxlYe3dElYYXWtzbw2bHiHZ0FKgYDw=";
};
- npmDepsHash = "sha256-fuNTSZl+4DG/YL34f/+bYK26ruRFAc1hyHVAm256LiE=";
+ npmDepsHash = "sha256-pC1hT85Lk4asGRkQf4ZGlNULtmdlKX/2X1eDHMi6BZ0=";
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
diff --git a/pkgs/by-name/ap/apfsprogs/package.nix b/pkgs/by-name/ap/apfsprogs/package.nix
index b8b18f6bd563..1ea1b3595633 100644
--- a/pkgs/by-name/ap/apfsprogs/package.nix
+++ b/pkgs/by-name/ap/apfsprogs/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
version = "v${finalAttrs.version}";
};
};
- versionTestList = builtins.map mkVersionTest tools;
+ versionTestList = map mkVersionTest tools;
versionTests = lib.mergeAttrsList versionTestList;
in
diff --git a/pkgs/by-name/ap/aporetic/package.nix b/pkgs/by-name/ap/aporetic/package.nix
index 9c05714c594a..cad2fbd57404 100644
--- a/pkgs/by-name/ap/aporetic/package.nix
+++ b/pkgs/by-name/ap/aporetic/package.nix
@@ -52,7 +52,7 @@ in
symlinkJoin {
inherit pname version;
- paths = (builtins.map makeIosevkaFont sets);
+ paths = (map makeIosevkaFont sets);
meta = {
inherit (src.meta) homepage;
diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix
index 048595e17af2..b44ee3e033ac 100644
--- a/pkgs/by-name/au/authentik/package.nix
+++ b/pkgs/by-name/au/authentik/package.nix
@@ -49,7 +49,7 @@ let
outputHash =
{
"aarch64-linux" = "sha256-92UFGgYLmtN13hW0/BV0gJa6ImrVyn+zRpDp5KeRRhs=";
- "x86_64-linux" = "sha256-Td0+H0os4bfv8cfIFhvUJ43y8y9dHv9P1UD0B5Wqe4I=";
+ "x86_64-linux" = "sha256-jVi+pgcz96Dj25T4e/s+SHqsZfonzXs1WZYe0lCI48Q=";
}
.${stdenvNoCC.hostPlatform.system} or (throw "authentik-website-deps: unsupported host platform");
diff --git a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix
index b839b089fd9e..51bd2f68da83 100644
--- a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix
@@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
homepage = "https://github.com/AyatanaIndicators/ayatana-indicator-messages";
changelog = "https://github.com/AyatanaIndicators/ayatana-indicator-messages/blob/${
- if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+ if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ba/babl/package.nix b/pkgs/by-name/ba/babl/package.nix
index 4028e7a9716c..779330f42be6 100644
--- a/pkgs/by-name/ba/babl/package.nix
+++ b/pkgs/by-name/ba/babl/package.nix
@@ -13,7 +13,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "babl";
- version = "0.1.114";
+ version = "0.1.116";
outputs = [
"out"
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor finalAttrs.version}/babl-${finalAttrs.version}.tar.xz";
- hash = "sha256-vLt3hsHkR3A9s7x/o01i0NLRF7IvBNiDTHstXe1FZIc=";
+ hash = "sha256-UPrgaYZ8et4SWYiP8ePbhf7IbXCCUuU4W1pPOaeOxIM=";
};
patches = [
diff --git a/pkgs/by-name/ba/baekmuk-ttf/package.nix b/pkgs/by-name/ba/baekmuk-ttf/package.nix
index 497b9bb9cb03..7726a772f916 100644
--- a/pkgs/by-name/ba/baekmuk-ttf/package.nix
+++ b/pkgs/by-name/ba/baekmuk-ttf/package.nix
@@ -1,4 +1,8 @@
-{ stdenvNoCC, fetchurl }:
+{
+ lib,
+ stdenvNoCC,
+ fetchurl,
+}:
stdenvNoCC.mkDerivation rec {
pname = "baekmuk-ttf";
@@ -21,6 +25,6 @@ stdenvNoCC.mkDerivation rec {
meta = {
description = "Korean font";
homepage = "http://kldp.net/projects/baekmuk/";
- license = "BSD-like";
+ license = lib.licenses.baekmuk;
};
}
diff --git a/pkgs/by-name/bi/biboumi/package.nix b/pkgs/by-name/bi/biboumi/package.nix
index 107c6e79c1a1..ea9b4688c9fa 100644
--- a/pkgs/by-name/bi/biboumi/package.nix
+++ b/pkgs/by-name/bi/biboumi/package.nix
@@ -1,13 +1,13 @@
{
lib,
stdenv,
- fetchurl,
- fetchgit,
+ fetchFromGitea,
+ fetchpatch,
cmake,
libuuid,
expat,
libiconv,
- botan2,
+ botan3,
systemd,
pkg-config,
python3Packages,
@@ -26,22 +26,36 @@ assert lib.assertMsg (
) "At least one Biboumi database provider required";
let
- louiz_catch = fetchgit {
- url = "https://lab.louiz.org/louiz/Catch.git";
- rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1
- sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl";
+ catch = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "poezio";
+ repo = "catch";
+ tag = "v2.2.1";
+ hash = "sha256-dGUnB/KPONqPno1aO5cOSiE5N4lUiTbMUcH0X6HUoCk=";
};
-in
-stdenv.mkDerivation rec {
+
pname = "biboumi";
version = "9.0";
+in
+stdenv.mkDerivation {
+ inherit pname version;
- src = fetchurl {
- url = "https://git.louiz.org/biboumi/snapshot/biboumi-${version}.tar.xz";
- sha256 = "1jvygri165aknmvlinx3jb8cclny6cxdykjf8dp0a3l3228rmzqy";
+ src = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "poezio";
+ repo = "biboumi";
+ tag = version;
+ hash = "sha256-yjh9WFuFjaoZLfXTfZajmdRO+3KZqJYBEd0HgqcC28A=";
};
- patches = [ ./catch.patch ];
+ patches = [
+ ./catch.patch
+ (fetchpatch {
+ name = "update_botan_to_version_3.patch";
+ url = "https://codeberg.org/poezio/biboumi/commit/e4d32f939240ed726e9981e42c0dc251cd9879da.patch";
+ hash = "sha256-QUt2ZQtoouLHAeEUlJh+yfCYEmLboL/tk6O2TbHR67Q=";
+ })
+ ];
nativeBuildInputs = [
cmake
@@ -53,7 +67,7 @@ stdenv.mkDerivation rec {
expat
libiconv
systemd
- botan2
+ botan3
]
++ lib.optional withIDN libidn
++ lib.optional withPostgreSQL libpq
@@ -67,17 +81,17 @@ stdenv.mkDerivation rec {
preConfigure = ''
substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi
- cp ${louiz_catch}/single_include/catch.hpp tests/
+ cp ${catch}/single_include/catch.hpp tests/
'';
doCheck = true;
- meta = with lib; {
+ meta = {
description = "Modern XMPP IRC gateway";
mainProgram = "biboumi";
- platforms = platforms.unix;
- homepage = "https://lab.louiz.org/louiz/biboumi";
- license = licenses.zlib;
- maintainers = [ maintainers.woffs ];
+ platforms = lib.platforms.unix;
+ homepage = "https://codeberg.org/poezio/biboumi";
+ license = lib.licenses.zlib;
+ maintainers = [ lib.maintainers.woffs ];
};
}
diff --git a/pkgs/by-name/bo/boehmgc/package.nix b/pkgs/by-name/bo/boehmgc/package.nix
index 5755e462fad4..25531f535700 100644
--- a/pkgs/by-name/bo/boehmgc/package.nix
+++ b/pkgs/by-name/bo/boehmgc/package.nix
@@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
C or C++ programs, though that is not its primary goal.
'';
changelog = "https://github.com/bdwgc/bdwgc/blob/v${finalAttrs.version}/ChangeLog";
- license = "https://hboehm.info/gc/license.txt"; # non-copyleft, X11-style license
+ license = lib.licenses.boehmGC;
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.all;
};
diff --git a/pkgs/by-name/bo/bonsai/package.nix b/pkgs/by-name/bo/bonsai/package.nix
index a8cb48e55294..6a33d21a259d 100644
--- a/pkgs/by-name/bo/bonsai/package.nix
+++ b/pkgs/by-name/bo/bonsai/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
hareThirdParty.hare-json
];
- makeFlags = [ "PREFIX=${builtins.placeholder "out"}" ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
enableParallelBuilding = true;
diff --git a/pkgs/by-name/bo/boolstuff/package.nix b/pkgs/by-name/bo/boolstuff/package.nix
index 1f8495be5519..5309d6f079b5 100644
--- a/pkgs/by-name/bo/boolstuff/package.nix
+++ b/pkgs/by-name/bo/boolstuff/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Library for operations on boolean expression binary trees";
homepage = "http://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html";
- license = "GPL";
+ license = lib.licenses.gpl2Only;
maintainers = [ lib.maintainers.marcweber ];
mainProgram = "booldnf";
platforms = lib.platforms.all;
diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix
index 5a55283544fc..85ff58f20b58 100644
--- a/pkgs/by-name/br/brave/make-brave.nix
+++ b/pkgs/by-name/br/brave/make-brave.nix
@@ -221,8 +221,6 @@ stdenv.mkDerivation {
--replace-fail /usr/bin/brave-browser-stable $out/bin/brave
substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \
--replace-fail /opt/brave.com $out/opt/brave.com
- substituteInPlace $out/share/menu/brave-browser.menu \
- --replace-fail /opt/brave.com $out/opt/brave.com
substituteInPlace $out/opt/brave.com/brave/default-app-block \
--replace-fail /opt/brave.com $out/opt/brave.com
diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index a5108569ba2e..1039ba159d6d 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
let
pname = "brave";
- version = "1.82.172";
+ version = "1.83.109";
allArchives = {
aarch64-linux = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
- hash = "sha256-/RlrYfbUEfBVKzmVGtz9xI5h2++XaOZ8qD9sbN/4ZKA=";
+ hash = "sha256-mbhJnNheLdFGto4AuXMW0Gfajo+lThE4qqT7kzNvUHU=";
};
x86_64-linux = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- hash = "sha256-tTByjOyzTXPu0wBzNmH2TETqFEATzfxDM6QIkgrxpHA=";
+ hash = "sha256-ZpB0BhXeTa0SBRh2Dj/qLDi8cABUVmW8o5aK0kRPEUM=";
};
aarch64-darwin = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
- hash = "sha256-mqhXIpE3IGiDq2cyN5T/Qa+nibuuRShKPsPe5lBlXls=";
+ hash = "sha256-8NzqrvxKiamBdpOnCxVfs50kmDu1xl3HApTUY9MdANQ=";
};
x86_64-darwin = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
- hash = "sha256-TJ3dqnUR+4VEUBZ+2S57F8kXxLX2llh8LbrFHA0PIqM=";
+ hash = "sha256-EJ+eT0RyleAjAofRiVeAyk5yLWSeAOf7QFGT5/HhWjo=";
};
};
diff --git a/pkgs/by-name/bu/buddy/package.nix b/pkgs/by-name/bu/buddy/package.nix
index 9ca2ad864f4b..f47823a3c8fe 100644
--- a/pkgs/by-name/bu/buddy/package.nix
+++ b/pkgs/by-name/bu/buddy/package.nix
@@ -27,7 +27,10 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://sourceforge.net/projects/buddy/";
description = "Binary decision diagram package";
- license = "as-is";
+ license = {
+ url = "https://sourceforge.net/p/buddy/gitcode/ci/master/tree/README";
+ fullName = "Buddy License";
+ };
platforms = lib.platforms.unix; # Once had cygwin problems
};
diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix
index fb21a68824fe..00e54d0cc095 100644
--- a/pkgs/by-name/bu/burpsuite/package.nix
+++ b/pkgs/by-name/bu/burpsuite/package.nix
@@ -9,20 +9,20 @@
}:
let
- version = "2025.9.3";
+ version = "2025.9.4";
product =
if proEdition then
{
productName = "pro";
productDesktop = "Burp Suite Professional Edition";
- hash = "sha256-gLcSx+AZdHW+LP4kPez1KVamTrp7IfGMF/caHDKAxK4=";
+ hash = "sha256-Q6fltYCkmVXXh/nhIalMKmLoV7lqNWcM6LjyfPIkORw=";
}
else
{
productName = "community";
productDesktop = "Burp Suite Community Edition";
- hash = "sha256-LmlmQ6UaIFMGFIFI9r7i9LV81ZcisuNygJo3/oUaWSM=";
+ hash = "sha256-8USmaNI1OZrbo33WkKIEybzGOTIAhIE+0J8tld4Kysg=";
};
src = fetchurl {
diff --git a/pkgs/by-name/ca/catppuccin-gtk/package.nix b/pkgs/by-name/ca/catppuccin-gtk/package.nix
index 922f6973e979..256f5d549fe3 100644
--- a/pkgs/by-name/ca/catppuccin-gtk/package.nix
+++ b/pkgs/by-name/ca/catppuccin-gtk/package.nix
@@ -95,9 +95,9 @@ lib.checkListOfEnum "${pname}: theme accent" validAccents accents lib.checkListO
mkdir -p $out/share/themes
python3 build.py ${variant} \
- --accent ${builtins.toString accents} \
+ --accent ${toString accents} \
${lib.optionalString (size != [ ]) "--size " + size} \
- ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \
+ ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \
--dest $out/share/themes
runHook postInstall
diff --git a/pkgs/by-name/cg/cgal/package.nix b/pkgs/by-name/cg/cgal/package.nix
index 8ccae7b37b7e..e475e253adeb 100644
--- a/pkgs/by-name/cg/cgal/package.nix
+++ b/pkgs/by-name/cg/cgal/package.nix
@@ -6,6 +6,7 @@
boost,
gmp,
mpfr,
+ testers,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -17,19 +18,32 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-8wxb58JaKj6iS8y6q1z2P6/aY8AnnzTX5/izISgh/tY=";
};
+ patches = [ ./cgal_path.patch ];
+
+ nativeBuildInputs = [ cmake ];
+
# note: optional component libCGAL_ImageIO would need zlib and opengl;
# there are also libCGAL_Qt{3,4} omitted ATM
buildInputs = [
- boost
gmp
mpfr
];
- nativeBuildInputs = [ cmake ];
- patches = [ ./cgal_path.patch ];
+ propagatedBuildInputs = [
+ boost
+ ];
doCheck = false;
+ passthru = {
+ tests = {
+ cmake-config = testers.hasCmakeConfigModules {
+ moduleNames = [ "CGAL" ];
+ package = finalAttrs.finalPackage;
+ };
+ };
+ };
+
meta = {
description = "Computational Geometry Algorithms Library";
homepage = "http://cgal.org";
diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix
index aff5f8283fcb..7f93bbd32809 100644
--- a/pkgs/by-name/co/cockpit/package.nix
+++ b/pkgs/by-name/co/cockpit/package.nix
@@ -44,13 +44,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cockpit";
- version = "347";
+ version = "348";
src = fetchFromGitHub {
owner = "cockpit-project";
repo = "cockpit";
tag = finalAttrs.version;
- hash = "sha256-9jVtO97QdFe8pp6JmuftaKyVM/MnRCYCWLPLrtjgbJ8=";
+ hash = "sha256-JO+tHrG1fxfDRdGHIDZ6TBLug/6p/vB8RkxC9TLoOuk=";
fetchSubmodules = true;
};
diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix
index 0e3c6f168164..3a0a44b01b9f 100644
--- a/pkgs/by-name/co/codebook/package.nix
+++ b/pkgs/by-name/co/codebook/package.nix
@@ -7,17 +7,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codebook";
- version = "0.3.10";
+ version = "0.3.11";
src = fetchFromGitHub {
owner = "blopker";
repo = "codebook";
tag = "v${finalAttrs.version}";
- hash = "sha256-MBhPVCnNXIFqwhWEY9ZDFVEQf7DRq2ZY6mamaMfneCc=";
+ hash = "sha256-4jK5wmYnkQ0WDSSBmWL155fqFwG3SQENWvQuKdsfHF0=";
};
buildAndTestSubdir = "crates/codebook-lsp";
- cargoHash = "sha256-LiVveJ27R6Joz3hpCn2sSiikMlerusSjD/eLfn+gaEw=";
+ cargoHash = "sha256-FV7Ux+UuM57McQLqKYjgSvCbPCnM7ZOzX/jFEmtOz2o=";
# Integration tests require internet access for dictionaries
doCheck = false;
diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 4059743941f3..7019fc6ab242 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -14,18 +14,18 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex";
- version = "0.42.0";
+ version = "0.44.0";
src = fetchFromGitHub {
owner = "openai";
repo = "codex";
tag = "rust-v${finalAttrs.version}";
- hash = "sha256-YyI4quZ1vcwzDx38EzqycnUQDBOg9SfEemR4zdKYYIw=";
+ hash = "sha256-i7UhSQ16HqcX/QUb6JQgF6WOTAEDZZNkL/MSqefcwBI=";
};
sourceRoot = "${finalAttrs.src.name}/codex-rs";
- cargoHash = "sha256-No6/WmaCI+w1cVD+PsLJ1jK0zZDYziGlm9DD9E3hA58=";
+ cargoHash = "sha256-sR7Y1SfP0akLRRvP/6tu3gZRNvQbG/a+4bOSEbbrV30=";
nativeBuildInputs = [
installShellFiles
diff --git a/pkgs/by-name/co/colloid-gtk-theme/package.nix b/pkgs/by-name/co/colloid-gtk-theme/package.nix
index 2d5e8d5b0774..7f2c05aa7875 100644
--- a/pkgs/by-name/co/colloid-gtk-theme/package.nix
+++ b/pkgs/by-name/co/colloid-gtk-theme/package.nix
@@ -87,10 +87,10 @@ lib.checkListOfEnum "colloid-gtk-theme: theme variants"
runHook preInstall
name= HOME="$TMPDIR" ./install.sh \
- ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \
- ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \
- ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \
- ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \
+ ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \
+ ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \
+ ${lib.optionalString (sizeVariants != [ ]) "--size " + toString sizeVariants} \
+ ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \
--dest $out/share/themes
jdupes --quiet --link-soft --recurse $out/share
diff --git a/pkgs/by-name/co/colloid-icon-theme/package.nix b/pkgs/by-name/co/colloid-icon-theme/package.nix
index 1713fcd89b54..566897e0df59 100644
--- a/pkgs/by-name/co/colloid-icon-theme/package.nix
+++ b/pkgs/by-name/co/colloid-icon-theme/package.nix
@@ -77,8 +77,8 @@ lib.checkListOfEnum "colloid-icon-theme: scheme variants"
runHook preInstall
name= ./install.sh \
- ${lib.optionalString (schemeVariants != [ ]) ("--scheme " + builtins.toString schemeVariants)} \
- ${lib.optionalString (colorVariants != [ ]) ("--theme " + builtins.toString colorVariants)} \
+ ${lib.optionalString (schemeVariants != [ ]) ("--scheme " + toString schemeVariants)} \
+ ${lib.optionalString (colorVariants != [ ]) ("--theme " + toString colorVariants)} \
--dest $out/share/icons
jdupes --quiet --link-soft --recurse $out/share
diff --git a/pkgs/by-name/co/coredns/package.nix b/pkgs/by-name/co/coredns/package.nix
index 57a01b6aa50b..375fbe28733c 100644
--- a/pkgs/by-name/co/coredns/package.nix
+++ b/pkgs/by-name/co/coredns/package.nix
@@ -10,7 +10,7 @@
}:
let
- attrsToSources = attrs: builtins.map ({ repo, version, ... }: "${repo}@${version}") attrs;
+ attrsToSources = attrs: map ({ repo, version, ... }: "${repo}@${version}") attrs;
in
buildGoModule (finalAttrs: {
pname = "coredns";
@@ -75,7 +75,7 @@ buildGoModule (finalAttrs: {
) externalPlugins)
}
diff -u plugin.cfg.orig plugin.cfg || true
- for src in ${builtins.toString (attrsToSources externalPlugins)}; do go get $src; done
+ for src in ${toString (attrsToSources externalPlugins)}; do go get $src; done
GOOS= GOARCH= go generate
go mod vendor
'';
diff --git a/pkgs/by-name/cp/cppitertools/package.nix b/pkgs/by-name/cp/cppitertools/package.nix
index 99c363273d52..90a73ff7f9d9 100644
--- a/pkgs/by-name/cp/cppitertools/package.nix
+++ b/pkgs/by-name/cp/cppitertools/package.nix
@@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
# files that are also in that repo.
cmakeBuildDir = "cmake-build";
- includeInstallDir = "${builtins.placeholder "out"}/include/cppitertools";
- cmakeInstallDir = "${builtins.placeholder "out"}/share/cmake";
+ includeInstallDir = "${placeholder "out"}/include/cppitertools";
+ cmakeInstallDir = "${placeholder "out"}/share/cmake";
# This version of cppitertools considers itself as having used the default value,
# and issues warning, unless -Dcppitertools_INSTALL_CMAKE_DIR is present as an
diff --git a/pkgs/by-name/cs/cscope/package.nix b/pkgs/by-name/cs/cscope/package.nix
index 6e836948008c..9982c1787732 100644
--- a/pkgs/by-name/cs/cscope/package.nix
+++ b/pkgs/by-name/cs/cscope/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
used to manage projects involving 20 million lines of code!
'';
- license = "BSD-style";
+ license = lib.licenses.bsd3;
homepage = "https://cscope.sourceforge.net/";
diff --git a/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix b/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix
index 515370a06f0b..8aecaf789d8a 100644
--- a/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix
+++ b/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
description = "Brother HL-L2350DW printer driver";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
- platforms = builtins.map (arch: "${arch}-linux") arches;
+ platforms = map (arch: "${arch}-linux") arches;
downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2350dw_us_eu_as&os=128";
maintainers = [ maintainers.sternenseemann ];
};
diff --git a/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix b/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix
index 8cfaf540ecba..12ba4dd2982b 100644
--- a/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix
+++ b/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.brother.com/";
description = "Brother HLL2375DW printer driver";
license = licenses.unfree;
- platforms = builtins.map (arch: "${arch}-linux") arches;
+ platforms = map (arch: "${arch}-linux") arches;
maintainers = [ maintainers.gador ];
};
}
diff --git a/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix b/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix
index 2e286d529ad6..18fb22ed747b 100644
--- a/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix
+++ b/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
description = "Brother MFC-L2750DW printer driver";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
- platforms = builtins.map (arch: "${arch}-linux") arches;
+ platforms = map (arch: "${arch}-linux") arches;
maintainers = [ maintainers.lovesegfault ];
};
}
diff --git a/pkgs/by-name/cu/cups-brother-mfcl2800dw/package.nix b/pkgs/by-name/cu/cups-brother-mfcl2800dw/package.nix
index 6de620531193..3096053861d7 100644
--- a/pkgs/by-name/cu/cups-brother-mfcl2800dw/package.nix
+++ b/pkgs/by-name/cu/cups-brother-mfcl2800dw/package.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation {
description = "Brother MFC-L2750DW printer driver";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
- platforms = builtins.map (arch: "${arch}-linux") arches;
+ platforms = map (arch: "${arch}-linux") arches;
maintainers = [ lib.maintainers.luftmensch-luftmensch ];
};
}
diff --git a/pkgs/by-name/cu/curl-impersonate/chrome/update.sh b/pkgs/by-name/cu/curl-impersonate/chrome/update.sh
index 31f8349eb702..429bc3700e11 100755
--- a/pkgs/by-name/cu/curl-impersonate/chrome/update.sh
+++ b/pkgs/by-name/cu/curl-impersonate/chrome/update.sh
@@ -23,7 +23,7 @@ vendorhash() {
findpath() {
path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
- outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
+ outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "fetchGit \"$nixpkgs\"")"
if [ -n "$outpath" ]; then
path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}"
diff --git a/pkgs/by-name/cu/curl-impersonate/firefox/update.sh b/pkgs/by-name/cu/curl-impersonate/firefox/update.sh
index 76dd6099d417..3202ed1c9057 100644
--- a/pkgs/by-name/cu/curl-impersonate/firefox/update.sh
+++ b/pkgs/by-name/cu/curl-impersonate/firefox/update.sh
@@ -23,7 +23,7 @@ vendorhash() {
findpath() {
path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
- outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
+ outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "fetchGit \"$nixpkgs\"")"
if [ -n "$outpath" ]; then
path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}"
diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix
index d59565107167..1850b328def1 100644
--- a/pkgs/by-name/cy/cyrus-imapd/package.nix
+++ b/pkgs/by-name/cy/cyrus-imapd/package.nix
@@ -180,7 +180,7 @@ stdenv.mkDerivation (finalAttrs: {
checkInputs = [ cunit ];
doCheck = true;
- versionCheckProgram = "${builtins.placeholder "out"}/libexec/master";
+ versionCheckProgram = "${placeholder "out"}/libexec/master";
versionCheckProgramArg = "-V";
nativeInstallCheckInputs = [
versionCheckHook
diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix
index 1929c022a5f9..fd90be690af0 100644
--- a/pkgs/by-name/da/davinci-resolve/package.nix
+++ b/pkgs/by-name/da/davinci-resolve/package.nix
@@ -35,7 +35,7 @@ let
davinci = (
stdenv.mkDerivation rec {
pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
- version = "20.0.1";
+ version = "20.2.1";
nativeBuildInputs = [
(appimage-run.override { buildFHSEnv = buildFHSEnvChroot; })
@@ -57,9 +57,9 @@ let
outputHashAlgo = "sha256";
outputHash =
if studioVariant then
- "sha256-20ZmxkniX4rbKqxxjqGJOCSeZt6i+HN72Vm8HtsONUg="
+ "sha256-emAVfA9mclwJSiT9oVvLVhCy2GXGQVsvg4pj3vodxk8="
else
- "sha256-ZbiQdsm0zoVe0Riw8K6ZBRKd+v73OdplS0Db7P1DE6E=";
+ "sha256-/OQhi4y07TOyeIdD18URBr4qAfuPhd2mr0giqgTEfk0=";
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
@@ -150,7 +150,7 @@ let
test -e ${lib.escapeShellArg appimageName}
appimage-run ${lib.escapeShellArg appimageName} -i -y -n -C $out
- mkdir -p $out/{configs,DolbyVision,easyDCP,Fairlight,GPUCache,logs,Media,"Resolve Disk Database",.crashreport,.license,.LUT,Extras}
+ mkdir -p $out/{"Apple Immersive/Calibration",configs,DolbyVision,easyDCP,Extras,Fairlight,GPUCache,logs,Media,"Resolve Disk Database",.crashreport,.license,.LUT}
runHook postInstall
'';
diff --git a/pkgs/by-name/de/deco/package.nix b/pkgs/by-name/de/deco/package.nix
index c6fbf6b5a1c7..4c5d044bc734 100644
--- a/pkgs/by-name/de/deco/package.nix
+++ b/pkgs/by-name/de/deco/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
meta = {
homepage = "https://github.com/vedatechnologiesinc/deco";
description = "Simple root image setter";
- license = lib.licenses.mit;
+ license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.ebzzry ];
platforms = lib.platforms.unix;
mainProgram = "deco";
diff --git a/pkgs/by-name/di/digiham/package.nix b/pkgs/by-name/di/digiham/package.nix
index 2e002cfbcd05..e373f97e082e 100644
--- a/pkgs/by-name/di/digiham/package.nix
+++ b/pkgs/by-name/di/digiham/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
];
nativeInstallCheckInputs = [ versionCheckHook ];
- versionCheckProgram = "${builtins.placeholder "out"}/bin/dmr_decoder";
+ versionCheckProgram = "${placeholder "out"}/bin/dmr_decoder";
doInstallCheck = true;
meta = {
diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix
index 433b894e3822..a837dedac7c6 100644
--- a/pkgs/by-name/dm/dmd/generic.nix
+++ b/pkgs/by-name/dm/dmd/generic.nix
@@ -40,7 +40,7 @@ let
);
};
- bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
+ bits = toString stdenv.hostPlatform.parsed.cpu.bits;
osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name;
pathToDmd = "\${NIX_BUILD_TOP}/dmd/generated/${osname}/release/${bits}/dmd";
diff --git a/pkgs/by-name/dn/dnglab/package.nix b/pkgs/by-name/dn/dnglab/package.nix
index c09927e50d50..24b6f1811cca 100644
--- a/pkgs/by-name/dn/dnglab/package.nix
+++ b/pkgs/by-name/dn/dnglab/package.nix
@@ -5,7 +5,7 @@
}:
rustPlatform.buildRustPackage rec {
pname = "dnglab";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "dnglab";
@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec {
postFetch = ''
rm -rf "$out"/rawler/data/testdata/cameras/Canon/{"EOS REBEL T7i","EOS Rebel T7i"}
'';
- hash = "sha256-nUZZgVDnFH+TYx9eltI7edsAiWYPkvc3wwnkSNXr0Jw=";
+ hash = "sha256-KBv7HhsGSPo1fa2QGXZi7zjh5Bu9wEtKwZ9X2TRkg2g=";
};
- cargoHash = "sha256-n7p16cCk1sJaTBQ/E7e4BmPeMvcApzTGBrd+CmJ8E3k=";
+ cargoHash = "sha256-0Fxhs6Igi5kf/I5wgQ6bM01ka3Favo4AhfIL2DSvLAw=";
postInstall = ''
rm $out/bin/benchmark $out/bin/identify
diff --git a/pkgs/by-name/do/docker-credential-helpers/package.nix b/pkgs/by-name/do/docker-credential-helpers/package.nix
index a262b00423e3..e692bf9eb4ff 100644
--- a/pkgs/by-name/do/docker-credential-helpers/package.nix
+++ b/pkgs/by-name/do/docker-credential-helpers/package.nix
@@ -47,8 +47,8 @@ buildGoModule rec {
];
in
''
- for cmd in ${builtins.toString cmds}; do
- go build -ldflags "${builtins.toString ldflags}" -trimpath -o bin/docker-credential-$cmd ./$cmd/cmd
+ for cmd in ${toString cmds}; do
+ go build -ldflags "${toString ldflags}" -trimpath -o bin/docker-credential-$cmd ./$cmd/cmd
done
'';
diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix
index 9d5475ee60fb..181df75dfbb4 100644
--- a/pkgs/by-name/do/dopamine/package.nix
+++ b/pkgs/by-name/do/dopamine/package.nix
@@ -6,11 +6,11 @@
}:
appimageTools.wrapType2 rec {
pname = "dopamine";
- version = "3.0.0-preview.39";
+ version = "3.0.0-preview.40";
src = fetchurl {
url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage";
- hash = "sha256-t4f+4ceGyEJHuJxk/8/BMWK0oGYoFXZMjk8UCHLJId8=";
+ hash = "sha256-Cd0qUNkUXup9l3/tzagswY/MUgx4cCnXcML7c5ZSo4k=";
};
extraInstallCommands =
diff --git a/pkgs/by-name/dr/dropbear/package.nix b/pkgs/by-name/dr/dropbear/package.nix
index fb46cd50916f..edd8f75f7367 100644
--- a/pkgs/by-name/dr/dropbear/package.nix
+++ b/pkgs/by-name/dr/dropbear/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
};
CFLAGS = lib.pipe (lib.attrNames dflags) [
- (builtins.map (name: "-D${name}=\\\"${dflags.${name}}\\\""))
+ (map (name: "-D${name}=\\\"${dflags.${name}}\\\""))
(lib.concatStringsSep " ")
];
diff --git a/pkgs/by-name/dv/dvdplusrwtools/package.nix b/pkgs/by-name/dv/dvdplusrwtools/package.nix
index d61702cc13d6..f99641a856db 100644
--- a/pkgs/by-name/dv/dvdplusrwtools/package.nix
+++ b/pkgs/by-name/dv/dvdplusrwtools/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
]
# Patches from Gentoo
++
- builtins.map
+ map
(
{ pfile, sha256 }:
fetchpatch {
diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix
index 4243e5b578de..d6c6534257cb 100644
--- a/pkgs/by-name/ej/ejabberd/package.nix
+++ b/pkgs/by-name/ej/ejabberd/package.nix
@@ -127,7 +127,7 @@ let
};
};
- beamDeps = builtins.removeAttrs allBeamDeps [
+ beamDeps = removeAttrs allBeamDeps [
"sqlite3"
"p1_pgsql"
"p1_mysql"
diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix
index af332edd8748..371e6612f14a 100644
--- a/pkgs/by-name/el/element-desktop/package.nix
+++ b/pkgs/by-name/el/element-desktop/package.nix
@@ -30,7 +30,7 @@ let
in
stdenv.mkDerivation (
finalAttrs:
- builtins.removeAttrs pinData [ "hashes" ]
+ removeAttrs pinData [ "hashes" ]
// {
pname = "element-desktop";
name = "${finalAttrs.pname}-${finalAttrs.version}";
diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix
index 1c842d2fe8ec..284a790e4a05 100644
--- a/pkgs/by-name/el/element-web-unwrapped/package.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/package.nix
@@ -18,7 +18,7 @@ let
in
stdenv.mkDerivation (
finalAttrs:
- builtins.removeAttrs pinData [ "hashes" ]
+ removeAttrs pinData [ "hashes" ]
// {
pname = "element-web";
diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix
index 59c8c0f59952..6ae2bde48e24 100644
--- a/pkgs/by-name/en/engage/package.nix
+++ b/pkgs/by-name/en/engage/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
];
env = {
- ENGAGE_DOCS_LINK = "file://${builtins.placeholder "doc"}/share/doc/${finalAttrs.pname}/index.html";
+ ENGAGE_DOCS_LINK = "file://${placeholder "doc"}/share/doc/${finalAttrs.pname}/index.html";
};
src = fetchFromGitLab {
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd engage ${
builtins.concatStringsSep " " (
- builtins.map (shell: "--${shell} <($out/bin/engage completions ${shell})") [
+ map (shell: "--${shell} <($out/bin/engage completions ${shell})") [
"bash"
"zsh"
"fish"
diff --git a/pkgs/by-name/ep/epson-escpr2/package.nix b/pkgs/by-name/ep/epson-escpr2/package.nix
index caba87f35644..bbfe2d0e2508 100644
--- a/pkgs/by-name/ep/epson-escpr2/package.nix
+++ b/pkgs/by-name/ep/epson-escpr2/package.nix
@@ -33,8 +33,8 @@ stdenv.mkDerivation {
];
configureFlags = [
- "--with-cupsfilterdir=${builtins.placeholder "out"}/lib/cups/filter"
- "--with-cupsppddir=${builtins.placeholder "out"}/share/cups/model"
+ "--with-cupsfilterdir=${placeholder "out"}/lib/cups/filter"
+ "--with-cupsppddir=${placeholder "out"}/share/cups/model"
];
meta = {
diff --git a/pkgs/by-name/eu/eurofurence/package.nix b/pkgs/by-name/eu/eurofurence/package.nix
index aa341e70a9ba..3da21b84c6c7 100644
--- a/pkgs/by-name/eu/eurofurence/package.nix
+++ b/pkgs/by-name/eu/eurofurence/package.nix
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation {
(
{ url, hash }:
fetchzip {
- name = builtins.baseNameOf url;
+ name = baseNameOf url;
stripRoot = false;
inherit url hash;
}
diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix
index 1afadd6cc48b..19293a765010 100644
--- a/pkgs/by-name/ez/eza/package.nix
+++ b/pkgs/by-name/ez/eza/package.nix
@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "eza";
- version = "0.23.3";
+ version = "0.23.4";
src = fetchFromGitHub {
owner = "eza-community";
repo = "eza";
tag = "v${finalAttrs.version}";
- hash = "sha256-z9lG2Ht8Kn/QxmxWqMV27iYGHdUwaz87ayLAZdKJPvQ=";
+ hash = "sha256-zLb2VPfmv9J9UdPAXS+QPHI+hvDRl5UBcvW84J6nUK8=";
};
- cargoHash = "sha256-Izogi+IWOwAuaOBs+99UzuzwIzzfCM8pqo3xZuutYI8=";
+ cargoHash = "sha256-3KLjlEZhGEyOcaiBnfIafR509oRbsWllqf1e6Z0M8Sg=";
nativeBuildInputs = [
cmake
diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
index d0da34ab3ad8..5f8e931e9abc 100644
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@@ -3,99 +3,99 @@
"alpha": {
"experimental": {
"candidateHashFilenames": [
- "factorio_linux_2.0.66.tar.xz"
+ "factorio_linux_2.0.69.tar.xz"
],
- "name": "factorio_alpha_x64-2.0.66.tar.xz",
+ "name": "factorio_alpha_x64-2.0.69.tar.xz",
"needsAuth": true,
- "sha256": "8140abc1017b00de329244e62ae7866406a96c2b5ee6f3d481aeaf86c7f8738a",
+ "sha256": "f3ea6a475eaf6157475169b302753f70f3ac6b6a357a4f682fec2e515339e678",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.66/alpha/linux64",
- "version": "2.0.66"
+ "url": "https://factorio.com/get-download/2.0.69/alpha/linux64",
+ "version": "2.0.69"
},
"stable": {
"candidateHashFilenames": [
- "factorio_linux_2.0.66.tar.xz"
+ "factorio_linux_2.0.69.tar.xz"
],
- "name": "factorio_alpha_x64-2.0.66.tar.xz",
+ "name": "factorio_alpha_x64-2.0.69.tar.xz",
"needsAuth": true,
- "sha256": "8140abc1017b00de329244e62ae7866406a96c2b5ee6f3d481aeaf86c7f8738a",
+ "sha256": "f3ea6a475eaf6157475169b302753f70f3ac6b6a357a4f682fec2e515339e678",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.66/alpha/linux64",
- "version": "2.0.66"
+ "url": "https://factorio.com/get-download/2.0.69/alpha/linux64",
+ "version": "2.0.69"
}
},
"demo": {
"experimental": {
"candidateHashFilenames": [
- "factorio-demo_linux_2.0.66.tar.xz"
+ "factorio-demo_linux_2.0.69.tar.xz"
],
- "name": "factorio_demo_x64-2.0.66.tar.xz",
+ "name": "factorio_demo_x64-2.0.69.tar.xz",
"needsAuth": false,
- "sha256": "74250b0717d41406dc297d0a75103c91413b2b68395e4f3260c5c67cbeec4bda",
+ "sha256": "a670a4cd2fa59cb8dc6db10d969867266080f171e47ebed78880ccd5ed42356c",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.66/demo/linux64",
- "version": "2.0.66"
+ "url": "https://factorio.com/get-download/2.0.69/demo/linux64",
+ "version": "2.0.69"
},
"stable": {
"candidateHashFilenames": [
- "factorio-demo_linux_2.0.66.tar.xz"
+ "factorio-demo_linux_2.0.69.tar.xz"
],
- "name": "factorio_demo_x64-2.0.66.tar.xz",
+ "name": "factorio_demo_x64-2.0.69.tar.xz",
"needsAuth": false,
- "sha256": "74250b0717d41406dc297d0a75103c91413b2b68395e4f3260c5c67cbeec4bda",
+ "sha256": "a670a4cd2fa59cb8dc6db10d969867266080f171e47ebed78880ccd5ed42356c",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.66/demo/linux64",
- "version": "2.0.66"
+ "url": "https://factorio.com/get-download/2.0.69/demo/linux64",
+ "version": "2.0.69"
}
},
"expansion": {
"experimental": {
"candidateHashFilenames": [
- "factorio-space-age_linux_2.0.66.tar.xz"
+ "factorio-space-age_linux_2.0.69.tar.xz"
],
- "name": "factorio_expansion_x64-2.0.66.tar.xz",
+ "name": "factorio_expansion_x64-2.0.69.tar.xz",
"needsAuth": true,
- "sha256": "98443ba14d65ba8f4b268a73b6c40e4a27d6fc50ddf80e7286bb4a3b49cc4bbb",
+ "sha256": "a44bf364c4a0037b1d21b8770d604f278e45b397481908cb4212b49411f3ddd2",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.66/expansion/linux64",
- "version": "2.0.66"
+ "url": "https://factorio.com/get-download/2.0.69/expansion/linux64",
+ "version": "2.0.69"
},
"stable": {
"candidateHashFilenames": [
- "factorio-space-age_linux_2.0.66.tar.xz"
+ "factorio-space-age_linux_2.0.69.tar.xz"
],
- "name": "factorio_expansion_x64-2.0.66.tar.xz",
+ "name": "factorio_expansion_x64-2.0.69.tar.xz",
"needsAuth": true,
- "sha256": "98443ba14d65ba8f4b268a73b6c40e4a27d6fc50ddf80e7286bb4a3b49cc4bbb",
+ "sha256": "a44bf364c4a0037b1d21b8770d604f278e45b397481908cb4212b49411f3ddd2",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.66/expansion/linux64",
- "version": "2.0.66"
+ "url": "https://factorio.com/get-download/2.0.69/expansion/linux64",
+ "version": "2.0.69"
}
},
"headless": {
"experimental": {
"candidateHashFilenames": [
- "factorio-headless_linux_2.0.66.tar.xz",
- "factorio_headless_x64_2.0.66.tar.xz"
+ "factorio-headless_linux_2.0.69.tar.xz",
+ "factorio_headless_x64_2.0.69.tar.xz"
],
- "name": "factorio_headless_x64-2.0.66.tar.xz",
+ "name": "factorio_headless_x64-2.0.69.tar.xz",
"needsAuth": false,
- "sha256": "f1b3976eacc4e233800d399d90006c356fa366f5d64341c504c95c0cba321c06",
+ "sha256": "235147bb3ed6b5f0a6993893c6c92fdfe535ba95ab866046f51f865284b57341",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.66/headless/linux64",
- "version": "2.0.66"
+ "url": "https://factorio.com/get-download/2.0.69/headless/linux64",
+ "version": "2.0.69"
},
"stable": {
"candidateHashFilenames": [
- "factorio-headless_linux_2.0.66.tar.xz",
- "factorio_headless_x64_2.0.66.tar.xz"
+ "factorio-headless_linux_2.0.69.tar.xz",
+ "factorio_headless_x64_2.0.69.tar.xz"
],
- "name": "factorio_headless_x64-2.0.66.tar.xz",
+ "name": "factorio_headless_x64-2.0.69.tar.xz",
"needsAuth": false,
- "sha256": "f1b3976eacc4e233800d399d90006c356fa366f5d64341c504c95c0cba321c06",
+ "sha256": "235147bb3ed6b5f0a6993893c6c92fdfe535ba95ab866046f51f865284b57341",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.66/headless/linux64",
- "version": "2.0.66"
+ "url": "https://factorio.com/get-download/2.0.69/headless/linux64",
+ "version": "2.0.69"
}
}
}
diff --git a/pkgs/by-name/fc/fcft/package.nix b/pkgs/by-name/fc/fcft/package.nix
index 1e2392b7b544..4f23760a704c 100644
--- a/pkgs/by-name/fc/fcft/package.nix
+++ b/pkgs/by-name/fc/fcft/package.nix
@@ -65,9 +65,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
(lib.mesonEnable "system-nanosvg" true)
]
- ++ builtins.map (
- t: lib.mesonEnable "${t}-shaping" (lib.elem t withShapingTypes)
- ) availableShapingTypes;
+ ++ map (t: lib.mesonEnable "${t}-shaping" (lib.elem t withShapingTypes)) availableShapingTypes;
doCheck = true;
diff --git a/pkgs/by-name/fc/fcgi/package.nix b/pkgs/by-name/fc/fcgi/package.nix
index 602090e8eb76..3d9bb21863d1 100644
--- a/pkgs/by-name/fc/fcgi/package.nix
+++ b/pkgs/by-name/fc/fcgi/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Language independent, scalable, open extension to CGI";
homepage = "https://fastcgi-archives.github.io/"; # Formerly http://www.fastcgi.com/
- license = "FastCGI, see LICENSE.TERMS";
+ license = lib.licenses.oml;
mainProgram = "cgi-fcgi";
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ jtbx ];
diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix
index dc36b15d8e4a..26fe09dfc89d 100644
--- a/pkgs/by-name/fi/fishnet/package.nix
+++ b/pkgs/by-name/fi/fishnet/package.nix
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
runtimeEnv = {
PNAME = finalAttrs.pname;
- PKG_FILE = builtins.toString ./package.nix;
+ PKG_FILE = toString ./package.nix;
GITHUB_REPOSITORY = "${finalAttrs.src.owner}/${finalAttrs.src.repo}";
NNUE_BIG_FILE = nnueBigFile;
NNUE_BIG_HASH = nnueBigHash;
diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix
index 030a84a9e190..3e7c92e96a45 100644
--- a/pkgs/by-name/fl/flaresolverr/package.nix
+++ b/pkgs/by-name/fl/flaresolverr/package.nix
@@ -17,38 +17,32 @@ let
python = python3.withPackages (
ps: with ps; [
bottle
+ waitress
+ selenium
func-timeout
prometheus-client
- selenium
- waitress
- xvfbwrapper
-
- # For `undetected_chromedriver`
- looseversion
requests
+ certifi
websockets
+ packaging
+ xvfbwrapper
]
);
in
stdenv.mkDerivation (finalAttrs: {
pname = "flaresolverr";
- version = "3.3.25";
+ version = "3.4.1";
src = fetchFromGitHub {
owner = "FlareSolverr";
repo = "FlareSolverr";
rev = "v${finalAttrs.version}";
- hash = "sha256-AGRqJOIIePaJH0j0eyMFJ6Kddul3yXF6uw6dPMnskmY=";
+ hash = "sha256-ySYH4Ty6Z1mZWPIhIIX0+78RiozEHJ++3C4kBj7MfU0=";
};
nativeBuildInputs = [ makeWrapper ];
postPatch = ''
- substituteInPlace src/undetected_chromedriver/patcher.py \
- --replace-fail \
- "from distutils.version import LooseVersion" \
- "from looseversion import LooseVersion"
-
substituteInPlace src/utils.py \
--replace-fail \
'CHROME_EXE_PATH = None' \
diff --git a/pkgs/by-name/fl/flix/package.nix b/pkgs/by-name/fl/flix/package.nix
index 0b85a7f7a726..3b8195269131 100644
--- a/pkgs/by-name/fl/flix/package.nix
+++ b/pkgs/by-name/fl/flix/package.nix
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation rec {
pname = "flix";
- version = "0.62.0";
+ version = "0.64.0";
src = fetchurl {
url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";
- sha256 = "sha256-YUFeEeDpgRQ9nciOMtyoFjEJ81D8ATQFBgb1H707FtM=";
+ sha256 = "sha256-/iBzYJY3YPPexvZTMF1A9Qz4j67qEcrRWckGuTg87XI=";
};
dontUnpack = true;
diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix
index a6142a33e129..8a2a154b4d3c 100644
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
# We fix this by setting the systemd package's `systemdsystemunitdir` pkg-config variable.
#
# https://man.openbsd.org/pkg-config.1#PKG_CONFIG_$PACKAGE_$VARIABLE
- PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${builtins.placeholder "out"}/lib/systemd/system";
+ PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
outputs = [
"out"
diff --git a/pkgs/by-name/fl/fluent-gtk-theme/package.nix b/pkgs/by-name/fl/fluent-gtk-theme/package.nix
index 3b5b4be1c1ad..a2dc6a21bf3a 100644
--- a/pkgs/by-name/fl/fluent-gtk-theme/package.nix
+++ b/pkgs/by-name/fl/fluent-gtk-theme/package.nix
@@ -86,10 +86,10 @@ lib.checkListOfEnum "${pname}: theme variants"
runHook preInstall
name= HOME="$TMPDIR" ./install.sh \
- ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \
- ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \
- ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \
- ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \
+ ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \
+ ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \
+ ${lib.optionalString (sizeVariants != [ ]) "--size " + toString sizeVariants} \
+ ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \
--icon nixos \
--dest $out/share/themes
diff --git a/pkgs/by-name/fl/fluent-icon-theme/package.nix b/pkgs/by-name/fl/fluent-icon-theme/package.nix
index 355ce29e499a..bd02e441ff11 100644
--- a/pkgs/by-name/fl/fluent-icon-theme/package.nix
+++ b/pkgs/by-name/fl/fluent-icon-theme/package.nix
@@ -60,7 +60,7 @@ lib.checkListOfEnum "${pname}: available color variants"
./install.sh --dest $out/share/icons \
--name Fluent \
- ${builtins.toString colorVariants} \
+ ${toString colorVariants} \
${lib.optionalString allColorVariants "--all"} \
${lib.optionalString roundedIcons "--round"} \
${lib.optionalString blackPanelIcons "--black"}
diff --git a/pkgs/by-name/fr/freecad/freecad-utils.nix b/pkgs/by-name/fr/freecad/freecad-utils.nix
index 3fb384705a06..8d440540d7bf 100644
--- a/pkgs/by-name/fr/freecad/freecad-utils.nix
+++ b/pkgs/by-name/fr/freecad/freecad-utils.nix
@@ -31,7 +31,7 @@ let
in
lib.optionalString (val != null) "--run ${installer}";
- pythonsProcessed = builtins.map (
+ pythonsProcessed = map (
pyt:
if builtins.isString pyt then
pyt
@@ -57,7 +57,7 @@ let
let
modulesStr = wrapPathsStr "--module-path" modules;
pythonsStr = wrapPathsStr "--python-path" (pythonsProcessed pythons);
- makeWrapperFlagsStr = builtins.concatStringsSep " " (builtins.map (f: "'${f}'") makeWrapperFlags);
+ makeWrapperFlagsStr = builtins.concatStringsSep " " (map (f: "'${f}'") makeWrapperFlags);
userCfgStr = wrapCfgStr "user" userCfg;
systemCfgStr = wrapCfgStr "system" systemCfg;
diff --git a/pkgs/by-name/fr/freeimage/package.nix b/pkgs/by-name/fr/freeimage/package.nix
index e0331774258a..62206be74b30 100644
--- a/pkgs/by-name/fr/freeimage/package.nix
+++ b/pkgs/by-name/fr/freeimage/package.nix
@@ -113,7 +113,11 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Open Source library for accessing popular graphics image file formats";
homepage = "http://freeimage.sourceforge.net/";
- license = "GPL";
+ license = with lib.licenses; [
+ freeimage
+ gpl2Only
+ gpl3Only
+ ];
knownVulnerabilities = [
"CVE-2024-31570"
"CVE-2024-28584"
diff --git a/pkgs/by-name/fr/freeswitch/package.nix b/pkgs/by-name/fr/freeswitch/package.nix
index 04f6be81d886..3b88653441ef 100644
--- a/pkgs/by-name/fr/freeswitch/package.nix
+++ b/pkgs/by-name/fr/freeswitch/package.nix
@@ -100,7 +100,7 @@ let
modulesConf =
let
- lst = builtins.map (mod: mod.path) enabledModules;
+ lst = map (mod: mod.path) enabledModules;
str = lib.strings.concatStringsSep "\n" lst;
in
builtins.toFile "modules.conf" str;
diff --git a/pkgs/by-name/ga/ganttproject-bin/package.nix b/pkgs/by-name/ga/ganttproject-bin/package.nix
index ab7fbcac624e..b8ba41626fc5 100644
--- a/pkgs/by-name/ga/ganttproject-bin/package.nix
+++ b/pkgs/by-name/ga/ganttproject-bin/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
mkdir -pv "$out/bin"
wrapProgram "$out/share/ganttproject/ganttproject" \
--set JAVA_HOME "${jre}" \
- --prefix _JAVA_OPTIONS " " "${builtins.toString javaOptions}"
+ --prefix _JAVA_OPTIONS " " "${toString javaOptions}"
mv -v "$out/share/ganttproject/ganttproject" "$out/bin"
diff --git a/pkgs/by-name/ga/gauge-unwrapped/package.nix b/pkgs/by-name/ga/gauge-unwrapped/package.nix
index ef21db98eb68..a82dea06615f 100644
--- a/pkgs/by-name/ga/gauge-unwrapped/package.nix
+++ b/pkgs/by-name/ga/gauge-unwrapped/package.nix
@@ -6,7 +6,7 @@
buildGoModule rec {
pname = "gauge";
- version = "1.6.20";
+ version = "1.6.21";
patches = [
# adds a check which adds an error message when trying to
@@ -18,10 +18,10 @@ buildGoModule rec {
owner = "getgauge";
repo = "gauge";
tag = "v${version}";
- hash = "sha256-Ynyi2ph1L9SfxDwgXqw55nieP5o9LyHxKw4HYQEhXEo=";
+ hash = "sha256-mUuoGLAVUShhNsSjURCL6yWcIW+K7P8KEBwBoBelgyw=";
};
- vendorHash = "sha256-vv77sD+H2PI06iaJWNGoT4Oe53Shc7QxlSL1nX4i4+Y=";
+ vendorHash = "sha256-WyQbvZNd61L4Bz5btZ2hkrCTb5iuJJU5yNDzuYR5Sdc=";
excludedPackages = [
"build"
diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix
index 9364e1e84384..7d03232a5d76 100644
--- a/pkgs/by-name/ge/geoserver/package.nix
+++ b/pkgs/by-name/ge/geoserver/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
(previousAttrs.buildInputs or [ ]) ++ lib.lists.concatMap (drv: drv.buildInputs) selectedExtensions
);
postInstall = (previousAttrs.postInstall or "") + ''
- for extension in ${builtins.toString selectedExtensions} ; do
+ for extension in ${toString selectedExtensions} ; do
cp -r $extension/* $out
# Some files are the same for all/several extensions. We allow overwriting them again.
chmod -R +w $out
diff --git a/pkgs/by-name/ge/getxbook/package.nix b/pkgs/by-name/ge/getxbook/package.nix
index e30d863f46fb..11dbf45848f1 100644
--- a/pkgs/by-name/ge/getxbook/package.nix
+++ b/pkgs/by-name/ge/getxbook/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs";
};
- env.NIX_CFLAGS_COMPILE = builtins.toString (
+ env.NIX_CFLAGS_COMPILE = toString (
[ "-Wno-error=deprecated-declarations" ]
++ lib.optionals (!stdenv.cc.isClang) [
"-Wno-error=format-truncation"
diff --git a/pkgs/by-name/gi/giflib/package.nix b/pkgs/by-name/gi/giflib/package.nix
index bf6a84007ab8..5855c5b902e4 100644
--- a/pkgs/by-name/gi/giflib/package.nix
+++ b/pkgs/by-name/gi/giflib/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
];
makeFlags = [
- "PREFIX=${builtins.placeholder "out"}"
+ "PREFIX=${placeholder "out"}"
];
postPatch = ''
diff --git a/pkgs/by-name/gi/git-quick-stats/package.nix b/pkgs/by-name/gi/git-quick-stats/package.nix
index c27447e798fc..b3d3b7231f44 100644
--- a/pkgs/by-name/gi/git-quick-stats/package.nix
+++ b/pkgs/by-name/gi/git-quick-stats/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
installFlags = [
- "PREFIX=${builtins.placeholder "out"}"
+ "PREFIX=${placeholder "out"}"
];
postInstall =
diff --git a/pkgs/by-name/gi/git-worktree-switcher/package.nix b/pkgs/by-name/gi/git-worktree-switcher/package.nix
index adec0677d5f9..eed927c03043 100644
--- a/pkgs/by-name/gi/git-worktree-switcher/package.nix
+++ b/pkgs/by-name/gi/git-worktree-switcher/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "git-worktree-switcher";
- version = "0.2.4";
+ version = "0.2.6";
src = fetchFromGitHub {
owner = "mateusauler";
repo = "git-worktree-switcher";
tag = "${finalAttrs.version}-fork";
- hash = "sha256-N+bDsLEUM6FWhyliUav2n5hwMa5EEuVPoIK+Cja0DxA=";
+ hash = "sha256-vPnAXiizCU5nXce+aE2x2G5ei+7A+eBTUpxcGleSSa8=";
};
buildInputs = [
diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix
index e984f8f2480a..fd3f655978c7 100644
--- a/pkgs/by-name/go/go-ethereum/package.nix
+++ b/pkgs/by-name/go/go-ethereum/package.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
# Move binaries to separate outputs and symlink them back to $out
postInstall = lib.concatStringsSep "\n" (
- builtins.map (
+ map (
bin:
"mkdir -p \$${bin}/bin && mv $out/bin/${bin} \$${bin}/bin/ && ln -s \$${bin}/bin/${bin} $out/bin/"
) bins
diff --git a/pkgs/by-name/go/gonzo/package.nix b/pkgs/by-name/go/gonzo/package.nix
new file mode 100644
index 000000000000..c6b6b6ba69c4
--- /dev/null
+++ b/pkgs/by-name/go/gonzo/package.nix
@@ -0,0 +1,47 @@
+{
+ lib,
+ go,
+ buildGoModule,
+ fetchFromGitHub,
+ nix-update-script,
+ versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+ pname = "gonzo";
+ version = "0.2.1";
+
+ src = fetchFromGitHub {
+ owner = "control-theory";
+ repo = "gonzo";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-P8Ntt8Dj5zq+Ff5MkZEvWabk2w5Cm6tXxl3ssMxDNok=";
+ };
+
+ vendorHash = "sha256-XKwtq8EF774lHLHtyFzveFa5agJa15CvhsuwwaQdJwU=";
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X=main.version=${finalAttrs.version}"
+ "-X=main.commit=${finalAttrs.src.tag}"
+ "-X=main.buildTime=1970-01-01T00:00:00Z"
+ "-X=main.goVersion=${lib.getVersion go}"
+ ];
+
+ passthru.updateScript = nix-update-script { };
+
+ doInstallCheck = true;
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ versionCheckProgramArg = "--version";
+
+ meta = {
+ description = "TUI log analysis tool";
+ homepage = "https://gonzo.controltheory.com/";
+ downloadPage = "https://github.com/control-theory/gonzo";
+ changelog = "https://github.com/control-theory/gonzo/releases/tag/v${finalAttrs.src.tag}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ kpbaks ];
+ mainProgram = "gonzo";
+ };
+})
diff --git a/pkgs/by-name/go/google-cloud-sdk/components.nix b/pkgs/by-name/go/google-cloud-sdk/components.nix
index 690afb80e5df..b603f3492452 100644
--- a/pkgs/by-name/go/google-cloud-sdk/components.nix
+++ b/pkgs/by-name/go/google-cloud-sdk/components.nix
@@ -69,7 +69,7 @@ let
lib.fix (
self:
builtins.listToAttrs (
- builtins.map (component: {
+ map (component: {
name = component.id;
value = componentFromSnapshot self {
inherit
@@ -96,7 +96,7 @@ let
version,
}@attrs:
let
- baseUrl = builtins.dirOf schema_version.url;
+ baseUrl = dirOf schema_version.url;
# Architectures supported by this component. Defaults to all available
# architectures.
architectures = builtins.filter (arch: builtins.elem arch (builtins.attrNames arches)) (
@@ -115,12 +115,12 @@ let
"source"
] component) "${baseUrl}/${component.data.source}";
sha256 = lib.attrByPath [ "data" "checksum" ] "" component;
- dependencies = builtins.map (dep: builtins.getAttr dep components) component.dependencies;
+ dependencies = map (dep: builtins.getAttr dep components) component.dependencies;
platforms =
if component.platform == { } then
lib.platforms.all
else
- builtins.concatMap (arch: builtins.map (os: toNixPlatform arch os) operating_systems) architectures;
+ builtins.concatMap (arch: map (os: toNixPlatform arch os) operating_systems) architectures;
snapshot = snapshotFromComponent attrs;
};
diff --git a/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix b/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix
index 2e704194f69a..986ee2ba4884 100644
--- a/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix
+++ b/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix
@@ -43,11 +43,11 @@ let
installCheck =
let
- compNames = builtins.map lib.getName comps_;
+ compNames = map lib.getName comps_;
in
''
$out/bin/gcloud components list --only-local-state --format 'value(id)' > component_list.txt
- for comp in ${builtins.toString compNames}; do
+ for comp in ${toString compNames}; do
snapshot_file="$out/google-cloud-sdk/.install/$comp.snapshot.json"
if ! [ -f "$snapshot_file" ]; then
diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
index 2c2e70e2025d..59155f9b5926 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
@@ -28,12 +28,12 @@
stdenv.mkDerivation rec {
pname = "gpu-screen-recorder";
- version = "5.7.0";
+ version = "5.7.4";
src = fetchgit {
url = "https://repo.dec05eba.com/${pname}";
tag = version;
- hash = "sha256-1F4j62wqF+C6eA5ECCjqCoY8+DINBPVKnsWQi6GF2Us=";
+ hash = "sha256-X1yvVmjKYUnwdsRC0kY+R1kEuUq6SB1bKhpHWnBvIho=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gr/graphhopper/package.nix b/pkgs/by-name/gr/graphhopper/package.nix
index b4dd2b989b11..fe3572224f55 100644
--- a/pkgs/by-name/gr/graphhopper/package.nix
+++ b/pkgs/by-name/gr/graphhopper/package.nix
@@ -11,7 +11,7 @@
...
}:
let
- version = builtins.fromTOML (builtins.readFile ./version.toml);
+ version = fromTOML (builtins.readFile ./version.toml);
src = fetchFromGitHub {
owner = "graphhopper";
diff --git a/pkgs/by-name/gr/graphite-gtk-theme/package.nix b/pkgs/by-name/gr/graphite-gtk-theme/package.nix
index 0208957a2e4f..e91f3485181b 100644
--- a/pkgs/by-name/gr/graphite-gtk-theme/package.nix
+++ b/pkgs/by-name/gr/graphite-gtk-theme/package.nix
@@ -96,10 +96,10 @@ lib.checkListOfEnum "${pname}: theme variants"
runHook preInstall
name= ./install.sh \
- ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \
- ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \
- ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \
- ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \
+ ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \
+ ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \
+ ${lib.optionalString (sizeVariants != [ ]) "--size " + toString sizeVariants} \
+ ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \
--dest $out/share/themes
${lib.optionalString wallpapers "sh -x wallpaper/install-wallpapers.sh"}
@@ -112,7 +112,7 @@ lib.checkListOfEnum "${pname}: theme variants"
./install.sh --justcopy --dest $out/share/grub/themes \
${lib.optionalString (builtins.elem "nord" tweaks) "--theme nord"} \
- ${lib.optionalString (grubScreens != [ ]) "--screen " + builtins.toString grubScreens}
+ ${lib.optionalString (grubScreens != [ ]) "--screen " + toString grubScreens}
)
''}
diff --git a/pkgs/by-name/gr/grcov/package.nix b/pkgs/by-name/gr/grcov/package.nix
index f73b64f76c7e..2197d4fafd72 100644
--- a/pkgs/by-name/gr/grcov/package.nix
+++ b/pkgs/by-name/gr/grcov/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
];
skipFlag = test: "--skip " + test;
in
- builtins.concatStringsSep " " (builtins.map skipFlag skipList);
+ builtins.concatStringsSep " " (map skipFlag skipList);
meta = {
description = "Rust tool to collect and aggregate code coverage data for multiple source files";
diff --git a/pkgs/by-name/gu/guile-gnutls/package.nix b/pkgs/by-name/gu/guile-gnutls/package.nix
index a19f0469c217..8371a934cea9 100644
--- a/pkgs/by-name/gu/guile-gnutls/package.nix
+++ b/pkgs/by-name/gu/guile-gnutls/package.nix
@@ -39,9 +39,9 @@ stdenv.mkDerivation rec {
];
configureFlags = [
- "--with-guile-site-dir=${builtins.placeholder "out"}/${guile.siteDir}"
- "--with-guile-site-ccache-dir=${builtins.placeholder "out"}/${guile.siteCcacheDir}"
- "--with-guile-extension-dir=${builtins.placeholder "out"}/lib/guile/${guile.effectiveVersion}/extensions"
+ "--with-guile-site-dir=${placeholder "out"}/${guile.siteDir}"
+ "--with-guile-site-ccache-dir=${placeholder "out"}/${guile.siteCcacheDir}"
+ "--with-guile-extension-dir=${placeholder "out"}/lib/guile/${guile.effectiveVersion}/extensions"
];
meta = with lib; {
diff --git a/pkgs/by-name/ha/hare/cross-compilation-tests.nix b/pkgs/by-name/ha/hare/cross-compilation-tests.nix
index c5797a9a1566..45245d730e5b 100644
--- a/pkgs/by-name/ha/hare/cross-compilation-tests.nix
+++ b/pkgs/by-name/ha/hare/cross-compilation-tests.nix
@@ -7,9 +7,7 @@
}:
let
archs = lib.concatStringsSep " " (
- builtins.map (lib.removeSuffix "-linux") (
- builtins.filter (lib.hasSuffix "-linux") hare.meta.platforms
- )
+ map (lib.removeSuffix "-linux") (builtins.filter (lib.hasSuffix "-linux") hare.meta.platforms)
);
mainDotHare = writeText "main.ha" ''
export fn main() void = void;
diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix
index 8f9b1bc89fbe..4db503b574b4 100644
--- a/pkgs/by-name/ha/hare/package.nix
+++ b/pkgs/by-name/ha/hare/package.nix
@@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
makeFlags = [
"HARECACHE=.harecache"
- "PREFIX=${builtins.placeholder "out"}"
+ "PREFIX=${placeholder "out"}"
"ARCH=${arch}"
"VERSION=${finalAttrs.version}-nixpkgs"
"QBEFLAGS=-t${qbePlatform}"
diff --git a/pkgs/by-name/ha/harec/package.nix b/pkgs/by-name/ha/harec/package.nix
index c80e8cb0126b..73257d0296ad 100644
--- a/pkgs/by-name/ha/harec/package.nix
+++ b/pkgs/by-name/ha/harec/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ qbe ];
makeFlags = [
- "PREFIX=${builtins.placeholder "out"}"
+ "PREFIX=${placeholder "out"}"
"ARCH=${arch}"
"VERSION=${finalAttrs.version}-nixpkgs"
"QBEFLAGS=-t${qbePlatform}"
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
updateScript = _experimental-update-script-combinators.sequence (
- builtins.map (item: item.command) [
+ map (item: item.command) [
(gitUpdater {
attrPath = "harec";
ignoredVersions = [ "-rc[0-9]{1,}" ];
diff --git a/pkgs/by-name/ha/haredo/package.nix b/pkgs/by-name/ha/haredo/package.nix
index ee937f9a0c3c..62fd701f099f 100644
--- a/pkgs/by-name/ha/haredo/package.nix
+++ b/pkgs/by-name/ha/haredo/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelChecking = true;
- env.PREFIX = builtins.placeholder "out";
+ env.PREFIX = placeholder "out";
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
diff --git a/pkgs/by-name/hg/hgrep/package.nix b/pkgs/by-name/hg/hgrep/package.nix
new file mode 100644
index 000000000000..c110c9814d37
--- /dev/null
+++ b/pkgs/by-name/hg/hgrep/package.nix
@@ -0,0 +1,40 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ versionCheckHook,
+ nix-update-script,
+}:
+
+let
+ version = "0.3.8";
+in
+rustPlatform.buildRustPackage {
+ pname = "hgrep";
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "rhysd";
+ repo = "hgrep";
+ tag = "v${version}";
+ hash = "sha256-GcV6tZLhAtBE0/husOqZ3Gib9nXXg7kcxrNp9IK0eTo=";
+ };
+
+ cargoHash = "sha256-NxfWY9OoMNASlWE48njuAdTI11JAV+rzjD0OU2cHLsc=";
+
+ nativeInstallCheckInputs = [
+ versionCheckHook
+ ];
+ versionCheckProgramArg = "--version";
+ doInstallCheck = true;
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Grep with human-friendly search results";
+ homepage = "https://github.com/rhysd/hgrep";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ axka ];
+ mainProgram = "hgrep";
+ };
+}
diff --git a/pkgs/by-name/hi/himitsu/package.nix b/pkgs/by-name/hi/himitsu/package.nix
index dd3e09a7797e..ac9dd0c25dc0 100644
--- a/pkgs/by-name/hi/himitsu/package.nix
+++ b/pkgs/by-name/hi/himitsu/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
scdoc
];
- installFlags = [ "PREFIX=${builtins.placeholder "out"}" ];
+ installFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with lib; {
homepage = "https://himitsustore.org/";
diff --git a/pkgs/by-name/hy/hylafaxplus/package.nix b/pkgs/by-name/hy/hylafaxplus/package.nix
index b81bd67847b7..044198f267c9 100644
--- a/pkgs/by-name/hy/hylafaxplus/package.nix
+++ b/pkgs/by-name/hy/hylafaxplus/package.nix
@@ -33,7 +33,7 @@
let
configSite = replaceVars ./config.site {
- config_maxgid = lib.optionalString (maxgid != null) ''CONFIG_MAXGID=${builtins.toString maxgid}'';
+ config_maxgid = lib.optionalString (maxgid != null) ''CONFIG_MAXGID=${toString maxgid}'';
ghostscript_version = ghostscript.version;
out = null; # "out" will be resolved in post-install.sh
inherit coreutils ghostscript libtiff;
@@ -41,7 +41,7 @@ let
postPatch = replaceVars ./post-patch.sh {
inherit configSite;
- maxuid = lib.optionalString (maxuid != null) (builtins.toString maxuid);
+ maxuid = lib.optionalString (maxuid != null) (toString maxuid);
faxcover_binpath = lib.makeBinPath [
stdenv.shellPackage
coreutils
diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix
index 1573eedda079..d019d9d5a5b0 100644
--- a/pkgs/by-name/hy/hyprutils/package.nix
+++ b/pkgs/by-name/hy/hyprutils/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hyprutils";
- version = "0.8.4";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprutils";
tag = "v${finalAttrs.version}";
- hash = "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=";
+ hash = "sha256-FWB9Xe9iIMlUskfLzKlYH3scvnHpSC5rMyN1EDHUQmE=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ib/ibm-plex/package.nix b/pkgs/by-name/ib/ibm-plex/package.nix
index ac07709c7b95..b1f48169c21d 100644
--- a/pkgs/by-name/ib/ibm-plex/package.nix
+++ b/pkgs/by-name/ib/ibm-plex/package.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation {
pname = "ibm-plex";
inherit version;
- srcs = builtins.map (
+ srcs = map (
family:
fetchzip {
url = "https://github.com/IBM/plex/releases/download/%40ibm%2Fplex-${family}%40${version}/ibm-plex-${family}.zip";
diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index 10ef5f0ed50f..0c002e42fbf4 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -56,7 +56,7 @@ let
buildLock = {
sources =
- builtins.map
+ map
(p: {
name = p.pname;
inherit (p) version;
@@ -224,9 +224,9 @@ stdenv.mkDerivation {
echo '${builtins.toJSON buildLock}' > "$packageOut/build/build-lock.json"
- makeWrapper '${lib.getExe nodejs}' "$out/bin/admin-cli" \
+ makeWrapper '${lib.getExe nodejs}' "$out/bin/immich-admin" \
--add-flags "$packageOut/dist/main" \
- --add-flags cli
+ --add-flags immich-admin
makeWrapper '${lib.getExe nodejs}' "$out/bin/server" \
--add-flags "$packageOut/dist/main" \
--chdir "$packageOut" \
diff --git a/pkgs/by-name/im/imv/package.nix b/pkgs/by-name/im/imv/package.nix
index af7faf513f2d..47e257e65e2e 100644
--- a/pkgs/by-name/im/imv/package.nix
+++ b/pkgs/by-name/im/imv/package.nix
@@ -61,7 +61,7 @@ let
libjpeg = libjpeg_turbo;
};
- backendFlags = builtins.map (
+ backendFlags = map (
b: if builtins.elem b withBackends then "-D${b}=enabled" else "-D${b}=disabled"
) (builtins.attrNames backends);
in
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
inih
]
++ windowSystems."${withWindowSystem}"
- ++ builtins.map (b: backends."${b}") withBackends;
+ ++ map (b: backends."${b}") withBackends;
patches = [
(fetchpatch {
diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix
index 38c995ee32a4..6245b34a2a7d 100644
--- a/pkgs/by-name/in/inspircd/package.nix
+++ b/pkgs/by-name/in/inspircd/package.nix
@@ -123,9 +123,7 @@ let
};
# buildInputs necessary for the enabled extraModules
- extraInputs = lib.concatMap (
- m: extras."${m}" or (builtins.throw "Unknown extra module ${m}")
- ) extraModules;
+ extraInputs = lib.concatMap (m: extras."${m}" or (throw "Unknown extra module ${m}")) extraModules;
# if true, we can't provide a binary version of this
# package without violating the GPL 2
diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix
index e158e3fb5c0c..7d00ee756764 100644
--- a/pkgs/by-name/in/intel-compute-runtime/package.nix
+++ b/pkgs/by-name/in/intel-compute-runtime/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
(lib.cmakeBool "SKIP_UNIT_TESTS" true)
- (lib.cmakeFeature "IGC_DIR" (builtins.toString intel-graphics-compiler))
+ (lib.cmakeFeature "IGC_DIR" (toString intel-graphics-compiler))
(lib.cmakeFeature "OCL_ICD_VENDORDIR" "${placeholder "out"}/etc/OpenCL/vendors")
# The install script assumes this path is relative to CMAKE_INSTALL_PREFIX
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix
index 789c6c76b03d..f105fe38466a 100644
--- a/pkgs/by-name/in/intelli-shell/package.nix
+++ b/pkgs/by-name/in/intelli-shell/package.nix
@@ -11,21 +11,26 @@
rustPlatform.buildRustPackage rec {
pname = "intelli-shell";
- version = "0.2.7";
+ version = "3.2.3";
src = fetchFromGitHub {
owner = "lasantosr";
repo = "intelli-shell";
rev = "v${version}";
- hash = "sha256-D7hB1vKi54L7hU3TqTvzxXIr6XohfYLUTidR6wFJmfo=";
+ hash = "sha256-kwwZzuo/eH+bssSFjBWC3YwP6X/CoRPo8OCa/0wGrp8=";
};
- cargoHash = "sha256-vzmUmznY5uqPhaTzfT0KR+k2nvPmB0Jm9/N4lgzEe2E=";
+ cargoHash = "sha256-0wS751jE0VK/FaoL7WNc2OezJeDmYJNO+IKezB7Ma1Q=";
nativeBuildInputs = [
pkg-config
];
+ buildNoDefaultFeatures = true;
+ buildFeatures = [
+ "extra-features"
+ ];
+
buildInputs = [
libgit2
openssl
@@ -41,7 +46,7 @@ rustPlatform.buildRustPackage rec {
description = "Like IntelliSense, but for shells";
homepage = "https://github.com/lasantosr/intelli-shell";
license = licenses.asl20;
- maintainers = [ ];
+ maintainers = with maintainers; [ lasantosr ];
mainProgram = "intelli-shell";
};
}
diff --git a/pkgs/by-name/in/invoiceplane/fix-yarn-lock.patch b/pkgs/by-name/in/invoiceplane/fix-yarn-lock.patch
deleted file mode 100644
index 8398ad956450..000000000000
--- a/pkgs/by-name/in/invoiceplane/fix-yarn-lock.patch
+++ /dev/null
@@ -1,651 +0,0 @@
-diff --git a/yarn.lock b/yarn.lock
-index 691942c1..6d3bd8ce 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -2,11 +2,71 @@
- # yarn lockfile v1
-
-
-+"@parcel/watcher-android-arm64@2.5.1":
-+ version "2.5.1"
-+ resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz#507f836d7e2042f798c7d07ad19c3546f9848ac1"
-+ integrity sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==
-+
-+"@parcel/watcher-darwin-arm64@2.5.1":
-+ version "2.5.1"
-+ resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz#3d26dce38de6590ef79c47ec2c55793c06ad4f67"
-+ integrity sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==
-+
-+"@parcel/watcher-darwin-x64@2.5.1":
-+ version "2.5.1"
-+ resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz#99f3af3869069ccf774e4ddfccf7e64fd2311ef8"
-+ integrity sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==
-+
-+"@parcel/watcher-freebsd-x64@2.5.1":
-+ version "2.5.1"
-+ resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz#14d6857741a9f51dfe51d5b08b7c8afdbc73ad9b"
-+ integrity sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==
-+
-+"@parcel/watcher-linux-arm-glibc@2.5.1":
-+ version "2.5.1"
-+ resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz#43c3246d6892381db473bb4f663229ad20b609a1"
-+ integrity sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==
-+
-+"@parcel/watcher-linux-arm-musl@2.5.1":
-+ version "2.5.1"
-+ resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz#663750f7090bb6278d2210de643eb8a3f780d08e"
-+ integrity sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==
-+
-+"@parcel/watcher-linux-arm64-glibc@2.5.1":
-+ version "2.5.1"
-+ resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz#ba60e1f56977f7e47cd7e31ad65d15fdcbd07e30"
-+ integrity sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==
-+
-+"@parcel/watcher-linux-arm64-musl@2.5.1":
-+ version "2.5.1"
-+ resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz#f7fbcdff2f04c526f96eac01f97419a6a99855d2"
-+ integrity sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==
-+
- "@parcel/watcher-linux-x64-glibc@2.5.1":
- version "2.5.1"
- resolved "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz"
- integrity sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==
-
-+"@parcel/watcher-linux-x64-musl@2.5.1":
-+ version "2.5.1"
-+ resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz#277b346b05db54f55657301dd77bdf99d63606ee"
-+ integrity sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==
-+
-+"@parcel/watcher-win32-arm64@2.5.1":
-+ version "2.5.1"
-+ resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz#7e9e02a26784d47503de1d10e8eab6cceb524243"
-+ integrity sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==
-+
-+"@parcel/watcher-win32-ia32@2.5.1":
-+ version "2.5.1"
-+ resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz#2d0f94fa59a873cdc584bf7f6b1dc628ddf976e6"
-+ integrity sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==
-+
-+"@parcel/watcher-win32-x64@2.5.1":
-+ version "2.5.1"
-+ resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz#ae52693259664ba6f2228fa61d7ee44b64ea0947"
-+ integrity sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==
-+
- "@parcel/watcher@^2.4.1":
- version "2.5.1"
- resolved "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz"
-@@ -105,7 +165,9 @@ async@^2.6.0:
- lodash "^4.17.14"
-
- async@^3.2.3, async@~3.2.0:
-- version "3.2.5"
-+ version "3.2.6"
-+ resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
-+ integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
-
- autoprefixer@9.8:
- version "9.8.8"
-@@ -155,33 +217,48 @@ brace-expansion@^1.1.7:
- balanced-match "^1.0.0"
- concat-map "0.0.1"
-
--braces@^3.0.2:
-- version "3.0.2"
-+braces@^3.0.3:
-+ version "3.0.3"
-+ resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-+ integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
- dependencies:
-- fill-range "^7.0.1"
-+ fill-range "^7.1.1"
-
--browserslist@^4.12.0, "browserslist@>= 4.21.0":
-- version "4.22.1"
-+browserslist@^4.12.0:
-+ version "4.25.1"
-+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.25.1.tgz#ba9e8e6f298a1d86f829c9b975e07948967bb111"
-+ integrity sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==
- dependencies:
-- caniuse-lite "^1.0.30001541"
-- electron-to-chromium "^1.4.535"
-- node-releases "^2.0.13"
-- update-browserslist-db "^1.0.13"
-+ caniuse-lite "^1.0.30001726"
-+ electron-to-chromium "^1.5.173"
-+ node-releases "^2.0.19"
-+ update-browserslist-db "^1.1.3"
-
- bytes@1:
- version "1.0.0"
- resolved "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"
- integrity sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==
-
--call-bind@^1.0.0:
-- version "1.0.5"
-+call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
-+ version "1.0.2"
-+ resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
-+ integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
- dependencies:
-+ es-errors "^1.3.0"
- function-bind "^1.1.2"
-- get-intrinsic "^1.2.1"
-- set-function-length "^1.1.1"
-
--caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001541:
-- version "1.0.30001561"
-+call-bound@^1.0.2:
-+ version "1.0.4"
-+ resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
-+ integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
-+ dependencies:
-+ call-bind-apply-helpers "^1.0.2"
-+ get-intrinsic "^1.3.0"
-+
-+caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001726:
-+ version "1.0.30001731"
-+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001731.tgz#277c07416ea4613ec564e5b0ffb47e7b60f32e2f"
-+ integrity sha512-lDdp2/wrOmTRWuoB5DpfNkC0rJDU8DqRa6nYL6HK6sytw70QMopt/NIc/9SM7ylItlBWfACXk0tEn37UWM/+mg==
-
- chalk@^1.1.1:
- version "1.1.3"
-@@ -241,16 +318,16 @@ color-convert@^2.0.1:
- dependencies:
- color-name "~1.1.4"
-
--color-name@~1.1.4:
-- version "1.1.4"
-- resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
-- integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
--
- color-name@1.1.3:
- version "1.1.3"
- resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
- integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
-
-+color-name@~1.1.4:
-+ version "1.1.4"
-+ resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
-+ integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-+
- colors@~1.1.2:
- version "1.1.2"
- resolved "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"
-@@ -278,13 +355,6 @@ debug@^3.1.0:
- dependencies:
- ms "^2.1.1"
-
--define-data-property@^1.1.1:
-- version "1.1.1"
-- dependencies:
-- get-intrinsic "^1.2.1"
-- gopd "^1.0.1"
-- has-property-descriptors "^1.0.0"
--
- delegate@^3.1.2:
- version "3.2.0"
- resolved "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz"
-@@ -310,13 +380,24 @@ dropzone@5.9:
- resolved "https://registry.npmjs.org/dropzone/-/dropzone-5.9.3.tgz"
- integrity sha512-Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA==
-
-+dunder-proto@^1.0.1:
-+ version "1.0.1"
-+ resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
-+ integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
-+ dependencies:
-+ call-bind-apply-helpers "^1.0.1"
-+ es-errors "^1.3.0"
-+ gopd "^1.2.0"
-+
- duplexer@^0.1.1:
- version "0.1.2"
- resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
- integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
--electron-to-chromium@^1.4.535:
-- version "1.4.576"
-+electron-to-chromium@^1.5.173:
-+ version "1.5.198"
-+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.198.tgz#ac12b539ac1bb3dece1a4cd2d8882d0349c71c55"
-+ integrity sha512-G5COfnp3w+ydVu80yprgWSfmfQaYRh9DOxfhAxstLyetKaLyl55QrNjx8C38Pc/C+RaDmb1M0Lk8wPEMQ+bGgQ==
-
- error@^7.0.0:
- version "7.2.1"
-@@ -325,8 +406,27 @@ error@^7.0.0:
- dependencies:
- string-template "~0.2.1"
-
--escalade@^3.1.1:
-- version "3.1.1"
-+es-define-property@^1.0.1:
-+ version "1.0.1"
-+ resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
-+ integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
-+
-+es-errors@^1.3.0:
-+ version "1.3.0"
-+ resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
-+ integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
-+
-+es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
-+ version "1.1.1"
-+ resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
-+ integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
-+ dependencies:
-+ es-errors "^1.3.0"
-+
-+escalade@^3.2.0:
-+ version "3.2.0"
-+ resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
-+ integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
-
- escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
- version "1.0.5"
-@@ -379,8 +479,10 @@ file-sync-cmp@^0.1.0:
- resolved "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz"
- integrity sha512-0k45oWBokCqh2MOexeYKpyqmGKG+8mQ2Wd8iawx+uWd/weWJQAZ6SoPybagdCI4xFisag8iAR77WPm4h3pTfxA==
-
--fill-range@^7.0.1:
-- version "7.0.1"
-+fill-range@^7.1.1:
-+ version "7.1.1"
-+ resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
-+ integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
- dependencies:
- to-regex-range "^5.0.1"
-
-@@ -461,13 +563,29 @@ gaze@^1.1.0:
- dependencies:
- globule "^1.0.0"
-
--get-intrinsic@^1.0.2, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2:
-- version "1.2.2"
-+get-intrinsic@^1.2.5, get-intrinsic@^1.3.0:
-+ version "1.3.0"
-+ resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
-+ integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
- dependencies:
-+ call-bind-apply-helpers "^1.0.2"
-+ es-define-property "^1.0.1"
-+ es-errors "^1.3.0"
-+ es-object-atoms "^1.1.1"
- function-bind "^1.1.2"
-- has-proto "^1.0.1"
-- has-symbols "^1.0.3"
-- hasown "^2.0.0"
-+ get-proto "^1.0.1"
-+ gopd "^1.2.0"
-+ has-symbols "^1.1.0"
-+ hasown "^2.0.2"
-+ math-intrinsics "^1.1.0"
-+
-+get-proto@^1.0.1:
-+ version "1.0.1"
-+ resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
-+ integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
-+ dependencies:
-+ dunder-proto "^1.0.1"
-+ es-object-atoms "^1.0.0"
-
- getobject@~1.0.0:
- version "1.0.2"
-@@ -486,19 +604,7 @@ glob@^7.1.3:
- once "^1.3.0"
- path-is-absolute "^1.0.0"
-
--glob@~7.1.1:
-- version "7.1.7"
-- resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
-- integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
-- dependencies:
-- fs.realpath "^1.0.0"
-- inflight "^1.0.4"
-- inherits "2"
-- minimatch "^3.0.4"
-- once "^1.3.0"
-- path-is-absolute "^1.0.0"
--
--glob@~7.1.6:
-+glob@~7.1.1, glob@~7.1.6:
- version "7.1.7"
- resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
- integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
-@@ -546,10 +652,10 @@ good-listener@^1.2.2:
- dependencies:
- delegate "^3.1.2"
-
--gopd@^1.0.1:
-- version "1.0.1"
-- dependencies:
-- get-intrinsic "^1.1.3"
-+gopd@^1.2.0:
-+ version "1.2.0"
-+ resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
-+ integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
-
- grunt-cli@~1.4.3:
- version "1.4.3"
-@@ -656,7 +762,7 @@ grunt-sass@3.1:
- resolved "https://registry.npmjs.org/grunt-sass/-/grunt-sass-3.1.0.tgz"
- integrity sha512-90s27H7FoCDcA8C8+R0GwC+ntYD3lG6S/jqcavWm3bn9RiJTmSfOvfbFa1PXx4NbBWuiGQMLfQTj/JvvqT5w6A==
-
--grunt@>=0.4.5, grunt@>=1, grunt@>=1.4.1, grunt@1.6:
-+grunt@1.6:
- version "1.6.1"
- resolved "https://registry.npmjs.org/grunt/-/grunt-1.6.1.tgz"
- integrity sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA==
-@@ -700,21 +806,15 @@ has-flag@^4.0.0:
- resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
- integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
--has-property-descriptors@^1.0.0:
-- version "1.0.1"
-- dependencies:
-- get-intrinsic "^1.2.2"
--
--has-proto@^1.0.1:
-- version "1.0.1"
--
--has-symbols@^1.0.3:
-- version "1.0.3"
-- resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
-- integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
-+has-symbols@^1.1.0:
-+ version "1.1.0"
-+ resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
-+ integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
-
--hasown@^2.0.0:
-- version "2.0.0"
-+hasown@^2.0.2:
-+ version "2.0.2"
-+ resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
-+ integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
- dependencies:
- function-bind "^1.1.2"
-
-@@ -784,9 +884,11 @@ is-absolute@^1.0.0:
- is-windows "^1.0.1"
-
- is-core-module@^2.13.0:
-- version "2.13.1"
-+ version "2.16.1"
-+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
-+ integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
- dependencies:
-- hasown "^2.0.0"
-+ hasown "^2.0.2"
-
- is-extglob@^2.1.1:
- version "2.1.1"
-@@ -848,7 +950,7 @@ jquery-ui@1.14:
- dependencies:
- jquery ">=1.12.0 <5.0.0"
-
--"jquery@>=1.12.0 <5.0.0", "jquery@>=3.4.0 <4.0.0", jquery@3.7:
-+jquery@3.7, "jquery@>=1.12.0 <5.0.0", "jquery@>=3.4.0 <4.0.0":
- version "3.7.1"
- resolved "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz"
- integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
-@@ -925,6 +1027,11 @@ map-cache@^0.2.0:
- resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"
- integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
-
-+math-intrinsics@^1.1.0:
-+ version "1.1.0"
-+ resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
-+ integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
-+
- maxmin@^3.0.0:
- version "3.0.0"
- resolved "https://registry.npmjs.org/maxmin/-/maxmin-3.0.0.tgz"
-@@ -936,9 +1043,11 @@ maxmin@^3.0.0:
- pretty-bytes "^5.3.0"
-
- micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
-- version "4.0.5"
-+ version "4.0.8"
-+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
-+ integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
- dependencies:
-- braces "^3.0.2"
-+ braces "^3.0.3"
- picomatch "^2.3.1"
-
- minimatch@^3.0.4, minimatch@^3.1.1:
-@@ -948,14 +1057,7 @@ minimatch@^3.0.4, minimatch@^3.1.1:
- dependencies:
- brace-expansion "^1.1.7"
-
--minimatch@~3.0.2:
-- version "3.0.8"
-- resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz"
-- integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==
-- dependencies:
-- brace-expansion "^1.1.7"
--
--minimatch@~3.0.4:
-+minimatch@~3.0.2, minimatch@~3.0.4:
- version "3.0.8"
- resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz"
- integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==
-@@ -979,15 +1081,19 @@ multimatch@^4.0.0:
- minimatch "^3.0.4"
-
- nanoid@^3.3.7:
-- version "3.3.7"
-+ version "3.3.11"
-+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
-+ integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
-
- node-addon-api@^7.0.0:
- version "7.1.1"
- resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz"
- integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
-
--node-releases@^2.0.13:
-- version "2.0.13"
-+node-releases@^2.0.19:
-+ version "2.0.19"
-+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314"
-+ integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==
-
- nopt@~3.0.6:
- version "3.0.6"
-@@ -1019,8 +1125,10 @@ object-assign@^4.1.0:
- resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
- integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
-
--object-inspect@^1.9.0:
-- version "1.13.1"
-+object-inspect@^1.13.3:
-+ version "1.13.4"
-+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
-+ integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
-
- object.defaults@^1.1.0:
- version "1.1.0"
-@@ -1137,12 +1245,9 @@ picocolors@^0.2.1:
- resolved "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"
- integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
-
--picocolors@^1.0.0:
-- version "1.0.0"
--
--picocolors@^1.1.0:
-+picocolors@^1.1.1:
- version "1.1.1"
-- resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz"
-+ resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
- integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
-
- picomatch@^2.3.1:
-@@ -1167,6 +1272,15 @@ postcss-value-parser@^4.1.0:
- resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
- integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-
-+postcss@8.4:
-+ version "8.4.49"
-+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
-+ integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
-+ dependencies:
-+ nanoid "^3.3.7"
-+ picocolors "^1.1.1"
-+ source-map-js "^1.2.1"
-+
- postcss@^6.0.11:
- version "6.0.23"
- resolved "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz"
-@@ -1184,22 +1298,17 @@ postcss@^7.0.32:
- picocolors "^0.2.1"
- source-map "^0.6.1"
-
--postcss@8.4:
-- version "8.4.47"
-- dependencies:
-- nanoid "^3.3.7"
-- picocolors "^1.1.0"
-- source-map-js "^1.2.1"
--
- pretty-bytes@^5.3.0:
- version "5.6.0"
- resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"
- integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
-
- qs@^6.4.0:
-- version "6.11.2"
-+ version "6.14.0"
-+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930"
-+ integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==
- dependencies:
-- side-channel "^1.0.4"
-+ side-channel "^1.1.0"
-
- raw-body@~1.1.0:
- version "1.1.7"
-@@ -1283,32 +1392,57 @@ sass@^1.89.2:
- optionalDependencies:
- "@parcel/watcher" "^2.4.1"
-
-+select2@4.1.0-rc.0:
-+ version "4.1.0-rc.0"
-+ resolved "https://registry.npmjs.org/select2/-/select2-4.1.0-rc.0.tgz"
-+ integrity sha512-Hr9TdhyHCZUtwznEH2CBf7967mEM0idtJ5nMtjvk3Up5tPukOLXbHUNmh10oRfeNIhj+3GD3niu+g6sVK+gK0A==
-+
- select@^1.1.2:
- version "1.1.2"
- resolved "https://registry.npmjs.org/select/-/select-1.1.2.tgz"
- integrity sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==
-
--select2@4.1.0-rc.0:
-- version "4.1.0-rc.0"
-- resolved "https://registry.npmjs.org/select2/-/select2-4.1.0-rc.0.tgz"
-- integrity sha512-Hr9TdhyHCZUtwznEH2CBf7967mEM0idtJ5nMtjvk3Up5tPukOLXbHUNmh10oRfeNIhj+3GD3niu+g6sVK+gK0A==
-+side-channel-list@^1.0.0:
-+ version "1.0.0"
-+ resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
-+ integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
-+ dependencies:
-+ es-errors "^1.3.0"
-+ object-inspect "^1.13.3"
-
--set-function-length@^1.1.1:
-- version "1.1.1"
-+side-channel-map@^1.0.1:
-+ version "1.0.1"
-+ resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"
-+ integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==
- dependencies:
-- define-data-property "^1.1.1"
-- get-intrinsic "^1.2.1"
-- gopd "^1.0.1"
-- has-property-descriptors "^1.0.0"
-+ call-bound "^1.0.2"
-+ es-errors "^1.3.0"
-+ get-intrinsic "^1.2.5"
-+ object-inspect "^1.13.3"
-
--side-channel@^1.0.4:
-- version "1.0.4"
-+side-channel-weakmap@^1.0.2:
-+ version "1.0.2"
-+ resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea"
-+ integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==
-+ dependencies:
-+ call-bound "^1.0.2"
-+ es-errors "^1.3.0"
-+ get-intrinsic "^1.2.5"
-+ object-inspect "^1.13.3"
-+ side-channel-map "^1.0.1"
-+
-+side-channel@^1.1.0:
-+ version "1.1.0"
-+ resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
-+ integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
- dependencies:
-- call-bind "^1.0.0"
-- get-intrinsic "^1.0.2"
-- object-inspect "^1.9.0"
-+ es-errors "^1.3.0"
-+ object-inspect "^1.13.3"
-+ side-channel-list "^1.0.0"
-+ side-channel-map "^1.0.1"
-+ side-channel-weakmap "^1.0.2"
-
--source-map-js@^1.2.1, "source-map-js@>=0.6.2 <2.0.0":
-+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.2.1:
- version "1.2.1"
- resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz"
- integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
-@@ -1333,16 +1467,16 @@ sprintf-js@~1.0.2:
- resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
- integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
-
--string_decoder@0.10:
-- version "0.10.31"
-- resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-- integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
--
- string-template@~0.2.1:
- version "0.2.1"
- resolved "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz"
- integrity sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==
-
-+string_decoder@0.10:
-+ version "0.10.31"
-+ resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-+ integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
-+
- strip-ansi@^3.0.0:
- version "3.0.1"
- resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
-@@ -1399,7 +1533,9 @@ to-regex-range@^5.0.1:
- is-number "^7.0.0"
-
- uglify-js@^3.16.1:
-- version "3.17.4"
-+ version "3.19.3"
-+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.19.3.tgz#82315e9bbc6f2b25888858acd1fff8441035b77f"
-+ integrity sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==
-
- unc-path-regex@^0.1.2:
- version "0.1.2"
-@@ -1414,11 +1550,13 @@ underscore.string@~3.3.5:
- sprintf-js "^1.1.1"
- util-deprecate "^1.0.2"
-
--update-browserslist-db@^1.0.13:
-- version "1.0.13"
-+update-browserslist-db@^1.1.3:
-+ version "1.1.3"
-+ resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz#348377dd245216f9e7060ff50b15a1b740b75420"
-+ integrity sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==
- dependencies:
-- escalade "^3.1.1"
-- picocolors "^1.0.0"
-+ escalade "^3.2.0"
-+ picocolors "^1.1.1"
-
- uri-path@^1.0.0:
- version "1.0.0"
diff --git a/pkgs/by-name/in/invoiceplane/fix_composer_validation.patch b/pkgs/by-name/in/invoiceplane/fix_composer_validation.patch
deleted file mode 100644
index 0a610bead28d..000000000000
--- a/pkgs/by-name/in/invoiceplane/fix_composer_validation.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e404c835ae6681287f0d0ba005e43732becf8e9e Mon Sep 17 00:00:00 2001
-From: Jonas Heinrich
-Date: Sun, 17 Aug 2025 09:54:41 +0200
-Subject: [PATCH] composer.json omit version string
-
----
- composer.json | 1 -
- composer.lock | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/composer.json b/composer.json
-index 4ae0b32b7..241d59be9 100644
---- a/composer.json
-+++ b/composer.json
-@@ -1,6 +1,5 @@
- {
- "name": "invoiceplane/invoiceplane",
-- "version": "1.6.3-rc1",
- "description": "InvoicePlane is a self-hosted open source application for managing your invoices, clients and payments",
- "homepage": "https://invoiceplane.com",
- "license": "MIT",
-diff --git a/composer.lock b/composer.lock
-index 46fae450e..cf4aa24c1 100644
---- a/composer.lock
-+++ b/composer.lock
-@@ -4,7 +4,7 @@
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
- "This file is @generated automatically"
- ],
-- "content-hash": "6920f42f5773c5e01f9f107ebcedb891",
-+ "content-hash": "16ec29d674456761958ca1c78513c3c5",
- "packages": [
- {
- "name": "bacon/bacon-qr-code",
diff --git a/pkgs/by-name/in/invoiceplane/package.nix b/pkgs/by-name/in/invoiceplane/package.nix
deleted file mode 100644
index 35f54a6775bb..000000000000
--- a/pkgs/by-name/in/invoiceplane/package.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{
- lib,
- fetchFromGitHub,
- nixosTests,
- fetchYarnDeps,
- applyPatches,
- php,
- yarnConfigHook,
- yarnBuildHook,
- yarnInstallHook,
- nodePackages,
- fetchzip,
-}:
-let
- version = "1.6.3";
- # Fetch release tarball which contains language files
- # https://github.com/InvoicePlane/InvoicePlane/issues/1170
- languages = fetchzip {
- url = "https://github.com/InvoicePlane/InvoicePlane/releases/download/v${version}/v${version}.zip";
- hash = "sha256-MuqxbkayW3GeiaorxfZSJtlwCWvnIF2ED/UUqahyoIQ=";
- };
-in
-php.buildComposerProject2 (finalAttrs: {
- pname = "invoiceplane";
- inherit version;
-
- src = applyPatches {
- src = fetchFromGitHub {
- owner = "InvoicePlane";
- repo = "InvoicePlane";
- tag = "v${version}";
- hash = "sha256-XNjdFWP5AEulbPZcMDXYSdDhaLWlgu3nnCSFnjUjGpk=";
- };
- patches = [
- # Fix composer.json validation
- # See https://github.com/InvoicePlane/InvoicePlane/pull/1306
- ./fix_composer_validation.patch
- ];
- };
-
- patches = [
- # yarn.lock missing some resolved attributes and fails
- ./fix-yarn-lock.patch
- ];
-
- vendorHash = "sha256-UCYAnECuIbIYg1T4I8I9maXVKXJc1zkyauBuIy5frTY=";
-
- nativeBuildInputs = [
- yarnConfigHook
- yarnBuildHook
- yarnInstallHook
- # Needed for executing package.json scripts
- nodePackages.grunt-cli
- ];
-
- offlineCache = fetchYarnDeps {
- inherit (finalAttrs) src patches;
- hash = "sha256-0fPdxOIeQBTulPUxHtaQylm4jevQTONSN1bChqbGbGs=";
- };
-
- postBuild = ''
- grunt build
- '';
-
- # Cleanup and language files
- postInstall = ''
- chmod -R u+w $out/share
- mv $out/share/php/invoiceplane/* $out/
- cp -r ${languages}/application/language $out/application/
- rm -r $out/{composer.json,composer.lock,CONTRIBUTING.md,docker-compose.yml,Gruntfile.js,package.json,node_modules,yarn.lock,share}
- '';
-
- passthru.tests = {
- inherit (nixosTests) invoiceplane;
- };
-
- meta = {
- description = "Self-hosted open source application for managing your invoices, clients and payments";
- changelog = "https://github.com/InvoicePlane/InvoicePlane/releases/tag/v${version}";
- homepage = "https://www.invoiceplane.com";
- license = lib.licenses.mit;
- platforms = lib.platforms.all;
- maintainers = with lib.maintainers; [ onny ];
- };
-})
diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix
index fa16d73cbbf6..69a3b7b1c887 100644
--- a/pkgs/by-name/io/iosevka-bin/package.nix
+++ b/pkgs/by-name/io/iosevka-bin/package.nix
@@ -12,7 +12,7 @@ let
variantHashes = import ./variants.nix;
validVariants = map (lib.removePrefix "Iosevka") (
- builtins.attrNames (builtins.removeAttrs variantHashes [ "Iosevka" ])
+ builtins.attrNames (removeAttrs variantHashes [ "Iosevka" ])
);
in
stdenv.mkDerivation rec {
diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix
index 21edd614080b..15e3c2a5c81a 100644
--- a/pkgs/by-name/is/isabelle/package.nix
+++ b/pkgs/by-name/is/isabelle/package.nix
@@ -258,7 +258,7 @@ stdenv.mkDerivation (finalAttrs: {
in
symlinkJoin {
name = "isabelle-with-components-${isabelle.version}";
- paths = [ isabelle ] ++ (builtins.map (c: c.override { inherit isabelle; }) components);
+ paths = [ isabelle ] ++ (map (c: c.override { inherit isabelle; }) components);
postBuild = ''
rm $out/bin/*
diff --git a/pkgs/by-name/ja/ja2-stracciatella/package.nix b/pkgs/by-name/ja/ja2-stracciatella/package.nix
index 5ced41656169..6c3f3525a8ec 100644
--- a/pkgs/by-name/ja/ja2-stracciatella/package.nix
+++ b/pkgs/by-name/ja/ja2-stracciatella/package.nix
@@ -104,7 +104,11 @@ stdenv.mkDerivation rec {
# Fails to build on x86_64-linux as of 2025-03-16 and potentially earlier
broken = true;
description = "Jagged Alliance 2, with community fixes";
- license = "SFI Source Code license agreement";
+ license = {
+ fullName = "Strategy First Inc. Source Code License Agreement";
+ url = "https://github.com/ja2-stracciatella/ja2-stracciatella/blob/master/SFI%20Source%20Code%20license%20agreement.txt";
+ free = false;
+ };
homepage = "https://ja2-stracciatella.github.io/";
maintainers = [ ];
};
diff --git a/pkgs/by-name/ja/jade/package.nix b/pkgs/by-name/ja/jade/package.nix
index 372c559361b2..45d648192f7a 100644
--- a/pkgs/by-name/ja/jade/package.nix
+++ b/pkgs/by-name/ja/jade/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
meta = {
description = "James Clark's DSSSL Engine";
- license = "custom";
+ license = lib.licenses.x11;
homepage = "http://www.jclark.com/jade/";
platforms = with lib.platforms; linux;
maintainers = [ ];
diff --git a/pkgs/by-name/ja/jasper-gtk-theme/package.nix b/pkgs/by-name/ja/jasper-gtk-theme/package.nix
index 33ffeaeefa71..662f84cc033e 100644
--- a/pkgs/by-name/ja/jasper-gtk-theme/package.nix
+++ b/pkgs/by-name/ja/jasper-gtk-theme/package.nix
@@ -81,10 +81,10 @@ lib.checkListOfEnum "${pname}: theme variants"
runHook preInstall
name= HOME="$TMPDIR" ./install.sh \
- ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \
- ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \
- ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \
- ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \
+ ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \
+ ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \
+ ${lib.optionalString (sizeVariants != [ ]) "--size " + toString sizeVariants} \
+ ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \
--dest $out/share/themes
jdupes --quiet --link-soft --recurse $out/share
diff --git a/pkgs/by-name/ja/jazz2-content/package.nix b/pkgs/by-name/ja/jazz2-content/package.nix
index 2a7032322ec0..39a8661412e2 100644
--- a/pkgs/by-name/ja/jazz2-content/package.nix
+++ b/pkgs/by-name/ja/jazz2-content/package.nix
@@ -8,7 +8,7 @@ runCommandLocal "jazz2-content"
{
inherit (jazz2) version src;
- meta = (builtins.removeAttrs jazz2.meta [ "mainProgram" ]) // {
+ meta = (removeAttrs jazz2.meta [ "mainProgram" ]) // {
description = "Assets needed for jazz2";
platforms = lib.platforms.all;
};
diff --git a/pkgs/by-name/ka/kagen/package.nix b/pkgs/by-name/ka/kagen/package.nix
index 1b830896ca49..57842dfa679a 100644
--- a/pkgs/by-name/ka/kagen/package.nix
+++ b/pkgs/by-name/ka/kagen/package.nix
@@ -2,25 +2,22 @@
lib,
stdenv,
fetchFromGitHub,
- fetchpatch2,
cmake,
pkg-config,
mpi,
- cgal_5,
- boost,
- gmp,
- mpfr,
+ cgal,
sparsehash,
imagemagick,
gtest,
ctestCheckHook,
mpiCheckPhaseHook,
withExamples ? false,
+ testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "kagen";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "KarlsruheGraphGeneration";
@@ -28,44 +25,27 @@ stdenv.mkDerivation (finalAttrs: {
tag = "v${finalAttrs.version}";
# use vendor libmorton and xxHash
fetchSubmodules = true;
- hash = "sha256-FSlTNOQgwPGOn4mIVIgFejvU0dpyydomHYJOKPz1UjU=";
+ hash = "sha256-2jXHHS9Siu6hXrYPIrZSOWe6D2PgsvrbMw/7Ykpc3wk=";
};
- patches = [
- # replace asm by builtin function to ensure compatibility with arm64
- (fetchpatch2 {
- url = "https://github.com/KarlsruheGraphGeneration/KaGen/commit/cab9d5dc6cc256972e52675ad9c385524d40ecd9.patch?full_index=1";
- hash = "sha256-DCsuwUiE98UKZMxlUI9p36/wq486uHHrUphrIVqM+Cc=";
- })
- ];
-
- postPatch = ''
- substituteInPlace tests/CMakeLists.txt \
- --replace-fail "FetchContent_MakeAvailable(googletest)" "find_package(GTest REQUIRED)"\
- --replace-fail "set_property(DIRECTORY" "#set_property(DIRECTORY"
-
- substituteInPlace kagen/CMakeLists.txt \
- --replace-fail "OBJECT" ""
- '';
-
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
- mpi
- cgal_5
- sparsehash
imagemagick
- # should be propagated by cgal
- boost
- gmp
- mpfr
+ ];
+
+ propagatedBuildInputs = [
+ mpi
+ cgal
+ sparsehash
];
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+ (lib.cmakeBool "KAGEN_USE_BUNDLED_GTEST" false)
(lib.cmakeBool "KAGEN_BUILD_EXAMPLES" withExamples)
(lib.cmakeBool "KAGEN_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
];
@@ -80,15 +60,24 @@ stdenv.mkDerivation (finalAttrs: {
mpiCheckPhaseHook
];
- disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
- # flaky tests on aarch64-darwin
+ disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+ # flaky tests on darwin
"test_rgg2d.2cores"
"test_rgg2d.4cores"
+ "test_edge_weights.2cores"
+ "test_edge_weights.4cores"
+ "test_permutation.2cores"
+ "test_permutation.4cores"
];
- postInstall = ''
- cmake --install . --component tools
- '';
+ passthru = {
+ tests = {
+ cmake-config = testers.hasCmakeConfigModules {
+ moduleNames = [ "KaGen" ];
+ package = finalAttrs.finalPackage;
+ };
+ };
+ };
meta = {
description = "Communication-free Massively Distributed Graph Generators";
diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix
index 90106f4ecda3..8ac6d55981a9 100644
--- a/pkgs/by-name/ki/kimai/package.nix
+++ b/pkgs/by-name/ki/kimai/package.nix
@@ -7,13 +7,13 @@
php.buildComposerProject2 (finalAttrs: {
pname = "kimai";
- version = "2.38.0";
+ version = "2.40.0";
src = fetchFromGitHub {
owner = "kimai";
repo = "kimai";
tag = finalAttrs.version;
- hash = "sha256-4wi87RvNrfd6vmRG/w6BY84j9NxXqNpAD/rfFN93QyY=";
+ hash = "sha256-/962VDi/50PMfSjMtJtlR9uIbJSzkF7kSQiRzb6o+SI=";
};
php = php.buildEnv {
@@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: {
'';
};
- vendorHash = "sha256-U9yBSHL3682dWf2VZDw6/CiSmHLMS0EO/o/JgWbfwVM=";
+ vendorHash = "sha256-I4v4WkPGLc8vBPjCiYzPxcLn4rH3HWtQXSqwGVKXeGg=";
composerNoPlugins = false;
composerNoScripts = false;
diff --git a/pkgs/by-name/ko/kodelife/update.sh b/pkgs/by-name/ko/kodelife/update.sh
index 992f7c2bf434..13f93c515321 100755
--- a/pkgs/by-name/ko/kodelife/update.sh
+++ b/pkgs/by-name/ko/kodelife/update.sh
@@ -24,7 +24,7 @@ nixeval() {
findpath() {
path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
- outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
+ outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "fetchGit \"$nixpkgs\"")"
if [ -n "$outpath" ]; then
path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}"
diff --git a/pkgs/by-name/kt/ktx-tools/package.nix b/pkgs/by-name/kt/ktx-tools/package.nix
index 7c4da8a5c2fe..0533aecb78a1 100644
--- a/pkgs/by-name/kt/ktx-tools/package.nix
+++ b/pkgs/by-name/kt/ktx-tools/package.nix
@@ -10,13 +10,13 @@
}:
stdenv.mkDerivation rec {
pname = "ktx-tools";
- version = "4.4.0";
+ version = "4.4.1";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "KTX-Software";
rev = "v${version}";
- hash = "sha256-bDdRdVFbVmN8fEGRLnPLOXsV6lfYU9Lg4nW0GuCj6AU=";
+ hash = "sha256-dAb1ze2YpgQYu+fNONWLCG8/ckj0SeedxIUNmlSh5J0=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix b/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix
index 2285e65c80d0..7496c1ed274c 100644
--- a/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix
+++ b/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix
@@ -241,11 +241,11 @@ let
builder = if x.from >= minRepoVersionValidated then mkMigration else stubBecauseDisabled;
in
builder x.from x.to x.release x.hash;
- migrations = builtins.map mkMigrationOrStub releases;
+ migrations = map mkMigrationOrStub releases;
packageNotBroken = package: !package.meta.broken;
migrationsBrokenRemoved = builtins.filter packageNotBroken migrations;
- migrationsBrokenStubbed = builtins.map (
+ migrationsBrokenStubbed = map (
x: if packageNotBroken x then x else (stubBecauseBroken x.pname)
) migrations;
in
@@ -253,7 +253,7 @@ in
symlinkJoin {
name = "kubo-fs-repo-migrations-${version}";
paths = if stubBrokenMigrations then migrationsBrokenStubbed else migrationsBrokenRemoved;
- meta = (builtins.removeAttrs kubo-migrator-unwrapped.meta [ "mainProgram" ]) // {
+ meta = (removeAttrs kubo-migrator-unwrapped.meta [ "mainProgram" ]) // {
description = "Several individual migrations for migrating the filesystem repository of Kubo one version at a time";
longDescription = ''
This package contains all the individual migrations in the bin directory.
diff --git a/pkgs/by-name/ld/ld-audit-search-mod/package.nix b/pkgs/by-name/ld/ld-audit-search-mod/package.nix
index 6ad048662edb..0f88d156b38a 100644
--- a/pkgs/by-name/ld/ld-audit-search-mod/package.nix
+++ b/pkgs/by-name/ld/ld-audit-search-mod/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
cmakeFlags = [
- (lib.cmakeFeature "NIX_RTLD_NAME" (builtins.baseNameOf stdenv.cc.bintools.dynamicLinker))
+ (lib.cmakeFeature "NIX_RTLD_NAME" (baseNameOf stdenv.cc.bintools.dynamicLinker))
(lib.cmakeFeature "NIX_STORE_DIR" storeDir)
];
diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index 42edb65b2f10..fae35a66143b 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
let
pname = "ledger-live-desktop";
- version = "2.128.1";
+ version = "2.130.0";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
- hash = "sha256-qJuvpzBeGlB4nAu7vLDcppzeleo/7vxC5MrxCBqlsKM=";
+ hash = "sha256-llI3J/7fPnO5lrLe04VZQTVmJmPyY9vg1EXy6Pea+6s=";
};
appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix
index 828e81ed0812..3bb5229cdfab 100644
--- a/pkgs/by-name/le/lemminx/package.nix
+++ b/pkgs/by-name/le/lemminx/package.nix
@@ -86,7 +86,7 @@ maven.buildMavenPackage rec {
passthru = {
updateScript =
let
- pkgFile = builtins.toString ./package.nix;
+ pkgFile = toString ./package.nix;
in
lib.getExe (writeShellApplication {
name = "update-${pname}";
diff --git a/pkgs/by-name/li/lib3ds/package.nix b/pkgs/by-name/li/lib3ds/package.nix
index 3764dbdd0158..67f34436efe3 100644
--- a/pkgs/by-name/li/lib3ds/package.nix
+++ b/pkgs/by-name/li/lib3ds/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files";
homepage = "https://lib3ds.sourceforge.net/";
- license = "LGPL";
+ license = lib.licenses.lgpl2Only;
platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index 8a2573f94548..7382e1029ac2 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
- version = "2.14.0";
+ version = "2.16.0";
src = fetchFromGitHub {
owner = "chatmail";
repo = "core";
tag = "v${version}";
- hash = "sha256-oSTQcR7HE1YaVlNuSknG6JhoiiOjgNwAIaCecmLE7PY=";
+ hash = "sha256-QmDWTQjVc+ZhxQTj89tKcN5he6avriXZmFPN7EuvoUE=";
};
patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "chatmail-core";
inherit version src;
- hash = "sha256-9Dmll7os2cq3mxp30L9Nrx53QK1ZF7loozDg/XTs0UE=";
+ hash = "sha256-nPSWxbGuJ89j6ZfTp1jCF5iqxEgYMEohLxtayKzxGA4=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libdynd/package.nix b/pkgs/by-name/li/libdynd/package.nix
index 8bfc3412e341..37065b69fee8 100644
--- a/pkgs/by-name/li/libdynd/package.nix
+++ b/pkgs/by-name/li/libdynd/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
"-DDYND_BUILD_BENCHMARKS=OFF"
];
- env.NIX_CFLAGS_COMPILE = builtins.toString [
+ env.NIX_CFLAGS_COMPILE = toString [
# added to fix build with gcc7+
"-Wno-error=implicit-fallthrough"
"-Wno-error=nonnull"
diff --git a/pkgs/by-name/li/libmhash/package.nix b/pkgs/by-name/li/libmhash/package.nix
index c13761b2c69c..ce3706fe4e19 100644
--- a/pkgs/by-name/li/libmhash/package.nix
+++ b/pkgs/by-name/li/libmhash/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
which are based on hash algorithms.
'';
homepage = "https://mhash.sourceforge.net";
- license = "LGPL";
+ license = lib.licenses.lgpl2Only;
platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/by-name/li/libofx/package.nix b/pkgs/by-name/li/libofx/package.nix
index 7511ea6b63da..a5cbe80e7bf2 100644
--- a/pkgs/by-name/li/libofx/package.nix
+++ b/pkgs/by-name/li/libofx/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Opensource implementation of the Open Financial eXchange specification";
homepage = "https://libofx.sourceforge.net/";
- license = "LGPL";
+ license = lib.licenses.gpl2Only;
platforms = lib.platforms.unix;
maintainers = [ ];
};
diff --git a/pkgs/by-name/li/libpsl-with-scripts/package.nix b/pkgs/by-name/li/libpsl-with-scripts/package.nix
index cc31b95798f9..9338e74a9b03 100644
--- a/pkgs/by-name/li/libpsl-with-scripts/package.nix
+++ b/pkgs/by-name/li/libpsl-with-scripts/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
cd -
'';
links = lib.concatMapStrings (
- output: linkOutput libpsl.${output} (builtins.placeholder output)
+ output: linkOutput libpsl.${output} (placeholder output)
) libpsl.outputs;
in
''
diff --git a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix
index cde586922b7c..f9c578dca6f9 100644
--- a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix
+++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix
@@ -1,35 +1,30 @@
{
lib,
stdenv,
+ boost,
fetchFromGitHub,
cmake,
- zlib,
- boost,
openssl,
python3,
- ncurses,
}:
let
- version = "2.0.11";
-
# Make sure we override python, so the correct version is chosen
boostPython = boost.override {
enablePython = true;
python = python3;
};
-
in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
pname = "libtorrent-rasterbar";
- inherit version;
+ version = "2.0.11";
src = fetchFromGitHub {
owner = "arvidn";
repo = "libtorrent";
- tag = "v${version}";
- hash = "sha256-iph42iFEwP+lCWNPiOJJOejISFF6iwkGLY9Qg8J4tyo=";
+ tag = "v${finalAttrs.version}";
fetchSubmodules = true;
+ hash = "sha256-iph42iFEwP+lCWNPiOJJOejISFF6iwkGLY9Qg8J4tyo=";
};
nativeBuildInputs = [
@@ -52,9 +47,15 @@ stdenv.mkDerivation {
# https://github.com/arvidn/libtorrent/issues/6865
postPatch = ''
substituteInPlace cmake/Modules/GeneratePkgConfig/target-compile-settings.cmake.in \
- --replace-fail 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")' \
- 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")
- set(_INSTALL_FULL_LIBDIR "@CMAKE_INSTALL_FULL_LIBDIR@")'
+ --replace-fail \
+ 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")' \
+ 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")
+ set(_INSTALL_FULL_LIBDIR "@CMAKE_INSTALL_FULL_LIBDIR@")'
+ ''
+ # a: libdir=''${prefix}//nix/store/...
+ # b: libdir=/nix/store/...
+ # https://github.com/NixOS/nixpkgs/issues/144170
+ + ''
substituteInPlace cmake/Modules/GeneratePkgConfig/pkg-config.cmake.in \
--replace-fail '$'{prefix}/@_INSTALL_LIBDIR@ @_INSTALL_FULL_LIBDIR@
'';
@@ -67,6 +68,12 @@ stdenv.mkDerivation {
postFixup = ''
substituteInPlace "$dev/lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets-release.cmake" \
--replace-fail "\''${_IMPORT_PREFIX}/lib" "$out/lib"
+ ''
+ # a: Cflags: ... -I/nix/store/x//nix/store/x-dev/include ...
+ # b: Cflags: ... -I/nix/store/x-dev/include ...
+ + ''
+ substituteInPlace $dev/lib/pkgconfig/libtorrent-rasterbar.pc \
+ --replace-fail "$out/$dev" "$dev"
'';
outputs = [
@@ -76,14 +83,15 @@ stdenv.mkDerivation {
];
cmakeFlags = [
- "-Dpython-bindings=on"
+ (lib.cmakeBool "python-bindings" true)
];
- meta = with lib; {
+ meta = {
homepage = "https://libtorrent.org/";
- description = "C++ BitTorrent implementation focusing on efficiency and scalability";
- license = licenses.bsd3;
+ description = "Efficient feature complete C++ bittorrent implementation";
+ changelog = "https://github.com/arvidn/libtorrent/blob/${finalAttrs.src.tag}/ChangeLog";
+ license = lib.licenses.bsd3;
maintainers = [ ];
- platforms = platforms.unix;
+ platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/by-name/ll/llama-swap/ui.nix b/pkgs/by-name/ll/llama-swap/ui.nix
index 6a6ac83b4f6e..a54cf1382739 100644
--- a/pkgs/by-name/ll/llama-swap/ui.nix
+++ b/pkgs/by-name/ll/llama-swap/ui.nix
@@ -20,7 +20,7 @@ buildNpmPackage (finalAttrs: {
rm -rf $out/lib
'';
- meta = (builtins.removeAttrs llama-swap.meta [ "mainProgram" ]) // {
+ meta = (removeAttrs llama-swap.meta [ "mainProgram" ]) // {
description = "${llama-swap.meta.description} - UI";
};
})
diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix
index 92cab5748015..e4c969a6b776 100644
--- a/pkgs/by-name/lo/lock/package.nix
+++ b/pkgs/by-name/lo/lock/package.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lock";
- version = "1.7.6";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "konstantintutsch";
repo = "Lock";
tag = "v${finalAttrs.version}";
- hash = "sha256-DfHQKz+DuBnISsX4s0I4+3dvSsCDVGHYp5kcSaUrfjM=";
+ hash = "sha256-t472uLuuT5QPmfxkRP6wPalblMU68iD2wyKOxSrJfeU=";
};
strictDeps = true;
diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix
index 51dc07907881..d7fd84e0a78a 100644
--- a/pkgs/by-name/lu/luanti/package.nix
+++ b/pkgs/by-name/lu/luanti/package.nix
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
- gitUpdater,
substitute,
cmake,
coreutils,
@@ -35,6 +34,8 @@
buildServer ? true,
SDL2,
useSDL2 ? true,
+
+ nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -141,10 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true;
- passthru.updateScript = gitUpdater {
- allowedVersions = "\\.";
- ignoredVersions = "-android$";
- };
+ passthru.updateScript = nix-update-script { };
meta = with lib; {
homepage = "https://www.luanti.org/";
diff --git a/pkgs/by-name/lu/luarocks-packages-updater/package.nix b/pkgs/by-name/lu/luarocks-packages-updater/package.nix
index 153b371bdcde..cf41d472435e 100644
--- a/pkgs/by-name/lu/luarocks-packages-updater/package.nix
+++ b/pkgs/by-name/lu/luarocks-packages-updater/package.nix
@@ -25,7 +25,7 @@ let
luajit
];
- attrs = builtins.fromTOML (builtins.readFile ./pyproject.toml);
+ attrs = fromTOML (builtins.readFile ./pyproject.toml);
pname = attrs.project.name;
inherit (attrs.project) version;
in
diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix
index 5af6581ddc82..1b7cb2d98a08 100644
--- a/pkgs/by-name/lu/luau-lsp/package.nix
+++ b/pkgs/by-name/lu/luau-lsp/package.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "luau-lsp";
- version = "1.53.5";
+ version = "1.54.0";
src = fetchFromGitHub {
owner = "JohnnyMorganz";
repo = "luau-lsp";
tag = finalAttrs.version;
- hash = "sha256-T0zwaBR2KYD5kcoo7mPomNVIixz/8J6ZMJSjfeVnPEs=";
+ hash = "sha256-18r/NScWfSwAvFT46zdJsNYXoEW8FF34XyZajAaGb28=";
fetchSubmodules = true;
};
diff --git a/pkgs/by-name/ma/magma/package.nix b/pkgs/by-name/ma/magma/package.nix
index 9c5d762fd8eb..f3182f0b6eda 100644
--- a/pkgs/by-name/ma/magma/package.nix
+++ b/pkgs/by-name/ma/magma/package.nix
@@ -100,7 +100,7 @@ let
minArch =
let
# E.g. [ "80" "86" "90" ]
- cudaArchitectures = (builtins.map flags.dropDots flags.cudaCapabilities);
+ cudaArchitectures = (map flags.dropDots flags.cudaCapabilities);
minArch' = builtins.head (builtins.sort strings.versionOlder cudaArchitectures);
in
# "75" -> "750" Cf. https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L200-L201
diff --git a/pkgs/by-name/ma/matcha-gtk-theme/package.nix b/pkgs/by-name/ma/matcha-gtk-theme/package.nix
index 2f0f5d338649..9b6d4156f668 100644
--- a/pkgs/by-name/ma/matcha-gtk-theme/package.nix
+++ b/pkgs/by-name/ma/matcha-gtk-theme/package.nix
@@ -56,8 +56,8 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] col
mkdir -p $out/share/themes
name= ./install.sh \
- ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \
- ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \
+ ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \
+ ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \
--dest $out/share/themes
mkdir -p $out/share/doc/matcha-gtk-theme
diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix
index 6b4aa51d8de5..2e167b02a9df 100644
--- a/pkgs/by-name/ma/maven/build-maven-package.nix
+++ b/pkgs/by-name/ma/maven/build-maven-package.nix
@@ -71,13 +71,13 @@ let
+ lib.optionalString buildOffline ''
mvn $MAVEN_EXTRA_ARGS de.qaware.maven:go-offline-maven-plugin:1.2.8:resolve-dependencies -Dmaven.repo.local=$out/.m2 ${mvnDepsParameters}
- for artifactId in ${builtins.toString manualMvnArtifacts}
+ for artifactId in ${toString manualMvnArtifacts}
do
echo "downloading manual $artifactId"
mvn $MAVEN_EXTRA_ARGS dependency:get -Dartifact="$artifactId" -Dmaven.repo.local=$out/.m2
done
- for artifactId in ${builtins.toString manualMvnSources}
+ for artifactId in ${toString manualMvnSources}
do
group=$(echo $artifactId | cut -d':' -f1)
artifact=$(echo $artifactId | cut -d':' -f2)
@@ -115,7 +115,7 @@ let
);
in
stdenv.mkDerivation (
- builtins.removeAttrs args [ "mvnFetchExtraArgs" ]
+ removeAttrs args [ "mvnFetchExtraArgs" ]
// {
inherit fetchedMavenDeps;
diff --git a/pkgs/by-name/mc/mcp-nixos/package.nix b/pkgs/by-name/mc/mcp-nixos/package.nix
index 5263ca5546b6..fd990bd36647 100644
--- a/pkgs/by-name/mc/mcp-nixos/package.nix
+++ b/pkgs/by-name/mc/mcp-nixos/package.nix
@@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "mcp-nixos";
- version = "1.0.1";
+ version = "1.0.2";
pyproject = true;
src = fetchFromGitHub {
owner = "utensils";
repo = "mcp-nixos";
tag = "v${version}";
- hash = "sha256-NFy38FrU4N+bk4qGyRnrpf2AaBrlQyC9SyRbCLm/d9Y=";
+ hash = "sha256-SbmfP5Qo7liu39tTpIm6IC2qfwChooTYaPZiJqgwTzY=";
};
patches = [
diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index 52b186fcf432..1505f7c2a6b8 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -118,7 +118,7 @@ python3.pkgs.buildPythonApplication rec {
''
]
# Remove problematic tests
- ++ (builtins.map (f: ''rm -vr "${f}";'') (
+ ++ (map (f: ''rm -vr "${f}";'') (
[
# requires git, creating cyclic dependency
''test cases/common/66 vcstag''
diff --git a/pkgs/by-name/mf/mfcl5750dw/package.nix b/pkgs/by-name/mf/mfcl5750dw/package.nix
index 752edbc51b23..597330ef748c 100644
--- a/pkgs/by-name/mf/mfcl5750dw/package.nix
+++ b/pkgs/by-name/mf/mfcl5750dw/package.nix
@@ -113,7 +113,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
homepage = "https://www.brother.com/";
description = "Brother MFCL5750DW CUPS driver";
license = lib.licenses.unfree;
- platforms = builtins.map (arch: "${arch}-linux") arches;
+ platforms = map (arch: "${arch}-linux") arches;
maintainers = with lib.maintainers; [ qdlmcfresh ];
};
})
diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 1335eeada7e7..330851a5b5a6 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -162,11 +162,11 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "microsoft-edge";
- version = "140.0.3485.94";
+ version = "141.0.3537.57";
src = fetchurl {
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
- hash = "sha256-UvnAT87X9YMlyF1i9z7bBCWpz3CU2ZWe9hoABgGSXY8=";
+ hash = "sha256-xqHu6OdB6BFJVi+YmQJjMjh7CbL2m9drUHgtRVHBhrk=";
};
# With strictDeps on, some shebangs were not being patched correctly
@@ -216,9 +216,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
--replace-fail /usr/bin/microsoft-edge-$dist $exe
substituteInPlace $out/share/gnome-control-center/default-apps/microsoft-edge.xml \
--replace-fail /opt/microsoft/msedge $exe
- substituteInPlace $out/share/menu/microsoft-edge.menu \
- --replace-fail /opt $out/share \
- --replace-fail $out/share/microsoft/$appname/microsoft-edge $exe
for icon_file in $out/share/microsoft/msedge/product_logo_[0-9]*.png; do
num_and_suffix="''${icon_file##*logo_}"
diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix
index d854f28325e1..bfdd8f48fab6 100644
--- a/pkgs/by-name/mi/mission-center/package.nix
+++ b/pkgs/by-name/mi/mission-center/package.nix
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeInstallCheckInputs = [
versionCheckHook
];
- versionCheckProgram = "${builtins.placeholder "out"}/bin/missioncenter";
+ versionCheckProgram = "${placeholder "out"}/bin/missioncenter";
doInstallCheck = true;
postFixup = ''
diff --git a/pkgs/by-name/mi/mitm-cache/fetch.nix b/pkgs/by-name/mi/mitm-cache/fetch.nix
index 0136fb54f87b..6917bbeb8ce2 100644
--- a/pkgs/by-name/mi/mitm-cache/fetch.nix
+++ b/pkgs/by-name/mi/mitm-cache/fetch.nix
@@ -13,7 +13,7 @@
}@attrs:
let
- data' = builtins.removeAttrs (if builtins.isPath data then lib.importJSON data else data) [
+ data' = removeAttrs (if builtins.isPath data then lib.importJSON data else data) [
"!version"
];
@@ -59,7 +59,7 @@ let
);
in
runCommand name (
- builtins.removeAttrs attrs [
+ removeAttrs attrs [
"name"
"data"
]
diff --git a/pkgs/by-name/mo/mojave-gtk-theme/package.nix b/pkgs/by-name/mo/mojave-gtk-theme/package.nix
index b483b58f762c..3b7f5b99aa48 100644
--- a/pkgs/by-name/mo/mojave-gtk-theme/package.nix
+++ b/pkgs/by-name/mo/mojave-gtk-theme/package.nix
@@ -137,13 +137,11 @@ lib.checkListOfEnum "${pname}: button size variants" [ "standard" "small" ] butt
runHook preInstall
name= ./install.sh \
- ${
- lib.optionalString (buttonSizeVariants != [ ]) "--small " + builtins.toString buttonSizeVariants
- } \
- ${lib.optionalString (buttonVariants != [ ]) "--alt " + builtins.toString buttonVariants} \
- ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \
- ${lib.optionalString (opacityVariants != [ ]) "--opacity " + builtins.toString opacityVariants} \
- ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \
+ ${lib.optionalString (buttonSizeVariants != [ ]) "--small " + toString buttonSizeVariants} \
+ ${lib.optionalString (buttonVariants != [ ]) "--alt " + toString buttonVariants} \
+ ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \
+ ${lib.optionalString (opacityVariants != [ ]) "--opacity " + toString opacityVariants} \
+ ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \
--icon nixos \
--dest $out/share/themes
diff --git a/pkgs/by-name/mp/mpage/package.nix b/pkgs/by-name/mp/mpage/package.nix
index ef6cfa8e381d..3f247a65a37a 100644
--- a/pkgs/by-name/mp/mpage/package.nix
+++ b/pkgs/by-name/mp/mpage/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
ISO 8859.1 to print 8-bit characters.
'';
- license = "liberal"; # a non-copyleft license, see `Copyright' file
+ license = lib.licenses.gpl2Plus;
homepage = "http://www.mesa.nl/pub/mpage/";
platforms = lib.platforms.all;
};
diff --git a/pkgs/by-name/my/mylvmbackup/package.nix b/pkgs/by-name/my/mylvmbackup/package.nix
index b45d653fe045..d012ac3bbe22 100644
--- a/pkgs/by-name/my/mylvmbackup/package.nix
+++ b/pkgs/by-name/my/mylvmbackup/package.nix
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs mylvmbackup
substituteInPlace Makefile \
- --replace "prefix = /usr/local" "prefix = ${builtins.placeholder "out"}" \
- --replace "sysconfdir = /etc" "sysconfdir = ${builtins.placeholder "out"}/etc" \
+ --replace "prefix = /usr/local" "prefix = ${placeholder "out"}" \
+ --replace "sysconfdir = /etc" "sysconfdir = ${placeholder "out"}/etc" \
--replace "/usr/bin/install" "install"
'';
diff --git a/pkgs/by-name/n9/n98-magerun/package.nix b/pkgs/by-name/n9/n98-magerun/package.nix
deleted file mode 100644
index bd1c9aaf8b91..000000000000
--- a/pkgs/by-name/n9/n98-magerun/package.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- lib,
- fetchFromGitHub,
- php81,
- nix-update-script,
-}:
-
-php81.buildComposerProject2 (finalAttrs: {
- pname = "n98-magerun";
- version = "2.3.0";
-
- src = fetchFromGitHub {
- owner = "netz98";
- repo = "n98-magerun";
- tag = finalAttrs.version;
- hash = "sha256-/RffdYgl2cs8mlq4vHtzUZ6j0viV8Ot/cB/cB1dstFM=";
- };
-
- vendorHash = "sha256-huYLbqJaxeSST2WGcSdk4gR3d3KWSkIK/6tzVpCw0oQ=";
-
- passthru.updateScript = nix-update-script {
- # Excludes 1.x versions from the Github tags list
- extraArgs = [
- "--version-regex"
- "^(2\\.(.*))"
- ];
- };
-
- meta = {
- changelog = "https://magerun.net/category/magerun/";
- description = "Swiss army knife for Magento1/OpenMage developers";
- homepage = "https://magerun.net/";
- license = lib.licenses.mit;
- mainProgram = "n98-magerun";
- teams = [ lib.teams.php ];
- };
-})
diff --git a/pkgs/by-name/na/nafees/package.nix b/pkgs/by-name/na/nafees/package.nix
index 3e5af2873cff..a2e8bb096ede 100644
--- a/pkgs/by-name/na/nafees/package.nix
+++ b/pkgs/by-name/na/nafees/package.nix
@@ -61,7 +61,10 @@ stdenv.mkDerivation {
# Used to be GPLv2. The license distributed with the fonts looks
# more like a modified BSD, but still contains the GPLv2 embedded
# font exception, and some not-for-resale language.
- license = "unknown";
+ license = {
+ fullName = "Nafees License Agreement";
+ url = "https://www.cle.org.pk/software/license/Nafees_Pakistani_Naskh_License.html";
+ };
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ bergey ];
};
diff --git a/pkgs/by-name/ne/neko/package.nix b/pkgs/by-name/ne/neko/package.nix
index 1de5f938e47b..b3e654b72396 100644
--- a/pkgs/by-name/ne/neko/package.nix
+++ b/pkgs/by-name/ne/neko/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
lib.licenses.zlib # zlib.ndll
lib.licenses.asl20 # mod_neko, mod_tora, mbedTLS
lib.licenses.mit # overall, other libs
- "https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE#L24-L40" # boehm gc
+ lib.licenses.boehmGC # boehm gc
];
maintainers = with lib.maintainers; [
marcweber
diff --git a/pkgs/by-name/ne/nemo-with-extensions/package.nix b/pkgs/by-name/ne/nemo-with-extensions/package.nix
index 52c081c774c8..9bdf5deba5ca 100644
--- a/pkgs/by-name/ne/nemo-with-extensions/package.nix
+++ b/pkgs/by-name/ne/nemo-with-extensions/package.nix
@@ -54,7 +54,7 @@ symlinkJoin {
done
'';
- meta = builtins.removeAttrs nemo.meta [
+ meta = removeAttrs nemo.meta [
"name"
"outputsToInstall"
"position"
diff --git a/pkgs/by-name/ne/neverball/package.nix b/pkgs/by-name/ne/neverball/package.nix
index d56ee11a81e7..9526c928c514 100644
--- a/pkgs/by-name/ne/neverball/package.nix
+++ b/pkgs/by-name/ne/neverball/package.nix
@@ -67,7 +67,12 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://neverball.org/";
description = "Tilt the floor to roll a ball";
- license = "GPL";
+ license = with lib.licenses; [
+ gpl2Plus
+ ijg
+ mit
+ gpl3Only
+ ];
maintainers = [ ];
platforms = with lib.platforms; linux;
};
diff --git a/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix
index 09b50753bcfe..a210f22844c6 100644
--- a/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix
+++ b/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix
@@ -16,7 +16,7 @@ nim-unwrapped-2.overrideAttrs (
patches =
builtins.filter (
p:
- builtins.elem (builtins.baseNameOf p) [
+ builtins.elem (baseNameOf p) [
"NIM_CONFIG_DIR.patch"
"nixbuild.patch"
]
diff --git a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix
index 168dacbff336..e459351c676d 100644
--- a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix
+++ b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix
@@ -15,7 +15,7 @@ nim-unwrapped-2_2.overrideAttrs (
patches = lib.lists.unique (
builtins.filter (
p:
- builtins.elem (builtins.baseNameOf p) [
+ builtins.elem (baseNameOf p) [
"NIM_CONFIG_DIR.patch"
"nixbuild.patch"
"extra-mangling.patch"
diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix
index 2da30a868854..e37cba924edc 100644
--- a/pkgs/by-name/ni/nix-required-mounts/package.nix
+++ b/pkgs/by-name/ni/nix-required-mounts/package.nix
@@ -28,7 +28,7 @@
}:
let
- attrs = builtins.fromTOML (builtins.readFile ./pyproject.toml);
+ attrs = fromTOML (builtins.readFile ./pyproject.toml);
pname = attrs.project.name;
inherit (attrs.project) version;
in
diff --git a/pkgs/by-name/ni/nixos-init/package.nix b/pkgs/by-name/ni/nixos-init/package.nix
index b34f6d570899..aab7354c8856 100644
--- a/pkgs/by-name/ni/nixos-init/package.nix
+++ b/pkgs/by-name/ni/nixos-init/package.nix
@@ -7,7 +7,7 @@
}:
let
- cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
+ cargoToml = fromTOML (builtins.readFile ./Cargo.toml);
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = cargoToml.package.name;
diff --git a/pkgs/by-name/ni/nixpkgs-hammering/package.nix b/pkgs/by-name/ni/nixpkgs-hammering/package.nix
index 2b48d6453da5..97364eeb7f90 100644
--- a/pkgs/by-name/ni/nixpkgs-hammering/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-hammering/package.nix
@@ -2,71 +2,45 @@
lib,
fetchFromGitHub,
rustPlatform,
- stdenv,
makeWrapper,
- python3,
nix,
unstableGitUpdater,
}:
-
-let
- version = "0-unstable-2025-02-09";
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "nixpkgs-hammering";
+ version = "0-unstable-2025-09-10";
src = fetchFromGitHub {
owner = "jtojnar";
repo = "nixpkgs-hammering";
- rev = "df77e6533c21737e5976c6fe4a4d81d7dcfc3e0e";
- hash = "sha256-Nr/4WcBMA/fc9WfNECB/nM85JfT2xwQYwS7Jq6rGKoM=";
+ rev = "8cb86601cfa5521b454974d7219924f2d1c304c9";
+ hash = "sha256-9rSdimO591tpfe3MpcHkqsc0lPk6roNwgj6ajVSOG7E=";
};
- meta = with lib; {
- description = "Set of nit-picky rules that aim to point out and explain common mistakes in nixpkgs package pull requests";
- homepage = "https://github.com/jtojnar/nixpkgs-hammering";
- license = licenses.mit;
- maintainers = with maintainers; [ figsoda ];
- };
-
- rust-checks = rustPlatform.buildRustPackage {
- pname = "nixpkgs-hammering-rust-checks";
- inherit version src meta;
- sourceRoot = "${src.name}/rust-checks";
-
- cargoHash = "sha256-cE1fzdxGa0WG2WCPs8UFnE2vzaKfU7r6LS+9HLCVJ1U=";
- };
-in
-
-stdenv.mkDerivation {
- pname = "nixpkgs-hammering";
-
- inherit version src;
+ cargoHash = "sha256-MRwmeR5rj0PWUF5VMW5+9BbcX7Pq82YhufUv2Gt107U=";
nativeBuildInputs = [ makeWrapper ];
+ postInstall = ''
+ datadir="$out/share/nixpkgs-hammering"
+ mkdir -p "$datadir"
- buildInputs = [ python3 ];
-
- installPhase = ''
- runHook preInstall
-
- AST_CHECK_NAMES=$(find ${rust-checks}/bin -maxdepth 1 -type f -printf "%f:")
-
- install -Dt $out/bin tools/nixpkgs-hammer
- wrapProgram $out/bin/nixpkgs-hammer \
- --prefix PATH : ${
- lib.makeBinPath [
- nix
- rust-checks
- ]
- } \
- --set AST_CHECK_NAMES ''${AST_CHECK_NAMES%:}
-
- cp -r lib overlays $out
-
- runHook postInstall
+ wrapProgram "$out/bin/nixpkgs-hammer" \
+ --prefix PATH ":" ${lib.makeBinPath [ nix ]} \
+ --set OVERLAYS_DIR "$datadir/overlays"
+ cp -r ./overlays "$datadir/overlays"
+ cp -r ./lib "$datadir/lib"
'';
+ # running checks requires to run nix inside of the builder which fails due to permission errors
+ doCheck = false;
+
passthru.updateScript = unstableGitUpdater { };
- meta = meta // {
+ meta = {
+ description = "Set of nit-picky rules that aim to point out and explain common mistakes in nixpkgs package pull requests";
+ homepage = "https://github.com/jtojnar/nixpkgs-hammering";
+ license = lib.licenses.mit;
mainProgram = "nixpkgs-hammer";
+ maintainers = with lib.maintainers; [ figsoda ];
};
-}
+})
diff --git a/pkgs/by-name/oc/ocaml_make/package.nix b/pkgs/by-name/oc/ocaml_make/package.nix
index 0d41e59be0fe..0f1431e07418 100644
--- a/pkgs/by-name/oc/ocaml_make/package.nix
+++ b/pkgs/by-name/oc/ocaml_make/package.nix
@@ -29,7 +29,11 @@ stdenv.mkDerivation {
meta = {
homepage = "http://www.ocaml.info/home/ocaml_sources.html";
description = "Generic OCaml Makefile for GNU Make";
- license = "LGPL";
+ license = with lib.licenses; [
+ lgpl21Only
+ ocamlLgplLinkingException
+ gpl3Only
+ ];
platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 63af415a6d6d..0fc029c214c1 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -179,7 +179,7 @@ goBuild (finalAttrs: {
in
if matched == null then str else builtins.head matched;
- cudaArchitectures = builtins.concatStringsSep ";" (builtins.map removeSMPrefix cudaArches);
+ cudaArchitectures = builtins.concatStringsSep ";" (map removeSMPrefix cudaArches);
rocmTargets = builtins.concatStringsSep ";" rocmGpuTargets;
cmakeFlagsCudaArchitectures = lib.optionalString enableCuda "-DCMAKE_CUDA_ARCHITECTURES='${cudaArchitectures}'";
diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix
index 03ec4393af1c..2710fd3f7482 100644
--- a/pkgs/by-name/op/opa-envoy-plugin/package.nix
+++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix
@@ -10,7 +10,7 @@
assert
enableWasmEval && stdenv.hostPlatform.isDarwin
- -> builtins.throw "building with wasm on darwin is failing in nixpkgs";
+ -> throw "building with wasm on darwin is failing in nixpkgs";
buildGoModule rec {
pname = "opa-envoy-plugin";
diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index 790e1b81741b..1516eaf56a78 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -10,7 +10,7 @@
assert
enableWasmEval && stdenv.hostPlatform.isDarwin
- -> builtins.throw "building with wasm on darwin is failing in nixpkgs";
+ -> throw "building with wasm on darwin is failing in nixpkgs";
buildGoModule (finalAttrs: {
pname = "open-policy-agent";
diff --git a/pkgs/by-name/op/openipmi/package.nix b/pkgs/by-name/op/openipmi/package.nix
index 0aec715128c1..fada75ad48cb 100644
--- a/pkgs/by-name/op/openipmi/package.nix
+++ b/pkgs/by-name/op/openipmi/package.nix
@@ -1,5 +1,6 @@
{
stdenv,
+ buildPackages,
fetchurl,
popt,
ncurses,
@@ -18,6 +19,17 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xi049dp99Cmaw6ZSUI6VlTd1JEAYHjTHayrs69fzAbk=";
};
+ postConfigure = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ substituteInPlace lanserv/Makefile \
+ --replace-fail "sdrcomp/sdrcomp_build -o" "${buildPackages.openipmi}/bin/sdrcomp -o"
+ '';
+
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ python3
+ ];
+
buildInputs = [
ncurses
popt
@@ -26,6 +38,10 @@ stdenv.mkDerivation rec {
openssl
];
+ makeFlags = [
+ "BUILD_CC=${stdenv.cc.targetPrefix}cc"
+ ];
+
outputs = [
"out"
"lib"
diff --git a/pkgs/by-name/op/openscenegraph/package.nix b/pkgs/by-name/op/openscenegraph/package.nix
index b1f9dcb63d9a..9fddd9562b7a 100644
--- a/pkgs/by-name/op/openscenegraph/package.nix
+++ b/pkgs/by-name/op/openscenegraph/package.nix
@@ -147,6 +147,9 @@ stdenv.mkDerivation rec {
raskin
];
platforms = with platforms; linux ++ darwin;
- license = "OpenSceneGraph Public License - free LGPL-based license";
+ license = with lib.licenses; [
+ lgpl21Only
+ wxWindowsException31
+ ];
};
}
diff --git a/pkgs/by-name/op/openutau/update.sh b/pkgs/by-name/op/openutau/update.sh
index d073923c933a..b129cca96e06 100755
--- a/pkgs/by-name/op/openutau/update.sh
+++ b/pkgs/by-name/op/openutau/update.sh
@@ -19,7 +19,7 @@ nixbuildscript() {
findpath() {
path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
- outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
+ outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "fetchGit \"$nixpkgs\"")"
if [ -n "$outpath" ]; then
path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}"
diff --git a/pkgs/by-name/or/orchis-theme/package.nix b/pkgs/by-name/or/orchis-theme/package.nix
index af74db27205d..5ba9ce8ec43e 100644
--- a/pkgs/by-name/or/orchis-theme/package.nix
+++ b/pkgs/by-name/or/orchis-theme/package.nix
@@ -63,10 +63,8 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks
installPhase = ''
runHook preInstall
bash install.sh -d $out/share/themes -t all \
- ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \
- ${lib.optionalString (border-radius != null) (
- "--round " + builtins.toString border-radius + "px"
- )}
+ ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \
+ ${lib.optionalString (border-radius != null) ("--round " + toString border-radius + "px")}
${lib.optionalString withWallpapers ''
mkdir -p $out/share/backgrounds
cp src/wallpaper/{1080p,2k,4k}.jpg $out/share/backgrounds
diff --git a/pkgs/by-name/os/osgqt/package.nix b/pkgs/by-name/os/osgqt/package.nix
index 12e88648edd8..b672cf61cdb5 100644
--- a/pkgs/by-name/os/osgqt/package.nix
+++ b/pkgs/by-name/os/osgqt/package.nix
@@ -42,7 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Qt bindings for OpenSceneGraph";
homepage = "https://github.com/openscenegraph/osgQt";
- license = "OpenSceneGraph Public License - free LGPL-based license";
+ license = with lib.licenses; [
+ lgpl21Only
+ wxWindowsException31
+ ];
maintainers = [ lib.maintainers.nim65s ];
platforms = lib.platforms.unix;
};
diff --git a/pkgs/by-name/ov/ovhcloud-cli/package.nix b/pkgs/by-name/ov/ovhcloud-cli/package.nix
new file mode 100644
index 000000000000..98bf05847bb5
--- /dev/null
+++ b/pkgs/by-name/ov/ovhcloud-cli/package.nix
@@ -0,0 +1,47 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+ installShellFiles,
+ testers,
+}:
+
+buildGoModule (finalAttrs: {
+ pname = "ovhcloud-cli";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "ovh";
+ repo = "ovhcloud-cli";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-vf8z2jOcN76BIS6AamWxrBIVUMxlerd4dNwVxpuxQZg=";
+ };
+
+ vendorHash = "sha256-WNONEceR/cDVloosQ/BMYjPTk9elQ1oTX89lgzENSAI=";
+
+ env.CGO_ENABLED = 0;
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X github.com/ovh/ovhcloud-cli/internal/version.Version=${finalAttrs.version}"
+ ];
+
+ excludedPackages = [ "cmd/docgen" ];
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ passthru.tests.version = testers.testVersion {
+ package = finalAttrs.finalPackage;
+ command = "ovhcloud version";
+ };
+
+ meta = {
+ homepage = "https://github.com/ovh/ovhcloud-cli";
+ changelog = "https://github.com/ovh/ovhcloud-cli/releases/tag/v${finalAttrs.version}";
+ description = "Command Line Interface to manage your OVHcloud services";
+ mainProgram = "ovhcloud";
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.anthonyroussel ];
+ };
+})
diff --git a/pkgs/by-name/ox/oxker/package.nix b/pkgs/by-name/ox/oxker/package.nix
index 3ede127f6f52..4741fd5b4726 100644
--- a/pkgs/by-name/ox/oxker/package.nix
+++ b/pkgs/by-name/ox/oxker/package.nix
@@ -1,5 +1,6 @@
{
lib,
+ stdenv,
fetchCrate,
rustPlatform,
nix-update-script,
@@ -7,14 +8,20 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "oxker";
- version = "0.11.1";
+ version = "0.12.0";
src = fetchCrate {
inherit (finalAttrs) pname version;
- hash = "sha256-YJe1WiKlvExrcpB8LZSLzrLcMaw84oL4OoHSRo+lqRo=";
+ hash = "sha256-cTusvvxr2ec2Qy6iWwGRmPcvGpRMOKxzrAx/qRvj+BE=";
};
- cargoHash = "sha256-V/9s5T+Ofkt22hmjxxFtgkDBdwfeyFUr98xXChrFKwM=";
+ cargoHash = "sha256-X5iNAwp0DcXoT82ZLq37geifztvJ/zZgOgM3SycAazA=";
+
+ checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
+ "--skip ui::draw_blocks::help::tests::test_draw_blocks_help_custom_keymap_one_definition"
+ "--skip ui::draw_blocks::help::tests::test_draw_blocks_help_custom_keymap_two_definitions"
+ "--skip ui::draw_blocks::help::tests::test_draw_blocks_help_one_and_two_definitions"
+ ];
passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/pa/paratype-pt-mono/package.nix b/pkgs/by-name/pa/paratype-pt-mono/package.nix
index 10c2c8ec3372..85df4d37804f 100644
--- a/pkgs/by-name/pa/paratype-pt-mono/package.nix
+++ b/pkgs/by-name/pa/paratype-pt-mono/package.nix
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation {
homepage = "http://www.paratype.ru/public/";
description = "Open Paratype font";
- license = "Open Paratype license";
+ license = lib.licenses.paratype;
# no commercial distribution of the font on its own
# must rename on modification
# http://www.paratype.ru/public/pt_openlicense.asp
diff --git a/pkgs/by-name/pa/paratype-pt-sans/package.nix b/pkgs/by-name/pa/paratype-pt-sans/package.nix
index 97e0d2fa4bf1..cfc0811db164 100644
--- a/pkgs/by-name/pa/paratype-pt-sans/package.nix
+++ b/pkgs/by-name/pa/paratype-pt-sans/package.nix
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation {
homepage = "http://www.paratype.ru/public/";
description = "Open Paratype font";
- license = "Open Paratype license";
+ license = lib.licenses.paratype;
# no commercial distribution of the font on its own
# must rename on modification
# http://www.paratype.ru/public/pt_openlicense.asp
diff --git a/pkgs/by-name/pa/paratype-pt-serif/package.nix b/pkgs/by-name/pa/paratype-pt-serif/package.nix
index 86732b19d737..eb20bf598f7c 100644
--- a/pkgs/by-name/pa/paratype-pt-serif/package.nix
+++ b/pkgs/by-name/pa/paratype-pt-serif/package.nix
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation {
homepage = "http://www.paratype.ru/public/";
description = "Open Paratype font";
- license = "Open Paratype license";
+ license = lib.licenses.paratype;
# no commercial distribution of the font on its own
# must rename on modification
# http://www.paratype.ru/public/pt_openlicense.asp
diff --git a/pkgs/by-name/ph/phase-cli/package.nix b/pkgs/by-name/ph/phase-cli/package.nix
index 445231c0ec40..c748ee0a0952 100644
--- a/pkgs/by-name/ph/phase-cli/package.nix
+++ b/pkgs/by-name/ph/phase-cli/package.nix
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "phase-cli";
- version = "1.19.6";
+ version = "1.20.0";
pyproject = true;
src = fetchFromGitHub {
owner = "phasehq";
repo = "cli";
tag = "v${version}";
- hash = "sha256-SOFMTetw5kEduV7ufY1v2vnv3exDEmnCFBr9q83YVTo=";
+ hash = "sha256-vhjDXQutRdkeeId2shPWFtoZGH6FXvQcWhH8MLe9JqI=";
};
build-system = with python3Packages; [
diff --git a/pkgs/by-name/pi/pigpio/package.nix b/pkgs/by-name/pi/pigpio/package.nix
index 41b85cc445e6..796847528482 100644
--- a/pkgs/by-name/pi/pigpio/package.nix
+++ b/pkgs/by-name/pi/pigpio/package.nix
@@ -7,8 +7,7 @@
}:
let
- mkDerivation =
- if builtins.isNull buildPythonPackage then stdenv.mkDerivation else buildPythonPackage;
+ mkDerivation = if isNull buildPythonPackage then stdenv.mkDerivation else buildPythonPackage;
in
mkDerivation rec {
pname = "pigpio";
diff --git a/pkgs/by-name/pi/pihole/package.nix b/pkgs/by-name/pi/pihole/package.nix
index 73362403c25f..93b327eae971 100644
--- a/pkgs/by-name/pi/pihole/package.nix
+++ b/pkgs/by-name/pi/pihole/package.nix
@@ -72,7 +72,7 @@
solutions.default =
let
- out = builtins.placeholder "out";
+ out = placeholder "out";
scriptsDir = "${out}/share/pihole/advanced/Scripts";
in
{
diff --git a/pkgs/by-name/pi/pixinsight/package.nix b/pkgs/by-name/pi/pixinsight/package.nix
index 212512ef17b9..21e9fb9c924c 100644
--- a/pkgs/by-name/pi/pixinsight/package.nix
+++ b/pkgs/by-name/pi/pixinsight/package.nix
@@ -162,7 +162,7 @@ stdenv.mkDerivation (finalAttrs: {
];
dontWrapQtApps = true;
postFixup = ''
- wrapProgram $out/opt/PixInsight/bin/PixInsight ${builtins.toString finalAttrs.qtWrapperArgs}
+ wrapProgram $out/opt/PixInsight/bin/PixInsight ${toString finalAttrs.qtWrapperArgs}
'';
meta = with lib; {
diff --git a/pkgs/by-name/pl/plymouth/package.nix b/pkgs/by-name/pl/plymouth/package.nix
index ee52b762baaa..63e5f9d65f1c 100644
--- a/pkgs/by-name/pl/plymouth/package.nix
+++ b/pkgs/by-name/pl/plymouth/package.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
rm -r "$DESTDIR/''${!o}"
done
# Ensure the DESTDIR is removed.
- rmdir "$DESTDIR/${builtins.storeDir}" "$DESTDIR/${builtins.dirOf builtins.storeDir}" "$DESTDIR"
+ rmdir "$DESTDIR/${builtins.storeDir}" "$DESTDIR/${dirOf builtins.storeDir}" "$DESTDIR"
'';
# HACK: We want to install configuration files to $out/etc
diff --git a/pkgs/by-name/pm/pmacct/package.nix b/pkgs/by-name/pm/pmacct/package.nix
index b7124af8a101..97f9a078c631 100644
--- a/pkgs/by-name/pm/pmacct/package.nix
+++ b/pkgs/by-name/pm/pmacct/package.nix
@@ -8,6 +8,8 @@
libpcap,
libcdada,
# Optional Dependencies
+ withKafka ? true,
+ rdkafka,
withJansson ? true,
jansson,
withNflog ? true,
@@ -45,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
libcdada
libpcap
]
+ ++ lib.optional withKafka rdkafka
++ lib.optional withJansson jansson
++ lib.optional withNflog libnetfilter_log
++ lib.optional withSQLite sqlite
@@ -61,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
configureFlags = [
"--with-pcap-includes=${libpcap}/include"
]
+ ++ lib.optional withKafka "--enable-kafka"
++ lib.optional withJansson "--enable-jansson"
++ lib.optional withNflog "--enable-nflog"
++ lib.optional withSQLite "--enable-sqlite3"
diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index 25afdcbf3ad0..87aaec7f1d78 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
];
runtimeEnv = {
PNAME = "podman-desktop";
- PKG_FILE = builtins.toString ./package.nix;
+ PKG_FILE = toString ./package.nix;
};
text = ''
new_src="$(nix-build --attr "pkgs.$PNAME.src" --no-out-link)"
diff --git a/pkgs/by-name/po/postfixadmin/package.nix b/pkgs/by-name/po/postfixadmin/package.nix
deleted file mode 100644
index eeb9928e2b7a..000000000000
--- a/pkgs/by-name/po/postfixadmin/package.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- fetchFromGitHub,
- stdenv,
- lib,
- nixosTests,
-}:
-
-stdenv.mkDerivation rec {
- pname = "postfixadmin";
- version = "3.3.16";
-
- src = fetchFromGitHub {
- owner = "postfixadmin";
- repo = "postfixadmin";
- tag = "postfixadmin-${version}";
- hash = "sha256-sSn5XHxnpP2Axv9BD9IvzSmu8MthcylEPk1kU51p/3k=";
- };
-
- installPhase = ''
- runHook preInstall
-
- mkdir $out
- cp -r * $out/
- ln -sf /etc/postfixadmin/config.local.php $out/
- ln -sf /var/cache/postfixadmin/templates_c $out/
-
- runHook postInstall
- '';
-
- passthru.tests = { inherit (nixosTests) postfixadmin; };
-
- meta = {
- changelog = "https://github.com/postfixadmin/postfixadmin/releases/tag/${src.tag}";
- description = "Web based virtual user administration interface for Postfix mail servers";
- homepage = "https://postfixadmin.sourceforge.io/";
- maintainers = with lib.maintainers; [ globin ];
- license = lib.licenses.gpl2Plus;
- platforms = lib.platforms.all;
- };
-}
diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix
index ee3467f2fc46..895959038d04 100644
--- a/pkgs/by-name/pr/prek/package.nix
+++ b/pkgs/by-name/pr/prek/package.nix
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
# some python tests use uv, which in turn needs python
UV_PYTHON = "${python312}/bin/python";
- checkFlags = builtins.map (t: "--skip ${t}") [
+ checkFlags = map (t: "--skip ${t}") [
# these tests require internet access
"check_added_large_files_hook"
"check_json_hook"
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/by-name/pr/prl-tools/package.nix
similarity index 80%
rename from pkgs/os-specific/linux/prl-tools/default.nix
rename to pkgs/by-name/pr/prl-tools/package.nix
index 1f9cf0e7651c..7c78f14257bb 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/by-name/pr/prl-tools/package.nix
@@ -1,32 +1,28 @@
{
- lib,
- stdenv,
- fetchurl,
autoPatchelfHook,
+ bash,
bbe,
+ coreutils,
+ cups,
+ dbus,
+ fetchurl,
+ fuse,
+ gawk,
+ glib,
+ lib,
makeWrapper,
+ netcat,
p7zip,
perl,
- undmg,
- dbus-glib,
- fuse,
- glib,
- xorg,
- zlib,
- kernel,
- bash,
- cups,
- gawk,
- netcat,
+ stdenv,
timetrap,
+ undmg,
util-linux,
wayland,
+ xorg,
}:
let
- kernelVersion = kernel.modDirVersion;
- kernelDir = "${kernel.dev}/lib/modules/${kernelVersion}";
-
libPath = lib.concatStringsSep ":" [
"${glib.out}/lib"
"${xorg.libXrandr}/lib"
@@ -34,6 +30,7 @@ let
];
scriptPath = lib.concatStringsSep ":" [
"${bash}/bin"
+ "${coreutils}/bin"
"${cups}/sbin"
"${gawk}/bin"
"${netcat}/bin"
@@ -43,13 +40,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "prl-tools";
- version = "26.0.1-57243";
+ version = "26.1.1-57288";
# We download the full distribution to extract prl-tools-lin.iso from
# => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
src = fetchurl {
url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
- hash = "sha256-jAOP9g3JCKxOFyiDdYJvvM9ecGDbMuCARCEu4sE7Cfs=";
+ hash = "sha256-11IyKI2oOffzSPTB65XksZI3PD9W2+0SPZIfpb0RLuU=";
};
hardeningDisable = [
@@ -64,11 +61,9 @@ stdenv.mkDerivation (finalAttrs: {
p7zip
perl
undmg
- ]
- ++ kernel.moduleBuildDependencies;
+ ];
buildInputs = [
- dbus-glib
fuse
glib
xorg.libX11
@@ -77,10 +72,10 @@ stdenv.mkDerivation (finalAttrs: {
xorg.libXrandr
xorg.libXi
xorg.libXinerama
- zlib
];
runtimeDependencies = [
+ dbus
glib
xorg.libXrandr
];
@@ -91,36 +86,14 @@ stdenv.mkDerivation (finalAttrs: {
undmg $src
export sourceRoot=prl-tools-build
7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin${lib.optionalString stdenv.hostPlatform.isAarch64 "-arm"}.iso" -o$sourceRoot
- ( cd $sourceRoot/kmods; tar -xaf prl_mod.tar.gz )
-
runHook postUnpack
'';
- buildPhase = ''
- runHook preBuild
-
- ( # kernel modules
- cd kmods
- make -f Makefile.kmods \
- KSRC=${kernelDir}/source \
- HEADERS_CHECK_DIR=${kernelDir}/source \
- KERNEL_DIR=${kernelDir}/build \
- SRC=${kernelDir}/build \
- KVER=${kernelVersion}
- )
-
- runHook postBuild
- '';
+ dontBuild = true;
installPhase = ''
runHook preInstall
- ( # kernel modules
- cd kmods
- mkdir -p $out/lib/modules/${kernelVersion}/extra
- cp prl_tg/Toolgate/Guest/Linux/prl_tg/prl_tg.ko $out/lib/modules/${kernelVersion}/extra
- )
-
( # tools
cd tools/tools${
if stdenv.hostPlatform.isAarch64 then
@@ -139,6 +112,10 @@ stdenv.mkDerivation (finalAttrs: {
rm -f bin/prltoolsd
mv bin/prltoolsd.tmp bin/prltoolsd
+ # replace hardcoded /usr/bin/prl_fsd
+ substituteInPlace ../mount.fuse.prl_fsd \
+ --replace-fail "/usr/bin/prl_fsd" "$out/bin/prl_fsd"
+
# install binaries
for i in bin/* sbin/prl_nettool sbin/prl_snapshot; do
# also patch binaries to replace /usr/bin/XXX to XXX
@@ -156,6 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
install -Dm755 $i $out/$i
done
+ install -Dm755 ../../tools/mount.fuse.prl_fsd $out/sbin/mount.fuse.prl_fsd
install -Dm755 ../../tools/prlfsmountd.sh $out/sbin/prlfsmountd
install -Dm755 ../../tools/prlbinfmtconfig.sh $out/sbin/prlbinfmtconfig
for f in $out/bin/* $out/sbin/*; do
@@ -170,7 +148,7 @@ stdenv.mkDerivation (finalAttrs: {
done
substituteInPlace ../99prltoolsd-hibernate \
- --replace "/bin/bash" "${bash}/bin/bash"
+ --replace-fail "/bin/bash" "${bash}/bin/bash"
mkdir -p $out/etc/pm/sleep.d
install -Dm644 ../99prltoolsd-hibernate $out/etc/pm/sleep.d
diff --git a/pkgs/os-specific/linux/prl-tools/update.sh b/pkgs/by-name/pr/prl-tools/update.sh
similarity index 97%
rename from pkgs/os-specific/linux/prl-tools/update.sh
rename to pkgs/by-name/pr/prl-tools/update.sh
index c6999c494d01..cd2a9ff22b57 100755
--- a/pkgs/os-specific/linux/prl-tools/update.sh
+++ b/pkgs/by-name/pr/prl-tools/update.sh
@@ -4,7 +4,7 @@
set -eu -o pipefail
nixpkgs="$(git rev-parse --show-toplevel)"
-path="$nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix"
+path="$nixpkgs/pkgs/by-name/pr/prl-tools/default.nix"
# Currently this script only supports Parallels 26
# Please change the knowledge base url after each major release
diff --git a/pkgs/by-name/pr/prowlarr/update.py b/pkgs/by-name/pr/prowlarr/update.py
index aeee96d2c280..4bb133688138 100644
--- a/pkgs/by-name/pr/prowlarr/update.py
+++ b/pkgs/by-name/pr/prowlarr/update.py
@@ -53,7 +53,7 @@ package_attrs = json.loads(subprocess.run(
"--json",
"--file", nixpkgs_path,
"--apply", """p: {
- dir = builtins.dirOf p.meta.position;
+ dir = dirOf p.meta.position;
version = p.version;
sourceHash = p.src.src.outputHash;
yarnHash = p.yarnOfflineCache.outputHash;
diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix
index aa6d2f68966c..fe56d2b32d66 100644
--- a/pkgs/by-name/pu/pulsar/package.nix
+++ b/pkgs/by-name/pu/pulsar/package.nix
@@ -78,7 +78,7 @@ let
];
# Hunspell
- hunspellDirs = builtins.map (lang: "${hunspellDicts.${lang}}/share/hunspell") languages;
+ hunspellDirs = map (lang: "${hunspellDicts.${lang}}/share/hunspell") languages;
hunspellTargetDirs = "$out/opt/Pulsar/resources/app.asar.unpacked/node_modules/spellchecker/vendor/hunspell_dictionaries";
hunspellCopyCommands = lib.concatMapStringsSep "\n" (
lang: "cp -r ${lang}/* ${hunspellTargetDirs};"
diff --git a/pkgs/by-name/qi/qiv/package.nix b/pkgs/by-name/qi/qiv/package.nix
new file mode 100644
index 000000000000..03615b74947d
--- /dev/null
+++ b/pkgs/by-name/qi/qiv/package.nix
@@ -0,0 +1,46 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitea,
+ pkg-config,
+ gtk3,
+ file,
+ lcms2,
+ libexif,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "qiv";
+ version = "3.0.2";
+
+ src = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "ciberandy";
+ repo = "qiv";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-U++ZyJ0cVa5x/1Me7Em1W33jAYe3Q/TfMZgPj71ZaFA=";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [
+ gtk3
+ file
+ lcms2
+ libexif
+ ];
+
+ preBuild = ''
+ substituteInPlace Makefile \
+ --replace-fail /usr/local "$out" \
+ --replace-fail /man/ /share/man/ \
+ --replace-fail /share/share/ /share/
+ '';
+
+ meta = {
+ description = "Quick image viewer";
+ homepage = "http://spiegl.de/qiv/";
+ license = lib.licenses.gpl2Only;
+ platforms = lib.platforms.linux;
+ mainProgram = "qiv";
+ };
+})
diff --git a/pkgs/by-name/qo/qogir-icon-theme/package.nix b/pkgs/by-name/qo/qogir-icon-theme/package.nix
index 775b3e31cb0d..653f73c5dad4 100644
--- a/pkgs/by-name/qo/qogir-icon-theme/package.nix
+++ b/pkgs/by-name/qo/qogir-icon-theme/package.nix
@@ -55,8 +55,8 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "dark" "all" ] color
mkdir -p $out/share/icons
name= ./install.sh \
- ${lib.optionalString (themeVariants != [ ]) ("--theme " + builtins.toString themeVariants)} \
- ${lib.optionalString (colorVariants != [ ]) ("--color " + builtins.toString colorVariants)} \
+ ${lib.optionalString (themeVariants != [ ]) ("--theme " + toString themeVariants)} \
+ ${lib.optionalString (colorVariants != [ ]) ("--color " + toString colorVariants)} \
--dest $out/share/icons
jdupes --quiet --link-soft --recurse $out/share
diff --git a/pkgs/by-name/qo/qogir-theme/package.nix b/pkgs/by-name/qo/qogir-theme/package.nix
index 0e0c2c471735..00532e9d574e 100644
--- a/pkgs/by-name/qo/qogir-theme/package.nix
+++ b/pkgs/by-name/qo/qogir-theme/package.nix
@@ -67,9 +67,9 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "a
mkdir -p $out/share/themes
name= HOME="$TMPDIR" ./install.sh \
- ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \
- ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \
- ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \
+ ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \
+ ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \
+ ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \
--dest $out/share/themes
mkdir -p $out/share/doc/qogir-theme
diff --git a/pkgs/by-name/qr/qrq/package.nix b/pkgs/by-name/qr/qrq/package.nix
index 751d17b4c483..283eaba711b4 100644
--- a/pkgs/by-name/qr/qrq/package.nix
+++ b/pkgs/by-name/qr/qrq/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"BUILD_INFO=nix"
- "DESTDIR=${builtins.placeholder "out"}"
+ "DESTDIR=${placeholder "out"}"
];
postPatch = ''
diff --git a/pkgs/by-name/ra/racket/minimal.nix b/pkgs/by-name/ra/racket/minimal.nix
index 17c4dcf61c17..57fbbf224b84 100644
--- a/pkgs/by-name/ra/racket/minimal.nix
+++ b/pkgs/by-name/ra/racket/minimal.nix
@@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
}@config:
assert lib.assertMsg (libraries == [ ]) "library integration for Racket has not been implemented";
writers.makeScriptWriter (
- builtins.removeAttrs config [ "libraries" ]
+ removeAttrs config [ "libraries" ]
// {
interpreter = "${lib.getExe finalAttrs.finalPackage}";
}
diff --git a/pkgs/by-name/ra/racket/tests/get-version-and-variant.nix b/pkgs/by-name/ra/racket/tests/get-version-and-variant.nix
index 870542f8f6c0..f49d2e15b2e1 100644
--- a/pkgs/by-name/ra/racket/tests/get-version-and-variant.nix
+++ b/pkgs/by-name/ra/racket/tests/get-version-and-variant.nix
@@ -10,7 +10,7 @@ runCommandLocal "racket-test-get-version-and-variant"
}
(
lib.concatLines (
- builtins.map
+ map
(
{ expectation, output }:
''
diff --git a/pkgs/by-name/ra/radarr/update.py b/pkgs/by-name/ra/radarr/update.py
index 007e4583cae6..614abee64279 100644
--- a/pkgs/by-name/ra/radarr/update.py
+++ b/pkgs/by-name/ra/radarr/update.py
@@ -53,7 +53,7 @@ package_attrs = json.loads(subprocess.run(
"--json",
"--file", nixpkgs_path,
"--apply", """p: {
- dir = builtins.dirOf p.meta.position;
+ dir = dirOf p.meta.position;
version = p.version;
sourceHash = p.src.src.outputHash;
yarnHash = p.yarnOfflineCache.outputHash;
diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix
index 9942d6c54e9e..fd8d91605601 100644
--- a/pkgs/by-name/re/redocly/package.nix
+++ b/pkgs/by-name/re/redocly/package.nix
@@ -9,16 +9,16 @@
buildNpmPackage rec {
pname = "redocly";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "Redocly";
repo = "redocly-cli";
rev = "@redocly/cli@${version}";
- hash = "sha256-94SqBRA2XqVCH6BN6pmaSKEfQC2SPPGfDe6fxQS+8as=";
+ hash = "sha256-e25pjXopmWqoLV16DC+w57YZzH6bbwITsRhKI9IBr+0=";
};
- npmDepsHash = "sha256-u+zWxenJDsOjYEbTbAfrRvBTdWLzZKX1TITEXk8yHSo=";
+ npmDepsHash = "sha256-/Gi0hNuG6fkgOCcjD1jDNyUT1ke3oipqmzAHDpdbiJg=";
npmBuildScript = "prepare";
diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index 31a14d9e785b..fe3b126810ee 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -6,10 +6,10 @@
}:
let
pname = "remnote";
- version = "1.20.18";
+ version = "1.21.5";
src = fetchurl {
url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
- hash = "sha256-GxME5+Un6bYoMg9tkcdF3r5kTCdifdWmWtQrihGBloY=";
+ hash = "sha256-Tq8qyjlyB/1tQkB5rLVSLy8HbpnfBZ4QmNQB/CVEiN0=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix
index 46ca11c74a69..b3bc0827d60c 100644
--- a/pkgs/by-name/re/reposilite/package.nix
+++ b/pkgs/by-name/re/reposilite/package.nix
@@ -10,7 +10,7 @@
}:
let
pluginsDir = linkFarm "reposilite-plugins" (
- builtins.map (p: {
+ map (p: {
name = (builtins.parseDrvName p.name).name + ".jar";
path = p.outPath or p;
}) plugins
diff --git a/pkgs/by-name/re/reversal-icon-theme/package.nix b/pkgs/by-name/re/reversal-icon-theme/package.nix
index dac5a4e8f82e..e61a5d6a15e7 100644
--- a/pkgs/by-name/re/reversal-icon-theme/package.nix
+++ b/pkgs/by-name/re/reversal-icon-theme/package.nix
@@ -73,7 +73,7 @@ lib.checkListOfEnum "${pname}: color variants"
mkdir -p $out/share/icons
name= ./install.sh \
- ${if allColorVariants then "-a" else builtins.toString colorVariants} \
+ ${if allColorVariants then "-a" else toString colorVariants} \
-d $out/share/icons
rm $out/share/icons/*/{AUTHORS,COPYING}
diff --git a/pkgs/by-name/ri/riemann_c_client/package.nix b/pkgs/by-name/ri/riemann_c_client/package.nix
index 5a691d0fd29e..703d3301a7a5 100644
--- a/pkgs/by-name/ri/riemann_c_client/package.nix
+++ b/pkgs/by-name/ri/riemann_c_client/package.nix
@@ -33,10 +33,13 @@ stdenv.mkDerivation rec {
"out"
];
+ strictDeps = true;
+
nativeBuildInputs = [
autoreconfHook
check
pkg-config
+ protobufc
];
buildInputs = [
file
diff --git a/pkgs/by-name/rm/rman/package.nix b/pkgs/by-name/rm/rman/package.nix
index 4fbaded2596a..794afd971082 100644
--- a/pkgs/by-name/rm/rman/package.nix
+++ b/pkgs/by-name/rm/rman/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Parse formatted man pages and man page source from most flavors of UNIX and converts them to HTML, ASCII, TkMan, DocBook, and other formats";
- license = "artistic";
+ license = lib.licenses.artistic1;
platforms = lib.platforms.all;
mainProgram = "rman";
};
diff --git a/pkgs/by-name/ro/rofi-calc/package.nix b/pkgs/by-name/ro/rofi-calc/package.nix
index 6b297a2ba034..f6369c1c77b0 100644
--- a/pkgs/by-name/ro/rofi-calc/package.nix
+++ b/pkgs/by-name/ro/rofi-calc/package.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "rofi-calc";
- version = "2.4.0";
+ version = "2.4.1";
src = fetchFromGitHub {
owner = "svenstaro";
repo = "rofi-calc";
rev = "v${version}";
- sha256 = "sha256-iTLi76GinRASawPSWAqmxSwLZPGvHesarHNoqO4m4dM=";
+ sha256 = "sha256-E0C5hlrZGRGHT/yb4J2qFquf3AuB0T1zqbFPZdT1UxE=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ru/rust-streamdeck/package.nix b/pkgs/by-name/ru/rust-streamdeck/package.nix
index 8c8c8b2b5f31..e3a2f3e263ca 100644
--- a/pkgs/by-name/ru/rust-streamdeck/package.nix
+++ b/pkgs/by-name/ru/rust-streamdeck/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
- versionCheckProgram = "${builtins.placeholder "out"}/bin/${meta.mainProgram}";
+ versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
postInstall = ''
install -Dm444 40-streamdeck.rules -t $out/lib/udev/rules.d/
diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix
index 9bb9999e0216..e90d2b63b645 100644
--- a/pkgs/by-name/sh/shogihome/package.nix
+++ b/pkgs/by-name/sh/shogihome/package.nix
@@ -143,7 +143,7 @@ buildNpmPackage (finalAttrs: {
];
runtimeEnv = {
PNAME = finalAttrs.pname;
- PKG_FILE = builtins.toString ./package.nix;
+ PKG_FILE = toString ./package.nix;
};
text = ''
new_src="$(nix-build --attr "pkgs.$PNAME.src" --no-out-link)"
diff --git a/pkgs/by-name/si/sierra-gtk-theme/package.nix b/pkgs/by-name/si/sierra-gtk-theme/package.nix
index 987a18a8d33e..e044f0c5176c 100644
--- a/pkgs/by-name/si/sierra-gtk-theme/package.nix
+++ b/pkgs/by-name/si/sierra-gtk-theme/package.nix
@@ -63,10 +63,10 @@ lib.checkListOfEnum "${pname}: button variants" [ "standard" "alt" ] buttonVaria
mkdir -p $out/share/themes
name= ./install.sh --dest $out/share/themes \
- ${lib.optionalString (buttonVariants != [ ]) "--alt " + builtins.toString buttonVariants} \
- ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \
- ${lib.optionalString (opacityVariants != [ ]) "--opacity " + builtins.toString opacityVariants} \
- ${lib.optionalString (sizeVariants != [ ]) "--flat " + builtins.toString sizeVariants}
+ ${lib.optionalString (buttonVariants != [ ]) "--alt " + toString buttonVariants} \
+ ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \
+ ${lib.optionalString (opacityVariants != [ ]) "--opacity " + toString opacityVariants} \
+ ${lib.optionalString (sizeVariants != [ ]) "--flat " + toString sizeVariants}
# Replace duplicate files with hardlinks to the first file in each
# set of duplicates, reducing the installed size in about 79%
diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix
index 7a7016bca2d7..836cc6dd25c3 100644
--- a/pkgs/by-name/sk/sketchybar-app-font/package.nix
+++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix
@@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sketchybar-app-font";
- version = "2.0.43";
+ version = "2.0.46";
src = fetchFromGitHub {
owner = "kvndrsslr";
repo = "sketchybar-app-font";
tag = "v${finalAttrs.version}";
- hash = "sha256-F2Zg3sg56lftY1NWqwUZiYhEP/JCebWUg5ICAnB4Mu8=";
+ hash = "sha256-s4R0kxLbaWrjoLacnfZcLdtcRD0rC1na2JOV3B+p6T8=";
};
pnpmDeps = pnpm_9.fetchDeps {
diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix
index 5b8872a81de6..96e3ce98b91f 100644
--- a/pkgs/by-name/sl/slurm/package.nix
+++ b/pkgs/by-name/sl/slurm/package.nix
@@ -22,7 +22,7 @@
numactl,
readline,
freeipmi,
- xorg,
+ xauth,
lz4,
rdma-core,
nixosTests,
@@ -33,13 +33,11 @@
http-parser,
# enable internal X11 support via libssh2
enableX11 ? true,
- enableGtk2 ? false,
- gtk2,
enableNVML ? config.cudaSupport,
nvml,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "slurm";
version = "25.05.3.1";
@@ -49,7 +47,7 @@ stdenv.mkDerivation rec {
owner = "SchedMD";
repo = "slurm";
# The release tags use - instead of .
- rev = "${pname}-${builtins.replaceStrings [ "." ] [ "-" ] version}";
+ rev = "slurm-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
hash = "sha256-W/q9eN4Ov3pxp2qyr3b7G4ayDaNtFUPQeAcOHCB23Q8=";
};
@@ -60,7 +58,7 @@ stdenv.mkDerivation rec {
prePatch = ''
substituteInPlace src/common/env.c \
- --replace "/bin/echo" "${coreutils}/bin/echo"
+ --replace "/bin/echo" "${lib.getExe' coreutils "echo"}"
# Autoconf does not support split packages for pmix (libs and headers).
# Fix the path to the pmix libraries, so dlopen can find it.
@@ -71,7 +69,7 @@ stdenv.mkDerivation rec {
''
+ (lib.optionalString enableX11 ''
substituteInPlace src/common/x11_util.c \
- --replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"'
+ --replace '"/usr/bin/xauth"' '"${lib.getExe xauth}"'
'');
# nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode'
@@ -108,13 +106,12 @@ stdenv.mkDerivation rec {
libbpf
http-parser
]
- ++ lib.optionals enableX11 [ xorg.xauth ]
- ++ lib.optionals enableGtk2 [ gtk2 ]
+ ++ lib.optionals enableX11 [ xauth ]
++ lib.optionals enableNVML [
(runCommand "collect-nvml" { } ''
mkdir $out
- ln -s ${nvml.dev}/include $out/include
- ln -s ${nvml.lib}/lib/stubs $out/lib
+ ln -s ${lib.getDev nvml}/include $out/include
+ ln -s ${lib.getLib nvml}/lib/stubs $out/lib
'')
];
@@ -133,7 +130,6 @@ stdenv.mkDerivation rec {
"--with-bpf=${libbpf}"
"--without-rpath" # Required for configure to pick up the right dlopen path
]
- ++ (lib.optional enableGtk2 "--disable-gtktest")
++ (lib.optional (!enableX11) "--disable-x11")
++ (lib.optional (enableNVML) "--with-nvml");
@@ -150,14 +146,14 @@ stdenv.mkDerivation rec {
passthru.tests.slurm = nixosTests.slurm;
- meta = with lib; {
+ meta = {
homepage = "http://www.schedmd.com/";
description = "Simple Linux Utility for Resource Management";
- platforms = platforms.linux;
- license = licenses.gpl2Only;
- maintainers = with maintainers; [
+ platforms = lib.platforms.linux;
+ license = lib.licenses.gpl2Only;
+ maintainers = with lib.maintainers; [
jagajaga
markuskowa
];
};
-}
+})
diff --git a/pkgs/by-name/so/soapui/package.nix b/pkgs/by-name/so/soapui/package.nix
index 1788c7e4b08b..31add3917376 100644
--- a/pkgs/by-name/so/soapui/package.nix
+++ b/pkgs/by-name/so/soapui/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
description = "Most Advanced REST & SOAP Testing Tool in the World";
homepage = "https://www.soapui.org/";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
- license = "SoapUI End User License Agreement";
+ license = lib.licenses.eupl11;
maintainers = with maintainers; [ gerschtli ];
platforms = platforms.linux; # we don't fetch the dmg yet
mainProgram = "soapui";
diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix
index 9ac59650fae9..95d74c881c0c 100644
--- a/pkgs/by-name/so/solana-cli/package.nix
+++ b/pkgs/by-name/so/solana-cli/package.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-J7gyR7K1hauV+VrzoNzRrooLuSkjk8U6A3aFn9O2yFY=";
strictDeps = true;
- cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs;
+ cargoBuildFlags = map (n: "--bin=${n}") solanaPkgs;
RUSTFLAGS = "-Amismatched_lifetime_syntaxes -Adead_code";
LIBCLANG_PATH = "${libclang.lib}/lib";
diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix
index b5eabf16e0e4..7cdeed81fb4a 100644
--- a/pkgs/by-name/so/sonarlint-ls/package.nix
+++ b/pkgs/by-name/so/sonarlint-ls/package.nix
@@ -63,7 +63,7 @@ maven.buildMavenPackage rec {
passthru.updateScript =
let
- pkgFile = builtins.toString ./package.nix;
+ pkgFile = toString ./package.nix;
in
lib.getExe (writeShellApplication {
name = "update-${pname}";
diff --git a/pkgs/by-name/so/sonarr/update.py b/pkgs/by-name/so/sonarr/update.py
index 05d1933a1d23..5c8fd4c83700 100644
--- a/pkgs/by-name/so/sonarr/update.py
+++ b/pkgs/by-name/so/sonarr/update.py
@@ -53,7 +53,7 @@ package_attrs = json.loads(subprocess.run(
"--json",
"--file", nixpkgs_path,
"--apply", """p: {
- dir = builtins.dirOf p.meta.position;
+ dir = dirOf p.meta.position;
version = p.version;
sourceHash = p.src.src.outputHash;
yarnHash = p.yarnOfflineCache.outputHash;
diff --git a/pkgs/by-name/sp/spacetimedb/package.nix b/pkgs/by-name/sp/spacetimedb/package.nix
index 523bfc391df3..ddda40733761 100644
--- a/pkgs/by-name/sp/spacetimedb/package.nix
+++ b/pkgs/by-name/sp/spacetimedb/package.nix
@@ -13,16 +13,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "spacetimedb";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "clockworklabs";
repo = "spacetimedb";
tag = "v${finalAttrs.version}";
- hash = "sha256-SB8OWHWsYc2nrnap9BoHefTQx8BufIbfy//ga9M4N4I=";
+ hash = "sha256-fUs3EdyOzUogEEhSOnpFrA1LeivEa/crmlhQcf2lGUE=";
};
- cargoHash = "sha256-MOx1jBKVX69Hhn8BomnVb0UUOCvzrW2HTPPulIJMYY4=";
+ cargoHash = "sha256-EWLfAyYN/U2kt03lmR8mVXc+j/DbjFat+RysNUt99QI=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/sq/squashfuse/package.nix b/pkgs/by-name/sq/squashfuse/package.nix
index a3e8bf3cbaa5..4b74c781731b 100644
--- a/pkgs/by-name/sq/squashfuse/package.nix
+++ b/pkgs/by-name/sq/squashfuse/package.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/vasi/squashfuse";
maintainers = [ ];
platforms = lib.platforms.unix;
- license = "BSD-2-Clause";
+ license = lib.licenses.bsd2;
};
}
diff --git a/pkgs/by-name/ss/ssldump/package.nix b/pkgs/by-name/ss/ssldump/package.nix
index c7927eb92acb..179895dda9e9 100644
--- a/pkgs/by-name/ss/ssldump/package.nix
+++ b/pkgs/by-name/ss/ssldump/package.nix
@@ -34,7 +34,10 @@ stdenv.mkDerivation {
meta = with lib; {
description = "SSLv3/TLS network protocol analyzer";
homepage = "https://ssldump.sourceforge.net";
- license = "BSD-style";
+ license = with lib.licenses; [
+ bsdOriginal
+ bsdOriginalShortened
+ ];
maintainers = with maintainers; [ aycanirican ];
platforms = platforms.unix;
mainProgram = "ssldump";
diff --git a/pkgs/by-name/st/steam/package.nix b/pkgs/by-name/st/steam/package.nix
index 99b28d32bb68..fe3bc2dddf86 100644
--- a/pkgs/by-name/st/steam/package.nix
+++ b/pkgs/by-name/st/steam/package.nix
@@ -25,7 +25,7 @@ let
...
}@args:
buildFHSEnv (
- (builtins.removeAttrs args [
+ (removeAttrs args [
"extraPkgs"
"extraLibraries"
"extraProfile"
diff --git a/pkgs/by-name/st/stockfish/package.nix b/pkgs/by-name/st/stockfish/package.nix
index 02cfd355f012..6e4b9ee9312c 100644
--- a/pkgs/by-name/st/stockfish/package.nix
+++ b/pkgs/by-name/st/stockfish/package.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
];
runtimeEnv = {
PNAME = pname;
- PKG_FILE = builtins.toString ./package.nix;
+ PKG_FILE = toString ./package.nix;
NNUE_BIG_FILE = nnueBigFile;
NNUE_BIG_HASH = nnueBigHash;
NNUE_SMALL_FILE = nnueSmallFile;
diff --git a/pkgs/by-name/st/streamdeck-ui/package.nix b/pkgs/by-name/st/streamdeck-ui/package.nix
index daea5cb273c4..73e4062aa015 100644
--- a/pkgs/by-name/st/streamdeck-ui/package.nix
+++ b/pkgs/by-name/st/streamdeck-ui/package.nix
@@ -103,7 +103,7 @@ python3Packages.buildPythonApplication rec {
categories = [ "Utility" ];
};
in
- builtins.map makeDesktopItem [
+ map makeDesktopItem [
common
(
common
diff --git a/pkgs/by-name/st/structurizr-cli/package.nix b/pkgs/by-name/st/structurizr-cli/package.nix
index c3370146c581..5db3e8af4252 100644
--- a/pkgs/by-name/st/structurizr-cli/package.nix
+++ b/pkgs/by-name/st/structurizr-cli/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
}
];
in
- builtins.map (
+ map (
entry:
fetchpatch {
url = "https://github.com/structurizr/cli/commit/${entry.rev}.patch";
diff --git a/pkgs/by-name/su/subfinder/disable-update-check.patch b/pkgs/by-name/su/subfinder/disable-update-check.patch
index 18b16babea23..eeb718bcd725 100644
--- a/pkgs/by-name/su/subfinder/disable-update-check.patch
+++ b/pkgs/by-name/su/subfinder/disable-update-check.patch
@@ -1,5 +1,5 @@
---- a/v2/pkg/runner/options.go
-+++ b/v2/pkg/runner/options.go
+--- a/pkg/runner/options.go
++++ b/pkg/runner/options.go
@@ -107,7 +107,7 @@ func ParseOptions() *Options {
flagSet.CreateGroup("update", "Update",
diff --git a/pkgs/by-name/su/subfinder/package.nix b/pkgs/by-name/su/subfinder/package.nix
index 09c8700d15ff..1d5e82653358 100644
--- a/pkgs/by-name/su/subfinder/package.nix
+++ b/pkgs/by-name/su/subfinder/package.nix
@@ -6,18 +6,16 @@
buildGoModule rec {
pname = "subfinder";
- version = "2.8.0";
+ version = "2.9.0";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "subfinder";
tag = "v${version}";
- hash = "sha256-HfQz0tLBKt16IrtxOT3lX28FcVG05X1hICw5Xq/dQJw=";
+ hash = "sha256-llyzTGy7nj5RFwt0KDPP9Ua1FkcrErW8GdvbSWg3mpk=";
};
- vendorHash = "sha256-3bHIrjA5Bbl6prF+ttEs+N2Sa4AMZDtRk3ysoIitsdY=";
-
- modRoot = "./v2";
+ vendorHash = "sha256-z+CKoRxxskyKYmBfIEQjtf8nXuGfWH+4IG98+1eCCmk=";
patches = [
# Disable automatic version check
diff --git a/pkgs/by-name/sw/swi-prolog/package.nix b/pkgs/by-name/sw/swi-prolog/package.nix
index 70dbac88c78e..ee6745c234a3 100644
--- a/pkgs/by-name/sw/swi-prolog/package.nix
+++ b/pkgs/by-name/sw/swi-prolog/package.nix
@@ -64,7 +64,7 @@
# url = "https://github.com/mndrix/list_util/archive/v0.13.0.zip";
# sha256 = "0lx7vffflak0y8l8vg8k0g8qddwwn23ksbz02hi3f8rbarh1n89q";
# };
- # typedef = builtins.fetchTarball {
+ # typedef = fetchTarball {
# name = "swipl-pack-typedef";
# url = "https://raw.githubusercontent.com/samer--/prolog/master/typedef/release/typedef-0.1.9.tgz";
# sha256 = "056nqjn01g18fb1b2qivv9s7hb4azk24nx2d4kvkbmm1k91f44p3";
@@ -166,7 +166,7 @@ stdenv.mkDerivation {
mkdir -p $out/lib/swipl/extra-pack
'';
- postInstall = builtins.concatStringsSep "\n" (builtins.map (packInstall "$out") extraPacks);
+ postInstall = builtins.concatStringsSep "\n" (map (packInstall "$out") extraPacks);
meta = {
homepage = "https://www.swi-prolog.org";
diff --git a/pkgs/by-name/sw/swiftformat/package.nix b/pkgs/by-name/sw/swiftformat/package.nix
index 2f94decd9389..4778c0f8cd55 100644
--- a/pkgs/by-name/sw/swiftformat/package.nix
+++ b/pkgs/by-name/sw/swiftformat/package.nix
@@ -12,13 +12,13 @@
swift.stdenv.mkDerivation rec {
pname = "swiftformat";
- version = "0.57.2";
+ version = "0.58.2";
src = fetchFromGitHub {
owner = "nicklockwood";
repo = "SwiftFormat";
rev = version;
- sha256 = "sha256-KMSRryaSoAX4zi+AhIEHFMX0UVN8ena27SoJF8gAbzY=";
+ sha256 = "sha256-v0ZJzB8PndVo6x4TZuxdw4bAALemY0mubPdmUdcAuHk=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix
index 1968fe74d70d..9951760b51ec 100644
--- a/pkgs/by-name/sy/sydbox/package.nix
+++ b/pkgs/by-name/sy/sydbox/package.nix
@@ -12,7 +12,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sydbox";
- version = "3.38.2";
+ version = "3.39.1";
outputs = [
"out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "Sydbox";
repo = "sydbox";
tag = "v${finalAttrs.version}";
- hash = "sha256-yxe3U+n9FL58wI/uk8EM24Mcmxzlk8wmgi0wCu+dcnk=";
+ hash = "sha256-LJHZb4TGo+Lep7yiej2G1H6mXAoEk5ixn/lGDxAWqvg=";
};
- cargoHash = "sha256-17Ri1QGQFWL/DTjpGEMb4SubsnvHcVTYW6wsjiFR36w=";
+ cargoHash = "sha256-mUeJ3A2HW2pXWXW3Abb+aqTaZjVrchYJNCJCDC2Em9s=";
nativeBuildInputs = [
mandoc
diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix
index 2faac3744fea..34c6e072b72b 100644
--- a/pkgs/by-name/sy/syslogng/package.nix
+++ b/pkgs/by-name/sy/syslogng/package.nix
@@ -65,13 +65,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "syslog-ng";
- version = "4.10.0";
+ version = "4.10.1";
src = fetchFromGitHub {
owner = "syslog-ng";
repo = "syslog-ng";
tag = "syslog-ng-${finalAttrs.version}";
- hash = "sha256-XqYfDRJc+AwkdQGSbkslFadYqNK0UDiZOruUUMYO1po=";
+ hash = "sha256-Iha0HExkB0oM8IxzgMjnqwY4AlrK8ifL6DU3MxgGdXQ=";
fetchSubmodules = true;
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix
index 9b70bfdc53c8..d46d201117d3 100644
--- a/pkgs/by-name/ta/tabby/package.nix
+++ b/pkgs/by-name/ta/tabby/package.nix
@@ -59,7 +59,7 @@ let
# - metal if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
# !! warn if multiple acceleration methods are enabled and default to the first one in the list
featureDevice =
- if (builtins.isNull acceleration) then
+ if (isNull acceleration) then
(warnIfMultipleAccelerationMethods availableAccelerations)
else
acceleration;
diff --git a/pkgs/by-name/ta/tahoe-lafs/package.nix b/pkgs/by-name/ta/tahoe-lafs/package.nix
index 5680ce76fd7d..7d8f4d3a089c 100644
--- a/pkgs/by-name/ta/tahoe-lafs/package.nix
+++ b/pkgs/by-name/ta/tahoe-lafs/package.nix
@@ -163,7 +163,10 @@ python3Packages.buildPythonApplication rec {
homepage = "https://tahoe-lafs.org/";
license = [
lib.licenses.gpl2Plus # or
- "TGPPLv1+"
+ {
+ fullName = "Transitive Grace Period Public Licence version 1.0";
+ url = "https://github.com/tahoe-lafs/tahoe-lafs/blob/master/COPYING.TGPPL.rst";
+ }
];
maintainers = with lib.maintainers; [ MostAwesomeDude ];
platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ta/tayga/package.nix b/pkgs/by-name/ta/tayga/package.nix
index 718bf40dbd0d..b665e0ff2ed3 100644
--- a/pkgs/by-name/ta/tayga/package.nix
+++ b/pkgs/by-name/ta/tayga/package.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation (finalAttrs: {
makeFlags = [ "CC=${lib.getExe stdenv.cc}" ];
+ env = lib.optionalAttrs stdenv.hostPlatform.is32bit {
+ NIX_CFLAGS_COMPILE = "-D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64";
+ };
+
preBuild = ''
echo "#define TAYGA_VERSION \"${finalAttrs.version}\"" > version.h
'';
diff --git a/pkgs/by-name/tc/tcp_wrappers/package.nix b/pkgs/by-name/tc/tcp_wrappers/package.nix
index 1bfadfbf5ef2..e9319aaa4974 100644
--- a/pkgs/by-name/tc/tcp_wrappers/package.nix
+++ b/pkgs/by-name/tc/tcp_wrappers/package.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
'';
homepage = "ftp://ftp.porcupine.org/pub/security/index.html";
- license = "BSD-style";
+ license = lib.licenses.tcpWrappers;
platforms = lib.platforms.linux;
};
}
diff --git a/pkgs/by-name/te/tela-circle-icon-theme/package.nix b/pkgs/by-name/te/tela-circle-icon-theme/package.nix
index 5cba50aae8b4..79e5e9bfe70c 100644
--- a/pkgs/by-name/te/tela-circle-icon-theme/package.nix
+++ b/pkgs/by-name/te/tela-circle-icon-theme/package.nix
@@ -72,7 +72,7 @@ lib.checkListOfEnum "tela-circle-icon-theme: color variants"
./install.sh -d $out/share/icons \
${lib.optionalString circularFolder "-c"} \
- ${if allColorVariants then "-a" else builtins.toString colorVariants}
+ ${if allColorVariants then "-a" else toString colorVariants}
jdupes --quiet --link-soft --recurse $out/share
diff --git a/pkgs/by-name/tl/tla/package.nix b/pkgs/by-name/tl/tla/package.nix
index 9554be300e46..3d978d922b32 100644
--- a/pkgs/by-name/tl/tla/package.nix
+++ b/pkgs/by-name/tl/tla/package.nix
@@ -1,4 +1,5 @@
{
+ lib,
stdenv,
fetchurl,
which,
@@ -41,6 +42,6 @@ stdenv.mkDerivation rec {
description = "GNU Arch (aka. `tla'), a distributed revision control system";
mainProgram = "tla";
homepage = "https://www.gnu.org/software/gnu-arch/";
- license = "GPL";
+ license = lib.licenses.gpl2Plus;
};
}
diff --git a/pkgs/by-name/to/torque/package.nix b/pkgs/by-name/to/torque/package.nix
index 49210ab7179a..55162d324708 100644
--- a/pkgs/by-name/to/torque/package.nix
+++ b/pkgs/by-name/to/torque/package.nix
@@ -94,6 +94,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/adaptivecomputing/torque";
description = "Resource management system for submitting and controlling jobs on supercomputers, clusters, and grids";
platforms = platforms.linux;
- license = "TORQUEv1.1";
+ license = lib.licenses.torque11;
};
}
diff --git a/pkgs/by-name/to/touchosc/update.sh b/pkgs/by-name/to/touchosc/update.sh
index dc3e2f088878..88315275bc22 100755
--- a/pkgs/by-name/to/touchosc/update.sh
+++ b/pkgs/by-name/to/touchosc/update.sh
@@ -24,7 +24,7 @@ nixeval() {
findpath() {
path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
- outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
+ outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "fetchGit \"$nixpkgs\"")"
if [ -n "$outpath" ]; then
path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}"
diff --git a/pkgs/by-name/tr/treecat/package.nix b/pkgs/by-name/tr/treecat/package.nix
index bb983196e8ab..20b4592f56ee 100644
--- a/pkgs/by-name/tr/treecat/package.nix
+++ b/pkgs/by-name/tr/treecat/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
scdoc
];
- env.PREFIX = builtins.placeholder "out";
+ env.PREFIX = placeholder "out";
dontConfigure = true;
diff --git a/pkgs/by-name/tr/treefmt/functions-doc.nix b/pkgs/by-name/tr/treefmt/functions-doc.nix
index 86dc23b226ea..f02ba13abb66 100644
--- a/pkgs/by-name/tr/treefmt/functions-doc.nix
+++ b/pkgs/by-name/tr/treefmt/functions-doc.nix
@@ -24,7 +24,7 @@ in
{
locations = lib.pipe attrs [
builtins.attrNames
- (builtins.map (
+ (map (
name:
let
pos = builtins.unsafeGetAttrPos name attrs;
diff --git a/pkgs/by-name/tr/treefmt/options-doc.nix b/pkgs/by-name/tr/treefmt/options-doc.nix
index f9e51ec0dff1..c0e14ba4e71c 100644
--- a/pkgs/by-name/tr/treefmt/options-doc.nix
+++ b/pkgs/by-name/tr/treefmt/options-doc.nix
@@ -26,6 +26,6 @@ let
in
nixosOptionsDoc {
documentType = "none";
- options = builtins.removeAttrs configuration.options [ "_module" ];
+ options = removeAttrs configuration.options [ "_module" ];
transformOptions = opt: opt // { declarations = map transformDeclaration opt.declarations; };
}
diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix
index 84593c31a908..bbe124f2c371 100644
--- a/pkgs/by-name/tr/triton-llvm/package.nix
+++ b/pkgs/by-name/tr/triton-llvm/package.nix
@@ -44,7 +44,7 @@ let
"AMDGPU"
"NVPTX"
]
- ++ builtins.map inferNativeTarget llvmTargetsToBuild;
+ ++ map inferNativeTarget llvmTargetsToBuild;
# This LLVM version can't seem to find pygments/pyyaml,
# but a later update will likely fix this (triton-2.1.0)
diff --git a/pkgs/by-name/tt/ttf2pt1/package.nix b/pkgs/by-name/tt/ttf2pt1/package.nix
index 67f27ccb9bd3..c04bd07949c1 100644
--- a/pkgs/by-name/tt/ttf2pt1/package.nix
+++ b/pkgs/by-name/tt/ttf2pt1/package.nix
@@ -47,7 +47,13 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "True Type to Postscript Type 3 converter, fpdf";
homepage = "https://ttf2pt1.sourceforge.net/index.html";
- license = "ttf2pt1";
+ license = with lib.licenses; [
+ gpl2Plus
+ {
+ fullName = "ttf2pt1 License";
+ url = "https://git.altlinux.org/gears/t/ttf2pt1.git?p=ttf2pt1.git;a=blob;f=ttf2pt1/COPYRIGHT;h=75e8f38e5a7638ee7d23892c86442ddcc35f4761;hb=f3cdb9f16159edf8115dc81520be9af791e846b2";
+ }
+ ];
platforms = lib.platforms.linux;
};
})
diff --git a/pkgs/by-name/tu/tuist/package.nix b/pkgs/by-name/tu/tuist/package.nix
index 7b7cb6d22bb1..79e6e38c89cb 100644
--- a/pkgs/by-name/tu/tuist/package.nix
+++ b/pkgs/by-name/tu/tuist/package.nix
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tuist";
- version = "4.79.7";
+ version = "4.81.1";
src = fetchurl {
url = "https://github.com/tuist/tuist/releases/download/${finalAttrs.version}/tuist.zip";
- hash = "sha256-afZToryR7SXLlS/MKFuQFoBv2JQAaF4bHvEk5tO6xiw=";
+ hash = "sha256-mBgkYcV9p2m53CSHl2FuVLkyQFyPrckt9lgwGiVB3wA=";
};
dontUnpack = true;
diff --git a/pkgs/by-name/tw/twurl/package.nix b/pkgs/by-name/tw/twurl/package.nix
index 2587d6f0b2c0..dbaa518bd2cf 100644
--- a/pkgs/by-name/tw/twurl/package.nix
+++ b/pkgs/by-name/tw/twurl/package.nix
@@ -14,7 +14,7 @@ bundlerApp {
meta = with lib; {
description = "OAuth-enabled curl for the Twitter API";
homepage = "https://github.com/twitter/twurl";
- license = "MIT";
+ license = lib.licenses.mit;
maintainers = with maintainers; [ brecht ];
platforms = platforms.unix;
mainProgram = "twurl";
diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix
index dd56d6422f4e..afd7ff4065c6 100644
--- a/pkgs/by-name/ty/typescript-go/package.nix
+++ b/pkgs/by-name/ty/typescript-go/package.nix
@@ -10,17 +10,17 @@ let
in
buildGoModule {
pname = "typescript-go";
- version = "0-unstable-2025-09-17";
+ version = "0-unstable-2025-10-03";
src = fetchFromGitHub {
owner = "microsoft";
repo = "typescript-go";
- rev = "1ca5a2d97b0c2b93cfc32137c8922185b4f41df0";
- hash = "sha256-g1Wc2jAlpO7voqIFvNkEF900ZZIb/nwNFL1+4ZUGU9U=";
+ rev = "e729a0a55aa898cd3ce424a5c97e07f5dc98580f";
+ hash = "sha256-ZIluvlQNC21EZA4le+lyeynaJj4D0JYxI9njgw7Uuyc=";
fetchSubmodules = false;
};
- vendorHash = "sha256-k1fKa93zxMnORDPWnZrMahNHG0sCa3JOJl+d4T8PyIM=";
+ vendorHash = "sha256-ywhlLaUq2bjfE9GZIUOIcufIY1GLw3ZRGM+ZDfEpOiU=";
ldflags = [
"-s"
diff --git a/pkgs/by-name/uc/ucc/package.nix b/pkgs/by-name/uc/ucc/package.nix
index 6dea8a577f28..284fcdc68cf4 100644
--- a/pkgs/by-name/uc/ucc/package.nix
+++ b/pkgs/by-name/uc/ucc/package.nix
@@ -86,7 +86,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
# NOTE: With `__structuredAttrs` enabled, `LDFLAGS` must be set under `env` so it is assured to be a string;
# otherwise, we might have forgotten to convert it to a string and Nix would make LDFLAGS a shell variable
# referring to an array!
- env.LDFLAGS = builtins.toString (
+ env.LDFLAGS = toString (
optionals enableCuda [
# Fake libnvidia-ml.so (the real one is deployed impurely)
"-L${getLib cuda_nvml_dev}/lib/stubs"
diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix
index 0535089cbba6..adbe207a32b9 100644
--- a/pkgs/by-name/ul/ultrastardx/package.nix
+++ b/pkgs/by-name/ul/ultrastardx/package.nix
@@ -45,13 +45,13 @@ let
in
stdenv.mkDerivation rec {
pname = "ultrastardx";
- version = "2025.9.0";
+ version = "2025.10.0";
src = fetchFromGitHub {
owner = "UltraStar-Deluxe";
repo = "USDX";
rev = "v${version}";
- hash = "sha256-SQqmcFchXaYNKzQHjBcisZTjAN9TTWuKXv657yWGghw=";
+ hash = "sha256-rJhPVq6rheAtPHkDi8zPb1OGKHP56rl7jG9sKVDEqUw=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/un/unftp/package.nix b/pkgs/by-name/un/unftp/package.nix
new file mode 100644
index 000000000000..8b8d40608aca
--- /dev/null
+++ b/pkgs/by-name/un/unftp/package.nix
@@ -0,0 +1,38 @@
+{
+ fetchFromGitHub,
+ lib,
+ nix-update-script,
+ versionCheckHook,
+ rustPlatform,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "unftp";
+ version = "0.15.1";
+
+ src = fetchFromGitHub {
+ owner = "bolcom";
+ repo = "unftp";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-M6+4AYE2Wls2+LoPx3LSLHIWgWu9SMOIaNLVbXWKqGY=";
+ };
+
+ cargoHash = "sha256-P3TjRzo1TJE1LW+jbF0HOWeVXYsvwaZ+5CI+kH4jZNQ=";
+
+ nativeInstallCheckInputs = [
+ versionCheckHook
+ ];
+ versionCheckProgramArg = "--version";
+ doInstallCheck = true;
+
+ passthru = {
+ updateScript = nix-update-script { };
+ };
+
+ meta = {
+ description = "FTP(S) server with a couple of twists written in Rust";
+ homepage = "https://unftp.rs/";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ aiyion ];
+ mainProgram = "unftp";
+ };
+})
diff --git a/pkgs/by-name/un/unifont/package.nix b/pkgs/by-name/un/unifont/package.nix
index 5c14b45ca3c5..5e4f8b6f4070 100644
--- a/pkgs/by-name/un/unifont/package.nix
+++ b/pkgs/by-name/un/unifont/package.nix
@@ -66,7 +66,10 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://unifoundry.com/unifont/";
# Basically GPL2+ with font exception.
- license = "https://unifoundry.com/LICENSE.txt";
+ license = with lib.licenses; [
+ gpl2Plus
+ fontException
+ ];
maintainers = [ maintainers.rycee ];
platforms = platforms.all;
};
diff --git a/pkgs/by-name/un/unifont_upper/package.nix b/pkgs/by-name/un/unifont_upper/package.nix
index bb7453f5d53c..ef2185843d8e 100644
--- a/pkgs/by-name/un/unifont_upper/package.nix
+++ b/pkgs/by-name/un/unifont_upper/package.nix
@@ -28,7 +28,10 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://unifoundry.com/unifont/";
# Basically GPL2+ with font exception.
- license = "https://unifoundry.com/LICENSE.txt";
+ license = with lib.licenses; [
+ gpl2Plus
+ fontException
+ ];
maintainers = [ maintainers.mathnerd314 ];
platforms = platforms.all;
};
diff --git a/pkgs/by-name/un/unit/package.nix b/pkgs/by-name/un/unit/package.nix
index b759e9ec1898..5ac7dbc9ab7e 100644
--- a/pkgs/by-name/un/unit/package.nix
+++ b/pkgs/by-name/un/unit/package.nix
@@ -8,9 +8,7 @@
withPython3 ? true,
python3,
ncurses,
- withPHP81 ? true,
- php81,
- withPHP82 ? false,
+ withPHP82 ? true,
php82,
withPerl ? true,
perl,
@@ -34,7 +32,6 @@ let
fpmSupport = false;
};
- php81-unit = php81.override phpConfig;
php82-unit = php82.override phpConfig;
inherit (lib) optional optionals optionalString;
@@ -59,7 +56,6 @@ stdenv.mkDerivation rec {
python3
ncurses
]
- ++ optional withPHP81 php81-unit
++ optional withPHP82 php82-unit
++ optional withPerl perl
++ optional withRuby_3_1 ruby_3_1
@@ -77,11 +73,10 @@ stdenv.mkDerivation rec {
++ optional withDebug "--debug";
# Optionally add the PHP derivations used so they can be addressed in the configs
- usedPhp81 = optionals withPHP81 php81-unit;
+ usedPhp82 = optionals withPHP82 php82-unit;
postConfigure = ''
${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"}
- ${optionalString withPHP81 "./configure php --module=php81 --config=${php81-unit.unwrapped.dev}/bin/php-config --lib-path=${php81-unit}/lib"}
${optionalString withPHP82 "./configure php --module=php82 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"}
${optionalString withPerl "./configure perl --module=perl --perl=${perl}/bin/perl"}
${optionalString withRuby_3_1 "./configure ruby --module=ruby31 --ruby=${ruby_3_1}/bin/ruby"}
diff --git a/pkgs/by-name/un/unnethack/package.nix b/pkgs/by-name/un/unnethack/package.nix
index 4250a98d0a3e..5e112d919a4e 100644
--- a/pkgs/by-name/un/unnethack/package.nix
+++ b/pkgs/by-name/un/unnethack/package.nix
@@ -77,7 +77,11 @@ stdenv.mkDerivation {
description = "Fork of NetHack";
mainProgram = "unnethack";
homepage = "https://unnethack.wordpress.com/";
- license = "nethack";
+ license = with lib.licenses; [
+ gpl3Only
+ cc-by-sa-30
+ publicDomain
+ ];
platforms = lib.platforms.all;
maintainers = [ ];
};
diff --git a/pkgs/by-name/un/unscii/package.nix b/pkgs/by-name/un/unscii/package.nix
index b622a5fd95cc..41cc2f470479 100644
--- a/pkgs/by-name/un/unscii/package.nix
+++ b/pkgs/by-name/un/unscii/package.nix
@@ -80,7 +80,11 @@ stdenv.mkDerivation rec {
description = "Bitmapped character-art-friendly Unicode fonts";
# Basically GPL2+ with font exception — because of the Unifont-augmented
# version. The reduced version is public domain.
- license = "http://unifoundry.com/LICENSE.txt";
+ license = with lib.licenses; [
+ gpl2Plus
+ fontException
+ ofl
+ ];
maintainers = [ lib.maintainers.raskin ];
homepage = "http://viznut.fi/unscii/";
};
diff --git a/pkgs/by-name/uw/uwsgi/package.nix b/pkgs/by-name/uw/uwsgi/package.nix
index 0f8fe4f8c98b..f5c5e3917ea8 100644
--- a/pkgs/by-name/uw/uwsgi/package.nix
+++ b/pkgs/by-name/uw/uwsgi/package.nix
@@ -76,7 +76,7 @@ let
else
throw "Unknown UWSGI plugin ${name}, available : ${all}";
- needed = builtins.map getPlugin plugins;
+ needed = map getPlugin plugins;
in
stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/va/vanillatd/package.nix b/pkgs/by-name/va/vanillatd/package.nix
index 4c336c2c1204..5d5ccf4b8147 100644
--- a/pkgs/by-name/va/vanillatd/package.nix
+++ b/pkgs/by-name/va/vanillatd/package.nix
@@ -154,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: {
rsync --archive --mkpath --chmod=a+w ${finalAttrs.finalPackage}/ $out/
# Symlink the data derivation to the default data path
- mkdir -p ${builtins.dirOf Default_Data_Path}
+ mkdir -p ${dirOf Default_Data_Path}
ln -s ${dataDerivation} ${Default_Data_Path}
# Fix `error: suspicious ownership or permission on '/nix/store/xxx-0.0.0' for output 'out'; rejecting this build output`
diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix
index 0c24c8edfd8f..9be733374954 100644
--- a/pkgs/by-name/vc/vcpkg/package.nix
+++ b/pkgs/by-name/vc/vcpkg/package.nix
@@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "vcpkg";
- version = "2025.08.27";
+ version = "2025.09.17";
src = fetchFromGitHub {
owner = "microsoft";
repo = "vcpkg";
tag = finalAttrs.version;
- hash = "sha256-rgpFnISzqmmb3Ce+iLd9HkcZnhqQ2dEVl2GkoeLrs2U=";
+ hash = "sha256-DySLGZrsUwXEW3NbcG6hEvcJZyPHub+oI9HWiKvYIpM=";
leaveDotGit = true;
postFetch = ''
cd "$out"
diff --git a/pkgs/by-name/vd/vdmfec/package.nix b/pkgs/by-name/vd/vdmfec/package.nix
index 6b9f4387be87..2815e5ae92df 100644
--- a/pkgs/by-name/vd/vdmfec/package.nix
+++ b/pkgs/by-name/vd/vdmfec/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
+ autoreconfHook,
}:
stdenv.mkDerivation rec {
@@ -13,6 +14,10 @@ stdenv.mkDerivation rec {
sha256 = "0i7q4ylx2xmzzq778anpkj4nqir5gf573n1lbpxnbc10ymsjq2rm";
};
+ nativeBuildInputs = [
+ autoreconfHook
+ ];
+
meta = with lib; {
description = "Program that adds error correction blocks";
homepage = "http://members.tripod.com/professor_tom/archives/index.html";
diff --git a/pkgs/by-name/vi/vimix-gtk-themes/package.nix b/pkgs/by-name/vi/vimix-gtk-themes/package.nix
index 0231a5dccbd4..72f667148a5f 100644
--- a/pkgs/by-name/vi/vimix-gtk-themes/package.nix
+++ b/pkgs/by-name/vi/vimix-gtk-themes/package.nix
@@ -76,10 +76,10 @@ lib.checkListOfEnum "${pname}: theme variants"
runHook preInstall
mkdir -p $out/share/themes
name= HOME="$TMPDIR" ./install.sh \
- ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \
- ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \
- ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \
- ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \
+ ${lib.optionalString (themeVariants != [ ]) "--theme " + toString themeVariants} \
+ ${lib.optionalString (colorVariants != [ ]) "--color " + toString colorVariants} \
+ ${lib.optionalString (sizeVariants != [ ]) "--size " + toString sizeVariants} \
+ ${lib.optionalString (tweaks != [ ]) "--tweaks " + toString tweaks} \
--dest $out/share/themes
rm $out/share/themes/*/{AUTHORS,LICENSE}
jdupes --quiet --link-soft --recurse $out/share
diff --git a/pkgs/by-name/vi/vimix-icon-theme/package.nix b/pkgs/by-name/vi/vimix-icon-theme/package.nix
index 9c23826a48f5..5d39400df9c4 100644
--- a/pkgs/by-name/vi/vimix-icon-theme/package.nix
+++ b/pkgs/by-name/vi/vimix-icon-theme/package.nix
@@ -61,7 +61,7 @@ lib.checkListOfEnum "${pname}: color variants"
runHook preInstall
./install.sh \
- ${if colorVariants != [ ] then builtins.toString colorVariants else "-a"} \
+ ${if colorVariants != [ ] then toString colorVariants else "-a"} \
-d $out/share/icons
# replace duplicate files with symlinks
diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix
index ac5b8bcf6c28..fd7964d8485a 100644
--- a/pkgs/by-name/vs/vsce/package.nix
+++ b/pkgs/by-name/vs/vsce/package.nix
@@ -11,16 +11,16 @@
buildNpmPackage (finalAttrs: {
pname = "vsce";
- version = "3.6.0";
+ version = "3.6.2";
src = fetchFromGitHub {
owner = "microsoft";
repo = "vscode-vsce";
tag = "v${finalAttrs.version}";
- hash = "sha256-6Tt7IewbCLHG8DVoD8PV6VmrNu3MCUHITgYFq9smvOo=";
+ hash = "sha256-TcBzXDNpjJvI+0ir80d+HFp6mF/Ecle4vhOMcACvF7M=";
};
- npmDepsHash = "sha256-pZUDui2mhGe+My9QL+pqeBU16AyJ+/udULbo2EQjZd0=";
+ npmDepsHash = "sha256-G09pn6JX389GMbIzYmmLutH7qwiaDb8V9zCGAOFaDdk=";
postPatch = ''
substituteInPlace package.json --replace-fail '"version": "0.0.0"' '"version": "${finalAttrs.version}"'
diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix
index 9b58b0ca2f05..c5c5204454f7 100644
--- a/pkgs/by-name/wa/wasilibc/package.nix
+++ b/pkgs/by-name/wa/wasilibc/package.nix
@@ -33,9 +33,9 @@ stdenvNoLibc.mkDerivation (finalAttrs: {
'';
preBuild = ''
- export SYSROOT_LIB=${builtins.placeholder "out"}/lib
- export SYSROOT_INC=${builtins.placeholder "dev"}/include
- export SYSROOT_SHARE=${builtins.placeholder "share"}/share
+ export SYSROOT_LIB=${placeholder "out"}/lib
+ export SYSROOT_INC=${placeholder "dev"}/include
+ export SYSROOT_SHARE=${placeholder "share"}/share
mkdir -p "$SYSROOT_LIB" "$SYSROOT_INC" "$SYSROOT_SHARE"
makeFlagsArray+=(
"SYSROOT_LIB:=$SYSROOT_LIB"
diff --git a/pkgs/by-name/wg/wgpu-native/examples.nix b/pkgs/by-name/wg/wgpu-native/examples.nix
index d51db484124b..71619d101641 100644
--- a/pkgs/by-name/wg/wgpu-native/examples.nix
+++ b/pkgs/by-name/wg/wgpu-native/examples.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
];
makeWrapperArgs = lib.optionals (finalAttrs.runtimeInputs != [ ]) [
- "--prefix LD_LIBRARY_PATH : ${builtins.toString (lib.makeLibraryPath finalAttrs.runtimeInputs)}"
+ "--prefix LD_LIBRARY_PATH : ${toString (lib.makeLibraryPath finalAttrs.runtimeInputs)}"
];
installPhase = ''
diff --git a/pkgs/by-name/wh/whitesur-icon-theme/package.nix b/pkgs/by-name/wh/whitesur-icon-theme/package.nix
index 31b620f635e2..8a4c7cfd5def 100644
--- a/pkgs/by-name/wh/whitesur-icon-theme/package.nix
+++ b/pkgs/by-name/wh/whitesur-icon-theme/package.nix
@@ -61,7 +61,7 @@ lib.checkListOfEnum "${pname}: theme variants"
./install.sh --dest $out/share/icons \
--name WhiteSur \
- --theme ${builtins.toString themeVariants} \
+ --theme ${toString themeVariants} \
${lib.optionalString alternativeIcons "--alternative"} \
${lib.optionalString boldPanelIcons "--bold"} \
diff --git a/pkgs/by-name/wo/wooting-udev-rules/package.nix b/pkgs/by-name/wo/wooting-udev-rules/package.nix
index 40047cdade55..94cb0fee812a 100644
--- a/pkgs/by-name/wo/wooting-udev-rules/package.nix
+++ b/pkgs/by-name/wo/wooting-udev-rules/package.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation {
homepage = "https://help.wooting.io/article/147-configuring-device-access-for-wootility-under-linux-udev-rules";
description = "udev rules that give NixOS permission to communicate with Wooting keyboards";
platforms = platforms.linux;
- license = "unknown";
+ # We think they are so simple that they are uncopyrightable
+ license = lib.licenses.publicDomain;
maintainers = with maintainers; [
returntoreality
];
diff --git a/pkgs/by-name/xe/xevd/package.nix b/pkgs/by-name/xe/xevd/package.nix
index fc5c80e31bbb..a98cfbecf0d9 100644
--- a/pkgs/by-name/xe/xevd/package.nix
+++ b/pkgs/by-name/xe/xevd/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
};
patches = lib.optionals (!lib.versionOlder "0.5.0" finalAttrs.version) (
- builtins.map fetchpatch2 [
+ map fetchpatch2 [
# Upstream accepted patches, should be dropped on next version bump.
{
url = "https://github.com/mpeg5/xevd/commit/7eda92a6ebb622189450f7b63cfd4dcd32fd6dff.patch?full_index=1";
@@ -63,8 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
optional isAarch64 (cmakeBool "ARM" true)
++ optional isDarwin (cmakeFeature "CMAKE_SYSTEM_NAME" "Darwin");
- env.NIX_CFLAGS_COMPILE = builtins.toString (
- builtins.map (w: "-Wno-" + w) (
+ env.NIX_CFLAGS_COMPILE = toString (
+ map (w: "-Wno-" + w) (
[
# Evaluate on version bump whether still necessary.
"sometimes-uninitialized"
diff --git a/pkgs/by-name/xe/xeve/package.nix b/pkgs/by-name/xe/xeve/package.nix
index f7513d9c1298..0b478314be39 100644
--- a/pkgs/by-name/xe/xeve/package.nix
+++ b/pkgs/by-name/xe/xeve/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
};
patches =
- builtins.map fetchpatch2 [
+ map fetchpatch2 [
{
url = "https://github.com/mpeg5/xeve/commit/954ed6e0494cd2438fd15c717c0146e88e582b33.patch?full_index=1";
hash = "sha256-//NtOUm1fqPFvOM955N6gF+QgmOdmuVunwx/3s/G/J8=";
@@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
optional isAarch64 (cmakeBool "ARM" true)
++ optional isDarwin (cmakeFeature "CMAKE_SYSTEM_NAME" "Darwin");
- env.NIX_CFLAGS_COMPILE = builtins.toString (
- builtins.map (w: "-Wno-" + w) [
+ env.NIX_CFLAGS_COMPILE = toString (
+ map (w: "-Wno-" + w) [
# Patch addressing an if without a body was rejected upstream, third
# line-based comment in this thread, https://github.com/mpeg5/xeve/pull/122#pullrequestreview-2187744305
# Evaluate on version bump whether still necessary.
diff --git a/pkgs/by-name/xg/xgboost/package.nix b/pkgs/by-name/xg/xgboost/package.nix
index 1f974022d373..fe0e48d2f95c 100644
--- a/pkgs/by-name/xg/xgboost/package.nix
+++ b/pkgs/by-name/xg/xgboost/package.nix
@@ -30,7 +30,7 @@ let
# #226165 rewrites cudaStdenv
effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv;
# Ensures we don't use the stdenv value by accident.
- stdenv = builtins.throw "Use effectiveStdenv instead of stdenv in xgboost derivation.";
+ stdenv = throw "Use effectiveStdenv instead of stdenv in xgboost derivation.";
in
effectiveStdenv.mkDerivation rec {
diff --git a/pkgs/by-name/xt/xtitle/package.nix b/pkgs/by-name/xt/xtitle/package.nix
index ec4e3867ad9a..de25b9ab7b2a 100644
--- a/pkgs/by-name/xt/xtitle/package.nix
+++ b/pkgs/by-name/xt/xtitle/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
description = "Outputs X window titles";
homepage = "https://github.com/baskerville/xtitle";
maintainers = with maintainers; [ meisternu ];
- license = "Custom";
+ license = lib.licenses.unlicense;
platforms = platforms.linux;
mainProgram = "xtitle";
};
diff --git a/pkgs/by-name/ya/yandex-cloud/update.py b/pkgs/by-name/ya/yandex-cloud/update.py
index d1b95ca50ec6..d6309118bf92 100644
--- a/pkgs/by-name/ya/yandex-cloud/update.py
+++ b/pkgs/by-name/ya/yandex-cloud/update.py
@@ -38,7 +38,7 @@ package_attrs = json.loads(subprocess.run(
"--json",
"--file", nixpkgs_path,
"--apply", """p: {
- dir = builtins.dirOf p.meta.position;
+ dir = dirOf p.meta.position;
version = p.version;
}""",
"--",
diff --git a/pkgs/by-name/yo/yoshimi/package.nix b/pkgs/by-name/yo/yoshimi/package.nix
index f7cf1f740c8a..f27f33c179a6 100644
--- a/pkgs/by-name/yo/yoshimi/package.nix
+++ b/pkgs/by-name/yo/yoshimi/package.nix
@@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "yoshimi";
- version = "2.3.4.1";
+ version = "2.3.5.1";
src = fetchFromGitHub {
owner = "Yoshimi";
repo = "yoshimi";
rev = version;
- hash = "sha256-d0NA4/uCC1jhksM7KOi+SXqeLiq9XZimXV0KUyRhWGs=";
+ hash = "sha256-A6laO4JhYFjuqBYmaQzZduHbDwdC+8zAVPqifbpJ8JQ=";
};
sourceRoot = "${src.name}/src";
diff --git a/pkgs/by-name/yu/yubioath-flutter/package.nix b/pkgs/by-name/yu/yubioath-flutter/package.nix
index fc2f05b6d545..4cc2f0100e89 100644
--- a/pkgs/by-name/yu/yubioath-flutter/package.nix
+++ b/pkgs/by-name/yu/yubioath-flutter/package.nix
@@ -1,6 +1,6 @@
{
lib,
- flutter332,
+ flutter335,
python3,
fetchFromGitHub,
pcre2,
@@ -17,15 +17,15 @@
gitUpdater,
}:
-flutter332.buildFlutterApplication rec {
+flutter335.buildFlutterApplication rec {
pname = "yubioath-flutter";
- version = "7.2.3";
+ version = "7.3.0";
src = fetchFromGitHub {
owner = "Yubico";
repo = "yubioath-flutter";
tag = version;
- hash = "sha256-n7BfstsuOTv8d16Y5oE/LDqlj0nVs/6196SnLaLN7h4=";
+ hash = "sha256-1Hr8ZDHXiLiYfQg4PEpmIuIJR/USbsGCgI4YZSex2Eg=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json b/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json
index 31cfa0f8a9eb..81dfc5fd4ac8 100644
--- a/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json
+++ b/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json
@@ -4,31 +4,31 @@
"dependency": "transitive",
"description": {
"name": "_fe_analyzer_shared",
- "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f",
+ "sha256": "f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "82.0.0"
+ "version": "88.0.0"
},
"analyzer": {
"dependency": "direct dev",
"description": {
"name": "analyzer",
- "sha256": "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0",
+ "sha256": "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "7.4.5"
+ "version": "8.1.1"
},
"analyzer_plugin": {
"dependency": "direct dev",
"description": {
"name": "analyzer_plugin",
- "sha256": "ee188b6df6c85f1441497c7171c84f1392affadc0384f71089cb10a3bc508cef",
+ "sha256": "dd574a0ab77de88b7d9c12bc4b626109a5ca9078216a79041a5c24c3a1bd103c",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.13.1"
+ "version": "0.13.7"
},
"archive": {
"dependency": "direct main",
@@ -64,11 +64,11 @@
"dependency": "direct main",
"description": {
"name": "base32",
- "sha256": "ddad4ebfedf93d4500818ed8e61443b734ffe7cf8a45c668c9b34ef6adde02e2",
+ "sha256": "37548444aaee8bd5e91db442ce69ee3a79d3652ed47c1fa7568aa3bb9af0aea5",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.1.3"
+ "version": "2.2.0"
},
"boolean_selector": {
"dependency": "transitive",
@@ -84,21 +84,21 @@
"dependency": "transitive",
"description": {
"name": "build",
- "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0",
+ "sha256": "5b887c55a0f734b433b3b2d89f9cd1f99eb636b17e268a5b4259258bc916504b",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.4.2"
+ "version": "4.0.0"
},
"build_config": {
"dependency": "transitive",
"description": {
"name": "build_config",
- "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33",
+ "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.1.2"
+ "version": "1.2.0"
},
"build_daemon": {
"dependency": "transitive",
@@ -110,35 +110,15 @@
"source": "hosted",
"version": "4.0.4"
},
- "build_resolvers": {
- "dependency": "transitive",
- "description": {
- "name": "build_resolvers",
- "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0",
- "url": "https://pub.dev"
- },
- "source": "hosted",
- "version": "2.4.4"
- },
"build_runner": {
"dependency": "direct dev",
"description": {
"name": "build_runner",
- "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99",
+ "sha256": "804c47c936df75e1911c19a4fb8c46fa8ff2b3099b9f2b2aa4726af3774f734b",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.4.15"
- },
- "build_runner_core": {
- "dependency": "transitive",
- "description": {
- "name": "build_runner_core",
- "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021",
- "url": "https://pub.dev"
- },
- "source": "hosted",
- "version": "8.0.0"
+ "version": "2.8.0"
},
"built_collection": {
"dependency": "transitive",
@@ -154,11 +134,11 @@
"dependency": "transitive",
"description": {
"name": "built_value",
- "sha256": "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27",
+ "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "8.10.1"
+ "version": "8.12.0"
},
"chalkdart": {
"dependency": "transitive",
@@ -184,11 +164,11 @@
"dependency": "transitive",
"description": {
"name": "checked_yaml",
- "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+ "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.0.3"
+ "version": "2.0.4"
},
"ci": {
"dependency": "transitive",
@@ -224,11 +204,11 @@
"dependency": "transitive",
"description": {
"name": "code_builder",
- "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
+ "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "4.10.1"
+ "version": "4.11.0"
},
"collection": {
"dependency": "direct main",
@@ -274,61 +254,91 @@
"dependency": "direct dev",
"description": {
"name": "custom_lint",
- "sha256": "409c485fd14f544af1da965d5a0d160ee57cd58b63eeaa7280a4f28cf5bda7f1",
+ "sha256": "751ee9440920f808266c3ec2553420dea56d3c7837dd2d62af76b11be3fcece5",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.7.5"
+ "version": "0.8.1"
},
"custom_lint_builder": {
"dependency": "direct dev",
"description": {
"name": "custom_lint_builder",
- "sha256": "107e0a43606138015777590ee8ce32f26ba7415c25b722ff0908a6f5d7a4c228",
+ "sha256": "1128db6f58e71d43842f3b9be7465c83f0c47f4dd8918f878dd6ad3b72a32072",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.7.5"
+ "version": "0.8.1"
},
"custom_lint_core": {
"dependency": "transitive",
"description": {
"name": "custom_lint_core",
- "sha256": "31110af3dde9d29fb10828ca33f1dce24d2798477b167675543ce3d208dee8be",
+ "sha256": "85b339346154d5646952d44d682965dfe9e12cae5febd706f0db3aa5010d6423",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.7.5"
+ "version": "0.8.1"
},
"custom_lint_visitor": {
"dependency": "transitive",
"description": {
"name": "custom_lint_visitor",
- "sha256": "cba5b6d7a6217312472bf4468cdf68c949488aed7ffb0eab792cd0b6c435054d",
+ "sha256": "446d68322747ec1c36797090de776aa72228818d3d80685a91ff524d163fee6d",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.0.0+7.4.5"
+ "version": "1.0.0+8.1.1"
},
"dart_style": {
"dependency": "transitive",
"description": {
"name": "dart_style",
- "sha256": "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af",
+ "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.1.0"
+ "version": "3.1.2"
+ },
+ "dbus": {
+ "dependency": "transitive",
+ "description": {
+ "name": "dbus",
+ "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.7.11"
},
"desktop_drop": {
"dependency": "direct main",
"description": {
"name": "desktop_drop",
- "sha256": "bd21017e0415632c85f6b813c846bc8c9811742507776dcf6abf91a14d946e98",
+ "sha256": "927511f590ce01ee90d0d80f79bc71b9c919d8522d01e495e89a00c6f4a4fb5b",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.6.0"
+ "version": "0.6.1"
+ },
+ "dispose_scope": {
+ "dependency": "transitive",
+ "description": {
+ "name": "dispose_scope",
+ "sha256": "48ec38ca2631c53c4f8fa96b294c801e55c335db5e3fb9f82cede150cfe5a2af",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.0"
+ },
+ "equatable": {
+ "dependency": "transitive",
+ "description": {
+ "name": "equatable",
+ "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.7"
},
"fake_async": {
"dependency": "transitive",
@@ -364,11 +374,11 @@
"dependency": "direct main",
"description": {
"name": "file_picker",
- "sha256": "77f8e81d22d2a07d0dee2c62e1dda71dc1da73bf43bb2d45af09727406167964",
+ "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "10.1.9"
+ "version": "10.3.3"
},
"fixnum": {
"dependency": "transitive",
@@ -412,11 +422,11 @@
"dependency": "transitive",
"description": {
"name": "flutter_plugin_android_lifecycle",
- "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
+ "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.0.28"
+ "version": "2.0.30"
},
"flutter_riverpod": {
"dependency": "direct main",
@@ -444,21 +454,21 @@
"dependency": "direct dev",
"description": {
"name": "freezed",
- "sha256": "6022db4c7bfa626841b2a10f34dd1e1b68e8f8f9650db6112dcdeeca45ca793c",
+ "sha256": "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.0.6"
+ "version": "3.2.3"
},
"freezed_annotation": {
"dependency": "direct main",
"description": {
"name": "freezed_annotation",
- "sha256": "c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b",
+ "sha256": "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.0.0"
+ "version": "3.1.0"
},
"frontend_server_client": {
"dependency": "transitive",
@@ -510,11 +520,11 @@
"dependency": "transitive",
"description": {
"name": "http",
- "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
+ "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.4.0"
+ "version": "1.5.0"
},
"http_multi_server": {
"dependency": "transitive",
@@ -562,16 +572,6 @@
"source": "hosted",
"version": "1.0.5"
},
- "js": {
- "dependency": "transitive",
- "description": {
- "name": "js",
- "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
- "url": "https://pub.dev"
- },
- "source": "hosted",
- "version": "0.7.2"
- },
"json_annotation": {
"dependency": "direct main",
"description": {
@@ -586,41 +586,41 @@
"dependency": "direct dev",
"description": {
"name": "json_serializable",
- "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c",
+ "sha256": "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.9.5"
+ "version": "6.11.1"
},
"leak_tracker": {
"dependency": "transitive",
"description": {
"name": "leak_tracker",
- "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
+ "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "10.0.9"
+ "version": "11.0.2"
},
"leak_tracker_flutter_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_flutter_testing",
- "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
+ "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.0.9"
+ "version": "3.0.10"
},
"leak_tracker_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_testing",
- "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+ "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.0.1"
+ "version": "3.0.2"
},
"lint": {
"dependency": "direct dev",
@@ -685,11 +685,11 @@
"dependency": "direct main",
"description": {
"name": "material_symbols_icons",
- "sha256": "7c50901b39d1ad645ee25d920aed008061e1fd541a897b4ebf2c01d966dbf16b",
+ "sha256": "9e2042673fda5dda0b77e262220b3c34cac5806a3833da85522e41bb27fbf6c0",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "4.2815.1"
+ "version": "4.2873.0"
},
"menu_base": {
"dependency": "transitive",
@@ -702,7 +702,7 @@
"version": "0.1.1"
},
"meta": {
- "dependency": "transitive",
+ "dependency": "direct dev",
"description": {
"name": "meta",
"sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
@@ -765,21 +765,21 @@
"dependency": "transitive",
"description": {
"name": "path_provider_android",
- "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
+ "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.2.17"
+ "version": "2.2.18"
},
"path_provider_foundation": {
"dependency": "transitive",
"description": {
"name": "path_provider_foundation",
- "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
+ "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.4.1"
+ "version": "2.4.2"
},
"path_provider_linux": {
"dependency": "transitive",
@@ -811,15 +811,35 @@
"source": "hosted",
"version": "2.3.0"
},
+ "patrol_finders": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "patrol_finders",
+ "sha256": "4a658d7d560de523f92deb3fa3326c78747ca0bf7e7f4b8788c012463138b628",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.9.0"
+ },
+ "patrol_log": {
+ "dependency": "transitive",
+ "description": {
+ "name": "patrol_log",
+ "sha256": "9fed4143980df1e3bbcfa00d0b443c7d68f04f9132317b7698bbc37f8a5a58c5",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.5.0"
+ },
"petitparser": {
"dependency": "transitive",
"description": {
"name": "petitparser",
- "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+ "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.1.0"
+ "version": "7.0.1"
},
"platform": {
"dependency": "transitive",
@@ -855,21 +875,21 @@
"dependency": "transitive",
"description": {
"name": "posix",
- "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62",
+ "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.0.2"
+ "version": "6.0.3"
},
"process": {
"dependency": "transitive",
"description": {
"name": "process",
- "sha256": "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d",
+ "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "5.0.3"
+ "version": "5.0.5"
},
"pub_semver": {
"dependency": "transitive",
@@ -984,11 +1004,11 @@
"dependency": "transitive",
"description": {
"name": "shared_preferences_android",
- "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
+ "sha256": "a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.4.10"
+ "version": "2.4.12"
},
"shared_preferences_foundation": {
"dependency": "transitive",
@@ -1080,21 +1100,21 @@
"dependency": "transitive",
"description": {
"name": "source_gen",
- "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b",
+ "sha256": "ccf30b0c9fbcd79d8b6f5bfac23199fb354938436f62475e14aea0f29ee0f800",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.0.0"
+ "version": "4.0.1"
},
"source_helper": {
"dependency": "transitive",
"description": {
"name": "source_helper",
- "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c",
+ "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.3.5"
+ "version": "1.3.8"
},
"source_span": {
"dependency": "transitive",
@@ -1190,40 +1210,21 @@
"dependency": "transitive",
"description": {
"name": "test_api",
- "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+ "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.7.4"
- },
- "test_res": {
- "dependency": "direct dev",
- "description": {
- "path": "integration_test/test_res",
- "relative": true
- },
- "source": "path",
- "version": "0.0.0"
- },
- "timing": {
- "dependency": "transitive",
- "description": {
- "name": "timing",
- "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",
- "url": "https://pub.dev"
- },
- "source": "hosted",
- "version": "1.0.2"
+ "version": "0.7.6"
},
"tray_manager": {
"dependency": "direct main",
"description": {
"name": "tray_manager",
- "sha256": "ad18c4cd73003097d182884bacb0578ad2865f3ab842a0ad00f6d043ed49eaf0",
+ "sha256": "537e539f48cd82d8ee2240d4330158c7b44c7e043e8e18b5811f2f8f6b7df25a",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.5.0"
+ "version": "0.5.1"
},
"typed_data": {
"dependency": "transitive",
@@ -1249,31 +1250,31 @@
"dependency": "direct main",
"description": {
"name": "url_launcher",
- "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+ "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.3.1"
+ "version": "6.3.2"
},
"url_launcher_android": {
"dependency": "transitive",
"description": {
"name": "url_launcher_android",
- "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
+ "sha256": "07cffecb7d68cbc6437cd803d5f11a86fe06736735c3dfe46ff73bcb0f958eed",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.3.16"
+ "version": "6.3.21"
},
"url_launcher_ios": {
"dependency": "transitive",
"description": {
"name": "url_launcher_ios",
- "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
+ "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.3.3"
+ "version": "6.3.4"
},
"url_launcher_linux": {
"dependency": "transitive",
@@ -1289,11 +1290,11 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_macos",
- "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
+ "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.2.2"
+ "version": "3.2.3"
},
"url_launcher_platform_interface": {
"dependency": "transitive",
@@ -1339,11 +1340,11 @@
"dependency": "direct main",
"description": {
"name": "vector_graphics",
- "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de",
+ "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.1.18"
+ "version": "1.1.19"
},
"vector_graphics_codec": {
"dependency": "transitive",
@@ -1359,41 +1360,41 @@
"dependency": "direct main",
"description": {
"name": "vector_graphics_compiler",
- "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331",
+ "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.1.17"
+ "version": "1.1.19"
},
"vector_math": {
"dependency": "transitive",
"description": {
"name": "vector_math",
- "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+ "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.1.4"
+ "version": "2.2.0"
},
"vm_service": {
"dependency": "transitive",
"description": {
"name": "vm_service",
- "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
+ "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "15.0.0"
+ "version": "15.0.2"
},
"watcher": {
"dependency": "transitive",
"description": {
"name": "watcher",
- "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
+ "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.1.1"
+ "version": "1.1.3"
},
"web": {
"dependency": "transitive",
@@ -1439,11 +1440,11 @@
"dependency": "transitive",
"description": {
"name": "win32",
- "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
+ "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "5.13.0"
+ "version": "5.14.0"
},
"window_manager": {
"dependency": "direct main",
@@ -1470,11 +1471,11 @@
"dependency": "transitive",
"description": {
"name": "xml",
- "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+ "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.5.0"
+ "version": "6.6.1"
},
"yaml": {
"dependency": "transitive",
@@ -1488,7 +1489,7 @@
}
},
"sdks": {
- "dart": ">=3.8.0 <4.0.0",
- "flutter": ">=3.27.0"
+ "dart": ">=3.9.0 <4.0.0",
+ "flutter": ">=3.35.0"
}
}
diff --git a/pkgs/by-name/zs/zsh/package.nix b/pkgs/by-name/zs/zsh/package.nix
index 29ed6e6c78f5..5db470dc4b25 100644
--- a/pkgs/by-name/zs/zsh/package.nix
+++ b/pkgs/by-name/zs/zsh/package.nix
@@ -182,7 +182,7 @@ stdenv.mkDerivation {
completion, shell functions (with autoloading), a history mechanism, and
a host of other features.
'';
- license = "MIT-like";
+ license = lib.licenses.mit-modern;
homepage = "https://www.zsh.org/";
maintainers = with lib.maintainers; [
pSub
diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix
index a1e95af55ab6..28ab7abb556f 100644
--- a/pkgs/by-name/zx/zxtune/package.nix
+++ b/pkgs/by-name/zx/zxtune/package.nix
@@ -115,11 +115,11 @@ stdenv.mkDerivation rec {
in
''
runHook preBuild
- make ${builtins.toString makeOptsCommon} -C apps/xtractor
- make ${builtins.toString makeOptsCommon} -C apps/zxtune123
+ make ${toString makeOptsCommon} -C apps/xtractor
+ make ${toString makeOptsCommon} -C apps/zxtune123
''
+ lib.optionalString withQt ''
- make ${builtins.toString (makeOptsCommon ++ makeOptsQt)} -C apps/zxtune-qt
+ make ${toString (makeOptsCommon ++ makeOptsQt)} -C apps/zxtune-qt
''
+ ''
runHook postBuild
diff --git a/pkgs/common-updater/combinators.nix b/pkgs/common-updater/combinators.nix
index eafc530ceaed..e857f0fb4b88 100644
--- a/pkgs/common-updater/combinators.nix
+++ b/pkgs/common-updater/combinators.nix
@@ -52,7 +52,7 @@ let
arg:
if builtins.isPath arg then
{
- args = args ++ [ { __rawShell = "\"\$${builtins.toString maxArgIndex}\""; } ];
+ args = args ++ [ { __rawShell = "\"\$${toString maxArgIndex}\""; } ];
maxArgIndex = maxArgIndex + 1;
paths = paths ++ [ arg ];
}
@@ -144,7 +144,7 @@ rec {
scripts:
let
- scriptsNormalized = builtins.map normalize scripts;
+ scriptsNormalized = map normalize scripts;
in
let
scripts = scriptsNormalized;
@@ -174,7 +174,7 @@ rec {
builtins.length (
lib.unique (
builtins.filter (attrPath: attrPath != null) (
- builtins.map (
+ map (
{
attrPath ? null,
...
@@ -187,7 +187,7 @@ rec {
) "Combining update scripts with different attr paths is currently unsupported.";
{
- command = commandsToShellInvocation (builtins.map ({ command, ... }: command) scripts);
+ command = commandsToShellInvocation (map ({ command, ... }: command) scripts);
supportedFeatures =
if hasCommitSupport then
[ "commit" ]
diff --git a/pkgs/common-updater/unstable-updater.nix b/pkgs/common-updater/unstable-updater.nix
index 9727fabd0096..8897e93616a3 100644
--- a/pkgs/common-updater/unstable-updater.nix
+++ b/pkgs/common-updater/unstable-updater.nix
@@ -164,7 +164,7 @@ let
in
[
(lib.getExe updateScript)
- "--url=${builtins.toString url}"
+ "--url=${toString url}"
"--tag-format=${tagFormat}"
]
++ lib.optionals (branch != null) [
diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix
index 52974e657f9d..7269a62c2837 100644
--- a/pkgs/data/fonts/iosevka/comfy.nix
+++ b/pkgs/data/fonts/iosevka/comfy.nix
@@ -73,7 +73,7 @@ let
});
in
builtins.listToAttrs (
- builtins.map (set: {
+ map (set: {
name = set;
value = makeIosevkaFont set;
}) sets
diff --git a/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix b/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix
index 318a65309921..4419eeb25138 100644
--- a/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix
+++ b/pkgs/desktops/gnome/extensions/buildGnomeExtension.nix
@@ -27,11 +27,11 @@ let
stdenv.mkDerivation {
pname = "gnome-shell-extension-${pname}";
- version = builtins.toString version;
+ version = toString version;
src = fetchzip {
url = "https://extensions.gnome.org/extension-data/${
builtins.replaceStrings [ "@" ] [ "" ] uuid
- }.v${builtins.toString version}.shell-extension.zip";
+ }.v${toString version}.shell-extension.zip";
inherit sha256;
stripRoot = false;
# The download URL may change content over time. This is because the
diff --git a/pkgs/desktops/gnome/update.nix b/pkgs/desktops/gnome/update.nix
index 481aeb831542..94b36c9227dc 100644
--- a/pkgs/desktops/gnome/update.nix
+++ b/pkgs/desktops/gnome/update.nix
@@ -29,7 +29,7 @@ let
minorAvailable =
builtins.length versionComponents > 1 && builtins.match "[0-9]+" minorVersion != null;
nextMinor = builtins.fromJSON minorVersion + 1;
- upperBound = "${lib.versions.major packageVersion}.${builtins.toString nextMinor}";
+ upperBound = "${lib.versions.major packageVersion}.${toString nextMinor}";
in
if builtins.isBool freeze then
lib.optionals (freeze && minorAvailable) [ upperBound ]
diff --git a/pkgs/desktops/lomiri/applications/lomiri-calculator-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-calculator-app/default.nix
index 9c89a3279396..50115d09e14d 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-calculator-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-calculator-app/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Powerful and easy to use calculator for Ubuntu Touch, with calculations history and formula validation";
homepage = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app";
changelog = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app/-/blob/${
- if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+ if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = lib.licenses.gpl3Only;
mainProgram = "lomiri-calculator-app";
diff --git a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
index cb7b7ca5e07e..d35e0045c989 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "File Manager application for Ubuntu Touch devices";
homepage = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app";
changelog = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/blob/${
- if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+ if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = lib.licenses.gpl3Only;
mainProgram = "lomiri-filemanager-app";
diff --git a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
index 2c8c6f1b6293..7ab53bf38eb2 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
@@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Photo gallery application for Ubuntu Touch devices";
homepage = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app";
changelog = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/blob/${
- if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+ if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = with lib.licenses; [
gpl3Only
diff --git a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix
index ed9a987e4ae3..2e02c75ab969 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix
@@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Media Player application for Ubuntu Touch devices";
homepage = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app";
changelog = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app/-/blob/${
- if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+ if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = with lib.licenses; [
gpl3Only
diff --git a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
index 49fc854d2fff..6771c1e29f7b 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Default Music application for Ubuntu devices";
homepage = "https://gitlab.com/ubports/development/apps/lomiri-music-app";
changelog = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/blob/${
- if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+ if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = with lib.licenses; [
gpl3Only
diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
index b1bcd75d3a48..4b5b90001e50 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
@@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "System Settings application for Lomiri";
homepage = "https://gitlab.com/ubports/development/core/lomiri-system-settings";
changelog = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/blob/${
- if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+ if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = licenses.gpl3Only;
mainProgram = "lomiri-system-settings";
diff --git a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
index ed6ebd0a68a0..cd47cbec28cd 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Terminal app for desktop and mobile devices";
homepage = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app";
changelog = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/blob/${
- if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+ if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = lib.licenses.gpl3Only;
mainProgram = "lomiri-terminal-app";
diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
index cfc8b18cbc09..509e569123c1 100644
--- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
@@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Performs uploads and downloads from a centralized location";
homepage = "https://gitlab.com/ubports/development/core/lomiri-download-manager";
changelog = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/blob/${
- if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+ if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = lib.licenses.lgpl3Only;
teams = [ lib.teams.lomiri ];
diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
index 34616ac586fc..2e8f725a3c9d 100644
--- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Ayatana indiator exporting the network settings menu through D-Bus";
homepage = "https://gitlab.com/ubports/development/core/lomiri-indicator-network";
changelog = "https://gitlab.com/ubports/development/core/lomiri-indicator-network/-/blob/${
- if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+ if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = lib.licenses.gpl3Only;
teams = [ lib.teams.lomiri ];
diff --git a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix
index fce7f3ec2836..5326211f9793 100644
--- a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Policy kit agent for the Lomiri desktop";
homepage = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent";
changelog = "https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/blob/${
- if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+ if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = lib.licenses.gpl3Only;
teams = [ lib.teams.lomiri ];
diff --git a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
index d7a1e7003c98..d28de698e310 100644
--- a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
@@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
homepage = "https://gitlab.com/ubports/development/core/lomiri-url-dispatcher";
changelog = "https://gitlab.com/ubports/development/core/lomiri-url-dispatcher/-/blob/${
- if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+ if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = with lib.licenses; [
lgpl3Only
diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
index b8391e001a17..2fd3c1ca05b1 100644
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Media scanner service & access library";
homepage = "https://gitlab.com/ubports/development/core/mediascanner2";
changelog = "https://gitlab.com/ubports/development/core/mediascanner2/-/blob/${
- if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+ if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
}/ChangeLog";
license = lib.licenses.gpl3Only;
teams = [ lib.teams.lomiri ];
diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix
index 18772e8cac6d..1f0a82871ea0 100644
--- a/pkgs/development/ada-modules/gnatprove/default.nix
+++ b/pkgs/development/ada-modules/gnatprove/default.nix
@@ -78,7 +78,7 @@ let
thisSpark =
spark2014.${gnat_version}
- or (builtins.throw "GNATprove depends on a specific GNAT version and can't be built using GNAT ${gnat_version}.");
+ or (throw "GNATprove depends on a specific GNAT version and can't be built using GNAT ${gnat_version}.");
in
stdenv.mkDerivation {
diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix
index ffc5e6a58979..05d2aa81bae9 100644
--- a/pkgs/development/beam-modules/mix-release.nix
+++ b/pkgs/development/beam-modules/mix-release.nix
@@ -86,7 +86,7 @@
}@attrs:
let
# Remove non standard attributes that cannot be coerced to strings
- overridable = builtins.removeAttrs attrs [
+ overridable = removeAttrs attrs [
"compileFlags"
"erlangCompilerOptions"
"mixNixDeps"
diff --git a/pkgs/development/compilers/chicken/4/eggDerivation.nix b/pkgs/development/compilers/chicken/4/eggDerivation.nix
index cf361be35b90..dc3c3bb07dd1 100644
--- a/pkgs/development/compilers/chicken/4/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/4/eggDerivation.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation (
}
// args.meta or { };
}
- // (builtins.removeAttrs args [
+ // (removeAttrs args [
"name"
"buildInputs"
"meta"
diff --git a/pkgs/development/compilers/chicken/5/default.nix b/pkgs/development/compilers/chicken/5/default.nix
index d53588d1b51c..bead4e3f19cf 100644
--- a/pkgs/development/compilers/chicken/5/default.nix
+++ b/pkgs/development/compilers/chicken/5/default.nix
@@ -58,6 +58,7 @@ lib.makeScope newScope (self: {
"bsd" = lib.licenses.bsd3;
"bsd-1-clause" = lib.licenses.bsd1;
"bsd-2-clause" = lib.licenses.bsd2;
+ "bsd-3" = lib.licenses.bsd3;
"bsd-3-clause" = lib.licenses.bsd3;
"gpl" = lib.licenses.gpl3Only;
"gpl-2" = lib.licenses.gpl2Only;
@@ -75,6 +76,7 @@ lib.makeScope newScope (self: {
"public-domain" = lib.licenses.publicDomain;
"srfi" = lib.licenses.bsd3;
"unicode" = lib.licenses.ucd;
+ "unknown" = lib.licenses.free;
"zlib-acknowledgement" = lib.licenses.zlib;
}
).${license} or license;
diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix
index a4da9793a1b4..6629a30ad973 100644
--- a/pkgs/development/compilers/chicken/5/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix
@@ -78,7 +78,7 @@ in
}
// args.meta or { };
}
- // builtins.removeAttrs args [
+ // removeAttrs args [
"name"
"pname"
"version"
diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix
index c7c29f12caa4..7914b7d7771e 100644
--- a/pkgs/development/compilers/crystal/build-package.nix
+++ b/pkgs/development/compilers/crystal/build-package.nix
@@ -41,7 +41,7 @@ assert (
]
);
let
- mkDerivationArgs = builtins.removeAttrs args [
+ mkDerivationArgs = removeAttrs args [
"format"
"installManPages"
"lockFile"
diff --git a/pkgs/development/compilers/gcc/ng/common/default.nix b/pkgs/development/compilers/gcc/ng/common/default.nix
index 98ce3bb89c1e..3f2e3b3b189d 100644
--- a/pkgs/development/compilers/gcc/ng/common/default.nix
+++ b/pkgs/development/compilers/gcc/ng/common/default.nix
@@ -59,12 +59,11 @@ let
;
src = monorepoSrc;
versionDir =
- (builtins.toString ../.)
- + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}";
+ (toString ../.) + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}";
getVersionFile =
p:
builtins.path {
- name = builtins.baseNameOf p;
+ name = baseNameOf p;
path =
let
patches = args.patchesFn (import ./patches.nix);
diff --git a/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix b/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix
index 284792e16830..7b294b56bbae 100644
--- a/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix
+++ b/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix
@@ -165,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: {
"gcc_cv_target_thread_file=single"
# $CC cannot link binaries, let alone run then
"cross_compiling=true"
- "--with-toolexeclibdir=${builtins.placeholder "dev"}/lib"
+ "--with-toolexeclibdir=${placeholder "dev"}/lib"
];
# Set the variable back the way it was, see corresponding code in
diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
index db97c1e3f54c..7be63b3a0a5f 100644
--- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
@@ -24,7 +24,7 @@
}@args:
let
- extraArgs = builtins.removeAttrs args [
+ extraArgs = removeAttrs args [
"lib"
"stdenv"
"alsa-lib"
diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
index 5276c5719dbd..b8c061f88c7d 100644
--- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
@@ -14,7 +14,7 @@
}@args:
let
- extraArgs = builtins.removeAttrs args [
+ extraArgs = removeAttrs args [
"lib"
"stdenv"
"autoPatchelfHook"
diff --git a/pkgs/development/compilers/idris2/build-idris.nix b/pkgs/development/compilers/idris2/build-idris.nix
index 40a7d275b7df..9a5a1f2818d7 100644
--- a/pkgs/development/compilers/idris2/build-idris.nix
+++ b/pkgs/development/compilers/idris2/build-idris.nix
@@ -50,7 +50,7 @@ let
libSuffix = "lib/${idrName}";
libDirs = libs: (lib.makeSearchPath libSuffix libs) + ":${idris2}/${idrName}";
supportDir = "${idris2}/${idrName}/lib";
- drvAttrs = builtins.removeAttrs attrs [
+ drvAttrs = removeAttrs attrs [
"ipkgName"
"idrisLibraries"
];
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 5de10bf97f0e..5a9088864e0d 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -74,12 +74,11 @@ let
;
src = monorepoSrc;
versionDir =
- (builtins.toString ../.)
- + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}";
+ (toString ../.) + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}";
getVersionFile =
p:
builtins.path {
- name = builtins.baseNameOf p;
+ name = baseNameOf p;
path =
let
patches = args.patchesFn (import ./patches.nix);
diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index 279be22f7757..ab080daa1d1a 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -272,7 +272,7 @@ stdenv.mkDerivation (
# and thus fails under the sandbox:
''
substituteInPlace unittests/TargetParser/Host.cpp \
- --replace-fail '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers"}"
+ --replace-fail '/usr/bin/sw_vers' "${(toString darwin.DarwinTools) + "/bin/sw_vers"}"
''
+
# This test tries to call the intrinsics `@llvm.roundeven.f32` and
diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix
index 3dccdf218905..d6fc31337fbd 100644
--- a/pkgs/development/compilers/mlton/20130715.nix
+++ b/pkgs/development/compilers/mlton/20130715.nix
@@ -131,5 +131,5 @@ stdenv.mkDerivation rec {
cp -r $(pwd)/install/${usr_prefix}/man $out
'';
- meta = import ./meta.nix;
+ meta = import ./meta.nix { inherit lib; };
}
diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/pkgs/development/compilers/mlton/20180207-binary.nix
index e348d88a318c..b60b5fa8f015 100644
--- a/pkgs/development/compilers/mlton/20180207-binary.nix
+++ b/pkgs/development/compilers/mlton/20180207-binary.nix
@@ -64,5 +64,5 @@ stdenv.mkDerivation rec {
done
'';
- meta = import ./meta.nix;
+ meta = import ./meta.nix { inherit lib; };
}
diff --git a/pkgs/development/compilers/mlton/20210117-binary.nix b/pkgs/development/compilers/mlton/20210117-binary.nix
index 9ed63cff6e3c..2e4f9d21a6c6 100644
--- a/pkgs/development/compilers/mlton/20210117-binary.nix
+++ b/pkgs/development/compilers/mlton/20210117-binary.nix
@@ -84,5 +84,5 @@ stdenv.mkDerivation rec {
done
'';
- meta = import ./meta.nix;
+ meta = import ./meta.nix { inherit lib; };
}
diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix
index 922ff25c77a2..91735196c1c7 100644
--- a/pkgs/development/compilers/mlton/from-git-source.nix
+++ b/pkgs/development/compilers/mlton/from-git-source.nix
@@ -1,4 +1,5 @@
{
+ lib,
fetchgit,
gmp,
mltonBootstrap,
@@ -45,5 +46,5 @@ stdenv.mkDerivation {
doCheck = true;
- meta = import ./meta.nix;
+ meta = import ./meta.nix { inherit lib; };
}
diff --git a/pkgs/development/compilers/mlton/meta.nix b/pkgs/development/compilers/mlton/meta.nix
index 38a4439c9ff5..a967c741f819 100644
--- a/pkgs/development/compilers/mlton/meta.nix
+++ b/pkgs/development/compilers/mlton/meta.nix
@@ -1,3 +1,6 @@
+{
+ lib,
+}:
{
description = "Open-source, whole-program, optimizing Standard ML compiler";
longDescription = ''
@@ -10,7 +13,7 @@
'';
homepage = "http://mlton.org/";
- license = "bsd";
+ license = lib.licenses.smlnj;
platforms = [
"i686-linux"
"x86_64-linux"
diff --git a/pkgs/development/compilers/opensmalltalk-vm/default.nix b/pkgs/development/compilers/opensmalltalk-vm/default.nix
index 357ffecc6c53..f0cff1818e0e 100644
--- a/pkgs/development/compilers/opensmalltalk-vm/default.nix
+++ b/pkgs/development/compilers/opensmalltalk-vm/default.nix
@@ -197,5 +197,5 @@ if (!config.allowAliases && !(vmsByPlatform ? platform)) then
else
vmsByPlatform.${platform} or (throw (
"Unsupported platform ${platform}: only the following platforms are supported: "
- + builtins.toString (builtins.attrNames vmsByPlatform)
+ + toString (builtins.attrNames vmsByPlatform)
))
diff --git a/pkgs/development/compilers/rust/1_89.nix b/pkgs/development/compilers/rust/1_89.nix
index 5690db67d8c3..77b5fc06dfc7 100644
--- a/pkgs/development/compilers/rust/1_89.nix
+++ b/pkgs/development/compilers/rust/1_89.nix
@@ -86,7 +86,7 @@ import ./default.nix
}
(
- builtins.removeAttrs args [
+ removeAttrs args [
"llvmPackages_20"
"llvm_20"
"wrapCCWith"
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 94bb15d58e70..315016ef7aea 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -218,8 +218,8 @@ stdenv.mkDerivation (self: {
"--prefix=$out"
"--xc-host=${lib.escapeShellArg bootstrapLisp'}"
]
- ++ builtins.map (x: "--with-${x}") self.enableFeatures
- ++ builtins.map (x: "--without-${x}") self.disableFeatures
+ ++ map (x: "--with-${x}") self.enableFeatures
+ ++ map (x: "--without-${x}") self.disableFeatures
++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [
"--arch=arm64"
];
diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix
index ecd34e60221c..e295437ab236 100644
--- a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix
+++ b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix
@@ -83,7 +83,7 @@ let
binaryBytecode
];
description = "${brand-name}, prebuilt OpenJDK binary";
- platforms = builtins.map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms
+ platforms = map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms
maintainers = with maintainers; [ taku0 ];
teams = [ teams.java ];
inherit knownVulnerabilities;
diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix
index 9b1cb142f5f8..33855e06f467 100644
--- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix
@@ -139,7 +139,7 @@ let
binaryBytecode
];
description = "${brand-name}, prebuilt OpenJDK binary";
- platforms = builtins.map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms
+ platforms = map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms
maintainers = with maintainers; [ taku0 ];
teams = [ teams.java ];
inherit knownVulnerabilities;
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index b494ce36ab12..586657b523f4 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -104,7 +104,7 @@ let
let
roundUpToEven = num: num + lib.mod num 2;
in
- "vala_${lib.versions.major version}_${builtins.toString (roundUpToEven (lib.toInt (lib.versions.minor version)))}";
+ "vala_${lib.versions.major version}_${toString (roundUpToEven (lib.toInt (lib.versions.minor version)))}";
packageName = "vala";
freeze = true;
};
diff --git a/pkgs/development/compilers/zulu/11.nix b/pkgs/development/compilers/zulu/11.nix
index 6f5d0b66767a..0ff3cb7e1c56 100644
--- a/pkgs/development/compilers/zulu/11.nix
+++ b/pkgs/development/compilers/zulu/11.nix
@@ -50,5 +50,5 @@ callPackage ./common.nix (
};
};
}
- // builtins.removeAttrs args [ "callPackage" ]
+ // removeAttrs args [ "callPackage" ]
)
diff --git a/pkgs/development/compilers/zulu/17.nix b/pkgs/development/compilers/zulu/17.nix
index 622f75365b4f..45abea1fc783 100644
--- a/pkgs/development/compilers/zulu/17.nix
+++ b/pkgs/development/compilers/zulu/17.nix
@@ -50,5 +50,5 @@ callPackage ./common.nix (
};
};
}
- // builtins.removeAttrs args [ "callPackage" ]
+ // removeAttrs args [ "callPackage" ]
)
diff --git a/pkgs/development/compilers/zulu/21.nix b/pkgs/development/compilers/zulu/21.nix
index 21516f45b3d2..cd9bbcb509a6 100644
--- a/pkgs/development/compilers/zulu/21.nix
+++ b/pkgs/development/compilers/zulu/21.nix
@@ -51,5 +51,5 @@ callPackage ./common.nix (
};
};
}
- // builtins.removeAttrs args [ "callPackage" ]
+ // removeAttrs args [ "callPackage" ]
)
diff --git a/pkgs/development/compilers/zulu/23.nix b/pkgs/development/compilers/zulu/23.nix
index 512a0f0813d0..836d545ab2af 100644
--- a/pkgs/development/compilers/zulu/23.nix
+++ b/pkgs/development/compilers/zulu/23.nix
@@ -50,5 +50,5 @@ callPackage ./common.nix (
};
};
}
- // builtins.removeAttrs args [ "callPackage" ]
+ // removeAttrs args [ "callPackage" ]
)
diff --git a/pkgs/development/compilers/zulu/24.nix b/pkgs/development/compilers/zulu/24.nix
index 2bedd55b0093..36a545742d06 100644
--- a/pkgs/development/compilers/zulu/24.nix
+++ b/pkgs/development/compilers/zulu/24.nix
@@ -51,5 +51,5 @@ callPackage ./common.nix (
};
};
}
- // builtins.removeAttrs args [ "callPackage" ]
+ // removeAttrs args [ "callPackage" ]
)
diff --git a/pkgs/development/compilers/zulu/25.nix b/pkgs/development/compilers/zulu/25.nix
index e0be95086313..19808de0a0af 100644
--- a/pkgs/development/compilers/zulu/25.nix
+++ b/pkgs/development/compilers/zulu/25.nix
@@ -54,5 +54,5 @@ callPackage ./common.nix (
};
};
}
- // builtins.removeAttrs args [ "callPackage" ]
+ // removeAttrs args [ "callPackage" ]
)
diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix
index 03a6b1c211c4..fff0903db91c 100644
--- a/pkgs/development/compilers/zulu/8.nix
+++ b/pkgs/development/compilers/zulu/8.nix
@@ -50,5 +50,5 @@ callPackage ./common.nix (
};
};
}
- // builtins.removeAttrs args [ "callPackage" ]
+ // removeAttrs args [ "callPackage" ]
)
diff --git a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
index a433a52c7394..529716220351 100644
--- a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
+++ b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
@@ -75,7 +75,7 @@ in
buildInputs = prevAttrs.buildInputs or [ ] ++ [ cutensor ];
cmakeFlags = prevAttrs.cmakeFlags or [ ] ++ [
- "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${builtins.placeholder "out"}/bin"
+ "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${placeholder "out"}/bin"
];
# CUTENSOR_ROOT is double escaped
diff --git a/pkgs/development/hare-third-party/hare-compress/default.nix b/pkgs/development/hare-third-party/hare-compress/default.nix
index d9065f3bcd2c..ce9103cddfe1 100644
--- a/pkgs/development/hare-third-party/hare-compress/default.nix
+++ b/pkgs/development/hare-third-party/hare-compress/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ hareHook ];
- makeFlags = [ "PREFIX=${builtins.placeholder "out"}" ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
doCheck = true;
diff --git a/pkgs/development/hare-third-party/hare-ev/default.nix b/pkgs/development/hare-third-party/hare-ev/default.nix
index d7a004954f96..42b6044ca49b 100644
--- a/pkgs/development/hare-third-party/hare-ev/default.nix
+++ b/pkgs/development/hare-third-party/hare-ev/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
nativeCheckInputs = [ hareHook ];
- makeFlags = [ "PREFIX=${builtins.placeholder "out"}" ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
doCheck = true;
diff --git a/pkgs/development/hare-third-party/hare-json/default.nix b/pkgs/development/hare-third-party/hare-json/default.nix
index a96de33b914a..a1ce306c3615 100644
--- a/pkgs/development/hare-third-party/hare-json/default.nix
+++ b/pkgs/development/hare-third-party/hare-json/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ hareHook ];
- makeFlags = [ "PREFIX=${builtins.placeholder "out"}" ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
doCheck = true;
diff --git a/pkgs/development/hare-third-party/hare-png/default.nix b/pkgs/development/hare-third-party/hare-png/default.nix
index fba410eb8ffd..1eb6072dfe2e 100644
--- a/pkgs/development/hare-third-party/hare-png/default.nix
+++ b/pkgs/development/hare-third-party/hare-png/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ hareHook ];
propagatedBuildInputs = [ hareThirdParty.hare-compress ];
- makeFlags = [ "PREFIX=${builtins.placeholder "out"}" ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
doCheck = true;
diff --git a/pkgs/development/hare-third-party/hare-ssh/default.nix b/pkgs/development/hare-third-party/hare-ssh/default.nix
index bf6e043fb977..8e29c6965c58 100644
--- a/pkgs/development/hare-third-party/hare-ssh/default.nix
+++ b/pkgs/development/hare-third-party/hare-ssh/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ hareHook ];
- makeFlags = [ "PREFIX=${builtins.placeholder "out"}" ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
doCheck = true;
diff --git a/pkgs/development/hare-third-party/hare-toml/default.nix b/pkgs/development/hare-third-party/hare-toml/default.nix
index cce8f8f744ca..0002db4c2fc2 100644
--- a/pkgs/development/hare-third-party/hare-toml/default.nix
+++ b/pkgs/development/hare-third-party/hare-toml/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
hareHook
];
- makeFlags = [ "PREFIX=${builtins.placeholder "out"}" ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
checkTarget = "check_local";
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 6767cfa7af50..df4b836e9743 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -397,9 +397,9 @@ let
# closePropagationFast.
propagatePlainBuildInputs =
drvs:
- builtins.map (i: i.val) (
+ map (i: i.val) (
builtins.genericClosure {
- startSet = builtins.map (drv: {
+ startSet = map (drv: {
key = drv.outPath;
val = drv;
}) (builtins.filter propagateValue drvs);
@@ -795,7 +795,7 @@ lib.fix (
checkFlagsArray+=(
"--show-details=streaming"
"--test-wrapper=${testWrapperScript}"
- ${lib.escapeShellArgs (builtins.map (opt: "--test-option=${opt}") testFlags)}
+ ${lib.escapeShellArgs (map (opt: "--test-option=${opt}") testFlags)}
)
export NIX_GHC_PACKAGE_PATH_FOR_TEST="''${NIX_GHC_PACKAGE_PATH_FOR_TEST:-$packageConfDir:}"
${setupCommand} test ${testTargetsString} $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"}
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 1ec268e78c36..fb5d8bcb7dae 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -87,7 +87,7 @@ buildPackages.stdenv.mkDerivation (finalAttrs: {
'')
(
lib.filter (el: el.haddockDir != null) (
- builtins.map (p: {
+ map (p: {
haddockDir = if p ? haddockDir then p.haddockDir p else null;
name = p.pname;
}) docPackages
diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix
index c2171e8948a4..055e6c40c784 100644
--- a/pkgs/development/haskell-modules/lib/compose.nix
+++ b/pkgs/development/haskell-modules/lib/compose.nix
@@ -663,9 +663,9 @@ rec {
# closePropagationFast.
propagatedPlainBuildInputs =
drvs:
- builtins.map (i: i.val) (
+ map (i: i.val) (
builtins.genericClosure {
- startSet = builtins.map (drv: {
+ startSet = map (drv: {
key = drv.outPath;
val = drv;
}) drvs;
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 0d936b21f41d..01d434a658ae 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -351,7 +351,7 @@ package-set { inherit pkgs lib callPackage; } self
developPackage =
{
root,
- name ? lib.optionalString (builtins.typeOf root == "path") (builtins.baseNameOf root),
+ name ? lib.optionalString (builtins.typeOf root == "path") (baseNameOf root),
source-overrides ? { },
overrides ? self: super: { },
modifier ? drv: drv,
@@ -634,7 +634,7 @@ package-set { inherit pkgs lib callPackage; } self
# pkgWithCombinedDepsDevDrv :: Derivation
pkgWithCombinedDepsDevDrv = pkgWithCombinedDeps.envFunc { inherit withHoogle; };
- mkDerivationArgs = builtins.removeAttrs args [
+ mkDerivationArgs = removeAttrs args [
"genericBuilderArgsModifier"
"packages"
"withHoogle"
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 0637c97a3714..fce001af1b6b 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -63,7 +63,7 @@ let
docDir = "$out/share/doc/ghc/html";
packageCfgDir = "${libDir}/package.conf.d";
paths = lib.concatLists (
- builtins.map (pkg: [ pkg ] ++ lib.optionals installDocumentation [ (lib.getOutput "doc" pkg) ]) (
+ map (pkg: [ pkg ] ++ lib.optionals installDocumentation [ (lib.getOutput "doc" pkg) ]) (
lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages)
)
);
diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix
index 01e567769575..f50997fbf337 100644
--- a/pkgs/development/idris-modules/build-idris-package.nix
+++ b/pkgs/development/idris-modules/build-idris-package.nix
@@ -26,7 +26,7 @@ let
allIdrisDeps = idrisDeps ++ lib.optional (!noPrelude) prelude ++ lib.optional (!noBase) base;
idris-with-packages = with-packages allIdrisDeps;
newAttrs =
- builtins.removeAttrs attrs [
+ removeAttrs attrs [
"idrisDeps"
"noPrelude"
"noBase"
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index b3e8b339c47c..7b2ef292fc42 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -113,7 +113,7 @@ stdenv.mkDerivation {
++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
++ lib.optional ffcallAvailable "--with-ffcall"
++ lib.optional (!ffcallAvailable) "--without-ffcall"
- ++ builtins.map (x: " --with-module=" + x) withModules
+ ++ map (x: " --with-module=" + x) withModules
++ lib.optional threadSupport "--with-threads=POSIX_THREADS";
preBuild = ''
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index aab69c1db2dc..09a1eb96ea84 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -52,7 +52,7 @@ let
See https://hexdocs.pm/elixir/${version}/compatibility-and-deprecations.html
'';
- maxShiftMajor = builtins.toString ((toInt (versions.major maximumOTPVersion)) + 1);
+ maxShiftMajor = toString ((toInt (versions.major maximumOTPVersion)) + 1);
maxAssert =
if (maximumOTPVersion == null) then
true
diff --git a/pkgs/development/interpreters/octave/build-octave-package.nix b/pkgs/development/interpreters/octave/build-octave-package.nix
index 507b26931473..66bab3c03b14 100644
--- a/pkgs/development/interpreters/octave/build-octave-package.nix
+++ b/pkgs/development/interpreters/octave/build-octave-package.nix
@@ -72,7 +72,7 @@ let
# This used to mean that if a package defined extra nativeBuildInputs, it
# would override the ones for building an Octave package (the hook and Octave
# itself, causing everything to fail.
- attrs' = builtins.removeAttrs attrs [
+ attrs' = removeAttrs attrs [
"nativeBuildInputs"
"passthru"
];
diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix
deleted file mode 100644
index cc5fef956dcf..000000000000
--- a/pkgs/development/interpreters/php/8.1.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ callPackage, fetchpatch, ... }@_args:
-
-let
- base = callPackage ./generic.nix (
- (removeAttrs _args [ "fetchpatch" ])
- // {
- version = "8.1.33";
- hash = "sha256-tlU0UYQcGlaYZdf9yDAkYh7kQ0zY+/6woxWIrJxwaF8=";
- }
- );
-in
-base.withExtensions (
- { all, ... }:
- with all;
- ([
- bcmath
- calendar
- curl
- ctype
- dom
- exif
- fileinfo
- filter
- ftp
- gd
- gettext
- gmp
- iconv
- imap
- intl
- ldap
- mbstring
- mysqli
- mysqlnd
- opcache
- openssl
- pcntl
- pdo
- pdo_mysql
- pdo_odbc
- pdo_pgsql
- pdo_sqlite
- pgsql
- posix
- readline
- session
- simplexml
- sockets
- soap
- sodium
- sysvsem
- sqlite3
- tokenizer
- xmlreader
- xmlwriter
- zip
- zlib
- ])
-)
diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
index 3f45bf634d80..87784a47966a 100644
--- a/pkgs/development/interpreters/php/8.4.nix
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -4,8 +4,8 @@ let
base = callPackage ./generic.nix (
_args
// {
- version = "8.4.12";
- hash = "sha256-Lr1TgusJDWAwh9pkntId5ksHlha8mgKrvFMribF+NGg=";
+ version = "8.4.13";
+ hash = "sha256-hRgd3Kez4D8UhSGwQ71iQRlQ1GjGZ9tkAEefGxCBIZQ=";
}
);
in
diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix
index 34ace067ea6c..0279576ce299 100644
--- a/pkgs/development/interpreters/php/generic.nix
+++ b/pkgs/development/interpreters/php/generic.nix
@@ -85,7 +85,7 @@ let
}@innerArgs:
let
allArgs = args // prevArgs // innerArgs;
- filteredArgs = builtins.removeAttrs allArgs [
+ filteredArgs = removeAttrs allArgs [
"extensions"
"extraConfig"
];
diff --git a/pkgs/development/interpreters/python/conda/default.nix b/pkgs/development/interpreters/python/conda/default.nix
index a3c3cd30ceb8..06421ff9b63a 100644
--- a/pkgs/development/interpreters/python/conda/default.nix
+++ b/pkgs/development/interpreters/python/conda/default.nix
@@ -4,7 +4,7 @@
# List of libraries that are needed for conda binary packages.
# When installing a conda binary package, just extend
# the `buildInputs` with `condaAutopatchLibs`.
- condaPatchelfLibs = builtins.map (p: p.lib or p) (
+ condaPatchelfLibs = map (p: p.lib or p) (
[
pkgs.alsa-lib
pkgs.cups
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 0b2a3e1a59d8..47c372fbd3b6 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -403,7 +403,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-kpXoIHlz53+0FAm/fK99ZBdNUg0u13erOr1XP2FSkQY=";
};
in
- (builtins.map (f: "${mingw-patch}/${f}") [
+ (map (f: "${mingw-patch}/${f}") [
# The other patches in that repo are already applied to 3.11.10
"mingw-python3_distutils.patch"
"mingw-python3_frozenmain.patch"
diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
index 5fd2c6e91dad..caaed105da48 100644
--- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
@@ -171,12 +171,12 @@ let
checkDrv = drv: if (isPythonModule drv) && (isMismatchedPython drv) then throwMismatch drv else drv;
in
- inputs: builtins.map (checkDrv) inputs;
+ inputs: map (checkDrv) inputs;
# Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
self = toPythonModule (
stdenv.mkDerivation (
- (builtins.removeAttrs attrs [
+ (removeAttrs attrs [
"disabled"
"checkPhase"
"checkInputs"
diff --git a/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix
index 7a842ffd79a7..aae8369cab20 100644
--- a/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix
+++ b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix
@@ -41,7 +41,7 @@ let
self = (
stdenv.mkDerivation (
- (builtins.removeAttrs attrs [
+ (removeAttrs attrs [
"addTclConfigureFlags"
"checkPhase"
"checkInputs"
diff --git a/pkgs/development/libraries/astal/buildAstalModule.nix b/pkgs/development/libraries/astal/buildAstalModule.nix
index 9436d6b30ad0..ff945e9d3d9f 100644
--- a/pkgs/development/libraries/astal/buildAstalModule.nix
+++ b/pkgs/development/libraries/astal/buildAstalModule.nix
@@ -15,7 +15,7 @@
python3,
}:
let
- cleanArgs = lib.flip builtins.removeAttrs [
+ cleanArgs = lib.flip removeAttrs [
"name"
"sourceRoot"
"nativeBuildInputs"
diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix
index d47af97f191f..bd61f72fc28e 100644
--- a/pkgs/development/libraries/glibc/locales.nix
+++ b/pkgs/development/libraries/glibc/locales.nix
@@ -83,7 +83,7 @@
makeFlags = (previousAttrs.makeFlags or [ ]) ++ [
"localedata/install-locales"
- "localedir=${builtins.placeholder "out"}/lib/locale"
+ "localedir=${placeholder "out"}/lib/locale"
];
installPhase = ''
diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix
index 3e83fd7eba50..67ad4ff31d6a 100644
--- a/pkgs/development/libraries/gobject-introspection/wrapper.nix
+++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix
@@ -16,13 +16,13 @@
let
# ensure that `.override` works
- args = builtins.removeAttrs _args [
+ args = removeAttrs _args [
"buildPackages"
"targetPackages"
"gobject-introspection-unwrapped"
];
# passing this stdenv to `targetPackages...` breaks due to splicing not working in `.override``
- argsForTarget = builtins.removeAttrs args [ "stdenv" ];
+ argsForTarget = removeAttrs args [ "stdenv" ];
overriddenUnwrappedGir = gobject-introspection-unwrapped.override args;
# if we have targetPackages.gobject-introspection then propagate that
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 514fe0155826..5d124432e4f8 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
# While "out" acts as the bin output, most packages only care about the lib output.
# We set prefix such that all the pkg-config configuration stays inside the dev and lib outputs.
# stdenv will take care of overriding bindir, sbindir, etc. such that "out" contains the binaries.
- prefix = builtins.placeholder "lib";
+ prefix = placeholder "lib";
env = lib.optionalAttrs stdenv.hostPlatform.isStatic {
NIX_CFLAGS_COMPILE = "-fcommon";
diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/development/libraries/libint/default.nix
index cd8bc263b33a..5dbd4e287070 100644
--- a/pkgs/development/libraries/libint/default.nix
+++ b/pkgs/development/libraries/libint/default.nix
@@ -75,29 +75,29 @@ assert (eri3Deriv >= 0 && eri3Deriv <= 4);
# Ensure valid arguments for generated angular momenta in ERI derivatives are used.
assert (
builtins.length eriAm == eriDeriv + 1
- && builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eriAm)
+ && builtins.foldl' (a: b: a && b) true (map (a: a <= maxAm && a >= 0) eriAm)
);
assert (
builtins.length eri3Am == eriDeriv + 1
- && builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eri3Am)
+ && builtins.foldl' (a: b: a && b) true (map (a: a <= maxAm && a >= 0) eri3Am)
);
assert (
builtins.length eri2Am == eriDeriv + 1
- && builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eri2Am)
+ && builtins.foldl' (a: b: a && b) true (map (a: a <= maxAm && a >= 0) eri2Am)
);
# Ensure valid arguments for generated angular momenta in optimised ERI derivatives are used.
assert (
builtins.length eriOptAm == eriDeriv + 1
- && builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eriOptAm)
+ && builtins.foldl' (a: b: a && b) true (map (a: a <= maxAm && a >= 0) eriOptAm)
);
assert (
builtins.length eri3OptAm == eriDeriv + 1
- && builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eri3OptAm)
+ && builtins.foldl' (a: b: a && b) true (map (a: a <= maxAm && a >= 0) eri3OptAm)
);
assert (
builtins.length eri2OptAm == eriDeriv + 1
- && builtins.foldl' (a: b: a && b) true (builtins.map (a: a <= maxAm && a >= 0) eri2OptAm)
+ && builtins.foldl' (a: b: a && b) true (map (a: a <= maxAm && a >= 0) eri2OptAm)
);
# Ensure a valid derivative order for one-electron integrals
@@ -185,26 +185,26 @@ let
];
configureFlags = [
- "--with-max-am=${builtins.toString maxAm}"
- "--with-eri-max-am=${lib.concatStringsSep "," (builtins.map builtins.toString eriAm)}"
- "--with-eri3-max-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri3Am)}"
- "--with-eri2-max-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri2Am)}"
- "--with-eri-opt-am=${lib.concatStringsSep "," (builtins.map builtins.toString eriOptAm)}"
- "--with-eri3-opt-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri3OptAm)}"
- "--with-eri2-opt-am=${lib.concatStringsSep "," (builtins.map builtins.toString eri2OptAm)}"
+ "--with-max-am=${toString maxAm}"
+ "--with-eri-max-am=${lib.concatStringsSep "," (map toString eriAm)}"
+ "--with-eri3-max-am=${lib.concatStringsSep "," (map toString eri3Am)}"
+ "--with-eri2-max-am=${lib.concatStringsSep "," (map toString eri2Am)}"
+ "--with-eri-opt-am=${lib.concatStringsSep "," (map toString eriOptAm)}"
+ "--with-eri3-opt-am=${lib.concatStringsSep "," (map toString eri3OptAm)}"
+ "--with-eri2-opt-am=${lib.concatStringsSep "," (map toString eri2OptAm)}"
"--with-cartgauss-ordering=${cartGaussOrd}"
"--with-shgauss-ordering=${shGaussOrd}"
"--with-shell-set=${shellSet}"
]
++ lib.optional enableFMA "--enable-fma"
- ++ lib.optional (eriDeriv > 0) "--enable-eri=${builtins.toString eriDeriv}"
- ++ lib.optional (eri2Deriv > 0) "--enable-eri2=${builtins.toString eri2Deriv}"
- ++ lib.optional (eri3Deriv > 0) "--enable-eri3=${builtins.toString eri3Deriv}"
+ ++ lib.optional (eriDeriv > 0) "--enable-eri=${toString eriDeriv}"
+ ++ lib.optional (eri2Deriv > 0) "--enable-eri2=${toString eri2Deriv}"
+ ++ lib.optional (eri3Deriv > 0) "--enable-eri3=${toString eri3Deriv}"
++ lib.optionals enableOneBody [
- "--enable-1body=${builtins.toString oneBodyDerivOrd}"
+ "--enable-1body=${toString oneBodyDerivOrd}"
"--enable-1body-property-derivs"
]
- ++ lib.optional (multipoleOrd > 0) "--with-multipole-max-order=${builtins.toString multipoleOrd}"
+ ++ lib.optional (multipoleOrd > 0) "--with-multipole-max-order=${toString multipoleOrd}"
++ lib.optional enableGeneric "--enable-generic"
++ lib.optional enableContracted "--enable-contracted-ints"
++ lib.optional eri3PureSh "--enable-eri3-pure-sh"
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 827c16e524b4..f548668644bf 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -120,8 +120,8 @@ let
toCommand = dep: "ln -s ${dep} $out/${dep.pname}-${dep.version}.tar.gz";
packageCacheCommand = lib.pipe rustDeps [
- (builtins.map fetchDep)
- (builtins.map toCommand)
+ (map fetchDep)
+ (map toCommand)
(lib.concatStringsSep "\n")
];
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index d23a732a4068..760af40f0ffb 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -193,9 +193,7 @@ let
# starting with 3.5 its nice to speed things up for free
++ lib.optional stdenv.hostPlatform.isx86_64 "enable-ec_nistp_64_gcc_128"
# useful to set e.g. 256 bit security level with setting this to 5
- ++ lib.optional (
- securityLevel != null
- ) "-DOPENSSL_TLS_SECURITY_LEVEL=${builtins.toString securityLevel}"
+ ++ lib.optional (securityLevel != null) "-DOPENSSL_TLS_SECURITY_LEVEL=${toString securityLevel}"
++ lib.optional enableMD2 "enable-md2"
++ lib.optional enableSSL2 "enable-ssl2"
++ lib.optional enableSSL3 "enable-ssl3"
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
index 4cdc80a4090a..26423ac73e7c 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -33,7 +33,7 @@ qtModule {
# store paths and disallows saving caches of bare qml files in the store.
(replaceVars ./invalidate-caches-from-mismatched-store-paths.patch {
nixStore = builtins.storeDir;
- nixStoreLength = builtins.toString ((builtins.stringLength builtins.storeDir) + 1); # trailing /
+ nixStoreLength = toString ((builtins.stringLength builtins.storeDir) + 1); # trailing /
})
# add version specific QML import path
./use-versioned-import-path.patch
@@ -41,7 +41,7 @@ qtModule {
preConfigure =
let
- storePrefixLen = builtins.toString ((builtins.stringLength builtins.storeDir) + 1);
+ storePrefixLen = toString ((builtins.stringLength builtins.storeDir) + 1);
in
''
# "NIX:" is reserved for saved qmlc files in patch 0001, "QTDHASH:" takes the place
diff --git a/pkgs/development/lua-modules/lib.nix b/pkgs/development/lua-modules/lib.nix
index d1482153ffea..7b6598f6ee21 100644
--- a/pkgs/development/lua-modules/lib.nix
+++ b/pkgs/development/lua-modules/lib.nix
@@ -134,7 +134,7 @@ rec {
# example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps;
- externalDepsDirs = map (x: builtins.toString x) (lib.filter (lib.isDerivation) externalDeps);
+ externalDepsDirs = map (x: toString x) (lib.filter (lib.isDerivation) externalDeps);
generatedConfig = (
{
diff --git a/pkgs/development/misc/resholve/resholve-utils.nix b/pkgs/development/misc/resholve/resholve-utils.nix
index 141d6bb79b47..cdcb11219875 100644
--- a/pkgs/development/misc/resholve/resholve-utils.nix
+++ b/pkgs/development/misc/resholve/resholve-utils.nix
@@ -27,7 +27,7 @@ rec {
phraseDirective =
solution: env: name: val:
if builtins.isInt val then
- builtins.toString val
+ toString val
else if builtins.isString val then
name
else if true == val then
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 189c85f3cd8b..a58e84ceb76f 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -255,16 +255,14 @@ let
mkLicenseTexts =
licenseNames:
lib.lists.flatten (
- builtins.map (
- licenseName:
- builtins.map (licenseText: "--- ${licenseName} ---\n${licenseText}") (mkLicenses licenseName)
+ map (
+ licenseName: map (licenseText: "--- ${licenseName} ---\n${licenseText}") (mkLicenses licenseName)
) licenseNames
);
# Converts a license name to a list of license hashes.
mkLicenseHashes =
- licenseName:
- builtins.map (licenseText: builtins.hashString "sha1" licenseText) (mkLicenses licenseName);
+ licenseName: map (licenseText: builtins.hashString "sha1" licenseText) (mkLicenses licenseName);
# The list of all license names we're accepting. Put android-sdk-license there
# by default.
diff --git a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix
index eb5a48681931..fbb52d65a23b 100644
--- a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix
+++ b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix
@@ -4,7 +4,7 @@
# If you copy this example out of nixpkgs, use these lines instead of the next.
# This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html
/*
- nixpkgsSource ? (builtins.fetchTarball {
+ nixpkgsSource ? (fetchTarball {
name = "nixpkgs-20.09";
url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz";
sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy";
diff --git a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix
index 3af80459b347..ead2c48aaf26 100644
--- a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix
+++ b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix
@@ -4,7 +4,7 @@
# If you copy this example out of nixpkgs, use these lines instead of the next.
# This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html
/*
- nixpkgsSource ? (builtins.fetchTarball {
+ nixpkgsSource ? (fetchTarball {
name = "nixpkgs-20.09";
url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz";
sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy";
diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix
index ff745ec1d20d..7fc69c3c1ca8 100644
--- a/pkgs/development/mobile/androidenv/examples/shell.nix
+++ b/pkgs/development/mobile/androidenv/examples/shell.nix
@@ -2,7 +2,7 @@
# If you copy this example out of nixpkgs, use these lines instead of the next.
# This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html
/*
- nixpkgsSource ? (builtins.fetchTarball {
+ nixpkgsSource ? (fetchTarball {
name = "nixpkgs-20.09";
url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz";
sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index db7858ecc8f8..dfc2f74ac83e 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -168,7 +168,7 @@ final: prev: {
pulp = prev.pulp.override {
# tries to install purescript
- npmFlags = builtins.toString [ "--ignore-scripts" ];
+ npmFlags = toString [ "--ignore-scripts" ];
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = ''
diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix
index 555e336dcfc6..7cd1a3c51013 100644
--- a/pkgs/development/ocaml-modules/atdgen/default.nix
+++ b/pkgs/development/ocaml-modules/atdgen/default.nix
@@ -31,7 +31,7 @@ buildDunePackage {
atdgen-codec-runtime
];
- meta = (builtins.removeAttrs atd.meta [ "mainProgram" ]) // {
+ meta = (removeAttrs atd.meta [ "mainProgram" ]) // {
description = "Generates efficient JSON serializers, deserializers and validators";
};
}
diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix
index f8e59ab0e9af..89913be9f02e 100644
--- a/pkgs/development/ocaml-modules/camlzip/default.nix
+++ b/pkgs/development/ocaml-modules/camlzip/default.nix
@@ -90,7 +90,10 @@ stdenv.mkDerivation {
ZIP and GZIP format, as well as to Java JAR files. It provides functions
for reading from and writing to compressed files in these formats.
'';
- license = "LGPL+linking exceptions";
+ license = with lib.licenses; [
+ lgpl21Plus
+ ocamlLgplLinkingException
+ ];
inherit (ocaml.meta) platforms;
maintainers = with maintainers; [ maggesi ];
};
diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
index 1c69c85ab4e2..5bc2a9bfe69a 100644
--- a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
@@ -17,7 +17,7 @@ let
in
if lib.versionOlder ocaml.version "4.08" then
- builtins.throw "${pname} is not available for OCaml ${ocaml.version}"
+ throw "${pname} is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
@@ -70,7 +70,7 @@ else
license = licenses.mit;
maintainers = [ maintainers.sternenseemann ];
homepage = "https://github.com/mirage/ocaml-freestanding";
- platforms = builtins.map ({ arch, os }: "${arch}-${os}") (
+ platforms = map ({ arch, os }: "${arch}-${os}") (
cartesianProduct {
arch = [
"aarch64"
diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix
index b6398c4e8470..2c30727e881b 100644
--- a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix
+++ b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix
@@ -18,7 +18,7 @@ buildDunePackage {
doCheck = true;
checkInputs = [ ounit2 ];
- meta = (builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // {
+ meta = (removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // {
description = "Internationalization library using camomile (i18n)";
};
diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix
index 29cd032dd4b5..c046d5f2c0ea 100644
--- a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix
+++ b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix
@@ -18,5 +18,5 @@ buildDunePackage {
doCheck = true;
checkInputs = [ ounit2 ];
- meta = builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ];
+ meta = removeAttrs ocaml_gettext.meta [ "mainProgram" ];
}
diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index fea4be04f8a3..fc0a75ca140f 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -37,7 +37,10 @@ buildDunePackage rec {
meta = {
homepage = "http://savonet.rastageeks.org/";
description = "OCaml bindings for libssl";
- license = "LGPL+link exception";
+ license = with lib.licenses; [
+ lgpl21Plus
+ ocamlLgplLinkingException
+ ];
maintainers = with lib.maintainers; [
anmonteiro
dandellion
diff --git a/pkgs/development/ocaml-modules/taglib/default.nix b/pkgs/development/ocaml-modules/taglib/default.nix
index ca0a47a356b0..8492f5cbfcf5 100644
--- a/pkgs/development/ocaml-modules/taglib/default.nix
+++ b/pkgs/development/ocaml-modules/taglib/default.nix
@@ -33,7 +33,7 @@ buildDunePackage rec {
description = "Bindings for the taglib library which provides functions for reading tags in headers of audio files";
license = with licenses; [
lgpl21Plus
- "link-exception"
+ ocamlLgplLinkingException
]; # GNU Library Public License 2 Linking Exception
maintainers = with maintainers; [ dandellion ];
};
diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix
index eb98b5c4337e..638342679241 100644
--- a/pkgs/development/ocaml-modules/uucp/default.nix
+++ b/pkgs/development/ocaml-modules/uucp/default.nix
@@ -21,7 +21,7 @@ let
in
if lib.versionOlder ocaml.version minimalOCamlVersion then
- builtins.throw "${pname} needs at least OCaml ${minimalOCamlVersion}"
+ throw "${pname} needs at least OCaml ${minimalOCamlVersion}"
else
stdenv.mkDerivation {
diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix
index f60dce3935df..fa2e7544a1ec 100644
--- a/pkgs/development/php-packages/relay/default.nix
+++ b/pkgs/development/php-packages/relay/default.nix
@@ -90,10 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
let
args =
lib.strings.concatMapStrings
- (
- v:
- " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${builtins.baseNameOf v.name}"
- )
+ (v: " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${baseNameOf v.name}")
(
with lib.attrsets;
[
diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix
index 5c0a9e3dcf26..979cc397b533 100644
--- a/pkgs/development/python-modules/acquire/default.nix
+++ b/pkgs/development/python-modules/acquire/default.nix
@@ -8,7 +8,6 @@
minio,
pycryptodome,
pytestCheckHook,
- pythonOlder,
requests,
requests-toolbelt,
rich,
@@ -18,16 +17,14 @@
buildPythonPackage rec {
pname = "acquire";
- version = "3.20";
+ version = "3.20.1";
pyproject = true;
- disabled = pythonOlder "3.9";
-
src = fetchFromGitHub {
owner = "fox-it";
repo = "acquire";
tag = version;
- hash = "sha256-BfY7LKSP82QnRz3QdfUNFvz7epw5RwGT/H2S43MSvVk=";
+ hash = "sha256-QX7rPoJJqBPdvN2LzSBw8kGDSsIHLm65TJ0uXuhwB4Q=";
};
build-system = [
@@ -68,7 +65,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Tool to quickly gather forensic artifacts from disk images or a live system";
homepage = "https://github.com/fox-it/acquire";
- changelog = "https://github.com/fox-it/acquire/releases/tag/${version}";
+ changelog = "https://github.com/fox-it/acquire/releases/tag/${src.tag}";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/aiohasupervisor/default.nix b/pkgs/development/python-modules/aiohasupervisor/default.nix
index f999f3824094..615859401ebe 100644
--- a/pkgs/development/python-modules/aiohasupervisor/default.nix
+++ b/pkgs/development/python-modules/aiohasupervisor/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "aiohasupervisor";
- version = "0.3.3b0";
+ version = "0.3.3";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "python-supervisor-client";
tag = version;
- hash = "sha256-Uv9chL9GxP5vJu1P6RB7B2b0pRQMeNtE6t1XFr2tBI4=";
+ hash = "sha256-v6w+g1M3VR/an3a5MfWf8fDCHNzRC4+05L7GW45PzWU=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix
index f4c3e6a2fbd5..588291f38598 100644
--- a/pkgs/development/python-modules/aioshelly/default.nix
+++ b/pkgs/development/python-modules/aioshelly/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "aioshelly";
- version = "13.10.0";
+ version = "13.11.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "aioshelly";
tag = version;
- hash = "sha256-sN8Qr+ZgKBaZbTgQSGujdZmA3N0fBMFEPnUIWiBkPhg=";
+ hash = "sha256-Nx7CFGCQ5lJO21fjkR5yis3Rh+TzqWKAiK52BaKBAts=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/airos/default.nix b/pkgs/development/python-modules/airos/default.nix
index 23d9f10af086..06e2fad5956f 100644
--- a/pkgs/development/python-modules/airos/default.nix
+++ b/pkgs/development/python-modules/airos/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "airos";
- version = "0.5.3";
+ version = "0.5.4";
pyproject = true;
disabled = pythonOlder "3.13";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "CoMPaTech";
repo = "python-airos";
tag = "v${version}";
- hash = "sha256-P9IQ4MBjOZJksKipaq9+6Zgui9uO4zy2Rx74OCLPYCU=";
+ hash = "sha256-IiQ/+Ey+CGQfeKRGnNZ54dUSY3t5YMJ1ws7kgc3SQBg=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix
index 6cde9151bb55..bf52312777c5 100644
--- a/pkgs/development/python-modules/array-record/default.nix
+++ b/pkgs/development/python-modules/array-record/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "array-record";
- version = "0.7.2";
+ version = "0.8.1";
format = "wheel";
disabled = pythonOlder "3.10" || pythonAtLeast "3.14";
@@ -26,13 +26,12 @@ buildPythonPackage rec {
dist = pyShortVersion;
python = pyShortVersion;
abi = pyShortVersion;
- platform = "manylinux_2_17_x86_64.manylinux2014_x86_64";
+ platform = "manylinux2014_x86_64.manylinux_2_17_x86_64";
hash =
{
- cp310 = "sha256-UmMEehSqMqgLy1TcYoKUX/tG4Tf8UM2xgnuUrXOiHGo=";
- cp311 = "sha256-cUN9Ws8A1xIN/n+/oGfv3mGUfmlsojLS69iWRpA2meM=";
- cp312 = "sha256-S+cV0NhXXlOzSTr2ED1oUuk6U1gQA0ZXoGPaWxGp/ZQ=";
- cp313 = "sha256-C7UvwXV0/NXA5dhr7NbUCW/KeUWg5w5F18aN2oAUXAQ=";
+ cp311 = "sha256-CQ2ChYqTHjdU4QYvXGLCCudk8+XyTnnqkFQ5OAQ4Oo0=";
+ cp312 = "sha256-AF+29PToM7LeHE5RxiCtajCok7RtwWgDnZuzG3FGYHA=";
+ cp313 = "sha256-N7uALh/cmO22CoWVUsfn1JThQc85C/tzUKz9Y0Z9rq4=";
}
.${pyShortVersion} or (throw "${pname} is missing hash for ${pyShortVersion}");
};
diff --git a/pkgs/development/python-modules/ax-platform/default.nix b/pkgs/development/python-modules/ax-platform/default.nix
index 771c02cb87d8..ca6562db40ca 100644
--- a/pkgs/development/python-modules/ax-platform/default.nix
+++ b/pkgs/development/python-modules/ax-platform/default.nix
@@ -29,14 +29,14 @@
buildPythonPackage rec {
pname = "ax-platform";
- version = "1.0.0";
+ version = "1.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "facebook";
repo = "ax";
tag = version;
- hash = "sha256-DFsV1w6J7bTZNUq9OYExDvfc7IfTcthGKAnRMNujRKI=";
+ hash = "sha256-DHB/BcD913gano5N7dlAbB+Tfg1dMTRP3AR1HwJjkLg=";
};
env.ALLOW_BOTORCH_LATEST = "1";
@@ -57,11 +57,11 @@ buildPythonPackage rec {
scikit-learn
scipy
sympy
- ];
+ ]
+ ++ botorch.optional-dependencies.pymoo;
nativeCheckInputs = [
pyfakefs
- # pytest-xdist
pytestCheckHook
sqlalchemy
tabulate
@@ -74,7 +74,7 @@ buildPythonPackage rec {
# broken with sqlalchemy 2
"ax/core/tests/test_experiment.py"
"ax/service/tests/test_ax_client.py"
- "ax/service/tests/test_scheduler.py"
+ "ax/service/tests/test_orchestrator.py"
"ax/service/tests/test_with_db_settings_base.py"
# Hangs forever
diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix
index 4253117e7563..f2b60e3b4a26 100644
--- a/pkgs/development/python-modules/botorch/default.nix
+++ b/pkgs/development/python-modules/botorch/default.nix
@@ -3,15 +3,24 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
+
+ # build-system
+ setuptools,
+ setuptools-scm,
+
+ # dependencies
gpytorch,
linear-operator,
multipledispatch,
pyre-extensions,
pyro-ppl,
- setuptools,
- setuptools-scm,
- torch,
scipy,
+ torch,
+
+ # optional-dependencies
+ pymoo,
+
+ # tests
pytestCheckHook,
pythonAtLeast,
}:
@@ -43,6 +52,12 @@ buildPythonPackage rec {
torch
];
+ optional-dependencies = {
+ pymoo = [
+ pymoo
+ ];
+ };
+
nativeCheckInputs = [
pytestCheckHook
];
diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix
index 12d72fb74cf1..090a8fccd1da 100644
--- a/pkgs/development/python-modules/cysignals/default.nix
+++ b/pkgs/development/python-modules/cysignals/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "cysignals";
- version = "1.12.4";
+ version = "1.12.5";
pyproject = true;
src = fetchFromGitHub {
owner = "sagemath";
repo = "cysignals";
tag = version;
- hash = "sha256-VwjAgJTrK703Eg+H9c8lJt2+5DGSSKv49YeWl7SPDck=";
+ hash = "sha256-y7CA0aih2vATLz0Fhwf19/wRw6GnQvNhGo9lS4+VrgI=";
};
build-system = [
diff --git a/pkgs/development/python-modules/eq3btsmart/default.nix b/pkgs/development/python-modules/eq3btsmart/default.nix
index f8e0c902c4da..3edb4644d4c0 100644
--- a/pkgs/development/python-modules/eq3btsmart/default.nix
+++ b/pkgs/development/python-modules/eq3btsmart/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "eq3btsmart";
- version = "2.3.0";
+ version = "2.4.1";
pyproject = true;
src = fetchFromGitHub {
owner = "EuleMitKeule";
repo = "eq3btsmart";
tag = version;
- hash = "sha256-9x2uQUpLl0bSOiEBTvt6IPZCJ3Oj+U4knlvrTXPGs3I=";
+ hash = "sha256-iT3XojEvD2FH+2/ybZ8xOkh7DE1FlFdRLu3tml3HA4A=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/faiss/default.nix b/pkgs/development/python-modules/faiss/default.nix
index 39e34a1879e8..76bb135148f8 100644
--- a/pkgs/development/python-modules/faiss/default.nix
+++ b/pkgs/development/python-modules/faiss/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage {
};
meta = lib.pipe (faiss-build.meta or { }) [
- (lib.flip builtins.removeAttrs [ "mainProgram" ])
+ (lib.flip removeAttrs [ "mainProgram" ])
(m: m // { description = "Bindings for faiss, the similarity search library"; })
];
}
diff --git a/pkgs/development/python-modules/fast-histogram/default.nix b/pkgs/development/python-modules/fast-histogram/default.nix
index c894dd3222d0..83124c0d62b3 100644
--- a/pkgs/development/python-modules/fast-histogram/default.nix
+++ b/pkgs/development/python-modules/fast-histogram/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
pytestCheckHook
];
- enabledTestPaths = [ "${builtins.placeholder "out"}/${python.sitePackages}" ];
+ enabledTestPaths = [ "${placeholder "out"}/${python.sitePackages}" ];
pythonImportsCheck = [ "fast_histogram" ];
diff --git a/pkgs/development/python-modules/fontpens/default.nix b/pkgs/development/python-modules/fontpens/default.nix
index f9e293d4a6ba..79c171c9bbe1 100644
--- a/pkgs/development/python-modules/fontpens/default.nix
+++ b/pkgs/development/python-modules/fontpens/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
pythonImportsCheck = [
"fontPens"
]
- ++ (builtins.map (s: "fontPens." + s) [
+ ++ (map (s: "fontPens." + s) [
"angledMarginPen"
"digestPointPen"
"flattenPen"
diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
index 8eabbccc815c..7ec606f2aa9a 100644
--- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
+++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "ha-mqtt-discoverable";
- version = "0.20.1";
+ version = "0.21.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "unixorn";
repo = "ha-mqtt-discoverable";
tag = "v${version}";
- hash = "sha256-XaaL5O6WHIs+9vNq/IqolPUsL04l6PCKTZNBTYH1z4g=";
+ hash = "sha256-p9qzK2pQDDLB6UVGNWYMd8M5/NicNbM4bnffxen48hQ=";
};
pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix
index 8659970f32d1..75fd66a2c678 100644
--- a/pkgs/development/python-modules/hy/default.nix
+++ b/pkgs/development/python-modules/hy/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
python-packages:
(python.withPackages (ps: (python-packages ps) ++ [ ps.hy ])).overrideAttrs (old: {
name = "${hy.name}-env";
- meta = lib.mergeAttrs (builtins.removeAttrs hy.meta [ "license" ]) { mainProgram = "hy"; };
+ meta = lib.mergeAttrs (removeAttrs hy.meta [ "license" ]) { mainProgram = "hy"; };
});
};
diff --git a/pkgs/development/python-modules/invisible-watermark/default.nix b/pkgs/development/python-modules/invisible-watermark/default.nix
index 212bbbc44ae5..28ed8400ec12 100644
--- a/pkgs/development/python-modules/invisible-watermark/default.nix
+++ b/pkgs/development/python-modules/invisible-watermark/default.nix
@@ -86,7 +86,7 @@ buildPythonPackage rec {
;
};
};
- allTests = builtins.map createTest testCases;
+ allTests = map createTest testCases;
in
(lib.attrsets.mergeAttrsList allTests)
// {
diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix
index 292c3fa2744e..e4961096d139 100644
--- a/pkgs/development/python-modules/jupyter-server/default.nix
+++ b/pkgs/development/python-modules/jupyter-server/default.nix
@@ -119,6 +119,8 @@ buildPythonPackage rec {
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
# TypeError: the JSON object must be str, bytes or bytearray, not NoneType
"test_terminal_create_with_cwd"
+ # Fails under load (which causes failure on Hydra)
+ "test_execution_state"
];
disabledTestPaths = [
diff --git a/pkgs/development/python-modules/keyrings-passwordstore/default.nix b/pkgs/development/python-modules/keyrings-passwordstore/default.nix
deleted file mode 100644
index 9acd515ce4fe..000000000000
--- a/pkgs/development/python-modules/keyrings-passwordstore/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- lib,
- buildPythonPackage,
- fetchPypi,
- pythonOlder,
-
- keyring,
- setuptools-scm,
-}:
-
-buildPythonPackage rec {
- pname = "keyrings.passwordstore";
- version = "0.1.0";
- format = "setuptools";
- disabled = pythonOlder "3.6";
-
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-pylZw45FUtLHzUV4cDyl/nT8tCZwNj4Jf41MMlyskoU=";
- };
-
- nativeBuildInputs = [ setuptools-scm ];
-
- nativeCheckInputs = [ keyring ];
-
- pythonImportsCheck = [ "keyrings.passwordstore.backend" ];
-
- meta = {
- license = lib.licenses.mit;
- description = "Keyring backend for password-store";
- homepage = "https://github.com/stv0g/keyrings.passwordstore";
- maintainers = [ lib.maintainers.shlevy ];
- broken = true; # https://github.com/stv0g/keyrings.passwordstore/issues/2
- };
-}
diff --git a/pkgs/development/python-modules/libpyvivotek/default.nix b/pkgs/development/python-modules/libpyvivotek/default.nix
index 7320880a1539..4adcefc505a0 100644
--- a/pkgs/development/python-modules/libpyvivotek/default.nix
+++ b/pkgs/development/python-modules/libpyvivotek/default.nix
@@ -3,26 +3,26 @@
buildPythonPackage,
fetchFromGitHub,
pytestCheckHook,
- pythonOlder,
requests,
+ setuptools,
vcrpy,
}:
buildPythonPackage rec {
pname = "libpyvivotek";
- version = "0.4.0";
- format = "setuptools";
-
- disabled = pythonOlder "3.7";
+ version = "0.6.1";
+ pyproject = true;
src = fetchFromGitHub {
owner = "HarlemSquirrel";
repo = "python-vivotek";
- rev = "v${version}";
- sha256 = "pNlnGpDjdYE7Lxog8GGZV+UZZmfmt5bwHof5LngPQjg=";
+ tag = "v${version}";
+ hash = "sha256-ai+FlvyrdeLyg/PJU8T0fTtbdnlyGo6mE4AM2oRATj8=";
};
- propagatedBuildInputs = [ requests ];
+ build-system = [ setuptools ];
+
+ dependencies = [ requests ];
nativeCheckInputs = [
pytestCheckHook
@@ -34,6 +34,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python Library for Vivotek IP Cameras";
homepage = "https://github.com/HarlemSquirrel/python-vivotek";
+ changelog = "https://github.com/HarlemSquirrel/python-vivotek/releases/tag/${src.tag}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/loro/default.nix b/pkgs/development/python-modules/loro/default.nix
index d44bac2fc91b..32d7e528a6f8 100644
--- a/pkgs/development/python-modules/loro/default.nix
+++ b/pkgs/development/python-modules/loro/default.nix
@@ -8,17 +8,17 @@
buildPythonPackage rec {
pname = "loro";
- version = "1.6.0";
+ version = "1.8.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-9UO4XHf3Nm3yFi3hwA490sLHUXG36WcM/8C2rFYdcpM=";
+ hash = "sha256-Is+xliW9ckXpdH7p1DsQURwWo1d1o4z5FNx0hjxNvog=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
- hash = "sha256-sTJ2jA/TLoVp7UTC2YMKzuJi1SxldG8gj3YGPbVco5s=";
+ hash = "sha256-b1zzDVK/pdxkAUeksmZZ8sbgyrXtJbwAfpNxkH4PevY=";
};
build-system = [
diff --git a/pkgs/development/python-modules/macropy/default.nix b/pkgs/development/python-modules/macropy/default.nix
deleted file mode 100644
index 6a9de5a4f57c..000000000000
--- a/pkgs/development/python-modules/macropy/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- lib,
- buildPythonPackage,
- fetchFromGitHub,
- python,
- isPy27,
- pythonAtLeast,
- pinqSupport ? false,
- sqlalchemy,
- pyxlSupport ? false,
- pyxl3,
-}:
-
-buildPythonPackage rec {
- # https://github.com/lihaoyi/macropy/issues/94
- version = "1.1.0b2";
- format = "setuptools";
- pname = "macropy";
- disabled = isPy27;
-
- src = fetchFromGitHub {
- owner = "lihaoyi";
- repo = "macropy";
- rev = "v${version}";
- sha256 = "1bd2fzpa30ddva3f8lw2sbixxf069idwib8srd64s5v46ricm2cf";
- };
-
- # js_snippets extra only works with python2
- propagatedBuildInputs =
- [ ] ++ lib.optional pinqSupport sqlalchemy ++ lib.optional pyxlSupport pyxl3;
-
- checkPhase = ''
- ${python.interpreter} run_tests.py
- '';
-
- meta = with lib; {
- homepage = "https://github.com/lihaoyi/macropy";
- description = "Macros in Python: quasiquotes, case classes, LINQ and more";
- license = licenses.mit;
- maintainers = [ ];
- broken = pythonAtLeast "3.8"; # see https://github.com/lihaoyi/macropy/issues/103
- };
-}
diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix
index 030d7aea1c1a..7873650a99a3 100644
--- a/pkgs/development/python-modules/millheater/default.nix
+++ b/pkgs/development/python-modules/millheater/default.nix
@@ -1,33 +1,28 @@
{
lib,
aiohttp,
- async-timeout,
buildPythonPackage,
fetchFromGitHub,
pyjwt,
- pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "millheater";
- version = "0.13.1";
+ version = "0.14.0";
pyproject = true;
- disabled = pythonOlder "3.10";
-
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pymill";
- tag = version; # https://github.com/Danielhiversen/pymill/issues/87
- hash = "sha256-fdKMX85uo5L/1ko5aXHzLcWbr24StzRV38jjEbeRRkw=";
+ tag = version;
+ hash = "sha256-s2uufn4G3yTDLd0v72KAL8AuZNSBYwQRkAX8UKXcex4=";
};
build-system = [ setuptools ];
dependencies = [
aiohttp
- async-timeout
pyjwt
];
@@ -40,7 +35,7 @@ buildPythonPackage rec {
description = "Python library for Mill heater devices";
homepage = "https://github.com/Danielhiversen/pymill";
changelog = "https://github.com/Danielhiversen/pymill/releases/tag/${src.tag}";
- license = with licenses; [ mit ];
+ license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/nhc/default.nix b/pkgs/development/python-modules/nhc/default.nix
index 020092d87395..e2fc67d0077a 100644
--- a/pkgs/development/python-modules/nhc/default.nix
+++ b/pkgs/development/python-modules/nhc/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "nhc";
- version = "0.5.4";
+ version = "0.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "vandeurenglenn";
repo = "nhc";
tag = "v${version}";
- hash = "sha256-IwV6Wav+GTVob2XW0pBhwgbLTFj+U1SG+S2HlJApLZ8=";
+ hash = "sha256-eEzubHmnaj1Z7XKlpQff4VLlNNllnBh7pDmNT5Yfw+E=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index ec03672ca806..47a014cf5517 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -1,40 +1,42 @@
{
lib,
- platformdirs,
+ awesomeversion,
buildPythonPackage,
docutils,
fetchFromGitHub,
- nix-update-script,
flaky,
installShellFiles,
+ jq,
+ lxml,
+ nix-update-script,
+ packaging,
+ platformdirs,
pycurl,
pytest-asyncio,
- pytest-httpbin,
pytestCheckHook,
+ pytest-httpbin,
pythonOlder,
setuptools,
structlog,
tomli,
tornado,
- awesomeversion,
- packaging,
- lxml,
+ zstandard,
}:
buildPythonPackage rec {
pname = "nvchecker";
- version = "2.18";
+ version = "2.19";
pyproject = true;
- disabled = pythonOlder "3.8";
-
src = fetchFromGitHub {
owner = "lilydjwg";
repo = "nvchecker";
tag = "v${version}";
- hash = "sha256-6uFox07mZeKwyhRXGuU8dMoPhLB5CkgdLaWCfG2dy4k=";
+ hash = "sha256-C8g8uhuWOl3zPCjTaGs21yJ8k3tmvZE8U9LzSXoDSxE=";
};
+ __darwinAllowLocalNetworking = true;
+
build-system = [ setuptools ];
nativeBuildInputs = [
@@ -42,7 +44,7 @@ buildPythonPackage rec {
installShellFiles
];
- propagatedBuildInputs = [
+ dependencies = [
structlog
platformdirs
tornado
@@ -50,7 +52,14 @@ buildPythonPackage rec {
]
++ lib.optionals (pythonOlder "3.11") [ tomli ];
- __darwinAllowLocalNetworking = true;
+ optional-dependencies = {
+ # vercmp = [ pyalpm ];
+ awesomeversion = [ awesomeversion ];
+ pypi = [ packaging ];
+ htmlparser = [ lxml ];
+ rpmrepo = [ lxml ] ++ lib.optionals (pythonOlder "3.14") [ zstandard ];
+ jq = [ jq ];
+ };
nativeCheckInputs = [
flaky
@@ -72,20 +81,13 @@ buildPythonPackage rec {
disabledTestMarks = [ "needs_net" ];
- optional-dependencies = {
- # vercmp = [ pyalpm ];
- awesomeversion = [ awesomeversion ];
- pypi = [ packaging ];
- htmlparser = [ lxml ];
- };
-
passthru.updateScript = nix-update-script { };
meta = {
description = "New version checker for software";
homepage = "https://github.com/lilydjwg/nvchecker";
- changelog = "https://github.com/lilydjwg/nvchecker/releases/tag/v${version}";
+ changelog = "https://github.com/lilydjwg/nvchecker/releases/tag/${src.tag}";
license = lib.licenses.mit;
- maintainers = [ lib.maintainers.mdaniels5757 ];
+ maintainers = with lib.maintainers; [ mdaniels5757 ];
};
}
diff --git a/pkgs/development/python-modules/orderedset/default.nix b/pkgs/development/python-modules/orderedset/default.nix
deleted file mode 100644
index a1835c6cdac6..000000000000
--- a/pkgs/development/python-modules/orderedset/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- lib,
- buildPythonPackage,
- fetchPypi,
-}:
-
-buildPythonPackage rec {
- pname = "orderedset";
- version = "2.0.3";
- format = "setuptools";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0abf19w37kxypsj6v7dz79jj92y1kivjk2zivnrv7rw6bbxwrxdj";
- };
-
- meta = with lib; {
- description = "Ordered Set implementation in Cython";
- homepage = "https://pypi.python.org/pypi/orderedset";
- license = licenses.bsd3;
- maintainers = [ ];
- # No support for Python 3.9/3.10
- # https://github.com/simonpercivall/orderedset/issues/36
- broken = true;
- };
-}
diff --git a/pkgs/development/python-modules/pygeocodio/default.nix b/pkgs/development/python-modules/pygeocodio/default.nix
index cf06e8687ca9..96350f02b599 100644
--- a/pkgs/development/python-modules/pygeocodio/default.nix
+++ b/pkgs/development/python-modules/pygeocodio/default.nix
@@ -3,7 +3,7 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
- setuptools,
+ hatchling,
requests,
pytestCheckHook,
httpretty,
@@ -22,7 +22,7 @@ buildPythonPackage rec {
};
build-system = [
- setuptools
+ hatchling
];
dependencies = [
diff --git a/pkgs/development/python-modules/pyportainer/default.nix b/pkgs/development/python-modules/pyportainer/default.nix
index aa22c41e24fb..145ad7676d87 100644
--- a/pkgs/development/python-modules/pyportainer/default.nix
+++ b/pkgs/development/python-modules/pyportainer/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "pyportainer";
- version = "1.0.1";
+ version = "1.0.3";
pyproject = true;
src = fetchFromGitHub {
owner = "erwindouna";
repo = "pyportainer";
tag = "v${version}";
- hash = "sha256-SAHcIP6M4WjWnrRwz4FlsV6rel1vHzH+cGHT8D/PcQk=";
+ hash = "sha256-Y/O2lhsjkSEKQL7HhdmlzMjY1597uuUOFfI05aLiBXg=";
};
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix
index 0046f1c1ba9c..9b36237895fd 100644
--- a/pkgs/development/python-modules/pytibber/default.nix
+++ b/pkgs/development/python-modules/pytibber/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pytibber";
- version = "0.32.1";
+ version = "0.32.2";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pyTibber";
tag = version;
- hash = "sha256-PHd0aqF1Oodfvgyrv25xOD3JSOKC4RUe/ViulQN7sxQ=";
+ hash = "sha256-gMXbDpkb+LVIxVkYliskEeHOrkJxAuJdYxUEC4wp3r8=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/rpy2-robjects/default.nix b/pkgs/development/python-modules/rpy2-robjects/default.nix
index 566cf7581068..a4c039e47c71 100644
--- a/pkgs/development/python-modules/rpy2-robjects/default.nix
+++ b/pkgs/development/python-modules/rpy2-robjects/default.nix
@@ -16,7 +16,7 @@
}:
buildPythonPackage rec {
- version = "3.6.2";
+ version = "3.6.3";
format = "pyproject";
pname = "rpy2-robjects";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${
builtins.replaceStrings [ "-" ] [ "_" ] pname
}-${version}.tar.gz";
- hash = "sha256-rJGvMtXE2iNrBaPNaNr7JM2PWogPAHhim48r8CUFQjs=";
+ hash = "sha256-cxqhpJBcSyXAVk1yy/2F+SMBAvmJ56IlFYhekdTfPUA=";
};
patches = [
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index 2615ca14450e..8a3c75b815be 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -32,7 +32,7 @@
}:
let
- installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}";
+ installedPackageRoot = "${placeholder "out"}/${python.sitePackages}";
self = buildPythonPackage rec {
pname = "scikit-image";
version = "0.25.2";
diff --git a/pkgs/development/python-modules/sentencepiece/default.nix b/pkgs/development/python-modules/sentencepiece/default.nix
index 211d753d1c94..c3ca94659e24 100644
--- a/pkgs/development/python-modules/sentencepiece/default.nix
+++ b/pkgs/development/python-modules/sentencepiece/default.nix
@@ -16,5 +16,5 @@ buildPythonPackage rec {
sourceRoot = "${src.name}/python";
# sentencepiece installs 'bin' output.
- meta = builtins.removeAttrs sentencepiece.meta [ "outputsToInstall" ];
+ meta = removeAttrs sentencepiece.meta [ "outputsToInstall" ];
}
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index c23fc3a688a4..736cc627d4b6 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -67,14 +67,14 @@
buildPythonPackage rec {
pname = "sentry-sdk";
- version = "2.34.1";
+ version = "2.39.0";
pyproject = true;
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-python";
tag = version;
- hash = "sha256-RQnjvX3bDiB9csn/DsQ769EiVm7HY+B7x9V5jpvsOOA=";
+ hash = "sha256-2M5Uvo8dl6hOqY13Eqjo4aKFySdlqEO8BHrPxZ/l+fw=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/specfile/default.nix b/pkgs/development/python-modules/specfile/default.nix
index 22092c5fa54d..ce46f03eea0f 100644
--- a/pkgs/development/python-modules/specfile/default.nix
+++ b/pkgs/development/python-modules/specfile/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "specfile";
- version = "0.37.0";
+ version = "0.37.1";
pyproject = true;
src = fetchFromGitHub {
owner = "packit";
repo = "specfile";
tag = version;
- hash = "sha256-gYbnbs2mkQghQ0Zvenal5bEYObLpDB3Xu4kO9oqi0Ms=";
+ hash = "sha256-phzvQs49AC9SbmcQHWprfjHssF0ughDJ9KKVnUEB/gg=";
};
build-system = [
diff --git a/pkgs/development/python-modules/subunit2sql/default.nix b/pkgs/development/python-modules/subunit2sql/default.nix
deleted file mode 100644
index ea239315d220..000000000000
--- a/pkgs/development/python-modules/subunit2sql/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
- lib,
- buildPythonPackage,
- fetchPypi,
- mock,
- oslo-concurrency,
- oslo-db,
- pbr,
- python-dateutil,
- stestr,
- testresources,
- testscenarios,
-}:
-
-buildPythonPackage rec {
- pname = "subunit2sql";
- version = "1.10.0";
- format = "setuptools";
-
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-c+Dg6moKiv30M0mmwGQSOEbc94gfH//ZnF7lnBgv8EU=";
- };
-
- propagatedBuildInputs = [
- oslo-db
- pbr
- python-dateutil
- ];
-
- nativeCheckInputs = [
- mock
- oslo-concurrency
- stestr
- testresources
- testscenarios
- ];
-
- checkPhase = ''
- export PATH=$out/bin:$PATH
- export HOME=$TMPDIR
-
- stestr run -e <(echo "
- subunit2sql.tests.db.test_api.TestDatabaseAPI.test_get_failing_test_ids_from_runs_by_key_value
- subunit2sql.tests.db.test_api.TestDatabaseAPI.test_get_id_from_test_id
- subunit2sql.tests.db.test_api.TestDatabaseAPI.test_get_test_run_dict_by_run_meta_key_value
- subunit2sql.tests.migrations.test_migrations.TestWalkMigrations.test_sqlite_opportunistically
- subunit2sql.tests.test_shell.TestMain.test_main
- subunit2sql.tests.test_shell.TestMain.test_main_with_targets
- ")
- '';
-
- pythonImportsCheck = [ "subunit2sql" ];
-
- meta = with lib; {
- description = "Command to Read a subunit file or stream and put the data in a SQL DB";
- homepage = "https://opendev.org/opendev/subunit2sql";
- license = licenses.asl20;
- teams = [ teams.openstack ];
- # version 1.10.0 is incomptaible with oslo-db 14.0.0
- broken = true;
- };
-}
diff --git a/pkgs/development/python-modules/tiered-debug/default.nix b/pkgs/development/python-modules/tiered-debug/default.nix
index 5a3bef576477..b274b116473e 100644
--- a/pkgs/development/python-modules/tiered-debug/default.nix
+++ b/pkgs/development/python-modules/tiered-debug/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "tiered-debug";
- version = "1.3.0";
+ version = "1.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "untergeek";
repo = "tiered-debug";
tag = "v${version}";
- hash = "sha256-2mThiuJUX+N5qIOXpdFOuIa+kBGYzbZzCeaAfEz3Iy0=";
+ hash = "sha256-cvyqyyHAeRaCup4V2jbqT1Jx2/waQGtc+Sk3DJy5y8M=";
};
build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index 3f87185b719e..3c956d0f6735 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "twilio";
- version = "9.8.2";
+ version = "9.8.3";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
tag = version;
- hash = "sha256-ZOkXJ1NN3qmHABfOBpR1tECCIfAwwVMGyLBbU1jYowc=";
+ hash = "sha256-bmDgzlI9W61uHbQHkaQ3VKu2Fwbr+y0N5Tec2AzjNBE=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
index 2d65e65880b3..797f9b71a849 100644
--- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix
+++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
@@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = "universal-silabs-flasher";
- version = "0.0.34";
+ version = "0.0.35";
pyproject = true;
src = fetchFromGitHub {
owner = "NabuCasa";
repo = "universal-silabs-flasher";
tag = "v${version}";
- hash = "sha256-08ay5W5DHY1GwzZDwjPGPnVjXfHgiwWUIHzuAZZpS9M=";
+ hash = "sha256-6NOcEH1UUicZHKOQ91o4l7JiC1Qwpc8vWyRR7TRENqs=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/uv/default.nix b/pkgs/development/python-modules/uv/default.nix
index a89e43451ec8..662ffffb3f65 100644
--- a/pkgs/development/python-modules/uv/default.nix
+++ b/pkgs/development/python-modules/uv/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage {
substituteInPlace python/uv/_find_uv.py \
--replace-fail \
'sysconfig.get_path("scripts", scheme=_user_scheme()),' \
- 'sysconfig.get_path("scripts", scheme=_user_scheme()), "${builtins.baseNameOf (lib.getExe uv)}",'
+ 'sysconfig.get_path("scripts", scheme=_user_scheme()), "${baseNameOf (lib.getExe uv)}",'
''
# Sidestep the maturin build system in favour of reusing the binary already built by nixpkgs,
# to avoid rebuilding the uv binary for every active python package set.
diff --git a/pkgs/development/python-modules/warp-lang/default.nix b/pkgs/development/python-modules/warp-lang/default.nix
index 8740e7ec96c1..cd521021b7f8 100644
--- a/pkgs/development/python-modules/warp-lang/default.nix
+++ b/pkgs/development/python-modules/warp-lang/default.nix
@@ -35,7 +35,7 @@
assert libmathdxSupport -> cudaSupport;
let
effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else args.stdenv;
- stdenv = builtins.throw "Use effectiveStdenv instead of stdenv directly, as it may be replaced by cudaPackages.backendStdenv";
+ stdenv = throw "Use effectiveStdenv instead of stdenv directly, as it may be replaced by cudaPackages.backendStdenv";
version = "1.9.0";
diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index 81954e88bb25..043bf9f8dd18 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -478,7 +478,7 @@ let
in
outer
// builtins.listToAttrs (
- builtins.map (arch: {
+ map (arch: {
name = arch;
value = scopeForArches [ arch ];
}) outer.clr.gpuTargets
diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix
index c8fb82fa0235..b45fe071041e 100644
--- a/pkgs/development/rocm-modules/6/llvm/default.nix
+++ b/pkgs/development/rocm-modules/6/llvm/default.nix
@@ -161,8 +161,8 @@ let
findClangNostdlibincPatch =
x:
(
- (lib.strings.hasSuffix "add-nostdlibinc-flag.patch" (builtins.baseNameOf x))
- || (lib.strings.hasSuffix "clang-at-least-16-LLVMgold-path.patch" (builtins.baseNameOf x))
+ (lib.strings.hasSuffix "add-nostdlibinc-flag.patch" (baseNameOf x))
+ || (lib.strings.hasSuffix "clang-at-least-16-LLVMgold-path.patch" (baseNameOf x))
);
llvmTargetsFlag = "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${
{
@@ -251,7 +251,7 @@ rec {
}).overrideAttrs
(old: {
patches = builtins.filter (
- x: !(lib.strings.hasSuffix "more-openbsd-program-headers.patch" (builtins.baseNameOf x))
+ x: !(lib.strings.hasSuffix "more-openbsd-program-headers.patch" (baseNameOf x))
) old.patches;
dontStrip = profilableStdenv;
nativeBuildInputs = old.nativeBuildInputs ++ [
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix
index 0e3c1c4187f2..10ea06c415bd 100644
--- a/pkgs/development/ruby-modules/gem/default.nix
+++ b/pkgs/development/ruby-modules/gem/default.nix
@@ -107,7 +107,7 @@ lib.makeOverridable (
in
stdenv.mkDerivation (
- (builtins.removeAttrs attrs [ "source" ])
+ (removeAttrs attrs [ "source" ])
// {
inherit ruby;
inherit dontBuild;
diff --git a/pkgs/development/tools/analysis/binlore/default.nix b/pkgs/development/tools/analysis/binlore/default.nix
index 5033a73c515e..ceb81cd2d1b8 100644
--- a/pkgs/development/tools/analysis/binlore/default.nix
+++ b/pkgs/development/tools/analysis/binlore/default.nix
@@ -136,7 +136,7 @@ rec {
+
# append lore from package's $out and drv.binlore.${drv.outputName} (last entry wins)
''
- for lore_type in ${builtins.toString lore.types}; do
+ for lore_type in ${toString lore.types}; do
if [[ -f "${drv}/nix-support/$lore_type" ]]; then
cat "${drv}/nix-support/$lore_type" >> "$out/$lore_type"
fi
diff --git a/pkgs/development/tools/build-managers/gradle/fetch-deps.nix b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix
index 1474d003f70d..9bb4686072fa 100644
--- a/pkgs/development/tools/build-managers/gradle/fetch-deps.nix
+++ b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix
@@ -26,7 +26,7 @@ in
let
data' =
- builtins.removeAttrs
+ removeAttrs
(
if builtins.isPath data then
lib.importJSON data
@@ -168,7 +168,7 @@ let
sortByVersion = a: b: (builtins.compareVersions a.version b.version) < 0;
sortedJarPomList = lib.sort sortByVersion jarPomList;
- uniqueVersionFiles = builtins.map ({ i, x }: x) (
+ uniqueVersionFiles = map ({ i, x }: x) (
builtins.filter (
{ i, x }: i == 0 || (builtins.elemAt sortedJarPomList (i - 1)).version != x.version
) (lib.imap0 (i: x: { inherit i x; }) sortedJarPomList)
diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix
index d0d43b94d82f..12fd33a51480 100644
--- a/pkgs/development/tools/buildah/wrapper.nix
+++ b/pkgs/development/tools/buildah/wrapper.nix
@@ -55,7 +55,7 @@ runCommand buildah-unwrapped.name
preferLocalBuild = true;
- meta = builtins.removeAttrs buildah-unwrapped.meta [ "outputsToInstall" ];
+ meta = removeAttrs buildah-unwrapped.meta [ "outputsToInstall" ];
outputs = [
"out"
diff --git a/pkgs/development/tools/haskell/ghc-settings-edit/default.nix b/pkgs/development/tools/haskell/ghc-settings-edit/default.nix
index 4cd19aebcdd7..5e4395bd1396 100644
--- a/pkgs/development/tools/haskell/ghc-settings-edit/default.nix
+++ b/pkgs/development/tools/haskell/ghc-settings-edit/default.nix
@@ -11,7 +11,7 @@ mkDerivation {
src = builtins.path {
path = ./.;
name = "source";
- filter = path: _: (builtins.baseNameOf path) != "default.nix";
+ filter = path: _: (baseNameOf path) != "default.nix";
};
isLibrary = false;
isExecutable = true;
diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index cc5a704dcef0..1ebddf20ed23 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -100,7 +100,7 @@ let
meta = {
description = "Fast, free distributed C/C++ compiler";
homepage = "http://distcc.org";
- license = "GPL";
+ license = lib.licenses.gpl2Only;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ anderspapitto ];
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index 24877ea7f401..95538b766105 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -13,5 +13,5 @@ buildDunePackage {
propagatedBuildInputs = [ js_of_ocaml-compiler ];
- meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
+ meta = removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
}
diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix
index d532c2fa43d3..91eb685f0671 100644
--- a/pkgs/development/tools/pnpm/fetch-deps/default.nix
+++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix
@@ -31,7 +31,7 @@ in
...
}@args:
let
- args' = builtins.removeAttrs args [
+ args' = removeAttrs args [
"hash"
"pname"
];
@@ -56,7 +56,7 @@ in
) true;
assert (lib.throwIf (!(builtins.elem fetcherVersion supportedFetcherVersions))
- "pnpm.fetchDeps `fetcherVersion` is not set to a supported value (${lib.concatStringsSep ", " (builtins.map toString supportedFetcherVersions)}), see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."
+ "pnpm.fetchDeps `fetcherVersion` is not set to a supported value (${lib.concatStringsSep ", " (map toString supportedFetcherVersions)}), see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."
) true;
stdenvNoCC.mkDerivation (
diff --git a/pkgs/development/tools/yarn2nix-moretea/default.nix b/pkgs/development/tools/yarn2nix-moretea/default.nix
index dc10d2d51819..9b0aca26bbd0 100644
--- a/pkgs/development/tools/yarn2nix-moretea/default.nix
+++ b/pkgs/development/tools/yarn2nix-moretea/default.nix
@@ -101,7 +101,7 @@ rec {
builtins.attrNames pkgConfig
);
- postInstall = builtins.map (
+ postInstall = map (
key:
if (pkgConfig.${key} ? postInstall) then
''
@@ -285,7 +285,7 @@ rec {
{
inherit name;
value = mkYarnPackage (
- builtins.removeAttrs attrs [ "packageOverrides" ]
+ removeAttrs attrs [ "packageOverrides" ]
// {
inherit
src
@@ -333,8 +333,7 @@ rec {
baseName = unlessNull name "${safeName}-${version}";
workspaceDependenciesTransitive = lib.unique (
- (lib.flatten (builtins.map (dep: dep.workspaceDependencies) workspaceDependencies))
- ++ workspaceDependencies
+ (lib.flatten (map (dep: dep.workspaceDependencies) workspaceDependencies)) ++ workspaceDependencies
);
deps = mkYarnModules {
@@ -387,7 +386,7 @@ rec {
in
stdenv.mkDerivation (
- builtins.removeAttrs attrs [
+ removeAttrs attrs [
"yarnNix"
"pkgConfig"
"workspaceDependencies"
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js
index 238fb744ab19..ca03c09821d0 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js
+++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js
@@ -12,7 +12,7 @@ const { execFileSync } = require("child_process");
//
// to
//
-// builtins.fetchGit {
+// fetchGit {
// url = "https://github.com/srghma/node-shell-quote.git";
// ref = "without_unlicenced_jsonify";
// rev = "1234commit";
@@ -26,7 +26,7 @@ const { execFileSync } = require("child_process");
//
// to
//
-// builtins.fetchGit {
+// fetchGit {
// url = "https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git";
// ref = "master";
// rev = "1234commit";
@@ -47,7 +47,7 @@ function prefetchgit(url, rev) {
function fetchgit(fileName, url, rev, branch, builtinFetchGit) {
const repo = builtinFetchGit
- ? `builtins.fetchGit ({
+ ? `fetchGit ({
url = "${url}";
ref = "${branch}";
rev = "${rev}";
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 0038bffbf2e6..e94887da7ad0 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -93,8 +93,8 @@ let
''
+ (lib.strings.concatStringsSep "\n" (
map (dep: ''
- if ! [[ "${builtins.baseNameOf dep.url}" =~ (PyQt|pyqt) ]]; then
- ln -vsf ${dep.path} "$out/${builtins.baseNameOf dep.url}"
+ if ! [[ "${baseNameOf dep.url}" =~ (PyQt|pyqt) ]]; then
+ ln -vsf ${dep.path} "$out/${baseNameOf dep.url}"
fi
'') pythonDeps
));
diff --git a/pkgs/games/anki/with-addons.nix b/pkgs/games/anki/with-addons.nix
index d47c2c16f316..f7fae980349a 100644
--- a/pkgs/games/anki/with-addons.nix
+++ b/pkgs/games/anki/with-addons.nix
@@ -99,7 +99,7 @@ symlinkJoin {
--set ANKI_ADDONS "${anki-utils.buildAnkiAddonsDir (ankiAddons ++ defaultAddons)}"
'';
- meta = builtins.removeAttrs anki.meta [
+ meta = removeAttrs anki.meta [
"name"
"outputsToInstall"
"position"
diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix
index 0af177f0448f..23595aa070c2 100644
--- a/pkgs/games/blightmud/default.nix
+++ b/pkgs/games/blightmud/default.nix
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec {
];
skipFlag = test: "--skip " + test;
in
- builtins.concatStringsSep " " (builtins.map skipFlag skipList);
+ builtins.concatStringsSep " " (map skipFlag skipList);
meta = with lib; {
description = "Terminal MUD client written in Rust";
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index b70fb9316333..8abe6f904479 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -20,7 +20,7 @@ let
base = if stdenv.hostPlatform.is32bit then "linux32" else "linux64";
in
prefix + base;
- inifile = "linux/v0.${builtins.toString dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}${platformSlug}.ini";
+ inifile = "linux/v0.${toString dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}${platformSlug}.ini";
unsupportedVersion = lib.versionOlder dwarf-therapist.maxDfVersion dwarf-fortress.dfVersion;
# Used to run dfhack to produce a Therapist ini file for the current memory map.
diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index b3fb1efed080..14ebff5c65bf 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -231,7 +231,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Rogue-like game";
homepage = "http://nethack.org/";
- license = "nethack";
+ license = lib.licenses.ngpl;
platforms = if x11Mode then platforms.linux else platforms.unix;
maintainers = [ ];
mainProgram = "nethack";
diff --git a/pkgs/games/scummvm/games.nix b/pkgs/games/scummvm/games.nix
index ed17fac29cdf..0275b50039da 100644
--- a/pkgs/games/scummvm/games.nix
+++ b/pkgs/games/scummvm/games.nix
@@ -48,7 +48,7 @@ let
...
}@attrs:
let
- attrs' = builtins.removeAttrs attrs [
+ attrs' = removeAttrs attrs [
"plong"
"pshort"
"pcode"
diff --git a/pkgs/games/shattered-pixel-dungeon/generic.nix b/pkgs/games/shattered-pixel-dungeon/generic.nix
index c881d994cded..39ffc40c1df3 100644
--- a/pkgs/games/shattered-pixel-dungeon/generic.nix
+++ b/pkgs/games/shattered-pixel-dungeon/generic.nix
@@ -22,7 +22,7 @@
}@attrs:
let
- cleanAttrs = builtins.removeAttrs attrs [
+ cleanAttrs = removeAttrs attrs [
"lib"
"stdenv"
"makeWrapper"
diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix
index 75228d1e36eb..97f989082494 100644
--- a/pkgs/kde/lib/mk-kde-derivation.nix
+++ b/pkgs/kde/lib/mk-kde-derivation.nix
@@ -161,7 +161,7 @@ let
env.LANG = "C.UTF-8";
};
- cleanArgs = builtins.removeAttrs args [
+ cleanArgs = removeAttrs args [
"extraBuildInputs"
"extraNativeBuildInputs"
"extraPropagatedBuildInputs"
diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
index 93888011ba8a..b3b43b9a78c8 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -114,7 +114,7 @@ let
}
// extraMeta;
}
- // builtins.removeAttrs args [ "extraMeta" ]
+ // removeAttrs args [ "extraMeta" ]
)
);
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index e7eae7c7c359..559da3d2c48d 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -137,7 +137,7 @@ let
mkdir -p "$out/nix-support"
${lib.concatMapStrings (file: ''
- echo "file binary-dist ${installDir}/${builtins.baseNameOf file}" >> "$out/nix-support/hydra-build-products"
+ echo "file binary-dist ${installDir}/${baseNameOf file}" >> "$out/nix-support/hydra-build-products"
'') (filesToInstall ++ builtins.attrNames pythonScriptsToInstall)}
runHook postInstall
diff --git a/pkgs/os-specific/bsd/freebsd/lib/default.nix b/pkgs/os-specific/bsd/freebsd/lib/default.nix
index d8d975ef71ad..ec07808f57d4 100644
--- a/pkgs/os-specific/bsd/freebsd/lib/default.nix
+++ b/pkgs/os-specific/bsd/freebsd/lib/default.nix
@@ -81,7 +81,7 @@
else if (builtins.isPath patches) then
(if (isDir patches) then (lib.filesystem.listFilesRecursive patches) else [ patches ])
else if (builtins.isList patches) then
- (lib.flatten (builtins.map consolidatePatches patches))
+ (lib.flatten (map consolidatePatches patches))
else
throw "Bad patches - must be path or derivation or list thereof";
consolidated = consolidatePatches patches;
@@ -115,7 +115,7 @@
);
filteredLines = builtins.filter filterFunc partitionedPatches;
derive = patchLines: writeText "freebsd-patch" (lib.concatLines patchLines);
- derivedPatches = builtins.map derive filteredLines;
+ derivedPatches = map derive filteredLines;
in
derivedPatches;
in
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix
index 002b9276cf5b..4f4595b1b6fb 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod-firmware.nix
@@ -40,7 +40,7 @@ mkDerivation rec {
env = sys.passthru.env;
SYSDIR = "${sys.src}/sys";
- KMODDIR = "${builtins.placeholder "out"}/kernel";
+ KMODDIR = "${placeholder "out"}/kernel";
meta = {
description = "GPU firmware for FreeBSD drm-kmod";
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix
index c604ee573628..e18446b1c434 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix
@@ -43,7 +43,7 @@ mkDerivation {
env = sys.passthru.env;
SYSDIR = "${sys.src}/sys";
- KMODDIR = "${builtins.placeholder "out"}/kernel";
+ KMODDIR = "${placeholder "out"}/kernel";
meta = {
description = "Linux drm driver, ported to FreeBSD";
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/install.nix b/pkgs/os-specific/bsd/freebsd/pkgs/install.nix
index 01e40b9d9144..d8dbf2ffa18b 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/install.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/install.nix
@@ -53,7 +53,7 @@ mkDerivation {
makeFlags = [
"STRIP=-s" # flag to install, not command
"MK_WERROR=no"
- "TESTSDIR=${builtins.placeholder "test"}"
+ "TESTSDIR=${placeholder "test"}"
]
++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
"BOOTSTRAPPING=1"
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
index eeac3be85758..a4a3017a209d 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
@@ -122,7 +122,7 @@ lib.makeOverridable (
installPhase = "includesPhase";
dontBuild = true;
}
- // (builtins.removeAttrs attrs [ "env" ])
+ // (removeAttrs attrs [ "env" ])
// {
patches =
(lib.optionals (attrs.autoPickPatches or true) (
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
index b788d9a81eb5..9c93d416f6c0 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
@@ -119,11 +119,11 @@ mkDerivation rec {
inherit env;
passthru.env = env;
- KODIR = "${builtins.placeholder "out"}/kernel";
- KMODDIR = "${builtins.placeholder "out"}/kernel";
- DTBDIR = "${builtins.placeholder "out"}/dbt";
+ KODIR = "${placeholder "out"}/kernel";
+ KMODDIR = "${placeholder "out"}/kernel";
+ DTBDIR = "${placeholder "out"}/dbt";
- KERN_DEBUGDIR = "${builtins.placeholder "debug"}/lib/debug";
+ KERN_DEBUGDIR = "${placeholder "debug"}/lib/debug";
KERN_DEBUGDIR_KODIR = "${KERN_DEBUGDIR}/kernel";
KERN_DEBUGDIR_KMODDIR = "${KERN_DEBUGDIR}/kernel";
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/package.nix
index dfe82eff271e..52c2d56c00d3 100644
--- a/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/package.nix
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/libcMinimal/package.nix
@@ -57,7 +57,7 @@ mkDerivation {
csu
];
- env.NIX_CFLAGS_COMPILE = builtins.toString [
+ env.NIX_CFLAGS_COMPILE = toString [
"-B${csu}/lib"
"-Wno-error"
];
diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix
index 7ef016e6f9f9..e3fd1520049a 100644
--- a/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix
@@ -103,6 +103,6 @@ lib.makeOverridable (
dontBuild = true;
}
// lib.optionalAttrs stdenv'.hostPlatform.isStatic { NOLIBSHARED = true; }
- // (builtins.removeAttrs attrs [ "extraNativeBuildInputs" ])
+ // (removeAttrs attrs [ "extraNativeBuildInputs" ])
)
)
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index 653769aa8a9b..0288be84dd6a 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -4,6 +4,7 @@
fetchurl,
kernel,
kernelModuleMakeFlags,
+ nixosTests,
}:
let
@@ -31,6 +32,10 @@ stdenv.mkDerivation rec {
-e /depmod/d Makefile
'';
+ passthru.tests = {
+ systemd-networkd-batadv = nixosTests.systemd-networkd-batadv;
+ };
+
meta = {
homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki";
description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2";
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 5f6111e5f7fa..a16ef1cccabe 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -104,7 +104,7 @@ let
# and pings all maintainers.
#
# For further context, see https://github.com/NixOS/nixpkgs/pull/143113#issuecomment-953319957
- basicArgs = builtins.removeAttrs args (
+ basicArgs = removeAttrs args (
lib.filter (
x:
!(builtins.elem x [
diff --git a/pkgs/os-specific/linux/kernel/mainline.nix b/pkgs/os-specific/linux/kernel/mainline.nix
index ac8f75c873eb..0ba9f47e542a 100644
--- a/pkgs/os-specific/linux/kernel/mainline.nix
+++ b/pkgs/os-specific/linux/kernel/mainline.nix
@@ -29,7 +29,7 @@ let
};
args' =
- (builtins.removeAttrs args [ "branch" ])
+ (removeAttrs args [ "branch" ])
// {
inherit src version;
isLTS = thisKernel.lts;
diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index d957e35c43db..0f071ff58330 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,14 +15,14 @@ let
variants = {
# ./update-xanmod.sh lts
lts = {
- version = "6.12.49";
- hash = "sha256-j7sVP+Aqiwz8cBZZ95NL5FNVT8NizCox1JiibSmfsIo=";
+ version = "6.12.50";
+ hash = "sha256-I3D862tWW+MYDTd5C6iGB8ZLH8nDOsXzlrOYch55K2g=";
isLTS = true;
};
# ./update-xanmod.sh main
main = {
- version = "6.16.9";
- hash = "sha256-Qu7P5l9Wz0gpptdloDUZRgOVeqXTJWq4q2AXNls6nBY=";
+ version = "6.16.10";
+ hash = "sha256-TCMx1Sx/9o8oGOLVfsIvYZoe+FHs5zL+n/tGYevObI0=";
};
};
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix b/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix
index a6adb130049c..df180c0646eb 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix
@@ -115,7 +115,7 @@ kaem.runCommand "${pname}-${version}"
]
);
}
- // (builtins.removeAttrs env [ "nativeBuildInputs" ])
+ // (removeAttrs env [ "nativeBuildInputs" ])
);
passthru.tests.get-version =
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix
index 8de6229e8809..4b8dd891b1e3 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix
@@ -83,7 +83,7 @@ bootBash.runCommand "${pname}-${version}"
]
);
}
- // (builtins.removeAttrs env [ "nativeBuildInputs" ])
+ // (removeAttrs env [ "nativeBuildInputs" ])
);
passthru.tests.get-version =
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix
index 71da482689d6..b3e0208476d6 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix
@@ -152,7 +152,7 @@ let
"src/posixos.c"
];
- objects = map (x: lib.replaceStrings [ ".c" ] [ ".o" ] (builtins.baseNameOf x)) sources;
+ objects = map (x: lib.replaceStrings [ ".c" ] [ ".o" ] (baseNameOf x)) sources;
in
kaem.runCommand "${pname}-${version}"
{
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnupatch/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnupatch/default.nix
index ac387537f7dc..8e18b829fc59 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/gnupatch/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/gnupatch/default.nix
@@ -66,7 +66,7 @@ let
"error.c"
];
- objects = map (x: lib.replaceStrings [ ".c" ] [ ".o" ] (builtins.baseNameOf x)) sources;
+ objects = map (x: lib.replaceStrings [ ".c" ] [ ".o" ] (baseNameOf x)) sources;
in
kaem.runCommand "${pname}-${version}"
{
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix
index 710520b68f91..bbec9847013f 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/mes/default.nix
@@ -138,7 +138,7 @@ let
CC = toString ([ cc ] ++ ccArgs);
- stripExt = source: lib.replaceStrings [ ".c" ] [ "" ] (builtins.baseNameOf source);
+ stripExt = source: lib.replaceStrings [ ".c" ] [ "" ] (baseNameOf source);
compile =
source:
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix
index 4f247197dc13..dcf9b50da37d 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix
@@ -77,7 +77,7 @@ rec {
#
# Neither your store nor your substituters seems to have:
#
- # ${builtins.placeholder "out"}
+ # ${placeholder "out"}
#
# You can create this path from an already-bootstrapped nixpkgs
# using the following command:
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/default.nix
index 84463ef7b133..091436dcf482 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/default.nix
@@ -51,7 +51,7 @@ derivationWithMeta {
]
);
}
- // (builtins.removeAttrs env [ "nativeBuildInputs" ])
+ // (removeAttrs env [ "nativeBuildInputs" ])
);
meta = with lib; {
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/utils.nix b/pkgs/os-specific/linux/minimal-bootstrap/utils.nix
index ba6cd71b5e0c..b974c08af984 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/utils.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/utils.nix
@@ -18,7 +18,7 @@ rec {
inherit (buildPlatform) system;
inherit (meta) name;
}
- // (builtins.removeAttrs attrs [
+ // (removeAttrs attrs [
"meta"
"passthru"
])
@@ -57,7 +57,7 @@ rec {
''
target=''${out}''${destination}
''
- + lib.optionalString (builtins.dirOf destination == ".") ''
+ + lib.optionalString (dirOf destination == ".") ''
mkdir -p ''${out}''${destinationDir}
''
+ ''
@@ -70,7 +70,7 @@ rec {
];
PATH = lib.makeBinPath [ mescc-tools-extra ];
- destinationDir = builtins.dirOf destination;
+ destinationDir = dirOf destination;
inherit destination;
};
diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix
index fec41a4a778f..270dfa993024 100644
--- a/pkgs/os-specific/linux/ndiswrapper/default.nix
+++ b/pkgs/os-specific/linux/ndiswrapper/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
meta = {
description = "Ndis driver wrapper for the Linux kernel";
homepage = "https://sourceforge.net/projects/ndiswrapper";
- license = "GPL";
+ license = lib.licenses.gpl2Plus;
platforms = [
"i686-linux"
"x86_64-linux"
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index e5ad9fd5fd1f..1a84f5c0846e 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -77,7 +77,7 @@ let
rewritePatch =
{ from, to }:
patch:
- runCommandLocal (builtins.baseNameOf patch)
+ runCommandLocal (baseNameOf patch)
{
inherit patch;
nativeBuildInputs = [ patchutils ];
@@ -249,7 +249,7 @@ stdenv.mkDerivation (finalAttrs: {
...
}@args:
let
- args' = builtins.removeAttrs args [
+ args' = removeAttrs args [
"owner"
"repo"
"rev"
@@ -276,7 +276,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit hash;
nvidia_x11 = finalAttrs.finalPackage;
patches =
- (builtins.map (rewritePatch {
+ (map (rewritePatch {
from = "kernel";
to = "kernel-open";
}) patches)
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 0bf921dd0853..37d2b43f0baf 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -891,11 +891,7 @@ stdenv.mkDerivation (finalAttrs: {
disallowedReferences =
lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform)
# 'or p' is for manually specified buildPackages as they dont have __spliced
- (
- builtins.filter (p: p != null) (
- builtins.map (p: p.__spliced.buildHost or p) finalAttrs.nativeBuildInputs
- )
- );
+ (builtins.filter (p: p != null) (map (p: p.__spliced.buildHost or p) finalAttrs.nativeBuildInputs));
disallowedRequisites = lib.optionals (!withUkify) [
bash
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 629afc08b89e..4f4401f31a71 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -22,9 +22,9 @@ let
downloadPage = "https://github.com/FirebirdSQL/firebird/";
homepage = "https://firebirdsql.org/";
changelog = "https://github.com/FirebirdSQL/firebird/blob/master/CHANGELOG.md";
- license = [
- "IDPL"
- "Interbase-1.0"
+ license = with lib.licenses; [
+ mpl11
+ interbase
];
platforms = platforms.linux;
maintainers = with maintainers; [
diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix
index 1033f50d045d..58d1cc369bc2 100644
--- a/pkgs/servers/home-assistant/build-custom-component/default.nix
+++ b/pkgs/servers/home-assistant/build-custom-component/default.nix
@@ -64,7 +64,7 @@ home-assistant.python.pkgs.buildPythonPackage (
// args.meta or { };
}
- // builtins.removeAttrs args [
+ // removeAttrs args [
"meta"
"nativeCheckInputs"
"passthru"
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d0d12067eeed..8e56ef1c9be6 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2025.10.0";
+ version = "2025.10.1";
components = {
"3_day_blinds" =
ps: with ps; [
diff --git a/pkgs/servers/home-assistant/custom-components/alarmo/package.nix b/pkgs/servers/home-assistant/custom-components/alarmo/package.nix
index cf30c8f30178..6c6483e418bb 100644
--- a/pkgs/servers/home-assistant/custom-components/alarmo/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/alarmo/package.nix
@@ -7,13 +7,13 @@
buildHomeAssistantComponent rec {
owner = "nielsfaber";
domain = "alarmo";
- version = "1.10.10";
+ version = "1.10.11";
src = fetchFromGitHub {
owner = "nielsfaber";
repo = "alarmo";
tag = "v${version}";
- hash = "sha256-vN+zyZFaW00Md5aow5n2b/lTYuC/FXh59OFA3TwrPi4=";
+ hash = "sha256-OASgIudnxPtWiBLpkiOioCRhIqlr2B5E2/XGlhs16sQ=";
};
postPatch = ''
diff --git a/pkgs/servers/home-assistant/custom-components/hildebrand_glow_ihd/package.nix b/pkgs/servers/home-assistant/custom-components/hildebrand_glow_ihd/package.nix
new file mode 100644
index 000000000000..68cd1f9464f9
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/hildebrand_glow_ihd/package.nix
@@ -0,0 +1,28 @@
+{
+ lib,
+ buildHomeAssistantComponent,
+ fetchFromGitHub,
+ nix-update-script,
+}:
+
+buildHomeAssistantComponent rec {
+ owner = "megakid";
+ domain = "hildebrand_glow_ihd";
+ version = "1.8.0";
+
+ src = fetchFromGitHub {
+ inherit owner;
+ repo = "ha_hildebrand_glow_ihd_mqtt";
+ tag = "v${version}";
+ hash = "sha256-13NmNHaCYDZkWK5uqKeTZlB84UuThNLOAYaPS4QfTKY=";
+ };
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ changelog = "https://github.com/megakid/ha_hildebrand_glow_ihd_mqtt/releases/tag/${src.tag}";
+ description = "Home Assistant integration for local MQTT Hildebrand Glow IHD";
+ homepage = "https://github.com/megakid/ha_hildebrand_glow_ihd_mqtt";
+ maintainers = with lib.maintainers; [ CodedNil ];
+ };
+}
diff --git a/pkgs/servers/home-assistant/custom-components/spook/package.nix b/pkgs/servers/home-assistant/custom-components/spook/package.nix
index 5848508d29e3..2a4af86c8896 100644
--- a/pkgs/servers/home-assistant/custom-components/spook/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/spook/package.nix
@@ -10,17 +10,22 @@
buildHomeAssistantComponent rec {
owner = "frenck";
domain = "spook";
- version = "3.1.0";
+ version = "4.0.1";
src = fetchFromGitHub {
inherit owner;
repo = domain;
tag = "v${version}";
- hash = "sha256-IV3n++uFSOvQANPfbCeBj3GP0CCL+w9icKp/k5VO3Qg=";
+ hash = "sha256-0IihrhATgraGmuMRnrbGTUrtlXAR+CooENSIKSWIknY=";
};
patches = [ ./remove-sub-integration-symlink-hack.patch ];
+ postPatch = ''
+ substituteInPlace custom_components/spook/manifest.json \
+ --replace-fail '"version": "0.0.0"' '"version": "${version}"'
+ '';
+
dependencies = [
pillow
fnv-hash-fast
diff --git a/pkgs/servers/home-assistant/custom-components/spook/remove-sub-integration-symlink-hack.patch b/pkgs/servers/home-assistant/custom-components/spook/remove-sub-integration-symlink-hack.patch
index 4756e4a2c389..30a30d7166fa 100644
--- a/pkgs/servers/home-assistant/custom-components/spook/remove-sub-integration-symlink-hack.patch
+++ b/pkgs/servers/home-assistant/custom-components/spook/remove-sub-integration-symlink-hack.patch
@@ -1,18 +1,18 @@
diff --git a/custom_components/spook/__init__.py b/custom_components/spook/__init__.py
-index 213fb2c..c7dc299 100644
+index 1abc79d..68d48d1 100644
--- a/custom_components/spook/__init__.py
+++ b/custom_components/spook/__init__.py
-@@ -23,8 +23,6 @@ from .templating import SpookTemplateFunctionManager
+@@ -22,8 +22,6 @@ from .services import SpookServiceManager
from .util import (
- async_ensure_template_environments_exists,
async_forward_setup_entry,
+ async_setup_all_entity_ids_cache_invalidation,
- link_sub_integrations,
- unlink_sub_integrations,
)
-
+
if TYPE_CHECKING:
-@@ -34,48 +32,6 @@ if TYPE_CHECKING:
-
+@@ -35,48 +33,6 @@ if TYPE_CHECKING:
+
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
"""Set up from a config entry."""
- # Symlink all sub integrations from Spook to the parent integrations folder
@@ -57,22 +57,22 @@ index 213fb2c..c7dc299 100644
- severity=ir.IssueSeverity.WARNING,
- translation_key="restart_required",
- )
-
- # Ensure template environments exists
- async_ensure_template_environments_exists(hass)
-@@ -120,4 +76,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-
+
+ # Forward async_setup_entry to ectoplasms
+ await async_forward_setup_entry(hass, entry)
+@@ -131,4 +87,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+
async def async_remove_entry(hass: HomeAssistant, _: ConfigEntry) -> None:
"""Remove a config entry."""
- await hass.async_add_executor_job(unlink_sub_integrations, hass)
diff --git a/custom_components/spook/util.py b/custom_components/spook/util.py
-index 32e9bd2..845d463 100644
+index 6aea27c..1437913 100644
--- a/custom_components/spook/util.py
+++ b/custom_components/spook/util.py
-@@ -104,37 +104,6 @@ async def async_forward_platform_entry_setups_to_ectoplasm(
+@@ -284,37 +284,6 @@ async def async_forward_platform_entry_setups_to_ectoplasm(
)
-
-
+
+
-def link_sub_integrations(hass: HomeAssistant) -> bool:
- """Link Spook sub integrations."""
- LOGGER.debug("Linking up Spook sub integrations")
@@ -105,5 +105,5 @@ index 32e9bd2..845d463 100644
-
-
@callback
- def async_ensure_template_environments_exists(hass: HomeAssistant) -> None:
- """Ensure default template environments exist.
+ def async_get_all_area_ids(hass: HomeAssistant) -> set[str]:
+ """Return all area IDs, known to Home Assistant."""
diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
index a001489108ff..3752430c2334 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
@@ -11,13 +11,13 @@
buildHomeAssistantComponent rec {
owner = "al-one";
domain = "xiaomi_miot";
- version = "1.0.21";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "al-one";
repo = "hass-xiaomi-miot";
rev = "v${version}";
- hash = "sha256-P/IcWaBv+yj9bMeSm/vDtht0S7YQPOb0+/rWR7DLiJU=";
+ hash = "sha256-nTxi8bKelHbhs1ivmr+LGHLMrnlRUQYfy+ARHdeVM0Q=";
};
dependencies = [
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 88712d93b1d4..d0deaf0ff42e 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -330,7 +330,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run update-component-packages.py after updating
- hassVersion = "2025.10.0";
+ hassVersion = "2025.10.1";
in
python.pkgs.buildPythonApplication rec {
@@ -351,13 +351,13 @@ python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
tag = version;
- hash = "sha256-E+rA6Pwzcoz0yPmbZ8NqEswZQ1Kmdc9H2BXZTgjnumk=";
+ hash = "sha256-1C7Lg/pL1C+pUoo4RiL1TVECTqtEn6jnZ6muLohYPcw=";
};
# Secondary source is pypi sdist for translations
sdist = fetchPypi {
inherit pname version;
- hash = "sha256-6HmHTG37hLtBFX/lMbqoNUrbVJjdTswug41y7ziuHdg=";
+ hash = "sha256-cVARVLg80wVkruSed7ywrnK+lutLWbMJL2MBIwAapBA=";
};
build-system = with python.pkgs; [
diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
index 86a7fb9669e6..a08886fa5119 100644
--- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
+++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pytest-homeassistant-custom-component";
- version = "0.13.277";
+ version = "0.13.285";
pyproject = true;
disabled = pythonOlder "3.13";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "MatthewFlamm";
repo = "pytest-homeassistant-custom-component";
rev = "refs/tags/${version}";
- hash = "sha256-khlvhMYO2Oj84EJ5/RTnx7uNZYZnv4InCesgMmCgYiA=";
+ hash = "sha256-pP8zUjOhhaXE+cbx3fKlJaoNBBprOfAKS0F92Tf8hjI=";
};
build-system = [ setuptools ];
diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 7512a98e9553..fb08bb681361 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
- version = "2025.10.0";
+ version = "2025.10.1";
pyproject = true;
disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
tag = version;
- hash = "sha256-WxuOHHOgzbF+9XJwn+5dAk+m5hZ4fSRjzhfWEHVghTE=";
+ hash = "sha256-uLr6ZBasZNsCqD2DmOV/zestPW0lak9MSvvvUVWgUqQ=";
};
build-system = [
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index ded740920ff7..f527e6a6adb3 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -26,7 +26,7 @@ callPackage ../nginx/generic.nix args rec {
fixPatch =
patch:
let
- name = patch.name or (builtins.baseNameOf patch);
+ name = patch.name or (baseNameOf patch);
in
runCommand "openresty-${name}" { src = patch; } ''
substitute $src $out \
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix
index 9735f5103b24..78672ba69c8a 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix
@@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation (
}
// meta;
}
- // (builtins.removeAttrs args [
+ // (removeAttrs args [
"zipHash"
"pname"
"versionPrefix"
diff --git a/pkgs/servers/sql/postgresql/ext/omnigres.nix b/pkgs/servers/sql/postgresql/ext/omnigres.nix
index eca3b8721e85..f622001c4d18 100644
--- a/pkgs/servers/sql/postgresql/ext/omnigres.nix
+++ b/pkgs/servers/sql/postgresql/ext/omnigres.nix
@@ -59,8 +59,8 @@ postgresqlBuildExtension (finalAttrs: {
cmakeFlags = [
"-DOPENSSL_CONFIGURED=1"
"-DPG_CONFIG=${pgWithExtensions.pg_config}/bin/pg_config"
- "-DPostgreSQL_TARGET_EXTENSION_DIR=${builtins.placeholder "out"}/share/postgresql/extension/"
- "-DPostgreSQL_TARGET_PACKAGE_LIBRARY_DIR=${builtins.placeholder "out"}/lib/"
+ "-DPostgreSQL_TARGET_EXTENSION_DIR=${placeholder "out"}/share/postgresql/extension/"
+ "-DPostgreSQL_TARGET_PACKAGE_LIBRARY_DIR=${placeholder "out"}/lib/"
];
enableParallelBuilding = true;
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index bb8a4cb3770e..a16f259a5c37 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -117,7 +117,7 @@ let
);
in
stdenv.mkDerivation (
- builtins.removeAttrs args [ "bundlerEnvArgs" ]
+ removeAttrs args [ "bundlerEnvArgs" ]
// {
pluginName = if name != null then name else "${pname}-${version}";
dontConfigure = true;
diff --git a/pkgs/shells/fish/plugins/build-fish-plugin.nix b/pkgs/shells/fish/plugins/build-fish-plugin.nix
index a3366707f548..ce8b99cca1af 100644
--- a/pkgs/shells/fish/plugins/build-fish-plugin.nix
+++ b/pkgs/shells/fish/plugins/build-fish-plugin.nix
@@ -31,7 +31,7 @@ attrs@{
let
# Do not pass attributes that are only relevant to buildFishPlugin to mkDerivation.
- drvAttrs = builtins.removeAttrs attrs [
+ drvAttrs = removeAttrs attrs [
"checkPlugins"
"checkFunctionDirs"
];
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index fcfc01d7f890..9d27f6bf40a1 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -275,7 +275,7 @@ rec {
drvPath = builtins.unsafeDiscardStringContext pkg.drvPath;
license = pkg.meta.license or null;
in
- builtins.trace "@:drv:${toString drvPath}:${builtins.toString license}:@" val;
+ builtins.trace "@:drv:${toString drvPath}:${toString license}:@" val;
in
pkg
// {
diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix
index 81458cdb0339..4709d53569f0 100644
--- a/pkgs/stdenv/booter.nix
+++ b/pkgs/stdenv/booter.nix
@@ -108,7 +108,7 @@ let
args'
else
allPackages (
- (builtins.removeAttrs args' [ "selfBuild" ])
+ (removeAttrs args' [ "selfBuild" ])
// {
adjacentPackages =
if args.selfBuild or true then
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 69ea14be5c83..f7780aacb892 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -16,7 +16,7 @@ let
# Ignore custom stdenvs when cross compiling for compatibility
# Use replaceCrossStdenv instead.
- config = builtins.removeAttrs config [ "replaceStdenv" ];
+ config = removeAttrs config [ "replaceStdenv" ];
};
in
diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix
index 6efe764947a8..c8f1bc66a06c 100644
--- a/pkgs/stdenv/custom/default.nix
+++ b/pkgs/stdenv/custom/default.nix
@@ -18,7 +18,7 @@ let
overlays
;
# Remove config.replaceStdenv to ensure termination.
- config = builtins.removeAttrs config [ "replaceStdenv" ];
+ config = removeAttrs config [ "replaceStdenv" ];
};
in
diff --git a/pkgs/stdenv/darwin/bootstrap-tools.nix b/pkgs/stdenv/darwin/bootstrap-tools.nix
index a3a9f17fb809..e14dfa3aea8e 100644
--- a/pkgs/stdenv/darwin/bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/bootstrap-tools.nix
@@ -5,7 +5,7 @@
unpack,
}:
-builtins.derivation {
+derivation {
inherit (stdenv.hostPlatform) system;
name = "bootstrap-tools";
@@ -17,7 +17,7 @@ builtins.derivation {
];
PATH = lib.makeBinPath [
- (builtins.placeholder "out")
+ (placeholder "out")
unpack
];
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index d7f4145ed3b9..e28b3a0be1f5 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -594,8 +594,8 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
overrides = self: super: {
inherit (prevStage) ccWrapperStdenv cctools ld64;
- binutils-unwrapped = builtins.throw "nothing in the Darwin bootstrap should depend on GNU binutils";
- curl = builtins.throw "nothing in the Darwin bootstrap can depend on curl";
+ binutils-unwrapped = throw "nothing in the Darwin bootstrap should depend on GNU binutils";
+ curl = throw "nothing in the Darwin bootstrap can depend on curl";
# Use this stage’s CF to build CMake. It’s required but can’t be included in the stdenv.
cmake = self.cmakeMinimal;
diff --git a/pkgs/stdenv/darwin/test-bootstrap-tools.nix b/pkgs/stdenv/darwin/test-bootstrap-tools.nix
index fc463a1b3e07..0773ed5acc57 100644
--- a/pkgs/stdenv/darwin/test-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/test-bootstrap-tools.nix
@@ -6,7 +6,7 @@
hello,
}:
-builtins.derivation {
+derivation {
name = "test-bootstrap-tools";
inherit (stdenv.hostPlatform) system;
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 26a59ffb84d0..30637de08277 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -59,7 +59,7 @@ let
attrs
// {
inherit system;
- name = attrs.name or (builtins.baseNameOf (builtins.elemAt attrs.paths 0));
+ name = attrs.name or (baseNameOf (builtins.elemAt attrs.paths 0));
src = bootstrapArchive;
builder = "${bootstrapArchive}/bin/bash";
# this script will prefer to link files instead of copying them.
@@ -497,7 +497,7 @@ in
bzip2
xz
;
- binutils-unwrapped = builtins.removeAttrs bootstrapTools.binutils-unwrapped [ "src" ];
+ binutils-unwrapped = removeAttrs bootstrapTools.binutils-unwrapped [ "src" ];
fetchurl = import ../../build-support/fetchurl {
inherit lib;
inherit (self) stdenvNoCC;
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index d8f519b0f185..ba42a85dec46 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -308,7 +308,7 @@ let
and is missing the following outputs:
- ${concatStrings (builtins.map (output: " - ${output}\n") missingOutputs)}
+ ${concatStrings (map (output: " - ${output}\n") missingOutputs)}
'';
handleEvalIssue =
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index bbd4c0a14f65..9ebedb728989 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -60,7 +60,7 @@ let
:::{.note}
This is used as the fundamental building block of most other functions in Nixpkgs for creating derivations.
- Most arguments are also passed through to the underlying call of [`builtins.derivation`](https://nixos.org/manual/nix/stable/language/derivations).
+ Most arguments are also passed through to the underlying call of [`derivation`](https://nixos.org/manual/nix/stable/language/derivations).
:::
*/
mkDerivation = fnOrAttrs: makeDerivationExtensible (toFunction fnOrAttrs);
@@ -115,8 +115,8 @@ let
${
args.name or "${pname}-${version}"
} was overridden with `version` but not `src` at ${pos.file or ""}:${
- builtins.toString pos.line or ""
- }:${builtins.toString pos.column or ""}.
+ toString pos.line or ""
+ }:${toString pos.column or ""}.
This is most likely not what you want. In order to properly change the version of a package, override
both the `version` and `src` attributes:
@@ -130,7 +130,7 @@ let
})
(To silence this warning, set `__intentionallyOverridingVersion = true` in your `overrideAttrs` call.)
- '' (prev // (builtins.removeAttrs thisOverlay [ "__intentionallyOverridingVersion" ]))
+ '' (prev // (removeAttrs thisOverlay [ "__intentionallyOverridingVersion" ]))
);
in
makeDerivationExtensible (extends' (lib.toExtension f0) rattrs);
@@ -866,7 +866,7 @@ let
# for a fixed-output derivation, the corresponding inputDerivation should
# *not* be fixed-output. To achieve this we simply delete the attributes that
# would make it fixed-output.
- deleteFixedOutputRelatedAttrs = lib.flip builtins.removeAttrs [
+ deleteFixedOutputRelatedAttrs = lib.flip removeAttrs [
"outputHashAlgo"
"outputHash"
"outputHashMode"
diff --git a/pkgs/stdenv/linux/test-bootstrap-tools.nix b/pkgs/stdenv/linux/test-bootstrap-tools.nix
index ee4e3b0e6c4c..7caa2a680269 100644
--- a/pkgs/stdenv/linux/test-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/test-bootstrap-tools.nix
@@ -7,7 +7,7 @@
hello,
}:
-builtins.derivation {
+derivation {
name = "test-bootstrap-tools";
inherit (stdenv.hostPlatform) system; # We cannot "cross test"
builder = busybox;
@@ -36,7 +36,7 @@ builtins.derivation {
''
+ lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
rtld=$(echo ${bootstrapTools}/lib/${builtins.unsafeDiscardStringContext # only basename
- (builtins.baseNameOf binutils.dynamicLinker)})
+ (baseNameOf binutils.dynamicLinker)})
libc_includes=${bootstrapTools}/include-glibc
''
+ lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
diff --git a/pkgs/test/auto-patchelf-hook/package.nix b/pkgs/test/auto-patchelf-hook/package.nix
index 21d99e5d75b8..79bab058fc1b 100644
--- a/pkgs/test/auto-patchelf-hook/package.nix
+++ b/pkgs/test/auto-patchelf-hook/package.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
readarray -td':' runpathArray < <(echo -n "$runpath")
echo "[auto-patchelf-hook-test]: Check that the runpath has the right number of entries"
- test "''${#runpathArray[@]}" -eq ${builtins.toString (builtins.length allDeps)}
+ test "''${#runpathArray[@]}" -eq ${toString (builtins.length allDeps)}
echo "[auto-patchelf-hook-test]: Check that the runpath contains the expected runtime deps"
''
@@ -89,7 +89,7 @@ stdenv.mkDerivation {
lib.lists.imap0 (
i: path:
let
- iAsStr = builtins.toString i;
+ iAsStr = toString i;
in
''
echo "[auto-patchelf-hook-test]: Check that entry ${iAsStr} is ${path}"
diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix
index 68f9b25dba75..1fd6721d5f33 100644
--- a/pkgs/test/haskell/setBuildTarget/default.nix
+++ b/pkgs/test/haskell/setBuildTarget/default.nix
@@ -15,7 +15,7 @@ let
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base ];
- license = "unknown";
+ license = pkgs.lib.licenses.mit;
};
drv = haskellPackages.callPackage pkgDef { };
diff --git a/pkgs/test/make-hardcode-gsettings-patch/default.nix b/pkgs/test/make-hardcode-gsettings-patch/default.nix
index db79d7a3af6b..2bf63f56aa46 100644
--- a/pkgs/test/make-hardcode-gsettings-patch/default.nix
+++ b/pkgs/test/make-hardcode-gsettings-patch/default.nix
@@ -38,7 +38,7 @@ let
cp -r --no-preserve=all "${expected}" src-expected
pushd src
- for patch in ${lib.escapeShellArgs (builtins.map (p: "${p}") patches)}; do
+ for patch in ${lib.escapeShellArgs (map (p: "${p}") patches)}; do
patch < "$patch"
done
patch < "${patch}"
diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix
index 9791f4c29969..7f16e83ad5ce 100644
--- a/pkgs/test/texlive/default.nix
+++ b/pkgs/test/texlive/default.nix
@@ -34,7 +34,7 @@ rec {
nativeBuildInputs = [ texLive ] ++ attrs.nativeBuildInputs or [ ];
text = builtins.toFile "${name}.tex" text;
}
- // builtins.removeAttrs attrs [
+ // removeAttrs attrs [
"nativeBuildInputs"
"text"
"texLive"
diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
index ab7cd852c3b5..2fee2461ab53 100644
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -172,7 +172,21 @@ python3Packages.buildPythonApplication {
# if not self._poll(timeout):
# raise Empty
# _queue.Empty
- "test/plugins/test_player.py"
+ "test/plugins/test_bpd.py"
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [
+ # fail on Hydra with `RuntimeError: image cannot be obtained without artresizer backend`
+ "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio"
+ "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio_with_percent_margin"
+ "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio_with_px_margin"
+ "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_minwidth"
+ "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_deinterlaced"
+ "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_deinterlaced_and_resized"
+ "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_not_resized"
+ "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized"
+ "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized_and_scaled"
+ "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized_but_not_scaled"
+ "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_resize"
];
disabledTests = disabledTests ++ [
# https://github.com/beetbox/beets/issues/5880
diff --git a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
index ec09f788a360..7c7d36d397d0 100644
--- a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
+++ b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
@@ -11,7 +11,7 @@
zsh,
}:
let
- cleanArgs = lib.flip builtins.removeAttrs [
+ cleanArgs = lib.flip removeAttrs [
"dependencies"
"meta"
];
diff --git a/pkgs/tools/networking/maubot/plugins/default.nix b/pkgs/tools/networking/maubot/plugins/default.nix
index e40154c989ca..6d2cfb522c72 100644
--- a/pkgs/tools/networking/maubot/plugins/default.nix
+++ b/pkgs/tools/networking/maubot/plugins/default.nix
@@ -25,7 +25,7 @@ let
...
}:
stdenvNoCC.mkDerivation (
- builtins.removeAttrs attrs [ "base_config" ]
+ removeAttrs attrs [ "base_config" ]
// {
pluginName = "${pname}-v${version}.mbp";
nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [
diff --git a/pkgs/tools/networking/maubot/wrapper.nix b/pkgs/tools/networking/maubot/wrapper.nix
index 8a85905f9c0a..db2823e17eaa 100644
--- a/pkgs/tools/networking/maubot/wrapper.nix
+++ b/pkgs/tools/networking/maubot/wrapper.nix
@@ -46,7 +46,7 @@ let
# XXX: would patching maubot be better? See:
# https://github.com/maubot/maubot/blob/75879cfb9370aade6fa0e84e1dde47222625139a/maubot/server.py#L106
server.override_resource_path =
- if builtins.isNull (baseConfig.server.override_resource_path or null) then
+ if isNull (baseConfig.server.override_resource_path or null) then
"${unwrapped}/${python3.sitePackages}/maubot/management/frontend/build"
else
baseConfig.server.override_resource_path;
diff --git a/pkgs/tools/package-management/akku/akkuDerivation.nix b/pkgs/tools/package-management/akku/akkuDerivation.nix
index eb79b353d437..59ede90eb1aa 100644
--- a/pkgs/tools/package-management/akku/akkuDerivation.nix
+++ b/pkgs/tools/package-management/akku/akkuDerivation.nix
@@ -119,7 +119,7 @@ stdenv.mkDerivation (
// args.meta or { };
setupHook = ./setup-hook.sh;
}
- // builtins.removeAttrs args [
+ // removeAttrs args [
"name"
"buildInputs"
"meta"
diff --git a/pkgs/tools/package-management/akku/default.nix b/pkgs/tools/package-management/akku/default.nix
index cc036dfa5c69..882db169d2bf 100644
--- a/pkgs/tools/package-management/akku/default.nix
+++ b/pkgs/tools/package-management/akku/default.nix
@@ -30,9 +30,9 @@ lib.makeScope newScope (self: rec {
src = fetchurl {
inherit url sha256;
};
- buildInputs = builtins.map (x: akkuself.${x}) dependencies;
+ buildInputs = map (x: akkuself.${x}) dependencies;
r7rs = source == "snow-fort";
- nativeBuildInputs = builtins.map (x: akkuself.${x}) dev-dependencies;
+ nativeBuildInputs = map (x: akkuself.${x}) dev-dependencies;
unpackPhase = "tar xf $src";
meta.homepage = homepage;
@@ -44,29 +44,37 @@ lib.makeScope newScope (self: rec {
(
lib.licenses
// (with lib.licenses; {
+ "0bsd" = bsd0;
"agpl" = agpl3Only;
+ "apache-2.0" = asl20;
"artistic" = artistic2;
"bsd" = bsd3;
"bsd-1-clause" = bsd1;
"bsd-2-clause" = bsd2;
"bsd-3-clause" = bsd3;
+ "cc0-1.0" = cc0;
"gpl" = gpl3Only;
"gpl-2" = gpl2Only;
+ "gpl-2.0-or-later" = gpl2Plus;
"gplv2" = gpl2Only;
"gpl-3" = gpl3Only;
"gpl-3.0" = gpl3Only;
+ "gpl-3.0-or-later" = gpl3Plus;
"gplv3" = gpl3Only;
"lgpl" = lgpl3Only;
"lgpl-2" = lgpl2Only;
"lgpl-2.0+" = lgpl2Plus;
"lgpl-2.1" = lgpl21Only;
"lgpl-2.1-or-later" = lgpl21Plus;
+ "lgpl-3.0-or-later" = lgpl3Plus;
"lgpl-3" = lgpl3Only;
"lgplv3" = lgpl3Only;
"public-domain" = publicDomain;
"srfi" = bsd3;
"unicode" = ucd;
+ "xerox" = xerox;
"zlib-acknowledgement" = zlib;
+ "noassertion" = free;
})
).${s} or s;
in
diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix
index dc3c7f02700c..2f8ba6c56b42 100644
--- a/pkgs/tools/system/collectd/plugins.nix
+++ b/pkgs/tools/system/collectd/plugins.nix
@@ -192,9 +192,7 @@ let
buildInputs =
if enabledPlugins == null then
- builtins.concatMap pluginBuildInputs (
- builtins.attrNames (builtins.removeAttrs plugins [ "xencpu" ])
- )
+ builtins.concatMap pluginBuildInputs (builtins.attrNames (removeAttrs plugins [ "xencpu" ]))
else
builtins.concatMap pluginBuildInputs enabledPlugins;
in
diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix
index d9eb3f973dca..767ae8206452 100644
--- a/pkgs/tools/system/nvtop/default.nix
+++ b/pkgs/tools/system/nvtop/default.nix
@@ -20,7 +20,7 @@ let
];
defaultSupport = builtins.listToAttrs (
# apple can only build on darwin, and it can't build everything else, and vice versa
- builtins.map (gpu: {
+ map (gpu: {
name = gpu;
value =
(gpu == "apple" && stdenv.buildPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform)
@@ -33,7 +33,7 @@ in
}
# additional packages with only one specific GPU family support
// builtins.listToAttrs (
- builtins.map (gpu: {
+ map (gpu: {
name = gpu;
value = (callPackage ./build-nvtop.nix { "${gpu}" = true; });
}) defaultGPUFamilies
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 5c8019cd8d9f..fe2e8ed03c51 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -250,7 +250,7 @@ rec {
"man"
"info"
]
- ++ (builtins.map (builtins.replaceStrings [ "-" ] [ "_" ]) corePackages);
+ ++ (map (builtins.replaceStrings [ "-" ] [ "_" ]) corePackages);
nativeBuildInputs = [
pkg-config
@@ -493,7 +493,7 @@ rec {
"man"
"info"
]
- ++ (builtins.map (builtins.replaceStrings [ "-" ] [ "_" ]) coreBigPackages)
+ ++ (map (builtins.replaceStrings [ "-" ] [ "_" ]) coreBigPackages)
# some outputs of metapost, omegaware are for ptex/uptex
++ [
"ptex"
diff --git a/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix b/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix
index 8401de273044..3176bebc368e 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix
@@ -67,7 +67,7 @@ let
tlOutputName = tlTypeToOut.${tlType};
};
all = lib.filter pkgFilter combined ++ lib.filter (pkg: pkg.tlType == "tlpkg") combined;
- converted = builtins.map toSpecified all;
+ converted = map toSpecified all;
in
buildTeXEnv {
__extraName = extraName;
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 4748f2f608d6..ade00aa8a608 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -254,7 +254,7 @@ let
};
toSpecifiedNV = p: rec {
name = value.tlOutputName;
- value = builtins.removeAttrs p [ "pkgs" ] // {
+ value = removeAttrs p [ "pkgs" ] // {
outputSpecified = true;
tlOutputName = tlTypeToOut.${p.tlType};
};
@@ -262,10 +262,10 @@ let
toTLPkgSet =
pname: drvs:
let
- set = lib.listToAttrs (builtins.map toSpecifiedNV drvs);
+ set = lib.listToAttrs (map toSpecifiedNV drvs);
mainDrv = set.out or set.tex or set.tlpkg or set.texdoc or set.texsource;
in
- builtins.removeAttrs mainDrv [ "outputSpecified" ];
+ removeAttrs mainDrv [ "outputSpecified" ];
toTLPkgSets = { pkgs, ... }: lib.mapAttrsToList toTLPkgSet (lib.groupBy (p: p.pname) pkgs);
# export TeX packages as { pkgs = [ ... ]; } in the top attribute set
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index aa608db0e575..24cd67a63f3f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1202,6 +1202,7 @@ mapAliases {
inotifyTools = inotify-tools; # Added 2015-09-01
insync-emblem-icons = throw "'insync-emblem-icons' has been removed, use 'insync-nautilus' instead"; # Added 2025-05-14
inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2024-10-17
+ invoiceplane = throw "'invoiceplane' doesn't support non-EOL PHP versions"; # Added 2025-10-03
ioccheck = throw "ioccheck was dropped since it was unmaintained."; # Added 2025-07-06
ipfs = kubo; # Added 2022-09-27
ipfs-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2022-09-27
@@ -1757,6 +1758,7 @@ mapAliases {
### N ###
+ n98-magerun = throw "n98-magerun doesn't support new PHP newer than 8.1"; # Added 2025-10-03
namazu = throw "namazu has been removed, as it was broken"; # Added 2025-08-25
nanoblogger = throw "nanoblogger has been removed as upstream stopped developement in 2013"; # Added 2025-09-10
ncdu_2 = ncdu; # Added 2022-07-22
@@ -2038,6 +2040,9 @@ mapAliases {
pgadmin = pgadmin4; # Added 2022-01-14
pharo-spur64 = pharo; # Added 2022-08-03
phlare = throw "'phlare' has been removed as the upstream project was archived."; # Added 2025-03-27
+ php81 = throw "php81 is EOL";
+ php81Extensions = php81;
+ php81Packages = php81;
picom-next = picom; # Added 2024-02-13
pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20
pidgin-mra = throw "'pidgin-mra' has been removed since mail.ru agent service has stopped functioning in 2024."; # Added 2025-09-17
@@ -2073,6 +2078,7 @@ mapAliases {
poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03
posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17
powerdns = pdns; # Added 2022-03-28
+ postfixadmin = throw "'postfixadmin' has been removed due to lack of maintenance and missing support for PHP >8.1"; # Added 2025-10-03
presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24
preserves-nim = throw "'preserves-nim' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
projectm = throw "Since version 4, 'projectm' has been split into 'libprojectm' (the library) and 'projectm-sdl-cpp' (the SDL2 frontend). ProjectM 3 has been moved to 'projectm_3'"; # Added 2024-11-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f4194d89f14..4d15c8610531 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3622,7 +3622,7 @@ with pkgs;
toPythonApplication (
nvchecker.overridePythonAttrs (oldAttrs: {
propagatedBuildInputs =
- oldAttrs.propagatedBuildInputs ++ lib.flatten (builtins.attrValues oldAttrs.optional-dependencies);
+ oldAttrs.dependencies ++ lib.flatten (builtins.attrValues oldAttrs.optional-dependencies);
})
);
@@ -6009,16 +6009,6 @@ with pkgs;
php82Extensions = recurseIntoAttrs php82.extensions;
php82Packages = recurseIntoAttrs php82.packages;
- # Import PHP81 interpreter, extensions and packages
- php81 = callPackage ../development/interpreters/php/8.1.nix {
- stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
- pcre2 = pcre2.override {
- withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630
- };
- };
- php81Extensions = recurseIntoAttrs php81.extensions;
- php81Packages = recurseIntoAttrs php81.packages;
-
polyml = callPackage ../development/compilers/polyml { };
polyml56 = callPackage ../development/compilers/polyml/5.6.nix { };
polyml57 = callPackage ../development/compilers/polyml/5.7.nix { };
@@ -8214,7 +8204,7 @@ with pkgs;
py
];
# Avoid update.nix/tests conflicts with libxml2.
- passthru = builtins.removeAttrs libxml2.passthru [
+ passthru = removeAttrs libxml2.passthru [
"updateScript"
"tests"
];
@@ -12408,10 +12398,6 @@ with pkgs;
pothos = libsForQt5.callPackage ../applications/radio/pothos { };
- qiv = callPackage ../applications/graphics/qiv {
- imlib2 = imlib2Full;
- };
-
# perhaps there are better apps for this task? It's how I had configured my previous system.
# And I don't want to rewrite all rules
profanity = callPackage ../applications/networking/instant-messengers/profanity (
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
index a9e58d9c4e3f..0c2910d76eb4 100644
--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -20,7 +20,7 @@ let
mkMassRebuild =
args:
mkOption (
- builtins.removeAttrs args [ "feature" ]
+ removeAttrs args [ "feature" ]
// {
type = args.type or (types.uniq types.bool);
default = args.default or false;
diff --git a/pkgs/top-level/factor-packages.nix b/pkgs/top-level/factor-packages.nix
index 5ddc4ad86599..1da43653ba35 100644
--- a/pkgs/top-level/factor-packages.nix
+++ b/pkgs/top-level/factor-packages.nix
@@ -37,7 +37,7 @@ let
}
// lib.optionalAttrs pkgs.config.allowAliases {
- interpreter = builtins.throw "factorPackages now offers various wrapped factor runtimes (see documentation) and the buildFactorApplication helper.";
+ interpreter = throw "factorPackages now offers various wrapped factor runtimes (see documentation) and the buildFactorApplication helper.";
};
extensible-self = lib.makeExtensible (lib.extends overrides inside);
in
diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index db79a1588a7c..851ab4282902 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -55,7 +55,7 @@ assert args ? localSystem -> !(args ? system);
assert args ? system -> !(args ? localSystem);
import ./. (
- builtins.removeAttrs args [ "system" ]
+ removeAttrs args [ "system" ]
// {
inherit config overlays localSystem;
}
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index e99677265b8c..380b398694a0 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -590,8 +590,6 @@ in
netatop = callPackage ../os-specific/linux/netatop { };
- prl-tools = callPackage ../os-specific/linux/prl-tools { };
-
isgx = callPackage ../os-specific/linux/isgx { };
rr-zen_workaround = callPackage ../development/tools/analysis/rr/zen_workaround.nix { };
@@ -723,6 +721,7 @@ in
system76-scheduler = lib.warnOnInstantiate "kernelPackages.system76-scheduler is now pkgs.system76-scheduler" pkgs.system76-scheduler; # Added 2024-10-16
tuxedo-keyboard = self.tuxedo-drivers; # Added 2024-09-28
phc-intel = throw "phc-intel drivers are no longer supported by any kernel >=4.17"; # added 2025-07-18
+ prl-tools = throw "Parallel Tools no longer provide any kernel module, please use pkgs.prl-tools instead."; # added 2025-10-04
}
);
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e380e032a556..07f775906245 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -29086,6 +29086,26 @@ with self;
};
};
+ PerlStrip = buildPerlPackage {
+ pname = "Perl-Strip";
+ version = "1.2";
+ src = pkgs.fetchurl {
+ url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Perl-Strip-1.2.tar.gz";
+ sha256 = "sha256-PI7buDcjZwzD/RIEFVUW+a18N2nzPnnan4xlxQItixo=";
+ };
+ buildInputs = [
+ ModuleBuildTiny
+ PPI
+ ];
+ propagatedBuildInputs = [
+ commonsense
+ ];
+ meta = {
+ description = "Perl::Strip - reduce file size by stripping whitespace, comments, pod etc";
+ mainProgram = "perlstrip";
+ };
+ };
+
PodAbstract = buildPerlPackage {
pname = "Pod-Abstract";
version = "0.20";
@@ -33228,6 +33248,10 @@ with self;
./scripts/yath test -j $NIX_BUILD_CORES
'';
+ # The t/integration/preload.t test is broken on riscv64
+ # https://github.com/Test-More/Test2-Harness/issues/290
+ doCheck = !stdenv.hostPlatform.isRiscV;
+
propagatedBuildInputs = [
DataUUID
Importer
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index f9180f44b37a..2e3fe3d68310 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -1,5 +1,6 @@
{
stdenv,
+ fetchpatch,
config,
callPackages,
lib,
@@ -115,7 +116,7 @@ lib.makeScope pkgs.newScope (
...
}@args:
stdenv.mkDerivation (
- (builtins.removeAttrs args [ "name" ])
+ (removeAttrs args [ "name" ])
// {
pname = "php-${name}";
extensionName = extName;
@@ -407,6 +408,7 @@ lib.makeScope pkgs.newScope (
}
// lib.optionalAttrs config.allowAliases {
php-spx = throw "php-spx is deprecated, use spx instead";
+ openssl-legacy = throw "openssl-legacy has been removed";
}
// (
# Core extensions
@@ -445,6 +447,14 @@ lib.makeScope pkgs.newScope (
configureFlags = [
"--enable-dom"
];
+ patches = lib.optionals (lib.versionAtLeast php.version "8.4") [
+ # Fix build of ext-dom.
+ # https://github.com/php/php-src/pull/20023 (will be part of 8.4.14)
+ (fetchpatch {
+ url = "https://github.com/php/php-src/commit/4fe040290da2822c70d3b60d30a2c1256264735d.patch";
+ hash = "sha256-hCs59X5gCApXMjU9dKEtgdTJBHYq3BcKr9tlQjRCTIA=";
+ })
+ ];
}
{
name = "enchant";
@@ -599,16 +609,6 @@ lib.makeScope pkgs.newScope (
configureFlags = [ "--with-openssl" ];
doCheck = false;
}
- # This provides a legacy OpenSSL PHP extension
- # For situations where OpenSSL 3 do not support a set of features
- # without a specific openssl.cnf file
- {
- name = "openssl-legacy";
- extName = "openssl";
- buildInputs = [ openssl_1_1 ];
- configureFlags = [ "--with-openssl" ];
- doCheck = false;
- }
{ name = "pcntl"; }
{
name = "pdo";
@@ -845,7 +845,7 @@ lib.makeScope pkgs.newScope (
# [ { name = ; value = ; } ... ]
#
# which we later use listToAttrs to make all attrs available by name.
- namedExtensions = builtins.map (drv: {
+ namedExtensions = map (drv: {
name = drv.name;
value = mkExtension drv;
}) extensionData;
diff --git a/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix
index 1979006bf262..8f0157feb7d8 100644
--- a/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix
+++ b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix
@@ -11,7 +11,7 @@ let
inherit (lib.strings) escapeNixIdentifier;
allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v) (
- builtins.removeAttrs defaultPkgConfigPackages [ "recurseForDerivations" ]
+ removeAttrs defaultPkgConfigPackages [ "recurseForDerivations" ]
);
# nix-build rejects attribute names with periods
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index f17434b17512..cd0f080d77a3 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -394,6 +394,7 @@ mapAliases ({
keras-applications = throw "keras-applications has been removed because it's abandoned since 2022"; # added 2025-01-12
keras-preprocessing = throw "keras-preprocessing has been removed because it's abandoned since 2024"; # added 2025-01-12
keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01
+ keyrings-passwordstore = throw "keyrings-passwordstore has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
kivy-garden-modernmenu = throw "kivy-garden-modernmenu has been removed as it's abandoned since 2019"; # added 2505-05-25
ldap = python-ldap; # added 2022-09-16
lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
@@ -427,6 +428,7 @@ mapAliases ({
markdownsuperscript = throw "markdownsuperscript is unmaintained, use pymdown-extensions"; # added 2023-06-10
mask-rcnn = throw "mask-rcnn has been removed as it is unmaintained and its dependency imgaug no longer builds"; # added 2023-07-10
mac_alias = mac-alias; # added 2024-01-07
+ macropy = throw "macropy has been removed as it was broken since 2020"; # added 2025-10-04
MDP = mdp; # added 2023-02-19
mdp = throw "mdp has been removed as it is unmaintained and broken"; # added 2024-11-23
MechanicalSoup = mechanicalsoup; # added 2021-06-01
@@ -504,6 +506,7 @@ mapAliases ({
opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16
opentracing = throw "The opentracing Python module was removed due to being unmaintained upstream. Use OpenTelemetry instead."; # Added 2024-12-09
ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28
+ orderedset = throw "orderedset has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
orm = throw "orm has been removed as it is unmaintained"; # added 2025-08-27
pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19
paho-mqtt_1 = throw "paho-mqtt_1 was removed because no package depends on it anymore"; # added 2025-03-05
@@ -797,6 +800,7 @@ mapAliases ({
SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23
sqlsoup = throw "sqlsoup has been removed as it is incompatible with modern SQLAlchemy and unmaintained"; # added 2024-05-13
subdownloader = throw "subdownloader has been removed, because it depended on pyqt4"; # added 2022-06-09
+ subunit2sql = throw "subunit2sql has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
suds-jurko = throw "suds-jurko has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-02-27
supervise_api = supervise-api; # added 2023-10-11
suseapi = throw "suseapi has been removed because it is no longer maintained"; # added 2023-02-27
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f0f0db0aea59..6e3aefcf48cf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7823,8 +7823,6 @@ self: super: with self; {
callPackage ../development/python-modules/keyrings-google-artifactregistry-auth
{ };
- keyrings-passwordstore = callPackage ../development/python-modules/keyrings-passwordstore { };
-
keystone-engine = callPackage ../development/python-modules/keystone-engine { };
keystoneauth1 = callPackage ../development/python-modules/keystoneauth1 { };
@@ -8900,8 +8898,6 @@ self: super: with self; {
macholib = callPackage ../development/python-modules/macholib { };
- macropy = callPackage ../development/python-modules/macropy { };
-
maec = callPackage ../development/python-modules/maec { };
maestral = callPackage ../development/python-modules/maestral { };
@@ -11203,8 +11199,6 @@ self: super: with self; {
orderedmultidict = callPackage ../development/python-modules/orderedmultidict { };
- orderedset = callPackage ../development/python-modules/orderedset { };
-
orderly-set = callPackage ../development/python-modules/orderly-set { };
orgformat = callPackage ../development/python-modules/orgformat { };
@@ -17803,8 +17797,6 @@ self: super: with self; {
inherit (pkgs) subunit cppunit check;
};
- subunit2sql = callPackage ../development/python-modules/subunit2sql { };
-
subzerod = callPackage ../development/python-modules/subzerod { };
succulent = callPackage ../development/python-modules/succulent { };
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 7227412a1347..1f3d4be32d0c 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -641,7 +641,7 @@ let
teams = [ lib.teams.haskell ];
};
constituents = accumulateDerivations (
- builtins.map (name: jobs.haskellPackages."${name}") (maintainedPkgNames pkgs.haskellPackages)
+ map (name: jobs.haskellPackages."${name}") (maintainedPkgNames pkgs.haskellPackages)
);
};
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index 6d3ad1174107..fe4566bb175e 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -141,7 +141,7 @@ let
splicedPackagesWithXorg =
splicedPackages
- // builtins.removeAttrs splicedPackages.xorg [
+ // removeAttrs splicedPackages.xorg [
"callPackage"
"newScope"
"overrideScope"
@@ -150,7 +150,7 @@ let
packagesWithXorg =
pkgs
- // builtins.removeAttrs pkgs.xorg [
+ // removeAttrs pkgs.xorg [
"callPackage"
"newScope"
"overrideScope"
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 90e842703417..9fa556ff7e02 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -92,7 +92,7 @@ let
# The following line guarantees that the output of this function
# is a well-formed platform with no missing fields. It will be
# uncommented in a separate PR, in case it breaks the build.
- #(x: lib.trivial.pipe x [ (x: builtins.removeAttrs x [ "_type" ]) lib.systems.parse.mkSystem ])
+ #(x: lib.trivial.pipe x [ (x: removeAttrs x [ "_type" ]) lib.systems.parse.mkSystem ])
(
parsed
// {