diff --git a/ci/github-script/labels.js b/ci/github-script/labels.js index 7bbe1497d906..d7dbc2b2375c 100644 --- a/ci/github-script/labels.js +++ b/ci/github-script/labels.js @@ -292,11 +292,16 @@ module.exports = async function ({ github, context, core, dry }) { }) ).data.workflow_runs[0] - // Go back as far as the last successful run of this workflow to make sure - // we are not leaving anyone behind on GHA failures. - // Defaults to go back 1 hour on the first run. const cutoff = new Date( - lastRun?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000, + Math.max( + // Go back as far as the last successful run of this workflow to make sure + // we are not leaving anyone behind on GHA failures. + // Defaults to go back 1 hour on the first run. + new Date(lastRun?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000).getTime(), + // Go back max. 1 day to prevent hitting all API rate limits immediately, + // when GH API returns a wrong workflow by accident. + new Date().getTime() - 24 * 60 * 60 * 1000, + ), ) core.info('cutoff timestamp: ' + cutoff.toISOString()) @@ -308,6 +313,7 @@ module.exports = async function ({ github, context, core, dry }) { 'is:open', `updated:>=${cutoff.toISOString()}`, ].join(' AND '), + per_page: 100, // TODO: Remove in 2025-10, when it becomes the default. advanced_search: true, }, diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 7da9580e2045..63944fd1bc01 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -223,6 +223,10 @@ If `null` (which is the default value), the one included in `src` is used. `editedCabalFile` : `sha256` hash of the cabal file identified by `revision` or `null`. +`env` +: Extra environment variables to set during the build. +These will also be set inside the [development environment defined by the `passthru.env` attribute in the returned derivation](#haskell-development-environments), but will not be set inside a development environment built with [`shellFor`](#haskell-shellFor) that includes this package. + `configureFlags` : Extra flags passed when executing the `configure` command of `Setup.hs`. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2ca9edb79453..2de240577e05 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1445,12 +1445,6 @@ githubId = 5149377; name = "Amine Chikhaoui"; }; - amorsillo = { - email = "andrew.morsillo@gmail.com"; - github = "evelant"; - githubId = 858965; - name = "Andrew Morsillo"; - }; amozeo = { email = "wroclaw223@outlook.com"; github = "amozeo"; @@ -6210,12 +6204,6 @@ githubId = 21953890; name = "Tim Digel"; }; - desiderius = { - email = "didier@devroye.name"; - github = "desiderius"; - githubId = 1311761; - name = "Didier J. Devroye"; - }; desttinghim = { email = "opensource@louispearson.work"; matrix = "@desttinghim:matrix.org"; @@ -11280,6 +11268,13 @@ githubId = 45084216; keys = [ { fingerprint = "1BF9 8D10 E0D0 0B41 5723 5836 4C13 3A84 E646 9228"; } ]; }; + JacoMalan1 = { + name = "Jaco Malan"; + email = "jacom@codelog.co.za"; + github = "JacoMalan1"; + githubId = 10290409; + keys = [ { fingerprint = "339C 9213 7F2D 5D6E 2B6A 6E98 240B B4C4 27BC 327A"; } ]; + }; jaculabilis = { name = "Tim Van Baak"; email = "tim.vanbaak@gmail.com"; @@ -19007,13 +19002,6 @@ githubId = 104593071; name = "Oliver Schmidt"; }; - osslate = { - email = "fionn@kelleher.email"; - github = "osslate"; - githubId = 773673; - matrix = "@osslate:fsfe.org"; - name = "Fionn Kelleher"; - }; ostrolucky = { email = "gabriel.ostrolucky@gmail.com"; github = "ostrolucky"; @@ -22485,10 +22473,10 @@ name = "Sauyon Lee"; }; savalet = { - email = "savinien.petitjean@gmail.com"; + email = "me@savalet.dev"; github = "savalet"; githubId = 73446695; - name = "savalet"; + name = "Savinien Petitjean"; }; savannidgerinel = { email = "savanni@luminescent-dreams.com"; @@ -25986,6 +25974,11 @@ githubId = 57819359; name = "Binh Nguyen"; }; + tuynia = { + github = "mivorasu"; + githubId = 221005165; + name = "Qylia Vorlaque"; + }; tv = { email = "tv@krebsco.de"; github = "4z3"; diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md index f69ea279abb5..9751dbd7ff49 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -343,6 +343,15 @@ source: @NIXOS_TEST_OPTIONS_JSON@ ## Accessing VMs in the sandbox with SSH {#sec-test-sandbox-breakpoint} +::: {.note} +For debugging with SSH access into the machines, it's recommended to try using +[the interactive driver](#sec-running-nixos-tests-interactively) with its +[SSH backdoor](#sec-nixos-test-ssh-access) first. + +This feature is mostly intended to debug flaky test failures that aren't +reproducible elsewhere. +::: + As explained in [](#sec-nixos-test-ssh-access), it's possible to configure an SSH backdoor based on AF_VSOCK. This can be used to SSH into a VM of a running build in a sandbox. diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 04fd56cf4a55..8e9e6e7f225c 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -857,6 +857,12 @@ "modules-services-akkoma-distributed-deployment": [ "index.html#modules-services-akkoma-distributed-deployment" ], + "module-services-atalkd": [ + "index.html#module-services-atalkd" + ], + "module-services-atalkd-basic-usage": [ + "index.html#module-services-atalkd-basic-usage" + ], "module-services-systemd-lock-handler": [ "index.html#module-services-systemd-lock-handler" ], diff --git a/nixos/modules/hardware/sensor/iio.nix b/nixos/modules/hardware/sensor/iio.nix index 0f7450cf1649..dd783d5a72a2 100644 --- a/nixos/modules/hardware/sensor/iio.nix +++ b/nixos/modules/hardware/sensor/iio.nix @@ -19,6 +19,8 @@ type = lib.types.bool; default = false; }; + + package = lib.mkPackageOption pkgs "iio-sensor-proxy" { }; }; }; @@ -28,10 +30,10 @@ boot.initrd.availableKernelModules = [ "hid-sensor-hub" ]; - environment.systemPackages = with pkgs; [ iio-sensor-proxy ]; + environment.systemPackages = [ config.hardware.sensor.iio.package ]; - services.dbus.packages = with pkgs; [ iio-sensor-proxy ]; - services.udev.packages = with pkgs; [ iio-sensor-proxy ]; - systemd.packages = with pkgs; [ iio-sensor-proxy ]; + services.dbus.packages = [ config.hardware.sensor.iio.package ]; + services.udev.packages = [ config.hardware.sensor.iio.package ]; + systemd.packages = [ config.hardware.sensor.iio.package ]; }; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 45b0b5c1fd7c..373a2df52894 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -333,6 +333,7 @@ ./programs/vim.nix ./programs/virt-manager.nix ./programs/vivid.nix + ./programs/vscode.nix ./programs/wavemon.nix ./programs/wayland/cardboard.nix ./programs/wayland/dwl.nix @@ -1073,6 +1074,7 @@ ./services/networking/anubis.nix ./services/networking/aria2.nix ./services/networking/asterisk.nix + ./services/networking/atalkd.nix ./services/networking/atftpd.nix ./services/networking/atticd.nix ./services/networking/autossh.nix diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix index 787947226e79..625baa0514e5 100644 --- a/nixos/modules/programs/nix-required-mounts.nix +++ b/nixos/modules/programs/nix-required-mounts.nix @@ -47,7 +47,10 @@ let ); driverPaths = [ + # opengl: + # NOTE: Since driverLink is just a symlink, we need to include its target as well. pkgs.addDriverRunpath.driverLink + config.systemd.tmpfiles.settings.graphics-driver."/run/opengl-driver"."L+".argument # mesa: config.hardware.graphics.package diff --git a/nixos/modules/programs/vscode.nix b/nixos/modules/programs/vscode.nix new file mode 100644 index 000000000000..f7d427eba14e --- /dev/null +++ b/nixos/modules/programs/vscode.nix @@ -0,0 +1,63 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.vscode; +in +{ + options.programs.vscode = { + enable = lib.mkEnableOption "VSCode editor"; + + defaultEditor = lib.mkEnableOption "" // { + description = '' + When enabled, configures VSCode to be the default editor + using the EDITOR environment variable. + ''; + }; + + package = lib.mkPackageOption pkgs "vscode" { + extraDescription = "The final package will be customized with extensions from {option}`programs.vscode.extensions`"; + }; + + extensions = lib.mkOption { + type = lib.types.listOf lib.types.package; + default = [ ]; + example = lib.literalExpression '' + with pkgs.vscode-extensions; [ + bbenoist.nix + golang.go + twxs.cmake + ] + ''; + description = "List of extensions to install."; + }; + + finalPackage = lib.mkOption { + type = lib.types.package; + visible = false; + readOnly = true; + description = "Resulting customized VSCode package."; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ + cfg.finalPackage + ]; + + environment.variables.EDITOR = lib.mkIf cfg.defaultEditor ( + lib.mkOverride 900 cfg.finalPackage.meta.mainProgram + ); + + programs.vscode.finalPackage = pkgs.vscode-with-extensions.override { + vscode = cfg.package; + vscodeExtensions = cfg.extensions; + }; + }; + + meta.maintainers = with lib.maintainers; [ ethancedwards8 ]; +} diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 8d668236bff6..552c6bfd1d51 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -176,6 +176,10 @@ in krdp xwaylandvideobridge # exposes Wayland windows to X11 screen capture ] + ++ lib.optionals config.hardware.sensor.iio.enable [ + # This is required for autorotation in Plasma 6 + qtsensors + ] ++ lib.optionals config.services.flatpak.enable [ # Since PackageKit Nix support is not there yet, # only install discover if flatpak is enabled. diff --git a/nixos/modules/services/home-automation/zwave-js-ui.nix b/nixos/modules/services/home-automation/zwave-js-ui.nix index d33bcbaad2d5..ea78ce0df428 100644 --- a/nixos/modules/services/home-automation/zwave-js-ui.nix +++ b/nixos/modules/services/home-automation/zwave-js-ui.nix @@ -100,7 +100,7 @@ in ProtectHostname = true; ProtectKernelLogs = true; ProtectKernelModules = true; - ProtectKernalTunables = true; + ProtectKernelTunables = true; ProtectProc = "invisible"; ProcSubset = "pid"; RemoveIPC = true; diff --git a/nixos/modules/services/networking/atalkd.md b/nixos/modules/services/networking/atalkd.md new file mode 100644 index 000000000000..3b999680ce33 --- /dev/null +++ b/nixos/modules/services/networking/atalkd.md @@ -0,0 +1,18 @@ +# atalkd {#module-services-atalkd} + +atalkd (AppleTalk daemon) is a component inside of the suite of software provided by Netatalk. It allows for the creation of AppleTalk networks, typically speaking over a Linux ethernet network interface, that can still be seen by classic macintosh computers. Using the NixOS module, you can specify a set of network interfaces that you wish to speak AppleTalk on, and the corresponding ATALKD.CONF(5) values to go along with it. + +## Basic Usage {#module-services-atalkd-basic-usage} + +A minimal configuration looks like this: + +```nix +{ + services.atalkd = { + enable = true; + interfaces.wlan0.config = "-router -phase 2 -net 1 -addr 1.48 -zone \"Default\""; + }; +} +``` + +It is also valid to use atalkd without setting `services.netatalk.interfaces` to any value, only providing `services.atalkd.enable = true`. In this case it will inherit the behavior of the upstream application when an empty config file is found, which is to listen on and use all interfaces. diff --git a/nixos/modules/services/networking/atalkd.nix b/nixos/modules/services/networking/atalkd.nix new file mode 100644 index 000000000000..1f8d5e75f041 --- /dev/null +++ b/nixos/modules/services/networking/atalkd.nix @@ -0,0 +1,98 @@ +{ + config, + pkgs, + lib, + utils, + ... +}: + +let + cfg = config.services.atalkd; + + # Generate atalkd.conf only if configFile isn't manually specified + atalkdConfFile = pkgs.writeText "atalkd.conf" ( + lib.concatStringsSep "\n" ( + lib.mapAttrsToList ( + iface: ifaceCfg: iface + (if ifaceCfg.config != null then " ${ifaceCfg.config}" else "") + ) cfg.interfaces + ) + ); +in +{ + options.services.atalkd = { + enable = lib.mkEnableOption "the AppleTalk daemon"; + + configFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = atalkdConfFile; + defaultText = "/nix/store/xxx-atalkd.conf"; + description = '' + Optional path to a custom `atalkd.conf` file. When set, this overrides the generated + configuration from `services.atalkd.interfaces`. + ''; + }; + + interfaces = lib.mkOption { + description = "Per-interface configuration for atalkd."; + type = lib.types.attrsOf ( + lib.types.submodule { + options.config = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = "Optional configuration string for this interface."; + }; + } + ); + default = { }; + }; + }; + + config = + let + interfaces = map (iface: "sys-subsystem-net-devices-${utils.escapeSystemdPath iface}.device") ( + builtins.attrNames cfg.interfaces + ); + in + lib.mkIf cfg.enable { + system.requiredKernelConfig = [ + (config.lib.kernelConfig.isEnabled "APPLETALK") + ]; + systemd.services.netatalk.partOf = [ "atalkd.service" ]; + systemd.services.netatalk.after = interfaces; + systemd.services.netatalk.requires = interfaces; + systemd.services.atalkd = + let + interfaces = map (iface: "sys-subsystem-net-devices-${utils.escapeSystemdPath iface}.device") ( + builtins.attrNames cfg.interfaces + ); + in + { + + description = "atalkd AppleTalk daemon"; + unitConfig.Documentation = "man:atalkd.conf(5) man:atalkd(8)"; + after = interfaces; + wants = [ "network.target" ]; + before = [ "netatalk.service" ]; + requires = interfaces; + + wantedBy = [ "multi-user.target" ]; + + path = [ pkgs.netatalk ]; + + serviceConfig = { + Type = "forking"; + GuessMainPID = "no"; + DynamicUser = true; + AmbientCapabilities = [ "CAP_NET_ADMIN" ]; + RuntimeDirectory = "atalkd"; + PIDFile = "/run/atalkd/atalkd"; + BindPaths = [ "/run/atalkd:/run/lock" ]; + ExecStart = "${pkgs.netatalk}/bin/atalkd -f ${cfg.configFile}"; + Restart = "always"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ matthewcroughan ]; + meta.doc = ./atalkd.md; +} diff --git a/nixos/modules/services/networking/g3proxy.nix b/nixos/modules/services/networking/g3proxy.nix index 6df4f37b1123..bdcc8e2e36b7 100644 --- a/nixos/modules/services/networking/g3proxy.nix +++ b/nixos/modules/services/networking/g3proxy.nix @@ -54,7 +54,7 @@ in let g3proxy-yaml = settingsFormat.generate "g3proxy.yaml" cfg.settings; in - "${lib.getExe cfg.package} --config-file ${g3proxy-yaml}"; + "${lib.getExe cfg.package} --config-file ${g3proxy-yaml} --systemd --control-dir %t/g3proxy"; WorkingDirectory = "/var/lib/g3proxy"; StateDirectory = "g3proxy"; diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index a0932f131ec4..9e1ab0abef4b 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -71,7 +71,7 @@ let }; cupsFilesFile = writeConf "cups-files.conf" '' - SystemGroup root wheel + SystemGroup root wheel lpadmin ServerBin ${bindir}/lib/cups DataDir ${bindir}/share/cups @@ -361,10 +361,15 @@ in config = mkIf config.services.printing.enable { - users.users.cups = { - uid = config.ids.uids.cups; - group = "lp"; - description = "CUPS printing services"; + users = { + users.cups = { + uid = config.ids.uids.cups; + group = "lp"; + description = "CUPS printing services"; + }; + + # It seems that groups provided for `SystemGroup` must exist + groups.lpadmin = { }; }; # We need xdg-open (part of xdg-utils) for the desktop-file to proper open the users default-browser when opening "Manage Printing" diff --git a/nixos/modules/services/web-apps/lanraragi.nix b/nixos/modules/services/web-apps/lanraragi.nix index 4c029d301827..1fbffa47238d 100644 --- a/nixos/modules/services/web-apps/lanraragi.nix +++ b/nixos/modules/services/web-apps/lanraragi.nix @@ -22,6 +22,10 @@ in description = "Port for LANraragi's web interface."; }; + openFirewall = lib.mkEnableOption "" // { + description = "Open ports in the firewall for the Radarr web interface."; + }; + passwordFile = lib.mkOption { type = lib.types.nullOr lib.types.path; default = null; @@ -103,5 +107,9 @@ in EOF ''; }; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; }; } diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index 76e95cfe52e0..d6074d1c6146 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -34,7 +34,6 @@ let "@obsolete" "@privileged" "@setuid" - "@spawn" ]; cfgService = { diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 166dbbdca2e5..fd7caf0bacf6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1331,7 +1331,7 @@ in ssh-audit = runTest ./ssh-audit.nix; sssd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd.nix { }; sssd-ldap = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-ldap.nix { }; - stalwart-mail = runTest ./stalwart-mail.nix; + stalwart-mail = runTest ./stalwart/stalwart-mail.nix; stargazer = runTest ./web-servers/stargazer.nix; starship = runTest ./starship.nix; stash = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stash.nix { }; diff --git a/nixos/tests/stalwart/stalwart-mail-config.nix b/nixos/tests/stalwart/stalwart-mail-config.nix new file mode 100644 index 000000000000..800090ab5949 --- /dev/null +++ b/nixos/tests/stalwart/stalwart-mail-config.nix @@ -0,0 +1,81 @@ +{ pkgs, lib, ... }: + +let + certs = import ../common/acme/server/snakeoil-certs.nix; + domain = certs.domain; +in +{ + security.pki.certificateFiles = [ certs.ca.cert ]; + + services.stalwart-mail = { + enable = true; + settings = { + server.hostname = domain; + + certificate."snakeoil" = { + cert = "%{file:${certs.${domain}.cert}}%"; + private-key = "%{file:${certs.${domain}.key}}%"; + }; + + server.tls = { + certificate = "snakeoil"; + enable = true; + implicit = false; + }; + + server.listener = { + "smtp-submission" = { + bind = [ "[::]:587" ]; + protocol = "smtp"; + }; + + "imap" = { + bind = [ "[::]:143" ]; + protocol = "imap"; + }; + + "http" = { + bind = [ "[::]:80" ]; + protocol = "http"; + }; + }; + + session.auth.mechanisms = "[plain]"; + session.auth.directory = "'in-memory'"; + storage.directory = "in-memory"; + + storage.data = "rocksdb"; + storage.fts = "rocksdb"; + storage.blob = "rocksdb"; + storage.lookup = "rocksdb"; + + session.rcpt.directory = "'in-memory'"; + queue.outbound.next-hop = "'local'"; + + store."rocksdb" = { + type = "rocksdb"; + path = "/var/lib/stalwart-mail/data"; + compression = "lz4"; + }; + + directory."in-memory" = { + type = "memory"; + principals = [ + { + class = "individual"; + name = "alice"; + secret = "foobar"; + email = [ "alice@${domain}" ]; + } + { + class = "individual"; + name = "bob"; + secret = "foobar"; + email = [ "bob@${domain}" ]; + } + ]; + }; + }; + }; + +} diff --git a/nixos/tests/stalwart-mail.nix b/nixos/tests/stalwart/stalwart-mail.nix similarity index 53% rename from nixos/tests/stalwart-mail.nix rename to nixos/tests/stalwart/stalwart-mail.nix index 4eef33e63e81..f7b733f7f658 100644 --- a/nixos/tests/stalwart-mail.nix +++ b/nixos/tests/stalwart/stalwart-mail.nix @@ -3,9 +3,8 @@ # - serve this message through IMAP. let - certs = import ./common/acme/server/snakeoil-certs.nix; + certs = import ../common/acme/server/snakeoil-certs.nix; domain = certs.domain; - in { lib, ... }: { @@ -14,78 +13,9 @@ in nodes.main = { pkgs, ... }: { - security.pki.certificateFiles = [ certs.ca.cert ]; - - services.stalwart-mail = { - enable = true; - settings = { - server.hostname = domain; - - certificate."snakeoil" = { - cert = "%{file:${certs.${domain}.cert}}%"; - private-key = "%{file:${certs.${domain}.key}}%"; - }; - - server.tls = { - certificate = "snakeoil"; - enable = true; - implicit = false; - }; - - server.listener = { - "smtp-submission" = { - bind = [ "[::]:587" ]; - protocol = "smtp"; - }; - - "imap" = { - bind = [ "[::]:143" ]; - protocol = "imap"; - }; - - "http" = { - bind = [ "[::]:80" ]; - protocol = "http"; - }; - }; - - session.auth.mechanisms = "[plain]"; - session.auth.directory = "'in-memory'"; - storage.directory = "in-memory"; - - storage.data = "rocksdb"; - storage.fts = "rocksdb"; - storage.blob = "rocksdb"; - storage.lookup = "rocksdb"; - - session.rcpt.directory = "'in-memory'"; - queue.outbound.next-hop = "'local'"; - - store."rocksdb" = { - type = "rocksdb"; - path = "/var/lib/stalwart-mail/data"; - compression = "lz4"; - }; - - directory."in-memory" = { - type = "memory"; - principals = [ - { - class = "individual"; - name = "alice"; - secret = "foobar"; - email = [ "alice@${domain}" ]; - } - { - class = "individual"; - name = "bob"; - secret = "foobar"; - email = [ "bob@${domain}" ]; - } - ]; - }; - }; - }; + imports = [ + ./stalwart-mail-config.nix + ]; environment.systemPackages = [ (pkgs.writers.writePython3Bin "test-smtp-submission" { } '' diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index ce5901df0e49..754bb91b39ec 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "polyphonic additive synthesizer"; + description = "Polyphonic additive synthesizer"; mainProgram = "padthv1_jack"; homepage = "http://padthv1.sourceforge.net/"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 920d55d25f8e..dde003468bff 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -7,12 +7,12 @@ let pname = "plexamp"; - version = "4.12.3"; + version = "4.12.4"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - hash = "sha512-gjOjk/JtHbhEDGzWH/bBtNd7qsYS97hBlPbRw7uWH/PCXD4urUWBrlihNWAOgYClVwl7nbrx/y7mhCrI2N6c1w=="; + hash = "sha512-LtYqC4pqX7hA+clUj9UVrp0YWebELULM23SsYlKnVDcYbZn8LJldiOOebS0+SU4RqK1a8Z3Kh4fPJ/HfijP0qw=="; }; appimageContents = appimageTools.extractType2 { @@ -38,7 +38,7 @@ appimageTools.wrapType2 { meta = with lib; { description = "Beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/80"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/81"; license = licenses.unfree; maintainers = with maintainers; [ killercup diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 7df504767cdb..432f859c5bec 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = ''A real-time graphical programming environment for audio, video, and graphical processing''; + description = ''Real-time graphical programming environment for audio, video, and graphical processing''; homepage = "http://puredata.info"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index d5c9148304a9..51ca0eda2f00 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -100,7 +100,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://leo-editor.github.io/leo-editor/"; - description = "A powerful folding editor"; + description = "Powerful folding editor"; longDescription = "Leo is a PIM, IDE and outliner that accelerates the work flow of programmers, authors and web designers."; license = licenses.mit; maintainers = with maintainers; [ diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 8d2d915d60e5..c0bd3fb5c3a6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4055,6 +4055,8 @@ let reditorsupport.r = callPackage ./reditorsupport.r { }; + release-candidate.vscode-scheme-repl = callPackage ./release-candidate.vscode-scheme-repl { }; + reloadedextensions.reloaded-cpp = buildVscodeMarketplaceExtension { mktplcRef = { name = "reloaded-cpp"; @@ -4929,6 +4931,8 @@ let }; }; + tsyesika.guile-scheme-enhanced = callPackage ./tsyesika.guile-scheme-enhanced { }; + tuttieee.emacs-mcx = buildVscodeMarketplaceExtension { mktplcRef = { name = "emacs-mcx"; @@ -4983,6 +4987,8 @@ let }; }; + ufo5260987423.magic-scheme = callPackage ./ufo5260987423.magic-scheme { }; + uiua-lang.uiua-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "uiua-vscode"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index 106d391d1cb5..6507f0587c65 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -16,7 +16,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "python"; publisher = "ms-python"; version = "2025.10.0"; - hash = "sha256-8dc1uM/6iUNF+9y4yKH7w4/FsrzgVoOJlIFfQOvY8YM="; + hash = "sha256-uD6NWGD5GyYwd7SeoGsgYEH26NI+hDxCx3f2EhqoOXk="; }; buildInputs = [ icu ]; diff --git a/pkgs/applications/editors/vscode/extensions/release-candidate.vscode-scheme-repl/default.nix b/pkgs/applications/editors/vscode/extensions/release-candidate.vscode-scheme-repl/default.nix new file mode 100644 index 000000000000..234508bd76eb --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/release-candidate.vscode-scheme-repl/default.nix @@ -0,0 +1,29 @@ +{ + lib, + vscode-utils, + jq, + chez, + moreutils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "release-candidate"; + name = "vscode-scheme-repl"; + version = "0.7.4"; + hash = "sha256-Pfy0aJXq8I53o5mG4dfzyqsyLQX0bs+phBgN46yU/Yw="; + }; + + postInstall = '' + cd "$out/$installPrefix" + ${lib.getExe jq} '.contributes.configuration.properties."chezScheme.schemePath" = "${lib.getExe' chez "scheme"}"' package.json | ${lib.getExe' moreutils "sponge"} package.json + ''; + + meta = { + description = "Uses REPL for autocompletions and to evaluate expressions"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=release-candidate.vscode-scheme-repl"; + homepage = "https://github.com/Release-Candidate/vscode-scheme-repl"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tuynia ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/tsyesika.guile-scheme-enhanced/default.nix b/pkgs/applications/editors/vscode/extensions/tsyesika.guile-scheme-enhanced/default.nix new file mode 100644 index 000000000000..ceb3b3706f0b --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/tsyesika.guile-scheme-enhanced/default.nix @@ -0,0 +1,29 @@ +{ + lib, + vscode-utils, + jq, + guile, + moreutils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "tsyesika"; + name = "guile-scheme-enhanced"; + version = "0.0.2"; + hash = "sha256-uoHYfbLeANHnMB7OgDQPfIIlNN7LgERS9zQfa+QIk0M="; + }; + + postInstall = '' + cd "$out/$installPrefix" + ${lib.getExe jq} '.contributes.configuration.properties."guileScheme.guileREPLCommand".default = "${lib.getExe' guile "guile"}"' package.json | ${lib.getExe' moreutils "sponge"} package.json + ''; + + meta = { + description = "Better experience for working with scheme"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=tsyesika.guile-scheme-enhanced"; + homepage = "https://codeberg.org/tsyesika/vscode-guile-scheme-enhanced"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ tuynia ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/ufo5260987423.magic-scheme/default.nix b/pkgs/applications/editors/vscode/extensions/ufo5260987423.magic-scheme/default.nix new file mode 100644 index 000000000000..318bd03ab95c --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ufo5260987423.magic-scheme/default.nix @@ -0,0 +1,31 @@ +{ + lib, + vscode-utils, + jq, + akkuPackages, + chez, + akku, + moreutils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "ufo5260987423"; + name = "magic-scheme"; + version = "0.0.5"; + hash = "sha256-br1Vr4gIC2Zo74NHyCLTJL+GCjFzdOZh2oXIXZdJuRw="; + }; + + postInstall = '' + cd "$out/$installPrefix" + ${lib.getExe jq} '.contributes.configuration.properties."magicScheme.scheme-langserver.serverPath".default = "${lib.getExe' akkuPackages.scheme-langserver "scheme-langserver"}" | .contributes.configuration.properties."magicScheme.scheme.path".default = "${lib.getExe' chez "scheme"}" | .contributes.configuration.properties."magicScheme.akku.path".default = "${lib.getExe akku}"' package.json | ${lib.getExe' moreutils "sponge"} package.json + ''; + + meta = { + description = "Adds support for Scheme(r6rs standard)"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ufo5260987423.magic-scheme"; + homepage = "https://github.com/ufo5260987423/magic-scheme"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tuynia ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 0c096a93a107..b146f9026926 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-/6V4hjwp3Vy4WEwTtcYvJk6Rt3AIeKqXWJ09Zsp9CZg="; + hash = "sha256-QOMJIhgc/dixPDUmir7bq5dWYGUfEWHJOlgTbGkxuDo="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-bMwiMIhsvF6Q12vCgt9Os109acqW8Ovpt3o9Y8Sf+gk="; + hash = "sha256-CucMSzmeYdrSbXZbevyJb3M2oTkyatddAt2MUMXNwl0="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-SwBHNKqif3mGqNSF6Y100HCDaLmARe0jApPol7AzsOQ="; + hash = "sha256-Lv/Hqp5OGC66qdIj/5VPlj434ftK4BBHNWlgg2ZAAac="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-SGTQdjvrXkEaCuHv9dfJfCBUgkfOtf+kLPiHYAqJ7+8="; + hash = "sha256-KuAT8+8t6YlQ4VygtxGindvSRs1x7oKT9ZgE7Vhvf8I="; }; }; in { name = "visualjj"; publisher = "visualjj"; - version = "0.15.4"; + version = "0.16.1"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index 6769ede91831..01a2b5475243 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Your-editor (yed) is a small and simple terminal editor core that is meant to be extended through a powerful plugin architecture"; + description = "Small and simple terminal editor core that is meant to be extended through a powerful plugin architecture"; homepage = "https://your-editor.org/"; changelog = "https://github.com/your-editor/yed/blob/${version}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index ed405d6257bd..d09b19cdfedf 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2025-06-27"; + version = "0-unstable-2025-07-18"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "7eaca304a77827d4ba0f9bd9e23aca1ed8eb231e"; - hash = "sha256-hcl0iN7AfZEncXFC8GvD6D8olr+NlIOcVV42dZ6G55Y="; + rev = "0cfb7a22b129f42feb3b48095871c122acf45158"; + hash = "sha256-Fonxi2RQJ/iqSLAfun2anHCzVnM7TkJFkc8PtWkNsQY="; }; meta = { diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index d943e0efccab..6d720415a5e3 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -66,6 +66,7 @@ adwaita-icon-theme, alsa-lib, desktopToDarwinBundle, + fetchpatch, }: let @@ -110,6 +111,13 @@ stdenv.mkDerivation (finalAttrs: { (replaceVars ./tests-dbus-conf.patch { session_conf = "${dbus.out}/share/dbus-1/session.conf"; }) + + # Fix a crash that occurs when trying to pick a color for text outline + # TODO: remove after GIMP 3.2 is released, per https://gitlab.gnome.org/GNOME/gimp/-/issues/14047#note_2491655 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/1685c86af5d6253151d0056a9677ba469ea10164.diff"; + hash = "sha256-Rb3ANXWki21thByEIWkBgWEml4x9Qq2HAIB9ho1bygw="; + }) ]; nativeBuildInputs = diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index bab21335b1e8..88a7f94b6b9c 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -20,6 +20,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-/jkZiCapmCLMp7WfgUmpsR8aNCfb3gBELlMYaC4e7zI="; }; + patches = [ + ./remove-setuptools-sandbox.patch + ]; + nativeBuildInputs = [ gettext python3Packages.pyqt5 diff --git a/pkgs/applications/misc/dupeguru/remove-setuptools-sandbox.patch b/pkgs/applications/misc/dupeguru/remove-setuptools-sandbox.patch new file mode 100644 index 000000000000..983ea4dd7efc --- /dev/null +++ b/pkgs/applications/misc/dupeguru/remove-setuptools-sandbox.patch @@ -0,0 +1,27 @@ +diff --git a/build.py b/build.py +index 06905a11..56d54a17 100644 +--- a/build.py ++++ b/build.py +@@ -10,7 +10,7 @@ from optparse import OptionParser + import shutil + from multiprocessing import Pool + +-from setuptools import sandbox ++import subprocess + from hscommon import sphinxgen + from hscommon.build import ( + add_to_pythonpath, +@@ -118,7 +118,12 @@ def build_normpo(): + def build_pe_modules(): + print("Building PE Modules") + # Leverage setup.py to build modules +- sandbox.run_setup("setup.py", ["build_ext", "--inplace"]) ++ result = subprocess.run( ++ [sys.executable, "setup.py", "build_ext", "--inplace"], ++ check=True, ++ ) ++ if result.returncode != 0: ++ sys.exit("Error building PE modules. Please check the output above.") + + + def build_normal(): diff --git a/pkgs/applications/misc/inochi2d/default.nix b/pkgs/applications/misc/inochi2d/default.nix index 9e30a883d668..d66c4b5035a6 100644 --- a/pkgs/applications/misc/inochi2d/default.nix +++ b/pkgs/applications/misc/inochi2d/default.nix @@ -46,7 +46,7 @@ in # darwin has slightly different build steps broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/Inochi2D/inochi-creator/releases/tag/${src.rev}"; - description = "An open source editor for the Inochi2D puppet format"; + description = "Open source editor for the Inochi2D puppet format"; }; }; @@ -80,7 +80,7 @@ in # darwin has slightly different build steps broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/Inochi2D/inochi-session/releases/tag/${src.rev}"; - description = "An application that allows streaming with Inochi2D puppets"; + description = "Application that allows streaming with Inochi2D puppets"; }; }; } diff --git a/pkgs/applications/misc/kiwix/tools.nix b/pkgs/applications/misc/kiwix/tools.nix index 244aec6bd526..a58416329742 100644 --- a/pkgs/applications/misc/kiwix/tools.nix +++ b/pkgs/applications/misc/kiwix/tools.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = gitUpdater { }; meta = with lib; { - description = "Command line Kiwix tools: kiwix-serve, kiwix-manage, .."; + description = "Command line Kiwix tools"; homepage = "https://kiwix.org"; changelog = "https://github.com/kiwix/kiwix-tools/releases/tag/${finalAttrs.version}"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index 045c8cdfeab3..46f4d14c8efc 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://jwilk.net/software/mwic"; - description = "spell-checker that groups possible misspellings and shows them in their contexts"; + description = "Spell-checker that groups possible misspellings and shows them in their contexts"; mainProgram = "mwic"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 503c4292713c..a439aad37b31 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://tools.suckless.org/slstatus/"; - description = "status monitor for window managers that use WM_NAME like dwm"; + description = "Status monitor for window managers that use WM_NAME like dwm"; license = licenses.isc; maintainers = with maintainers; [ oxzi diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index dba00724a2b6..477f18a4fb36 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -38,14 +38,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.7.9"; + version = "1.7.10"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-nIu6JrFqJ1QsALei9Bmrs6Bd2qM/37nb0ouxDymMN8k="; + hash = "sha256-ik/UKemhSuhe3oXPPLAR/qKO7J4Mq35zimixVHNj7go="; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2fc9e6ee146f..23c7e5da5b79 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -215,7 +215,6 @@ let }; isElectron = packageName == "electron"; - needsCompgen = chromiumVersionAtLeast "133"; rustcVersion = buildPackages.rustc.version; chromiumDeps = lib.mapAttrs ( @@ -295,11 +294,7 @@ let [ ninja gnChromium - ] - ++ lib.optionals needsCompgen [ bashInteractive # needed for compgen in buildPhase -> process_template - ] - ++ [ pkg-config python3WithPackages perl @@ -513,7 +508,7 @@ let revert = true; }) ] - ++ lib.optionals (chromiumVersionAtLeast "131" && stdenv.hostPlatform.isAarch64) [ + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # Reverts decommit pooled pages which causes random crashes of tabs on systems # with page sizes different than 4k. It 'supports' runtime page sizes, but has # a hardcode for aarch64 systems. @@ -529,70 +524,12 @@ let hash = "sha256-PuinMLhJ2W4KPXI5K0ujw85ENTB1wG7Hv785SZ55xnY="; }) ] - ++ lib.optionals (!isElectron && !chromiumVersionAtLeast "137") [ - # Backport "Add more CFI suppressions for inline PipeWire functions" from M137 - # to fix SIGKILL (ud1) when screensharing with PipeWire 1.4+ and is_cfi = true. - # Our chromium builds set is_official_build = true, which in turn enables is_cfi. - # We don't apply this patch to electron, because we build electron with - # is_cfi = false and as such is not affected by this. - # https://chromium-review.googlesource.com/c/chromium/src/+/6421030 - (fetchpatch { - name = "add-more-CFI-suppressions-for-inline-PipeWire-functions.patch"; - url = "https://chromium.googlesource.com/chromium/src/+/0eebf40b9914bca8fe69bef8eea89522c1a5d4ce^!?format=TEXT"; - decode = "base64 -d"; - hash = "sha256-xMqGdu5Q8BGF/OIRdmMzPrrrMGDOSY2xElFfhRsJlDU="; - }) - ] - ++ lib.optionals (!isElectron && !chromiumVersionAtLeast "136") [ - # Backport "Only call format_message when needed" to fix print() crashing with is_cfi = true. - # We build electron is_cfi = false and as such electron is not affected by this. - # Started shipping with M136+. - # https://github.com/NixOS/nixpkgs/issues/401326 - # https://gitlab.archlinux.org/archlinux/packaging/packages/chromium/-/issues/13 - # https://skia-review.googlesource.com/c/skia/+/961356 - (fetchpatch { - name = "only-call-format_message-when-needed.patch"; - url = "https://skia.googlesource.com/skia/+/71685eda67178fa374d473ec1431fc459c83bb21^!?format=TEXT"; - decode = "base64 -d"; - stripLen = 1; - extraPrefix = "third_party/skia/"; - hash = "sha256-aMqDjt/0cowqSm5DqcD3+zX+mtjydk396LD+B5F/3cs="; - }) - ] ++ lib.optionals (chromiumVersionAtLeast "136") [ # Modify the nodejs version check added in https://chromium-review.googlesource.com/c/chromium/src/+/6334038 # to look for the minimal version, not the exact version (major.minor.patch). The linked CL makes a case for # preventing compilations of chromium with versions below their intended version, not about running the very # exact version or even running a newer version. ./patches/chromium-136-nodejs-assert-minimal-version-instead-of-exact-match.patch - ] - ++ lib.optionals (versionRange "137" "138") [ - (fetchpatch { - # Partial revert of upstream clang+llvm bump revert to fix the following error when building with LLVM < 21: - # clang++: error: unknown argument: '-fextend-variable-liveness=none' - # https://chromium-review.googlesource.com/c/chromium/src/+/6514242 - # Upstream relanded this in M138+ with . - name = "chromium-137-llvm-19.patch"; - url = "https://chromium.googlesource.com/chromium/src/+/ddf8f8a465be2779bd826db57f1299ccd2f3aa25^!?format=TEXT"; - includes = [ "build/config/compiler/BUILD.gn" ]; - revert = true; - decode = "base64 -d"; - hash = "sha256-wAR8E4WKMvdkW8DzdKpyNpp4dynIsYAbnJ2MqE8V2o8="; - }) - ] - ++ lib.optionals (versionRange "137" "138") [ - (fetchpatch { - # Backport "Fix build with system libpng" that fixes a typo in core/fxcodec/png/png_decoder.cpp that causes - # the build to fail at the final linking step. - # https://pdfium-review.googlesource.com/c/pdfium/+/132130 - # Started shipping with M138+. - name = "pdfium-Fix-build-with-system-libpng.patch"; - url = "https://pdfium.googlesource.com/pdfium.git/+/83f11d630aa1cb6d5ceb292364412f7b0585a201^!?format=TEXT"; - extraPrefix = "third_party/pdfium/"; - stripLen = 1; - decode = "base64 -d"; - hash = "sha256-lDX0OLdxxTNLtViqEt0luJQ/H0mlvQfV0zbY1Ubqyq0="; - }) ]; postPatch = @@ -811,19 +748,10 @@ let # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient): chrome_pgo_phase = 0; clang_base_path = "${llvmCcAndBintools}"; + + use_qt5 = false; + use_qt6 = false; } - // ( - # M134 changed use_qt to use_qt5 (and use_qt6) - if chromiumVersionAtLeast "134" then - { - use_qt5 = false; - use_qt6 = false; - } - else - { - use_qt = false; - } - ) // lib.optionalAttrs (chromiumVersionAtLeast "136") { # LLVM < v21 does not support --warning-suppression-mappings yet: clang_warning_suppression_file = ""; @@ -911,12 +839,14 @@ let let buildCommand = target: '' TERM=dumb ninja -C "${buildPath}" -j$NIX_BUILD_CORES "${target}" - ${lib.optionalString needsCompgen "bash -s << EOL\n"}( + bash -s << EOL + ( source chrome/installer/linux/common/installer.include PACKAGE=$packageName MENUNAME="Chromium" process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1" - )${lib.optionalString needsCompgen "\nEOL"} + ) + EOL ''; targets = extraAttrs.buildTargets or [ ]; commands = map buildCommand targets; diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index c52e8385e537..5591ca682b62 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 = "140.0.4"; + version = "141.0"; sources = [ { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ach/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ach/firefox-141.0.tar.xz"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "f943c88e9137bac9d5ddfc60939ad2d29c1bd552a25940952cfc259594fed177"; + sha256 = "3e6b1b0a383f48190fbcf2d15d1b88d9169a433702b4c064a1557670724247fa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/af/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/af/firefox-141.0.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b99de59f6e9dc526de1a5b2ad32746e664644e1571808fc69afc8c4642c0e1e1"; + sha256 = "135ff6f4e52d3940562db5fc42a482749c91106412a1dfda4efee8b24b7dc540"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/an/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/an/firefox-141.0.tar.xz"; locale = "an"; arch = "linux-x86_64"; - sha256 = "c045273e667aeabc7be60f0086391bc36d90f2adfab92210ba1f9268e1d7c8ee"; + sha256 = "fdfa0e89b46d6d6a7c1b0ac963c37aa74c4fbbc3f0e91744713674431d36f723"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ar/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ar/firefox-141.0.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "82e951d31b07d9688937734621057a7619cf191fe752ba8ec727163917ae56cc"; + sha256 = "40f6cdd85d1088f5d9e9f22d6a38cd51d0b392d0dc5ede6fbd1a1addec274812"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ast/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ast/firefox-141.0.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8dda2a1af36b2dca3de2c9f74bc0072f3be2d9b3214d39d710db03583d921b84"; + sha256 = "6391be9e9d2d1a5b4bc7be20fc139842d3e47822c8ff526a8d17f7f007ec8c83"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/az/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/az/firefox-141.0.tar.xz"; locale = "az"; arch = "linux-x86_64"; - sha256 = "2807a17273842e0599a13dfe4fdea595f2f5949217e3a346b92839d15dea72e0"; + sha256 = "32d9ed4fc3b209f664fe6384ef518a6671bcdf56738821a0297cd7a9dbd1515d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/be/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/be/firefox-141.0.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b8296455d8ece60bffb88e8202dc30c34bef5d7ec1ffab8af08239e70ab1046d"; + sha256 = "237c9ee1875b6e323efc9ad180aa690538ff553e446f998493b0ef4bfef62a09"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/bg/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/bg/firefox-141.0.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "7d3e2f5e04170c73008253f03b11fbe0c48c183faf6e10e2350e1836df60a475"; + sha256 = "2b298fc9131958876dfe687ab11b00c900ee33f258b6b2b115cda43f7a01086f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/bn/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/bn/firefox-141.0.tar.xz"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "be32a5971fd9ec8b7a90ec14d36025501744bfd0fede998f7e3050529f84480d"; + sha256 = "38c00267f75db553981c7d102045a92625290d1fb97fa4fcc98664b76ce4da17"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/br/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/br/firefox-141.0.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "fd4216ca595c6aeb3df8f65757f255ec19c3ec3a4efc189f247ff46266c0b49c"; + sha256 = "1d7da8cddbb96807b1ed1be39c2f2d7dfed48423cc5647a30b016deaf4192958"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/bs/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/bs/firefox-141.0.tar.xz"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "81dd60942c9ff6756678076ecd7911bcdf3b7d4a5a8afbd7b30b18a6653ab542"; + sha256 = "e26ba197a3f103633af4fcca1b8a170abf56a099e8dd682e3ccb76cc3a320845"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ca-valencia/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ca-valencia/firefox-141.0.tar.xz"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "033596fb9b446b4e83a05db4d3ca4bbedb4749fc306d2abf19aa18cd1ce56c7b"; + sha256 = "7e67820161094d2fb516d6e2e2c28ebbd34a131532cc699698019b218c2421be"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ca/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ca/firefox-141.0.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "8e0b32b4201d78fa0cdbe39358091f75823385bfef42202073b08fb89e855f1d"; + sha256 = "ee562cfaaefac838448d021afbebeaa7b466fd61697f90aa3b4520a74cd0a95d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/cak/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/cak/firefox-141.0.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "80030af3faff215dd3a31a38ddf6300c25317c48d43cd6e368edb8260500b38c"; + sha256 = "7fde32de81a709d9cd21c0ca6fbde093c17746455c4d03054f73ff4bdae4f078"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/cs/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/cs/firefox-141.0.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "3268be2e344b28b4b29eb1e72cf998c08c03a4ec09b291c492c91e7ddd8ce527"; + sha256 = "5a7ecf4748639f839660f9b087a30a951dd9f7a6ba96a174ee47291007cae675"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/cy/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/cy/firefox-141.0.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "ea30df26b853d0ac57d3e180469b31e8ab1ca9b2715159126254920934a553c7"; + sha256 = "5bd49100e3779b0ada4cd1f639daff934dbb52fd0361f04b64230e24a0eb49f9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/da/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/da/firefox-141.0.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "1ab11a3de9e956f9409b0bb1bd63e93bca452dfee9af08b6146a48aec05360ce"; + sha256 = "7b0b58d4b1389752f4247fcbf7b9b5d1595ece150606b0f90a57343dacd8504b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/de/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/de/firefox-141.0.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "41238ec3f71f94994a5b4e0f8f853f37e118b525c236184f8252e5a8f3fd5fb6"; + sha256 = "b6d065f00726d340e0dff99192230f103a67e9e53ed33f54982d4c3fbb8743d3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/dsb/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/dsb/firefox-141.0.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "9bc216214d2b946e1b6fd299650e7694936d40e8c42d1af495846846034b4e42"; + sha256 = "80c95b18b23323da0ab223e821d334e43c1dd559ee7766b0d0528bee785357c1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/el/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/el/firefox-141.0.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "eaf89ac946296670fdd03ff1a04b4e31415cf5a3aeea74136abe060aed5c1174"; + sha256 = "bf674b73a1fe252aaa116009278522b6d77abc5904f6c0a80a2582838e64a1bb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/en-CA/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/en-CA/firefox-141.0.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f3fc43e9a3cd80217021d16158f5a8788d0e79312b2d04f6506ef7b959be8f75"; + sha256 = "cb4ba527f1529848a4b4685cf2b95f2c412a0949df8ad39e7d46361ddf362e40"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/en-GB/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/en-GB/firefox-141.0.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c0ad885a06a9c3544d26342ce750c8f77833af7bb07b58056b3766d8b39f9121"; + sha256 = "7ff41d22f2d9cb62ae9886103a790c353bbe43dfb2536f2726e5e65bdd8bd8a2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/en-US/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/en-US/firefox-141.0.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "63e0033e6f4dd0576074de3cf1f70feec43359f923ed9055e554cf84b13856f6"; + sha256 = "2e96728330c1ffc90dbf45ecd10a82237e4ee528245888954000e67435494829"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/eo/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/eo/firefox-141.0.tar.xz"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "9ba6978b7b93067906632f5ff5cc5176dcfa822b328bef47aeda12a2b80b772e"; + sha256 = "71866de169b504b80b2a3fba2e636b3e12c6f89e53d8c7ad9440bd613f5e85b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/es-AR/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/es-AR/firefox-141.0.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "5f18c84a33a752113b605b7aa1190f861266d112bbd3bf11a02e398374f21793"; + sha256 = "57f6b30511f93c3c5aba682c61fa533b1bae6682c0979cda3ac910bca2aa660b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/es-CL/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/es-CL/firefox-141.0.tar.xz"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "3e50bdee8ba84836a5e473e7ae16a10a77c72ea00313ef747d481e456509d5cb"; + sha256 = "1f86e51d8e1573ab65cc6614a06cccd5176d1a34b9ca7b78a7015e820c54703a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/es-ES/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/es-ES/firefox-141.0.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c968ee5478d2d0d19345e3b2589c4ab59b920ea8d7362c9568894b01844b53ad"; + sha256 = "c623c56d71f89a9a1bbd31edc8b2a3dee30522ae32448e92d608e8269aad5d3f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/es-MX/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/es-MX/firefox-141.0.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "4b5cb4200ce1b0d03fa64c6548ac890ad728ba48f820cc57b646851a2b799906"; + sha256 = "e4d2e2865070df8e6c41191401b854e20ae75f1c4ad7c0aea530adc761c39db2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/et/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/et/firefox-141.0.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "cbc37f1164ae18c166304847ddaf77a2f41f80cfacffc621dd83ce49f58b396f"; + sha256 = "31cc948f723a7dcc0dd8fe8f6daea40102aa84dcb80855eae9bf85dcf26f9d86"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/eu/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/eu/firefox-141.0.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "391084c38de7ec752b0127a2e094000428a1e14695be863ce9974a93bac68ca3"; + sha256 = "d4089668e9fbefc146bdf33dcb6ceed190d6a65ee56d2c95e998b06adcb9b39d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/fa/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/fa/firefox-141.0.tar.xz"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "d4748949656408593c2a1b50cde8aaf793bc72949839757e0c876fd41103fbf6"; + sha256 = "6d0e6301529846f112c6590852e72bc747c9d5448b72935a49920a39a14d3439"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ff/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ff/firefox-141.0.tar.xz"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "6936546f2b1ec30628566448d7ee1899bb2421aba7fe6216cffb188d1b37db30"; + sha256 = "5dc83cdce211ffae44202383634c96b443e0b83722ddd2ca0e06028b85b9c539"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/fi/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/fi/firefox-141.0.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b5fc0520a281b904effb0934de09d5aa181fe7e1e69097e5a210f171441cf8e4"; + sha256 = "c6a1b0da82834768b5102f7abb698a2a9b86a1a8e4cf5c289f76e597fd26de81"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/fr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/fr/firefox-141.0.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "b09ae010df4e4532e8352b53d1e912063a7212d32a98b7c57d6b65ae8f69d2cb"; + sha256 = "1fcda548b4e7d7dd489646d7b375dffce227d978bfd2f6d08b85dde3c7bb38d9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/fur/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/fur/firefox-141.0.tar.xz"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "d22129ecdd21d576196314138c1ea95a3586e32597dfd7ec10ac521b1051f342"; + sha256 = "3ec0a1f62207fbdfdd393ddee4834df18948acb90b2563898031e071e6b7aa76"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/fy-NL/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/fy-NL/firefox-141.0.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "af31dd2af4fe4b189028c950a18aafb0c1c3929584c010eb7fbfd265f4d070ab"; + sha256 = "ec25b6f7c44797af3801ea711897e170eefa73e73ef631de71c67abdef5e1173"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ga-IE/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ga-IE/firefox-141.0.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "af7fec204caac40b39d53c32d4998e8d79d63852c20c814d452bff7242c3a203"; + sha256 = "c7b6828beea6cf578301b0e765ec4f8518f35eccb8a2e370ed94e5697f09d115"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/gd/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/gd/firefox-141.0.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "39557be86366b4af33ceba02999817cd9c924b71fa53c8ce8c5978db46540c03"; + sha256 = "37e25ae1bb99b97610cd9be71ca0d4cadcef048412d520aae58fc2764e6181db"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/gl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/gl/firefox-141.0.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "641d663a98e9cfb2d73851cd43690e5ba6558eb9a53293d82bc56317f13d304b"; + sha256 = "83183330f5a1784da6f246f3ba0daf8beb8742a7440c51dc8b184b0b9de3f588"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/gn/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/gn/firefox-141.0.tar.xz"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "b31eae5285175df269e309669f7b388d5e0a6ba638bfeda93055332b50de7239"; + sha256 = "45057f2c452fd7ab24f9962b40c246638432d4d7d03b19ea782badca090da0f7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/gu-IN/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/gu-IN/firefox-141.0.tar.xz"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "4005c93cc405fd87d657e48fe5d1fd4465138672fde4c99f52b473d6c0610c91"; + sha256 = "68af924f8fb5d919ea5599ba568962c8009d4f5de07d874d5334687972f36338"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/he/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/he/firefox-141.0.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c8be882c46896913f393dfa087aae2234a658aedd1fd40b95e6929fef4a09d89"; + sha256 = "73e902a07907897b5a4003c7ff24871b43d716d2a794bf70e507f8a5e11f683e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/hi-IN/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/hi-IN/firefox-141.0.tar.xz"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9635a5904731ff04829de5fe78006643bf95e66ced31cf408a391c840529ec57"; + sha256 = "e225f7ffe452266ffab0d85b487b81dbf04a5429d57f70da53a86839a6a9014c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/hr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/hr/firefox-141.0.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "fbb0266b9d44fa95ce0d836828c652931b95fb0788fc34677627f2f65154f0f7"; + sha256 = "a72814186ba7b1f51d284acc8d8e9073fc6648c77d39247a4ae47b0efdcdf32c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/hsb/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/hsb/firefox-141.0.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "67b867edf6f8755462e6655a924ad814f2dec6773fb9f16a8fe7a2e99f5e162f"; + sha256 = "b7adaa498a7bb21ba2b25420ed2114a0e37016b0522778c9ee181a60bef97291"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/hu/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/hu/firefox-141.0.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b2e5d9572e5c4a432b8724da8d93b1b2fc380aa17edb1bbc8e9404fc7aceb3fa"; + sha256 = "d1d19362eeaafea3741cc304c25698a1a786560eac7723e4809b9e838a45a6fa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/hy-AM/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/hy-AM/firefox-141.0.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "2275107b5ce36130de9ed6a017b3eba161094d6d82795e14ec94f49c219e28e6"; + sha256 = "917231e760fea43b5cf8c0ca536677201d763e6407cd3bc9dd40a23f09b30a83"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ia/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ia/firefox-141.0.tar.xz"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "1e8da9c5524c7f110747be29b8d5dd0cf9dde3e688b69dc01b4f2ab9128ad998"; + sha256 = "9a95a730bdbaa79bca731a646ca3c5e404758a853b48f9be46ca1c986fe7fc02"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/id/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/id/firefox-141.0.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "003534b48392817c8086008ece34ebc3841e46cfe542b2fcae85fa53f4e23328"; + sha256 = "da3d3de6eff36ec93fbcfdcccd0283513eaea316a2cc9ebd814d895fc1b68e41"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/is/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/is/firefox-141.0.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "b4721a060e43541462752c7d32afd68dbbd31acc2b5a6ecf80a266e7e96f25ff"; + sha256 = "c08761f2e05d8ff2e972f129bcb8922d8dde2e33d50e9812854111a27f120c3d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/it/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/it/firefox-141.0.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "aacda149720a3b218a7bbc7e5f9b79f9b90f12a1c0e11d9c3cdc6ba73bdf4e1a"; + sha256 = "ea28cf696817240f2046c7806c883b38dccfbbeb3d16584856230484b3ae6f40"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ja/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ja/firefox-141.0.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "4c3e0e5d946447466a14f65c94f27c11e5fb20b948da4d580ea069909b9babd5"; + sha256 = "bf84f48fb3649491dcfb15123daa413df7acdb1f228b6d9a942c680e781d4f92"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ka/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ka/firefox-141.0.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "58c5ba63cceaa864645f015148305b73dcc68ee15d30f65c38fd4a8c731f87e9"; + sha256 = "f6da1a00fe176ecd85817b26a068f4e1130bd50abf6136109ea0401573844f96"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/kab/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/kab/firefox-141.0.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "8759cb4d63917b1a767eeef65fcedb63d56e5abaaa6fde80ceed66eac5daa76d"; + sha256 = "bda812d1c00b1b7bbd711749833abcc6b751074e37ad829d0e2c242e1e7f74c0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/kk/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/kk/firefox-141.0.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "6f3d8d0872fad6b6d99842ed558e4585c55928d46abbadb8a5b9ecad41d98147"; + sha256 = "67b5f326b92f46ae52c648758e0157d0c14336ff957ca21b84288897273d5eec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/km/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/km/firefox-141.0.tar.xz"; locale = "km"; arch = "linux-x86_64"; - sha256 = "599233b9a4a4e0d8bbb303df932830f5f48f05e6e8f6abc6a613b9cb65a3a08a"; + sha256 = "4fb69460b2a9a9a768aed91915c000f18860c1a46efc31e05c5fc4e083b6bceb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/kn/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/kn/firefox-141.0.tar.xz"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "0fedef33ccdf32bb7d402ac10068c4710473acfc35daa75f0027364c61f37993"; + sha256 = "37dffc6a11fcd7cecd68a1bfc1d91c23f5877fad9c371e43fe5fc523d2b532ab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ko/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ko/firefox-141.0.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "afbe28ce7f201e9ff3910ea66780c9422ea8c2d6f86914fd35d3e12016039199"; + sha256 = "84e953fc82150ada59b72277056f9f925cc57dcde96770c09ad080cf9aa8b372"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/lij/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/lij/firefox-141.0.tar.xz"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "07b0ea91c23c6925bfa9ae4fb8778feaaaa9ed0b1dcab8f401fe438fb97440f8"; + sha256 = "a3fdc95541c34d23c4d8f3ebe75abbd292dab4c6342dc8f66d569d44aa4b3487"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/lt/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/lt/firefox-141.0.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "9baa71d8a7c20aca54c421b0aa89d7a5ccd47d81ae330b62f47d80645fbccc7e"; + sha256 = "8dfcbe66f2a636207e26033a4657880579853f456fa74bdfc569bb3c855ca6d5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/lv/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/lv/firefox-141.0.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "09e19b4cbafa4eed3389bfb4d963ee336f20e1e7013d73302f6735fba0c83762"; + sha256 = "9b9b6025ff3723d8bed7d0674e4a769120f7ca7fb292e13aa6cd1395de578b3a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/mk/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/mk/firefox-141.0.tar.xz"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "8863e0afc27e29630604ab9d5d46119233dc6dc1acdaa0411ddf546e51f25a90"; + sha256 = "d3d04e13714e5008f8e748caa30e8822a7ebf4ee34062869a04fb26e12facdd0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/mr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/mr/firefox-141.0.tar.xz"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "f89cf49dd5a8119987c9824af141a610fafd35ecdad63efdda4566ef881b779e"; + sha256 = "c5892b143341aa7b598af97c3b6c8183d232c25795b92d44986a78ad4e0423e9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ms/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ms/firefox-141.0.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "16034026fa470345bda32ab6cf77855ad181a46450605c2f3a3da7b3e8459141"; + sha256 = "56cc8cce77bb0a08ebe02a96119c4dd096b0b21efa7fa6e3fef23ec172087d6b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/my/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/my/firefox-141.0.tar.xz"; locale = "my"; arch = "linux-x86_64"; - sha256 = "80b62b63f5b85034ad85c08427e8b57d8ad7006c39398f1d53d5c1d371d52f58"; + sha256 = "908923f951d9359aab8a6842dced595dea6894845b4a87f1a0b3d230d938ed79"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/nb-NO/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/nb-NO/firefox-141.0.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "822b4d14e399be6be9a7138eef6c3d4196df57c1af1bf397e57ceaf255f5005d"; + sha256 = "2acc1f4c9066febc25ea640f18ef4d097f566aa684c61b2aa70e7f23dbf36a3f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ne-NP/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ne-NP/firefox-141.0.tar.xz"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "9835c9fcee863a72f405342b3b9e5ca8221640999f676071208b92e4f55a431b"; + sha256 = "ef3c32c2fc7f5eda6446193fe60340b41224d657e2b0612830291a366f8c4929"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/nl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/nl/firefox-141.0.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "321eabfeca0d23d1ca52f11f2385951ab493cf37e6fa0f2910c614b9cea50c5e"; + sha256 = "94fdd76231cb9d57cab829d740cf693b5eb9263b79d90ad1c672a7c3fd9e9a80"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/nn-NO/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/nn-NO/firefox-141.0.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b6d189494b498693635c773fb5508add490766a8e84a3434174aeb806fcae122"; + sha256 = "28fd06badf8d15e00926bc3551719760df780c528d6328ee4f712d134b406203"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/oc/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/oc/firefox-141.0.tar.xz"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "5e4c3b578f7be36ba60f0bea160384c3d51c975a78509e978229116409a0c2dd"; + sha256 = "ac7f41fe17af7dbf01815eaf9bcfce3725ceb0940d15d2247b0eb8028822807d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/pa-IN/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/pa-IN/firefox-141.0.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9a2db5dda0332d2bc15319a2bd9827fe631b55e309874683c013f467e241560c"; + sha256 = "5c4e14cc6b316194b6b947698362496b9247846527004de0e1b72fbd8f327c4a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/pl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/pl/firefox-141.0.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d1d2e2e5280de06eb8e5c4a5003427bd022a1fd75de781d9f1102a493f489728"; + sha256 = "e0f6f5419bd271a96cd302e10f223f642b1c6a4c95342d5a9a898bd80a7ae43a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/pt-BR/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/pt-BR/firefox-141.0.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "98b35b1f41e66e81bce4d73389537d5f65a62b26a541d11d7a777173ff80ace1"; + sha256 = "3a5d178aeb8b5be2f46f24d045860ade3d5bacfedf6de277cbb8605b2ec3845a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/pt-PT/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/pt-PT/firefox-141.0.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "3888619d2961ae318b80554a1a96d6a1217775b73fd420cab7c7550db213677d"; + sha256 = "d7f0e228938443336a612295618b01783b1e74f3a885e3bb081a1665afc0e6ec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/rm/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/rm/firefox-141.0.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "454c0d5c4206dc40aa4d1466c68bfa34a14dffadc39b4f1389c08396cbfc6a2c"; + sha256 = "ffeeba509ea2daa430198075b59f1ebeeb82d7b52cd92c1d3ac522fa41100892"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ro/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ro/firefox-141.0.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "36e688a7fd8de7faa6137b8f18c529af29c1ddb4127f13522d1e764a96a0359f"; + sha256 = "bf218bb75858601ede8a0eb7a25ba6e40162c75b25ad89eff895c67bf1cdfdd2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ru/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ru/firefox-141.0.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "b58eff8dd606fc072aec5d2a5c05aaf3f1be24df50ebe229f67ae470fc0de77e"; + sha256 = "b7b16e3bfafff74d6d3df3d331e97d0b9eb22e5addfd851a49c9a71a9e98a983"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sat/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sat/firefox-141.0.tar.xz"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "359ea9fa726ae7cf85e8c4e3b93ac229fd1eb1e6aadfcd80202f43261f230b2d"; + sha256 = "652538fb059b7b0a51120df52c228adb70bf7601c274e3d66a60cbe311dd1645"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sc/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sc/firefox-141.0.tar.xz"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "019e0c4b5efa01ccf11c648ea5926b06723b8347dc40a510dc8943d6f3f9398c"; + sha256 = "248940ad9472e70e9c945fe2082b61af06f67095d39f29f6bea27af57d9ec91b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sco/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sco/firefox-141.0.tar.xz"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "579aa32bf96feaf1802661cb76ee71e2e86eab5eef165427ffd17221d930a424"; + sha256 = "981cc2a18172d064384a960fb66dbed2a0b17eb1395035774e7798245e51a5ef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/si/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/si/firefox-141.0.tar.xz"; locale = "si"; arch = "linux-x86_64"; - sha256 = "36bbcbf0c69c94dcaa5f7d83a210803e62aa4e7681ea265ff940b450809a8c9d"; + sha256 = "8b83988259428dea385076c979dec578978ca75b1bd4c3878eaccd1a461f397c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sk/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sk/firefox-141.0.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "4c0d7fd27b2d6f13b9fbb46bc60d0d0fae3ccc0a48964d8b76fd755abb09b6c3"; + sha256 = "9a561262a0c7b7b1e332a8a9a5b69e687b47dc8c503408a93f1099b1c9ddfaf8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/skr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/skr/firefox-141.0.tar.xz"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "a36eb3eff2841cf74a826ecfdf5e9bba0f002dbfbdbd047efa666f017b4b8990"; + sha256 = "f0d532ef24b5013f7ed8523cde916f9cdb2073ee6e575ff438fa58d0bd7aff7e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sl/firefox-141.0.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "94907dcffdcb458d689f07d44d593bebb626b8e33369f8430bb832af3ebbeb31"; + sha256 = "6fc3499d2426050f2fb5dc06208dd47bbc4dd12ae0e2465c9ff1e19a46b9a189"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/son/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/son/firefox-141.0.tar.xz"; locale = "son"; arch = "linux-x86_64"; - sha256 = "2361e0fe70ce80a749202033a108cdd5f452bde4f6d1aabe93bac29f111099be"; + sha256 = "e94de9882893729691bb25e19da53f4d823d498f91540ab22a0b0e7469af4490"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sq/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sq/firefox-141.0.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "0b10efa397b9374633f1e6cdd96e6c0db209fbbbecea9f5b2ace09387f0d0632"; + sha256 = "20e4ae4867df2a6bdebceafe293afa420bd830832cc41731c5476b41808ac207"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sr/firefox-141.0.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d3d1ee2abed6d1f4a7141266dc91607f63e99050bb8604d42d57fb84ec4b0ad1"; + sha256 = "b9a1cd195e866f7b586dba2e365daf35262563da904120b4e143c43511279447"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/sv-SE/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/sv-SE/firefox-141.0.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "861ec995d3c583b3923bc3341eeef98798081efad4aed440c85db7d68c17e633"; + sha256 = "b6ddcae04d1d1cf86a1e83b6f32f3f6da5203dd56406318b25c78ef74fac3675"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/szl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/szl/firefox-141.0.tar.xz"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "cf15037296dc5d8d12473c7d6b35d76212e18737e615bad47618544770689e30"; + sha256 = "f651961b177b1d6bbde75495c29496caf6a9e48ad74ca60049b2cd63927aeb73"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ta/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ta/firefox-141.0.tar.xz"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "b67ecba9a19f933c2119a360bc32155933bbf58880682e9a92d611413839e3f3"; + sha256 = "eda48ae4f0ae77b3348cb98e08cf57b4d206f7eba7df2bdb13e235216c7c16de"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/te/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/te/firefox-141.0.tar.xz"; locale = "te"; arch = "linux-x86_64"; - sha256 = "3a7f66d6301d732aa1f7a38b543af171217981752422adc8369bb0d2fa57960e"; + sha256 = "7ba0cc8ec3345529c4b907afd9e48f4d9866706624d8e667c3a964e01c452d02"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/tg/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/tg/firefox-141.0.tar.xz"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "7f7d9279462f9258d34d5c244ee05f7b550c077783de99826f98c85c1b18a1de"; + sha256 = "59347f07805141279b3c1c4e49dbbc2a3e4a3326a817ed5bb431769835753989"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/th/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/th/firefox-141.0.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "7f66f1da57dcb7d66d01df6dde1a6164c2b67547de375f922f3b969da44b0c4c"; + sha256 = "c6f12617e5a120aede51d216c4e25dc02736548da6100713d1e9cc720c765bcc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/tl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/tl/firefox-141.0.tar.xz"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "e5e537353c36f62fe81665e568b58a628cbded6e3878b6f7cd0a4c1595f66a7f"; + sha256 = "7d9dc0189cc61c76e2b8f4aee8114a01c399b5646a76d1aae34a4bfd180bb279"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/tr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/tr/firefox-141.0.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "1a1234f1d51aa51914e0a7b0691119f7db59e2fdec984ac7a050f6146165094c"; + sha256 = "66dc3859bf6cefad36bce15c4cce672d51cc830ff0803e9736f2b0bb5318ee7a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/trs/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/trs/firefox-141.0.tar.xz"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "f2daf710fca9ef775dacb674666248b263f17de8aafbe104057883b9cb8ab082"; + sha256 = "aab10409ced21fd7ea068e347ef1ee152dd876b30cc49b7a19ac74c16a7ff8d0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/uk/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/uk/firefox-141.0.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "ccde5546dfffdf689266eb5d775e515788720e3ee9fd604040f5fa1159a13629"; + sha256 = "fb892fb66074ee76dfadd57478919fb609f9ccb3633b056041669748cf5565d2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/ur/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/ur/firefox-141.0.tar.xz"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "d341965dbe1d7b5e97a259616c656241d70b79475edb66f496eb12b847c7b8b5"; + sha256 = "5b59801b5908364e7420659a1fa7036d63d3e8ff721da385a2dda318893cdb24"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/uz/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/uz/firefox-141.0.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "10be44ae71670ff47a6a5d5770a66ae72f0de6c9f92b20ad5ba4e35c513c7c21"; + sha256 = "8072c4b2cae35e14ecadfdd4e14f155a0f19a2cf4754973e28ec119c5c1d20b5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/vi/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/vi/firefox-141.0.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "0f62936990ed1b09fa802076f5a3fac6e0124abc7b00e2b21eb3d99f67b9a93c"; + sha256 = "c746d7d728c2be0d094334878c3fe54abddc62cbae023d344ac2c6f17a79e3d9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/xh/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/xh/firefox-141.0.tar.xz"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "5a2b8e9bb73887c7bf67dcbdba8107276865c6acc5f068097762ea6423363b69"; + sha256 = "7a1550cf0fba788deaedaca174891483b0ad35b81b64cdc4b0e14b5f5ca93f13"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/zh-CN/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/zh-CN/firefox-141.0.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "7e9414f774c20db478855bda61ac92b4391b71b67926a3c0500ade8b02a50118"; + sha256 = "5fa634f2baa3c9db65b6862831319e70fedee2f327a4c3a3618887d9c7ee2557"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/zh-TW/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-x86_64/zh-TW/firefox-141.0.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "91745033ba539697affd88bc38b907e8611366ab920e0368f7c32d58995ec38a"; + sha256 = "20fcd590199eef56f5aaf0a5de146f42988ceaeab41db94d02e83bb8cd913aa7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ach/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ach/firefox-141.0.tar.xz"; locale = "ach"; arch = "linux-i686"; - sha256 = "1186084f9cb050042d78e286a31cf8638025a86323e35980646a7097117af318"; + sha256 = "5aa043bd9a998e3e41755fd8d7056c7d8ccdaafbf64657ba355d3cd55627162b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/af/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/af/firefox-141.0.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "2a38b0c0ef06cee8b82618b1590a381c4aa986db7fb2a4c5c95e8c84ecaf7cb3"; + sha256 = "276b5d34ea2743e4b8cc49202196ed27696516cfd7ff02643166de2277105e74"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/an/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/an/firefox-141.0.tar.xz"; locale = "an"; arch = "linux-i686"; - sha256 = "14be6b274071b90e28b31eaced6fb55c8aa802f812ee844895f05a6976a7b67c"; + sha256 = "4d630ecdd61f81ef2eb6bf6ba35f73d33cdce7b4a8a59169ed8fd823b9d3bae7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ar/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ar/firefox-141.0.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "2fd0c0cb5059f4982c3b47350bd20e1a75c61e556b0624eb48e5842ed7651adb"; + sha256 = "bf49eed15b7b617db673924eb9d03801f4297e9f9c20ab7c61b7d64cc71eee03"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ast/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ast/firefox-141.0.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "73d6547c8e24b39cf93f10f58f72198108967eb3f8b00bad07ffd62f01ffa528"; + sha256 = "55f8efe4c353f8c38b789bc76fa67639799d4d19bc120707a1695c0f236ba797"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/az/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/az/firefox-141.0.tar.xz"; locale = "az"; arch = "linux-i686"; - sha256 = "79fb1f46eae41d4bff468e72de977282c353936fcd8a3e3cf7503bc324284183"; + sha256 = "2e824f712f4a0efd8eb5f761b21a61a5fa4b2a7e547cb914ab684934cc9e8ac6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/be/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/be/firefox-141.0.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "dc68865f6e1946c94828eecf8f3d8f036e31a0e39628f15b68b434c05e6236e6"; + sha256 = "be41ccd413e228d286e6b322173f6e6cbe8adc4944cffce9ef5fd229ee67a31e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/bg/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/bg/firefox-141.0.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "105a93713444c9e121945073ed075530ea8cf6de27304f51eda03d97fc390be1"; + sha256 = "dbe7756144cac5928de8fea7c6cbf1074833992abc122ab9bb1360c333735cce"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/bn/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/bn/firefox-141.0.tar.xz"; locale = "bn"; arch = "linux-i686"; - sha256 = "689007b39930b173756e9dd0f07db52dddd7af05ab75058103a22af1bdf2f243"; + sha256 = "4b080771a07ee9a868e7a3a2c19581cd9ddb29a05bd9135d21fc7c765db09667"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/br/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/br/firefox-141.0.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "f7f4fdddc29c097eba6d19cf9956c0e1e57a6319d8e8b595d75c818a5aeb2969"; + sha256 = "6715f0c218de95bcfc24429b0f767ead54249192e0e755ff1c8988f13dfd1fad"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/bs/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/bs/firefox-141.0.tar.xz"; locale = "bs"; arch = "linux-i686"; - sha256 = "f03d2f78cee1bb7ff52191daf0aefa020051135876e93584705a576ceab2c000"; + sha256 = "1e1cae385cec000a8408f6a2d26ebce2084344e877d4ef1a88d0a1014be3ed84"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ca-valencia/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ca-valencia/firefox-141.0.tar.xz"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "f374f49c3b99ef7a4ab5971476088e0a795f51b79c78bb107735736fb02608cc"; + sha256 = "7d5a3865c34be1d6f11262a0f4d982e6f5878d9c3915bff842067e4aa626e472"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ca/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ca/firefox-141.0.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "19ee5381f86227c2cece4d0bc17bb91a903d2d3f91ef426962ed4088fa420a5a"; + sha256 = "8acefde214d8fbc2920d4a7b608343771a42ad2e74c995d0f365e3220aee8576"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/cak/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/cak/firefox-141.0.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "d2ee2f40482b9b2e38c30845ad2e81a22adeade19ac4d9bbd74c65457bc60372"; + sha256 = "4b3f2f5bfc1fbda23410abd42c8876eaad03974adb511e0552a07fb846b3aa10"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/cs/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/cs/firefox-141.0.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "e6d69d98553b603912cee8d1c4a34055b9ab1eacff80c7951bc171e792e760f5"; + sha256 = "670b97ab473462da89c7e8fe9e041ae390e8c05d2651f190b0913e86dd03270e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/cy/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/cy/firefox-141.0.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "eb66fd829f0c8824aa6b591e9a493ab09014c5a0ce1f6964228eda7ae55c78be"; + sha256 = "3dff5d6fc179055454cdd402f954ef68a75640ab495771e579b77e7fffb5c2c2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/da/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/da/firefox-141.0.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "01dd245a9277b95134001c1c96a1f3a82af274a76034e307695d8f1c1793bc26"; + sha256 = "14c0c1fce44b64eb823ed163701bf7cf4931f645357da2e4147304fed531af5e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/de/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/de/firefox-141.0.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "31f6ead3bc8c4dd96a7f6f4471090f36a7783ba35aff21aa4809257d713f837c"; + sha256 = "7ed12cc1b63ad10454842ef6115dc591db54ac300aeec62475710d1dfed75171"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/dsb/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/dsb/firefox-141.0.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "8e88de458d493f789912612b1c90f444eab638ad300db42142ed17683c4980ef"; + sha256 = "39c498682c70bf9ff4c01464d538cdfa5478a40eaf03221b56854faae8813ba0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/el/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/el/firefox-141.0.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "799de2a52b142ab9c506a839c7adb9d9c1bdc06a1ab59ba4713a8b950fe6173d"; + sha256 = "bfe3b614fffed35a0e7af98ce80e48a41fa134c69d5560e92225a89898242c08"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/en-CA/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/en-CA/firefox-141.0.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a5385017f0ac16e01be9f62034e1e598e52f0b89095538f060f52323e77364e3"; + sha256 = "927b19d244fa723ea1073f7c37a8b769f10e5fcbd53c49dc16893c0d6bb290f7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/en-GB/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/en-GB/firefox-141.0.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "6ae767b1b34a59c7e0ef1df07367ad47a396f68c50577ae537d888ab6f7ae692"; + sha256 = "461c7001d0f7eab4cef32ae8969f1a80a59b5f39ad91e28f4f08e5537bb3dcfb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/en-US/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/en-US/firefox-141.0.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "eafcda88f4a296ee1b67936cc6caf44650f3c109f208c86729ba029ba78378ab"; + sha256 = "7565db5c5d192feb50db24d9e13ebd93a6a2c77e47c8ad379a7c9346637bfafa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/eo/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/eo/firefox-141.0.tar.xz"; locale = "eo"; arch = "linux-i686"; - sha256 = "92ada3e5fb02c36d2e8c1bfe8bac1adb522f5d528e355b368b887a07b44b764b"; + sha256 = "2fd3f94eb43c3aff5d750c4dbe1d5aadab01d6df3721eaf3eda888f3735c51f1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/es-AR/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/es-AR/firefox-141.0.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "838667df7f1454bb55f8c55cb92ea4feb0a4c6d7c85aa77670a8bdb607a3759f"; + sha256 = "e6a56798649cf9b4c2120ecde4c42eaa750b1539cd2ff2580600c975cb6d634d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/es-CL/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/es-CL/firefox-141.0.tar.xz"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "2af8df8d4192e875c750c6689e44eb18c21dbae9e7db73f0def9df63c89e36f3"; + sha256 = "3f13a218745ba43f0e0b898d13a1f988091b5825903ca45926f8363f3da07c94"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/es-ES/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/es-ES/firefox-141.0.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "76667eef65181a671dcf5624c60c13d529ebabd2fd3c541886ec568cef6d81c2"; + sha256 = "c7ce7ca55abe0ad7931970f569cd2c63adb6be94efb43dba669f71e5be938000"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/es-MX/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/es-MX/firefox-141.0.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "9d92bab5185b98dd57da6c49f65a6f67937edb39027dae66f745a1292bd574f8"; + sha256 = "dc7ccfb16d1001791e7fd38643d23cb4c90633cc326b16c0b1678ce89e1c40d1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/et/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/et/firefox-141.0.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "ac1b2e960d0d57d03b0e08afd7fe4426c4aedbc4bb9d24aef77182aa8480a8f8"; + sha256 = "b29521d4f8ecf5a5c2680055323a157b59e4a323dcb255de4348d49ac84cc1f3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/eu/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/eu/firefox-141.0.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "bef2d01f49e73a81f0a59afcd3ac8709eb9918acf79fb47f7cdac6b09c4a1c3c"; + sha256 = "d19ae457c6f8eb84a93d686bdd70f64292434dac20f1b695e61ea2fc96bd1504"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/fa/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/fa/firefox-141.0.tar.xz"; locale = "fa"; arch = "linux-i686"; - sha256 = "bd1d3f8bcb2ba008f76c449a3661f42f45559faf047e1339143926e972b6cd21"; + sha256 = "a7e8a4d9bfc4d81c7d81d5a686a0294c2846395606ce1c0a16f6c653d527c96b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ff/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ff/firefox-141.0.tar.xz"; locale = "ff"; arch = "linux-i686"; - sha256 = "5c3907a334848afbae90d52b643413dc9692ed76b60225ec71524867b40eae0d"; + sha256 = "67e4dd228ff9f4271dea1cb85269d9e823f3c5ba3ca85eccf85fe9e0368ccbbc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/fi/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/fi/firefox-141.0.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "db125233d28993a07aba3b3920e99417d7bb1348c179cc2c9c20285aae72f1a0"; + sha256 = "cc6f75c78b47355bbea0083d9973c0253293e5a3b4c3ece85d1b1658f8bb6871"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/fr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/fr/firefox-141.0.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "cd75264af4230341e12cfd29c4561fb0c5b2871f63d2c6ba13dfbb8107e549e1"; + sha256 = "24bf7401101568aab6e44f32d6864ab73b3b49394fb58703b525c19ecf0b9195"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/fur/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/fur/firefox-141.0.tar.xz"; locale = "fur"; arch = "linux-i686"; - sha256 = "b8404633354613834a6d088b7f9ab77936c1535b7c30f87f8145e3f81bafd5dd"; + sha256 = "782f063719b7476f78f76f05a90b04a7ade39233a5b198433c4917ab08be8df9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/fy-NL/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/fy-NL/firefox-141.0.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "2ff96697538281488c405648f9adbb378cb716a6946923ee616f29f3e647232d"; + sha256 = "030a5125e9171f11709c3ff0e64d5ec79562181f2dbb244792a8f28ab657cb20"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ga-IE/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ga-IE/firefox-141.0.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "767885a0c5e8e409be4918a534e3afba13697e3a97beab0832e9f1f47e26d2e3"; + sha256 = "557ad3837d690426d2e2dca036f384d959908ecbb59d46ed4872d733b1d98bbf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/gd/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/gd/firefox-141.0.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "6d7de73fb8d3dc953d384ef7388b17d3df364fa3127f39ebb319b4fd1a443d11"; + sha256 = "78491adbbccb8b3aed530fce3fca22e9da848dad04d5736003aa398f89b62587"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/gl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/gl/firefox-141.0.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "90726dd9f6cf47601d11567f194a32f34db308d6ee0a63df97057bf7810c51f7"; + sha256 = "3ac9e2b3b1c0d71f6aa30d18f65e210d7035155859dd4ad052f546fb2806601d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/gn/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/gn/firefox-141.0.tar.xz"; locale = "gn"; arch = "linux-i686"; - sha256 = "a93f279cfe4d256ed9065cbbad5fd619469723a4451a67a4427ccb8cb767af1c"; + sha256 = "d7d9e0c119a2e1845dfa344f60b5511353fbc06dc7eaba0e7feeea61015c2948"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/gu-IN/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/gu-IN/firefox-141.0.tar.xz"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "591d5fc411d3da52b04ffec9a3a54e3952e512b9fe66527dd4145568145f7a4a"; + sha256 = "bf125d9ce7b2858e5327a6b0bef3171ec025a57c64466844cdbb62486c1f8019"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/he/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/he/firefox-141.0.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "760e0ab517792425bfcf61c203cae2237dbda07141f468cfe7994ac0acf7802f"; + sha256 = "543db004f4d57fafdcd8de2b90dc87d303550a5bef6bd4ca82f0a80b6b65c7f1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/hi-IN/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/hi-IN/firefox-141.0.tar.xz"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "26aaef2183370bcbc259109030aa2282d670a1fd53cbfb68897650c452417a79"; + sha256 = "a062b2864d4ea0f346c717ccfa216ae74c90e026930adae706f42df6b7fb6dcf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/hr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/hr/firefox-141.0.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "85091c7c9c80d1fb4e91129ce00185689c4c768ae7071c61a2350d5b43de4ff3"; + sha256 = "ff46fb0123c60126ad06d730e64c6495098e6504413a03032be995c3ff8dea5d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/hsb/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/hsb/firefox-141.0.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "00a7c57673ccf6dfd6cf1dc01681c7d75f150c0bd24eb06add8574779bd5099c"; + sha256 = "2e7044896d3e4dc8729ca33d4c6cfcb0bc649634c4c6a88532fcf8b252b7d4f0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/hu/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/hu/firefox-141.0.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "78575993d3b84d8cebc2205ceef28866fdcc8bd5197df345c410132733b554f5"; + sha256 = "1cb2f78170646edf541d818562bb459452e466c2f17d115db66629d6c18fad95"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/hy-AM/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/hy-AM/firefox-141.0.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "410e925297b0084e9b727f931cc6701cde2e8fed7b824aa5b484c44ca69cefc6"; + sha256 = "570b2f69934b42e86ce4c4aab691f6820f9aec7139aa954662b44488cb0780f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ia/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ia/firefox-141.0.tar.xz"; locale = "ia"; arch = "linux-i686"; - sha256 = "5210d60588e6716e837d5910dbdf437cdcfce114281f4c3b040c162bda99d2b9"; + sha256 = "51355e8645d04868c51b0437e4892a78f4f0ed5c91ae3682335942cf6e014c0d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/id/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/id/firefox-141.0.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "5730cdf18ca4724f3e198328431d393761efd46041bdabb65185e36dddfc781d"; + sha256 = "2b52ddb2dd924930f608a4c6f8d1099fec1cb74c7161bc40ad6efb705aa0d796"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/is/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/is/firefox-141.0.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "19a6a3f928b4fbf9a5febad502227e00c919860a4f434bd2b9ddacaf96062708"; + sha256 = "cf97b0c06a28d810511b0f811d446717196fda444f51002bdd39288024abec0a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/it/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/it/firefox-141.0.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "926d389543d9969e7820024ff536faacdeeb0382122300a6611f91d20e13325e"; + sha256 = "93207e91c578afb16b2c8c2e33b91499d655ffa4390303f8b6060f7087a0b0f7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ja/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ja/firefox-141.0.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "f6163a71d048e428e4fb0ad48467b53cef0e4f27b7145822e0ed3ca545ce288f"; + sha256 = "b469ee8dad85b4884b626a6c712c30e17d3827e7a3e74e989ef30a59d5366b61"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ka/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ka/firefox-141.0.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "a24df85ab9592ee6d362b67e82707c12c77516021214734157082b33fe47abd1"; + sha256 = "3f109d8749d4598263f2eb23c5eda43d261df2cf5c746b81d773f51f52eb3f26"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/kab/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/kab/firefox-141.0.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "42333cd22e35b27212e08a183d464c54797926835314c98afc06ad863846a41f"; + sha256 = "5b53cdad9ec00d761e8585548c438d6a00e67f744374b748b3270d08722ac7b0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/kk/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/kk/firefox-141.0.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "11cef3b82e42ddf4683da915a13da3561c140427bb40343b4192bfd0902f20d2"; + sha256 = "29240ea34efd79874971167d4e5d6c95c62facc8af60398acb113961b357fc84"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/km/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/km/firefox-141.0.tar.xz"; locale = "km"; arch = "linux-i686"; - sha256 = "3606f00c659d1ac9bde60a6311ab0c8c1d7a512219acec6597392f128c16c009"; + sha256 = "34381d90e835eb8b3fb624c1808b0121fd8b3454800672f36e3b6e13d79eb900"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/kn/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/kn/firefox-141.0.tar.xz"; locale = "kn"; arch = "linux-i686"; - sha256 = "0d36b7260b717e6817821759b105fced8c0d3c08ebcefbc04aefc7bf9e49ab2a"; + sha256 = "e4d3f968421d11ca0ed15a62ae51c35830a1070e6debda6156d57e299c9f9685"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ko/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ko/firefox-141.0.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "f54e98158ab899e17ae495a9339154c564565fe0c4955b67dca57c5a454083e8"; + sha256 = "7391803ec0c56fe9e6ebfc0e51fddc910c4e9256fa5be6f79fecb91bf692d40a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/lij/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/lij/firefox-141.0.tar.xz"; locale = "lij"; arch = "linux-i686"; - sha256 = "85411a183548f9dd3210a595fd84e3cb283dc5b4f42b9ab0f09f4c28397b14db"; + sha256 = "c69ed4155c7c10b5b965e96553927e07285bf7a3c79ccc0cb91604649e10aa56"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/lt/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/lt/firefox-141.0.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "d11ebfadbc6abb1768e5accd287ae8ec716b36e6f150e85b1d987c558aa6c0b5"; + sha256 = "cc01e27b3e08bd4b64808e3a4cd833ae672e0dc7a99a70855385c2c9b286de6f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/lv/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/lv/firefox-141.0.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "84fffed5dc9c2e8daee302f1c13365dd7b9a1023d5844fff2fbd4096a192b020"; + sha256 = "ce3de8e3be078ecab1db158666e3d482ed652b9ac3ee710e6161314df90eaa18"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/mk/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/mk/firefox-141.0.tar.xz"; locale = "mk"; arch = "linux-i686"; - sha256 = "04c0cafa61498b0d6ec291fe3f96cb57e5b7706753d2d67ff569736da636239c"; + sha256 = "bc00c297a354bda0cb6b42cbbe02cc08b5685de9b057682ce67cca469faeb821"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/mr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/mr/firefox-141.0.tar.xz"; locale = "mr"; arch = "linux-i686"; - sha256 = "3f03d5b6dce578611e79991fbb414b7fda11a3ebaccb20115cc3574658332d99"; + sha256 = "7218f52c71e2ee8829fd9b3872d9f848ff2ad9dcbbbb9f190406a9e768386441"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ms/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ms/firefox-141.0.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "4d9d5b55c7e39c440aa274f1b1fe7633c7b688ebe6bb49938d70908649de480e"; + sha256 = "75cc4dd0bf5b564be5ebc834cd45f366ec0e767944aca03758630a79707e0b83"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/my/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/my/firefox-141.0.tar.xz"; locale = "my"; arch = "linux-i686"; - sha256 = "8bef74e92c76779e82e7fa52179f9e34ddb4b3fd6151ea15113c0704ad498072"; + sha256 = "4ed6d75bb1d3146c8cfd352f88ee248f44d4a8b6f77924ae98fa7db57cd5c7bf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/nb-NO/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/nb-NO/firefox-141.0.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "88d110b88ef70b57911f546cef221cac830ea2e636c5484dbeb61d885ebedf24"; + sha256 = "2f94cc5308f36d553b447dcc61bda412e329492817c3f61bcba3a4df65bb9c70"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ne-NP/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ne-NP/firefox-141.0.tar.xz"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "fb6712cacd82c6f02606dc4905dd23eef2476f7c418e5880f173ff10b5fa59c2"; + sha256 = "0e04a014e66e5c7217195f54e6d04bad68f4f5dacc6ccd8b8df47c38309005c2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/nl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/nl/firefox-141.0.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "8b90206da1f2b369efc854460d9ab281f965f39def4861c95b9ce760f2c360bd"; + sha256 = "f31f3b676e11bc776d0bda4d117a8fe5290be1e4df9b5524adac6f130d144664"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/nn-NO/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/nn-NO/firefox-141.0.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e24a2b5e8c110d05bebdd3abe3ff4195eef879b24a30fb163f2d8871125ee56b"; + sha256 = "c02e3e9e7fdc1afe4d69ace09661605d98923104d4bd319c4bfdf45afdfc3b38"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/oc/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/oc/firefox-141.0.tar.xz"; locale = "oc"; arch = "linux-i686"; - sha256 = "0ae9de22a79c531978af028c44f8e10df180bcec26881e8f54a694849a46505a"; + sha256 = "02b25ea041b208e652112ed3bb51c1b12c9e12a2817ef5e20bb6931a217232bb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/pa-IN/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/pa-IN/firefox-141.0.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "517a43fa69a74781289432120f437cf376ef7ed048404fd56d5117868afe6d0b"; + sha256 = "83f1819769ce810da7f07c9cfd134674870ba6432a4d5155e1680400a9c854e1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/pl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/pl/firefox-141.0.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "acf94affec7f47373fe85cfdd824513f3c3b6fb30179bf3d4fc7715de5691f8c"; + sha256 = "cf7eb41a565d3e11f3c737041cc3fc318d9fe987b269cdb7bd9653cd75923b5b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/pt-BR/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/pt-BR/firefox-141.0.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ad4fdc5a791b43f030ad93c2b4cfb4282dbc8f42a19b9d35a212ee8ee98b6074"; + sha256 = "4cf8ad05597682e0da5f9c97a955bc7adb29c16f2e7c7fefb560237dbeade240"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/pt-PT/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/pt-PT/firefox-141.0.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "5cdac4fea8472a90f172d45a2d18f4647b93e1f2f8b2ac3c40fca62038644a4b"; + sha256 = "ff81397fdd191239f642dd23334b999cf5c05900391e23f236b9c9c78859f571"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/rm/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/rm/firefox-141.0.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "21241ffb36c656890a3237ef91dd77baff5d43281af40acba3417e8dc4a86214"; + sha256 = "ff29401be1494f52e4db6b255bc1c8646de098e6f225559e60c0dd6951339757"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ro/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ro/firefox-141.0.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "c9dac36d52db35856e66499fc5173b98ccfd95be625d4e849877b764cdf80c9a"; + sha256 = "cd2c23ba828cd720c1c8d4ad2f86082f53b36da6615888d3805549683a1ffe35"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ru/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ru/firefox-141.0.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "ded83911dcf012854599b9f9d31c5f4a91ec58d9ae0253180d6ea6f1d75c1822"; + sha256 = "233861f5917fb6c2a1fc01c66540d6dad78e3ab395bf531da4d5e22862be4f1c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sat/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sat/firefox-141.0.tar.xz"; locale = "sat"; arch = "linux-i686"; - sha256 = "059393952f1f7a02b548f2e449cff48607ffe6e06468b66859705da256735acf"; + sha256 = "fb33c7db943c3dfbf161eb897ce2d2b3a14a50228d50898210f0fb7f202bd199"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sc/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sc/firefox-141.0.tar.xz"; locale = "sc"; arch = "linux-i686"; - sha256 = "5806b3f7a94555921c1c9531246cc4b94ec362843b91391b221d79fe808ad162"; + sha256 = "9778681d914235972cb3e8e2a53edef86fe2d346bbd61cbf4ff517713c9e6ecc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sco/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sco/firefox-141.0.tar.xz"; locale = "sco"; arch = "linux-i686"; - sha256 = "d327e522393d3620051068217c194f45f5ed5f5940f5d1cdaaea7f2600015ecb"; + sha256 = "e764f135910329ce3a77cbbbb8395bd8cd4af076d2d36e2e0d6279e1236a384a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/si/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/si/firefox-141.0.tar.xz"; locale = "si"; arch = "linux-i686"; - sha256 = "8815c0a8fba1b3d877f4ed563ee6b197ceac5eeb726acdb0d78a32dac7266ab1"; + sha256 = "fda117580f2aeb783303ce104baaea184fd5462bf8f4e48220050762b6be7b1b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sk/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sk/firefox-141.0.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "f177a066c7844baee30c7a36c409b32806f183006e2a31fa3ba004ab62fcfdc3"; + sha256 = "d2789b826380a3f57db217d641a32619b15e95d4539fa308efa3d78096cbae4f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/skr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/skr/firefox-141.0.tar.xz"; locale = "skr"; arch = "linux-i686"; - sha256 = "cc6acfdd37ce3a9879dcf5ee9d5f38c429eaf249c4f7176c02380d71d0801791"; + sha256 = "ae9c3b5b57cf9692978ffe016aa19e68440e1ba4a606284796d8782de15bf0c1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sl/firefox-141.0.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "ba3d208c9c962823357250878e2f0009e3f58f4d1b30b2899ee2082a7a5ed3d4"; + sha256 = "86f5a3b52584f83219d5a98f6068afd0cd94643f33e8349b2e66f49bc801add3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/son/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/son/firefox-141.0.tar.xz"; locale = "son"; arch = "linux-i686"; - sha256 = "7bc3d7fad830deecb63ebb36fbc0d840370e4cb8c745912f7c6137a009754e5a"; + sha256 = "bbe1ad142243cbd2fe3321c30da9e615470f8c3682d42b9e1d0482220a6998cb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sq/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sq/firefox-141.0.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "27bbf9aa13ef2165309ec386115d79451db291ea8a248d8f8680092fbcbd1a8a"; + sha256 = "42e2d7c7f12fab825a4be15acf4d03902e4120003dcd2a5d3b59d106038a481e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sr/firefox-141.0.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "f90cfb58f79ae2550f847eb904861e5f7c86c2a6e098ea5f1454dc3e1f5a5306"; + sha256 = "e934b45befcb444a004c81f101bb53838d4376bc05e254ca4ea4ae0d1d750c03"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/sv-SE/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/sv-SE/firefox-141.0.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "6d6e809c8883a51082fe1a3e6dfc2903904377c51bd103cfada00935c905daba"; + sha256 = "892086ab14cf38c9a601aa9854f52f8b5d499bbc63b0197f1ecad46d60e67a93"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/szl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/szl/firefox-141.0.tar.xz"; locale = "szl"; arch = "linux-i686"; - sha256 = "29192ac2b94d1d96020ece1c6fc8b33e65eec9c2cdf7b438f0e5b7df0b851e09"; + sha256 = "af0e5fdc9aff9732d9664b737e2c4b70f6f2a8ac623b8935808eb716128ae583"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ta/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ta/firefox-141.0.tar.xz"; locale = "ta"; arch = "linux-i686"; - sha256 = "979babaf05ebc2c16bf2da8d279f6f3828f048aac6d04e2dd86dc7f4fcc554d6"; + sha256 = "527a976bc63260fa6af3cfb327afab823596a6b10fffbe8310040b26a0195089"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/te/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/te/firefox-141.0.tar.xz"; locale = "te"; arch = "linux-i686"; - sha256 = "7c7da8dadec29b82e314d7912bda12fa293e11e94f7868063d4dd94407dc2bf5"; + sha256 = "6ad09f6a85513a6bcfd8b30198f279b8084babe1c099927bd5fbf2532d915947"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/tg/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/tg/firefox-141.0.tar.xz"; locale = "tg"; arch = "linux-i686"; - sha256 = "9115f96a39349f10579c2cde41913cdde6eecf04543caac8c6a35c52c4e5add4"; + sha256 = "35ed5298274b54d13285d2dfbe1c5264e264a51991f3681fc756872a6a951428"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/th/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/th/firefox-141.0.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "6c0b244c8a6ee15c8f5b0f0bf5ce0e31af2d99d20d734d21b6e6ce18ac567d84"; + sha256 = "f16ac55a1453cecda0bc2741b93f078836ef9dfd9cca2991b7c299b34a58f40c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/tl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/tl/firefox-141.0.tar.xz"; locale = "tl"; arch = "linux-i686"; - sha256 = "1cd80d936cd748cb208c47e2f0b5f3f69f22fc24621b02c22cd53b60b9115583"; + sha256 = "0ed960bed6664da92bab23f2ac0a2d62a00c587dcbc1a854e71ff7a9e7477996"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/tr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/tr/firefox-141.0.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "60ed67df6ffea409dc5e4ac797377a6e70c209df5f75c7d973eadc4b01d64445"; + sha256 = "65396ce695c8b71ff1ef0cc09b461a17b8724c05a8938d5ac11032f4f4974bb5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/trs/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/trs/firefox-141.0.tar.xz"; locale = "trs"; arch = "linux-i686"; - sha256 = "acd9b73c34d44f136fe10cc6fb02b2e61a0c0e4c1f0d7b90b69c1f2dd37e3cd2"; + sha256 = "a30ee9bfd5e5cfb3b29d4140fe12d8a920d2baf3d449409a15e32beac3fe378c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/uk/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/uk/firefox-141.0.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "0317a19713592c74d4c63985343aa19c5bf4b5a03d888e2dd1f6f8e6df57c411"; + sha256 = "45f53bd8e2b3c03211ec56c6ccf24d415fb1aa8f68809db9438a6138491eb748"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/ur/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/ur/firefox-141.0.tar.xz"; locale = "ur"; arch = "linux-i686"; - sha256 = "20a209284bf272b652bddec3c5e7ade62281b08c2d4cb9f64daad729bf68de41"; + sha256 = "43f14388598c3b48436f4d705606387b1bf1df547ba933b26f0787ee026139c6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/uz/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/uz/firefox-141.0.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "f751e5ca2598227f47d947616f489f7f7d68dae18aab7d98723d840db3d3eed0"; + sha256 = "0fdc2dfb461538bafba3fccabaabc2230010bc95dd134c8a2a463053f1b96de1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/vi/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/vi/firefox-141.0.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "d4f49dda1cf6095b3efd018825c0a486e339685b5e036ec24839fb970cb64a9a"; + sha256 = "eb87d5242ce8cf0bd02e514c653cabd90be2b4d53ee02a8db9306fbf1972cc0f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/xh/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/xh/firefox-141.0.tar.xz"; locale = "xh"; arch = "linux-i686"; - sha256 = "21c8dae0e3d167785cc6836d6e84b0002b3ecfd078026cecdfd56c4f78b4ad61"; + sha256 = "c8b117266ba61ae9731854a437769d53bdbb1081bcab25cf3e2bcd9ac4a98f4d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/zh-CN/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/zh-CN/firefox-141.0.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "ec63201dc79770db65338212096adb556bbd6dbfd4dd437f65828020f3c084ce"; + sha256 = "420b8386d740c7bb77a0ca1cdeab0d0e6b58601664d085759cc96837949f4a61"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-i686/zh-TW/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-i686/zh-TW/firefox-141.0.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "880a92add3be7ef80e53906949732f5be0de4b5f8160b9573cbcd73b977f2918"; + sha256 = "94c3bb09d5ee8fcbc09aa03b8204de23926f4c16aab3f4552c464a9c9b194418"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ach/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ach/firefox-141.0.tar.xz"; locale = "ach"; arch = "linux-aarch64"; - sha256 = "ee6a2f927fceac0a29b482d26196cb548d947533271c24b29be8e18f1bcb023e"; + sha256 = "7a6bbb01b346c6cd60e9674e85590752d918b961190cb3a9ba075d5a71d1ab9c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/af/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/af/firefox-141.0.tar.xz"; locale = "af"; arch = "linux-aarch64"; - sha256 = "3509f5a61f54ff9cf90323b6916ebbf0d090c79696fcf59c5b75c8b265307d57"; + sha256 = "c3a9eee6c157c60a95c44c7f2f39bb60480f8f2c8d1801c66db8e16d8c0c2927"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/an/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/an/firefox-141.0.tar.xz"; locale = "an"; arch = "linux-aarch64"; - sha256 = "7bba810d969a564349e6fec524735fa8b112baa736d6fb89c2e9408ecf9b6f3e"; + sha256 = "d6c2a84edd6fde2f95a1d6bf9e2033fefdf54c693312b36430a1b9314c963ce5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ar/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ar/firefox-141.0.tar.xz"; locale = "ar"; arch = "linux-aarch64"; - sha256 = "3d894a428a8d21831ee740b08362cf5ee4f3e801dd79dfdeda5035e1744581b9"; + sha256 = "8788255c91d0234e5bd0a040a56b4c47a424dd14b636dc871ab4897a9c10d6a4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ast/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ast/firefox-141.0.tar.xz"; locale = "ast"; arch = "linux-aarch64"; - sha256 = "b326e605e76a2ab98e76524a7f492b78e2a09d0780665966ca535d339fc9c1a3"; + sha256 = "876451d2a8cf20e00358d0d083ec96dfee3beb84783897b3f13ee3a8e5f95222"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/az/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/az/firefox-141.0.tar.xz"; locale = "az"; arch = "linux-aarch64"; - sha256 = "0829bd77aa680c1fa46fbbd1ac8b198f3bf8eb05370a516e8ca45ae5cad1e7f0"; + sha256 = "e90fadc22db540694fbde1a657c977f1112f4977bcc4a77808714e3bf889ec26"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/be/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/be/firefox-141.0.tar.xz"; locale = "be"; arch = "linux-aarch64"; - sha256 = "341ad96edc419e1f04124c9f64644f519d4dd0e5330b3cc7c09deb065cac724e"; + sha256 = "f3021d43d6717bf02dda359e2b0bbaa78322b738b73098d1a67810941c362c64"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/bg/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/bg/firefox-141.0.tar.xz"; locale = "bg"; arch = "linux-aarch64"; - sha256 = "fb3e054b853a1fc6405c6c1fa79a8ba85b90b91f2a5f002746a86116b27359fa"; + sha256 = "0ab418148f0efa63d95074c32daf7ea576a63e8e1fe2e24bbf9d0250c0048987"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/bn/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/bn/firefox-141.0.tar.xz"; locale = "bn"; arch = "linux-aarch64"; - sha256 = "967d668fdd4d4b7c4400cd97fa5e6def893475f226fc87d3c16f760de2131e36"; + sha256 = "b9821d01e9b876b2c5cb513df4116df68df9fdcb3dad6ebba0faaef05d34df09"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/br/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/br/firefox-141.0.tar.xz"; locale = "br"; arch = "linux-aarch64"; - sha256 = "fc5bf2eb28c833ce9327921d31361d689a95be25758decd739e40f9c95254ba1"; + sha256 = "fe6fca4b69edb9411634a4730683b62f2339ea2d1d42e445fca503caf221d5c7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/bs/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/bs/firefox-141.0.tar.xz"; locale = "bs"; arch = "linux-aarch64"; - sha256 = "4f1a924828e80324e0b2f11c7525b94d079cd68d1291f778bdecc8e705c0af90"; + sha256 = "24da2ccd8b228097604eb07062d0cf157a08d287d203d6a357c8fe677f7f5f73"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ca-valencia/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ca-valencia/firefox-141.0.tar.xz"; locale = "ca-valencia"; arch = "linux-aarch64"; - sha256 = "5c5922151fcec6d24a4720df7d8990060055c0b959c313434018e8dd434527cb"; + sha256 = "5c95e4bd1af51356d3540520daffc0eee7757402d4de41c719c0a91026178657"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ca/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ca/firefox-141.0.tar.xz"; locale = "ca"; arch = "linux-aarch64"; - sha256 = "c098f2b52b3b616c38065664d4f2e21c6a7a2dc5e4a7f95ea1f644cf0d9c53aa"; + sha256 = "b7a64d102b944a62d642d04d935cd3b0e84e2bdcc0d44ca1bb85133c793dac3b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/cak/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/cak/firefox-141.0.tar.xz"; locale = "cak"; arch = "linux-aarch64"; - sha256 = "3dd00b15b3d6be7d58826da7f9aebbc9914c9b06bf5e99799cd7c59a0c5288a3"; + sha256 = "10516973d54f4096590818b0866cb5456b5aa6f83acb91f468554b0cbf6ddb55"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/cs/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/cs/firefox-141.0.tar.xz"; locale = "cs"; arch = "linux-aarch64"; - sha256 = "70556ad2f415e77a310f4665680a2b20bf0e775622ae2313c465e642dd18399a"; + sha256 = "f2dbb0f36bc09085718641946ecb1b5c43bfb0b9a9a0f40b2b8c16c26a922bfd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/cy/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/cy/firefox-141.0.tar.xz"; locale = "cy"; arch = "linux-aarch64"; - sha256 = "e3bcfcb7bdafcdad35e44f2ec05597c1d369f7172c94e83654b6d51b70afbc03"; + sha256 = "f6b55e30337a59727483175797e353ff338c2494667660dd5ab8d81c0b7504d7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/da/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/da/firefox-141.0.tar.xz"; locale = "da"; arch = "linux-aarch64"; - sha256 = "20232efc4305599d6baeeb5dc408b910ff74758ba71a01db02b1dec386989065"; + sha256 = "996f07782149a6b29adfb4ba3dfdb7216c1d7b998aa9d417db4813e668297383"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/de/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/de/firefox-141.0.tar.xz"; locale = "de"; arch = "linux-aarch64"; - sha256 = "5efee132fa89ad0475752616afdd9ba2036c7571254829616430f53a34175300"; + sha256 = "1989cc6498fbf5d967beb033ab3327286963843ed9ef7c0e27b2a8a7d1a80d55"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/dsb/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/dsb/firefox-141.0.tar.xz"; locale = "dsb"; arch = "linux-aarch64"; - sha256 = "a30c1efe29f33a855713fbf8063575f7d49dde6a2616b5fa3cf1c3cf487d37ad"; + sha256 = "d2f72f233cd0c7fdd93194d4c3c288b64afdc3de8cb18ceaa26ceda338954b97"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/el/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/el/firefox-141.0.tar.xz"; locale = "el"; arch = "linux-aarch64"; - sha256 = "d4193f216d3b1ac5b40a2fa8c94b45f1ac4531cdf22f3a41c45b840d4d125f1c"; + sha256 = "3e5e375a63c717b3d7e28824d46a15e23417e783a6ab3bcf725ede324105ac13"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/en-CA/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/en-CA/firefox-141.0.tar.xz"; locale = "en-CA"; arch = "linux-aarch64"; - sha256 = "227a921b8d40f111a0d0212fe5d44455f20297a210dbb05188f8ed0dda6cebab"; + sha256 = "fb208ba07b5f7a0ba068452b20cfdbf737db5d58bdbedde4ed1618a361beb83b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/en-GB/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/en-GB/firefox-141.0.tar.xz"; locale = "en-GB"; arch = "linux-aarch64"; - sha256 = "7240f66b1a87c0b796b254056ce7e8dc644f294fa5156cd7cbdec3f7d1a7792b"; + sha256 = "68bf68a0710b90fb637fc59f5c522b9c9a9c19636c76ccb44e9c9c5a2e3a7d4d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/en-US/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/en-US/firefox-141.0.tar.xz"; locale = "en-US"; arch = "linux-aarch64"; - sha256 = "49da44e2936ef9ce1f11da3630ded25d5c1b6335a8a7594ba448aa54777eefc5"; + sha256 = "969ed24ac8ac6c85e5f935802d8768b69f7c49ce100ac1d36d1978f17debf42b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/eo/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/eo/firefox-141.0.tar.xz"; locale = "eo"; arch = "linux-aarch64"; - sha256 = "0bae6d02e31658ce42e6abb42ed49ad1af39d8f16284bb9d28124182b35f357d"; + sha256 = "dcbbf28d4a05dd4b02352f5b4e626bdc2dd1da15c6379e4cc949c3677c4b0813"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/es-AR/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/es-AR/firefox-141.0.tar.xz"; locale = "es-AR"; arch = "linux-aarch64"; - sha256 = "a2428221a38ddd566dfd4a594060d7aff353e671bce4d130a8f0a5e7bad46903"; + sha256 = "5288f642e749bcffad30492b86bf47f363cda982fef8f8b903b4c8b1214bbc74"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/es-CL/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/es-CL/firefox-141.0.tar.xz"; locale = "es-CL"; arch = "linux-aarch64"; - sha256 = "369938be0e9d55b11bf31112c7ab947953be1322c98522ebdd0c4885fb136912"; + sha256 = "630f95e0a6e7f2744e3b849d961b7a000f0d43afb77bceed99f381cf52dbfb7b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/es-ES/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/es-ES/firefox-141.0.tar.xz"; locale = "es-ES"; arch = "linux-aarch64"; - sha256 = "91bbd1ad46d76473d48a99ab32ad52aafc6bc4affdf4813309c96a10042dab62"; + sha256 = "54e7ce5176e6ce1b9414df26e0c9479d8e0bd42775dfc8dd42152c15cde3c706"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/es-MX/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/es-MX/firefox-141.0.tar.xz"; locale = "es-MX"; arch = "linux-aarch64"; - sha256 = "6f4314b2b0fabf30dbe4ad561c45287199159a03542991666fac5876ff69095e"; + sha256 = "ed07f411f134bc96e2f0f368d9ec0a523075f453448d91604c1e067969e4b69c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/et/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/et/firefox-141.0.tar.xz"; locale = "et"; arch = "linux-aarch64"; - sha256 = "f02a0088768be3728906b464b9fa7a5dbc29aca6d453e614954836d4a2a037d4"; + sha256 = "1166fb557f2e13f78a81ee6df2fbcff0bebd627f300761cbec19b83575ef5f2c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/eu/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/eu/firefox-141.0.tar.xz"; locale = "eu"; arch = "linux-aarch64"; - sha256 = "64fd3f22e97c514b90e40d21eccb3b60cf5e75bc5a1a5e439e32aad8846f0080"; + sha256 = "9ea87da2a9d3e03d351f99c41c4cf3e50f6c556b78d38ebf87adcca3bdbcb080"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/fa/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/fa/firefox-141.0.tar.xz"; locale = "fa"; arch = "linux-aarch64"; - sha256 = "770254c4417f195e9bdad4de8428688bdc36f25bc3cbacf1f694427f3393d2f1"; + sha256 = "1e3dc3aa244441fef3fd0134f5099aaba92dbed1c3773c75433299ce82c1a071"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ff/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ff/firefox-141.0.tar.xz"; locale = "ff"; arch = "linux-aarch64"; - sha256 = "5b0375e73dedda5387f80033ced469c7f428096d316731674439cf6a7a049a23"; + sha256 = "595e9f92b83d39031b3df09de7fc80d6058ef70e7afed640437a370124a3bff9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/fi/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/fi/firefox-141.0.tar.xz"; locale = "fi"; arch = "linux-aarch64"; - sha256 = "50ca8051d24cb8876f1daae33082d4e7ba3c5e37d1a4dd6af8fb50e543365155"; + sha256 = "91cbe9b2657f322ab712c86c418dd6c921d5dad356be47d8f668e78518ce87c0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/fr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/fr/firefox-141.0.tar.xz"; locale = "fr"; arch = "linux-aarch64"; - sha256 = "7d08364316235d9709a3893efff19ec3b427c9bb2b42525ec9f4b8d3fa93c1b7"; + sha256 = "fc29a0ce928e15572ee15be76f167dc0cb9a8be41912700c90e3afd7295e264a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/fur/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/fur/firefox-141.0.tar.xz"; locale = "fur"; arch = "linux-aarch64"; - sha256 = "58d796e386371bac0f72e0b42f557dac7af26c4188cb97aee29a99de2f13c1be"; + sha256 = "fd29448a293003398f1d9a6615b7cf17bfb7989d585335f66cf0f900f5e52511"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/fy-NL/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/fy-NL/firefox-141.0.tar.xz"; locale = "fy-NL"; arch = "linux-aarch64"; - sha256 = "05f36abc1281d79bf70a83800945d939d7508d1a781f16dd6e89eef67189e1b9"; + sha256 = "ce98a17fa7ce0c3c0858154faffc94c1d9b5e8933c4c85360a3299aad1d5516e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ga-IE/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ga-IE/firefox-141.0.tar.xz"; locale = "ga-IE"; arch = "linux-aarch64"; - sha256 = "ea2561f9ad01e1fc9b92da91d855ff9a20d887989616d1bc89874383ce6cfd0a"; + sha256 = "f783d514e30d966212848e75421542edde43a91a108b5156719b570333d45c6a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/gd/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/gd/firefox-141.0.tar.xz"; locale = "gd"; arch = "linux-aarch64"; - sha256 = "bba853484a42bd14c86a647f1132e75f237f2ccb618b4f0e40a5183a8408c589"; + sha256 = "23424cde2fec3e4f4ee7056d4ae9411e3504ae6790038f8937781d5506f05f8c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/gl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/gl/firefox-141.0.tar.xz"; locale = "gl"; arch = "linux-aarch64"; - sha256 = "bc333bfbd4c5a7f219d1f3f29418cca7472ffe1a7e01bd40a5eab8a33e8d492d"; + sha256 = "e0b6304083036a44632e57820569861bfb0bc45a2517325f47787ba586ac2a2e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/gn/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/gn/firefox-141.0.tar.xz"; locale = "gn"; arch = "linux-aarch64"; - sha256 = "5c43fc318ebe73f0b9ee79ba24379f45c423d377ae35634839000080f69c2fb9"; + sha256 = "60ef090b64b53111d27307cd6ddfc3b7e7d28d77dd0fd4ff9e2c392828194117"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/gu-IN/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/gu-IN/firefox-141.0.tar.xz"; locale = "gu-IN"; arch = "linux-aarch64"; - sha256 = "d3ed9b516e2c020a3db99373ada5ebf47053954e6ddaa05b82d2235b0493d1ad"; + sha256 = "9d5c5c5ec51bf0055c05652ee5754322bc7c3ca6727344fa42e8defdbc58caa5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/he/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/he/firefox-141.0.tar.xz"; locale = "he"; arch = "linux-aarch64"; - sha256 = "a7766f63fd84e10f60cb9320e42b5a385436513addf5467415fed92a1ba98c4e"; + sha256 = "777574acff8dfc12dce742fe8e1947c43201cadb96a6cd85619268f70c1589e5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/hi-IN/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/hi-IN/firefox-141.0.tar.xz"; locale = "hi-IN"; arch = "linux-aarch64"; - sha256 = "21c799ade147e12f177ae9c63d0434ca845de3a75546017ae4bd7fe33984bff9"; + sha256 = "273d2c477e798bf96f14b7720c223c2f9f61f40d356182e2d4b5146843bc0376"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/hr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/hr/firefox-141.0.tar.xz"; locale = "hr"; arch = "linux-aarch64"; - sha256 = "ef0ce05465362d699d95535a2c8af8e7a041dc959391d2a1e032cc043bf38d0f"; + sha256 = "05ae7b41c1913f9e2b64a38768d9a988a3f35efe67e01c970b6233070d0c041c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/hsb/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/hsb/firefox-141.0.tar.xz"; locale = "hsb"; arch = "linux-aarch64"; - sha256 = "ace01688b2523329e5070a34672262c309fb27a96d7b9e33cedaeaac1d721581"; + sha256 = "67b28c680a579044dc1b1487001f51478f9012b9754d7d5b6791deb9072ea842"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/hu/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/hu/firefox-141.0.tar.xz"; locale = "hu"; arch = "linux-aarch64"; - sha256 = "9e3147d01af92d36cd21b25a6461cc2c2c4ab7db5fdbebba1882fcdb37e98793"; + sha256 = "de6f76e788bbd5049794629763e460e061a335bc3dbcd5329bd344015108167e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/hy-AM/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/hy-AM/firefox-141.0.tar.xz"; locale = "hy-AM"; arch = "linux-aarch64"; - sha256 = "a51c68b72e7e26c24fe5131a3e8a1da32e3062d274b3aebf736013a4ce663647"; + sha256 = "709cdd09f4fa19a98b36738c32c1ecad082487cf8c9abf5d8945a77c26a1de5c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ia/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ia/firefox-141.0.tar.xz"; locale = "ia"; arch = "linux-aarch64"; - sha256 = "eaa04b180552fe5dc8eaa69147c6c844486086eb98dddb4c4bc5b0438b699ada"; + sha256 = "e1b74859a9da3940206bcfc44504f708e59473b7bd668ea88c8a690c84965892"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/id/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/id/firefox-141.0.tar.xz"; locale = "id"; arch = "linux-aarch64"; - sha256 = "c8b724dc675ad34581a13492fa5fcdcb9e2033aa25a91cacec8f89d47d7ef802"; + sha256 = "12a4a59dd5225243de14aa58ec2a278b23e9a2eabe6102778657e1876f261a8a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/is/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/is/firefox-141.0.tar.xz"; locale = "is"; arch = "linux-aarch64"; - sha256 = "654311b10195eed0fc13e7d0c3b347a8034fa8d075522f1c2a86020e3c5c9b7e"; + sha256 = "f9b74c20b2ba276cbfc7d0bb8d687b119f430116dd5917d342e1f0515df3e2a7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/it/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/it/firefox-141.0.tar.xz"; locale = "it"; arch = "linux-aarch64"; - sha256 = "ab14882c6ef15e534c416e5c7127aaaef2104885a933e71f1e26d97ba91eb836"; + sha256 = "444282751c33332ae45ffcc7fc9f5bf1bba0ea42f834b704c66a76f298843457"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ja/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ja/firefox-141.0.tar.xz"; locale = "ja"; arch = "linux-aarch64"; - sha256 = "76d761b485afaead9fd2eedcf7baba0a28b1889ae5c07937dc3f78403d3254c0"; + sha256 = "103fbef467c480ca579b1bac124adaedd214f9ae63d20ae36ad406c03c371c71"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ka/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ka/firefox-141.0.tar.xz"; locale = "ka"; arch = "linux-aarch64"; - sha256 = "50cd042ed4e96900b12b2fd3e4c2948bae13f5b1ee9301f70fca772bacb5412a"; + sha256 = "21f219c9989f64a6462ba3edc0cbc392e02acf4b31c85b87f82a281f81c10ec2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/kab/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/kab/firefox-141.0.tar.xz"; locale = "kab"; arch = "linux-aarch64"; - sha256 = "277e8b2991d305221986ff6d7cfa104dd59918816fb90e4dc17f3933729efefc"; + sha256 = "48da5c3531a1b875e350dd7c332379287da22c8dd4f2e012bf5b63ebe11d8018"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/kk/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/kk/firefox-141.0.tar.xz"; locale = "kk"; arch = "linux-aarch64"; - sha256 = "7adc1aaa752c9e6c7e249ea931d4a23dd7d3423eba3c2993fdf05f6ec63f7c48"; + sha256 = "451c87eecdad201bc4112ea92c984fd5f8b6bbd84f10786daf1338b5e3411a2f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/km/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/km/firefox-141.0.tar.xz"; locale = "km"; arch = "linux-aarch64"; - sha256 = "ed43eb8ebcdfa4edc5607a7a0ed6c4e063945f089e59b356cf9c724aaf252f16"; + sha256 = "52dc55cce033fbb0d06acb16b93d52f0499b48c71b108a5423ac323d049efc9d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/kn/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/kn/firefox-141.0.tar.xz"; locale = "kn"; arch = "linux-aarch64"; - sha256 = "5f43e929dcb0b02deb0fc496d1111df5401fc9ec4ee80eceef87b2f3be1f3dd9"; + sha256 = "cd9201fd5ed1031c87ff99be8d42d4a7dad035d4e3f2a3fff8359f6559862a8a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ko/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ko/firefox-141.0.tar.xz"; locale = "ko"; arch = "linux-aarch64"; - sha256 = "7dc6e17515344497ab7ab7f6970ad019f19d1c3db716af10ab9db46b92fa335b"; + sha256 = "97881c312b41c968aae7f24906769c5bf46a6b0df4eb9754c5309859ec0b32a7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/lij/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/lij/firefox-141.0.tar.xz"; locale = "lij"; arch = "linux-aarch64"; - sha256 = "6b18ed5bb0c37dc64120c2ac5cc15048215fca442da0da7929b09621ce2ed331"; + sha256 = "dc18c5c1ec14dbf84992ec863e43bb22a8ced37f7f031b18eb9cda6070bca0cf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/lt/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/lt/firefox-141.0.tar.xz"; locale = "lt"; arch = "linux-aarch64"; - sha256 = "b6cf020bd8d89bc8d0e9bcfc733b975b46a0619cdbb4a4b50c695683959b8a45"; + sha256 = "f556299a884b1f6ced7fe8291315a02c5e3fcd7d6c95ec8c5cbd42cd096d5474"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/lv/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/lv/firefox-141.0.tar.xz"; locale = "lv"; arch = "linux-aarch64"; - sha256 = "9fe291e0cf50e1b62539f8a0660942140a3264c18424d5e9071019646065384d"; + sha256 = "9c9db9540dfd41a1c09388ea066d6bdc8f2ceb249d3cc2d67d2eda66081c1796"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/mk/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/mk/firefox-141.0.tar.xz"; locale = "mk"; arch = "linux-aarch64"; - sha256 = "85f06e3c8ab85bb1474bc1e925641802723c5cd17beddce394da9abaa2c4ddb4"; + sha256 = "65e7ed03bfc18b8068bd11465525818c0110a0ccbb19f6bd913792e3567545e6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/mr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/mr/firefox-141.0.tar.xz"; locale = "mr"; arch = "linux-aarch64"; - sha256 = "b235154077ae5db0e322792f2fd486971586b5bbc900c37f452e094ca47ec640"; + sha256 = "4870e64c8033aa47221e8dcde220b48d34226565ec4a89d1b6e8fb19483683d7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ms/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ms/firefox-141.0.tar.xz"; locale = "ms"; arch = "linux-aarch64"; - sha256 = "14bff36ef998f00a29532795e69cd6f658341c37dc15e7c23081b6ce494382f0"; + sha256 = "5a36a76a877670ac2e31b8806cd74ab4b1260fbc80f6cb4d1a6dfc0d4787c2a0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/my/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/my/firefox-141.0.tar.xz"; locale = "my"; arch = "linux-aarch64"; - sha256 = "a7001bd1cbb7284ee6385e3d3d615aa350adfb774daa3da914d5b934cd539b3a"; + sha256 = "9b48dfc72214f7ae92c6baf11e8653e235d1d044afbc1deb61229df0bc929373"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/nb-NO/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/nb-NO/firefox-141.0.tar.xz"; locale = "nb-NO"; arch = "linux-aarch64"; - sha256 = "70a06afb3e9cdac1014335f85fe4dcd720a6777369a935e02d70024975448db3"; + sha256 = "4a94fb1645a4426aba91b9f3243a7653e9c4b0b8aea0db0aa107c405d3454a2c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ne-NP/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ne-NP/firefox-141.0.tar.xz"; locale = "ne-NP"; arch = "linux-aarch64"; - sha256 = "a589a80bbc4246ebfe862722ecd954911afe0f531ce88c29214f022681d8ccdc"; + sha256 = "66a62cf30847590c173f73908d8262c140a3d4a92ce8de7b56c45f3c750b4c33"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/nl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/nl/firefox-141.0.tar.xz"; locale = "nl"; arch = "linux-aarch64"; - sha256 = "31b8bcea4411543c6b9dd3861fcccbf952a995fa7b5c49b0155e1cf48d50a6a7"; + sha256 = "625b876f0d002b497daca34fe5740157c06fb6552f61a58ec713e4cae0bb9b18"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/nn-NO/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/nn-NO/firefox-141.0.tar.xz"; locale = "nn-NO"; arch = "linux-aarch64"; - sha256 = "5b686f327debb1575111d0144a7e37f64569b6c404e4e432394ca340c900803d"; + sha256 = "7142f9c8dce02936b1f8460ba42ced04363aeed066a3081e1502792892bb0028"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/oc/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/oc/firefox-141.0.tar.xz"; locale = "oc"; arch = "linux-aarch64"; - sha256 = "2b8c20c0aea4aa731b7571cbd0411fc28675daf0df7e3e178db00c01f8339287"; + sha256 = "50eb0eba55545937e9fd83a9b4f40995fc9311d597cc633c70735d3210f4b11b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/pa-IN/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/pa-IN/firefox-141.0.tar.xz"; locale = "pa-IN"; arch = "linux-aarch64"; - sha256 = "997a9c2fbc7618b6b94fb5094c6d7a5ffac8d0df30b44aa55c01e7034a412ad9"; + sha256 = "8bbae42ed6f75c950c1cc7cc72f28b2470ce4eb99171d02656f5bbf64a32bc78"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/pl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/pl/firefox-141.0.tar.xz"; locale = "pl"; arch = "linux-aarch64"; - sha256 = "d15f725123515636ca8efc4fada37c777d33703652fa7fd78d424e074e5886fa"; + sha256 = "144a945fa99cf9c358d7df739d1c16747b7356eb7d40d5c794917d9b7d27a7fb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/pt-BR/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/pt-BR/firefox-141.0.tar.xz"; locale = "pt-BR"; arch = "linux-aarch64"; - sha256 = "ea6a30fa75d99b625e323155c6e6510dda6870e92c8945ee6ebe72ef80b95719"; + sha256 = "4c75238108672c509254fdfbc0d5d8dd0e939d787f7cd7f7e67e69ca76d40749"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/pt-PT/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/pt-PT/firefox-141.0.tar.xz"; locale = "pt-PT"; arch = "linux-aarch64"; - sha256 = "101b96f5e866cbaae618d78c64c0756be0c1ddfbc0e34c33f26336fa59728845"; + sha256 = "ee93c94af5433167f9eaed15514d6862ec57dab3704a42f03f5784493d047a61"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/rm/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/rm/firefox-141.0.tar.xz"; locale = "rm"; arch = "linux-aarch64"; - sha256 = "2cfd9e972f3ec29085b8fe745e92fbbab515a10abf9b7995b81ea5371d984b78"; + sha256 = "b378e624740b18eefede481bacaf8c3e7340a4c6b30d3cc0465f032a22b9d8eb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ro/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ro/firefox-141.0.tar.xz"; locale = "ro"; arch = "linux-aarch64"; - sha256 = "033d5537fc46f12e98dc691c17a2b76ba10829f496e6f5bd177ccb4da9bd00ea"; + sha256 = "7b1d6ccac6e6cfeade8d9b94295716c5cdeeb8811ec21521a9992089ce6fd699"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ru/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ru/firefox-141.0.tar.xz"; locale = "ru"; arch = "linux-aarch64"; - sha256 = "c0e77abeb8b3c49007283fa7455005fdeb38ed5fd4a11822eab62e8ab38d26c4"; + sha256 = "6eb563dd5372bf11580d84e07294ffcb6ef6da08679d92e4e9a4655763fc11c9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sat/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sat/firefox-141.0.tar.xz"; locale = "sat"; arch = "linux-aarch64"; - sha256 = "7e31342df60c7d789da8e0d3bc2afbbb5dd088d7ff9be49306318eeaf4f4cff4"; + sha256 = "1e7f38f728f878f7e8064e604ebb33a587cacf83bc046b1cd6dff468cbdf4d77"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sc/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sc/firefox-141.0.tar.xz"; locale = "sc"; arch = "linux-aarch64"; - sha256 = "5cfe8e8b0b86848feb7711c0360c8b991e9d9b3dcb39676d10a3d40c9fc1b4a4"; + sha256 = "fc06636b3b17dcbdd89f06bbb94abaad20ba9ecdb52d7b48c55c11ef6d780130"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sco/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sco/firefox-141.0.tar.xz"; locale = "sco"; arch = "linux-aarch64"; - sha256 = "edf5dcce85c6f38d866a61acf0c0b9ef6cee8062c9ac5b856d70cc079eb2cfa2"; + sha256 = "6c49150cf7b2e95079e305916287435ad5d0520a8a26d807a215d4e7fc6dedc4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/si/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/si/firefox-141.0.tar.xz"; locale = "si"; arch = "linux-aarch64"; - sha256 = "ef5016a94479fc9914b722de0f686163d9ff0b6343c0a825877c1c095db872bc"; + sha256 = "1ca1300faf467654e63ed4902595ce2bbe8176cb009bb00f7aac892a99b5bf37"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sk/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sk/firefox-141.0.tar.xz"; locale = "sk"; arch = "linux-aarch64"; - sha256 = "5dc50a12c14297db1f9f59e44870be390265693353d69fa1b31465cc0e08f79d"; + sha256 = "96ba7baf72739a60db646c95bab3c32e57a286865bc5ec7dbf9e11222fcc14f2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/skr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/skr/firefox-141.0.tar.xz"; locale = "skr"; arch = "linux-aarch64"; - sha256 = "f7b3dbd0386981995bb07a055b66eaa8d54b002a3562dd19497314cbda20e68f"; + sha256 = "d8e8ab156723fff8daad21695249173b80f3353c8f4e451bf42e0ae578ae4066"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sl/firefox-141.0.tar.xz"; locale = "sl"; arch = "linux-aarch64"; - sha256 = "a5fafb0df39613ef5c1670a36368fb73c66c4f8b853205669da9eec305a1ff02"; + sha256 = "1901216a8f6ad147335e3994a75d2cd655528d225f002b9d0066c21ea257e831"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/son/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/son/firefox-141.0.tar.xz"; locale = "son"; arch = "linux-aarch64"; - sha256 = "612dc6eca9650fd96e0abae35efae626753928d575b5e420292854c164f5aa51"; + sha256 = "5a0e224cdf6b3fd0d030229faa7f138f14b458529ea79db37fe05edcd80e09ef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sq/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sq/firefox-141.0.tar.xz"; locale = "sq"; arch = "linux-aarch64"; - sha256 = "921e13d746eb17a421d97672273c886d924f773234694405f00395a65210aac0"; + sha256 = "964e62bfb2534cfbb6a78154d83849609a621f638be8d0e101ee1fc3689e8573"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sr/firefox-141.0.tar.xz"; locale = "sr"; arch = "linux-aarch64"; - sha256 = "1025c259512e6aab613fb1543439b49101fc84b38e0124c8727f7a2007d62159"; + sha256 = "e61e83203bc23f8ffb3a81789f44d32124a0fce9b56017c0b4e73b0fc138d0a1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/sv-SE/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/sv-SE/firefox-141.0.tar.xz"; locale = "sv-SE"; arch = "linux-aarch64"; - sha256 = "5cb05c6739b26128fb1f0dbbd18204a85da05c59f05ea093e20651eab09128de"; + sha256 = "991893a78693d32fc610be86fdbfa6be893137ee8c5836a3b751101894cdd2b1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/szl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/szl/firefox-141.0.tar.xz"; locale = "szl"; arch = "linux-aarch64"; - sha256 = "ab55e0ea9ea39073330acbf8774b8e407a356ed97747eb7050692308a141bad2"; + sha256 = "ab3c71fb49cf41b221c1ae4b7817c9223542a0ff9b9606079206fd8df1d3dd5e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ta/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ta/firefox-141.0.tar.xz"; locale = "ta"; arch = "linux-aarch64"; - sha256 = "a9a084d97c19ebce2aa3939d4773c7afac89780c45da9654c316f0606aa1e55a"; + sha256 = "28b984a1efd9eb98fdf6ac01c547b928106adffb00b93ab838d899e51bbfb404"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/te/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/te/firefox-141.0.tar.xz"; locale = "te"; arch = "linux-aarch64"; - sha256 = "d07ba7015244294d981cdf9f7bda120c76739eed7e8dbc698231bef19ab05c09"; + sha256 = "e86a3d29a9f52c6b54213c579968fbd28d11699764dea3338f174130826fde90"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/tg/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/tg/firefox-141.0.tar.xz"; locale = "tg"; arch = "linux-aarch64"; - sha256 = "ab89563040fa7561896cbac272e268067c893f60134f29e07524b9582d7f7f34"; + sha256 = "496973dd1255f3fb6d89c342213cfd77f199c55b94e449d4d556e781493f738a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/th/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/th/firefox-141.0.tar.xz"; locale = "th"; arch = "linux-aarch64"; - sha256 = "b9b73ce1f8d6526663810b6fa21e3a0b57cd8e9558aeee50b499e7ea9ac3f0d2"; + sha256 = "71df4ca388050037082e29492cc3ea89d4127ee0e60a89a546bb87c28cfc3f9c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/tl/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/tl/firefox-141.0.tar.xz"; locale = "tl"; arch = "linux-aarch64"; - sha256 = "a39396b454763f477019a8f537718a91e04ac7b699b1241e7e2e586e6d98f236"; + sha256 = "9ff6874dc43318281956e7a279995eee55a7bc41c0e40e116d8ae86054a5afdc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/tr/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/tr/firefox-141.0.tar.xz"; locale = "tr"; arch = "linux-aarch64"; - sha256 = "3b3cb24381bf0e3bbec6381624dfe892904446775624510f5b8f42f88407d7c7"; + sha256 = "1253a25c4fe5cbb7d161145067b9db60b860863594a8c46da1a4b1781c671585"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/trs/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/trs/firefox-141.0.tar.xz"; locale = "trs"; arch = "linux-aarch64"; - sha256 = "9fc80b0e716820b338a16a8a7c06cdb3ae0766ee7c0b38a563fa67d8f00fa1d3"; + sha256 = "e2264b05111fbecf3777c9f26a8b7220f250abaaed83cae13961e03bd8962c33"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/uk/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/uk/firefox-141.0.tar.xz"; locale = "uk"; arch = "linux-aarch64"; - sha256 = "f7a7dc5dec812f3eeecc5eb08b4e5e0b19d1e230f5e599539d49b8cbbe283f37"; + sha256 = "da17f7b2c861a07804fd98fee462cf6da603426797467380372e2c68b5b945c1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/ur/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/ur/firefox-141.0.tar.xz"; locale = "ur"; arch = "linux-aarch64"; - sha256 = "df2a6673417798160298d93f667c6f8cff6c6060b89b293e4553a4afb25ae426"; + sha256 = "35c5e1c02075e28c7f76f5ac771b0b35758e8b5b0a5a2435600b9f8be24c0473"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/uz/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/uz/firefox-141.0.tar.xz"; locale = "uz"; arch = "linux-aarch64"; - sha256 = "ca5f4503c25ca5e1489c050e08914ad382f7a66bb734a7be0a4e85d9f8481834"; + sha256 = "d1647907db42347f77367caf013106ff62f1c1a51eb1cde86f334572ad92d5a5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/vi/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/vi/firefox-141.0.tar.xz"; locale = "vi"; arch = "linux-aarch64"; - sha256 = "a5246465d7fd30150c5a2516efe8defaf4efd5ba4b31620af1c6aed83ddd49c4"; + sha256 = "ef548241d63908c4bdc04650e312584216a7ce15e258b68ba064d26b70a48ecf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/xh/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/xh/firefox-141.0.tar.xz"; locale = "xh"; arch = "linux-aarch64"; - sha256 = "563095415dae63d07dc071988e8beca12683b5df044cac470c9dc70688605dc5"; + sha256 = "ed24a24c8d50fcbbdd1025f6559b6c253fc72c973d423dd7f3441c30578926d5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/zh-CN/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/zh-CN/firefox-141.0.tar.xz"; locale = "zh-CN"; arch = "linux-aarch64"; - sha256 = "7d4dd6d7af3ae4ea0cdb340afbe83c44f2da2fbcfa6c324a2e5b6dd20a47ec6d"; + sha256 = "01d874c868d51e1d19880be5074dbb32f30668fca9b014bde2b87212d1c32fe0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/linux-aarch64/zh-TW/firefox-140.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/linux-aarch64/zh-TW/firefox-141.0.tar.xz"; locale = "zh-TW"; arch = "linux-aarch64"; - sha256 = "95320006e0a544120fa7d2ad27f0ef15b253f438a257b79c226e74dc8d26e1e6"; + sha256 = "c2a4e9b0c02456c1b0ce79802702ddc630a3799d5750f6e4a3617ce9201ef9ae"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ach/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ach/Firefox%20141.0.dmg"; locale = "ach"; arch = "mac"; - sha256 = "4c8286ccda8e88bcde5ed66c235fae7bdeb15c98a10990dd7f3eb6ef8e65ad85"; + sha256 = "2d646318cdc65f464af12315e8a17ef6744fc04fbc0b12946463b5b596b4952e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/af/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/af/Firefox%20141.0.dmg"; locale = "af"; arch = "mac"; - sha256 = "e9f57d3a8e6e7e488f7fd54fae59f2be7b1233371079d898382fbd9c89acdef4"; + sha256 = "1b89d705971d4bdbd06e44e3308387ebce02fd4fc74efba832ecf58ab0d7ab13"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/an/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/an/Firefox%20141.0.dmg"; locale = "an"; arch = "mac"; - sha256 = "cb2fcb694e47d16477445f63730fff81e2b38b24cb9d8eb94587b62f8210b31e"; + sha256 = "77239b8df0f3e31ab792c88da83f1a6e3aacc969771f5eee5b0e1da8af0ebcb6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ar/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ar/Firefox%20141.0.dmg"; locale = "ar"; arch = "mac"; - sha256 = "0c040cd1637142090716a9537cf89b249d1c82d782cf1d7f3ff6f86eeb3d6db1"; + sha256 = "ac4bed4577c16d1ba718c943775972d9be75bebf3557ce3ff022cba66615b5a2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ast/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ast/Firefox%20141.0.dmg"; locale = "ast"; arch = "mac"; - sha256 = "1d255ef5534eaf6183aa214bafb72b588299662f7fb7af1bc892e5f83972304d"; + sha256 = "e9b25785ca4720be251b000e6cbabaf73261d67154a0d4065eb8be4c18863a6e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/az/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/az/Firefox%20141.0.dmg"; locale = "az"; arch = "mac"; - sha256 = "ecff452dfc9d0f42fbe2f2d7408d55648c45e92840010cfc7753f9ed5189624d"; + sha256 = "5c95b3420193760f03c6fcba0b0ada000a7e1fc35d717e29f60aabd077c32892"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/be/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/be/Firefox%20141.0.dmg"; locale = "be"; arch = "mac"; - sha256 = "405ea45bdf09994704affe968d6dcd2505b9450c1241105d0cec7cd849a0303d"; + sha256 = "268a5916c3141599f085cceb17138af762cd96da1dcbee02b50613ef2d074557"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/bg/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/bg/Firefox%20141.0.dmg"; locale = "bg"; arch = "mac"; - sha256 = "de85ca7b6d121e8e0a55f53d65803b7d5782fb7afb1a0a7ec7483a3a1c68ba2c"; + sha256 = "1cbb5a788f90002fa6953a2584015b1655b9989e6c638dcbc723265f08854a83"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/bn/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/bn/Firefox%20141.0.dmg"; locale = "bn"; arch = "mac"; - sha256 = "a8b21d3ab4a3e3dccc30e8188e9e953d17cbdf52534ebf53f5cc1d252cce99b3"; + sha256 = "0f33952b98fa2b12559d1e26a5d685a7eb0a115b5ca83b5b2cf3b590e119c7d8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/br/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/br/Firefox%20141.0.dmg"; locale = "br"; arch = "mac"; - sha256 = "536aca8e56e1990e329a23998db9628943ececa17a239eedb5f62f95a12494db"; + sha256 = "4a78d0bd1b97bab98c3528ed6791f8a7051684352ed6833d21638a0d3ac7d023"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/bs/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/bs/Firefox%20141.0.dmg"; locale = "bs"; arch = "mac"; - sha256 = "0a13b4c61bdfda6274358f3a58baffa15b2ba40ebfc9b8fa5ae5da7317d590af"; + sha256 = "d8cb8d7b77a0c87b637f170b33d574c229e23bd9d287e4a7d29bb1486250111d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ca-valencia/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ca-valencia/Firefox%20141.0.dmg"; locale = "ca-valencia"; arch = "mac"; - sha256 = "5d1f6569ac2b8c561334d5ada5245ef9aecf0814398e6d9ca89cd7c01f73cafb"; + sha256 = "29345bba27c498514d970b1aa7493a308b4d064615d4200e3ac9130ce7a53838"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ca/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ca/Firefox%20141.0.dmg"; locale = "ca"; arch = "mac"; - sha256 = "a97bca2cd5de2dbcb6d04e14f45b5e9144bb5d035464a9a056fa8eb633de89be"; + sha256 = "0730fb671f74c191a5809fc08ea4daad06e472dc44533080903c0355d81e5a96"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/cak/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/cak/Firefox%20141.0.dmg"; locale = "cak"; arch = "mac"; - sha256 = "e6b815c4631d3fc622b5912fa286ea0b626a9d2fc81595e7492c656a6b1e9111"; + sha256 = "26d1fa860c369c0506f3daac0451640c485333fc8a8802b5bd7b590d113bc3db"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/cs/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/cs/Firefox%20141.0.dmg"; locale = "cs"; arch = "mac"; - sha256 = "e60d7c7f78d2178457c357bf89f4687c94a1fe1e8212626957823b1c13ab11c3"; + sha256 = "db5a9752316e661df2f6556cba4cab098c301bf4ebb1d48417dc88d3f460fda9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/cy/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/cy/Firefox%20141.0.dmg"; locale = "cy"; arch = "mac"; - sha256 = "6af60b846d8b7f0ba3eba2f3a6b3eb41f935d109ebe59cbbbc6948a2bae6eb2b"; + sha256 = "4dc37b54778326a75fbc24af6e44bba7a1a226781e24dcd95f98a24e1a9c0942"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/da/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/da/Firefox%20141.0.dmg"; locale = "da"; arch = "mac"; - sha256 = "f8b04a2d2c4c966a5451d964b23b6c6136cdf2ad2a86f1f3e6820c63fc7d9940"; + sha256 = "48c99e8604547336100444fd9b395bfc937d43fcef3c49709c71fa68c329a264"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/de/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/de/Firefox%20141.0.dmg"; locale = "de"; arch = "mac"; - sha256 = "b51a3ba43c4a0afd4cdd78e44ab5795663fe07c49dc1fef3fccf5c5ba5049bda"; + sha256 = "5ae1392c6281d460a98f063cadea1c8a72dfac311ea5f165f26af883896afad3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/dsb/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/dsb/Firefox%20141.0.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "8fe058e953664730490b54d549825282458dd031087df0c3ee72838f88141005"; + sha256 = "0c3be90c018466786add506e2978e27b14cc2ea52b22aabf3e531fcbd9f147dd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/el/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/el/Firefox%20141.0.dmg"; locale = "el"; arch = "mac"; - sha256 = "dd4f77a7d168a2dea9229a9a7fcde85fd33484242802ba3adf543133d1485ea9"; + sha256 = "1654e0ff5e19a5a3e3831724f3a6a70f0dd914b73cc1add013e8c6078582f9ed"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/en-CA/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/en-CA/Firefox%20141.0.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "a6577b839347ca1dcb6fdc4e017ac277238f969fe567a2923ae1d19a02408600"; + sha256 = "46030b203e41d4b5a6533898ff0bc8ac55e0b31649cc90f99981c86949e0774b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/en-GB/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/en-GB/Firefox%20141.0.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "027a7b1755d0a2a6dd1eddc1ca71f9dbb4d43b9f8c81fce32a18e2bd41550aca"; + sha256 = "ab20062bbccce286e6f499b5d29dad23e8706b52fea62e5ca84bddce99339450"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/en-US/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/en-US/Firefox%20141.0.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "e97d88d6ac04766cc52963d0d8f567bd39464bfc612167cd81627e6bb22d1d8c"; + sha256 = "37b716b18a7852d3253e9444dbd0eb275204e54b589cc7ad38209c7fceb7ccf3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/eo/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/eo/Firefox%20141.0.dmg"; locale = "eo"; arch = "mac"; - sha256 = "488e0a613dbb62ef53d244dac8c9ab1349c2ea6b4ccc84ab57836103502dfb65"; + sha256 = "7f3cde6487f4340176f0bf665a7b279b9a8bb334125e17c1731e8ba31ae494e7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/es-AR/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/es-AR/Firefox%20141.0.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "da7725fb75155f96a0abc50cb503e32d17f8debb3002e010a3ebf59b5a2bbb99"; + sha256 = "67dc1c5e17c8a9b53c11daf1fb9b9b756a982e55cccf9b9aefc0b4295f03888f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/es-CL/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/es-CL/Firefox%20141.0.dmg"; locale = "es-CL"; arch = "mac"; - sha256 = "650a8f2d8198eded9cf01ab44668c46b6c5100524478017e9a1a95332976146d"; + sha256 = "c97042717572fed5637a061ea3272b65ceceea1b02f29f6f6119d5bd77b9c372"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/es-ES/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/es-ES/Firefox%20141.0.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "aff48cbc6a8dab4c88a9ed40222e85c27d44c281e7d9b0f835e84820f8909fad"; + sha256 = "86ab897195a45161d8a91e1beec7d95ec4b638ed040ffd3cbd3c73d09149e50b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/es-MX/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/es-MX/Firefox%20141.0.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "243d59d14008425a1c264713586cf13ffcc375b56de828f8cda5a4ae22b459bb"; + sha256 = "c5acd527fa2441bcc8970dfcda84dd219e18247153e5c540b366e95934caf6e8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/et/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/et/Firefox%20141.0.dmg"; locale = "et"; arch = "mac"; - sha256 = "c3403c2475c259c1e775598814455c0954d0aa788993014a481355d71e38a9b4"; + sha256 = "e99a68d5f1462498c64950752e1d1148c4c4e54c1cc118bad125d901b3e3592f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/eu/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/eu/Firefox%20141.0.dmg"; locale = "eu"; arch = "mac"; - sha256 = "49cb5f48d63040c0bdaa236d12139ca3f04795c164813893128228ff2f23d944"; + sha256 = "62811cbc10df1cfc6edc4335ae1b28aae766c928ed3ea96aa30c757c22ff9593"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/fa/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/fa/Firefox%20141.0.dmg"; locale = "fa"; arch = "mac"; - sha256 = "80807e3b049f0568492a67dd346a42cac86da5a07318d5dda2b7e596a6a20b5a"; + sha256 = "9040a8fd73f666ea883273537f7f704cfc5e2f8fd4076e754ad305fdce081de5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ff/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ff/Firefox%20141.0.dmg"; locale = "ff"; arch = "mac"; - sha256 = "cd75707ccad5392126b4f2e2059b226925b5762eb5ee5d9cc6f3d8be62d1dfdb"; + sha256 = "1fabff46a95fab8aadc282dd4457ee3e7f47868a8313abaf00b4bb3e484d642e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/fi/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/fi/Firefox%20141.0.dmg"; locale = "fi"; arch = "mac"; - sha256 = "51578245b8bd2eb40aeebca324940634c7fa735a2d1e313a58bee237bd708625"; + sha256 = "27649db4540cc76b263c6206daf18bfa105d4898ce34a9d7b6ffb3ce45f6a188"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/fr/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/fr/Firefox%20141.0.dmg"; locale = "fr"; arch = "mac"; - sha256 = "983937d9e3fe76aa0b90150ea43fc6ae9d4595a2cd5ad23fe0b7b441d742b5a0"; + sha256 = "30ff050bc6cb530af58113d67fab3c58a8a5e2daba2c7a006e27a01c0763edf3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/fur/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/fur/Firefox%20141.0.dmg"; locale = "fur"; arch = "mac"; - sha256 = "c93f087be6cdc2c1ef2ffcc4f4fa5c23a768fa46a0cf089e37c102bf3722f92f"; + sha256 = "f5bd86f76936041dbb89072c05bdd09f9191bbf132f30a5104f6d8556eb007b3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/fy-NL/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/fy-NL/Firefox%20141.0.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "5cab4a45193a8983fdfdaa39f96fc091d02360546b526a64fe15b2f66644a5af"; + sha256 = "037fb3559a0e9df8ef64fd0709389b13bbdc05bab7b532e18ea31691e49025b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ga-IE/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ga-IE/Firefox%20141.0.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "10d323fff09bb3cee2d99262a86726815ee36396ff0ad15a55213876b7b956e0"; + sha256 = "d2b8ffbb97c1632fd87b383fe48366bde9b0a31341efcf7e36534d0d6ac1e639"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/gd/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/gd/Firefox%20141.0.dmg"; locale = "gd"; arch = "mac"; - sha256 = "83ff0d14ae302cacef73c078f4d2a10c845376f928b4302e2dcb1a197db97190"; + sha256 = "94adf31c9d91323dcd6d8f76ee94dae258d80ea851dc47417a98afe8d526cd98"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/gl/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/gl/Firefox%20141.0.dmg"; locale = "gl"; arch = "mac"; - sha256 = "96cb66a2829c0cc22157e0b53c782de7c281e96a5044bdc73f905c1140e4ff6c"; + sha256 = "2b59bad54487b5847b952f9f7c127dd0091ec11240e8693b0cca3bc6abd299ba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/gn/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/gn/Firefox%20141.0.dmg"; locale = "gn"; arch = "mac"; - sha256 = "7bcb00d87a9274aa154b3ca74272389180df0a1d399c7e9840a19f61c0714b21"; + sha256 = "7b3124230895938621fdfff33af4c2c4cf3ef1de458b6f8b261a70918fcbcccd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/gu-IN/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/gu-IN/Firefox%20141.0.dmg"; locale = "gu-IN"; arch = "mac"; - sha256 = "26d644391bf6e772c3cb5551eecddbfe1eb03d1f0acf3905071019e268151fee"; + sha256 = "761af68dfd2a6d83102f73fed9830bc74d69ec6de00dffdcd6850f410c367b82"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/he/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/he/Firefox%20141.0.dmg"; locale = "he"; arch = "mac"; - sha256 = "2fa8005f947b7af24fe8b2099b7c5a1b4ba0703271ef7b77aedc3d154c8dc35c"; + sha256 = "40080800f9dcf6b7133c86b671f7dccaa12a3ad5530810de548f52b7628d6e96"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/hi-IN/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/hi-IN/Firefox%20141.0.dmg"; locale = "hi-IN"; arch = "mac"; - sha256 = "656fc2cd7490d2da9ec61ddd4df9b9bf384e80cd87e718e2394e02de393837dc"; + sha256 = "a1f2030fbc7caea2db22cbca1395131d98d4004a190b25176e0ad45badece8ef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/hr/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/hr/Firefox%20141.0.dmg"; locale = "hr"; arch = "mac"; - sha256 = "37f3c1a7026e32fdf89eeaa19b9b77243eae301766ba6d2be42ac936d837fec2"; + sha256 = "1c7a3c44423e6b29deb06337f610e0de4839d5bba0b4e82c1336ab2867289d97"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/hsb/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/hsb/Firefox%20141.0.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "a47e0bf57e7067b8c88e284b8b725ce860bc02800e25a4f47bfe6614355840b1"; + sha256 = "f95ca452f3a35561bff5c0978d2420cc45d2c4efcc1d24a9be7dc2fd01247593"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/hu/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/hu/Firefox%20141.0.dmg"; locale = "hu"; arch = "mac"; - sha256 = "3b3b56a4da6934fb4945d8b386810503752104b0973e3ce20d826142e1c87f81"; + sha256 = "451a87db40008ed51641d84ab0f001ac060f06644691b2a39756282379f4c5d7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/hy-AM/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/hy-AM/Firefox%20141.0.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "b3949d87e2eac12b715340590ccbbfd67382d40928a0a641f2c017d044e78049"; + sha256 = "f2850be54a81a819f60701b98e488e4dc16982afc2c12d94e96445033b94fb3c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ia/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ia/Firefox%20141.0.dmg"; locale = "ia"; arch = "mac"; - sha256 = "443fca414194feb84e801baabe6592ed95858c96b2f8b4e569fcb701b579e822"; + sha256 = "0c5a37dc15eb95535926f528e7502d86fa3995af0d6675e39c4b1fcb869d31e8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/id/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/id/Firefox%20141.0.dmg"; locale = "id"; arch = "mac"; - sha256 = "a3cb49eda1eb25f5099df6f82e5483f0b3be5f1c919c83950f5fdbac22f580e7"; + sha256 = "12a69b1077f5b1547fa539a3b5808dd3844d07ebb63a1ad0a18b322ad2d06831"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/is/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/is/Firefox%20141.0.dmg"; locale = "is"; arch = "mac"; - sha256 = "7b70819e255261c0a0c1ae32ad69d2dce1da301fe9b3eda4b656f5d3a9c2c938"; + sha256 = "860f21eb86b1b32d0f221f80d33bd1845e8190749a6f506a743735acbe43a3e5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/it/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/it/Firefox%20141.0.dmg"; locale = "it"; arch = "mac"; - sha256 = "b6f2be2b39f18483009de42a3da9f752b0564b55f56e1b00cd289db530e218a7"; + sha256 = "abf920bdcc9e64d1c3942eb8fb225bdffe792d82a99d45ecdec1dc7ec88821fd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ja-JP-mac/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ja-JP-mac/Firefox%20141.0.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "b24cc09f5bbff3f55aa28d4728ff347464891edb66219df9c6f2e44ed860107f"; + sha256 = "4d10b017c618a656a133701a89573e635607582b3c7f93de12c46ab20a6bdf34"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ka/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ka/Firefox%20141.0.dmg"; locale = "ka"; arch = "mac"; - sha256 = "4260c25eeeda5198d62eedc945f26d488aff857365ee81088e52629035039f14"; + sha256 = "a1b00a24f8c5f42dd0ca424695c0750e9c8894e0d9b6a17fae8ac89a8575823a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/kab/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/kab/Firefox%20141.0.dmg"; locale = "kab"; arch = "mac"; - sha256 = "5d29fa67a92bd3447b8bdb7023d2979087427980ffe1128b1661d0b0615c1169"; + sha256 = "cf02236311dcb1e2388640373cef5bf2d46b0cb5d561ebda7d1ccc74a31454f6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/kk/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/kk/Firefox%20141.0.dmg"; locale = "kk"; arch = "mac"; - sha256 = "e746741ab8ff463985849f3b65a82a0105605bc689d3f27f9e9dfc26433d125a"; + sha256 = "06f791c414b7b1230ccb9c06ede74fa557896daa96333571474a864a9247444b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/km/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/km/Firefox%20141.0.dmg"; locale = "km"; arch = "mac"; - sha256 = "9c72595599c6943194bdf659b6d7a7d55f68be905f139a88ad511ab3e7c54863"; + sha256 = "02fc09e2aa767ffc54d9619173e87e1ae6dbd1bd1a8ecde5840c5b389c135628"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/kn/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/kn/Firefox%20141.0.dmg"; locale = "kn"; arch = "mac"; - sha256 = "b7d63b5583d9f51c6fceb2f444a3dfcc79cd335e44566ad18166fd607833a571"; + sha256 = "bda70cb591c05f52ae99916bd4669a6a52fb0a6d4b7f882c053dbe03a104bcc1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ko/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ko/Firefox%20141.0.dmg"; locale = "ko"; arch = "mac"; - sha256 = "b8287ea7deedbf7350115dd1ac4358f9a9ed3a4670e5054c6058be2f47fb696b"; + sha256 = "c4846df0b8af4423724841f3af77e4eeac525c8a7d7e01493a20c787cae029c3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/lij/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/lij/Firefox%20141.0.dmg"; locale = "lij"; arch = "mac"; - sha256 = "bf6907af6b823649b82d142bb953ac82678240d546c37d60729d53748fca2c01"; + sha256 = "d73ca865779e509fe94cda0d1f5f45bd4b528173d57145dcbb3de9432e2993c0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/lt/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/lt/Firefox%20141.0.dmg"; locale = "lt"; arch = "mac"; - sha256 = "a3c3dc1761732eed8dcef2f54d114b02d93c50d37b489cfa661c3df91ebe43e8"; + sha256 = "9d831f0655b0f890b4081f0c843eb38e987c436d281438cfd1aa5e6dfd14d0c3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/lv/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/lv/Firefox%20141.0.dmg"; locale = "lv"; arch = "mac"; - sha256 = "73e0108bd692e7a457de70c5c7e899c429fad8cd37721ce7370e66a525e707e6"; + sha256 = "9891e2af2be47146440a4b0200f89d9f9f4080133cfbf383d66e9c81d401e9e6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/mk/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/mk/Firefox%20141.0.dmg"; locale = "mk"; arch = "mac"; - sha256 = "ca46e88411ec1cd4ceddc672ace2919dc25727663612bb9bd27632ab9a2f5f03"; + sha256 = "90259de40c97e582579af6dd9e802aece86463e3b338115945cfa40d6a528346"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/mr/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/mr/Firefox%20141.0.dmg"; locale = "mr"; arch = "mac"; - sha256 = "181c49b5d8c02e3909bd4f2061efb8ef3cb9ec55e9ff63403211e32be3130e55"; + sha256 = "7cdeb56ed559a69eaa746c26b21eaa0238677be472e314991cd654f5c3ef74f6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ms/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ms/Firefox%20141.0.dmg"; locale = "ms"; arch = "mac"; - sha256 = "17f855ce25ef1ac92944fb14b16d7ffb5fb679e03b7bfc37e6cab025fca35b22"; + sha256 = "b362c9acd234f6db36c7597f34e2a273156d50b891c26c50c0f9f663705496f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/my/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/my/Firefox%20141.0.dmg"; locale = "my"; arch = "mac"; - sha256 = "cff7f16757123113d39b8fb5a56ab77757fe9d90e1f5ba62f12ec9ea6f29b3a2"; + sha256 = "2055b06d76d307a97a7816449298fc1180e9d9424d54df88f5c7dec54182e149"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/nb-NO/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/nb-NO/Firefox%20141.0.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "8d76da8da930c484a4f2f78be4679688cc29ca44f8a6b991df385399eefa85c1"; + sha256 = "17cb325fe0210a52a2976bcdf148837092938cfcf1aaa6673cd7f4a14b39238e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ne-NP/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ne-NP/Firefox%20141.0.dmg"; locale = "ne-NP"; arch = "mac"; - sha256 = "c4614af7cfbe822fe82e46a614af0882ae14110e2254d5aa06e8dff7657694cb"; + sha256 = "877c21e2a7f37eb27a3a3ba111906737514093a20c94c5edf571284cde5c097a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/nl/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/nl/Firefox%20141.0.dmg"; locale = "nl"; arch = "mac"; - sha256 = "e5f2094e8b3d9ca293616d962cbd1d99eef02b92dcc3b473feb0d13c292c7082"; + sha256 = "7ae4122c451953bd92eedd23dd068631ddeec419a7ddf7d783dc204c08e75f95"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/nn-NO/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/nn-NO/Firefox%20141.0.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "c67f47d65d913bc8767df912a6d6f3e633b811f1fc0aec3545cad7b6bb7757fb"; + sha256 = "10a255b5280ee7bbdf220e6ca8bd994eef159a5dd8804d22c6f6c963febb6c14"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/oc/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/oc/Firefox%20141.0.dmg"; locale = "oc"; arch = "mac"; - sha256 = "b0a98bc8572ec911403bfe490dc504d313fcff081079c1c18c6a82e0d9eca984"; + sha256 = "26059c0262743605d045e4eda0589bb4f0fe8d63b584f2ea1f904d48da2ccb65"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/pa-IN/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/pa-IN/Firefox%20141.0.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "1b307d5709181a0b250327d04fd9a2f127fce7e792c4a525540480d4039fbc9d"; + sha256 = "cd77d464e80b82ad6c68eb2b5dd7ae41956d9b151a68688def0915d640cd8e01"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/pl/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/pl/Firefox%20141.0.dmg"; locale = "pl"; arch = "mac"; - sha256 = "83a51dc92c8aafea137f698eef0c7d7249d238c0d459f4d6f542f023532db44a"; + sha256 = "52e9054e146d4e3757012f5d20391f6f30c8dd4fcc197ac55a49042946f6d580"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/pt-BR/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/pt-BR/Firefox%20141.0.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "62c4ca2b20346f0906d5b536aab92f661d6f88ab0222469d3212c58e9d6224f5"; + sha256 = "40cbc55abbb762e676134a878406625701b26be5cd000dae110b7598ae157138"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/pt-PT/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/pt-PT/Firefox%20141.0.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "fa7f410a5d63c69e6b89501f34ce96fb09e0ac78a2e787349ab2af8fa801f3a3"; + sha256 = "ab12106d4121ecd135131b67839758b5f9e16725376f3b8213a9725858b5e40f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/rm/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/rm/Firefox%20141.0.dmg"; locale = "rm"; arch = "mac"; - sha256 = "233e7a0967801897a1458d33f0e0d0e7ee3f1841d2e564a9f4c2e7f872f64710"; + sha256 = "14ad99e70f378fc33cb2685e327bb3a415a39874e069abd3a0a5d84a89d27ea1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ro/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ro/Firefox%20141.0.dmg"; locale = "ro"; arch = "mac"; - sha256 = "a6cb37d19d21f59bf35893661f3bf14f290a51bf78860edb555e4af46ccb2e82"; + sha256 = "47d520b2f796c97a722b56e511b82631eed52275ab28e3fbd0674d7d38001dc5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ru/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ru/Firefox%20141.0.dmg"; locale = "ru"; arch = "mac"; - sha256 = "bea384a03df803d4d91e7a8d6330f538a7949e66bf03b0b6db4105c1e92411ad"; + sha256 = "e5a4756ac321867f3fb16364c66951834c49648b197f2e30cfa29bf6d62a7b9a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sat/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sat/Firefox%20141.0.dmg"; locale = "sat"; arch = "mac"; - sha256 = "c262f58493dfd81e6691578550a2942a8f9456513e3c51ad4b3805b60e07bc4a"; + sha256 = "47588d13670c68abc3204431b5519173b92ac60e38922cf32940e96b2071e8d9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sc/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sc/Firefox%20141.0.dmg"; locale = "sc"; arch = "mac"; - sha256 = "991631ef16653fe21a34ec791da72a457c820f58ee6365b62a43aff47bf06245"; + sha256 = "cf49aa4838ea82c215f3bff06477e1db38d0c67df88e6d0ac2871b4f5d7902ec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sco/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sco/Firefox%20141.0.dmg"; locale = "sco"; arch = "mac"; - sha256 = "2ce73609d4aeb566f702446280a7512e9107585208129ac857d29ca04fdb135c"; + sha256 = "efbb3486d6f863f3974cbd69d4ed6e2f9b42f581e9926e5ed125567eee930e7b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/si/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/si/Firefox%20141.0.dmg"; locale = "si"; arch = "mac"; - sha256 = "6f0ab9069c5cf18ad5c4c12e2933e8304d12c492de1dd480f4b7e0393b4f0f40"; + sha256 = "022a133db9177b6e882fa0aa644d70184a8efaae24e0aa625ca111e4cbcd369b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sk/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sk/Firefox%20141.0.dmg"; locale = "sk"; arch = "mac"; - sha256 = "c6801c789af1374ffb94eed0ef9245579dc7af6205d5175d7f3795bd9a01355a"; + sha256 = "d3eb5b8ce103dc6eddb8ca7947e7ad3652b766c2d395ecc6acb9b740bdbb2c45"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/skr/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/skr/Firefox%20141.0.dmg"; locale = "skr"; arch = "mac"; - sha256 = "b776c0cf15d02f16558af2587d44cb8dfeaa4756c67363d04e61a355176f3feb"; + sha256 = "1be25eca1806ebf72603cd1d3e7dc6ab6799b8c386d1ade693d070438fd00f6a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sl/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sl/Firefox%20141.0.dmg"; locale = "sl"; arch = "mac"; - sha256 = "cb7f05c8dd3099f7887dc6554a854281bcea7e4595e643609d67a8d72a5b6d9e"; + sha256 = "3f4792daf890d39d120edbbb05a96cc9605ec49015d87f6969bf8a5dc1a2d122"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/son/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/son/Firefox%20141.0.dmg"; locale = "son"; arch = "mac"; - sha256 = "fd85af5542a3dedf92870e240c39f1826a30396d15ff8c8b75a8e07d3fff2cc2"; + sha256 = "2fd6c939b7a4cc813e03d098bdfc19b8a1a48759b831be2e084719c16c8cf34a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sq/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sq/Firefox%20141.0.dmg"; locale = "sq"; arch = "mac"; - sha256 = "5773ffbc81b5d558ae2197a76cea792f49dd9fe48a47d2329c7cb01a6b85c9ce"; + sha256 = "3a5ffe9efff4d1d12f00d86c7fa46239accc708af95d7cf6a0d41492938899fc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sr/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sr/Firefox%20141.0.dmg"; locale = "sr"; arch = "mac"; - sha256 = "47b78c97701e7a146a42e8ca849ffb5ffe1852d4a23bb5bd702cc265b6f5736d"; + sha256 = "576572b308fa150011e62831783f13604c4700dec1f1f7f033fba25c835a5978"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/sv-SE/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/sv-SE/Firefox%20141.0.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "170936262506ad970a17d46e3d2c5fb23ebfc3d3f8b3ac3438c0f80d25870814"; + sha256 = "c84ae9979023217920f03f6c1eb02fd1aebb9dbfddc0459afd2681dbbe7fc562"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/szl/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/szl/Firefox%20141.0.dmg"; locale = "szl"; arch = "mac"; - sha256 = "71828dcc2c4c020d9773714c0847b20c367f36d432088f267fa73d425faa5728"; + sha256 = "cdc6004f451d5c7306088661318f2a2149e84b3e01c28cbe9c0dec56c30dce85"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ta/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ta/Firefox%20141.0.dmg"; locale = "ta"; arch = "mac"; - sha256 = "d8d9a5a2d78d3218119d4e6edbb602651cfa4f3918a7181eba3e8a3c41667aea"; + sha256 = "7084b920384d0827a3a26b2e51aa0a1d33b57b63d4b607963e8ecbe8422039fa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/te/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/te/Firefox%20141.0.dmg"; locale = "te"; arch = "mac"; - sha256 = "345d3ff94590419d82f9ec551ec909d80b4fc5d7fa34bc41c489849d84f04f4d"; + sha256 = "ca1d02ccc47d7372adfc7e7aa4174fec378d5f07550781ad02ae92297dd61705"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/tg/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/tg/Firefox%20141.0.dmg"; locale = "tg"; arch = "mac"; - sha256 = "07f8aad52582f034079de255d3753d4e754d8ea89f5988ed5326c5a728969617"; + sha256 = "933eacf454718a8b0dca160a2ee87bcd87152af358945b97383d592158028853"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/th/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/th/Firefox%20141.0.dmg"; locale = "th"; arch = "mac"; - sha256 = "8751a21cf8772835eb7a0da4981517dcd2607691ba46137ee89f76c2bbba3a79"; + sha256 = "1d9df1dc264e62cda2e49718570b93456fce86b9c38e91016fff8f9135b1f4fe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/tl/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/tl/Firefox%20141.0.dmg"; locale = "tl"; arch = "mac"; - sha256 = "dade6f970bbd83d77c6ee56465bc605a539aaed2e9d69f3edb6f71637f94aab2"; + sha256 = "d3b0e0e439ccd7b566d5810fc4834323f4e1fe30fcf07a7d7014662bf53084a0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/tr/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/tr/Firefox%20141.0.dmg"; locale = "tr"; arch = "mac"; - sha256 = "a2bd26e7f458938dd4ceae8a145beb1fa735081c2b99a34a843d6ec349b1703b"; + sha256 = "3ad66b0abfd0995f48cc55a6deaac71a464af45b40a734f48fe6418c18ca7f26"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/trs/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/trs/Firefox%20141.0.dmg"; locale = "trs"; arch = "mac"; - sha256 = "0b3333f1f80ec5005266f8e1e7c5b98edde047c9cd617bf37ae0f536f4962ba2"; + sha256 = "26a3a62918b4c8ad8250f1218d2811717f155fecabb9f5e5ea79feea03928b79"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/uk/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/uk/Firefox%20141.0.dmg"; locale = "uk"; arch = "mac"; - sha256 = "842296fa529441cc2ec1939d813649a1c05682d3eae0369b0917137fd32f5fd7"; + sha256 = "fbd6d9a970260b140ff434596e99ab55bb418124062fe14834fda9423395a2b2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/ur/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/ur/Firefox%20141.0.dmg"; locale = "ur"; arch = "mac"; - sha256 = "469fa87ab6c043aca07f8c9c864b2a1370cc18c64df735cc034f146b18a0bcd3"; + sha256 = "7817b6f04256bb0e98eff7899b28d49039cea84b595d8ef33d2130b6464584e2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/uz/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/uz/Firefox%20141.0.dmg"; locale = "uz"; arch = "mac"; - sha256 = "97e4ef0e7c28f03b9bcaecdbe5af093e5c03d4e1b845669fbac3cafa973738a3"; + sha256 = "2fd70f20d710655d2543dd1500e9d791016a3abaa316cc9ce30c8e28023fbed6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/vi/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/vi/Firefox%20141.0.dmg"; locale = "vi"; arch = "mac"; - sha256 = "727c8192e65e94dfbdf8fe506abe8d6db550bba6d559ba8923ce37031a130d68"; + sha256 = "11681cfc5b979b0fb822079cecaa5bfbf2eaa0b40df832832eecd81ffc43fdc2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/xh/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/xh/Firefox%20141.0.dmg"; locale = "xh"; arch = "mac"; - sha256 = "bb6a1b92642b51a82ba0d3d8f19e01d4952a62c36add5ccb86e4c15c4bcd7b83"; + sha256 = "23f15ef262b39bd1295d0751e86bccfa632d66c4438c888cdeabb4f712b462cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/zh-CN/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/zh-CN/Firefox%20141.0.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "fc739cd43d62b94132292e8fa3457da7cb65b23a7cdf19f451d4025094231ae5"; + sha256 = "92a269c2bedc65b9ff8dbfeb7dc53e115ac49792d43dd76232482b04d6f2fde0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/140.0.4/mac/zh-TW/Firefox%20140.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/141.0/mac/zh-TW/Firefox%20141.0.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "3b88dc8fd0ed780c5cf8fb3c4fbaf18177bf06150c94c7ceb2a5a88f5fcd80be"; + sha256 = "7077da1c7698b20b8a04df0871413336d8b63f51e0ad1ddbe8e303c4363064a4"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/mobile-config.nix b/pkgs/applications/networking/browsers/firefox/mobile-config.nix index db88c0931201..027be201c3b3 100644 --- a/pkgs/applications/networking/browsers/firefox/mobile-config.nix +++ b/pkgs/applications/networking/browsers/firefox/mobile-config.nix @@ -7,113 +7,46 @@ let pkg = fetchFromGitLab { + domain = "gitlab.postmarketos.org"; owner = "postmarketOS"; repo = "mobile-config-firefox"; - rev = "ff2f07873f4ebc6e220da0e9b9f04c69f451edda"; - sha256 = "sha256-8wRz8corz00+0qROMiOmZAddM4tjfmE91bx0+P8JNx4="; + rev = "4.6.0"; + hash = "sha256-tISfxN/04spgtKStkkn+zlCtFU6GbtwuZubqpGN2olA="; }; - userChrome = runCommand "userChrome.css" { } '' - cat ${pkg}/src/userChrome/*.css > $out + mobileConfigDir = runCommand "mobile-config-firefox" { } '' + mkdir -p $out/mobile-config-firefox/{common,userChrome,userContent} + + cp ${pkg}/src/common/*.css $out/mobile-config-firefox/common/ + cp ${pkg}/src/userChrome/*.css $out/mobile-config-firefox/userChrome/ + cp ${pkg}/src/userContent/*.css $out/mobile-config-firefox/userContent/ + + (cd $out/mobile-config-firefox && find common -name "*.css" | sort) >> $out/mobile-config-firefox/userChrome.files + (cd $out/mobile-config-firefox && find common -name "*.css" | sort) >> $out/mobile-config-firefox/userContent.files + + (cd $out/mobile-config-firefox && find userChrome -name "*.css" | sort) > $out/mobile-config-firefox/userChrome.files + (cd $out/mobile-config-firefox && find userContent -name "*.css" | sort) > $out/mobile-config-firefox/userContent.files + ''; - userContent = runCommand "userContent.css" { } '' - cat ${pkg}/src/userContent/*.css > $out + + mobileConfigAutoconfig = runCommand "mobile-config-autoconfig.js" { } '' + substitute ${pkg}/src/mobile-config-autoconfig.js $out \ + --replace "/etc/mobile-config-firefox" "${mobileConfigDir}/mobile-config-firefox" + ''; + + mobileConfigPrefs = runCommand "mobile-config-prefs.js" { } '' + # Remove the autoconfig setup lines since we handle that through extraPrefsFiles + grep -v "general.config.filename" ${pkg}/src/mobile-config-prefs.js | \ + grep -v "general.config.obscure_value" | \ + grep -v "general.config.sandbox_enabled" > $out ''; in wrapFirefox firefox-unwrapped { - # extraPolicies = (lib.importJSON "${pkg}/src/policies.json").policies; - extraPoliciesFiles = [ "${pkg}/src/policies.json" ]; - extraPrefs = '' - // Copyright 2022 Arnaud Ferraris, Oliver Smith - // SPDX-License-Identifier: MPL-2.0 + extraPrefsFiles = [ + mobileConfigAutoconfig + mobileConfigPrefs + ]; - // This is a Firefox autoconfig file: - // https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig - - // Import custom userChrome.css on startup or new profile creation - const {classes: Cc, interfaces: Ci, utils: Cu} = Components; - Cu.import("resource://gre/modules/Services.jsm"); - Cu.import("resource://gre/modules/FileUtils.jsm"); - - var updated = false; - - // Create /chrome/ directory if not already present - var chromeDir = Services.dirsvc.get("ProfD", Ci.nsIFile); - chromeDir.append("chrome"); - if (!chromeDir.exists()) { - chromeDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY); - } - - // Create nsIFile objects for userChrome.css in /chrome/ and in /etc/ - var chromeFile = chromeDir.clone(); - chromeFile.append("userChrome.css"); - var defaultChrome = new FileUtils.File("${userChrome}"); - - // No auto-upgrade. Should this be replaced with symlinking? - // // Remove the existing userChrome.css if older than the installed one - // if (chromeFile.exists() && defaultChrome.exists() && - // chromeFile.lastModifiedTime < defaultChrome.lastModifiedTime) { - // chromeFile.remove(false); - // } - - // Copy userChrome.css to /chrome/ - if (!chromeFile.exists()) { - defaultChrome.copyTo(chromeDir, "userChrome.css"); - updated = true; - } - - // Create nsIFile objects for userContent.css in /chrome/ and in /etc/ - var contentFile = chromeDir.clone(); - contentFile.append("userContent.css"); - var defaultContent = new FileUtils.File("${userContent}"); - - // No auto-upgrade. Should this be replaced with symlinking? - // // Remove the existing userContent.css if older than the installed one - // if (contentFile.exists() && defaultContent.exists() && - // contentFile.lastModifiedTime < defaultContent.lastModifiedTime) { - // contentFile.remove(false); - // } - - // Copy userContent.css to /chrome/ - if (!contentFile.exists()) { - defaultContent.copyTo(chromeDir, "userContent.css"); - updated = true; - } - - // Restart Firefox immediately if one of the files got updated - if (updated === true) { - var appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup); - appStartup.quit(Ci.nsIAppStartup.eForceQuit | Ci.nsIAppStartup.eRestart); - } - - defaultPref('general.useragent.override', 'Mozilla/5.0 (Android 11; Mobile; rv:96.0) Gecko/96.0 Firefox/96.0'); - defaultPref('browser.urlbar.suggest.topsites', false); - defaultPref('browser.urlbar.suggest.engines', false); - defaultPref('browser.newtabpage.enabled', true); - - // Enable android-style pinch-to-zoom - pref('dom.w3c.touch_events.enabled', true); - pref('apz.allow_zooming', true); - pref('apz.allow_double_tap_zooming', true); - - // Save vertical space by hiding the titlebar - pref('browser.tabs.inTitlebar', 1); - - // Disable search suggestions - pref('browser.search.suggest.enabled', false); - - // Empty new tab page: faster, less distractions - pref('browser.newtabpage.enabled', false); - - // Allow UI customizations with userChrome.css and userContent.css - pref('toolkit.legacyUserProfileCustomizations.stylesheets', true); - - // Select the entire URL with one click - pref('browser.urlbar.clickSelectsAll', true); - - // Disable cosmetic animations, save CPU - pref('toolkit.cosmeticAnimations.enabled', false); - - // Disable download animations, save CPU - pref('browser.download.animateNotifications', false); - ''; + extraPoliciesFiles = [ + "${pkg}/src/policies.json" + ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix index 7fc014e12d82..96719a7734ed 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix @@ -9,11 +9,11 @@ buildMozillaMach rec { pname = "firefox"; - version = "128.12.0esr"; + version = "128.13.0esr"; applicationName = "Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "442d0b2b6ce02adcd878975f01e86548ca8fe93840185d77a1acb41ec99440c7abfdc8757e6f30d60593dcf2c7f50563b6ea6ccd4d239beea01305615b73c359"; + sha512 = "9e6f3af535e0904219bcac947d458789cc43cbfaf476ac287328323662391eaaadeff57b244599acf3626a2fadc0bc41b70d07e33ca6af4412006ad01ceff034"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix index 24a2e506f388..0364f6122a01 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix @@ -9,11 +9,11 @@ buildMozillaMach rec { pname = "firefox"; - version = "140.0esr"; + version = "140.1.0esr"; applicationName = "Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "12e40b81627ac4b44d43edb94aa1cd2a6c50bb49503e3b1b6f80259eed197ecb5847a0f0520ad204340dfe0ab7b5a4aa1ced2bc21ee0258471e8fdb121f6aaf4"; + sha512 = "1b5caff9b381cd449c40d148542501f7a31a7151a3f2f888e789c9743af8ee1d1eddbd970f8c0054902d1e1d739221db0cfcf1dc6ab704bb83bbb7b7b6a20055"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix index 6569d19bd289..2aa06fd0ebd9 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 = "140.0.4"; + version = "141.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3de7c0871b8a45683f5c226fb3e91e597e8f89ef154b208b2a57c4d3ea9f39cb5c69ecbd5eca3b6da68d3775688d2289c1360c7d110c67bb1be1cf26ef8cf36d"; + sha512 = "bd6998bce927c5b5c186537bd41475fc9e3809829ceadb2277bb382d02d3780d2a5e5749487567a75b7c9e3726f97662c4ec28924bc491c5a3f21e2ec4828d63"; }; meta = { diff --git a/pkgs/applications/networking/cluster/rke2/builder.nix b/pkgs/applications/networking/cluster/rke2/builder.nix index 605cfcc6b2a3..bd8795f6ccaa 100644 --- a/pkgs/applications/networking/cluster/rke2/builder.nix +++ b/pkgs/applications/networking/cluster/rke2/builder.nix @@ -152,7 +152,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/rancher/rke2"; - description = "RKE2, also known as RKE Government, is Rancher's next-generation Kubernetes distribution"; + description = "Rancher's next-generation Kubernetes distribution, also known as RKE Government"; changelog = "https://github.com/rancher/rke2/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ef08f2993c22..3902cc789074 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -426,13 +426,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-oKAfDSSY8Ys7wKHSDoFPOOrbXN4cOFq4HYinngjD5xY=", + "hash": "sha256-s2oXZSi0IVysbaI9rOp3sVDCSJCKPHe5cXJyU2g8SEE=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v3.10.0", + "rev": "v3.11.1", "spdx": "MIT", - "vendorHash": "sha256-kwrRbuMP57knT38w9SmrIs8bPmTaMeflqWb+4cFphew=" + "vendorHash": "sha256-OzFNqWCAIvFQQ/4bi52doASkjo/zoxlS2ueiV1rww1M=" }, "exoscale": { "hash": "sha256-V/+7qjE1r49cbF1+N5E7/jWFTSvqjhO8jxjneTJjjmQ=", @@ -1300,13 +1300,13 @@ "vendorHash": "sha256-jGGdSKXpg/N80lNsHFt1nU1t3oW5uDphGYHhBZmAgxE=" }, "sysdig": { - "hash": "sha256-oJ51syzDKX7ZO8EJ3Ug1JNRO34N0t4Y8CzAszc5apOM=", + "hash": "sha256-RGHf1JpcPP6VMPZSvj3HsL4Z7EnJKv5Y0T+tSk2hauc=", "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig", "owner": "sysdiglabs", "repo": "terraform-provider-sysdig", - "rev": "v1.56.3", + "rev": "v1.57.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-L+XwC7c4ph4lM0+BhHB9oi1R/Av8jlDcqHewOmtPU1s=" + "vendorHash": "sha256-IrkNNKoBCMd+8vwQDF5PNiC9vS5iz0pjhM2nN0rsMrA=" }, "tailscale": { "hash": "sha256-p96Jv4sIxWHWcpxcAWXASf2m06M7lsIvCCygM9KEALY=", diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/applications/networking/firehol/iprange.nix index 63157c65aa33..8d73c99a4d87 100644 --- a/pkgs/applications/networking/firehol/iprange.nix +++ b/pkgs/applications/networking/firehol/iprange.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "manage IP ranges"; + description = "Manage IP ranges"; mainProgram = "iprange"; homepage = "https://github.com/firehol/iprange"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 514b4f2122c6..c7ef0f2ec94e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,24 +9,24 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.101"; + stable = "0.0.102"; ptb = "0.0.152"; - canary = "0.0.716"; - development = "0.0.83"; + canary = "0.0.723"; + development = "0.0.84"; } else { - stable = "0.0.353"; - ptb = "0.0.181"; - canary = "0.0.823"; - development = "0.0.96"; + stable = "0.0.354"; + ptb = "0.0.182"; + canary = "0.0.829"; + development = "0.0.97"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-FB6GiCM+vGyjZLtF0GjAIq8etK5FYyQVisWX6IzB4Zc="; + hash = "sha256-xnl67Ty9uuAjOV5eWnR7xG+PR5J4M7nYc1hjRBjbaOI="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; @@ -34,29 +34,29 @@ let }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-W7uPrJRKY4I6nsdj/TNxT8kHh5ssn9KyCArhOhAlaH4="; + hash = "sha256-k1ClTRaYsb5rPV8AFtVg3iEZ44z5gmcBnOJgsQq9O1Y="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-KpZ90VekGf3KNpNpFfZlVXorv86yK1OuY0uqgBuWIQ4="; + hash = "sha256-0SmCBi/fl77m5PzI5O38CpAoIzyQc+eRUKLyKVMQ6Dc="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-qHOLhPhHwN0fy1KiJroJvshlYExBDsuna2PddjtNyEI="; + hash = "sha256-JucQ4EPWSMKAKvZhovij8YGWLhZ3IhnXoskce3RG0Do="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-Q153X08crRpXZMMgNDYbADHnL7MiBPCakJxQe8Pl0Uo="; + hash = "sha256-yL3NSjY3W1w1gfw7w7zdCgVcov18PtrT8RmcwgQLA6U="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-69Q8kTfenlmhjptVSQ9Y0AyeViRw+srMExOA7fAlaGw="; + hash = "sha256-pa7nJMJU6jPNcusIJ93aAH8AFQl93z1FX/sv6+M4WME="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-fe7yE+dxEATIdfITg57evbaQkChCcoaLrzV+8KwEBws="; + hash = "sha256-BVTQPr3Oox/mTNE7LTJfYuKhI8PlkJlznKiOffqpECs="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 70c6607158cc..04c8350f47fe 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -50,7 +50,7 @@ buildDunePackage { meta = with lib; { homepage = "https://github.com/hannesm/jackline"; - description = "minimalistic secure XMPP client in OCaml"; + description = "Minimalistic secure XMPP client in OCaml"; mainProgram = "jackline"; license = licenses.bsd2; maintainers = with maintainers; [ sternenseemann ]; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index b7d715ea4ad9..e57d2bd58bca 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -103,11 +103,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { pname = "weechat"; - version = "4.6.3"; + version = "4.7.0"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-XAte+pabhzxL5YIBmxhSPuQD50MLgiOCW820Son1gV0="; + hash = "sha256-RdwDlgYMhjFphoNJ7CgK8cb0rFJKpJJYDhoGXhQsLNg="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 2dbc038b3fb9..3c47447353cf 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -159,7 +159,10 @@ mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; - platforms = [ "x86_64-linux" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; maintainers = with maintainers; [ jagajaga jraygauthier diff --git a/pkgs/applications/networking/remote/teamviewer/update-teamviewer.sh b/pkgs/applications/networking/remote/teamviewer/update-teamviewer.sh index e8d2f681851a..46002360cbb1 100755 --- a/pkgs/applications/networking/remote/teamviewer/update-teamviewer.sh +++ b/pkgs/applications/networking/remote/teamviewer/update-teamviewer.sh @@ -1,7 +1,17 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p nix-update curl +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash curl gnugrep jq nix nix-prefetch nix-prefetch-scripts common-updater-scripts -TEAMVIEWER_VER=$(curl -s https://www.teamviewer.com/en-us/download/linux/ | grep -oP 'Current version: \K[0-9]+\.[0-9]+\.[0-9]+') +set -euo pipefail -nix-update --version "$TEAMVIEWER_VER" --system x86_64-linux teamviewer -nix-update --version "skip" --system aarch64-linux teamviewer +current_version=$(nix eval --raw -f . teamviewer.version) +latest_version=$(curl -s https://www.teamviewer.com/en-us/download/portal/linux/ | grep -oP 'Current version: \K[0-9]+\.[0-9]+\.[0-9]+') + +echo "current version: $current_version" +echo "latest version: $latest_version" + +if [[ "$latest_version" == "$current_version" ]]; then + echo "package is up-to-date" + exit 0 +fi + +update-source-version teamviewer "$latest_version" diff --git a/pkgs/applications/office/beebeep/default.nix b/pkgs/applications/office/beebeep/default.nix deleted file mode 100644 index 970680b8251a..000000000000 --- a/pkgs/applications/office/beebeep/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - mkDerivation, - fetchzip, - wrapQtAppsHook, - autoPatchelfHook, - qtbase, - qtmultimedia, - qtx11extras, -}: - -mkDerivation rec { - pname = "beebeep"; - version = "5.8.6"; - - src = fetchzip { - url = "https://netix.dl.sourceforge.net/project/beebeep/Linux/beebeep-${version}-qt5-amd64.tar.gz"; - sha256 = "sha256-YDgFRXFBM1tjLP99mHYJadgccHJYYPAZ1kqR+FngLKU="; - }; - - nativeBuildInputs = [ - wrapQtAppsHook - autoPatchelfHook - ]; - - buildInputs = [ - qtbase - qtmultimedia - qtx11extras - ]; - - installPhase = '' - mkdir -p $out/bin - cp * $out/bin - ''; - - meta = with lib; { - homepage = "https://www.beebeep.net/"; - description = "BeeBEEP is the free office messenger that is indispensable in all those places where privacy and security are an essential requirement"; - mainProgram = "beebeep"; - platforms = platforms.linux; - license = licenses.gpl2Only; - maintainers = with maintainers; [ mglolenstine ]; - }; -} diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix index 1c5d40629cf6..d386a374c46e 100644 --- a/pkgs/applications/science/biology/nest/default.nix +++ b/pkgs/applications/science/biology/nest/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "NEST is a command line tool for simulating neural networks"; + description = "Command line tool for simulating neural networks"; homepage = "https://www.nest-simulator.org/"; changelog = "https://github.com/nest/nest-simulator/releases/tag/v${version}"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index ec8ea13a192a..eaadc55bb0e2 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -66,7 +66,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/NanoVNA-Saver/nanovna-saver"; - description = "A tool for reading, displaying and saving data from the NanoVNA"; + description = "Tool for reading, displaying and saving data from the NanoVNA"; mainProgram = "NanoVNASaver"; longDescription = '' A multiplatform tool to save Touchstone files from the NanoVNA, sweep diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index fc3a72e49ad5..a4ef2509f2c3 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -14,7 +14,6 @@ pkg-config, gnumake42, customOCamlPackages ? null, - ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, @@ -35,12 +34,6 @@ let lib = import ../../../../build-support/coq/extra-lib.nix { inherit (args) lib; }; release = { - "8.5pl1".sha256 = "1976ki5xjg2r907xj9p7gs0kpdinywbwcqlgxqw75dgp0hkgi00n"; - "8.5pl2".sha256 = "109rrcrx7mz0fj7725kjjghfg5ydwb24hjsa5hspa27b4caah7rh"; - "8.5pl3".sha256 = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw"; - "8.6.0".sha256 = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4"; - "8.6.0".rev = "V8.6"; - "8.6.1".sha256 = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l"; "8.7.0".sha256 = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m"; "8.7.1".sha256 = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8"; "8.7.2".sha256 = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w"; @@ -131,10 +124,6 @@ let case = lib.versions.range "8.7" "8.10"; out = ocamlPackages_4_09; } - { - case = lib.versions.range "8.5" "8.6"; - out = ocamlPackages_4_05; - } ] ocamlPackages_4_14; ocamlNativeBuildInputs = [ ocamlPackages.ocaml diff --git a/pkgs/applications/science/math/labplot/default.nix b/pkgs/applications/science/math/labplot/default.nix index 7b1a54e46666..a998b1c26016 100644 --- a/pkgs/applications/science/math/labplot/default.nix +++ b/pkgs/applications/science/math/labplot/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "LabPlot is a FREE, open source and cross-platform Data Visualization and Analysis software accessible to everyone"; + description = "Free, open source and cross-platform data visualization and analysis software accessible to everyone"; homepage = "https://labplot.kde.org"; license = with licenses; [ asl20 diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 39c5798ff096..96625c2beeca 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -81,7 +81,7 @@ stdenv'.mkDerivation rec { ]; meta = with lib; { - description = "COLMAP - Structure-From-Motion and Multi-View Stereo pipeline"; + description = "Structure-From-Motion and Multi-View Stereo pipeline"; longDescription = '' COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index e732da52817c..ee21013ecae0 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -26,7 +26,7 @@ let pname = "rxvt-unicode"; version = "9.31"; - description = "A clone of the well-known terminal emulator rxvt"; + description = "Clone of the well-known terminal emulator rxvt"; desktopItem = makeDesktopItem { name = pname; diff --git a/pkgs/applications/version-management/gitlab-triage/default.nix b/pkgs/applications/version-management/gitlab-triage/default.nix index e75a3b9d53f2..8fdb4c1d773d 100644 --- a/pkgs/applications/version-management/gitlab-triage/default.nix +++ b/pkgs/applications/version-management/gitlab-triage/default.nix @@ -12,7 +12,7 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "gitlab-triage"; meta = with lib; { - description = "GitLab's issues and merge requests triage, automated!"; + description = "GitLab's issues and merge requests triage, automated"; homepage = "https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/applications/video/kodi/addons/defusedxml/default.nix b/pkgs/applications/video/kodi/addons/defusedxml/default.nix index 4f4109868a95..3a9ae800dc0d 100644 --- a/pkgs/applications/video/kodi/addons/defusedxml/default.nix +++ b/pkgs/applications/video/kodi/addons/defusedxml/default.nix @@ -25,7 +25,7 @@ buildKodiAddon rec { meta = with lib; { homepage = "https://github.com/tiran/defusedxml"; - description = "defusing XML bombs and other exploits"; + description = "Defusing XML bombs and other exploits"; license = licenses.psfl; teams = [ teams.kodi ]; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix b/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix index 1c65bff9b0f1..9dd74650681e 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-scale-to-sound"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "dimtpap"; repo = "obs-scale-to-sound"; tag = version; - hash = "sha256-N6OMufx4+WyLGnIZQNxwlPdlmsa+GoZhuDMS9NIbIGE="; + hash = "sha256-El5lwQfc33H9KvjttJyjakzRizjLoGz2MbkiRm4zm8E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 1dc5effb7044..6a6b819f2770 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -73,9 +73,9 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - virtualboxVersion = "7.1.10"; + virtualboxVersion = "7.1.12"; virtualboxSubVersion = ""; - virtualboxSha256 = "7d60010a4c9102613554b46f61d17b825c30ee59d8be071e52d8aac664ca9869"; + virtualboxSha256 = "6f9618f39168898134975f51df7c2d6d5129c0aa82b6ae11cf47f920c70df276"; kvmPatchVersion = "20250207"; kvmPatchHash = "sha256-GzRLIXhzWL1NLvaGKcWVBCdvay1IxgJUE4koLX1ze7Y="; @@ -247,8 +247,8 @@ stdenv.mkDerivation (finalAttrs: { ++ optional enableKvm ( let patchVboxVersion = - # There is no updated patch for 7.1.10 yet, but the older one still applies. - if finalAttrs.virtualboxVersion == "7.1.10" then "7.1.6" else finalAttrs.virtualboxVersion; + # There is no updated patch for 7.1.12 yet, but the older one still applies. + if finalAttrs.virtualboxVersion == "7.1.12" then "7.1.6" else finalAttrs.virtualboxVersion; in fetchpatch { name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch"; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 3d771d975798..ffa0b896eda0 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -4,7 +4,7 @@ virtualbox, }: let - virtualboxExtPackVersion = "7.1.10"; + virtualboxExtPackVersion = "7.1.12"; in fetchurl rec { name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack"; @@ -14,7 +14,7 @@ fetchurl rec { # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS let - value = "e020755711849fa0ee23d3bc47bc90cb0ea595da7dda804499568a0dc2387989"; + value = "c7ed97f4755988ecc05ec633475e299bbc1e0418cc3d143747a45c99df53abd3"; in assert (builtins.stringLength value) == 64; value; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index d78248dbb752..f0b46ad56772 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -5,7 +5,7 @@ }: fetchurl { url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso"; - sha256 = "59c92f7f5fd7e081211e989f5117fc53ad8d8800ad74a01b21e97bb66fe62972"; + sha256 = "256883e2eabf7ab5c10fb3b6831c294942ce34bc615807f9d0cf6c3d2e882236"; meta = { description = "Guest additions ISO for VirtualBox"; longDescription = '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 3d8cbf6fe5f3..3d69d726dbe5 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,9 +12,9 @@ libX11, }: let - virtualboxVersion = "7.1.10"; + virtualboxVersion = "7.1.12"; virtualboxSubVersion = ""; - virtualboxSha256 = "7d60010a4c9102613554b46f61d17b825c30ee59d8be071e52d8aac664ca9869"; + virtualboxSha256 = "6f9618f39168898134975f51df7c2d6d5129c0aa82b6ae11cf47f920c70df276"; virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { inherit virtualboxVersion virtualboxSubVersion virtualboxSha256; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix index da2b2cbd51af..8cd3353bfcd1 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix @@ -1,4 +1,5 @@ { + config, lib, callPackage, pkg-config, @@ -28,12 +29,12 @@ let { hypr-dynamic-cursors = import ./hypr-dynamic-cursors.nix; } { hyprfocus = import ./hyprfocus.nix; } { hyprgrass = import ./hyprgrass.nix; } - { - hyprscroller = throw "hyprlandPlugins.hyprscroller has been removed as the upstream project is deprecated. Consider using `hyprlandPlugins.hyprscrolling`."; - } # Added 2025-05-09 { hyprspace = import ./hyprspace.nix; } { hyprsplit = import ./hyprsplit.nix; } (import ./hyprland-plugins.nix) + (lib.optionalAttrs config.allowAliases { + hyprscroller = throw "hyprlandPlugins.hyprscroller has been removed as the upstream project is deprecated. Consider using `hyprlandPlugins.hyprscrolling`."; # Added 2025-05-09 + }) ]; in (lib.mapAttrs (name: plugin: callPackage plugin { inherit mkHyprlandPlugin; }) plugins) diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index dd64a987ed39..768f067397bd 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text"; + description = "A bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text"; homepage = "https://github.com/meskarune/i3lock-fancy"; maintainers = [ maintainers.reedrw ]; mainProgram = "i3lock-fancy"; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index eecaacbd6fea..ad4adaee5e29 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -728,12 +728,7 @@ stdenvNoCC.mkDerivation { '' # GCC NG friendly libc++ + optionalString (libcxx != null && libcxx.isGNU or false) '' - for dir in ${getDev libcxx}/include/c++/*; do - echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags - done - for dir in ${getDev libcxx}/include/c++/*/${targetPlatform.config}; do - echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags - done + echo "-isystem ${getDev libcxx}/include" >> $out/nix-support/libcxx-cxxflags '' ## diff --git a/pkgs/by-name/_9/_9base/package.nix b/pkgs/by-name/_9/_9base/package.nix index cc2410ed3cdb..4153315e04e3 100644 --- a/pkgs/by-name/_9/_9base/package.nix +++ b/pkgs/by-name/_9/_9base/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { meta = { homepage = "https://tools.suckless.org/9base/"; - description = "9base is a port of various original Plan 9 tools for Unix, based on plan9port"; + description = "Port of various original Plan 9 tools for Unix, based on plan9port"; longDescription = '' 9base is a port of various original Plan 9 tools for Unix, based on plan9port. It also contains the Plan 9 libc, libbio, libregexp, libfmt and libutf. diff --git a/pkgs/by-name/ab/ablog/package.nix b/pkgs/by-name/ab/ablog/package.nix index 624519d60a04..0de007d45673 100644 --- a/pkgs/by-name/ab/ablog/package.nix +++ b/pkgs/by-name/ab/ablog/package.nix @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec { passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = { - description = "ABlog for blogging with Sphinx"; + description = "Sphinx extension that converts any documentation or personal website project into a full-fledged blog"; mainProgram = "ablog"; homepage = "https://ablog.readthedocs.io/en/latest/"; license = lib.licenses.mit; diff --git a/pkgs/by-name/ad/adif-multitool/package.nix b/pkgs/by-name/ad/adif-multitool/package.nix index e9dcc76b0675..b2e8b0d65924 100644 --- a/pkgs/by-name/ad/adif-multitool/package.nix +++ b/pkgs/by-name/ad/adif-multitool/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { }; meta = with lib; { - description = "Command-line program for working with ham logfiles."; + description = "Command-line program for working with ham logfiles"; homepage = "https://github.com/flwyd/adif-multitool"; license = licenses.asl20; maintainers = with maintainers; [ mafo ]; diff --git a/pkgs/by-name/ad/adms/package.nix b/pkgs/by-name/ad/adms/package.nix index 2602b900e244..97df479bd0bb 100644 --- a/pkgs/by-name/ad/adms/package.nix +++ b/pkgs/by-name/ad/adms/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-maintainer-mode" ]; meta = { - description = "automatic device model synthesizer"; + description = "Automatic device model synthesizer"; homepage = "https://github.com/Qucs/adms"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ disassembler ]; diff --git a/pkgs/by-name/ae/aeolus-stops/package.nix b/pkgs/by-name/ae/aeolus-stops/package.nix index c4ba2f341231..ad53cee02e76 100644 --- a/pkgs/by-name/ae/aeolus-stops/package.nix +++ b/pkgs/by-name/ae/aeolus-stops/package.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = with lib; { - description = "aeolus synthesizer instrument definitions"; + description = "Aeolus synthesizer instrument definitions"; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/by-name/ag/agola/package.nix b/pkgs/by-name/ag/agola/package.nix index d7745fd80f51..a34500fa7e3f 100644 --- a/pkgs/by-name/ag/agola/package.nix +++ b/pkgs/by-name/ag/agola/package.nix @@ -35,7 +35,7 @@ buildGoModule { doCheck = false; meta = with lib; { - description = "Agola: CI/CD Redefined"; + description = "CI/CD Redefined"; homepage = "https://agola.io"; maintainers = with maintainers; [ happysalada ]; license = licenses.mit; diff --git a/pkgs/by-name/ai/aiac/package.nix b/pkgs/by-name/ai/aiac/package.nix index 34767642b9cd..ffa316e45412 100644 --- a/pkgs/by-name/ai/aiac/package.nix +++ b/pkgs/by-name/ai/aiac/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { ]; meta = with lib; { - description = ''Artificial Intelligence Infrastructure-as-Code Generator.''; + description = ''Artificial Intelligence Infrastructure-as-Code Generator''; mainProgram = "aiac"; homepage = "https://github.com/gofireflyio/aiac/"; license = licenses.asl20; diff --git a/pkgs/by-name/al/allure/package.nix b/pkgs/by-name/al/allure/package.nix index 8220348a55c5..d3168ee1aed9 100644 --- a/pkgs/by-name/al/allure/package.nix +++ b/pkgs/by-name/al/allure/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://allurereport.org/"; - description = "Allure Report is a flexible, lightweight multi-language test reporting tool"; + description = "Flexible, lightweight multi-language test reporting tool"; longDescription = '' Allure Report is a flexible, lightweight multi-language test reporting tool providing clear graphical reports and allowing everyone involved diff --git a/pkgs/by-name/al/almo/package.nix b/pkgs/by-name/al/almo/package.nix index b9b9480d9ea1..818dec23a5ef 100644 --- a/pkgs/by-name/al/almo/package.nix +++ b/pkgs/by-name/al/almo/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "ALMO is markdown parser and static site generator"; + description = "Markdown parser and static site generator"; license = lib.licenses.mit; platforms = lib.platforms.all; homepage = "https://github.com/abap34/almo"; 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 b7e8f5f326b6..fb634fa5195e 100644 --- a/pkgs/by-name/al/alsa-lib-with-plugins/package.nix +++ b/pkgs/by-name/al/alsa-lib-with-plugins/package.nix @@ -16,7 +16,7 @@ in runCommand "${alsa-lib.pname}-${alsa-lib.version}" { meta = with lib; { - description = "wrapper to ease access to ALSA plugins"; + description = "Wrapper to ease access to ALSA plugins"; mainProgram = "aserver"; platforms = platforms.linux; maintainers = with maintainers; [ gm6k ]; diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix index 77899800d3a5..c017b876a5d4 100644 --- a/pkgs/by-name/al/alvr/package.nix +++ b/pkgs/by-name/al/alvr/package.nix @@ -40,18 +40,18 @@ rustPlatform.buildRustPackage rec { pname = "alvr"; - version = "20.14.0"; + version = "20.14.1"; src = fetchFromGitHub { owner = "alvr-org"; repo = "ALVR"; tag = "v${version}"; fetchSubmodules = true; # TODO devendor openvr - hash = "sha256-K1E8zeSjaUtJ17C9G+aKNw9bzKUzeezUunZc0MM1Rj4="; + hash = "sha256-9fckUhUPAbcmbqOdUO8RlwuK8/nf1fc7XQBrAu5YaR4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-GeI6YlpTa89W6dYmK/1Hq73R0QX67va9zL1UIyfwcv0="; + cargoHash = "sha256-OTCMWrlwnfpUhm6ssOE133e/3DaQFnOU+NunN2c1N+g="; patches = [ (replaceVars ./fix-finding-libs.patch { diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix index 8bf83fc95f20..09ad0be5e158 100644 --- a/pkgs/by-name/an/ansible-doctor/package.nix +++ b/pkgs/by-name/an/ansible-doctor/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "ansible-doctor"; - version = "7.0.8"; + version = "7.0.9"; pyproject = true; src = fetchFromGitHub { owner = "thegeeklab"; repo = "ansible-doctor"; tag = "v${version}"; - hash = "sha256-BwmmAd1mmyGQ5QQo6uS3+JmPP9kmZe2OOBDNAKFqEl0="; + hash = "sha256-d7KPn+nCrGEYE9lzfV3+Fl8MDUq8x5S8MPKrwX8XZ5w="; }; build-system = with python3Packages; [ @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { description = "Annotation based documentation for your Ansible roles"; mainProgram = "ansible-doctor"; homepage = "https://github.com/thegeeklab/ansible-doctor"; - changelog = "https://github.com/thegeeklab/ansible-doctor/releases/tag/v${version}"; + changelog = "https://github.com/thegeeklab/ansible-doctor/releases/tag/${src.tag}"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ tboerger ]; }; diff --git a/pkgs/by-name/an/antimatter-dimensions/package.nix b/pkgs/by-name/an/antimatter-dimensions/package.nix index 13fec89df4df..1b32d06b5b7a 100644 --- a/pkgs/by-name/an/antimatter-dimensions/package.nix +++ b/pkgs/by-name/an/antimatter-dimensions/package.nix @@ -74,7 +74,7 @@ buildNpmPackage rec { meta = { homepage = "https://github.com/IvarK/AntimatterDimensionsSourceCode"; - description = "Idle incremental game with multiple prestige layers."; + description = "Idle incremental game with multiple prestige layers"; license = lib.licenses.mit; mainProgram = "antimatter-dimensions"; maintainers = with lib.maintainers; [ amozeo ]; diff --git a/pkgs/by-name/an/antonio-font/package.nix b/pkgs/by-name/an/antonio-font/package.nix index 1c15c06105ab..fb34f0e942a9 100644 --- a/pkgs/by-name/an/antonio-font/package.nix +++ b/pkgs/by-name/an/antonio-font/package.nix @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation { meta = { homepage = "https://github.com/vernnobile/antonioFont"; - description = "condensed, sans serif font for larger display, headline & banner use, based on Anton"; + description = "Condensed, sans serif font for larger display, headline & banner use, based on Anton"; longDescription = '' Antonio is a ‘refined’ version of the Anton Font. Anton is a single weight web font, designed specifically for larger display, headline and diff --git a/pkgs/by-name/an/anyk/package.nix b/pkgs/by-name/an/anyk/package.nix index 7120b96043fe..82c8dc8b8afe 100644 --- a/pkgs/by-name/an/anyk/package.nix +++ b/pkgs/by-name/an/anyk/package.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "Tool for filling forms for the Hungarian government,"; + description = "Tool for filling forms for the Hungarian government"; longDescription = '' Official tool for filling Hungarian government forms. diff --git a/pkgs/by-name/ap/apache-orc/package.nix b/pkgs/by-name/ap/apache-orc/package.nix index b84a8d71e6a4..d48b2dfaee33 100644 --- a/pkgs/by-name/ap/apache-orc/package.nix +++ b/pkgs/by-name/ap/apache-orc/package.nix @@ -44,12 +44,20 @@ stdenv.mkDerivation (finalAttrs: { zstd ]; - cmakeFlags = [ - (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") - (lib.cmakeBool "BUILD_JAVA" false) - (lib.cmakeBool "STOP_BUILD_ON_WARNING" true) - (lib.cmakeBool "INSTALL_VENDORED_LIBS" false) - ]; + cmakeFlags = + [ + (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") + (lib.cmakeBool "BUILD_JAVA" false) + (lib.cmakeBool "STOP_BUILD_ON_WARNING" true) + (lib.cmakeBool "INSTALL_VENDORED_LIBS" false) + ] + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + # Fix (RiscV) cross-compilation + # See https://github.com/apache/orc/issues/2334 + (lib.cmakeFeature "HAS_PRE_1970_EXITCODE" "0") + (lib.cmakeFeature "HAS_POST_2038_EXITCODE" "0") + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-unused-parameter") + ]; env = { GTEST_HOME = gtest.dev; diff --git a/pkgs/by-name/ap/applgrid/package.nix b/pkgs/by-name/ap/applgrid/package.nix index 66353890cda8..1eaba97039ec 100644 --- a/pkgs/by-name/ap/applgrid/package.nix +++ b/pkgs/by-name/ap/applgrid/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "APPLgrid project provides a fast and flexible way to reproduce the results of full NLO calculations with any input parton distribution set in only a few milliseconds rather than the weeks normally required to gain adequate statistics"; + description = "Fast and flexible way to reproduce the results of full NLO calculations with any input parton distribution set in only a few milliseconds rather than the weeks normally required to gain adequate statistics"; license = licenses.gpl3; homepage = "http://applgrid.hepforge.org"; platforms = platforms.unix; diff --git a/pkgs/by-name/ar/artisan/package.nix b/pkgs/by-name/ar/artisan/package.nix index e0a21953d456..a0366a98acb4 100644 --- a/pkgs/by-name/ar/artisan/package.nix +++ b/pkgs/by-name/ar/artisan/package.nix @@ -6,11 +6,11 @@ }: let pname = "artisan"; - version = "3.1.4"; + version = "3.2.0"; src = fetchurl { url = "https://github.com/artisan-roaster-scope/artisan/releases/download/v${version}/${pname}-linux-${version}.AppImage"; - hash = "sha256-GU9DCAIMioPRUC1IDu8SbhD802pWEH7MlALnQH+Y4oU="; + hash = "sha256-p8M9Z0z/0unJPOLXVOnN8INO4v0D5Ojjug42xT77oqQ="; }; appimageContents = appimageTools.extract { @@ -30,7 +30,7 @@ appimageTools.wrapType2 { }; meta = { - description = "visual scope for coffee roasters"; + description = "Visual scope for coffee roasters"; homepage = "https://artisan-scope.org/"; changelog = "https://github.com/artisan-roaster-scope/artisan/releases/tag/v${version}"; downloadPage = "https://github.com/artisan-roaster-scope/artisan/releases"; diff --git a/pkgs/by-name/as/asciiquarium/package.nix b/pkgs/by-name/as/asciiquarium/package.nix index 229078c72041..54c4723e7cdf 100644 --- a/pkgs/by-name/as/asciiquarium/package.nix +++ b/pkgs/by-name/as/asciiquarium/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "Enjoy the mysteries of the sea from the safety of your own terminal!"; + description = "Enjoy the mysteries of the sea from the safety of your own terminal"; mainProgram = "asciiquarium"; homepage = "https://robobunny.com/projects/asciiquarium/html/"; license = licenses.gpl2; diff --git a/pkgs/by-name/as/astroterm/package.nix b/pkgs/by-name/as/astroterm/package.nix index f4f823bacab3..a6ccd3e7cb8b 100644 --- a/pkgs/by-name/as/astroterm/package.nix +++ b/pkgs/by-name/as/astroterm/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "astroterm"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "da-luce"; repo = "astroterm"; tag = "v${finalAttrs.version}"; - hash = "sha256-SQR5Q369LUtQum5a4f0/sy7GdPB8sBfn6mkAjxyTbg8="; + hash = "sha256-XSJq2M+rOZf18ueF1jjApOR140mkMZOm/IFzA7M5x4M="; }; bsc5File = fetchurl { diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix index 5572cb5167d8..746869c2269d 100644 --- a/pkgs/by-name/at/atlas/package.nix +++ b/pkgs/by-name/at/atlas/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "atlas"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; tag = "v${finalAttrs.version}"; - hash = "sha256-USA3PiZcOF39LK45Xu0Oq/GJi3URMxJpBrUXxIsEkCY="; + hash = "sha256-NmlE0Wr5A2tt0cWudOWxGgyYwqE4fmCeEU68yuQKARU="; }; modRoot = "cmd/atlas"; diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix index d9abc1f26746..35bf81405f93 100644 --- a/pkgs/by-name/au/auth0-cli/package.nix +++ b/pkgs/by-name/au/auth0-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "auth0-cli"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; tag = "v${version}"; - hash = "sha256-1OPoogvCA85Z4pmwnEgoLosh5QDVvFH7SnDArCx156s="; + hash = "sha256-iTtjjqONnSmOlaBHOq1SgsbNiKVSKCePg5CJfZs4r/4="; }; - vendorHash = "sha256-tIZz3iwY79r5B4b3GuEOd/j0RtviM4uf6v1ZMS6M+t4="; + vendorHash = "sha256-e5/9AA68p1byqwUOK5/t4L3WQ/td9BYiNfFDD5NbTeU="; ldflags = [ "-s" diff --git a/pkgs/by-name/au/auto-epp/package.nix b/pkgs/by-name/au/auto-epp/package.nix index 48655147f8e1..0fd79f325e39 100644 --- a/pkgs/by-name/au/auto-epp/package.nix +++ b/pkgs/by-name/au/auto-epp/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { mainProgram = "auto-epp"; homepage = "https://github.com/jothi-prasath/auto-epp"; - description = "Auto-epp (energy performance preference) for AMD processors when amd_pstate=active"; + description = "Energy performance preference tuner for AMD processors when amd_pstate=active"; platforms = platforms.linux; license = licenses.mit; maintainers = [ maintainers.lamarios ]; diff --git a/pkgs/by-name/au/autoraise/package.nix b/pkgs/by-name/au/autoraise/package.nix index 9f0f1a19aa86..769543e4e567 100644 --- a/pkgs/by-name/au/autoraise/package.nix +++ b/pkgs/by-name/au/autoraise/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "AutoRaise (and focus) a window when hovering over it with the mouse"; + description = "Automatically raise and focus a window when hovering over it with the mouse"; homepage = "https://github.com/sbmpost/AutoRaise"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ nickhu ]; diff --git a/pkgs/by-name/ba/bazel-kazel/package.nix b/pkgs/by-name/ba/bazel-kazel/package.nix index 9144af8cf614..8ccb3727d1f6 100644 --- a/pkgs/by-name/ba/bazel-kazel/package.nix +++ b/pkgs/by-name/ba/bazel-kazel/package.nix @@ -22,7 +22,7 @@ buildGoModule rec { subPackages = [ "cmd/kazel" ]; meta = with lib; { - description = "kazel - a BUILD file generator for go and bazel"; + description = "A BUILD file generator for go and bazel"; homepage = "https://github.com/kubernetes/repo-infra"; license = licenses.asl20; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/by-name/bd/bdt/package.nix b/pkgs/by-name/bd/bdt/package.nix index 7400c5d74d59..0d6146618a1b 100644 --- a/pkgs/by-name/bd/bdt/package.nix +++ b/pkgs/by-name/bd/bdt/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-TikWh0U56x3HKca5Dj68Z59mOgedv+K5r+y7/CcpWa8="; meta = with lib; { - description = "boring data tool. A CLI tool to query parquet, json and avro files"; + description = "CLI tool to query parquet, json and avro files"; homepage = "https://github.com/datafusion-contrib/bdt"; license = licenses.asl20; mainProgram = "bdt"; diff --git a/pkgs/by-name/be/beebeep/package.nix b/pkgs/by-name/be/beebeep/package.nix new file mode 100644 index 000000000000..42a6dd4dc932 --- /dev/null +++ b/pkgs/by-name/be/beebeep/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchzip, + autoPatchelfHook, + libsForQt5, +}: + +libsForQt5.mkDerivation rec { + pname = "beebeep"; + version = "5.8.6"; + + src = fetchzip { + url = "https://netix.dl.sourceforge.net/project/beebeep/Linux/beebeep-${version}-qt5-amd64.tar.gz"; + hash = "sha256-YDgFRXFBM1tjLP99mHYJadgccHJYYPAZ1kqR+FngLKU="; + }; + + nativeBuildInputs = [ + libsForQt5.wrapQtAppsHook + autoPatchelfHook + ]; + + buildInputs = with libsForQt5; [ + qtbase + qtmultimedia + qtx11extras + ]; + + installPhase = '' + mkdir -p $out/bin + cp * $out/bin + ''; + + meta = { + homepage = "https://www.beebeep.net/"; + description = "Free office messenger that is indispensable in all those places where privacy and security are an essential requirement"; + mainProgram = "beebeep"; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ mglolenstine ]; + }; +} diff --git a/pkgs/by-name/be/beeper-bridge-manager/package.nix b/pkgs/by-name/be/beeper-bridge-manager/package.nix index b8d391ff3a51..879143264f92 100644 --- a/pkgs/by-name/be/beeper-bridge-manager/package.nix +++ b/pkgs/by-name/be/beeper-bridge-manager/package.nix @@ -18,7 +18,7 @@ buildGoModule rec { vendorHash = "sha256-yTNUxwnulQ+WbHdQbeNDghH4RPXurQMIgKDyXfrMxG8="; meta = { - description = "Tool for running self-hosted bridges with the Beeper Matrix server."; + description = "Tool for running self-hosted bridges with the Beeper Matrix server"; homepage = "https://github.com/beeper/bridge-manager"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.heywoodlh ]; diff --git a/pkgs/by-name/be/bend/package.nix b/pkgs/by-name/be/bend/package.nix index 7f0c34b0fcc0..24e551ae6e59 100644 --- a/pkgs/by-name/be/bend/package.nix +++ b/pkgs/by-name/be/bend/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ''; meta = { - description = "Bend is a massively parallel, high-level programming language"; + description = "Massively parallel, high-level programming language"; homepage = "https://higherorderco.com/"; license = lib.licenses.asl20; mainProgram = "bend"; diff --git a/pkgs/by-name/be/betterlockscreen/package.nix b/pkgs/by-name/be/betterlockscreen/package.nix index ba1fce2551e0..eb0dec9f184d 100644 --- a/pkgs/by-name/be/betterlockscreen/package.nix +++ b/pkgs/by-name/be/betterlockscreen/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Fast and sweet looking lockscreen for linux systems with effects!"; + description = "Fast and sweet looking lockscreen for linux systems with effects"; homepage = "https://github.com/betterlockscreen/betterlockscreen"; mainProgram = "betterlockscreen"; license = licenses.mit; diff --git a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix index c8a82da9e1b1..c1866ff4759b 100644 --- a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix +++ b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "bign-handheld-thumbnailer"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "MateusRodCosta"; repo = "bign-handheld-thumbnailer"; tag = "v${version}"; - hash = "sha256-DJbJ4l1QqaEuBI5lja3iCEq0QnlAgwPXg2N4MBPBvUY="; + hash = "sha256-qS1bKEkZPmNMfiLUZVlx8EAXMMYCcGGTTZFhWwlZ3gQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-cnl8H4+rqIS0sfwq+breJSuabX3vT16xLtaVnK96Q/4="; + cargoHash = "sha256-LyT0HDR51/bYnXtavgtff1nCKuJn41UmZuH/uJmykkk="; strictDeps = true; diff --git a/pkgs/by-name/bi/bigquery-emulator/package.nix b/pkgs/by-name/bi/bigquery-emulator/package.nix index 7f47611c10c5..b0bdc2b54223 100644 --- a/pkgs/by-name/bi/bigquery-emulator/package.nix +++ b/pkgs/by-name/bi/bigquery-emulator/package.nix @@ -34,7 +34,7 @@ buildGoModule.override doCheck = false; meta = { - description = "BigQuery emulator server implemented in Go."; + description = "BigQuery emulator server implemented in Go"; homepage = "https://github.com/goccy/bigquery-emulator"; changelog = "https://github.com/goccy/pname/releases/tag/v${version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/bi/bikeshed/package.nix b/pkgs/by-name/bi/bikeshed/package.nix index 934393647bef..d71596af980a 100644 --- a/pkgs/by-name/bi/bikeshed/package.nix +++ b/pkgs/by-name/bi/bikeshed/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "bikeshed"; - version = "5.3.2"; + version = "5.3.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-+TY26g685eIMXUjTG876r9gryg/tR6EtMGWAhk2kkis="; + hash = "sha256-hHLodlbHuDRXCR8GlTwSvaryOENPCiHgFj3S1hpApA8="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/bi/bindle/package.nix b/pkgs/by-name/bi/bindle/package.nix index 55f780753af1..5447b8dd57fa 100644 --- a/pkgs/by-name/bi/bindle/package.nix +++ b/pkgs/by-name/bi/bindle/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "Bindle: Aggregate Object Storage"; + description = "Object Storage for Collections"; homepage = "https://github.com/deislabs/bindle"; license = licenses.asl20; maintainers = [ ]; diff --git a/pkgs/by-name/bl/blackfire/package.nix b/pkgs/by-name/bl/blackfire/package.nix index ba4cb0c49709..cbf5e5d26ee3 100644 --- a/pkgs/by-name/bl/blackfire/package.nix +++ b/pkgs/by-name/bl/blackfire/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.28"; + version = "2.28.29"; src = passthru.sources.${stdenv.hostPlatform.system} @@ -60,23 +60,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "luMpquZCnK6eFffPLoHNt7XUyBgJNqzeNkC4mhdYVqQ="; + sha256 = "WIL8Y2pQq9vYuSI2fq2+T21HvjAd6PJPWKi4phKB5pw="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "K8/AYVpz25Pwe4Vf1sxwYd/l6yu6hgG/LETbiH1VxgQ="; + sha256 = "hcTVPb1zGrR3C1b5F2bgIzwH/lZV0ujeERNx0qt00Pc="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "COXdRnO0PAV1XbpK6VusBSiwMkP/WAfDfBDRGDpF2OY="; + sha256 = "7Qs47SjAhsOAIcCCCJk7jjDD1ab7CyjbPHfXl25z9mE="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "WZsF4SJ3BinPx9hhSG4Bi028qXUQXjdtqf2j/0/FN1w="; + sha256 = "v4ApyuA9kMfqZAGVXPSSJJS0fm9lP2zz0iD8lf9VGa0="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "l19yB2cA7JK7oUl4MnxLKoqA8RFD1KLq/NXsAkWmxFQ="; + sha256 = "t78kpafSfbCA/0Kzhn/+/wjAet2qne33CYqFvRT0XUM="; }; }; @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "Blackfire Profiler agent and client"; + description = "Profiler agent and client"; homepage = "https://blackfire.io/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; diff --git a/pkgs/by-name/bl/blaze/package.nix b/pkgs/by-name/bl/blaze/package.nix index 4a0ecbbdd965..4b0568307701 100644 --- a/pkgs/by-name/bl/blaze/package.nix +++ b/pkgs/by-name/bl/blaze/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "high performance C++ math library"; + description = "High performance C++ math library"; homepage = "https://bitbucket.org/blaze-lib/blaze"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ Madouura ]; diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 7cf4b1a96a6d..d5c20f992107 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -15,6 +15,7 @@ dbus, embree, fetchzip, + fetchFromGitHub, ffmpeg, fftw, fftwFloat, @@ -48,6 +49,7 @@ libxkbcommon, llvmPackages, makeWrapper, + manifold, mesa, nix-update-script, openUsdSupport ? !stdenv.hostPlatform.isDarwin, @@ -72,7 +74,7 @@ spaceNavSupport ? stdenv.hostPlatform.isLinux, sse2neon, stdenv, - tbb, + tbb_2022, vulkan-headers, vulkan-loader, wayland, @@ -100,26 +102,27 @@ let patches = (old.patches or [ ]) ++ [ ./libdecor.patch ]; }); - optix = fetchzip { - # Look at upstream Blender BuildBot logs to determine the current version, - # see Git blame here for historical details - url = "https://developer.download.nvidia.com/redist/optix/v7.4/OptiX-7.4.0-Include.zip"; - hash = "sha256-ca08XetwaUYC9foeP5bff9kcDfuFgEzopvjspn2s8RY="; + # See build_files/config/pipeline_config.yaml in upstream source for version + optix = fetchFromGitHub { + owner = "NVIDIA"; + repo = "optix-dev"; + tag = "v8.0.0"; + hash = "sha256-SXkXZHzQH8JOkXypjjxNvT/lUlWZkCuhh6hNCHE7FkY="; }; + + tbb = tbb_2022; in stdenv'.mkDerivation (finalAttrs: { pname = "blender"; - version = "4.4.3"; + version = "4.5.0"; src = fetchzip { name = "source"; url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; - hash = "sha256-vHDOKI7uqB5EbdRu711axBuYX1zM746E6GvK2Nl5hZg="; + hash = "sha256-ERT/apulQ9ogA7Uk/AfjBee0rLjxEXItw6GwDOoysXk="; }; - patches = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; - postPatch = (lib.optionalString stdenv.hostPlatform.isDarwin '' : > build_files/cmake/platform/platform_apple_xcode.cmake @@ -247,13 +250,14 @@ stdenv'.mkDerivation (finalAttrs: { libsndfile libtiff libwebp + (manifold.override { tbb_2021 = tbb; }) opencolorio openexr openimageio_2 openjpeg - openpgl + (openpgl.override { inherit tbb; }) (opensubdiv.override { inherit cudaSupport; }) - openvdb + (openvdb.override { inherit tbb; }) potrace pugixml python3 @@ -263,7 +267,7 @@ stdenv'.mkDerivation (finalAttrs: { zstd ] ++ lib.optional embreeSupport embree - ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; }) + ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport tbb; }) ++ ( if (!stdenv.hostPlatform.isDarwin) then [ @@ -419,6 +423,7 @@ stdenv'.mkDerivation (finalAttrs: { }; meta = { + broken = stdenv.hostPlatform.isDarwin; description = "3D Creation/Animation/Publishing System"; homepage = "https://www.blender.org"; # They comment two licenses: GPLv2 and Blender License, but they diff --git a/pkgs/by-name/bl/blobby/package.nix b/pkgs/by-name/bl/blobby/package.nix index abc10a1c32d3..ce2b8ce56e0b 100644 --- a/pkgs/by-name/bl/blobby/package.nix +++ b/pkgs/by-name/bl/blobby/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "Blobby volleyball game"; + description = "Volleyball game"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/by-name/bl/bluesnooze/package.nix b/pkgs/by-name/bl/bluesnooze/package.nix index 7fa0017646c4..58986d418627 100644 --- a/pkgs/by-name/bl/bluesnooze/package.nix +++ b/pkgs/by-name/bl/bluesnooze/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "Bluesnooze prevents your sleeping Mac from connecting to Bluetooth accessories"; + description = "Prevents your sleeping Mac from connecting to Bluetooth accessories"; homepage = "https://github.com/odlp/bluesnooze"; changelog = "https://github.com/odlp/bluesnooze/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/bu/bumblebee/package.nix b/pkgs/by-name/bu/bumblebee/package.nix index cfffcec882f6..142ba0523280 100644 --- a/pkgs/by-name/bu/bumblebee/package.nix +++ b/pkgs/by-name/bu/bumblebee/package.nix @@ -35,8 +35,7 @@ pkgsi686Linux, virtualgl, libglvnd, - automake111x, - autoconf, + autoreconfHook, # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. # TODO: Confusing. Perhaps use "SubArch" instead of i686? @@ -124,10 +123,6 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - # Don't use a special group, just reuse wheel. - substituteInPlace configure \ - --replace 'CONF_GID="bumblebee"' 'CONF_GID="wheel"' - # Apply configuration options substituteInPlace conf/xorg.conf.nvidia \ --subst-var nvidiaDeviceOptions @@ -148,8 +143,7 @@ stdenv.mkDerivation rec { makeWrapper pkg-config help2man - automake111x - autoconf + autoreconfHook ]; # The order of LDPATH is very specific: First X11 then the host @@ -162,6 +156,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-udev-rules=$out/lib/udev/rules.d" + # Don't use a special group, just reuse wheel. + "CONF_GID=wheel" # see #10282 #"CONF_PRIMUS_LD_PATH=${primusLibs}" ] diff --git a/pkgs/by-name/bu/burp/package.nix b/pkgs/by-name/bu/burp/package.nix index a37ca2faac41..4190bb458b6a 100644 --- a/pkgs/by-name/bu/burp/package.nix +++ b/pkgs/by-name/bu/burp/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { installFlags = [ "localstatedir=/tmp" ]; meta = with lib; { - description = "BURP - BackUp and Restore Program"; + description = "BackUp and Restore Program"; homepage = "https://burp.grke.org"; license = licenses.agpl3Plus; maintainers = with maintainers; [ arjan-s ]; diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 42f9aeec2039..e864859d2497 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "2.6.2"; + version = "2.7.0"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-cli-v${version}"; - hash = "sha256-QdboIHbRKC/0k6FGKDuCA7AR3eIa7KVij3fGekD9kNk="; + hash = "sha256-nEt4xoVHozqxWnyrXTn7XDgH2HYCzrfqBgt71+goYms="; }; useFetchCargoVendor = true; - cargoHash = "sha256-GFqUQLLURfm6sRpf4MwAp89aKpTwWIlxk3NNRf9QgC0="; + cargoHash = "sha256-av5UF0MgKnTwEX4dHhekvj2tz/BOZyUbs1YqLwx28Cw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix index 67d17cece65c..865aa902dc46 100644 --- a/pkgs/by-name/ca/cargo-tauri/test-app.nix +++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { ; fetcherVersion = 1; - hash = "sha256-plANa/+9YEQ4ipgdQ7QzPyxgz6eDCBhO7qFlxK6Ab58="; + hash = "sha256-I++iYwqSxACmXFvfPYAnY/0WSWSY6ElJYnylJDC03D8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/catppuccinifier-cli/package.nix b/pkgs/by-name/ca/catppuccinifier-cli/package.nix index eff6c9216011..fd88679c353e 100644 --- a/pkgs/by-name/ca/catppuccinifier-cli/package.nix +++ b/pkgs/by-name/ca/catppuccinifier-cli/package.nix @@ -4,21 +4,21 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "catppuccinifier-cli"; - version = "8.0.0"; + version = "9.0.0"; src = fetchFromGitHub { owner = "lighttigerXIV"; repo = "catppuccinifier"; - rev = version; - hash = "sha256-CEjdCr7QgyQw+1VmeEyt95R0HKE0lAKZHrwahaxgJoU="; + tag = finalAttrs.version; + hash = "sha256-YlHb8gueKyXB2JJeRJmo8oFLOeYcmthup4n4BkEHNTA="; }; - sourceRoot = "${src.name}/src/catppuccinifier-cli"; + sourceRoot = "${finalAttrs.src.name}/src/catppuccinifier-cli"; useFetchCargoVendor = true; - cargoHash = "sha256-oFY07E31ZFy4AphqDCqL6BAhUNQtakHmLwER1RsAE7o="; + cargoHash = "sha256-mIzRK4rqD8ON8LqkG3QhOseZLM5+Rr1Rhj1uuu+KRMI="; meta = { description = "Apply catppuccin flavors to your wallpapers"; @@ -31,4 +31,4 @@ rustPlatform.buildRustPackage rec { ]; platforms = with lib.platforms; linux ++ windows; }; -} +}) diff --git a/pkgs/by-name/ca/catppuccinifier-gui/package.nix b/pkgs/by-name/ca/catppuccinifier-gui/package.nix index 7c3c44b13791..875a74173a2c 100644 --- a/pkgs/by-name/ca/catppuccinifier-gui/package.nix +++ b/pkgs/by-name/ca/catppuccinifier-gui/package.nix @@ -11,7 +11,7 @@ libsoup_2_4, fetchzip, openssl_3, - webkitgtk_4_0, + webkitgtk_4_1, gdk-pixbuf, pkg-config, makeDesktopItem, @@ -19,15 +19,15 @@ autoPatchelfHook, }: let - version = "8.0.0"; + version = "9.0.0"; in stdenv.mkDerivation { pname = "catppuccinifier-gui"; inherit version; src = fetchzip { - url = "https://github.com/lighttigerXIV/catppuccinifier/releases/download/${version}/Catppuccinifer-Linux-${version}.zip"; - hash = "sha256-fG6YhLsjvMUIWsOnm+GSOh6LclCAISPSRiDQdWLlAR4="; + url = "https://github.com/lighttigerXIV/catppuccinifier/releases/download/${version}/Catppuccinifer-Linux-${version}.tar.xz"; + hash = "sha256-FtsO+3C5Ll1aYYCuohrPI2IQZsLyvBseXPzfK1sQgNc="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation { buildInputs = [ curl wget - webkitgtk_4_0 + webkitgtk_4_1 gtk3 cairo gdk-pixbuf diff --git a/pkgs/by-name/cf/cfripper/package.nix b/pkgs/by-name/cf/cfripper/package.nix index c2c3c6681c09..6f99054e4fc8 100644 --- a/pkgs/by-name/cf/cfripper/package.nix +++ b/pkgs/by-name/cf/cfripper/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.17.2"; + version = "1.18.0"; pyproject = true; src = fetchFromGitHub { owner = "Skyscanner"; repo = "cfripper"; tag = "v${version}"; - hash = "sha256-HhgOpjqWtnwx9u6EsDr/ba0g3lAmEi/slXQnBqu3h3Y="; + hash = "sha256-9cnOy7XBN3BRjUh6ST9RsKpAPJ8wrzJHtKMKhp7sg1g="; }; pythonRelaxDeps = [ diff --git a/pkgs/games/chessx/default.nix b/pkgs/by-name/ch/chessx/package.nix similarity index 74% rename from pkgs/games/chessx/default.nix rename to pkgs/by-name/ch/chessx/package.nix index e76cccc68532..94d6f8c7c8fe 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/by-name/ch/chessx/package.nix @@ -3,14 +3,9 @@ lib, pkg-config, zlib, - qtbase, - qtsvg, - qttools, - qtmultimedia, - qmake, fetchpatch, fetchurl, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation (finalAttrs: { @@ -22,19 +17,25 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-76YOe1WpB+vdEoEKGTHeaWJLpCVE4RoyYu1WLy3Dxhg="; }; - nativeBuildInputs = [ - pkg-config - qmake - wrapQtAppsHook - ]; + nativeBuildInputs = + [ + pkg-config + ] + ++ (with libsForQt5; [ + qmake + wrapQtAppsHook + ]); - buildInputs = [ - qtbase - qtmultimedia - qtsvg - qttools - zlib - ]; + buildInputs = + [ + zlib + ] + ++ (with libsForQt5; [ + qtbase + qtmultimedia + qtsvg + qttools + ]); patches = # needed to backport patches to successfully build, due to broken release @@ -63,12 +64,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://chessx.sourceforge.io/"; description = "Browse and analyse chess games"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ luispedro ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ luispedro ]; + platforms = lib.platforms.linux; mainProgram = "chessx"; }; }) diff --git a/pkgs/by-name/co/conduktor-ctl/package.nix b/pkgs/by-name/co/conduktor-ctl/package.nix index 01b207189c3d..c79ad89eb0ac 100644 --- a/pkgs/by-name/co/conduktor-ctl/package.nix +++ b/pkgs/by-name/co/conduktor-ctl/package.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "conduktor-ctl"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "conduktor"; repo = "ctl"; rev = "refs/tags/v${version}"; - hash = "sha256-czKQQT/9w2r8BDIP8aqeAG7B0Yk+HmpjgolovHxSlTM="; + hash = "sha256-o2Pf8ytPQlnZ68K690a6TDoi4mQthYwCXgfPqNiqako="; }; vendorHash = "sha256-kPCBzLU6aH6MNlKZcKKFcli99ZmdOtPV5+5gxPs5GH4="; diff --git a/pkgs/by-name/co/cosign/package.nix b/pkgs/by-name/co/cosign/package.nix index 52de7fc557cd..30556885da1d 100644 --- a/pkgs/by-name/co/cosign/package.nix +++ b/pkgs/by-name/co/cosign/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "cosign"; - version = "2.5.0"; + version = "2.5.3"; src = fetchFromGitHub { owner = "sigstore"; repo = "cosign"; rev = "v${finalAttrs.version}"; - hash = "sha256-QvU+JpIcE9EX+ehRWvs2bS2VGgGVekNX8f5+mITIwU0="; + hash = "sha256-EpCG20SSZFNc/oMgyUP/oARNTrpkzNsTvsA0Wx+zI00="; }; buildInputs = lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite); @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { installShellFiles ]; - vendorHash = "sha256-qIi+Pp4XZg1GxOhM9fCyD9rPaIiQHhoQudB50gzWgrM="; + vendorHash = "sha256-YwSi1TqtcGE1sV9NLJ3lxA8kk0gL+9kTgcJzvIJRanE="; subPackages = [ "cmd/cosign" @@ -50,14 +50,21 @@ buildGoModule (finalAttrs: { preCheck = '' # test all paths unset subPackages - - rm pkg/cosign/ctlog_test.go # Require network access - rm pkg/cosign/tlog_test.go # Require network access - rm cmd/cosign/cli/verify/verify_test.go # Require network access - rm cmd/cosign/cli/verify/verify_blob_attestation_test.go # Require network access - rm cmd/cosign/cli/verify/verify_blob_test.go # Require network access ''; + checkFlags = + let + # Skip tests that require network access + skippedTests = [ + "TestLoadCertsKeylessVerification/default_fulcio" + "TestGetCTLogPubKeys" + "TestGetRekorPubKeys" + "TestVerifyEmbeddedSCT" + "TestValidateAndUnpackCertWithSCT" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cosign \ --bash <($out/bin/cosign completion bash) \ diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index bfd11d3ae64e..78d8e6218267 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + runCommand, # nativeBuildInputs cmake, @@ -12,6 +13,7 @@ perl, pkg-config, wrapGAppsHook3, + saxon, # buildInputs SDL2, @@ -52,7 +54,6 @@ libtiff, libwebp, libxml2, - libxslt, lua, util-linux, openexr, @@ -79,6 +80,17 @@ gitUpdater, }: +let + # Create a wrapper for saxon to provide saxon-xslt command + saxon-xslt = runCommand "saxon-xslt" { } '' + mkdir -p $out/bin + cat > $out/bin/saxon-xslt << 'EOF' + #!/bin/sh + exec ${saxon}/bin/saxon "$@" + EOF + chmod +x $out/bin/saxon-xslt + ''; +in stdenv.mkDerivation rec { version = "5.2.0"; pname = "darktable"; @@ -97,6 +109,7 @@ stdenv.mkDerivation rec { perl pkg-config wrapGAppsHook3 + saxon-xslt # Use Saxon instead of libxslt to fix XSLT generate-id() consistency issues ]; buildInputs = @@ -120,7 +133,7 @@ stdenv.mkDerivation rec { lensfun lerc libaom - libavif + #libavif # TODO re-enable once cmake files are fixed (#425306) libdatrie libepoxy libexif @@ -138,7 +151,6 @@ stdenv.mkDerivation rec { libtiff libwebp libxml2 - libxslt lua openexr openjpeg diff --git a/pkgs/by-name/da/daytona-bin/package.nix b/pkgs/by-name/da/daytona-bin/package.nix deleted file mode 100644 index d04b4f972fe9..000000000000 --- a/pkgs/by-name/da/daytona-bin/package.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchurl, - makeWrapper, -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "daytona-bin"; - version = "0.12.0"; - - src = - let - urls = { - "x86_64-linux" = { - url = "https://download.daytona.io/daytona/v${finalAttrs.version}/daytona-linux-amd64"; - hash = "sha256-5nUWeIAKUSrbEAzo1SCSrebKvt2DKB/f2JZZ9c2vjxA="; - }; - "x86_64-darwin" = { - url = "https://download.daytona.io/daytona/v${finalAttrs.version}/daytona-darwin-amd64"; - hash = "sha256-JAc9EbuZnRCX2v1UXPBF8mlqz478DtrVEk6XEICW7CU="; - }; - "aarch64-linux" = { - url = "https://download.daytona.io/daytona/v${finalAttrs.version}/daytona-linux-arm64"; - hash = "sha256-1yy3S4JRtabQBK9LzepL+CVaj+3HPuG6oJe4YdbEi6E="; - }; - "aarch64-darwin" = { - url = "https://download.daytona.io/daytona/v${finalAttrs.version}/daytona-darwin-arm64"; - hash = "sha256-x5RVx5X2PD1Yu0g0umf2ywRymqa+1EFCzuXFEVSQImw="; - }; - }; - in - fetchurl ( - urls."${stdenvNoCC.hostPlatform.system}" - or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}") - ); - - dontUnpack = true; - - nativeBuildInputs = [ - makeWrapper - ]; - - installPhase = '' - runHook preInstall - install -Dm755 $src $out/bin/daytona - runHook postInstall - ''; - - meta = { - changelog = "https://github.com/daytonaio/daytona/releases/tag/v${finalAttrs.version}"; - description = "Open Source Dev Environment Manager"; - homepage = "https://github.com/daytonaio/daytona"; - license = lib.licenses.asl20; - mainProgram = "daytona"; - maintainers = with lib.maintainers; [ osslate ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -}) diff --git a/pkgs/by-name/dn/dnf5/package.nix b/pkgs/by-name/dn/dnf5/package.nix index 373191c04721..78c6e4fbb9d7 100644 --- a/pkgs/by-name/dn/dnf5/package.nix +++ b/pkgs/by-name/dn/dnf5/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.2.14.0"; + version = "5.2.15.0"; outputs = [ "out" @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rpm-software-management"; repo = "dnf5"; tag = finalAttrs.version; - hash = "sha256-dCeTOJrOjnGvRhY8u8mMOgm/mbUoTbYqzjiAkbIlSo0="; + hash = "sha256-WlQfvWDd9Eay9TPq2EfFlQGljEskJqL3xyNIJDdaNps="; }; nativeBuildInputs = diff --git a/pkgs/by-name/dn/dnsrecon/package.nix b/pkgs/by-name/dn/dnsrecon/package.nix index d8841ce7c0b7..d6be4da92d9c 100644 --- a/pkgs/by-name/dn/dnsrecon/package.nix +++ b/pkgs/by-name/dn/dnsrecon/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; - version = "1.3.1"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "darkoperator"; repo = "dnsrecon"; tag = version; - hash = "sha256-CW5HM8hATfhyQDbSAV+zSp8Gc/C5uy40yKMJAGawn0k="; + hash = "sha256-uBb19JNlbevwqFSNzLzUmmDw063Hl7RPbu453tYZ3Gc="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "DNS Enumeration script"; homepage = "https://github.com/darkoperator/dnsrecon"; - changelog = "https://github.com/darkoperator/dnsrecon/releases/tag/${version}"; + changelog = "https://github.com/darkoperator/dnsrecon/releases/tag/${src.tag}"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ c0bw3b diff --git a/pkgs/by-name/do/dokieli/package.nix b/pkgs/by-name/do/dokieli/package.nix index 6ebde44bde5c..f37464438c9a 100644 --- a/pkgs/by-name/do/dokieli/package.nix +++ b/pkgs/by-name/do/dokieli/package.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dokieli"; - version = "0-unstable-2025-07-10"; + version = "0-unstable-2025-07-11"; src = fetchFromGitHub { owner = "dokieli"; repo = "dokieli"; - rev = "fbd73c78f4690452e86a2758825cc5f5209b5322"; - hash = "sha256-LpUK8Uv8Qt3DMu5n7MHqbUIABlYSNzkw61BijlPRr7s="; + rev = "13c0c2d2d307ab1f391aca9aec4efc4ac4ba43c5"; + hash = "sha256-V9tKoSu1r8LZaIZUu1JSyZ0dM7/zblTDQZHu86/V3LE="; }; missingHashes = ./missing-hashes.json; diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix index 725d024b52ab..681980a6f3ee 100644 --- a/pkgs/by-name/do/dolphin-emu/package.nix +++ b/pkgs/by-name/do/dolphin-emu/package.nix @@ -54,13 +54,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dolphin-emu"; - version = "2506"; + version = "2506a"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; tag = finalAttrs.version; - hash = "sha256-JEp1rc5nNJY4GfNCR2Vi4ctQ14p+LZWuFPFirv6foUM="; + hash = "sha256-xYGq2Yt4Gqb/QDA6HZajs7JCwETufuqigk3bZbsgdEM="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix new file mode 100644 index 000000000000..fb96c27c1cf1 --- /dev/null +++ b/pkgs/by-name/ei/eigenwallet/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchurl, + stdenv, + dpkg, + autoPatchelfHook, + cairo, + gdk-pixbuf, + webkitgtk_4_1, + gtk3, +}: + +stdenv.mkDerivation (finalAttrs: { + name = "eigenwallet"; + version = "2.0.3"; + + src = fetchurl { + url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/UnstoppableSwap_${finalAttrs.version}_amd64.deb"; + hash = "sha256-2uOsZ6IvaQes+FYGQ0cNYlySzjyNwf/3fqk3DJzN+WI="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + ]; + + buildInputs = [ + cairo + gdk-pixbuf + webkitgtk_4_1 + gtk3 + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv {usr/bin,usr/share} $out + + runHook postInstall + ''; + + meta = { + description = "Protocol and desktop application for swapping Monero and Bitcoin"; + homepage = "https://unstoppableswap.net"; + maintainers = with lib.maintainers; [ JacoMalan1 ]; + license = lib.licenses.gpl3Only; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "unstoppableswap-gui-rs"; + }; +}) diff --git a/pkgs/by-name/en/ente-auth/git-hashes.json b/pkgs/by-name/en/ente-auth/git-hashes.json index 00eb4fd6c67e..80a5e5b11c43 100644 --- a/pkgs/by-name/en/ente-auth/git-hashes.json +++ b/pkgs/by-name/en/ente-auth/git-hashes.json @@ -1,5 +1,12 @@ { "ente_crypto_dart": "sha256-xBBK9BdXh4+OTj+Jkf3zh5sMZjXtvhyuE1R5LFE8iTY=", + "flutter_inappwebview": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=", + "flutter_inappwebview_android": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=", + "flutter_inappwebview_ios": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=", + "flutter_inappwebview_macos": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=", + "flutter_inappwebview_platform_interface": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=", + "flutter_inappwebview_web": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=", + "flutter_inappwebview_windows": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=", "flutter_local_authentication": "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=", "sqflite": "sha256-+XTVtkFJ94VifwnutvUuAqqiyWwrcEiZ3Uz0H4D9zWA=" } diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index 1298325524d5..8e42f2df491e 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -18,17 +18,17 @@ let in flutter324.buildFlutterApplication rec { pname = "ente-auth"; - version = "4.4.0"; + version = "4.4.3"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; - sparseCheckout = [ "auth" ]; + sparseCheckout = [ "mobile/apps/auth" ]; tag = "auth-v${version}"; - hash = "sha256-bwLEOmdDiD7X2o9PshDBf+Y1s6KYT7xGhqCu4nNAchI="; + hash = "sha256-6LTGmSCMlLynYtYCsJiALsRMm9vLUD9HaGnfHu0r6Rw="; }; - sourceRoot = "${src.name}/auth"; + sourceRoot = "${src.name}/mobile/apps/auth"; pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = lib.importJSON ./git-hashes.json; diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json index 8d7e969cb623..5007165e59e8 100644 --- a/pkgs/by-name/en/ente-auth/pubspec.lock.json +++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json @@ -676,82 +676,89 @@ "flutter_inappwebview": { "dependency": "direct main", "description": { - "name": "flutter_inappwebview", - "sha256": "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5", - "url": "https://pub.dev" + "path": "flutter_inappwebview", + "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26", + "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26", + "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git" }, - "source": "hosted", - "version": "6.1.5" + "source": "git", + "version": "6.2.0-beta.3" }, "flutter_inappwebview_android": { "dependency": "transitive", "description": { - "name": "flutter_inappwebview_android", - "sha256": "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba", - "url": "https://pub.dev" + "path": "flutter_inappwebview_android", + "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26", + "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26", + "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git" }, - "source": "hosted", - "version": "1.1.3" + "source": "git", + "version": "1.2.0-beta.3" }, "flutter_inappwebview_internal_annotations": { "dependency": "transitive", "description": { "name": "flutter_inappwebview_internal_annotations", - "sha256": "5f80fd30e208ddded7dbbcd0d569e7995f9f63d45ea3f548d8dd4c0b473fb4c8", + "sha256": "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.2.0" }, "flutter_inappwebview_ios": { "dependency": "transitive", "description": { - "name": "flutter_inappwebview_ios", - "sha256": "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d", - "url": "https://pub.dev" + "path": "flutter_inappwebview_ios", + "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26", + "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26", + "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git" }, - "source": "hosted", - "version": "1.1.2" + "source": "git", + "version": "1.2.0-beta.3" }, "flutter_inappwebview_macos": { "dependency": "transitive", "description": { - "name": "flutter_inappwebview_macos", - "sha256": "c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1", - "url": "https://pub.dev" + "path": "flutter_inappwebview_macos", + "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26", + "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26", + "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git" }, - "source": "hosted", - "version": "1.1.2" + "source": "git", + "version": "1.2.0-beta.3" }, "flutter_inappwebview_platform_interface": { "dependency": "transitive", "description": { - "name": "flutter_inappwebview_platform_interface", - "sha256": "cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500", - "url": "https://pub.dev" + "path": "flutter_inappwebview_platform_interface", + "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26", + "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26", + "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git" }, - "source": "hosted", - "version": "1.3.0+1" + "source": "git", + "version": "1.4.0-beta.3" }, "flutter_inappwebview_web": { "dependency": "transitive", "description": { - "name": "flutter_inappwebview_web", - "sha256": "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598", - "url": "https://pub.dev" + "path": "flutter_inappwebview_web", + "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26", + "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26", + "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git" }, - "source": "hosted", - "version": "1.1.2" + "source": "git", + "version": "1.2.0-beta.3" }, "flutter_inappwebview_windows": { "dependency": "transitive", "description": { - "name": "flutter_inappwebview_windows", - "sha256": "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055", - "url": "https://pub.dev" + "path": "flutter_inappwebview_windows", + "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26", + "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26", + "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git" }, - "source": "hosted", - "version": "0.6.0" + "source": "git", + "version": "0.7.0-beta.3" }, "flutter_launcher_icons": { "dependency": "direct main", diff --git a/pkgs/by-name/en/ente-auth/update.sh b/pkgs/by-name/en/ente-auth/update.sh index ed5d30529b60..fe46cf3e4d72 100755 --- a/pkgs/by-name/en/ente-auth/update.sh +++ b/pkgs/by-name/en/ente-auth/update.sh @@ -17,7 +17,9 @@ fi echo "Updating to $short_version" # Subtree needed for lockfile and icons -auth_tree="$(gh-curl "https://api.github.com/repos/ente-io/ente/git/trees/$version" | gojq '.tree[] | select(.path == "auth") | .url' --raw-output)" +mobile_tree="$(gh-curl "https://api.github.com/repos/ente-io/ente/git/trees/$version" | gojq '.tree[] | select(.path == "mobile") | .url' --raw-output)" +apps_tree="$(gh-curl "$mobile_tree" | gojq '.tree[] | select(.path == "apps") | .url' --raw-output)" +auth_tree="$(gh-curl "$apps_tree" | gojq '.tree[] | select(.path == "auth") | .url' --raw-output)" pushd "$pkg_dir" diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index f59a402b19ad..d4983b9b15f3 100644 --- a/pkgs/by-name/en/envoy-bin/package.nix +++ b/pkgs/by-name/en/envoy-bin/package.nix @@ -8,7 +8,7 @@ versionCheckHook, }: let - version = "1.34.2"; + version = "1.34.3"; inherit (stdenv.hostPlatform) system; throwSystem = throw "envoy-bin is not available for ${system}."; @@ -21,8 +21,8 @@ let hash = { - aarch64-linux = "sha256-82jzPZ08FCuM2eABcqU/QTdxEipnnvNjb350ZSiUS0o="; - x86_64-linux = "sha256-B1tnshv5fIjIKjeSADSjBotakhUak3rM0NWt4kWoWhk="; + aarch64-linux = "sha256-LsNkrFJ59MUiKIF0Dcuq2Lhn3LnAW0Mwlx4kIx78KfQ="; + x86_64-linux = "sha256-04vGgR8U0qiNBvmiim0aKa6Ug2acR31F5H4biSWkrag="; } .${system} or throwSystem; in diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index c47d88d4987f..6fe2cf916ea0 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -7,13 +7,13 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "enzyme"; - version = "0.0.185"; + version = "0.0.186"; src = fetchFromGitHub { owner = "EnzymeAD"; repo = "Enzyme"; rev = "v${version}"; - hash = "sha256-RRqjYdPVLPL6jlu491KqT/9P8uGESrsthAIdad4gckk="; + hash = "sha256-s9YGKHPk4/xy3Re3NdWe1Srjg+inPft0vrQMWaRcGpA="; }; postPatch = '' diff --git a/pkgs/by-name/et/ethersync/package.nix b/pkgs/by-name/et/ethersync/package.nix new file mode 100644 index 000000000000..6a0ce6607327 --- /dev/null +++ b/pkgs/by-name/et/ethersync/package.nix @@ -0,0 +1,41 @@ +{ + fetchFromGitHub, + lib, + rustPlatform, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ethersync"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "ethersync"; + repo = "ethersync"; + tag = "v${finalAttrs.version}"; + hash = "sha256-dHV4+WxNdEvRZK8WNK0qp9f43Y9oSUtlXrq/mI0yWls="; + }; + + sourceRoot = "${finalAttrs.src.name}/daemon"; + + cargoHash = "sha256-uKtJp4RD0YbOmtzbxebpYQxlBmP+5k88d+76hT4cTI8="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Real-time co-editing of local text files"; + homepage = "https://ethersync.github.io/ethersync/"; + downloadPage = "https://github.com/ethersync/ethersync"; + changelog = "https://github.com/ethersync/ethersync/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + prince213 + ethancedwards8 + ]; + }; +}) diff --git a/pkgs/by-name/ev/evemu/package.nix b/pkgs/by-name/ev/evemu/package.nix index 1676e1225a47..81340b377ec4 100644 --- a/pkgs/by-name/ev/evemu/package.nix +++ b/pkgs/by-name/ev/evemu/package.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { lgpl3Only gpl3Only ]; - maintainers = [ maintainers.amorsillo ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix index fb2e7d0610fc..ead86b1ec2fd 100644 --- a/pkgs/by-name/fa/factoriolab/package.nix +++ b/pkgs/by-name/fa/factoriolab/package.nix @@ -10,13 +10,13 @@ }: buildNpmPackage rec { pname = "factoriolab"; - version = "3.15.0"; + version = "3.16.3"; src = fetchFromGitHub { owner = "factoriolab"; repo = "factoriolab"; tag = "v${version}"; - hash = "sha256-HWt3BxW2nBgnJ+BzsL+JpFfrLht2Yl/Btbre6EfM9F4="; + hash = "sha256-LfeYe2lkT08RIk3Fx0/Ym8aDaEF4ZcYxuFmASH//u2Q="; }; buildInputs = [ vips ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/fa/fakeroot/package.nix b/pkgs/by-name/fa/fakeroot/package.nix index a7fbca8e3305..ae9883af71f1 100644 --- a/pkgs/by-name/fa/fakeroot/package.nix +++ b/pkgs/by-name/fa/fakeroot/package.nix @@ -25,17 +25,27 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-2ihdvYRnv2wpZrEikP4hCdshY8Eqarqnw3s9HPb+xKU="; }; - patches = lib.optionals stdenv.hostPlatform.isLinux [ - ./einval.patch + patches = + lib.optionals stdenv.hostPlatform.isLinux [ + ./einval.patch - # patches needed for musl libc, borrowed from alpine packaging. - # it is applied regardless of the environment to prevent patchrot - (fetchpatch { - name = "fakeroot-no64.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/fakeroot/fakeroot-no64.patch?id=f68c541324ad07cc5b7f5228501b5f2ce4b36158"; - sha256 = "sha256-NCDaB4nK71gvz8iQxlfaQTazsG0SBUQ/RAnN+FqwKkY="; - }) - ]; + # patches needed for musl libc, borrowed from alpine packaging. + # it is applied regardless of the environment to prevent patchrot + (fetchpatch { + name = "fakeroot-no64.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/fakeroot/fakeroot-no64.patch?id=f68c541324ad07cc5b7f5228501b5f2ce4b36158"; + sha256 = "sha256-NCDaB4nK71gvz8iQxlfaQTazsG0SBUQ/RAnN+FqwKkY="; + }) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # patch needed to fix execution on macos + # TODO: remove when the next release comes out: https://salsa.debian.org/clint/fakeroot/-/merge_requests/34 + (fetchpatch { + name = "fakeroot-fix-macos.patch"; + url = "https://salsa.debian.org/clint/fakeroot/-/merge_requests/34.diff"; + hash = "sha256-D5f1bXUaN2YMD/NTx/WIrqDBx/qNHpfLRcPhbdHYLl8="; + }) + ]; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix index 62da2fd3c343..23919b8fa6b8 100644 --- a/pkgs/by-name/fl/flood/package.nix +++ b/pkgs/by-name/fl/flood/package.nix @@ -24,7 +24,7 @@ buildNpmPackage rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; fetcherVersion = 1; - hash = "sha256-i1szy2JVKvq2rcL0l51vmsLano4l88s97EQPN9g4Qq4="; + hash = "sha256-xoCRZUJkdR4X5hszM5gaOyWXLNCbzG5CzF+6OXGEy1k="; }; passthru = { diff --git a/pkgs/by-name/fr/frida-tools/package.nix b/pkgs/by-name/fr/frida-tools/package.nix index 4f56d016ce93..68bdc5fa195b 100644 --- a/pkgs/by-name/fr/frida-tools/package.nix +++ b/pkgs/by-name/fr/frida-tools/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "frida-tools"; - version = "14.4.1"; + version = "14.4.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Zb6Pk6c7QbJLsb4twhdVgaUWtxCy/Vff5PKIno9B/b4="; + hash = "sha256-M+iKHoJpxIUUoEVYntL8PPR7B3TbBDiW/Oc8ZE15wo8="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/g3/g3proxy/package.nix b/pkgs/by-name/g3/g3proxy/package.nix index b9dcdad4c4e5..33e1cf636030 100644 --- a/pkgs/by-name/g3/g3proxy/package.nix +++ b/pkgs/by-name/g3/g3proxy/package.nix @@ -7,51 +7,57 @@ python3, lua5_4, capnproto, - cmake, + openssl, + rust-bindgen, + nix-update-script, }: -rustPlatform.buildRustPackage rec { - pname = "g3"; - version = "v1.10.4"; +rustPlatform.buildRustPackage (finalAttrs: { + pname = "g3proxy"; + version = "1.11.9"; src = fetchFromGitHub { owner = "bytedance"; repo = "g3"; - tag = "g3proxy-${version}"; - hash = "sha256-uafKYyzjGdtC+oMJG1wWOvgkSht/wTOzyODcPoTfOnU="; + tag = "g3proxy-v${finalAttrs.version}"; + hash = "sha256-N6Fvdc+Vj7S9CgBby9unKBVBoM9pPlmfyJPxY3KdSXg="; }; - cargoHash = "sha256-NbrJGGnpZkF7ZX3MqrMsZ03tWkN/nqWahh00O3IJGOw="; + cargoHash = "sha256-bLzkA50XiIUrGyKZ3upo2psjFnjUNups0aIEou+J5IA="; useFetchCargoVendor = true; - # TODO: can we unvendor AWS LC somehow? - buildFeatures = [ - "vendored-aws-lc" - "rustls-aws-lc" + cargoBuildFlags = [ + "-p" + "g3proxy" ]; - - # aws-lc/crypto compilation will trigger `strictoverflow` errors. - hardeningDisable = [ "strictoverflow" ]; + cargoTestFlags = finalAttrs.cargoBuildFlags; nativeBuildInputs = [ pkg-config - rustPlatform.bindgenHook python3 capnproto - cmake + rust-bindgen ]; buildInputs = [ c-ares lua5_4 + openssl ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^g3proxy-v([0-9.]+)$" + ]; + }; + meta = { description = "Enterprise-oriented Generic Proxy Solutions"; homepage = "https://github.com/bytedance/g3"; - changelog = "https://github.com/bytedance/g3/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/bytedance/g3/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ raitobezarius ]; mainProgram = "g3proxy"; }; -} +}) diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix index acc5f57b012f..a960d5a9ce18 100644 --- a/pkgs/by-name/ga/gallery-dl/package.nix +++ b/pkgs/by-name/ga/gallery-dl/package.nix @@ -8,7 +8,7 @@ let pname = "gallery-dl"; - version = "1.29.7"; + version = "1.30.0"; in python3Packages.buildPythonApplication { inherit pname version; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { owner = "mikf"; repo = "gallery-dl"; tag = "v${version}"; - hash = "sha256-OngtJ6E7Gvr+/5Vjv1vepPVVksNDRlXZkU9yMYRvh2k="; + hash = "sha256-puxkxrAkYu8oBmMltr1IfjNIAuoOu7yv6UZo6VqC6L8="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix index 60d085208de2..da847b9a91ca 100644 --- a/pkgs/by-name/ga/gate/package.nix +++ b/pkgs/by-name/ga/gate/package.nix @@ -6,7 +6,7 @@ let pname = "gate"; - version = "0.50.0"; + version = "0.51.0"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "minekube"; repo = "gate"; tag = "v${version}"; - hash = "sha256-clWQeFKOLzA99yNqgNPdPdvyaVoRvYjYg7PrGvnuk7o="; + hash = "sha256-Fe02QzD9ZtYT+pakWWjwM48dqe7SeF011/FafbvGc0E="; }; vendorHash = "sha256-d/D1l+/viJ5OFSpUDpC+4pnDwPJDBuYDjS7niao5D9U="; diff --git a/pkgs/by-name/ge/geonkick/package.nix b/pkgs/by-name/ge/geonkick/package.nix index 49fb9bf01e5e..4ee828486073 100644 --- a/pkgs/by-name/ge/geonkick/package.nix +++ b/pkgs/by-name/ge/geonkick/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitLab { owner = "Geonkick-Synthesizer"; repo = "geonkick"; rev = "v${version}"; - hash = "sha256-lTJ5O2UfXRUELErbMS9fCdCUgxhBxKRv/nIK8w5Fkiw="; + hash = "sha256-f5RJzkr98CygOT0O5igMnqetl8if81hKzGAJ2IrR5Hg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix index 04cdb78f6650..b7047664dcc2 100644 --- a/pkgs/by-name/ge/gersemi/package.nix +++ b/pkgs/by-name/ge/gersemi/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "gersemi"; - version = "0.20.1"; + version = "0.21.0"; format = "pyproject"; src = fetchFromGitHub { owner = "BlankSpruce"; repo = "gersemi"; tag = version; - hash = "sha256-6lBUP+xi0owlD33TLTOlaIFBcfWTnsniK/9cQdo/ND4="; + hash = "sha256-TOrnaYvI4U7+q7ANNThZ3M3XhZS/Y8m48mNAqwjjBsg="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix index a23c139f2778..91a32b6de33f 100644 --- a/pkgs/by-name/gi/gitleaks/package.nix +++ b/pkgs/by-name/gi/gitleaks/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.27.2"; + version = "8.28.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; tag = "v${version}"; - hash = "sha256-MuFIQYQb+KqxR/KyFrGnDMvwwH9WZ+AupFhc8RgMHTo="; + hash = "sha256-smh3Ge278lYVEcs6r1F43daexgjgddy1HKhU5E4CBYM="; }; - vendorHash = "sha256-vd39TbooEdmYa6QZGEnYOmYU9p+9mV+SrLKVY+h/PEM="; + vendorHash = "sha256-dd9sHt5t0s4Vff1rOwQY1OC+0FIw0SDt/cwJN+IL5D8="; ldflags = [ "-s" diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index a060b0b014d5..ea2a57801471 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "glooctl"; - version = "1.19.2"; + version = "1.19.4"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-IbHa9Xu5WEtkb/rumbmbZm2XI26iBOKPaOgxlMZ2fjA="; + hash = "sha256-6esnWLO0+6Tst8eplemgs1Z2Ibk+D3ipFHxcBWF3/6w="; }; - vendorHash = "sha256-eXLlcUTxSjyZKla8NosGQbJAz8HrRGmTDJs7onfgwuQ="; + vendorHash = "sha256-n42H8c4KqgEannLpEdpKSz7J4UZ+lpVhDAE7ZuBKdCU="; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/pkgs/by-name/go/goa/package.nix b/pkgs/by-name/go/goa/package.nix index 97f7016f78c6..4bb4e08820c8 100644 --- a/pkgs/by-name/go/goa/package.nix +++ b/pkgs/by-name/go/goa/package.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "goa"; - version = "3.21.1"; + version = "3.21.5"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - hash = "sha256-LDgpwSMB6TBdq4UwxNtddIH5KWkQSsgh3ok5JJNfwRw="; + hash = "sha256-3MRxiZK6rLc0Drn3Ha7YOZO3IGNkQNEpzppZwYcZLwg="; }; - vendorHash = "sha256-Mu93LchlPSU05r/zwZ+q0wgwWF2cTQEjOupr9lmuqVU="; + vendorHash = "sha256-5XKAfUA3dh1Vgh72h1GeiheoL7E7jij3nAlncV5FjF8="; subPackages = [ "cmd/goa" ]; diff --git a/pkgs/by-name/go/gosec/package.nix b/pkgs/by-name/go/gosec/package.nix index f4e294fb06e4..39af72cd98d7 100644 --- a/pkgs/by-name/go/gosec/package.nix +++ b/pkgs/by-name/go/gosec/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.22.5"; + version = "2.22.6"; src = fetchFromGitHub { owner = "securego"; repo = "gosec"; rev = "v${version}"; - hash = "sha256-gvKqBXiOK1KF0Y2+d7f/8QhhuvspgV632iizoKZgaQk="; + hash = "sha256-3USQf4kRAOpwmJzFNVK533yAGpYJ+Bz5vKwwIkQnctQ="; }; - vendorHash = "sha256-T29x5+n2MVIo3c1iabn5tQWrBKD96Cwo/EKWzHYgwrc="; + vendorHash = "sha256-0XYYPbbuqmBRsNDjUv1cgnQRzYFBn/sWJG6tMExRk3U="; subPackages = [ "cmd/gosec" diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix index c3574cde1a4f..1b3f6d76a05f 100644 --- a/pkgs/by-name/gr/greenmask/package.nix +++ b/pkgs/by-name/gr/greenmask/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "greenmask"; - version = "0.2.12"; + version = "0.2.13"; src = fetchFromGitHub { owner = "GreenmaskIO"; repo = "greenmask"; tag = "v${version}"; - hash = "sha256-Tgr6olU8EBiiHX4fNOL6EXdrFs2eckFk4ooBBoxc+ms="; + hash = "sha256-aV/H2UuMm66No2J1t7VnO0s/WozacmCYsSgKb0SAupQ="; }; vendorHash = "sha256-t2U65GAGBGdMRXPTkCQCuXfLuqohA6erTlvAN/xx/ek="; diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix index 30472742a2a0..b79cd7b8e298 100644 --- a/pkgs/by-name/ha/hare/package.nix +++ b/pkgs/by-name/ha/hare/package.nix @@ -23,8 +23,7 @@ assert inherit (lib) intersectLists platforms concatStringsSep; workingPlatforms = intersectLists platforms.linux (with platforms; x86_64 ++ aarch64 ++ riscv64); in - (enableCrossCompilation -> !(isLinux && is64bit)) - -> builtins.throw '' + lib.assertMsg (enableCrossCompilation -> isLinux && is64bit) '' The cross-compilation toolchains may only be enabled on the following platforms: ${concatStringsSep "\n" workingPlatforms} ''; diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index dcb1fe770445..cb438c5056c9 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.50.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-vhaIDzjOG43+zxJU1BTPNPTmbDkLqFo0NRfvYcJSvSo="; + hash = "sha256-jMifo0vhcCFY8DTuqRYzz483R2NGOWeWr1SR7xkTM/s="; }; buildAndTestSubdir = "harper-ls"; useFetchCargoVendor = true; - cargoHash = "sha256-6f8zJyz36Da7OvqWBE1w5IsRa8dNulSxLrQiTqjEbKo="; + cargoHash = "sha256-PSyJ9EDmxevU/b3xWZS3eqQPfcQ7Us/Bi6SA7WB70J4="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/havoc/package.nix b/pkgs/by-name/ha/havoc/package.nix index 9abe79999b43..2efd0c618ec2 100644 --- a/pkgs/by-name/ha/havoc/package.nix +++ b/pkgs/by-name/ha/havoc/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "havoc"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "ii8"; repo = "havoc"; rev = finalAttrs.version; - hash = "sha256-YCZdAlIDptVLMUko40gfp2BCAbhGNsYyVTDB14VTNSE="; + hash = "sha256-Hn0HrAgxrkfN+iXAt+C4rOd3/Z+ZKFVk3GGNgVtro7A="; }; depsBuildBuild = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { publicDomain ]; mainProgram = "havoc"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ videl ]; inherit (wayland.meta) platforms; broken = stdenv.hostPlatform.isDarwin; # fatal error: 'sys/epoll.h' file not found }; diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix index 286ba7d49f04..65133270291f 100644 --- a/pkgs/by-name/hp/hplip/package.nix +++ b/pkgs/by-name/hp/hplip/package.nix @@ -72,12 +72,6 @@ let in -assert - withPlugin - -> - builtins.elem hplipArch pluginArches - || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; - python3Packages.buildPythonApplication { inherit pname version; format = "other"; @@ -362,13 +356,7 @@ python3Packages.buildPythonApplication { bsd2 gpl2Plus ]; - platforms = [ - "i686-linux" - "x86_64-linux" - "armv6l-linux" - "armv7l-linux" - "aarch64-linux" - ]; + platforms = lib.attrNames hplipPlatforms; maintainers = with lib.maintainers; [ ttuegel ]; }; } diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix index 63a8d07dbf78..a155b272b2af 100644 --- a/pkgs/by-name/hy/hyprprop/package.nix +++ b/pkgs/by-name/hy/hyprprop/package.nix @@ -14,13 +14,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "hyprprop"; - version = "0.1-unstable-2025-06-19"; + version = "0.1-unstable-2025-07-18"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "189f32f56285aae9646bf1292976392beba5a2e2"; - hash = "sha256-LPwgPRBTfnA76rHUr7KYvwq2pNt5IfxymNAZUJFvn/M="; + rev = "481175e17e155f19a3b31416530b6edf725e7034"; + hash = "sha256-usBNOT/uzFdsKDe5Ik+C36zqL+BfT7Lp2rqKWrpQuqk="; }; sourceRoot = "${finalAttrs.src.name}/hyprprop"; diff --git a/pkgs/by-name/hy/hyprsunset/package.nix b/pkgs/by-name/hy/hyprsunset/package.nix index d106ba418ab1..cff4d6a37a3e 100644 --- a/pkgs/by-name/hy/hyprsunset/package.nix +++ b/pkgs/by-name/hy/hyprsunset/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, pkg-config, hyprland-protocols, + hyprlang, hyprutils, hyprwayland-scanner, wayland, @@ -14,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprsunset"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprsunset"; tag = "v${finalAttrs.version}"; - hash = "sha256-EIJka3UtSEtmkDBjYiGeR/hO6s6R4x3K+rbUlc9KPBE="; + hash = "sha256-Cp5kHNfWFFyJpA5eRxZh/7fJcHU1uM2tBehQyeyKEUA="; }; postPatch = '' @@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ hyprland-protocols + hyprlang hyprutils wayland wayland-protocols diff --git a/pkgs/by-name/in/intel-gmmlib/package.nix b/pkgs/by-name/in/intel-gmmlib/package.nix index 0197c3273edd..62006fbb8687 100644 --- a/pkgs/by-name/in/intel-gmmlib/package.nix +++ b/pkgs/by-name/in/intel-gmmlib/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.7.3"; + version = "22.8.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; tag = "intel-gmmlib-${version}"; - hash = "sha256-3KGDKdhy4jtBVdZYY6fhEEBQYmfYzXoTR7yPAuFqBvI="; + hash = "sha256-TFa8EfrL14w8ameIinRhmeNnfOJ18hoXWEpTgxTeBBE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index eb4b612bdab3..ba00981652bd 100644 --- a/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -15,8 +15,8 @@ let updateScript = ./update.sh; meta = { - description = "Jetbrains Toolbox"; - homepage = "https://jetbrains.com/"; + description = "JetBrains Toolbox"; + homepage = "https://www.jetbrains.com/toolbox-app"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ ners ]; @@ -91,6 +91,11 @@ selectKernel { ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs pkgs; runScript = "${src}/bin/jetbrains-toolbox --update-failed"; + + extraInstallCommands = '' + install -Dm0644 ${src}/bin/jetbrains-toolbox.desktop -t $out/share/applications + install -Dm0644 ${src}/bin/toolbox-tray-color.png $out/share/pixmaps/jetbrains-toolbox.png + ''; }; darwin = stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/kb/kbs2/package.nix b/pkgs/by-name/kb/kbs2/package.nix index 649db2a3f5da..b4f35b7fa93d 100644 --- a/pkgs/by-name/kb/kbs2/package.nix +++ b/pkgs/by-name/kb/kbs2/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "woodruffw"; repo = "kbs2"; rev = "v${version}"; - hash = "sha256-o8/ENAWzVqs7rokST6xnyu9Q/pKqq/UnKWOFRuIuGes="; + hash = "sha256-X+NhUQzxfok9amqAiim/vjkee45hjdPedsZc3zwcOXA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-+TJ/QG+6ZILcSZEIXj6B4qYF0P5pQpo1kw2qEfE0FDw="; + cargoHash = "sha256-Auk/6ltjfXE1VzlxmKikcV6MHDczpuRqKJrg6UGgJZE="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; diff --git a/pkgs/by-name/ke/keepass/package.nix b/pkgs/by-name/ke/keepass/package.nix index 9c326f991c96..b14c42fe032a 100644 --- a/pkgs/by-name/ke/keepass/package.nix +++ b/pkgs/by-name/ke/keepass/package.nix @@ -165,7 +165,6 @@ stdenv.mkDerivation (finalAttrs: { description = "GUI password manager with strong cryptography"; homepage = "http://www.keepass.info/"; maintainers = with lib.maintainers; [ - amorsillo obadz ]; platforms = with lib.platforms; all; diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index ee5e0c3dd75b..ed999f096682 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "26.2.5"; + version = "26.3.1"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-yXbHdznZlrz4T2+154cM+eAmPO/TR5kRCVVi26H66ok="; + hash = "sha256-M3YbS/aK9y4N2kZrm1wNT1ZaWAaUwaRn9QQ8fMdOV5g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ku/kubecm/package.nix b/pkgs/by-name/ku/kubecm/package.nix index f83d116231e3..d6c4f51e109d 100644 --- a/pkgs/by-name/ku/kubecm/package.nix +++ b/pkgs/by-name/ku/kubecm/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubecm"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "sunny0826"; repo = "kubecm"; rev = "v${version}"; - hash = "sha256-osyxgwJIHsnTW8uDKPFO174ImUntKHmW61v6KPY1E9M="; + hash = "sha256-ooVKXFFrDKrxbmR3MJvu2KJQ2PW3zzJ7Qm8ck9Fje8A="; }; - vendorHash = "sha256-rSha+Fd8vohRnLjECqRn3Zg4DYxGgXc4M7mUAgvW+Gw="; + vendorHash = "sha256-HKHUN3vOhNl46T06pMUZIjcZMxDw/gkeimbs7kdmtdI="; ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/ku/kubectl-klock/package.nix b/pkgs/by-name/ku/kubectl-klock/package.nix index 9564a40b22e4..0374e5f880bd 100644 --- a/pkgs/by-name/ku/kubectl-klock/package.nix +++ b/pkgs/by-name/ku/kubectl-klock/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "kubectl-klock"; - version = "0.8.1"; + version = "0.8.2"; nativeBuildInputs = [ makeWrapper ]; @@ -15,7 +15,7 @@ buildGoModule rec { owner = "applejag"; repo = "kubectl-klock"; rev = "v${version}"; - hash = "sha256-WKWaQ7VKzlfgYb5B/GmcUKTjxfFRctt+N+zRJcOGukA="; + hash = "sha256-Ajq3/JUnaIcz6FnC2nP9H/+oKJXQSca+mRpPSkG/xY0="; }; ldflags = [ @@ -24,7 +24,7 @@ buildGoModule rec { "-X main.version=${version}" ]; - vendorHash = "sha256-FWfAn3ZWScIXbdv3zwwZxFyMkpzJHZJuhxe22qvv1ac="; + vendorHash = "sha256-fuq073g1RG4cfFzs5eoMOytE9Ra32HgUFG/yQDYc2JE="; postInstall = '' makeWrapper $out/bin/kubectl-klock $out/bin/kubectl_complete-klock --add-flags __complete diff --git a/pkgs/by-name/li/libevdev/package.nix b/pkgs/by-name/li/libevdev/package.nix index dab1e65b1508..64deb28f988d 100644 --- a/pkgs/by-name/li/libevdev/package.nix +++ b/pkgs/by-name/li/libevdev/package.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/software/libevdev/doc/latest/index.html"; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.amorsillo ]; }; } diff --git a/pkgs/by-name/li/libkrun/package.nix b/pkgs/by-name/li/libkrun/package.nix index 3f8f2c4e3895..8276a93ce909 100644 --- a/pkgs/by-name/li/libkrun/package.nix +++ b/pkgs/by-name/li/libkrun/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { env.RUSTFLAGS = toString ( map (flag: "-C link-arg=" + flag) [ "-Wl,--push-state,--no-as-needed" - "-lkrunfw" + (if sevVariant then "-lkrunfw-sev" else "-lkrunfw") "-Wl,--pop-state" ] ); diff --git a/pkgs/by-name/li/librime/package.nix b/pkgs/by-name/li/librime/package.nix index e219a6c5c10c..b847adda5e7a 100644 --- a/pkgs/by-name/li/librime/package.nix +++ b/pkgs/by-name/li/librime/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation rec { pname = "librime"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "rime"; repo = "librime"; rev = version; - sha256 = "sha256-pv1I/YFzPLOmBDcT4HcrJWSikPEErEB5UzGrGqfJBvg="; + sha256 = "sha256-dks8Ab2YQ8t4hZRneMP9aU0VFZgIg+meh8RI0pp0lR0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libtracefs/package.nix b/pkgs/by-name/li/libtracefs/package.nix index d60221e81afd..d06f703b9e24 100644 --- a/pkgs/by-name/li/libtracefs/package.nix +++ b/pkgs/by-name/li/libtracefs/package.nix @@ -8,34 +8,23 @@ xmlto, docbook_xml_dtd_45, docbook_xsl, - valgrind, sourceHighlight, meson, flex, bison, ninja, - cunit, gitUpdater, - fetchpatch, }: stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.8.1"; + version = "1.8.2"; src = fetchzip { url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-libtracefs-${version}.tar.gz"; - hash = "sha256-2UiEgY4mQRLpWah+2rVfPiiUYBSSzRAy5gOv4YELQFQ="; + hash = "sha256-rpZUa34HMnDMSsGGwtOriEEHDfnW8emRSHZxzRkY3c4="; }; - patches = [ - (fetchpatch { - name = "add-missing-documentation-to-meson-build.patch"; - url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/patch/?id=4cbebed79b1fe933367e298ea7ddef694b9f98d0"; - hash = "sha256-tSaR0wpxrm50IyMgMoUCcHBB9r8lQQZZYGru6Znre50="; - }) - ]; - postPatch = '' chmod +x samples/extract-example.sh patchShebangs --build check-manpages.sh samples/extract-example.sh Documentation/install-docs.sh.in @@ -55,7 +44,6 @@ stdenv.mkDerivation rec { xmlto docbook_xml_dtd_45 docbook_xsl - valgrind sourceHighlight flex bison @@ -67,8 +55,7 @@ stdenv.mkDerivation rec { "docs" ]; - doCheck = true; - checkInputs = [ cunit ]; + doCheck = false; # needs root passthru.updateScript = gitUpdater { # No nicer place to find latest release. diff --git a/pkgs/by-name/li/libuninameslist/package.nix b/pkgs/by-name/li/libuninameslist/package.nix index 6b3f185916c8..47c2b819a0bf 100644 --- a/pkgs/by-name/li/libuninameslist/package.nix +++ b/pkgs/by-name/li/libuninameslist/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libuninameslist"; - version = "20240910"; + version = "20250714"; src = fetchFromGitHub { owner = "fontforge"; repo = "libuninameslist"; rev = version; - hash = "sha256-Pi30c3To57AzY59i39JVG2IUkGnq7CEAQkqJ1f5AZhw="; + hash = "sha256-2SC8hu4yHbSbmQL17bfF4BwPLzBhUvF8iGqEtueUZaU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/lightning-terminal/package.nix b/pkgs/by-name/li/lightning-terminal/package.nix index f656f0670ead..9d221a2bcd93 100644 --- a/pkgs/by-name/li/lightning-terminal/package.nix +++ b/pkgs/by-name/li/lightning-terminal/package.nix @@ -10,19 +10,25 @@ fetchYarnDeps, go, versionCheckHook, - testers, + runCommandWith, curl, lightning-terminal, + _experimental-update-script-combinators, + gitUpdater, + nurl, + nix, + gitMinimal, + writeShellScript, }: buildGoModule rec { pname = "lightning-terminal"; - version = "0.14.1-alpha"; + version = "0.15.1-alpha"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "lightning-terminal"; tag = "v${version}"; - hash = "sha256-sv/NsjAAF0vwD2xjRuGwHwV0L1gjCFQEw0SVp14Zyz0="; + hash = "sha256-aCZ1dzbj1SYBYQ6ysnk9MQs4V6ysljZYOYp0gOw0WFQ="; leaveDotGit = true; # Populate values that require us to use git. postFetch = '' @@ -35,7 +41,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-Gbx4uz6q9Ef4QNv6DpIoCACjhT66iZ7GPNpd/g9MgKQ="; + vendorHash = "sha256-tjNF6Llsaba/IlhtrOU4ebzSRHGVy+LPzwhBsS5xJgQ="; buildInputs = [ lightning-app ]; postUnpack = '' @@ -94,24 +100,71 @@ buildGoModule rec { versionCheckHook ]; - passthru.tests.litd-app = testers.runCommand { - name = "test-litd-app"; - nativeBuildInputs = [ - curl - lightning-terminal - ]; - script = '' - litd \ - --uipassword=12345678 \ - --insecure-httplisten=127.0.0.1:8080 \ - --httpslisten= & - sleep 2 - GETindexHTTPCode=$(curl -o /dev/null -w "%{http_code}" -Lvs 127.0.0.1:8080/index.html) - if [ "$GETindexHTTPCode" = 200 ]; then - touch $out - fi - ''; - }; + passthru.tests.litd-app = + runCommandWith + { + name = "test-litd-app"; + derivationArgs = { + nativeBuildInputs = [ + curl + lightning-terminal + ]; + }; + } + '' + litd \ + --uipassword=12345678 \ + --insecure-httplisten=127.0.0.1:8080 \ + --httpslisten= & + sleep 2 + GETindexHTTPCode=$(curl -o /dev/null -w "%{http_code}" -Lvs 127.0.0.1:8080/index.html) + if [ "$GETindexHTTPCode" = 200 ]; then + touch $out + fi + ''; + + # Usage: nix-shell maintainers/scripts/update.nix --argstr package lightning-terminal --argstr commit true + passthru.updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { + rev-prefix = "v"; + ignoredVersions = ".*rc.*"; + }) + { + command = [ + (writeShellScript "update-hashes.sh" '' + set -euxo pipefail + + . ${stdenv}/setup + PATH="${ + lib.makeBinPath [ + gitMinimal + nix + nurl + ] + }:$PATH" + + nixpkgs="$(git rev-parse --show-toplevel)" + packageVersion=$(nix --extra-experimental-features nix-command eval --impure --raw -f "$nixpkgs" "$UPDATE_NIX_ATTR_PATH.version") + if [ x"$UPDATE_NIX_OLD_VERSION" != x"$packageVersion" ]; then + vendorHashOld=${lightning-terminal.vendorHash} + vendorHashNew=$(nurl -e "(import $nixpkgs/. { }).$UPDATE_NIX_ATTR_PATH.goModules") + yarnOfflineCacheHashOld=${lightning-app.yarnOfflineCache.outputHash} + yarnOfflineCacheHashNew=$(nurl -e "let pkgs = (import $nixpkgs/. { }); in \ + pkgs.fetchYarnDeps \ + { yarnLock = pkgs.$UPDATE_NIX_ATTR_PATH.src + \"/app/yarn.lock\"; \ + hash = pkgs.lib.fakeHash; \ + }") + + substituteInPlace \ + "$nixpkgs"/pkgs/by-name/li/lightning-terminal/package.nix \ + --replace-fail "$vendorHashOld" "$vendorHashNew" \ + --replace-fail "$yarnOfflineCacheHashOld" "$yarnOfflineCacheHashNew" + fi + '') + ]; + supportedFeatures = [ "silent" ]; + } + ]; lightning-app = stdenv.mkDerivation { pname = "lightning-app"; @@ -119,7 +172,7 @@ buildGoModule rec { version = "0.0.1"; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/app/yarn.lock"; - hash = "sha256-ulOgKQRLG4cRi1N1DajmbZ0L7d08g5cYDA9itXu+Esw="; + hash = "sha256-FYRWyZxTPo4YwN5AiXsuubZoCVRcOeCrsUU/+ON4gx4="; }; # Remove this command from package.json. It requires Git and it is not diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 2c7e9fa48c1b..6ddbeba79e3b 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.4.4"; + version = "3.4.6"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-2ShSTAyFQtGDDQsBSqg7ZPZDZWpx/T3H3yuYUn/WMkcMJOXqQO+qyth73WjZYoa6hOqc1yp5OzE7H9lLGLIW/g=="; + hash = "sha512-uSuFcCon2gQONSV7Av6x3MywgUS3+q0vluc8MJbf4VnUJ7P1SgO7dKhqY2X6UBS7HJIqsmjuhWxfW9jScxTPIQ=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ma/maltego/package.nix b/pkgs/by-name/ma/maltego/package.nix index 8b832872eafb..c7c0d253cd39 100644 --- a/pkgs/by-name/ma/maltego/package.nix +++ b/pkgs/by-name/ma/maltego/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "maltego"; - version = "4.9.3"; + version = "4.10.0"; src = fetchzip { url = "https://downloads.maltego.com/maltego-v4/linux/Maltego.v${finalAttrs.version}.linux.zip"; - hash = "sha256-h0cTA6/i7cpYvGQli3UA6WZnaMOProN4f0TTdeIczcY="; + hash = "sha256-uN4KBfORh2CTcQbf3VGXFa0WZwYnsnfRiyILFCdxZyg="; }; postPatch = '' diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index 55e596fee69c..743b71efbe34 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -27,9 +27,10 @@ stdenv.mkDerivation (finalAttrs: { gtest glm tbb_2021 - clipper2 ]; + propagatedBuildInputs = [ clipper2 ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DMANIFOLD_TEST=ON" diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 74c8548b6a20..afce640ebf11 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -179,11 +179,11 @@ in stdenvNoCC.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "138.0.3351.83"; + version = "138.0.3351.95"; 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-NcDw2483l+VmBgr4Ue2vZmFFs3ZdWJvsfsub7stMEOE="; + hash = "sha256-Q5TdmqLlRITWDRZwUTMiOOjXQm09Cq+bK6N5XNew6R8="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -293,6 +293,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { maeve-oake leleuvilela bricklou + jonhermansen ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/mo/mods/package.nix b/pkgs/by-name/mo/mods/package.nix index cbc5d2e42032..81249486e604 100644 --- a/pkgs/by-name/mo/mods/package.nix +++ b/pkgs/by-name/mo/mods/package.nix @@ -1,34 +1,37 @@ { lib, + stdenv, buildGoModule, installShellFiles, fetchFromGitHub, gitUpdater, testers, mods, + installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mods"; version = "1.7.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "mods"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wzLYkcgUWPzghJEhYRh7HH19Rqov1RJAxdgp3AGnOTY="; }; vendorHash = "sha256-L+4vkh7u6uMm5ICMk8ke5RVY1oYeKMYWVYYq9YqpKiw="; - nativeBuildInputs = [ + nativeBuildInputs = lib.optionals (installManPages || installShellCompletions) [ installShellFiles ]; ldflags = [ "-s" "-w" - "-X=main.Version=${version}" + "-X=main.Version=${finalAttrs.version}" ]; # These tests require internet access. @@ -46,16 +49,20 @@ buildGoModule rec { }; }; - postInstall = '' - export HOME=$(mktemp -d) - $out/bin/mods man > mods.1 - $out/bin/mods completion bash > mods.bash - $out/bin/mods completion fish > mods.fish - $out/bin/mods completion zsh > mods.zsh - - installManPage mods.1 - installShellCompletion mods.{bash,fish,zsh} - ''; + postInstall = + '' + export HOME=$(mktemp -d) + '' + + lib.optionalString installManPages '' + $out/bin/mods man > ./mods.1 + installManPage ./mods.1 + '' + + lib.optionalString installShellCompletions '' + installShellCompletion --cmd mods \ + --bash <($out/bin/mods completion bash) \ + --fish <($out/bin/mods completion fish) \ + --zsh <($out/bin/mods completion zsh) + ''; meta = { description = "AI on the command line"; @@ -64,7 +71,8 @@ buildGoModule rec { maintainers = with lib.maintainers; [ dit7ya caarlos0 + delafthi ]; mainProgram = "mods"; }; -} +}) diff --git a/pkgs/by-name/mo/monetdb/package.nix b/pkgs/by-name/mo/monetdb/package.nix index 02ac4a2f166f..c7345d8c50c3 100644 --- a/pkgs/by-name/mo/monetdb/package.nix +++ b/pkgs/by-name/mo/monetdb/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.53.3"; + version = "11.53.9"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; - hash = "sha256-8q8Q3b7D6BR+UMmcu4T5y+Xtwmr1URHc0Cq97tfDD6I="; + hash = "sha256-qltKYPEWU5w3SIJumxunUTwC//egn7UtvmcFL+bxIUk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/mongosh/package.nix b/pkgs/by-name/mo/mongosh/package.nix index 1edaf93a10c2..f5f79c4f8609 100644 --- a/pkgs/by-name/mo/mongosh/package.nix +++ b/pkgs/by-name/mo/mongosh/package.nix @@ -6,16 +6,16 @@ buildNpmPackage (finalAttrs: { pname = "mongosh"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "mongodb-js"; repo = "mongosh"; tag = "v${finalAttrs.version}"; - hash = "sha256-dngguv/ShxwfFpbYyyfJ1SmQhSgEsDOKcRSXdjsfcmo="; + hash = "sha256-QK2woc6tlnTwYCZ7QEWCn2bRknye2qY8AYAHMVR9i24="; }; - npmDepsHash = "sha256-W5qq3XUV+x0Ko1Ftp2JTHbaOSGsSG5a7qABthtnaU4o="; + npmDepsHash = "sha256-TfakEOiCtoRz2Fhwz5teOWq0OLb7uZaYiKHLSq/c1OU="; patches = [ ./disable-telemetry.patch diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index e6467727e4e8..b4c00396a67a 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.20"; + version = "11.21"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-grZji+s1nffeSMdvsJBsmY0tW4yul2a7gYnenOtGa8g="; + hash = "sha256-nMxGrOjgjxJAHWJdJMGJl+QEwOZtuYsJlkzlpM0hnd0="; stripRoot = false; }; diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix index 48b86d244389..df281f33cd44 100644 --- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix +++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nextcloud-talk-desktop"; - version = "1.2.3"; + version = "1.2.5"; # Building from source would require building also building Server and Talk components # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites src = fetchzip { url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64.zip"; - hash = "sha256-St0frZpSjAHnF6MJWMRm4Md0TxNnNSAbLf+Sz9EDgS4="; + hash = "sha256-Jozdyxd02LocmbRrR2pB7EtIRIjd988JtDhlCNbumks="; stripRoot = false; }; diff --git a/pkgs/by-name/no/nomino/package.nix b/pkgs/by-name/no/nomino/package.nix index 0c2ab9a42274..3f0345d49c59 100644 --- a/pkgs/by-name/no/nomino/package.nix +++ b/pkgs/by-name/no/nomino/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "nomino"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "yaa110"; repo = "nomino"; rev = version; - hash = "sha256-pSk1v4AyXETBJ8UupLJy8cNEqKRwkqJnqfzoHU0SdmE="; + hash = "sha256-DZTJng5aVYi14nojQ6G9+JkqSd9kn6yEYrwQbR8cd2M="; }; useFetchCargoVendor = true; - cargoHash = "sha256-P8QkAzZ7jR8U+WzMLo4kDwMrARLk+RQWOr/j+8GCN0A="; + cargoHash = "sha256-jXDbQEUzQ5E7lcutdvQMpyMfuILcJTFvQgq7rNI/XmM="; meta = with lib; { description = "Batch rename utility for developers"; diff --git a/pkgs/by-name/ns/nsncd/package.nix b/pkgs/by-name/ns/nsncd/package.nix index a39f21e3d9ec..7618db6a9df4 100644 --- a/pkgs/by-name/ns/nsncd/package.nix +++ b/pkgs/by-name/ns/nsncd/package.nix @@ -25,19 +25,27 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-9M8Y0WwXFlrpRleSQPYDpnjNnxKGvrtO6Istl9qM30M="; - checkFlags = [ - # Relies on the test environment to be able to resolve "localhost" - # on IPv4. That's not the case in the Nix sandbox somehow. Works - # when running cargo test impurely on a (NixOS|Debian) machine. - "--skip=ffi::test_gethostbyname2_r" + checkFlags = + [ + # Relies on the test environment to be able to resolve "localhost" + # on IPv4. That's not the case in the Nix sandbox somehow. Works + # when running cargo test impurely on a (NixOS|Debian) machine. + "--skip=ffi::test_gethostbyname2_r" - # Relies on /etc/services to be present? - "--skip=handlers::test::test_handle_getservbyname_name" - "--skip=handlers::test::test_handle_getservbyname_name_proto" - "--skip=handlers::test::test_handle_getservbyport_port" - "--skip=handlers::test::test_handle_getservbyport_port_proto" - "--skip=handlers::test::test_handle_getservbyport_port_proto_aliases" - ]; + # Relies on /etc/services to be present? + "--skip=handlers::test::test_handle_getservbyname_name" + "--skip=handlers::test::test_handle_getservbyname_name_proto" + "--skip=handlers::test::test_handle_getservbyport_port" + "--skip=handlers::test::test_handle_getservbyport_port_proto" + "--skip=handlers::test::test_handle_getservbyport_port_proto_aliases" + ] + ++ lib.optionals stdenv.hostPlatform.isBigEndian [ + # Expected serialisation output in tests doesn't account for endianness differences + # https://github.com/twosigma/nsncd/issues/160 + "--skip=handlers::test::test_hostent_serialization" + "--skip=handlers::test::test_innetgroup_serialization_in_group" + "--skip=handlers::test::test_netgroup_serialization" + ]; meta = with lib; { description = "Name service non-caching daemon"; diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix index 943bc71569ce..4ed5d3111316 100644 --- a/pkgs/by-name/op/opencloud/package.nix +++ b/pkgs/by-name/op/opencloud/package.nix @@ -28,13 +28,13 @@ let in buildGoModule rec { pname = "opencloud"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "opencloud"; tag = "v${version}"; - hash = "sha256-QHx97pEsAIj0F46vAPv/fuSc0sfUP7BYfMVCE1mE3co="; + hash = "sha256-/kQH7a+ddKnHAF/ra2oGbX15lcaEknS5hwLWFWCeLeI="; }; postPatch = '' diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix index 3b2ab9c9661d..0f9f1b53cabf 100644 --- a/pkgs/by-name/op/opencloud/web.nix +++ b/pkgs/by-name/op/opencloud/web.nix @@ -9,19 +9,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencloud-web"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "web"; tag = "v${finalAttrs.version}"; - hash = "sha256-nFiYnZ+um1J0pf0Dr0P1ZBeTeZnxOQc0ILEyhFF2kQw="; + hash = "sha256-11vHPrmtyqRIvR/619z2YvF3VAW5EfrAhwnGTVexEZA="; }; pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-vxZxwbJByTk45GDD2FNphMMdeLlF8uxyrlc9x42crNA="; + hash = "sha256-PAoDkeiZIzf4P21oct0pNwMHT6jMLtS44if6maxN9c0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 1e7e4470335c..93fa9982f5ed 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -26,12 +26,12 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "0.3.43"; + version = "0.3.51"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-EM44FkMPPkRChuLcNEEK3n4dLc5uqnX7dHROsZXyr58="; + hash = "sha256-lvosTLb9HI5IjE6Z1yEGNQn1M84zq23epgEhXGEuteQ="; }; tui = buildGoModule { @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit (finalAttrs) version; src = "${finalAttrs.src}/packages/tui"; - vendorHash = "sha256-/YxvM+HZM4aRqcjUiSX0D1DhhMJkmLdh7G4+fPqtnic="; + vendorHash = "sha256-MZAKEXA34dHiH4XYUlLq6zo8ppG8JD3nj7fhZMrr+TI="; subPackages = [ "cmd/opencode" ]; diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix index 2d19f3859f79..cef3211f0053 100644 --- a/pkgs/by-name/op/openturns/package.nix +++ b/pkgs/by-name/op/openturns/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openturns"; - version = "1.25"; + version = "1.25.1"; src = fetchFromGitHub { owner = "openturns"; repo = "openturns"; rev = "v${finalAttrs.version}"; - hash = "sha256-lAFfOwriDdYvfRK/5vEQ/v97o3l/aH8jPHCVf9vlfV4="; + hash = "sha256-TwM6RvXG4+IBNxH2Ajg9atcaOGlC4kzusH8+6VbI6m4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/openvscode-server/package.nix b/pkgs/by-name/op/openvscode-server/package.nix index 36d49ba424d9..44c2babca569 100644 --- a/pkgs/by-name/op/openvscode-server/package.nix +++ b/pkgs/by-name/op/openvscode-server/package.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openvscode-server"; - version = "1.99.3"; + version = "1.101.2"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${finalAttrs.version}"; - hash = "sha256-nA+StCJgutWjD7vgCCcj9B91QSF7dEHnlNtj7zgJRwI="; + hash = "sha256-pcsto9zEq8BTP5jlQoGQzWEhdJNJMNkJY9S6FGw7LrI="; }; ## fetchNpmDeps doesn't correctly process git dependencies @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) src nativeBuildInputs; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-lgzNpWFAIGNxjDZ60kRw80fP1qEItk3FN1s5t7KdxGA="; + outputHash = "sha256-iSKDwe/ufJnC7mDqG0x+WcCckyUY/9dI/4ZTMvfBWIc="; env = { FORCE_EMPTY_CACHE = true; FORCE_GIT_DEPS = true; diff --git a/pkgs/by-name/op/opkssh/package.nix b/pkgs/by-name/op/opkssh/package.nix index eec9e82baaec..939750544a9a 100644 --- a/pkgs/by-name/op/opkssh/package.nix +++ b/pkgs/by-name/op/opkssh/package.nix @@ -8,18 +8,18 @@ buildGoModule (finalAttrs: { pname = "opkssh"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "openpubkey"; repo = "opkssh"; tag = "v${finalAttrs.version}"; - hash = "sha256-8fbOhyrHgNG9ulu/DZvUHzIojvoHG/gb5+Ft/RmMHXk="; + hash = "sha256-8CWxxhqgSgFVRNjAvJ0faHI4rsSPQNkcSqVSzTHRJY4="; }; ldflags = [ "-X main.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-bkTQqtlZhZ2/WnQNRdZzfblkGKjaAS22RFl6I1O3/yA="; + vendorHash = "sha256-0H7hST5Czd/1rDQ0nO2FAnbG2lN3AZULs5M17zKa9FY="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix index 18ce88812f6e..0a3ea664efb3 100644 --- a/pkgs/by-name/ow/owi/package.nix +++ b/pkgs/by-name/ow/owi/package.nix @@ -14,14 +14,14 @@ let in ocamlPackages.buildDunePackage rec { pname = "owi"; - version = "0.2-unstable-2025-07-08"; + version = "0.2-unstable-2025-07-11"; src = fetchFromGitHub { owner = "ocamlpro"; repo = "owi"; - rev = "bcd7d362ed165c542deb2d49da1d45296aa03277"; + rev = "be3d93320dcbf7d4e991f9b240ff490b5a1b0acc"; fetchSubmodules = true; - hash = "sha256-611k9CQx0C3QKR4NZpnr77LoBZSFBEdU0uRnZshO1cc="; + hash = "sha256-yc/f/N+smGk3NwtZnP/k4ISN3mvp1GL9VTcjgosbQJw="; }; nativeBuildInputs = with ocamlPackages; [ @@ -85,5 +85,6 @@ ocamlPackages.buildDunePackage rec { maintainers = [ lib.maintainers.ethancedwards8 ]; teams = with lib.teams; [ ngi ]; mainProgram = "owi"; + badPlatforms = lib.platforms.darwin; }; } diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix index a10acdf65546..f2220f8801d5 100644 --- a/pkgs/by-name/p2/p2pool/package.nix +++ b/pkgs/by-name/p2/p2pool/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "p2pool"; - version = "4.8"; + version = "4.8.1"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - hash = "sha256-D1yQMcgRYVZf3/VGCmp6ZGu5YlWUmvlCx3pZqQF7JDM="; + hash = "sha256-UnvMR4s6o8n7K+9hig3iSFtbN/BmR6yqjc64X443ctk="; fetchSubmodules = true; }; @@ -58,7 +58,10 @@ stdenv.mkDerivation rec { description = "Decentralized pool for Monero mining"; homepage = "https://github.com/SChernykh/p2pool"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ratsclub ]; + maintainers = with maintainers; [ + ratsclub + JacoMalan1 + ]; mainProgram = "p2pool"; platforms = platforms.all; }; diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix index 9324880d9555..1ac1d813cbf5 100644 --- a/pkgs/by-name/pa/pack/package.nix +++ b/pkgs/by-name/pa/pack/package.nix @@ -3,36 +3,43 @@ buildGoModule, fetchFromGitHub, nix-update-script, - testers, - pack, + versionCheckHook, + writableTmpDirAsHomeHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "pack"; - version = "0.37.0"; + version = "0.38.2"; src = fetchFromGitHub { owner = "buildpacks"; repo = "pack"; - rev = "v${version}"; - hash = "sha256-QCN0UvWa5u9XX5LvY3yD8Xz2s1XzZUg/WXnAfWwZnY0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-JDvNG0HMwr/bbWbuSLwuC5y+ZePECW4u+dzMBcKrcNk="; }; - vendorHash = "sha256-W8FTk2eJYaTE9gCRwrT+mDhda/ZZeCytqQ9vvVZZHSQ="; + subPackages = [ "." ]; - subPackages = [ "cmd/pack" ]; + vendorHash = "sha256-PvGoHJP+MsfidKz72qFx638x+uirhgckIKCBdTUrqB8="; ldflags = [ "-s" "-w" - "-X github.com/buildpacks/pack.Version=${version}" + "-X github.com/buildpacks/pack/pkg/client.Version=${finalAttrs.version}" ]; passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = pack; }; }; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckProgramArg = "--version"; + versionCheckKeepEnvironment = [ "HOME" ]; + meta = { description = "CLI for building apps using Cloud Native Buildpacks"; homepage = "https://github.com/buildpacks/pack/"; @@ -40,4 +47,4 @@ buildGoModule rec { mainProgram = "pack"; maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/by-name/pc/pcsclite/package.nix b/pkgs/by-name/pc/pcsclite/package.nix index 4fd0d974e94d..b90cedf109b1 100644 --- a/pkgs/by-name/pc/pcsclite/package.nix +++ b/pkgs/by-name/pc/pcsclite/package.nix @@ -23,9 +23,6 @@ polkitSupport ? false, }: -assert polkitSupport -> dbusSupport; -assert systemdSupport -> dbusSupport; - stdenv.mkDerivation (finalAttrs: { inherit pname; version = "2.3.0"; @@ -132,5 +129,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ lib.maintainers.anthonyroussel ]; pkgConfigModules = [ "libpcsclite" ]; platforms = lib.platforms.unix; + broken = !(polkitSupport -> dbusSupport) || !(systemdSupport -> dbusSupport); }; }) diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index 1ca6d5454213..dc21ef689e72 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -21,7 +21,14 @@ php.buildComposerProject2 (finalAttrs: { nativeBuildInputs = [ installShellFiles ]; - php = php.withExtensions ({ all, ... }: with all; [ mbstring ]); + php = php.withExtensions ( + { all, ... }: + with all; + [ + mbstring + tokenizer + ] + ); postInstall = '' installShellCompletion --cmd phpactor \ diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index 347523085fd8..43e6ee7dbaf2 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -9,18 +9,18 @@ buildGoModule (finalAttrs: { pname = "pocket-id"; - version = "1.6.2"; + version = "1.6.4"; src = fetchFromGitHub { owner = "pocket-id"; repo = "pocket-id"; tag = "v${finalAttrs.version}"; - hash = "sha256-fg9iT4JGB3CvmPiRaQwfyKxZ5T0mweDQAQYYU/fdb/g="; + hash = "sha256-P6pA0760eo/dL1t5Jics4oSztM4F/C8lIuZ3dZ9x5C8="; }; sourceRoot = "${finalAttrs.src.name}/backend"; - vendorHash = "sha256-LutjhewhizxGc/YlNHpK81HrX+wSAAJLWtA+skTjn1w="; + vendorHash = "sha256-8D7sSmxR+Fq4ouB9SuoEDplu6Znv3U0BIyYISSmF6Bs="; env.CGO_ENABLED = 0; ldflags = [ @@ -42,7 +42,7 @@ buildGoModule (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/frontend"; - npmDepsHash = "sha256-AZ8je9uaJ1h9wxfs2RtPr2Ki0QNYD0nDd2BZDj6/sl8="; + npmDepsHash = "sha256-FiFSnN6DOMr8XghvyGTWB/EMTNfvpqlAgx7FPnbGQxU="; npmFlags = [ "--legacy-peer-deps" ]; env.BUILD_OUTPUT_PATH = "dist"; diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix index b435c8496caa..4560cf41dfd4 100644 --- a/pkgs/by-name/po/postfix/package.nix +++ b/pkgs/by-name/po/postfix/package.nix @@ -71,11 +71,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.10.2"; + version = "3.10.3"; src = fetchurl { url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz"; - hash = "sha256-vMpWQTLUz1+cnONU2rndNe6OniGQCGRiPIFdrBa/vCc="; + hash = "sha256-487AXZG20pWOzW6pBF+qNfecWw4ii5dazkatKv6BIFM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix index a77e50810126..f94b451d40d1 100644 --- a/pkgs/by-name/pr/pragtical/package.nix +++ b/pkgs/by-name/pr/pragtical/package.nix @@ -15,13 +15,14 @@ mbedtls_2, pcre2, SDL2, + xz, zlib, }: stdenv.mkDerivation (finalAttrs: { pname = "pragtical"; - version = "3.5.2"; - pluginManagerVersion = "1.2.9"; + version = "3.6.0"; + pluginManagerVersion = "1.4.0"; src = fetchFromGitHub { owner = "pragtical"; @@ -44,10 +45,13 @@ stdenv.mkDerivation (finalAttrs: { find subprojects -type d -name .git -prune -execdir rm -r {} + ''; - hash = "sha256-RT+/h5vUILlik/YqcpwgkdOJRmhGBtEHRVynjlHWunw="; + hash = "sha256-rJEUTLjMTv19W1wSvW2HJaxHrzrBQHiG74v8XlcqgMc="; }; + strictDeps = true; + nativeBuildInputs = [ + lua5_4 # needed for built-time lua bytecode generation meson ninja pkg-config @@ -63,12 +67,10 @@ stdenv.mkDerivation (finalAttrs: { mbedtls_2 pcre2 SDL2 + xz zlib ]; - # workaround for `libmbedx509.so.1, libmbedcrypto.so.7: error adding symbols: DSO missing from command line` - env.NIX_LDFLAGS = "-lmbedx509 -lmbedcrypto"; - mesonFlags = [ "-Duse_system_lua=true" ]; meta = { diff --git a/pkgs/by-name/pr/prime-server/package.nix b/pkgs/by-name/pr/prime-server/package.nix index 41bd6671019f..64ee8fa1d602 100644 --- a/pkgs/by-name/pr/prime-server/package.nix +++ b/pkgs/by-name/pr/prime-server/package.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/kevinkreiser/prime_server"; license = licenses.bsd2; maintainers = [ maintainers.Thra11 ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix index 0b2781b450cb..9473f961bd70 100644 --- a/pkgs/by-name/pr/protoc-gen-es/package.nix +++ b/pkgs/by-name/pr/protoc-gen-es/package.nix @@ -7,20 +7,20 @@ buildNpmPackage rec { pname = "protoc-gen-es"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protobuf-es"; tag = "v${version}"; - hash = "sha256-9urMliPPZf2cGX6esbS+GdyXFct389TJr8XafrebAxA="; + hash = "sha256-Xrd9O8VHdlrlbTze0m+jDodLu01B2uT93qOj8mLHrog="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-UaHINeTL69vRmnxpezpzgOh1wtiZ7QKb2N5RXxSFV6I="; + npmDepsHash = "sha256-+J70/ZUMc7GtSPSTxAaoz3s195Gp/Khcj3bEiloQyYQ="; npmWorkspace = "packages/protoc-gen-es"; diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix index d75918a0a005..5395c2c883c7 100644 --- a/pkgs/by-name/py/pytr/package.nix +++ b/pkgs/by-name/py/pytr/package.nix @@ -44,7 +44,10 @@ python3Packages.buildPythonApplication rec { --zsh <($out/bin/pytr completion zsh) ''; - nativeCheckInputs = [ versionCheckHook ]; + nativeCheckInputs = [ + versionCheckHook + python3Packages.pytestCheckHook + ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/ra/railway-wallet/package.nix b/pkgs/by-name/ra/railway-wallet/package.nix index 2a0c890bd63c..a1718aa4307d 100644 --- a/pkgs/by-name/ra/railway-wallet/package.nix +++ b/pkgs/by-name/ra/railway-wallet/package.nix @@ -5,11 +5,11 @@ }: appimageTools.wrapType2 rec { pname = "railway-wallet"; - version = "5.19.4"; + version = "5.22.3"; src = fetchurl { - url = "https://github.com/Railway-Wallet/Railway-Wallet/releases/download/v${version}/Railway-linux-x86_64.AppImage"; - hash = "sha256-7Z/1PwmjwbvKsZXncWB60WbGnQVTlSsqcsLy8mN2CI0="; + url = "https://github.com/Railway-Wallet/Railway-Wallet/releases/download/v${version}/Railway-v${version}-linux-x86_64.AppImage"; + hash = "sha256-Y0t4YzzJwIfRYHV3GIETeRfxoRJptQ83RoacP3kdYtc="; }; meta = { diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index d9293282a739..796d61b1392c 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -7,7 +7,7 @@ rainfrog, }: let - version = "0.3.2"; + version = "0.3.3"; in rustPlatform.buildRustPackage { inherit version; @@ -17,11 +17,11 @@ rustPlatform.buildRustPackage { owner = "achristmascarl"; repo = "rainfrog"; tag = "v${version}"; - hash = "sha256-3oRuJytFGPfWLoxtrpgEwRWAPE8HGct5PqU1mxDinZs="; + hash = "sha256-nGUk+997TBx/2U3QMF4OpRqzwNzC0ILRraz3kOzzoBw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-W/3UNZw3gHVI/3uIzyaDmKGjM8gsfcr86+Vxlfm9Yb4="; + cargoHash = "sha256-8RvZmQI1WXfM2Sh5bMAkeJVNvOUp8fmM0MznZzCpxgY="; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix index d03ea5890e21..3f1b57e795d6 100644 --- a/pkgs/by-name/ra/rasm/package.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "rasm"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitHub { owner = "EdouardBERGE"; repo = "rasm"; rev = "v${version}"; - hash = "sha256-KW33PrQply22PYKmz+KLImesSR275SwgLGc/dsBO3Tw="; + hash = "sha256-g44xSNpoSLBDQuNGlOIeavFtmlljowuRgce6/2lUt0M="; }; # by default the EXEC variable contains `rasm.exe` diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 3c9bf54719b3..b5d6fb58270c 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.64"; + version = "0.9.66"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-J3AqZIbpf/B0KMFjjNRq97E5OWPt7wJvIlDdfb4sbvU="; + hash = "sha256-0KIqPB41sS0rX5IBao+0ThPz4EttpZxSb5mL4Spuoho="; fetchSubmodules = true; }; @@ -40,14 +40,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-nWDMtQZE+96gnvEwtp84iOcbfMAjnqKZK0cgQuh4+k8="; + hash = "sha256-o0R5b+cE680RgdBT+4uiCtec3y3dGxYkBmnKzT/7JOg="; }; pnpmRoot = "../.."; useFetchCargoVendor = true; - cargoHash = "sha256-35REIeZy/D9UWzSI6yQZc1MRYwlAnjzsk5T7KOAhWVw="; + cargoHash = "sha256-ReRCzKbdmjPr9rQwCI7mLEs/MjV2yCp7FFZAlib1xIs="; cargoRoot = "../.."; diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 2caf3a39ea76..32efff71fbcc 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -34,13 +34,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rerun"; - version = "0.23.4"; + version = "0.24.0"; src = fetchFromGitHub { owner = "rerun-io"; repo = "rerun"; tag = finalAttrs.version; - hash = "sha256-4+vx4BMGJpdN6k+UxAx2unO4maxoUd9uP9Q3mYjpyF4="; + hash = "sha256-OMSLCS1j55MYsC3pv4qPQjqO9nRgGj+AUOlcyESFXek="; }; # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-lmIe/QH8+/2LgaObbEvRgThP82AAnmGzf2SPfHExHks="; + cargoHash = "sha256-8XmOtB1U2SAOBchrpKMAv5I8mFvJniVVcmFPugtD4RI="; cargoBuildFlags = [ "--package rerun-cli" ]; cargoTestFlags = [ "--package rerun-cli" ]; diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index fc6f025c68cd..6e356c0b7374 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2025-07-12"; + version = "0-unstable-2025-07-20"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "8fc70859aaef7cc20181ac6d115a6ff8ca5a9162"; - hash = "sha256-MbbjiLa24PxaD7ZizR2CbTPy6yDFZTAV3QurFyYb3r8="; + rev = "e490a11c1a2ecfadd2cbc0759d77f4706bc2ee61"; + hash = "sha256-+UWVKs3xKitt8B/QCugnTuQaxWCgFcetJQ2RQNUDy00="; }; dontConfigure = true; diff --git a/pkgs/by-name/ru/rundeck-cli/package.nix b/pkgs/by-name/ru/rundeck-cli/package.nix index 7de143781188..7133be4c9825 100644 --- a/pkgs/by-name/ru/rundeck-cli/package.nix +++ b/pkgs/by-name/ru/rundeck-cli/package.nix @@ -11,6 +11,9 @@ let jre11_minimal_headless = jre11_minimal.override { jdk = jdk11_headless; + modules = [ + "java.logging" + ]; }; in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/sc/scala-cli/sources.json b/pkgs/by-name/sc/scala-cli/sources.json index fa51c3933560..5759da29dbd1 100644 --- a/pkgs/by-name/sc/scala-cli/sources.json +++ b/pkgs/by-name/sc/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.8.3", + "version": "1.8.4", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "0r5ximsin9b2xd9m7cbh5d294mcdhc6w41lsydkh0xs6kvy7gkd1" + "sha256": "1cvfsyzrfycpmd7ay9pvnh1z03n03gjrs1wpzkynj2dpks1qbvn5" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "0913pvppxk8yxs74zqrqf78vjw891r0dx1cn5n1djkn9nim8fxg7" + "sha256": "07mbdxqwf1zl30dg1djmpgry6q1dp0yq8w5qscys3wci2yfjidni" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "0z757cb44gm0d7vqm1dsl3jkcqp7cmbypll74ih28c8gf4llnrgd" + "sha256": "1m9zbndsai2p5gbfsby0b4a9371jdapaxhsib6jwx1ps2ay565h8" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0ddk8f8pr24hmnc9a8r8smswh19fxgya16mkakmvhxk3xb0i1gz0" + "sha256": "03nnd86qd8hy65di2rjqjp6vc3hv1rmw2agrrbg9v0yhh0r0in3q" } } } diff --git a/pkgs/by-name/sc/scid-vs-pc/package.nix b/pkgs/by-name/sc/scid-vs-pc/package.nix index 13853d0f09a6..78d96761773f 100644 --- a/pkgs/by-name/sc/scid-vs-pc/package.nix +++ b/pkgs/by-name/sc/scid-vs-pc/package.nix @@ -64,6 +64,7 @@ tcl.mkTclDerivation rec { description = "Chess database with play and training functionality"; homepage = "https://scidvspc.sourceforge.net/"; license = lib.licenses.gpl2Only; + mainProgram = "scid"; maintainers = [ maintainers.paraseba ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index aaf9dfb941a5..0d0a9174fd0e 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -65,13 +65,13 @@ in rustPlatform.buildRustPackage { pname = "servo"; - version = "0-unstable-2025-07-13"; + version = "0-unstable-2025-07-21"; src = fetchFromGitHub { owner = "servo"; repo = "servo"; - rev = "93e5b672a78247205c431d5741952bdf23c3fcc2"; - hash = "sha256-0826hNZ45BXXNzdZKbyUW/CfwVRZmpYU1e6efaACh4o="; + rev = "50603e5074064211cee253b0782cb29ae413d3ee"; + hash = "sha256-qlIjyvrtCwnUVO12LYm52drsQJqgfOEj7rV4LgubG5E="; # Breaks reproducibility depending on whether the picked commit # has other ref-names or not, which may change over time, i.e. with # "ref-names: HEAD -> main" as long this commit is the branch HEAD @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage { }; useFetchCargoVendor = true; - cargoHash = "sha256-uB5eTGiSq+DV7VwYoyLR2HH3DQpSV4xnP7C7iXZa7S0="; + cargoHash = "sha256-kKuauc5yK6IOKDL9o+vmNLg4wyZ+24YNT5Yhn+z51jE="; # set `HOME` to a temp dir for write access # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328) diff --git a/pkgs/by-name/si/sizelint/package.nix b/pkgs/by-name/si/sizelint/package.nix index 19d8e57fedd6..41c2b0b35eec 100644 --- a/pkgs/by-name/si/sizelint/package.nix +++ b/pkgs/by-name/si/sizelint/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "sizelint"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "a-kenji"; repo = "sizelint"; tag = "v${version}"; - hash = "sha256-bFOe8zrWzfIPzOn6NAHD5y943/v8cwCMzC2pTPEUi2Q="; + hash = "sha256-RwiopJHVyQE+WwiB5Bd89kfQxLl7TROZSB3aanf3fB0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-h5NJXxiGe3TIFt2aa08XAxPB2rtuBva/6GEhajin4OE="; + cargoHash = "sha256-Kf6QreDGYM0ndmkOND4zhcDdx6SsXHuj7rcwy6tGyQk="; meta = { description = "Lint your file tree based on file sizes"; diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index 9d11d12e7a30..9e5043d159c9 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -14,7 +14,7 @@ python312Packages.buildPythonApplication rec { pname = "snapcraft"; - version = "8.10.1"; + version = "8.10.2"; pyproject = true; @@ -22,7 +22,7 @@ python312Packages.buildPythonApplication rec { owner = "canonical"; repo = "snapcraft"; tag = version; - hash = "sha256-WGCbqtuCOF5X8yOVrgLKWyDcqjpb8sbTPRZzVesnAIY="; + hash = "sha256-klG+cT2vXo9v9tIJhJNCeGTiuV5C+oed0Vi9310PnqQ="; }; patches = [ diff --git a/pkgs/by-name/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix index 2a1fbd5b7c1f..c2e2216aadda 100644 --- a/pkgs/by-name/so/source-meta-json-schema/package.nix +++ b/pkgs/by-name/so/source-meta-json-schema/package.nix @@ -5,7 +5,7 @@ cmake, }: let - version = "9.4.0"; + version = "10.0.0"; in stdenv.mkDerivation (finalAttrs: { pname = "source-meta-json-schema"; @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "sourcemeta"; repo = "jsonschema"; rev = "v${version}"; - hash = "sha256-7Emcoabcj4p0bAAryIOaagojU3sQkO5NZ8UyerLjXms="; + hash = "sha256-fYNbHU9DcSzMrMt+pDbbtPirTc+Wu4jq+vSqq+qzhtE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spideroak/package.nix b/pkgs/by-name/sp/spideroak/package.nix index e89cfeffe789..38fd69606ebc 100644 --- a/pkgs/by-name/sp/spideroak/package.nix +++ b/pkgs/by-name/sp/spideroak/package.nix @@ -78,7 +78,6 @@ stdenv.mkDerivation { description = "Secure online backup and sychronization"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ amorsillo ]; platforms = lib.platforms.linux; mainProgram = "spideroak"; }; diff --git a/pkgs/by-name/sp/spirit/package.nix b/pkgs/by-name/sp/spirit/package.nix index 3e33990b96cd..669991608b1a 100644 --- a/pkgs/by-name/sp/spirit/package.nix +++ b/pkgs/by-name/sp/spirit/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { version = "0.8.0"; src = fetchFromGitHub { - owner = "cashapp"; + owner = "block"; repo = "spirit"; tag = "v${finalAttrs.version}"; hash = "sha256-bGKqiCd9dggppORouoWlAoAaYdx4vAivsP22KWm1fxU="; @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { ]; meta = { - homepage = "https://github.com/cashapp/spirit"; + homepage = "https://github.com/block/spirit"; description = "Online schema change tool for MySQL"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aaronjheng ]; diff --git a/pkgs/by-name/st/steamtinkerlaunch/package.nix b/pkgs/by-name/st/steamtinkerlaunch/package.nix index de45aa586e88..1eb594dcbe2b 100644 --- a/pkgs/by-name/st/steamtinkerlaunch/package.nix +++ b/pkgs/by-name/st/steamtinkerlaunch/package.nix @@ -20,13 +20,13 @@ stdenvNoCC.mkDerivation { pname = "steamtinkerlaunch"; - version = "12.12-unstable-2025-06-02"; + version = "12.12-unstable-2025-07-14"; src = fetchFromGitHub { owner = "sonic2kk"; repo = "steamtinkerlaunch"; - rev = "32bf79010dd2eb981ad5022c5b79fb65d2324d8a"; - hash = "sha256-iWGbUI56e7uoTtAlykvkDCnS61WsRExfTDIIS85x5pQ="; + rev = "8550ab26a712b7f5f6d0947070181446b9de61fd"; + hash = "sha256-mCcxdm8odHvTt4aP58RHY6NkaUMmMbQesUtY6dvIvOc="; }; passthru.updateScript = unstableGitUpdater { diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 0626ec7dcca2..3da5c053372b 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.15.55"; + version = "3.16.4"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-eDKP15xvd/SHZd4i2EorRZkS7ih5d8YNvCJQsRQeMYs="; + hash = "sha256-E4+FdFdc7TNIJ3f2aeo7TkxS1D7KcqNdN8ILfo4T0eA="; }; outputs = [ diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 9ed08e200f4e..7212e2e7277b 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -16,8 +16,6 @@ waylandSupport ? false, }: -assert waylandSupport -> stdenv.hostPlatform.isLinux; - buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; version = "0.17.0"; @@ -97,7 +95,7 @@ buildGoModule rec { mainProgram = "supersonic" + lib.optionalString waylandSupport "-wayland"; description = "Lightweight cross-platform desktop client for Subsonic music servers"; homepage = "https://github.com/dweymouth/supersonic"; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux ++ lib.optionals (!waylandSupport) platforms.darwin; license = licenses.gpl3Plus; maintainers = with maintainers; [ zane diff --git a/pkgs/by-name/ta/task-keeper/package.nix b/pkgs/by-name/ta/task-keeper/package.nix index 4fee335143fa..2814510162dc 100644 --- a/pkgs/by-name/ta/task-keeper/package.nix +++ b/pkgs/by-name/ta/task-keeper/package.nix @@ -8,19 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "task-keeper"; - version = "0.29.0"; + version = "0.29.3"; src = fetchFromGitHub { owner = "linux-china"; repo = "task-keeper"; tag = "v${version}"; - hash = "sha256-D+aAqyJ7DzkaGHY+MEItcxQwuNKXzZhV/0HVj5WMqn0="; + hash = "sha256-89KR1u4aTd32tGPiW4qUUk9eC7d9pGSBuZ8C8QVgMQ4="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; useFetchCargoVendor = true; - cargoHash = "sha256-asmdiJJmm+59vts0tkKDo7gkHOXbRM6FQWhdjfZ3w7U="; + cargoHash = "sha256-eLdGLKem/Sh9cQ7TRbKymUIldpctBKk1JBjWiSwLloo="; # tests depend on many packages (java, node, python, sbt, ...) - which I'm not currently willing to set up 😅 doCheck = false; diff --git a/pkgs/by-name/tf/tfsort/package.nix b/pkgs/by-name/tf/tfsort/package.nix index 017b4c521d99..aaf253bab4dd 100644 --- a/pkgs/by-name/tf/tfsort/package.nix +++ b/pkgs/by-name/tf/tfsort/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "tfsort"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "AlexNabokikh"; repo = "tfsort"; tag = "v${finalAttrs.version}"; - hash = "sha256-4LB4A1zvurhaV18BqT3m6ltJJz/ny0Fd+a52pEREBSQ="; + hash = "sha256-PQ7DROZf67pa6VeSsACgOhXz0jCmh48yiVAxMMbyIII="; }; vendorHash = "sha256-SebYucVQTbIr3kCaCVejw3FEaw9wi2fBVT55yuZRn48="; diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index fe3089f9ff8b..3e54cedf94ab 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "0.4.30"; + version = "0.4.34"; src = fetchFromGitHub { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-jRal4zwuP3kniS4vfS97sYKuXC+3I3kLMaBKbpa3ZUg="; + hash = "sha256-CCSqfgi7vTcDVgeOm/blqpw2Nq7rgov+R8+oYhlICHM="; }; # Tests relies on the presence of network doCheck = false; cargoBuildFlags = [ "--package tombi-cli" ]; - cargoHash = "sha256-JZlWYzKK6un1IMpHZ/o7SibLHROIitDpVgIRds3m5Ns="; + cargoHash = "sha256-2dLkZnGOVclp0EnAKsVH8HRTOXtq/1ADkoS5UiLGGnQ="; postPatch = '' substituteInPlace Cargo.toml \ diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix index 61cae96e1104..53fa8b8ae269 100644 --- a/pkgs/by-name/tr/tracy/package.nix +++ b/pkgs/by-name/tr/tracy/package.nix @@ -25,7 +25,6 @@ }: assert withGtkFileSelector -> stdenv.hostPlatform.isLinux; -assert withWayland -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation rec { pname = if withWayland then "tracy-wayland" else "tracy-glfw"; @@ -130,6 +129,6 @@ stdenv.mkDerivation rec { mpickering nagisa ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux ++ lib.optionals (!withWayland) platforms.darwin; }; } diff --git a/pkgs/by-name/tu/tuxedo-rs/package.nix b/pkgs/by-name/tu/tuxedo-rs/package.nix index 1d3d8be7b08a..66253c812726 100644 --- a/pkgs/by-name/tu/tuxedo-rs/package.nix +++ b/pkgs/by-name/tu/tuxedo-rs/package.nix @@ -2,10 +2,9 @@ lib, fetchFromGitHub, rustPlatform, - testers, - tuxedo-rs, + versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "tuxedo-rs"; version = "0.3.1"; @@ -14,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "AaronErhardt"; repo = "tuxedo-rs"; - rev = "tailor-v${version}"; + rev = "tailor-v${finalAttrs.version}"; hash = "sha256-+NzwUs8TZsA0us9hI1UmEKdiOo9IqTRmTOHs4xmC7MY="; }; @@ -24,11 +23,11 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-EkTLL7thZ/bBpY7TwfEsPOjJxzQ3vpxDi+sYPNAK6og="; - passthru.tests.version = testers.testVersion { - package = tuxedo-rs; - command = "${meta.mainProgram} --version"; - version = version; - }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; + versionCheckProgramArg = "--version"; postInstall = '' install -Dm444 tailord/com.tux.Tailor.conf -t $out/share/dbus-1/system.d @@ -52,4 +51,4 @@ rustPlatform.buildRustPackage rec { platforms = platforms.linux; mainProgram = "tailor"; }; -} +}) diff --git a/pkgs/by-name/tw/twingate/package.nix b/pkgs/by-name/tw/twingate/package.nix index 25fec007ae26..4ad686a44c4a 100644 --- a/pkgs/by-name/tw/twingate/package.nix +++ b/pkgs/by-name/tw/twingate/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "twingate"; - version = "2025.155.154174"; + version = "2025.175.154516"; src = fetchurl { url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb"; - hash = "sha256-TPXw9PDNZ/0X3yZ51mEBtCi9/NO7T6M66nauoBOn6HQ="; + hash = "sha256-WqIG5AUfRxkJ1qzGs6cB/2fe/UUNOZiL5/v9QMXlmK8="; }; buildInputs = [ diff --git a/pkgs/by-name/up/upscaler/package.nix b/pkgs/by-name/up/upscaler/package.nix index 9d25e57aef0a..4a7d059b1aeb 100644 --- a/pkgs/by-name/up/upscaler/package.nix +++ b/pkgs/by-name/up/upscaler/package.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { pname = "upscaler"; - version = "1.5.2"; + version = "1.6.0"; pyproject = false; # meson instead of pyproject @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = "Upscaler"; rev = version; - hash = "sha256-QpKeu4k31BKcpPFLvb4iuFMdE3IwQARCDXTqWhWhBM0="; + hash = "sha256-OsycWrMR/SEZTlNQFd0wKF4CQNXKV/mBHaqiliMFw00="; }; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/by-name/wa/wayback-x11/package.nix b/pkgs/by-name/wa/wayback-x11/package.nix new file mode 100644 index 000000000000..2c3423f0a952 --- /dev/null +++ b/pkgs/by-name/wa/wayback-x11/package.nix @@ -0,0 +1,64 @@ +{ + fetchFromGitLab, + lib, + libxkbcommon, + meson, + ninja, + pixman, + pkg-config, + scdoc, + stdenv, + unstableGitUpdater, + wayland, + wayland-protocols, + wayland-scanner, + wlroots_0_19, + xwayland, +}: + +stdenv.mkDerivation { + pname = "wayback"; + version = "0-unstable-2025-07-20"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "wayback"; + repo = "wayback"; + rev = "4b1b4c59f67a2639e960d6b19e1282cf03fc3660"; + hash = "sha256-+4fPMVVPoUAYbt0jgfl+dmt0ZNyGGWF7xuF1UzZ2uiU="; + }; + + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-scanner + ]; + + buildInputs = [ + libxkbcommon + pixman + wayland + wayland-protocols + wlroots_0_19 + xwayland + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "X11 compatibility layer leveraging wlroots and Xwayland"; + homepage = "https://wayback.freedesktop.org"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + mainProgram = "wayback-session"; + maintainers = with lib.maintainers; [ dramforever ]; + }; +} diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix index b8933e50499b..e5f9df2c338c 100644 --- a/pkgs/by-name/we/weaviate/package.nix +++ b/pkgs/by-name/we/weaviate/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "weaviate"; - version = "1.31.4"; + version = "1.31.6"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-DarJN5fbeuhAc1hFAGJR+aqgSWjMblqcj+rMyOdjMKQ="; + hash = "sha256-UuvIMmN4gyAzXB9ZXmPATOyFt7hNVh2r+c+Ho1Tn/WA="; }; vendorHash = "sha256-xAP9jrkpQFoGovTL5nymG2CYxwseJ3Be3NoVVrWXDYs="; diff --git a/pkgs/by-name/wi/winbox4/package.nix b/pkgs/by-name/wi/winbox4/package.nix index f29a92714b16..5b4104c16603 100644 --- a/pkgs/by-name/wi/winbox4/package.nix +++ b/pkgs/by-name/wi/winbox4/package.nix @@ -5,7 +5,7 @@ }: let pname = "winbox"; - version = "4.0beta21"; + version = "4.0beta26"; metaCommon = { description = "Graphical configuration utility for RouterOS-based devices"; @@ -23,13 +23,13 @@ let x86_64-zip = callPackage ./build-from-zip.nix { inherit pname version metaCommon; - hash = "sha256-Uoawz+CW1JLVOEoxSF49WpF31VuUDWK4q9tl1qAwS/c="; + hash = "sha256-m0+ofS1j6NaGW5ArldAn2dLUh0hfxtvEIRdRMKA1vc4="; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-PCdN5z77RU5WgYzk2h/ou2OeswZQl32FfxozEZ8ZlTo="; + hash = "sha256-3IrRDdNHzGyqLc2Ba5+WIpDN9CyCUvC8Q8Y0hMFazBk="; }; in (if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: { diff --git a/pkgs/by-name/wp/wpprobe/package.nix b/pkgs/by-name/wp/wpprobe/package.nix index 8c5fa5cafa9b..5a7d86312be8 100644 --- a/pkgs/by-name/wp/wpprobe/package.nix +++ b/pkgs/by-name/wp/wpprobe/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "wpprobe"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Chocapikk"; repo = "wpprobe"; tag = "v${finalAttrs.version}"; - hash = "sha256-duTd+4nY8G8+RPlNBrcEZ4hBd4lf/gEyykIdbWcWPbs="; + hash = "sha256-krYUwvFFOl05e/GTdIQvDUkplgcc4/lrWCv8mxmCz9E="; }; vendorHash = "sha256-KV6Ss0fN3xwm5Id7MAHMUjq9TsQbaInLjd5xcLKGX6U="; diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix index 720fd3ed5bbe..d34b7018ac9e 100644 --- a/pkgs/by-name/za/zapzap/package.nix +++ b/pkgs/by-name/za/zapzap/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "zapzap"; - version = "6.1"; + version = "6.1.1-2"; pyproject = true; src = fetchFromGitHub { owner = "rafatosta"; repo = "zapzap"; tag = version; - hash = "sha256-g3J9oVIRiar0QoksRjJZsbvSKiFBILaUdSUscNs1VXE="; + hash = "sha256-gd9DxTck0YG0ETmFMzsc/0osMTB4txr7pQ9Xw4dLP+A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ze/zenith/package.nix b/pkgs/by-name/ze/zenith/package.nix index a0d8928478b0..fe2e34fbe294 100644 --- a/pkgs/by-name/ze/zenith/package.nix +++ b/pkgs/by-name/ze/zenith/package.nix @@ -7,8 +7,6 @@ makeWrapper, }: -assert nvidiaSupport -> stdenv.hostPlatform.isLinux; - rustPlatform.buildRustPackage rec { pname = "zenith"; version = "0.14.1"; @@ -45,6 +43,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/bvaisvil/zenith"; license = licenses.mit; maintainers = with maintainers; [ wegank ]; - platforms = platforms.unix; + platforms = if nvidiaSupport then platforms.linux else platforms.unix; }; } diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix index cc96578c1c62..09a9ac05db2c 100644 --- a/pkgs/desktops/gnome/extensions/pop-shell/default.nix +++ b/pkgs/desktops/gnome/extensions/pop-shell/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation { pname = "gnome-shell-extension-pop-shell"; - version = "1.2.0-unstable-2025-03-10"; + version = "1.2.0-unstable-2025-07-09"; src = fetchFromGitHub { owner = "pop-os"; repo = "shell"; - rev = "b3fc4253dc29b30fb52ac5eef5d3af643a46d18c"; - hash = "sha256-EMX1AREpOO3DgxV/EbF2hP5JLggzlgFu1gsbhF3W1os="; + rev = "6fd8c039a081e8ad7bbd40ef7883ec6e5fc2a3f8"; + hash = "sha256-3zIbfjaJSUbPmUVppoSBWviQWQvykaT1qw9uQvcXmvM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/gcc/ng/15/gcc/custom-threading-model.patch b/pkgs/development/compilers/gcc/ng/15/gcc/custom-threading-model.patch deleted file mode 100644 index fb82e194263f..000000000000 --- a/pkgs/development/compilers/gcc/ng/15/gcc/custom-threading-model.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 46280d27a5c96b2efa7a61f49ee8dc14f7e10d0c Mon Sep 17 00:00:00 2001 -From: John Ericson -Date: Sun, 22 Aug 2021 01:14:22 -0400 -Subject: [PATCH] Factor out thread model detection with `GCC_AC_THREAD_MODEL` -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This macro deduplicates the - - $CC -v 2>&1 | sed -n 's/^Thread model: //p' - -check that was occurring in various runtime libs. - -Additionally, as a bit of an Easter egg, this also allows overriding -what the compiler would return by setting the -`gcc_cv_target_thread_file` cache variable first. I admit that it is in -fact this Easter egg that led me to write the patch. The use-case for it -is for making multilib builds where the library sets do not all share -the same thread model easier. See also `THREAD_MODEL_SPEC` for more -about the varying thread models use-case. - -Arguably one could could try to define on `THREAD_MODEL_SPEC` on more -platforms (besides e.g. AIX) but the ramifications of this are a bit -unclear. Setting `gcc_cv_target_thread_file` directly is a "low tech" -solution that will work for now for sure. Of course, since setting a -cache variable like this a hacky trick, I will not expect this to be at -all stable/guaranteed to work, going forward. - -Thanks to Arsen who on IRC discussed these things with me, including in -particular making it a cache var not `--with-model` flag, to not -prematurely foster expectations that this is stable. - -Suggested-by: Arsen Arsenović ---- - config/gthr.m4 | 23 +++++++++++++++++++++++ - libatomic/configure.ac | 4 +--- - libgcc/configure.ac | 4 +--- - libphobos/m4/druntime/os.m4 | 2 +- - libstdc++-v3/acinclude.m4 | 8 +++----- - 5 files changed, 29 insertions(+), 12 deletions(-) - -diff --git a/config/gthr.m4 b/config/gthr.m4 -index 11996247f15..e8fac4a5721 100644 ---- a/config/gthr.m4 -+++ b/config/gthr.m4 -@@ -5,6 +5,26 @@ dnl Public License, this file may be distributed as part of a program - dnl that contains a configuration script generated by Autoconf, under - dnl the same distribution terms as the rest of that program. - -+dnl Define thread model -+ -+dnl usage: GCC_AC_THREAD_MODEL -+AC_DEFUN([GCC_AC_THREAD_MODEL], -+[ -+# Specify the threading model for this GCC runtime library -+# Pass with no value to take from compiler's metadata -+# Pass with a value to specify a thread package -+# 'single' means single threaded -- without threads. -+AC_CACHE_CHECK([for the threading model used by GCC], [gcc_cv_target_thread_file], [ -+ # Set new cache variable -+ gcc_cv_target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` -+]) -+# Set variable name (not prefixed enough to be a good cache variable -+# name) traditionally used for this purpose, to avoid having to change -+# a bunch of configure scripts. -+target_thread_file="$gcc_cv_target_thread_file" -+]) -+ -+ - dnl Define header location by thread model - - dnl usage: GCC_AC_THREAD_HEADER([thread_model]) -@@ -23,6 +43,9 @@ case $1 in - vxworks) thread_header=config/gthr-vxworks.h ;; - win32) thread_header=config/i386/gthr-win32.h ;; - mcf) thread_header=config/i386/gthr-mcf.h ;; -+ *) -+ AC_MSG_ERROR([No known header for threading model '$1'.]) -+ ;; - esac - AC_SUBST(thread_header) - ]) -diff --git a/libatomic/configure.ac b/libatomic/configure.ac -index aafae71028d..a1aa3bdf69f 100644 ---- a/libatomic/configure.ac -+++ b/libatomic/configure.ac -@@ -162,9 +162,7 @@ libtool_VERSION=3:0:2 - AC_SUBST(libtool_VERSION) - - # Check for used threading-model --AC_MSG_CHECKING([for thread model used by GCC]) --target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` --AC_MSG_RESULT([$target_thread_file]) -+GCC_AC_THREAD_MODEL - - case "$target" in - *aarch64*) -diff --git a/libgcc/configure.ac b/libgcc/configure.ac -index 85e4f1bc48b..d44493f9653 100644 ---- a/libgcc/configure.ac -+++ b/libgcc/configure.ac -@@ -305,9 +305,7 @@ AC_SUBST([use_tm_clone_registry]) - - AC_LIB_PROG_LD_GNU - --AC_MSG_CHECKING([for thread model used by GCC]) --target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` --AC_MSG_RESULT([$target_thread_file]) -+GCC_AC_THREAD_MODEL - - # Check for assembler CFI support. - AC_CACHE_CHECK([whether assembler supports CFI directives], [libgcc_cv_cfi], -diff --git a/libphobos/m4/druntime/os.m4 b/libphobos/m4/druntime/os.m4 -index ef8ca434407..7bb91362dbe 100644 ---- a/libphobos/m4/druntime/os.m4 -+++ b/libphobos/m4/druntime/os.m4 -@@ -32,7 +32,7 @@ case $1 in - # TODO: These targets need porting. - dce|mipssde|rtems|tpf|vxworks) - DCFG_THREAD_MODEL="Single" ;; -- *) as_fn_error "Thread implementation '$1' not recognised" "$LINENO" 5 ;; -+ *) AC_MSG_ERROR([Thread implementation '$1' not recognised]) ;; - esac - AC_SUBST(DCFG_THREAD_MODEL) - ]) -diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 -index a0094c2dd95..66fc3abe4fd 100644 ---- a/libstdc++-v3/acinclude.m4 -+++ b/libstdc++-v3/acinclude.m4 -@@ -4345,9 +4345,7 @@ dnl Substs: - dnl thread_header - dnl - AC_DEFUN([GLIBCXX_ENABLE_THREADS], [ -- AC_MSG_CHECKING([for thread model used by GCC]) -- target_thread_file=`$CXX -v 2>&1 | sed -n 's/^Thread model: //p'` -- AC_MSG_RESULT([$target_thread_file]) -+ GCC_AC_THREAD_MODEL - GCC_AC_THREAD_HEADER([$target_thread_file]) - ]) - -@@ -4357,7 +4355,8 @@ dnl Check if gthread implementation defines the types and functions - dnl required by the c++0x thread library. Conforming gthread - dnl implementations can define __GTHREADS_CXX0X to enable use with c++0x. - dnl --dnl GLIBCXX_ENABLE_SYMVERS must be done before this. -+dnl GLIBCXX_ENABLE_SYMVERS and GLIBCXX_ENABLE_THREADS must be done -+dnl before this. - dnl - AC_DEFUN([GLIBCXX_CHECK_GTHREADS], [ - GLIBCXX_ENABLE(libstdcxx-threads,auto,,[enable C++11 threads support]) -@@ -4372,7 +4371,6 @@ AC_DEFUN([GLIBCXX_CHECK_GTHREADS], [ - CXXFLAGS="$CXXFLAGS -fno-exceptions \ - -I${toplevel_srcdir}/libgcc -I${toplevel_builddir}/libgcc" - -- target_thread_file=`$CXX -v 2>&1 | sed -n 's/^Thread model: //p'` - case $target_thread_file in - posix) - CXXFLAGS="$CXXFLAGS -DSUPPORTS_WEAK -DGTHREAD_USE_WEAK -D_PTHREADS" --- -2.47.2 - diff --git a/pkgs/development/compilers/gcc/ng/15/libgcc/force-regular-dirs.patch b/pkgs/development/compilers/gcc/ng/15/libgcc/force-regular-dirs.patch new file mode 100644 index 000000000000..c67f2f4498ea --- /dev/null +++ b/pkgs/development/compilers/gcc/ng/15/libgcc/force-regular-dirs.patch @@ -0,0 +1,49 @@ +From bb3277895d3bd77bcacb7c489ebb1390478bbc12 Mon Sep 17 00:00:00 2001 +From: John Ericson +Date: Thu, 17 Jul 2025 11:00:07 -0400 +Subject: [PATCH 2/2] Force regular dirs + +Override directories in libgcc so they are normal $out/lib and +$dev/include. This is not suitable for upstreaming, but is done on top +of a different patch which is, and which makes this smaller. + +--- + libgcc/Makefile.in | 6 +++--- + libgcc/configure.ac | 3 --- + 2 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in +index 4661c36703d..986cd035148 100644 +--- a/libgcc/Makefile.in ++++ b/libgcc/Makefile.in +@@ -202,10 +202,10 @@ STRIP = @STRIP@ + STRIP_FOR_TARGET = $(STRIP) + + # Used to install the shared libgcc. +-slibdir = @slibdir@ ++slibdir = $(libdir) + # Maybe used for DLLs on Windows targets. +-toolexecdir = @toolexecdir@ +-toolexeclibdir = @toolexeclibdir@ ++toolexecdir = $(bindir) ++toolexeclibdir = $(libdir) + + export AR_FOR_TARGET + export AR_CREATE_FOR_TARGET +diff --git a/libgcc/configure.ac b/libgcc/configure.ac +index 5fdac5d95f2..89044cb65c9 100644 +--- a/libgcc/configure.ac ++++ b/libgcc/configure.ac +@@ -479,9 +479,6 @@ if test x"$enable_as_accelerator_for" != x; then + accel_dir_suffix=/accel/${target_noncanonical} + real_host_noncanonical=${enable_as_accelerator_for} + fi +-# Directory in which the compiler finds libraries etc. +-libdir=${orig_libdir}/gcc/${real_host_noncanonical}/'$(version)'${accel_dir_suffix} +-includedir=${libdir}/include + + if test x"$enable_offload_targets" != x; then + extra_parts="${extra_parts} crtoffloadbegin.o crtoffloadend.o" +-- +2.47.2 + diff --git a/pkgs/development/compilers/gcc/ng/15/libgfortran/force-regular-dirs.patch b/pkgs/development/compilers/gcc/ng/15/libgfortran/force-regular-dirs.patch new file mode 100644 index 000000000000..fc7b69ea6e6e --- /dev/null +++ b/pkgs/development/compilers/gcc/ng/15/libgfortran/force-regular-dirs.patch @@ -0,0 +1,53 @@ +From 7a0c8ca8872a73c6886940448ba9b3203b13268d Mon Sep 17 00:00:00 2001 +From: John Ericson +Date: Mon, 21 Jul 2025 11:42:13 -0400 +Subject: [PATCH] libgfortran: Force regular include/lib dir + +--- + libgfortran/Makefile.am | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am +index 21b35c76a06..3d38cde5b42 100644 +--- a/libgfortran/Makefile.am ++++ b/libgfortran/Makefile.am +@@ -42,14 +42,13 @@ extra_darwin_ldflags_libgfortran += -Wc,-nodefaultrpaths + extra_darwin_ldflags_libgfortran += -Wl,-rpath,@loader_path + endif + +-gfor_c_HEADERS = ISO_Fortran_binding.h +-gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include ++include_HEADERS = ISO_Fortran_binding.h + + LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \ + $(lt_host_flags) + +-toolexeclib_LTLIBRARIES = libgfortran.la +-toolexeclib_DATA = libgfortran.spec ++lib_LTLIBRARIES = libgfortran.la ++toolexeclib_DATA = libgfortran.spec # needs "exec" in name + libgfortran_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS) + libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ + $(LTLDFLAGS) $(LIBQUADLIB) ../libbacktrace/libbacktrace.la \ +@@ -58,16 +57,14 @@ libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` + $(version_arg) -Wc,-shared-libgcc + libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP) + +-cafexeclib_LTLIBRARIES = libcaf_single.la +-cafexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) ++lib_LTLIBRARIES += libcaf_single.la + libcaf_single_la_SOURCES = caf/single.c + libcaf_single_la_LDFLAGS = -static + libcaf_single_la_DEPENDENCIES = caf/libcaf.h + libcaf_single_la_LINK = $(LINK) $(libcaf_single_la_LDFLAGS) + + if IEEE_SUPPORT +-fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude +-nodist_finclude_HEADERS = ieee_arithmetic.mod ieee_exceptions.mod ieee_features.mod ++nodist_include_HEADERS = ieee_arithmetic.mod ieee_exceptions.mod ieee_features.mod + endif + + ## io.h conflicts with a system header on some platforms, so +-- +2.47.2 + diff --git a/pkgs/development/compilers/gcc/ng/15/libssp/force-regular-dirs.patch b/pkgs/development/compilers/gcc/ng/15/libssp/force-regular-dirs.patch new file mode 100644 index 000000000000..4b15c9a1d8b0 --- /dev/null +++ b/pkgs/development/compilers/gcc/ng/15/libssp/force-regular-dirs.patch @@ -0,0 +1,30 @@ +From e7dac0e90f3e4363d858a6f147d7cc4f62815dd6 Mon Sep 17 00:00:00 2001 +From: John Ericson +Date: Fri, 18 Jul 2025 16:54:17 -0400 +Subject: [PATCH 3/3] Force regular dirs + +Override directories in libssp so they are normal $out/lib and +$dev/include. This is not suitable for upstreaming, but is done on top +of a different patch which is, and which makes this smaller. +--- + libssp/configure.ac | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/libssp/configure.ac b/libssp/configure.ac +index 5b9fa4fbecc..f1723dc33ce 100644 +--- a/libssp/configure.ac ++++ b/libssp/configure.ac +@@ -207,10 +207,6 @@ esac + AC_SUBST(toolexecdir) + AC_SUBST(toolexeclibdir) + +-# Directory in which the compiler finds libraries etc. +-libdir='$(toolexeclibdir)' +-includedir=${orig_libdir}/gcc/${host_noncanonical}/'$(version)/include' +- + if test ${multilib} = yes; then + multilib_arg="--enable-multilib" + else +-- +2.47.2 + diff --git a/pkgs/development/compilers/gcc/ng/15/libstdcxx/force-regular-dirs.patch b/pkgs/development/compilers/gcc/ng/15/libstdcxx/force-regular-dirs.patch new file mode 100644 index 000000000000..e80cffdce1e7 --- /dev/null +++ b/pkgs/development/compilers/gcc/ng/15/libstdcxx/force-regular-dirs.patch @@ -0,0 +1,120 @@ +From db427c55334dd2edc11397d3a92d55dc9c06d1c3 Mon Sep 17 00:00:00 2001 +From: John Ericson +Date: Sun, 20 Jul 2025 14:20:00 -0400 +Subject: [PATCH] libstdc++: Force regular include/lib dir + +Delete a bunch of unneeded logic to do this. +--- + libstdc++-v3/acinclude.m4 | 80 ++------------------------------ + libstdc++-v3/include/Makefile.am | 2 +- + 2 files changed, 4 insertions(+), 78 deletions(-) + +diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 +index a0094c2dd95..a0718dff394 100644 +--- a/libstdc++-v3/acinclude.m4 ++++ b/libstdc++-v3/acinclude.m4 +@@ -727,85 +727,11 @@ dnl + dnl This logic must match gcc/configure.ac's setting of gcc_gxx_include_dir. + dnl config/gxx-include-dir.m4 must be kept consistant with this as well. + AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [ +- glibcxx_toolexecdir=no +- glibcxx_toolexeclibdir=no ++ glibcxx_toolexecdir='$(libdir)' ++ glibcxx_toolexeclibdir='$(libdir)' ++ gxx_include_dir='$(includedir)' + glibcxx_prefixdir=$prefix + +- AC_MSG_CHECKING([for gxx-include-dir]) +- AC_ARG_WITH([gxx-include-dir], +- AC_HELP_STRING([--with-gxx-include-dir=DIR], +- [installation directory for include files]), +- [case "$withval" in +- yes) AC_MSG_ERROR([Missing directory for --with-gxx-include-dir]) ;; +- no) gxx_include_dir=no ;; +- *) gxx_include_dir=$withval ;; +- esac], +- [gxx_include_dir=no]) +- AC_MSG_RESULT($gxx_include_dir) +- +- AC_MSG_CHECKING([for --enable-version-specific-runtime-libs]) +- AC_ARG_ENABLE([version-specific-runtime-libs], +- AC_HELP_STRING([--enable-version-specific-runtime-libs], +- [Specify that runtime libraries should be installed in a compiler-specific directory]), +- [case "$enableval" in +- yes) version_specific_libs=yes ;; +- no) version_specific_libs=no ;; +- *) AC_MSG_ERROR([Unknown argument to enable/disable version-specific libs]);; +- esac], +- [version_specific_libs=no]) +- AC_MSG_RESULT($version_specific_libs) +- +- GCC_WITH_TOOLEXECLIBDIR +- +- # Default case for install directory for include files. +- if test $version_specific_libs = no && test $gxx_include_dir = no; then +- gxx_include_dir='include/c++/${gcc_version}' +- if test -n "$with_cross_host" && +- test x"$with_cross_host" != x"no"; then +- gxx_include_dir='${prefix}/${target_alias}/'"$gxx_include_dir" +- else +- gxx_include_dir='${prefix}/'"$gxx_include_dir" +- fi +- fi +- +- # Version-specific runtime libs processing. +- if test $version_specific_libs = yes; then +- # Need the gcc compiler version to know where to install libraries +- # and header files if --enable-version-specific-runtime-libs option +- # is selected. FIXME: these variables are misnamed, there are +- # no executables installed in _toolexecdir or _toolexeclibdir. +- if test x"$gxx_include_dir" = x"no"; then +- gxx_include_dir='${libdir}/gcc/${host_alias}/${gcc_version}/include/c++' +- fi +- glibcxx_toolexecdir='${libdir}/gcc/${host_alias}' +- glibcxx_toolexeclibdir='${toolexecdir}/${gcc_version}$(MULTISUBDIR)' +- fi +- +- # Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir +- # Install a library built with a cross compiler in tooldir, not libdir. +- if test x"$glibcxx_toolexecdir" = x"no"; then +- if test -n "$with_cross_host" && +- test x"$with_cross_host" != x"no"; then +- glibcxx_toolexecdir='${exec_prefix}/${host_alias}' +- case ${with_toolexeclibdir} in +- no) +- glibcxx_toolexeclibdir='${toolexecdir}/lib' +- ;; +- *) +- glibcxx_toolexeclibdir=${with_toolexeclibdir} +- ;; +- esac +- else +- glibcxx_toolexecdir='${libdir}/gcc/${host_alias}' +- glibcxx_toolexeclibdir='${libdir}' +- fi +- multi_os_directory=`$CXX -print-multi-os-directory` +- case $multi_os_directory in +- .) ;; # Avoid trailing /. +- *) glibcxx_toolexeclibdir=$glibcxx_toolexeclibdir/$multi_os_directory ;; +- esac +- fi +- + AC_MSG_CHECKING([for install location]) + AC_MSG_RESULT($gxx_include_dir) + +diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am +index 537774c2668..c0bfeb43b44 100644 +--- a/libstdc++-v3/include/Makefile.am ++++ b/libstdc++-v3/include/Makefile.am +@@ -1048,7 +1048,7 @@ endif + + host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR) + host_builddir = ./${host_alias}/bits +-host_installdir = ${gxx_include_dir}/${host_alias}$(MULTISUBDIR)/bits ++host_installdir = ${gxx_include_dir}/bits + host_headers = \ + ${host_srcdir}/ctype_base.h \ + ${host_srcdir}/ctype_inline.h \ +-- +2.47.2 + diff --git a/pkgs/development/compilers/gcc/ng/common/libatomic/default.nix b/pkgs/development/compilers/gcc/ng/common/libatomic/default.nix index ab5632313b76..49fef931007a 100644 --- a/pkgs/development/compilers/gcc/ng/common/libatomic/default.nix +++ b/pkgs/development/compilers/gcc/ng/common/libatomic/default.nix @@ -5,35 +5,81 @@ release_version, version, getVersionFile, - autoreconfHook269, monorepoSrc ? null, + fetchpatch, + autoreconfHook269, runCommand, }: stdenv.mkDerivation (finalAttrs: { pname = "libatomic"; inherit version; - src = monorepoSrc; + src = runCommand "libatomic-src-${version}" { src = monorepoSrc; } '' + runPhase unpackPhase + + mkdir -p "$out/gcc" + cp gcc/BASE-VER "$out/gcc" + cp gcc/DATESTAMP "$out/gcc" + + cp -r libatomic "$out" + + cp -r config "$out" + cp -r multilib.am "$out" + cp -r libtool.m4 "$out" + + cp config.guess "$out" + cp config.rpath "$out" + cp config.sub "$out" + cp config-ml.in "$out" + cp ltmain.sh "$out" + cp install-sh "$out" + cp mkinstalldirs "$out" + + [[ -f MD5SUMS ]]; cp MD5SUMS "$out" + ''; patches = [ - (getVersionFile "gcc/custom-threading-model.patch") + (fetchpatch { + name = "custom-threading-model.patch"; + url = "https://inbox.sourceware.org/gcc-patches/20250716204545.1063669-1-git@JohnEricson.me/raw"; + hash = "sha256-kxNntY2r4i/+XHQSpf9bYV2Jg+FD/pD5TiMn5hd4ckk="; + includes = [ + "config/*" + "libatomic/*" + ]; + }) ]; + postUnpack = '' + mkdir -p ./build + buildRoot=$(readlink -e "./build") + ''; + + preAutoreconf = '' + sourceRoot=$(readlink -e "./libatomic") + cd $sourceRoot + ''; + enableParallelBuilding = true; nativeBuildInputs = [ autoreconfHook269 ]; - postPatch = '' - sourceRoot=$(readlink -e "./libatomic") - ''; + configurePlatforms = [ + "build" + "host" + ]; + + configureFlags = [ + "--disable-dependency-tracking" + "cross_compiling=true" + "--disable-multilib" + ]; preConfigure = '' - mkdir ../build - cd ../build + cd "$buildRoot" configureScript=$sourceRoot/configure - chmod +x "$configureScript" ''; doCheck = true; diff --git a/pkgs/development/compilers/gcc/ng/common/libgcc/default.nix b/pkgs/development/compilers/gcc/ng/common/libgcc/default.nix index 907534c8f6f8..a1372a69e123 100644 --- a/pkgs/development/compilers/gcc/ng/common/libgcc/default.nix +++ b/pkgs/development/compilers/gcc/ng/common/libgcc/default.nix @@ -6,6 +6,7 @@ version, getVersionFile, monorepoSrc ? null, + fetchpatch, autoreconfHook269, buildGccPackages, buildPackages, @@ -37,7 +38,32 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - (getVersionFile "gcc/custom-threading-model.patch") + (fetchpatch { + name = "delete-MACHMODE_H.patch"; + url = "https://github.com/gcc-mirror/gcc/commit/493aae4b034d62054d5e7e54dc06cd9a8be54e29.diff"; + hash = "sha256-oEk0lnI96RlpALWpb7J+GnrtgQsFVqDO57I/zjiqqTk="; + }) + (fetchpatch { + name = "custom-threading-model.patch"; + url = "https://inbox.sourceware.org/gcc-patches/20250716204545.1063669-1-git@JohnEricson.me/raw"; + hash = "sha256-NgiC4cFeFInXXg27me1XpSeImPaL0WHs50Tf1YHz4ps="; + }) + (fetchpatch { + name = "libgcc.mvars-less-0.patch"; + url = "https://inbox.sourceware.org/gcc-patches/20250716234028.1153560-1-John.Ericson@Obsidian.Systems/raw"; + hash = "sha256-NEcieDCsy+7IRU3qQKVD3i57OuwGZKB/rmNF8X2I1n0="; + }) + (fetchpatch { + name = "libgcc.mvars-less-1.patch"; + url = "https://inbox.sourceware.org/gcc-patches/20250716234028.1153560-2-John.Ericson@Obsidian.Systems/raw"; + hash = "sha256-nfRC4f6m3kHDro4+6E4y1ZPs+prxBQmn0H2rzIjaMWM="; + }) + (fetchpatch { + name = "regular-libdir-includedir.patch"; + url = "https://inbox.sourceware.org/gcc-patches/20250717174911.1536129-1-git@JohnEricson.me/raw"; + hash = "sha256-Cn7rvg1FI7H/26GzSe4pv5VW/gvwbwGqivAqEeawkwk="; + }) + (getVersionFile "libgcc/force-regular-dirs.patch") ]; autoreconfFlags = "--install --force --verbose . libgcc"; @@ -95,7 +121,6 @@ stdenv.mkDerivation (finalAttrs: { tm.h \ options.h \ insn-constants.h \ - insn-modes.h \ version.h ) mkdir -p "$buildRoot/gcc/include" @@ -186,11 +211,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "MULTIBUILDTOP:=../" ]; postInstall = '' - cp gthr-default.h "$out/lib/gcc/${stdenv.hostPlatform.config}/${version}/include" - moveToOutput "lib/gcc/${stdenv.hostPlatform.config}/${version}/include" "$dev" - mkdir -p "$out/lib" "$dev/include" - ln -s "$out/lib/gcc/${stdenv.hostPlatform.config}/${version}"/* "$out/lib" - ln -s "$dev/lib/gcc/${stdenv.hostPlatform.config}/${version}/include"/* "$dev/include/" + install -c -m 644 gthr-default.h "$dev/include" ''; doCheck = true; diff --git a/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix b/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix index 7e2c5bc4fcd7..5b77efbb4ce2 100644 --- a/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix +++ b/pkgs/development/compilers/gcc/ng/common/libgfortran/default.nix @@ -5,10 +5,11 @@ gcc_meta, release_version, version, + getVersionFile, monorepoSrc ? null, - buildPackages, autoreconfHook269, libiberty, + buildPackages, libgcc, libbacktrace, }: @@ -32,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: { gfortran ]; + patches = [ + (getVersionFile "libgfortran/force-regular-dirs.patch") + ]; + autoreconfFlags = "--install --force --verbose . libgfortran"; postUnpack = '' @@ -161,6 +166,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" ]; # Set the variable back the way it was, see corresponding code in @@ -171,13 +177,6 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "MULTIBUILDTOP:=../" ]; - postInstall = '' - moveToOutput "lib/gcc/${stdenv.hostPlatform.config}/${version}/include" "$dev" - mkdir -p "$out/lib" "$dev/include" - ln -s "$out/lib/gcc/${stdenv.hostPlatform.config}/${version}"/* "$out/lib" - ln -s "$dev/lib/gcc/${stdenv.hostPlatform.config}/${version}/include"/* "$dev/include/" - ''; - doCheck = true; passthru = { diff --git a/pkgs/development/compilers/gcc/ng/common/libssp/default.nix b/pkgs/development/compilers/gcc/ng/common/libssp/default.nix index 3c4cc19582c5..bcc5d4b9c2e3 100644 --- a/pkgs/development/compilers/gcc/ng/common/libssp/default.nix +++ b/pkgs/development/compilers/gcc/ng/common/libssp/default.nix @@ -4,7 +4,10 @@ gcc_meta, release_version, version, + getVersionFile, monorepoSrc ? null, + fetchpatch, + autoreconfHook269, runCommand, }: stdenv.mkDerivation (finalAttrs: { @@ -20,6 +23,9 @@ stdenv.mkDerivation (finalAttrs: { cp -r libssp "$out" + cp -r config "$out" + cp -r multilib.am "$out" + cp config.guess "$out" cp config.rpath "$out" cp config.sub "$out" @@ -31,23 +37,50 @@ stdenv.mkDerivation (finalAttrs: { [[ -f MD5SUMS ]]; cp MD5SUMS "$out" ''; - sourceRoot = "${finalAttrs.src.name}/libssp"; + outputs = [ + "out" + "dev" + ]; + + patches = [ + (fetchpatch { + name = "regular-libdir-includedir.patch"; + url = "https://inbox.sourceware.org/gcc-patches/20250720172933.2404828-1-git@JohnEricson.me/raw"; + hash = "sha256-W7dcy1Tm3O2reK7kx83DRv8W97qUfaqDbKLiLXIegRw="; + }) + (getVersionFile "libssp/force-regular-dirs.patch") + ]; + + postUnpack = '' + mkdir -p ./build + buildRoot=$(readlink -e "./build") + ''; + + preAutoreconf = '' + sourceRoot=$(readlink -e "./libssp") + cd $sourceRoot + ''; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + autoreconfHook269 + ]; configurePlatforms = [ "build" "host" ]; + configureFlags = [ "--disable-dependency-tracking" - "--with-toolexeclibdir=${builtins.placeholder "out" + "/lib"}" "cross_compiling=true" "--disable-multilib" ]; preConfigure = '' - mkdir ../../build - cd ../../build - configureScript=../$sourceRoot/configure + cd "$buildRoot" + configureScript=$sourceRoot/configure ''; hardeningDisable = [ diff --git a/pkgs/development/compilers/gcc/ng/common/libstdcxx/default.nix b/pkgs/development/compilers/gcc/ng/common/libstdcxx/default.nix index c8fbc047c515..c7108fced4f4 100644 --- a/pkgs/development/compilers/gcc/ng/common/libstdcxx/default.nix +++ b/pkgs/development/compilers/gcc/ng/common/libstdcxx/default.nix @@ -6,25 +6,62 @@ version, getVersionFile, monorepoSrc ? null, - runCommand, + fetchpatch, autoreconfHook269, + runCommand, gettext, }: stdenv.mkDerivation (finalAttrs: { pname = "libstdcxx"; inherit version; - src = monorepoSrc; + src = runCommand "libstdcxx-src-${version}" { src = monorepoSrc; } '' + runPhase unpackPhase - enableParallelBuilding = true; + mkdir -p "$out/gcc" + cp gcc/BASE-VER "$out/gcc" + cp gcc/DATESTAMP "$out/gcc" - nativeBuildInputs = [ - autoreconfHook269 - gettext + mkdir -p "$out/libgcc" + cp libgcc/gthr*.h "$out/libgcc" + cp libgcc/unwind-pe.h "$out/libgcc" + + cp -r libstdc++-v3 "$out" + + cp -r libiberty "$out" + cp -r include "$out" + cp -r contrib "$out" + + cp -r config "$out" + cp -r multilib.am "$out" + + cp config.guess "$out" + cp config.rpath "$out" + cp config.sub "$out" + cp config-ml.in "$out" + cp ltmain.sh "$out" + cp install-sh "$out" + cp mkinstalldirs "$out" + + [[ -f MD5SUMS ]]; cp MD5SUMS "$out" + ''; + + outputs = [ + "out" + "dev" ]; patches = [ - (getVersionFile "gcc/custom-threading-model.patch") + (fetchpatch { + name = "custom-threading-model.patch"; + url = "https://inbox.sourceware.org/gcc-patches/20250716204545.1063669-1-git@JohnEricson.me/raw"; + hash = "sha256-jPP0+MoPLtCwWcW6doO6KHCppwAYK40qNVyriLXcGOg="; + includes = [ + "config/*" + "libstdc++-v3/*" + ]; + }) + (getVersionFile "libstdcxx/force-regular-dirs.patch") ]; postUnpack = '' @@ -37,12 +74,12 @@ stdenv.mkDerivation (finalAttrs: { cd $sourceRoot ''; - postPatch = '' - sed -i \ - -e 's/AM_ENABLE_MULTILIB(/AM_ENABLE_MULTILIB(NOPE/' \ - -e 's#glibcxx_toolexeclibdir=no#glibcxx_toolexeclibdir=${builtins.placeholder "out"}/libexec#' \ - configure.ac - ''; + enableParallelBuilding = true; + + nativeBuildInputs = [ + autoreconfHook269 + gettext + ]; preConfigure = '' cd "$buildRoot" @@ -50,9 +87,13 @@ stdenv.mkDerivation (finalAttrs: { chmod +x "$configureScript" ''; + configurePlatforms = [ + "build" + "host" + ]; + configureFlags = [ "--disable-dependency-tracking" - "--with-toolexeclibdir=${builtins.placeholder "out"}/lib" "gcc_cv_target_thread_file=posix" "cross_compiling=true" "--disable-multilib" @@ -64,16 +105,15 @@ stdenv.mkDerivation (finalAttrs: { "--with-default-libstdcxx-abi=new" ]; - outputs = [ - "out" - "dev" - ]; - hardeningDisable = [ # PATH_MAX "fortify" ]; + postInstall = '' + moveToOutput lib/libstdc++.modules.json "$dev" + ''; + doCheck = true; passthru = { diff --git a/pkgs/development/compilers/gcc/ng/common/patches.nix b/pkgs/development/compilers/gcc/ng/common/patches.nix index d69ec0098fab..81d3be9f68bf 100644 --- a/pkgs/development/compilers/gcc/ng/common/patches.nix +++ b/pkgs/development/compilers/gcc/ng/common/patches.nix @@ -32,9 +32,29 @@ } ]; - # Submitted: https://gcc.gnu.org/pipermail/gcc-patches/2025-July/689429.html - # In Git: https://github.com/Ericson2314/gcc/tree/libgcc-custom-threading-model-15 - "gcc/custom-threading-model.patch" = [ + # In Git: https://github.com/Ericson2314/gcc/tree/regular-dirs-in-libgcc-15 + "libgcc/force-regular-dirs.patch" = [ + { + after = "15"; + path = ../15; + } + ]; + # In Git: https://github.com/Ericson2314/gcc/tree/regular-dirs-in-libssp-15 + "libssp/force-regular-dirs.patch" = [ + { + after = "15"; + path = ../15; + } + ]; + # In Git: https://github.com/Ericson2314/gcc/tree/libstdcxx-force-regular-dirs-15 + "libstdcxx/force-regular-dirs.patch" = [ + { + after = "15"; + path = ../15; + } + ]; + # In Git: https://github.com/Ericson2314/gcc/tree/libgfortran-force-regular-dirs-15 + "libgfortran/force-regular-dirs.patch" = [ { after = "15"; path = ../15; diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 76368433205b..4a8bb063a979 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -163,6 +163,13 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; teams = [ teams.golang ]; platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi ++ platforms.freebsd; + badPlatforms = [ + # Support for big-endian POWER < 8 was dropped in 1.9, but POWER8 users have less of a reason to run in big-endian mode than pre-POWER8 ones + # So non-LE ppc64 is effectively unsupported, and Go SIGILLs on affordable ppc64 hardware + # https://github.com/golang/go/issues/19074 - Dropped support for big-endian POWER < 8, with community pushback + # https://github.com/golang/go/issues/73349 - upstream will not accept submissions to fix this + "powerpc64-linux" + ]; mainProgram = "go"; }; }) diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index fbccce4cd017..14787746ac19 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -163,6 +163,13 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; teams = [ teams.golang ]; platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi ++ platforms.freebsd; + badPlatforms = [ + # Support for big-endian POWER < 8 was dropped in 1.9, but POWER8 users have less of a reason to run in big-endian mode than pre-POWER8 ones + # So non-LE ppc64 is effectively unsupported, and Go SIGILLs on affordable ppc64 hardware + # https://github.com/golang/go/issues/19074 - Dropped support for big-endian POWER < 8, with community pushback + # https://github.com/golang/go/issues/73349 - upstream will not accept submissions to fix this + "powerpc64-linux" + ]; mainProgram = "go"; }; }) diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index b5cbfd3aa802..99b684cca449 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -168,6 +168,13 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; teams = [ teams.golang ]; platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi ++ platforms.freebsd; + badPlatforms = [ + # Support for big-endian POWER < 8 was dropped in 1.9, but POWER8 users have less of a reason to run in big-endian mode than pre-POWER8 ones + # So non-LE ppc64 is effectively unsupported, and Go SIGILLs on affordable ppc64 hardware + # https://github.com/golang/go/issues/19074 - Dropped support for big-endian POWER < 8, with community pushback + # https://github.com/golang/go/issues/73349 - upstream will not accept submissions to fix this + "powerpc64-linux" + ]; mainProgram = "go"; }; }) diff --git a/pkgs/development/compilers/go/binary.nix b/pkgs/development/compilers/go/binary.nix index b32b70a392ec..46f649930455 100644 --- a/pkgs/development/compilers/go/binary.nix +++ b/pkgs/development/compilers/go/binary.nix @@ -35,5 +35,12 @@ stdenv.mkDerivation { license = lib.licenses.bsd3; teams = [ lib.teams.golang ]; platforms = lib.platforms.darwin ++ lib.platforms.linux; + badPlatforms = [ + # Support for big-endian POWER < 8 was dropped in 1.9, but POWER8 users have less of a reason to run in big-endian mode than pre-POWER8 ones + # So non-LE ppc64 is effectively unsupported, and Go SIGILLs on affordable ppc64 hardware + # https://github.com/golang/go/issues/19074 - Dropped support for big-endian POWER < 8, with community pushback + # https://github.com/golang/go/issues/73349 - upstream will not accept submissions to fix this + "powerpc64-linux" + ]; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index df80f2fcc13e..004dfc4ef37a 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -23,7 +23,6 @@ ... }@args: -assert useMusl -> stdenv.hostPlatform.isLinux; let extraArgs = builtins.removeAttrs args [ "lib" diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix index 179fb668fec0..34571287f6be 100644 --- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -46,9 +46,6 @@ thrift, }: -assert !stdenv.hostPlatform.isDarwin; -# I can't test darwin - let rpath = lib.makeLibraryPath [ glib @@ -306,5 +303,9 @@ stdenv.mkDerivation rec { description = "Jetbrains' fork of JCEF"; license = lib.licenses.bsd3; homepage = "https://github.com/JetBrains/JCEF"; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; }; } diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index f3850f2cadf2..206b92b7432d 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -62,6 +62,9 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" '' + + lib.optionalString (lib.versionAtLeast release_version "21") '' + cp -r ${monorepoSrc}/third-party "$out" + '' + '' cp -r ${monorepoSrc}/compiler-rt "$out" '' diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 64fd4ee4b139..9d9bcaa9d1b8 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -32,10 +32,11 @@ let "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y="; - "21.0.0-git".gitRelease = { - rev = "e08833443256f8dde2f864853fa9491ffa7112d5"; - rev-version = "21.0.0-unstable-2025-07-13"; - sha256 = "sha256-O0mh9Kq6PHvGiCigjb5rDDqHNFBhy5Dv+IP67TstX8U="; + "21.1.0-rc1".officialRelease.sha256 = "sha256-EZMG3kNqGTvKSuvslbrtNnyqBCG5C2gN9Y2qHbiuh8Q="; + "22.0.0-git".gitRelease = { + rev = "f3a3270dbca3649b7d56aaa42cb8481fb34e2d67"; + rev-version = "22.0.0-unstable-2025-07-20"; + sha256 = "sha256-rMiPa8T2n0IWtOv0SYb+eWWHRfPTBGEb4yCp11gVzRE="; }; } // llvmVersions; diff --git a/pkgs/development/compilers/opensmalltalk-vm/default.nix b/pkgs/development/compilers/opensmalltalk-vm/default.nix index e84ec1175514..7617b7ce877b 100644 --- a/pkgs/development/compilers/opensmalltalk-vm/default.nix +++ b/pkgs/development/compilers/opensmalltalk-vm/default.nix @@ -1,4 +1,5 @@ { + config, stdenv, lib, fetchFromGitHub, @@ -190,7 +191,11 @@ let platform = stdenv.targetPlatform.system; in -vmsByPlatform.${platform} or (throw ( - "Unsupported platform ${platform}: only the following platforms are supported: " - + builtins.toString (builtins.attrNames vmsByPlatform) -)) +if (!config.allowAliases && !(vmsByPlatform ? platform)) then + # Don't throw without aliases to not break CI. + null +else + vmsByPlatform.${platform} or (throw ( + "Unsupported platform ${platform}: only the following platforms are supported: " + + builtins.toString (builtins.attrNames vmsByPlatform) + )) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 7c6439d1746e..a476886358b1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -1,4 +1,8 @@ -{ pkgs, haskellLib }: +{ + config, + pkgs, + haskellLib, +}: with haskellLib; @@ -108,7 +112,10 @@ self: super: { doctest = dontCheck super.doctest; - haskell-language-server = throw "haskell-language-server has dropped support for ghc 9.0 in version 2.4.0.0, please use a newer ghc version or an older nixpkgs version"; + haskell-language-server = + lib.throwIf config.allowAliases + "haskell-language-server has dropped support for ghc 9.0 in version 2.4.0.0, please use a newer ghc version or an older nixpkgs version" + (markBroken super.haskell-language-server); # Needs to use ghc-lib due to incompatible GHC ghc-tags = doDistribute self.ghc-tags_1_5; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 6d85d85a8617..cd67a884e853 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -1,4 +1,8 @@ -{ pkgs, haskellLib }: +{ + config, + pkgs, + haskellLib, +}: with haskellLib; @@ -74,7 +78,10 @@ self: super: { } ); - haskell-language-server = throw "haskell-language-server has dropped support for ghc 9.2 in version 2.10.0.0, please use a newer ghc version or an older nixpkgs version"; + haskell-language-server = + lib.throwIf config.allowAliases + "haskell-language-server has dropped support for ghc 9.2 in version 2.10.0.0, please use a newer ghc version or an older nixpkgs version" + (markBroken super.haskell-language-server); # For GHC < 9.4, some packages need data-array-byte as an extra dependency hashable = addBuildDepends [ self.data-array-byte ] super.hashable; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index fd96aa1a5c4e..a505eb771dc7 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -57,6 +57,9 @@ in }, sourceRoot ? null, setSourceRoot ? null, + # Extra environment variables to set during the build. + # See: `../../../doc/languages-frameworks/haskell.section.md` + env ? { }, buildDepends ? [ ], setupHaskellDepends ? [ ], libraryHaskellDepends ? [ ], @@ -556,6 +559,19 @@ let "haskellPackages.mkDerivation: testTarget is deprecated. Use testTargets instead" (lib.concatStringsSep " " testTargets); + env' = + { + LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. + } + // env + # Implicit pointer to integer conversions are errors by default since clang 15. + # Works around https://gitlab.haskell.org/ghc/ghc/-/issues/23456. + // optionalAttrs (stdenv.hasCC && stdenv.cc.isClang) { + NIX_CFLAGS_COMPILE = + "-Wno-error=int-conversion" + + lib.optionalString (env ? NIX_CFLAGS_COMPILE) (" " + env.NIX_CFLAGS_COMPILE); + }; + in lib.fix ( drv: @@ -589,7 +605,11 @@ lib.fix ( ++ optionals stdenv.hostPlatform.isGhcjs [ nodejs ]; propagatedBuildInputs = optionals isLibrary propagatedBuildInputs; - LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. + env = + optionalAttrs (stdenv.buildPlatform.libc == "glibc") { + LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; + } + // env'; prePatch = optionalString (editedCabalFile != null) '' @@ -995,16 +1015,37 @@ lib.fix ( nativeBuildInputs = [ ghcEnv ] ++ optional (allPkgconfigDepends != [ ]) pkg-config ++ collectedToolDepends; buildInputs = otherBuildInputsSystem; - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = lib.optionalString ( - stdenv.buildPlatform.libc == "glibc" - ) "${buildPackages.glibcLocales}/lib/locale/locale-archive"; - "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}"; - "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg"; - # TODO: is this still valid? - "NIX_${ghcCommandCaps}_DOCDIR" = "${ghcEnv}/share/doc/ghc/html"; - "NIX_${ghcCommandCaps}_LIBDIR" = - if ghc.isHaLVM or false then "${ghcEnv}/lib/HaLVM-${ghc.version}" else "${ghcEnv}/${ghcLibdir}"; + + env = + { + "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}"; + "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg"; + # TODO: is this still valid? + "NIX_${ghcCommandCaps}_DOCDIR" = "${ghcEnv}/share/doc/ghc/html"; + "NIX_${ghcCommandCaps}_LIBDIR" = + if ghc.isHaLVM or false then "${ghcEnv}/lib/HaLVM-${ghc.version}" else "${ghcEnv}/${ghcLibdir}"; + } + // optionalAttrs (stdenv.buildPlatform.libc == "glibc") { + # TODO: Why is this written in terms of `buildPackages`, unlike + # the outer `env`? + # + # According to @sternenseemann [1]: + # + # > The condition is based on `buildPlatform`, so it needs to + # > match. `LOCALE_ARCHIVE` is set to accompany `LANG` which + # > concerns things we execute on the build platform like + # > `haddock`. + # > + # > Arguably the outer non `buildPackages` one is incorrect and + # > probably works by accident in most cases since the locale + # > archive is not platform specific (the trouble is that it + # > may sometimes be impossible to cross-compile). At least + # > that would be my assumption. + # + # [1]: https://github.com/NixOS/nixpkgs/pull/424368#discussion_r2202683378 + LOCALE_ARCHIVE = "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + } + // env'; } "echo $nativeBuildInputs $buildInputs > $out"; env = envFunc { }; @@ -1050,17 +1091,8 @@ lib.fix ( // optionalAttrs (args ? postFixup) { inherit postFixup; } // optionalAttrs (args ? dontStrip) { inherit dontStrip; } // optionalAttrs (postPhases != [ ]) { inherit postPhases; } - // optionalAttrs (stdenv.buildPlatform.libc == "glibc") { - LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; - } // optionalAttrs (disallowedRequisites != [ ] || disallowGhcReference) { disallowedRequisites = disallowedRequisites ++ (if disallowGhcReference then [ ghc ] else [ ]); } - - # Implicit pointer to integer conversions are errors by default since clang 15. - # Works around https://gitlab.haskell.org/ghc/ghc/-/issues/23456. - // optionalAttrs (stdenv.hasCC && stdenv.cc.isClang) { - NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; - } ) ) diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index d80013fa212d..0a211850b2f4 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -422,8 +422,6 @@ in } ./setuptools-build-hook.sh ) { }; - setuptoolsCheckHook = throw "The setuptoolsCheckHook has been removed, since the test command has been removed in setuptools 72.0"; - setuptoolsRustBuildHook = callPackage ( { makePythonHook, setuptools-rust }: makePythonHook { diff --git a/pkgs/development/libraries/astal/source.nix b/pkgs/development/libraries/astal/source.nix index be6aa94308ab..56636e07bb88 100644 --- a/pkgs/development/libraries/astal/source.nix +++ b/pkgs/development/libraries/astal/source.nix @@ -7,15 +7,15 @@ let originalDrv = fetchFromGitHub { owner = "Aylur"; repo = "astal"; - rev = "81eb3770965190024803ed6dd0fe35318da64831"; - hash = "sha256-5Nr80lTZJ8ewuxIzRHc6E8L4LW4rdGZukiZyL7nOVSE="; + rev = "2c5eb54f39e1710c6e2c80915a240978beb3269a"; + hash = "sha256-XULTToDUkIshNXEO+YP2mAHdQv8bxWDvKjbamBfOC8E="; }; in originalDrv.overrideAttrs ( final: prev: { name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name pname = "astal-source"; - version = "0-unstable-2025-07-11"; + version = "0-unstable-2025-07-13"; meta = prev.meta // { description = "Building blocks for creating custom desktop shells (source)"; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index b0ad6cece22d..6ca154bad745 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { }; patches = [ + # Fix build with gettext 0.25 + ./gettext-0.25.patch # Build with enchant 2 # https://github.com/archlinux/svntogit-packages/tree/packages/gtkspell/trunk (fetchpatch { diff --git a/pkgs/development/libraries/gtkspell/gettext-0.25.patch b/pkgs/development/libraries/gtkspell/gettext-0.25.patch new file mode 100644 index 000000000000..abe8c5446508 --- /dev/null +++ b/pkgs/development/libraries/gtkspell/gettext-0.25.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index e926833..667a8e6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,6 +12,10 @@ AC_CONFIG_SRCDIR(gtkspell/gtkspell.c) + AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) + AC_CONFIG_HEADERS([config.h]) + ++AC_CONFIG_MACRO_DIRS([m4]) ++AM_GNU_GETTEXT_VERSION([0.25]) ++AM_GNU_GETTEXT([external]) ++ + SPELLER_LIB=-lenchant + + AC_SUBST(SPELLER_LIB) diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 38b3005bbc0c..c898938becfe 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "libfive"; - version = "0-unstable-2025-05-22"; + version = "0-unstable-2025-07-07"; src = fetchFromGitHub { owner = "libfive"; repo = "libfive"; - rev = "daa458279121a95b51482508bcfa906d6227442e"; - hash = "sha256-YPP3ZSMDCQgeOPugRPmZCDI9iesIMwnU7Xu8yGwV9JM="; + rev = "ba841d3ba91b885ba19c40e382d6ae6f3534a4b5"; + hash = "sha256-YVqP4k8KBLMYZOuWYLXijZBEiNGhQaaVNBVQtpIgvjc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 51f29eb909ec..eb09313d1a11 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.113"; - hash = "sha256-gjkJaNNTqtaMxO6PuRLZ8ATMP88L4LXCtpT84fahcmU="; + version = "3.114"; + hash = "sha256-YVtXk1U9JtqfOH7+m/+bUI/yXJcydqjjGbCy/5xbMe8="; } diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index 394e249abc7e..3ce4d9a7bf66 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -42,20 +42,7 @@ let ; inherit (magmaRelease) version hash supportedGpuTargets; - # Per https://icl.utk.edu/magma/downloads, support for CUDA 12 wasn't added until 2.7.1. - # If we're building a version prior to that, use the latest release of the 11.x series. - effectiveCudaPackages = - if strings.versionOlder version "2.7.1" then cudaPackages_11 else cudaPackages; - - inherit (effectiveCudaPackages) cudaAtLeast flags cudaOlder; - - effectiveRocmPackages = - if strings.versionOlder version "2.8.0" then - throw '' - the required ROCm 5.7 version for magma ${version} has been removed - '' - else - rocmPackages; + inherit (cudaPackages) cudaAtLeast flags cudaOlder; # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements # of the first list *from* the second list. That means: @@ -65,7 +52,7 @@ let # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like flags.realArches. # For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must # remove it. - rocmArches = lists.map (x: strings.removePrefix "gfx" x) effectiveRocmPackages.clr.gpuTargets; + rocmArches = lists.map (x: strings.removePrefix "gfx" x) rocmPackages.clr.gpuTargets; supportedRocmArches = lists.intersectLists rocmArches supportedGpuTargets; unsupportedRocmArches = lists.subtractLists supportedRocmArches rocmArches; @@ -123,19 +110,12 @@ stdenv.mkDerivation (finalAttrs: { "test" ]; - postPatch = - '' - # For rocm version script invoked by cmake - patchShebangs tools/ - # Fixup for the python test runners - patchShebangs ./testing/run_{tests,summarize}.py - '' - + lib.optionalString (strings.versionOlder version "2.9.0") '' - substituteInPlace ./testing/run_tests.py \ - --replace-fail \ - "print >>sys.stderr, cmdp, \"doesn't exist (original name: \" + cmd + \", precision: \" + precision + \")\"" \ - "print(f\"{cmdp} doesn't exist (original name: {cmd}, precision: {precision})\", file=sys.stderr)" - ''; + postPatch = '' + # For rocm version script invoked by cmake + patchShebangs tools/ + # Fixup for the python test runners + patchShebangs ./testing/run_{tests,summarize}.py + ''; nativeBuildInputs = [ @@ -145,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { gfortran ] ++ lists.optionals cudaSupport [ - effectiveCudaPackages.cuda_nvcc + cudaPackages.cuda_nvcc ]; buildInputs = @@ -157,7 +137,7 @@ stdenv.mkDerivation (finalAttrs: { (getLib gfortran.cc) # libgfortran.so ] ++ lists.optionals cudaSupport ( - with effectiveCudaPackages; + with cudaPackages; [ cuda_cccl # and cuda_cudart # cuda_runtime.h @@ -172,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: { ] ) ++ lists.optionals rocmSupport ( - with effectiveRocmPackages; + with rocmPackages; [ clr hipblas @@ -203,9 +183,9 @@ stdenv.mkDerivation (finalAttrs: { # Can be removed once https://github.com/icl-utk-edu/magma/pull/27 is merged # Can't easily apply the PR as a patch because we rely on the tarball with pregenerated # hipified files ∴ fetchpatch of the PR will apply cleanly but fail to build - (strings.cmakeFeature "ROCM_CORE" "${effectiveRocmPackages.clr}") - (strings.cmakeFeature "CMAKE_C_COMPILER" "${effectiveRocmPackages.clr}/bin/hipcc") - (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${effectiveRocmPackages.clr}/bin/hipcc") + (strings.cmakeFeature "ROCM_CORE" "${rocmPackages.clr}") + (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clr}/bin/hipcc") + (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clr}/bin/hipcc") ]; # Magma doesn't have a test suite we can easily run, just loose executables, all of which require a GPU. @@ -241,8 +221,12 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - inherit cudaSupport rocmSupport gpuTargets; - cudaPackages = effectiveCudaPackages; + inherit + cudaPackages + cudaSupport + rocmSupport + gpuTargets + ; testers = { all = let @@ -395,8 +379,6 @@ stdenv.mkDerivation (finalAttrs: { # dynamic CUDA support is broken https://github.com/NixOS/nixpkgs/issues/239237 (cudaSupport && !static) || !(cudaSupport || rocmSupport) # At least one back-end enabled - || (cudaSupport && rocmSupport) # Mutually exclusive - || (cudaSupport && strings.versionOlder version "2.7.1" && cudaPackages_11 == null) - || (rocmSupport && strings.versionOlder version "2.8.0"); + || (cudaSupport && rocmSupport); # Mutually exclusive }; }) diff --git a/pkgs/development/libraries/science/math/magma/releases.nix b/pkgs/development/libraries/science/math/magma/releases.nix index beb1559e3762..2d0566300330 100644 --- a/pkgs/development/libraries/science/math/magma/releases.nix +++ b/pkgs/development/libraries/science/math/magma/releases.nix @@ -4,68 +4,6 @@ # HIP is here: https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L290 # CUDA works around magma's wrappers and uses FindCUDAToolkit directly [ - { - version = "2.6.2"; - hash = "sha256-dbVU2rAJA+LRC5cskT5Q5/iMvGLzrkMrWghsfk7aCnE="; - supportedGpuTargets = [ - "700" - "701" - "702" - "703" - "704" - "705" - "801" - "802" - "803" - "805" - "810" - "900" - "902" - "904" - "906" - "908" - "909" - "90c" - "1010" - "1011" - "1012" - "1030" - "1031" - "1032" - "1033" - ]; - } - { - version = "2.7.2"; - hash = "sha256-cpvBpw5RinQi/no6VFN6R0EDWne+M0n2bqxcNiV21WA="; - supportedGpuTargets = [ - "700" - "701" - "702" - "703" - "704" - "705" - "801" - "802" - "803" - "805" - "810" - "900" - "902" - "904" - "906" - "908" - "909" - "90c" - "1010" - "1011" - "1012" - "1030" - "1031" - "1032" - "1033" - ]; - } { version = "2.9.0"; hash = "sha256-/3f9Nyaz3+w7+1V5CwZICqXMOEOWwts1xW/a5KgsZBw="; diff --git a/pkgs/development/ocaml-modules/processor/default.nix b/pkgs/development/ocaml-modules/processor/default.nix index 4a914449251a..d4eba003ea67 100644 --- a/pkgs/development/ocaml-modules/processor/default.nix +++ b/pkgs/development/ocaml-modules/processor/default.nix @@ -6,15 +6,15 @@ buildDunePackage rec { pname = "processor"; - version = "0.1"; + version = "0.1-unstable-2024-07-23"; minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "haesbaert"; repo = "ocaml-processor"; - tag = "v${version}"; - hash = "sha256-eGSNYjVbUIUMelajqZYOd3gvmRKQ9UP3TfMflLR9i7k="; + rev = "74df5ab38773e5c4ad5c3a3f21f525d863731c17"; + hash = "sha256-tWmgAsYfcpZUyxo7F+WIC3WOfAjDiuV74CscqEd93gk="; }; doCheck = true; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index f5f24d1c7e24..0d41b5ac0eed 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.7.1"; + version = "13.7.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; tag = version; - hash = "sha256-EQyq+l/WhM4mAQrq9D4F3hglk2EkvCrSD6tYbUr0aWw="; + hash = "sha256-8OOg6+oKaeLk2kUJ44ynxuNx1ZGtAydLhgAhM2N9Hn0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index e75403f2e801..f089156fa44a 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -7,7 +7,6 @@ empty-files, fetchFromGitHub, mock, - mrjob, numpy, pyperclip, pytest, @@ -20,14 +19,14 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "14.6.0"; + version = "15.0.0"; pyproject = true; src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; tag = "v${version}"; - hash = "sha256-hoBT83p2PHZR5NtVChdWK5SMjLt8llj59K5ODaKtRhQ="; + hash = "sha256-lXc81hQzxHxpg96OSWkkWmdmLOf4nU56dIKYVgLo+s8="; }; build-system = [ setuptools ]; @@ -38,7 +37,6 @@ buildPythonPackage rec { beautifulsoup4 empty-files mock - mrjob pyperclip pytest testfixtures @@ -52,11 +50,9 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_preceding_whitespace" + "test_warnings" + # test runs another python interpreter, ignoring $PYTHONPATH "test_command_line_verify" - # Tests expect paths below ApprovalTests.Python directory - "test_received_filename" - "test_pytest_namer" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/binary/default.nix b/pkgs/development/python-modules/binary/default.nix index ef625ffcd482..13433d53ca9b 100644 --- a/pkgs/development/python-modules/binary/default.nix +++ b/pkgs/development/python-modules/binary/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "binary"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "ofek"; repo = "binary"; tag = "v${version}"; - hash = "sha256-PbQlD/VR5KKoQ3+C6pnNoA/BJB5CEnXh6Q8CVZH/6cs="; + hash = "sha256-dU+E6MxAmH8AEGTW2/lZmtgRTinKCv9gDiVeb4n78U4="; }; build-system = [ diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix index a51ed1a5c2e7..98f5b7f6b5dc 100644 --- a/pkgs/development/python-modules/consul/default.nix +++ b/pkgs/development/python-modules/consul/default.nix @@ -30,6 +30,5 @@ buildPythonPackage rec { description = "Python client for Consul (https://www.consul.io/)"; homepage = "https://github.com/cablehead/python-consul"; license = licenses.mit; - maintainers = with maintainers; [ desiderius ]; }; } diff --git a/pkgs/development/python-modules/ddgs/default.nix b/pkgs/development/python-modules/ddgs/default.nix index 9ca4c278600e..cde1ca28740d 100644 --- a/pkgs/development/python-modules/ddgs/default.nix +++ b/pkgs/development/python-modules/ddgs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ddgs"; - version = "9.0.2"; + version = "9.2.3"; pyproject = true; src = fetchFromGitHub { owner = "deedy5"; repo = "ddgs"; tag = "v${version}"; - hash = "sha256-c0kTZV+lM1/vkI51TK6klUmnoaAdt8KSEn/rjeqcBa8="; + hash = "sha256-TWLB/IAUn0YEXwYGooqd/pz8xv8tmK8E1ZZ8G/TEtbU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-appconf/default.nix b/pkgs/development/python-modules/django-appconf/default.nix index fe81b6122f3c..8812b5dd5333 100644 --- a/pkgs/development/python-modules/django-appconf/default.nix +++ b/pkgs/development/python-modules/django-appconf/default.nix @@ -46,6 +46,5 @@ buildPythonPackage rec { homepage = "https://django-appconf.readthedocs.org/"; changelog = "https://github.com/django-compressor/django-appconf/blob/v${version}/docs/changelog.rst"; license = licenses.bsd2; - maintainers = with maintainers; [ desiderius ]; }; } diff --git a/pkgs/development/python-modules/django-compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix index 631929145301..b728fb29660c 100644 --- a/pkgs/development/python-modules/django-compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -81,6 +81,5 @@ buildPythonPackage rec { homepage = "https://django-compressor.readthedocs.org/"; changelog = "https://github.com/django-compressor/django-compressor/blob/${version}/docs/changelog.txt"; license = licenses.mit; - maintainers = with maintainers; [ desiderius ]; }; } diff --git a/pkgs/development/python-modules/django-lasuite/default.nix b/pkgs/development/python-modules/django-lasuite/default.nix index 67fbefc9fda6..5c152662bcfd 100644 --- a/pkgs/development/python-modules/django-lasuite/default.nix +++ b/pkgs/development/python-modules/django-lasuite/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "django-lasuite"; - version = "0.0.10"; + version = "0.0.11"; pyproject = true; src = fetchFromGitHub { owner = "suitenumerique"; repo = "django-lasuite"; tag = "v${version}"; - hash = "sha256-2rSPGioyG/2VeyBPfsNU4TL2jvlLjRQpxQSl1AHLL10="; + hash = "sha256-Cx2eV/c1oiLJGJpglIYuaQT/m2OC6QP3r80CmQzXydE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/django-modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix index 608c78f8cff4..a2dd8f0f62c5 100644 --- a/pkgs/development/python-modules/django-modelcluster/default.nix +++ b/pkgs/development/python-modules/django-modelcluster/default.nix @@ -48,6 +48,5 @@ buildPythonPackage rec { homepage = "https://github.com/torchbox/django-modelcluster/"; changelog = "https://github.com/wagtail/django-modelcluster/blob/v${version}/CHANGELOG.txt"; license = licenses.bsd2; - maintainers = with maintainers; [ desiderius ]; }; } diff --git a/pkgs/development/python-modules/django-taggit/default.nix b/pkgs/development/python-modules/django-taggit/default.nix index b6c3e021185c..97e717ed2497 100644 --- a/pkgs/development/python-modules/django-taggit/default.nix +++ b/pkgs/development/python-modules/django-taggit/default.nix @@ -45,6 +45,5 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/django-taggit"; changelog = "https://github.com/jazzband/django-taggit/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ desiderius ]; }; } diff --git a/pkgs/development/python-modules/django-treebeard/default.nix b/pkgs/development/python-modules/django-treebeard/default.nix index fa687c99549f..55c771d68731 100644 --- a/pkgs/development/python-modules/django-treebeard/default.nix +++ b/pkgs/development/python-modules/django-treebeard/default.nix @@ -34,6 +34,5 @@ buildPythonPackage rec { homepage = "https://tabo.pe/projects/django-treebeard/"; changelog = "https://github.com/django-treebeard/django-treebeard/blob/${version}/CHANGES.md"; license = licenses.asl20; - maintainers = with maintainers; [ desiderius ]; }; } diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 294c729d0bf7..e1cdd727e8d3 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -77,7 +77,6 @@ buildPythonPackage rec { changelog = "https://github.com/encode/django-rest-framework/releases/tag/3.15.1"; description = "Web APIs for Django, made easy"; homepage = "https://www.django-rest-framework.org/"; - maintainers = with maintainers; [ desiderius ]; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/docling-jobkit/default.nix b/pkgs/development/python-modules/docling-jobkit/default.nix index 53ef19db014a..cefa23cfa7f3 100644 --- a/pkgs/development/python-modules/docling-jobkit/default.nix +++ b/pkgs/development/python-modules/docling-jobkit/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "docling-jobkit"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-jobkit"; tag = "v${version}"; - hash = "sha256-V+Sc/eEuv0Q3q/wjGpkraD6ZR4Kfhorc3meg7fy0LTA="; + hash = "sha256-Q4RCA/gJxyfOfzuRnuCmndVEeV0JUCTU389KSEv7vVk="; }; build-system = [ diff --git a/pkgs/development/python-modules/docling-serve/default.nix b/pkgs/development/python-modules/docling-serve/default.nix index a5923a766140..32c44ad7b478 100644 --- a/pkgs/development/python-modules/docling-serve/default.nix +++ b/pkgs/development/python-modules/docling-serve/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "docling-serve"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-serve"; tag = "v${version}"; - hash = "sha256-kvtsutdQXk9mxx90fHXlzxFXrA7v+TdlgjrKCSFuuVU="; + hash = "sha256-/jaSmDk8eweXbYO0yyhXiLvp/T4viFsNC4vGoTMhbbU="; }; build-system = [ diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index e15fd9cb6e1e..d2401bc30882 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -48,6 +48,5 @@ buildPythonPackage rec { homepage = "https://github.com/elasticsearch/elasticsearch-dsl-py"; changelog = "https://github.com/elastic/elasticsearch-dsl-py/blob/v${version}/Changelog.rst"; license = licenses.asl20; - maintainers = with maintainers; [ desiderius ]; }; } diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index f545d9135b44..0d745fa389d0 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -51,6 +51,5 @@ buildPythonPackage rec { homepage = "https://github.com/elasticsearch/elasticsearch-py"; changelog = "https://github.com/elastic/elasticsearch-py/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ desiderius ]; }; } diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 8064c11cc8f5..4315534241dd 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -93,6 +93,5 @@ buildPythonPackage rec { description = "Ultra-reliable, fast ASGI+WSGI framework for building data plane APIs at scale"; homepage = "https://falconframework.org/"; license = licenses.asl20; - maintainers = with maintainers; [ desiderius ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 3e6d297351cd..b3dc48398ac4 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.20.3"; + version = "3.21.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_translate"; inherit version; - hash = "sha256-bTZUx/h3O/ytddhBkPdbqe6vJp5j4L+3PD8QrVUR5Ps="; + hash = "sha256-dg8l4bl5/qalncpE/8io3HCGk8UK43o5Vo/xKExTS+I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix index 815a010cdd8f..8e77c427b65f 100644 --- a/pkgs/development/python-modules/groq/default.nix +++ b/pkgs/development/python-modules/groq/default.nix @@ -1,5 +1,6 @@ { lib, + aiohttp, anyio, buildPythonPackage, dirty-equals, @@ -7,10 +8,12 @@ fetchFromGitHub, hatch-fancy-pypi-readme, hatchling, + httpx-aiohttp, httpx, nest-asyncio, pydantic, pytest-asyncio, + pytest-xdist, pytestCheckHook, respx, sniffio, @@ -19,16 +22,22 @@ buildPythonPackage rec { pname = "groq"; - version = "0.19.0"; + version = "0.30.0"; pyproject = true; src = fetchFromGitHub { owner = "groq"; repo = "groq-python"; tag = "v${version}"; - hash = "sha256-+1us/LPQEMeswxxHvydfTCod+RimUD2lKtlAZ3pDZOA="; + hash = "sha256-URjfgZC+6YIY7SBfaOmDavQ73YWAqHf9KHunyvniy2E="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "hatchling==1.26.3" \ + "hatchling>=1.26.3" + ''; + build-system = [ hatch-fancy-pypi-readme hatchling @@ -43,13 +52,21 @@ buildPythonPackage rec { typing-extensions ]; + optional-dependencies = { + aiohttp = [ + aiohttp + httpx-aiohttp + ]; + }; + nativeCheckInputs = [ dirty-equals nest-asyncio pytest-asyncio + pytest-xdist pytestCheckHook respx - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "groq" ]; @@ -66,6 +83,9 @@ buildPythonPackage rec { homepage = "https://github.com/groq/groq-python"; changelog = "https://github.com/groq/groq-python/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ fab ]; + maintainers = with lib.maintainers; [ + fab + sarahec + ]; }; } diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index d1ab25b7fb07..de4e8032dddd 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gsd"; - version = "3.4.2"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = "gsd"; tag = "v${version}"; - hash = "sha256-sBO5tt85BVLUrqSVWUT/tYzeLWyvyyI9ZXjNLt9/uAE="; + hash = "sha256-8pEs1use/R7g0l6h+rxjpN5j8PznqkJpjLxqiupn9iY="; }; build-system = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { description = "General simulation data file format"; mainProgram = "gsd"; homepage = "https://github.com/glotzerlab/gsd"; - changelog = "https://github.com/glotzerlab/gsd/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/glotzerlab/gsd/blob/${src.tag}/CHANGELOG.rst"; license = licenses.bsd2; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/httpx-aiohttp/default.nix b/pkgs/development/python-modules/httpx-aiohttp/default.nix new file mode 100644 index 000000000000..aee6166157f6 --- /dev/null +++ b/pkgs/development/python-modules/httpx-aiohttp/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + aiohttp, + httpx, +}: + +buildPythonPackage rec { + pname = "httpx-aiohttp"; + version = "0.1.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "karpetrosyan"; + repo = "httpx-aiohttp"; + tag = version; + hash = "sha256-Fdu8aKsXWggRkc/512OBEiEwWNAajrhjfG/+v4+cows="; + fetchSubmodules = true; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "requires = [\"hatchling\", \"hatch-fancy-pypi-readme\"]" \ + "requires = [\"hatchling\"]" + ''; + + build-system = [ + hatchling + ]; + + dependencies = [ + aiohttp + httpx + ]; + + pythonImportsCheck = [ + "httpx_aiohttp" + ]; + + meta = { + description = "Transports for httpx to work atop aiohttp"; + homepage = "https://github.com/karpetrosyan/httpx-aiohttp/"; + changelog = "https://github.com/karpetrosyan/httpx-aiohttp/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sarahec ]; + }; +} diff --git a/pkgs/development/python-modules/llm-github-copilot/default.nix b/pkgs/development/python-modules/llm-github-copilot/default.nix new file mode 100644 index 000000000000..7810f800a593 --- /dev/null +++ b/pkgs/development/python-modules/llm-github-copilot/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + llm, + llm-github-copilot, + writableTmpDirAsHomeHook, + pytestCheckHook, + pytest-vcr, + pytest-asyncio, +}: + +buildPythonPackage rec { + pname = "llm-github-copilot"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jmdaly"; + repo = "llm-github-copilot"; + tag = version; + hash = "sha256-BUVpt1Vv0+kxbTYHDdiYy3+ySJKWJ9b+dYexV7YS+NI="; + }; + + build-system = [ setuptools ]; + + dependencies = [ llm ]; + + nativeCheckInputs = [ + pytestCheckHook + writableTmpDirAsHomeHook + pytest-vcr + pytest-asyncio + ]; + + pythonImportsCheck = [ "llm_github_copilot" ]; + + passthru.tests = llm.mkPluginTest llm-github-copilot; + + meta = { + description = "LLM plugin providing access to GitHub Copilot"; + homepage = "https://github.com/jmdaly/llm-github-copilot"; + changelog = "https://github.com/jmdaly/llm-github-copilot/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ afh ]; + }; +} diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index da9d75d496eb..121d7c4571db 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -75,6 +75,7 @@ let llm-gemini ? false, llm-gguf ? false, llm-git ? false, + llm-github-copilot ? false, llm-grok ? false, llm-groq ? false, llm-hacker-news ? false, diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index 170805c655c3..88336f41fb55 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "neo"; - version = "0.14.1"; + version = "0.14.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "NeuralEnsemble"; repo = "python-neo"; tag = version; - hash = "sha256-n0+K1J6K3WYN+1LxcHoVuA+U3LeiRG0EsicJf5uKvnE="; + hash = "sha256-THAdUFCbteiUdfhjLzl6ocM2I0zFKHfFxJExCnK1z1Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index 1b3e649e3c9f..47f0d43187b0 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; src = fetchPypi { inherit pname; inherit version; - hash = "sha256-AiOQq3RkpE+HN/efizHOHTz6S0r3nMqhqsXoNo21h/s="; + hash = "sha256-X+xkkI/gQazEs6/CoyxJqrFUDPWBh29VY9aLsSnifFs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/psnawp/default.nix b/pkgs/development/python-modules/psnawp/default.nix new file mode 100644 index 000000000000..a152dc689f47 --- /dev/null +++ b/pkgs/development/python-modules/psnawp/default.nix @@ -0,0 +1,46 @@ +{ + buildPythonPackage, + fetchFromGitea, + lib, + poetry-core, + pycountry, + pyrate-limiter, + requests, + typing-extensions, +}: + +buildPythonPackage rec { + pname = "psnawp"; + version = "3.0.0"; + pyproject = true; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "YoshikageKira"; + repo = "psnawp"; + tag = "v${version}"; + hash = "sha256-JS8VGwIsCr21rwjXCRUXsoVHfFyLTZtgp+ZJcXWCCsQ="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + pycountry + pyrate-limiter + requests + typing-extensions + ]; + + pythonImportsCheck = [ "psnawp_api" ]; + + # tests access the actual PlayStation Network API + doCheck = false; + + meta = { + changelog = "https://codeberg.org/YoshikageKira/psnawp/releases/tag/${src.tag}"; + description = "Python API Wrapper for PlayStation Network API"; + homepage = "https://codeberg.org/YoshikageKira/psnawp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index d26992820e9c..c420ae81a4b1 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.89"; + version = "0.2.90"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-DCQmJ4YNQKMIK0IJwAYwIYp+ulGcRdjwDIsNI6W6RsU="; + hash = "sha256-7ImnA/1fiGEOVM+IycS+AR79ESx0OKoFSFnZJHYH9O8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pygtfs/default.nix b/pkgs/development/python-modules/pygtfs/default.nix index fc022bcfcedd..af9474ac35a6 100644 --- a/pkgs/development/python-modules/pygtfs/default.nix +++ b/pkgs/development/python-modules/pygtfs/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pygtfs"; - version = "0.1.9"; + version = "0.1.10"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-J5vu51OOMabWd8h60PpvvBiCnwQlhEnBywNXxy9hOuA="; + hash = "sha256-bOG/bXz97eWM77AprQvEgtl9g2fQbbKcwniF1fAC0d0="; }; build-system = [ diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 2f3b38147371..a4de9e62863b 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.24.0"; + version = "5.24.1"; pyproject = true; src = fetchFromGitHub { owner = "pymc-devs"; repo = "pymc"; tag = "v${version}"; - hash = "sha256-B4HFb+2Hzxt/eK5PdE9wNxQRNouSPi/9aKSrBV8xba4="; + hash = "sha256-lBsVr3A7y9CP+41Tk5TraWhu59HJb2+r0I7WlXiP/sY="; }; build-system = [ diff --git a/pkgs/development/python-modules/pymupdf4llm/default.nix b/pkgs/development/python-modules/pymupdf4llm/default.nix index 9f3a84eafde1..c2fc51f7be96 100644 --- a/pkgs/development/python-modules/pymupdf4llm/default.nix +++ b/pkgs/development/python-modules/pymupdf4llm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pymupdf4llm"; - version = "0.0.17"; + version = "0.0.25"; pyproject = true; src = fetchFromGitHub { owner = "pymupdf"; repo = "RAG"; tag = "v${version}"; - hash = "sha256-+RLK+UorkU8eVQJGrc7pVNZPtIpxMgA9mBKA6GeWUa0="; + hash = "sha256-20upIcCoUB8zjW/qBvA3kFxJ6jcdXV3ohkurMmnlMkc="; }; sourceRoot = "${src.name}/pymupdf4llm"; diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix index d4e296216ede..5da2bee9a7c1 100644 --- a/pkgs/development/python-modules/pymysensors/default.nix +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pymysensors"; - version = "0.25.2"; + version = "0.26.0"; pyproject = true; src = fetchFromGitHub { owner = "theolind"; repo = "pymysensors"; tag = version; - hash = "sha256-ndvn3mQ4fchL4NiUQLpYn7HMKeuEBT09HQvnJy14jPI="; + hash = "sha256-iND3MEKEruqCdsqJJExm+SA4Z2e87I45fsI4wbnIPRc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix index d8bea0dbf51d..367846149147 100644 --- a/pkgs/development/python-modules/pypdf2/default.nix +++ b/pkgs/development/python-modules/pypdf2/default.nix @@ -33,8 +33,5 @@ buildPythonPackage rec { homepage = "https://pypdf2.readthedocs.io/"; changelog = "https://github.com/py-pdf/PyPDF2/raw/${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ - desiderius - ]; }; } diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 57804f9bd150..d64448dad436 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -36,6 +36,5 @@ buildPythonPackage rec { homepage = "https://github.com/tobgu/pyrsistent/"; description = "Persistent/Functional/Immutable data structures"; license = licenses.mit; - maintainers = with maintainers; [ desiderius ]; }; } diff --git a/pkgs/development/python-modules/pysmarlaapi/default.nix b/pkgs/development/python-modules/pysmarlaapi/default.nix index fb1f116c714b..556eba660d9e 100644 --- a/pkgs/development/python-modules/pysmarlaapi/default.nix +++ b/pkgs/development/python-modules/pysmarlaapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pysmarlaapi"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "Explicatis-GmbH"; repo = "pysmarlaapi"; tag = version; - hash = "sha256-f8cghqdR4nxyBoMJiHWpZAzxcKMBmcKSqkLGtls2MwA="; + hash = "sha256-218FEHZsJ+t/60e7j8adb1gABAF2TGR5BN6EHvlMpmA="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/pytest-unmagic/default.nix b/pkgs/development/python-modules/pytest-unmagic/default.nix index 946478de5f68..869bbfd65b03 100644 --- a/pkgs/development/python-modules/pytest-unmagic/default.nix +++ b/pkgs/development/python-modules/pytest-unmagic/default.nix @@ -3,20 +3,21 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + gitUpdater, flit-core, pytest, }: buildPythonPackage rec { pname = "pytest-unmagic"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "dimagi"; repo = "pytest-unmagic"; tag = "v${version}"; - hash = "sha256-5WnLjQ0RuwLBIZAbOJoQ0KBEnb7yUWTUFBKy+WgNctQ="; + hash = "sha256-XHeQuMCYHtrNF5+7e/eMzcvYukM+AobHCMRdzL+7KpU="; }; build-system = [ @@ -29,6 +30,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "unmagic" ]; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + meta = { description = "Pytest fixtures with conventional import semantics"; homepage = "https://github.com/dimagi/pytest-unmagic"; diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index 69ebdfd69da8..28717a49bfc1 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.45.2"; + version = "0.45.3"; pyproject = true; src = fetchFromGitHub { owner = "pyvista"; repo = "pyvista"; tag = "v${version}"; - hash = "sha256-szI9kzJQOVCKcGTWj9Twq9i2DzbrHt/LmYBBfq6MBy8="; + hash = "sha256-9N1dF/zwjzoxX4xYIr5084M9pAk3YK3T48OUnCoC0NU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix index 0601a3217c61..4e4a8d192152 100644 --- a/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2025.5.0"; + version = "2025.7.0"; pyproject = true; src = fetchPypi { pname = "qbittorrent_api"; inherit version; - hash = "sha256-NKD5weGufhbeUOlGUXUsjZejz1TCo+GgXGqDdzmaDjA="; + hash = "sha256-9GLygXVZzKpMbNwSaUoxU++s1Q+jKFpCVAGrMKvA3nY="; }; build-system = [ diff --git a/pkgs/development/python-modules/sat-tmp/default.nix b/pkgs/development/python-modules/sat-tmp/default.nix new file mode 100644 index 000000000000..f055189c2ea9 --- /dev/null +++ b/pkgs/development/python-modules/sat-tmp/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchhg, + setuptools, + wokkel, +}: + +buildPythonPackage rec { + pname = "sat-tmp"; + version = "0.8.0"; + pyproject = true; + + src = fetchhg { + url = "https://repos.goffi.org/sat_tmp"; + rev = "v${version}"; + hash = "sha256-CEy0/eaPK0nHzsiJq3m7edNyxzAhfwBaNhFhLS0azOw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ wokkel ]; + + # Taken from import_test.py + pythonImportsCheck = [ + "sat_tmp.wokkel.pubsub" + "sat_tmp.wokkel.rsm" + "sat_tmp.wokkel.mam" + ]; + + # no pytest tests exist + + meta = { + description = "Libervia temporary third party patches"; + longDescription = '' + This module is used by Libervia project (formerly “Salut à Toi”) project to patch third party modules + when the patches are not yet available upstream. Patches are removed from this module once merged upstream. + ''; + homepage = "https://libervia.org"; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.ethancedwards8 ]; + teams = [ lib.teams.ngi ]; + }; +} diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index b541aca11bc8..4f60a99adba7 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "scikit-fmm"; - version = "2025.1.29"; + version = "2025.6.23"; pyproject = true; src = fetchPypi { pname = "scikit_fmm"; inherit version; - hash = "sha256-7gTKuObCAahEjfmIL8Azbby3nxJPPh4rjb4x1O4xBQw="; + hash = "sha256-oyCPXziB5At4eNESG6ObjVfxvDj7Tl8NnRxmqbAH5E8="; }; build-system = [ meson-python ]; diff --git a/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix index 903005d0df9a..af5f7ad7facc 100644 --- a/pkgs/development/python-modules/sphinx-hoverxref/default.nix +++ b/pkgs/development/python-modules/sphinx-hoverxref/default.nix @@ -34,6 +34,10 @@ buildPythonPackage rec { hash = "sha256-DJ+mHu9IeEYEyf/SD+nDNtWpTf6z7tQzG0ogaECDpkU="; }; + postPatch = '' + substituteInPlace docs/conf.py --replace-fail "sphinx-prompt" "sphinx_prompt" + ''; + nativeBuildInputs = [ flit-core diff --git a/pkgs/development/python-modules/sphinx-prompt/default.nix b/pkgs/development/python-modules/sphinx-prompt/default.nix index e549417bbacc..85d73da632b6 100644 --- a/pkgs/development/python-modules/sphinx-prompt/default.nix +++ b/pkgs/development/python-modules/sphinx-prompt/default.nix @@ -18,33 +18,22 @@ buildPythonPackage rec { pname = "sphinx-prompt"; - version = "1.7.0"; # read before updating past 1.7.0 https://github.com/sbrunner/sphinx-prompt/issues/398 - format = "pyproject"; + version = "1.10.0"; + pyproject = true; src = fetchFromGitHub { owner = "sbrunner"; repo = "sphinx-prompt"; tag = version; - hash = "sha256-/XxUSsW8Bowks7P+d6iTlklyMIfTb2otXva/VtRVAkM="; + hash = "sha256-JKCTn2YkdyGLvchMT9C61PxjYxuQFzt3SjCE9JvgtVc="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"poetry-plugin-tweak-dependencies-version", ' "" - ''; - - nativeBuildInputs = [ + build-system = [ poetry-core poetry-dynamic-versioning ]; - pythonRelaxDeps = [ - "docutils" - "pygments" - "Sphinx" - ]; - - propagatedBuildInputs = [ + dependencies = [ docutils pygments sphinx @@ -52,9 +41,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - # versions >=1.8.0 cannot be build from source - passthru.skipBulkUpdate = true; - meta = with lib; { description = "Sphinx extension for creating unselectable prompt"; homepage = "https://github.com/sbrunner/sphinx-prompt"; diff --git a/pkgs/development/python-modules/sphinx-version-warning/default.nix b/pkgs/development/python-modules/sphinx-version-warning/default.nix index 22ccb2d67599..f7f2863a3310 100644 --- a/pkgs/development/python-modules/sphinx-version-warning/default.nix +++ b/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -29,6 +29,10 @@ buildPythonPackage { "doc" ]; + postPatch = '' + substituteInPlace docs/conf.py --replace-fail "sphinx-prompt" "sphinx_prompt" + ''; + src = fetchFromGitHub { owner = "humitos"; repo = "sphinx-version-warning"; diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 4057bfea3be7..797c323cab37 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -46,9 +46,6 @@ # - the source build is currently brittle and not easy to maintain # - the source build doesn't work on NVIDIA Jetson platforms -# unsupported combination -assert !(stdenv.hostPlatform.isDarwin && cudaSupport); - let packages = import ./binary-hashes.nix; inherit (cudaPackages) cudatoolkit cudnn; @@ -233,5 +230,7 @@ buildPythonPackage rec { abbradar ]; badPlatforms = [ "x86_64-darwin" ]; + # unsupported combination + broken = stdenv.hostPlatform.isDarwin && cudaSupport; }; } diff --git a/pkgs/development/python-modules/tilt-pi/default.nix b/pkgs/development/python-modules/tilt-pi/default.nix new file mode 100644 index 000000000000..03b700368773 --- /dev/null +++ b/pkgs/development/python-modules/tilt-pi/default.nix @@ -0,0 +1,43 @@ +{ + aiohttp, + buildPythonPackage, + fetchFromGitHub, + lib, + poetry-core, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "tilt-pi"; + version = "0.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "michaelheyman"; + repo = "tilt-pi"; + tag = "v${version}"; + hash = "sha256-jGy7nwSblF486ldt4ShBEmmZtb0c4+7IuI10cN7Bw1A="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + ]; + + pythonImportsCheck = [ "tiltpi" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/michaelheyman/tilt-pi/releases/tag/${src.tag}"; + description = "Python client for interacting with the Tilt Pi API"; + homepage = "https://github.com/michaelheyman/tilt-pi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index 1a6d03167365..a844e96f36b9 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -3,27 +3,25 @@ buildPythonPackage, fetchFromGitHub, cffi, + flatbuffers, h3, numba, numpy, poetry-core, pytestCheckHook, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "timezonefinder"; - version = "6.5.9"; + version = "6.6.2"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "jannikmi"; repo = "timezonefinder"; tag = version; - hash = "sha256-LkGDR8nSGfRiBxSXugauGhe3+8RsLRPWU3oE+1c5iCk="; + hash = "sha256-5BScSnMYKPwVn4lO4qFeqPik1TAFu9AhOnmUADBW+3U="; }; build-system = [ @@ -35,6 +33,7 @@ buildPythonPackage rec { dependencies = [ cffi + flatbuffers h3 numpy ]; @@ -46,20 +45,25 @@ buildPythonPackage rec { pythonImportsCheck = [ "timezonefinder" ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-warn '"poetry-core>=1.0.0,<2.0.0"' '"poetry-core>=1.0.0"' - ''; - preCheck = '' # Some tests need the CLI on the PATH export PATH=$out/bin:$PATH ''; + disabledTestPaths = [ + # Don't test the archive content + "tests/test_package_contents.py" + "tests/test_integration.py" + # Don't test the example + "tests/test_example_scripts.py" + # Tests require clang extension + "tests/utils_test.py" + ]; + meta = with lib; { - changelog = "https://github.com/jannikmi/timezonefinder/blob/${src.tag}/CHANGELOG.rst"; description = "Module for finding the timezone of any point on earth (coordinates) offline"; homepage = "https://github.com/MrMinimal64/timezonefinder"; + changelog = "https://github.com/jannikmi/timezonefinder/blob/${src.tag}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "timezonefinder"; diff --git a/pkgs/development/python-modules/tsplib95/default.nix b/pkgs/development/python-modules/tsplib95/default.nix new file mode 100644 index 000000000000..1ac82c47d78e --- /dev/null +++ b/pkgs/development/python-modules/tsplib95/default.nix @@ -0,0 +1,62 @@ +{ + # Basic + lib, + buildPythonPackage, + fetchFromGitHub, + # Build system + setuptools, + # Dependencies + click, + deprecated, + networkx, + tabulate, + # Test + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "tsplib95"; + version = "0.7.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rhgrant10"; + repo = "tsplib95"; + tag = "v${version}"; + hash = "sha256-rDKnfuauA9+mlgL6Prfz0uRP2rWxiQruXBj422/6Eak="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + click + deprecated + networkx + tabulate + ]; + + # Remove deprecated pytest-runner + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "'pytest-runner'," "" + ''; + + pythonRelaxDeps = [ + "networkx" + "tabulate" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "tsplib95" ]; + + meta = { + description = "Library for working with TSPLIB 95 files."; + homepage = "https://github.com/rhgrant10/tsplib95"; + mainProgram = "tsplib95"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ thattemperature ]; + }; +} diff --git a/pkgs/development/python-modules/types-psycopg2/default.nix b/pkgs/development/python-modules/types-psycopg2/default.nix index 100ba9fc3266..2679d6f061bf 100644 --- a/pkgs/development/python-modules/types-psycopg2/default.nix +++ b/pkgs/development/python-modules/types-psycopg2/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-psycopg2"; - version = "2.9.21.20250516"; + version = "2.9.21.20250718"; pyproject = true; src = fetchPypi { pname = "types_psycopg2"; inherit version; - hash = "sha256-ZyEBgnkXXM4QuVgiAuKitKDaZnhXzPgql2kb217NYQ8="; + hash = "sha256-3AmpcnLvZ+c55XufR0C3YSCPRRQlfjEcCwXIx6N9BLQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/vegehub/default.nix b/pkgs/development/python-modules/vegehub/default.nix new file mode 100644 index 000000000000..ae7b272fb8bf --- /dev/null +++ b/pkgs/development/python-modules/vegehub/default.nix @@ -0,0 +1,48 @@ +{ + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + lib, + poetry-core, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "vegehub"; + version = "0.1.24"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Thulrus"; + repo = "VegeHubPyPiLib"; + tag = "V${version}"; + hash = "sha256-W/5kvertNC7w2IS/N5k06cDyNFgel2s4/znR+Lz5RJU="; + }; + + postPatch = '' + rm -r dist + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + ]; + + pythonImportsCheck = [ "vegehub" ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + ]; + + meta = { + description = "Basic package for simplifying interactions with the Vegetronix VegeHub"; + homepage = "https://github.com/Thulrus/VegeHubPyPiLib"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index e6678c838087..e4f67b86e6bf 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -53,7 +53,6 @@ buildPythonPackage rec { changelog = "https://github.com/wagtail/Willow/releases/tag/v${version}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ - desiderius kuflierl ]; }; diff --git a/pkgs/development/python-modules/youtubeaio/default.nix b/pkgs/development/python-modules/youtubeaio/default.nix index c98246dfb1c2..3641d821b9f6 100644 --- a/pkgs/development/python-modules/youtubeaio/default.nix +++ b/pkgs/development/python-modules/youtubeaio/default.nix @@ -9,13 +9,14 @@ yarl, aresponses, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, syrupy, }: buildPythonPackage rec { pname = "youtubeaio"; - version = "1.1.5"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,16 +25,12 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-youtube"; tag = "v${version}"; - hash = "sha256-utkf5t6yrf0f9QBIaDH6MxKduNZOsjfEWfQnuVyUoRM="; + hash = "sha256-lpmqQXizfFJXgGcKWhFqS4XMML12CFlB40k2ixdszCM="; }; - postPatch = '' - sed -i "/^addopts/d" pyproject.toml - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ + dependencies = [ aiohttp pydantic yarl @@ -44,12 +41,13 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook syrupy ]; meta = { - changelog = "https://github.com/joostlek/python-youtube/releases/tag/v${version}"; + changelog = "https://github.com/joostlek/python-youtube/releases/tag/${src.tag}"; description = "Asynchronous Python client for the YouTube V3 API"; homepage = "https://github.com/joostlek/python-youtube"; license = lib.licenses.mit; diff --git a/pkgs/development/web/nodejs/update.nix b/pkgs/development/web/nodejs/update.nix index b3ffde6ac035..fbe2f5474299 100644 --- a/pkgs/development/web/nodejs/update.nix +++ b/pkgs/development/web/nodejs/update.nix @@ -13,10 +13,10 @@ }: let - rev = "08bb3693621796b22511e56b8418737bd116d70b"; # should be the HEAD of nodejs/release-keys + rev = "901fc09b83c686693be51b3c9a13578929cbc1ab"; # should be the HEAD of nodejs/release-keys pubring = fetchurl { - url = "https://github.com/nodejs/release-keys/raw/${rev}/gpg/pubring.kbx"; - hash = "sha256-j7auIjCzRV7GoX8jdtqHFniwmWWTBoRNmRYWWPFSJ/k="; + url = "https://github.com/nodejs/release-keys/raw/${rev}/gpg-only-active-keys/pubring.kbx"; + hash = "sha256-r/thHVLDlMVRN3Ahr5Apivy+h2IuvPm4QhYFoAmms3E="; }; in writeScript "update-nodejs" '' diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 20ebe669387b..5294b31f31dd 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -18,8 +18,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.19.3"; - sha256 = "99be7b9d268d48b93be568a23240398ceacb0782dc7055b9972305c000b0e292"; + version = "20.19.4"; + sha256 = "b87fd7106013d3906706913ffc63a4403715fbb272c4f83ff4338527353eec0f"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index b44853fff88e..d9d433a31016 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20250627.8314b03"; + version = "20250714.880288c"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-av7ub9GnI+VwkTGafSB1J9YfCpjZOs2UMKVycMvzXwI="; + hash = "sha256-Ml25epg2ir0NqgPCQWpJnfqZU3w0p4pZCHC2esul1Cw="; }; sgt-puzzles-menu = fetchurl { diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 8142ede3407d..a4dbe56da39d 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -29,6 +29,7 @@ armTrustedFirmwareS905, opensbi, buildPackages, + darwin, }@pkgs: let @@ -82,22 +83,25 @@ let patchShebangs scripts ''; - nativeBuildInputs = [ - ncurses # tools/kwboot - bc - bison - flex - installShellFiles - (buildPackages.python3.withPackages (p: [ - p.libfdt - p.setuptools # for pkg_resources - p.pyelftools - ])) - swig - which # for scripts/dtc-version.sh - perl # for oid build (secureboot) - ] ++ lib.optionals (!crossTools) toolsDeps; - depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = + [ + ncurses # tools/kwboot + bc + bison + flex + installShellFiles + (buildPackages.python3.withPackages (p: [ + p.libfdt + p.setuptools # for pkg_resources + p.pyelftools + ])) + swig + which # for scripts/dtc-version.sh + perl # for oid build (secureboot) + ] + ++ lib.optionals (!crossTools) toolsDeps + ++ lib.optionals stdenv.buildPlatform.isDarwin [ darwin.DarwinTools ]; # sw_vers command is needed on darwin + depsBuildBuild = [ buildPackages.gccStdenv.cc ]; # gccStdenv is needed for Darwin buildPlatform buildInputs = lib.optionals crossTools toolsDeps; hardeningDisable = [ "all" ]; @@ -107,6 +111,7 @@ let makeFlags = [ "DTC=${lib.getExe buildPackages.dtc}" "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + "HOSTCFLAGS=-fcommon" ] ++ extraMakeFlags; passAsFile = [ "extraConfig" ]; @@ -114,7 +119,7 @@ let configurePhase = '' runHook preConfigure - make ${defconfig} + make -j$NIX_BUILD_CORES ${defconfig} cat $extraConfigPath >> .config @@ -310,10 +315,12 @@ in meta.license = lib.licenses.unfreeRedistributableFirmware; }; in - assert stdenv.buildPlatform.system == "x86_64-linux"; # aml_encrypt_gxl is a x86_64 binary buildUBoot { defconfig = "libretech-cc_defconfig"; - extraMeta.platforms = [ "aarch64-linux" ]; + extraMeta = { + broken = stdenv.buildPlatform.system != "x86_64-linux"; # aml_encrypt_gxl is a x86_64 binary + platforms = [ "aarch64-linux" ]; + }; filesToInstall = [ "u-boot.bin" ]; postBuild = '' # Copy binary files & tools from LibreELEC/amlogic-boot-fip, and u-boot build to working dir diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 6557063373e7..1768aa98e226 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -16,11 +16,11 @@ }: stdenv.mkDerivation rec { pname = "trace-cmd"; - version = "3.3.1"; + version = "3.3.2"; src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz"; - hash = "sha256-kEji3qDqQsSK0tL8Fx2ycSd2lTXBXOHHTvsb6XDNSa8="; + hash = "sha256-35BEzuevGiRQFqvWOQK1m20juhSd5101a8bBsNtM8Eo="; }; # Don't build and install html documentation @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { "libdir=${placeholder "lib"}/lib" "pkgconfig_dir=${placeholder "dev"}/lib/pkgconfig" "includedir=${placeholder "dev"}/include" - "BASH_COMPLETE_DIR=${placeholder "out"}/share/bash-completion/completions" + "completion_dir=${placeholder "out"}/share/bash-completion/completions" ]; passthru.updateScript = gitUpdater { diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ab0ff37aa88b..ab229b374a0e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -4459,8 +4459,9 @@ ]; "playstation_network" = ps: with ps; [ + psnawp pyrate-limiter - ]; # missing inputs: PSNAWP + ]; "plex" = ps: with ps; [ plexapi @@ -6005,7 +6006,8 @@ ]; "tilt_pi" = ps: with ps; [ - ]; # missing inputs: tilt-pi + tilt-pi + ]; "time" = ps: with ps; [ ]; @@ -6296,7 +6298,8 @@ ]; "vegehub" = ps: with ps; [ - ]; # missing inputs: vegehub + vegehub + ]; "velbus" = ps: with ps; [ aiousbwatcher @@ -7424,6 +7427,7 @@ "ping" "plaato" "plant" + "playstation_network" "plex" "plugwise" "point" @@ -7637,6 +7641,7 @@ "tibber" "tile" "tilt_ble" + "tilt_pi" "time" "time_date" "timer" @@ -7688,6 +7693,7 @@ "vacuum" "vallox" "valve" + "vegehub" "velbus" "velux" "venstar" diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index a46081d3c7d5..43aa42f24dc9 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz"; - hash = "sha256-KQoBKPAetKI3ySWvsRn5yrtf5T5ldWiqKGrRDK8O/4Q="; + hash = "sha256-atRcW9U3PjX/E3QhTa6dBfvb19Rb3n6ROpLeGinGD1U="; }; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 09c547075135..541ddbcf0484 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -91,12 +91,19 @@ postgresqlBuildExtension (finalAttrs: { ./autogen.sh ''; - configureFlags = [ - "--with-pgconfig=${postgresql.pg_config}/bin/pg_config" - "--with-gdalconfig=${gdal}/bin/gdal-config" - "--with-jsondir=${json_c.dev}" - "--disable-extension-upgrades-install" - ] ++ lib.optional withSfcgal "--with-sfcgal=${sfcgal}/bin/sfcgal-config"; + configureFlags = + let + isCross = stdenv.hostPlatform.config != stdenv.buildPlatform.config; + in + [ + (lib.enableFeature false "extension-upgrades-install") + (lib.withFeatureAs true "pgconfig" "${postgresql.pg_config}/bin/pg_config") + (lib.withFeatureAs true "gdalconfig" "${gdal}/bin/gdal-config") + (lib.withFeatureAs true "jsondir" (lib.getDev json_c)) + (lib.withFeatureAs true "xml2config" (lib.getExe' (lib.getDev libxml2) "xml2-config")) + (lib.withFeatureAs withSfcgal "sfcgal" "${sfcgal}/bin/sfcgal-config") + (lib.withFeature (!isCross) "json") # configure: error: cannot check for file existence when cross compiling + ]; makeFlags = [ "PERL=${perl}/bin/perl" diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 2529ba6acb92..1423876c41b5 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.85.0"; + version = "0.85.1"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-xzZQ0+eJOznZWpApbh9SUGuA5XiLnbhQS0qBLrLfk9Y="; + hash = "sha256-lErNsYzxqZYVl1MAQdMk062nBORjQGd3C+UbGbZMzvA="; }; nativeBuildInputs = [ diff --git a/pkgs/test/haskell/default.nix b/pkgs/test/haskell/default.nix index 26250ccc8f00..6be941c5f9e9 100644 --- a/pkgs/test/haskell/default.nix +++ b/pkgs/test/haskell/default.nix @@ -3,6 +3,7 @@ lib.recurseIntoAttrs { cabalSdist = callPackage ./cabalSdist { }; documentationTarball = callPackage ./documentationTarball { }; + env = callPackage ./env { }; ghcWithPackages = callPackage ./ghcWithPackages { }; incremental = callPackage ./incremental { }; setBuildTarget = callPackage ./setBuildTarget { }; diff --git a/pkgs/test/haskell/env/default.nix b/pkgs/test/haskell/env/default.nix new file mode 100644 index 000000000000..ae337d835c00 --- /dev/null +++ b/pkgs/test/haskell/env/default.nix @@ -0,0 +1,55 @@ +{ + lib, + haskellPackages, +}: + +let + withEnv = + env: + haskellPackages.mkDerivation { + pname = "puppy"; + version = "1.0.0"; + src = null; + license = null; + + inherit env; + }; + + failures = lib.runTests { + testCanSetEnv = { + expr = + (withEnv { + PUPPY = "DOGGY"; + }).drvAttrs.PUPPY; + expected = "DOGGY"; + }; + + testCanSetEnvMultiple = { + expr = + let + env = + (withEnv { + PUPPY = "DOGGY"; + SILLY = "GOOFY"; + }).drvAttrs; + in + { + inherit (env) PUPPY SILLY; + }; + expected = { + PUPPY = "DOGGY"; + SILLY = "GOOFY"; + }; + }; + + testCanSetEnvPassthru = { + expr = + (withEnv { + PUPPY = "DOGGY"; + }).passthru.env.PUPPY; + expected = "DOGGY"; + }; + }; +in +# TODO: Use `lib.debug.throwTestFailures`: https://github.com/NixOS/nixpkgs/pull/416207 +lib.optional (failures != [ ]) (throw "${lib.generators.toPretty { } failures}") diff --git a/pkgs/test/stdenv/gcc-stageCompare.nix b/pkgs/test/stdenv/gcc-stageCompare.nix index 091577a43383..133797f5999a 100644 --- a/pkgs/test/stdenv/gcc-stageCompare.nix +++ b/pkgs/test/stdenv/gcc-stageCompare.nix @@ -14,8 +14,6 @@ lib, }: -assert stdenv.cc.isGNU; - with pkgs; # rebuild gcc using the "final" stdenv let @@ -31,11 +29,23 @@ let NIX_OUTPATH_USED_AS_RANDOM_SEED = stdenv.cc.cc.out; }); in -assert lib.assertMsg (gcc-stageCompare ? checksum) - "tests-stdenv-gcc-stageCompare: No `checksum` output in `gcc-stageCompare` see conditional in `gcc/common/checksum.nix`"; -(runCommand "gcc-stageCompare" { } '' - diff -sr ${pkgs.gcc-unwrapped.checksum}/checksums ${gcc-stageCompare.checksum}/checksums && touch $out -'').overrideAttrs + +(runCommand "gcc-stageCompare" + { + checksumCompare = + assert lib.assertMsg (gcc-stageCompare ? checksum) + "tests-stdenv-gcc-stageCompare: No `checksum` output in `gcc-stageCompare` see conditional in `gcc/common/checksum.nix`"; + gcc-stageCompare.checksum; + + checksumUnwrapped = + assert lib.assertMsg (pkgs.gcc-unwrapped ? checksum) + "tests-stdenv-gcc-stageCompare: No `checksum` output in `gcc-stageCompare` see conditional in `gcc/common/checksum.nix`"; + pkgs.gcc-unwrapped.checksum; + } + '' + diff -sr "$checksumUnwrapped"/checksums "$checksumCompare"/checksums && touch $out + '' +).overrideAttrs (a: { meta = (a.meta or { }) // { platforms = lib.platforms.linux; diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 03bc6430bff8..865397c2212e 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.183.0"; + version = "3.184.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.183.0-linux-x64.tar.gz"; - sha256 = "1hak0a45z2jn8d1drii5za0agz6mvszyzhxdmmxfsgzy35p16pwx"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.184.0-linux-x64.tar.gz"; + sha256 = "1ji842kxi1pnr6c7w4aack4j7s2qln3g1wj69wr9ksn48cr7fd7a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.40.0-linux-amd64.tar.gz"; @@ -17,8 +17,8 @@ sha256 = "0xi7c5r4m26m7qn72v8gk2d5a1q7iiny7zh9208g7g3zkmx6qi3x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.82.0-linux-amd64.tar.gz"; - sha256 = "1rq90zz9r46kaj60dd5kvraxr3nxh46z25j5z6k4xxyp57fgqzl6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.83.0-linux-amd64.tar.gz"; + sha256 = "1nh12zwz7qf5i67nbszhi4rbbgg0qyaz9vpdmvbpf70fkhmh7vv1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.5-linux-amd64.tar.gz"; @@ -29,8 +29,8 @@ sha256 = "1pz92kgp8asyj8zk5c2byy79xf5zvri4cjp7a7nywdqsqpfw6d17"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.83.0-linux-amd64.tar.gz"; - sha256 = "023fschcg0f44ig8nm5538ch0al8m94f0c98c6427lpf1lvjmf8c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.0.0-linux-amd64.tar.gz"; + sha256 = "1dbjif5ym7iv1zvpvmxm0f63bzcjzvbqsh078rnja97hq7qx4079"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-linux-amd64.tar.gz"; @@ -81,8 +81,8 @@ sha256 = "0v9hw2m3vz3b9g1mabxmy0j863p51kwj9gkjfrsrabs80glz72ii"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.1.0-linux-amd64.tar.gz"; - sha256 = "01qsqf7i4w4jr0g5zhvnvdf6lnxcy8ax418g28qc9xng853lgk2f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.0-linux-amd64.tar.gz"; + sha256 = "08dfz919cmd0k0v5igjand4qgyf6fvv47idf5fjyqab2nafbjsv3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz"; @@ -97,8 +97,8 @@ sha256 = "08i1k8m59dp56lafx8b0ggmgxl7dfqv8f4nljy4dh95h3bs7fdl2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.0.0-linux-amd64.tar.gz"; - sha256 = "1v3bmv9b4mh2r71yk5aqgbs4lwd45v8x4m3ryvrd5556rkqrbvqv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.1.0-linux-amd64.tar.gz"; + sha256 = "01405rg0srcpcm242g74c2hjm12b5xxs6srikiqh62gjzw45p6ci"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.10-linux-amd64.tar.gz"; @@ -109,8 +109,8 @@ sha256 = "0k6y5ci7ikj4h164syizhxg257nkpg0p265y9ibvri3z6hbqjrw4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.1-linux-amd64.tar.gz"; - sha256 = "0jz43r79ghdl3wc7pqqk59aibv74wvxrm76pg5gayykbpf30xmh5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.2-linux-amd64.tar.gz"; + sha256 = "07vi2qzapg7dgl8hlikadrc0idlf8xx9fqy3d6v64hbmhabrav6y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.2-linux-amd64.tar.gz"; @@ -125,8 +125,8 @@ sha256 = "0vqhixxcl1axi68gz2kaj1gdnalxja1fdsqkm16pyci2hd5sxbbq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.122.0-linux-amd64.tar.gz"; - sha256 = "18x962vs6sq4a2q2g93g00x3r1i6flczv0ifcsvz93bz0wsjpixj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.123.0-linux-amd64.tar.gz"; + sha256 = "1ix96j8x02s4zci3jqhsyj3zknkk74019ywqj6c4mwd6jp078zva"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.183.0-darwin-x64.tar.gz"; - sha256 = "0fp5ci2ikmk171s8mfb72bl16xw5cfcxn37i39mynh20nd70b5ja"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.184.0-darwin-x64.tar.gz"; + sha256 = "0akqzff42jsawv87f1rcqj8ag0ybg5hfp520mvqdyw34vx44zniv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.40.0-darwin-amd64.tar.gz"; @@ -175,8 +175,8 @@ sha256 = "1by1rwasfs7v88f19i4f8d7fd3541h0rbciv4r64ipc5wj329vm1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.82.0-darwin-amd64.tar.gz"; - sha256 = "06li15jfyc48g8h234nbaxlvzrmg6ivfivxgsdlp20rcgm49mvy9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.83.0-darwin-amd64.tar.gz"; + sha256 = "0ib5rvlcfhlrm6racza5lckc0zjfy5m8v9baxvgkl9z5ys8ypf9m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.5-darwin-amd64.tar.gz"; @@ -187,8 +187,8 @@ sha256 = "092v230cj5nx1vr7k87cchyk1qnd9c629xrzh2jc483i8b5f19gp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.83.0-darwin-amd64.tar.gz"; - sha256 = "1yzzjsjzb02g4hkjv9bf6ymn2j2jmszsvsvslrvvbdqf6kpdhpbm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.0.0-darwin-amd64.tar.gz"; + sha256 = "1cn6di1xv5lh6525n30jlk2gh983ncm8shlzbwyqy7pq6x0fphmr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-darwin-amd64.tar.gz"; @@ -239,8 +239,8 @@ sha256 = "00286346z1ws7ffghnz7c9rvjcd66nq6gmmxwlwgqiz6d02z5pv3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.1.0-darwin-amd64.tar.gz"; - sha256 = "026z96c79qmnr5l6j0wz3vic1jgdy9nhgz03bcg8pnym2vbsmnxl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.0-darwin-amd64.tar.gz"; + sha256 = "1kay1ajdjcqcpv12hkicyvfyzkm455x9phxsa7q67mzy49avmjda"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz"; @@ -255,8 +255,8 @@ sha256 = "1pdvqyfv4cn25h0hg830r2mv5d7g16032badf6f16azscdri81lv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.0.0-darwin-amd64.tar.gz"; - sha256 = "15n49pp5yby5g90laf56iygc8kizdj4cg4pbkjvp2fq848jw589p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.1.0-darwin-amd64.tar.gz"; + sha256 = "0ryk92y7nnkj8ahdd0mp3j0fd192nyplr83r9xbrkdx8dgs30xac"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.10-darwin-amd64.tar.gz"; @@ -267,8 +267,8 @@ sha256 = "0iy1j33527g9r62q53lcy6h9016nr75cf7pp9kys7agxifbvskp6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.1-darwin-amd64.tar.gz"; - sha256 = "1dl63sqz67ppfc2afxl80iak74wl21zisprzy4f3ikk2agzm5m03"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.2-darwin-amd64.tar.gz"; + sha256 = "0xzj4hjkqppban49jhszm83aqh8fyay55q54pglcmywfihdwf7rr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.2-darwin-amd64.tar.gz"; @@ -283,8 +283,8 @@ sha256 = "0g4jm9yfvvywbrsg9k2bv09ni4z2wybg7abdl3ym0vpw4zq6lldw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.122.0-darwin-amd64.tar.gz"; - sha256 = "1zv5yxgjvqypkzwkfnk3hi24a93w2qhkw60qcrm6p1p259hyvgx6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.123.0-darwin-amd64.tar.gz"; + sha256 = "0j1hmij36s9gz15gpdrzr6xbdfsv481hn0am4km4s2wi0y92vk0m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.183.0-linux-arm64.tar.gz"; - sha256 = "19smgpvvjq4vg38kc8nq3mmbcdl6k3kphy2h5pk3glm89jss3zld"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.184.0-linux-arm64.tar.gz"; + sha256 = "1dagfxr3rspyybxzjf6qr8mr47754n374abg310bvhfl8hpfpvcl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.40.0-linux-arm64.tar.gz"; @@ -333,8 +333,8 @@ sha256 = "0hzr8cyz3l84ad86w4hqqlnx4m63cxk07jinan1li3fv60dg6y1q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.82.0-linux-arm64.tar.gz"; - sha256 = "18q4kc1lzyhfkzbdnkxi75b949m4in0niypc5vxfz3l794fklzrq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.83.0-linux-arm64.tar.gz"; + sha256 = "0vca0ryw4542m087sxnnwqw3k3z4avbism2milgxz50vi19ysjb8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.5-linux-arm64.tar.gz"; @@ -345,8 +345,8 @@ sha256 = "0k93ff9mc5qcrxz6f6l85hnymyw16hnxin6cp65ymcaam0xv432s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.83.0-linux-arm64.tar.gz"; - sha256 = "0pi8plpbfd2dh2yna3mvr88n433c8vvaifbhn11cb8rr5q9p7m7z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.0.0-linux-arm64.tar.gz"; + sha256 = "0zk7y29i64c2ccm5crpck9ys0psk9qyxn7lmwpad1diiwh715l7i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-linux-arm64.tar.gz"; @@ -397,8 +397,8 @@ sha256 = "0ivqs7v2x5132r07i62crfckgifaf7kpqgkxl3wby0gdaac9z378"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.1.0-linux-arm64.tar.gz"; - sha256 = "0y2b3n3scs6vgl5z1n3z04z8hbg3w754fw1cxvfbypk8yhsz3ziz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.0-linux-arm64.tar.gz"; + sha256 = "0zfqklx1w242ciiliqk4sidyjgk0w2hl207k1mkjk0nmk6yxxjay"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz"; @@ -413,8 +413,8 @@ sha256 = "0kqxz7y1n9zzpw3rv15kb55qvp14rvxh0vymddlrja7iqcvb8nd8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.0.0-linux-arm64.tar.gz"; - sha256 = "1bj42skxchbxsvksp3d58bnzmimjilr8znscl6dyy099kshr2g1b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.1.0-linux-arm64.tar.gz"; + sha256 = "1jr3i8d975814ylan8x0fwm53sscxdlzn1nz0jqfz5qgjahzc9cq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.10-linux-arm64.tar.gz"; @@ -425,8 +425,8 @@ sha256 = "14d75k7l23p0di75svdhrpqwkgd1wc88s535sgp3ry8zknirx3y9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.1-linux-arm64.tar.gz"; - sha256 = "0ipqaf6m4gn8jxv4i7nj23jgdr5i0hldb53g3mwqf1c2nshz3c7x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.2-linux-arm64.tar.gz"; + sha256 = "1xds90d0lg86c1i320bjhqk0h84xl39hwd91gdq9rllrva413cfl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.2-linux-arm64.tar.gz"; @@ -441,8 +441,8 @@ sha256 = "1aba8vd13790d8h29i9h5i7zlj5franbfj1l1minlp4vhxry3q6c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.122.0-linux-arm64.tar.gz"; - sha256 = "14li437gagdiwwx8m149k0x1yj16rmz9ik0lgr4r6w0wcsnlvmmi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.123.0-linux-arm64.tar.gz"; + sha256 = "0phigi7qydf2yqkiqi0gc1hhpx8fd2912d5y7g3s5yb5dblng21i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.183.0-darwin-arm64.tar.gz"; - sha256 = "1zycq0mpvbk75gihndfgjxl8714d35m8iba20lqqkkfyhkwl32hw"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.184.0-darwin-arm64.tar.gz"; + sha256 = "0zbbzvx5r7w2sv12qiabqy177k5zcdwpa9x8rhfn6iskn0zcid8k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.40.0-darwin-arm64.tar.gz"; @@ -491,8 +491,8 @@ sha256 = "0n8d67nzpas21mmxc6vl2vqqq4vgd54gr9r94dcm2666ssad6ii4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.82.0-darwin-arm64.tar.gz"; - sha256 = "13h8zk4n8vjl8d3j2i01ipjkfqm81xdnb06szywz0cnyg9f8p2b5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.83.0-darwin-arm64.tar.gz"; + sha256 = "11yv21983xfpf2asc00ng48jxz0xfhrax0gyp20p6gri4alfj5xr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.8.5-darwin-arm64.tar.gz"; @@ -503,8 +503,8 @@ sha256 = "1vkqy73n2371b7r1j5d3apm3kih4la39fswbw9w765s2nkpg8zi3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.83.0-darwin-arm64.tar.gz"; - sha256 = "0sszynwszz51nhxc3dc9z4nrcmjn18qlxkx3i3k4d5k38syjk2n5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.0.0-darwin-arm64.tar.gz"; + sha256 = "01bcjaq0nl0j1msbrfdx79ppmmp3l7mv0wwvsc52w8z1vbcxnylx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.1-darwin-arm64.tar.gz"; @@ -555,8 +555,8 @@ sha256 = "0ns88zd55p3pg8z8xs8jph9bv33s1alii4gnwd7gxc651gy7icrq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.1.0-darwin-arm64.tar.gz"; - sha256 = "1sqkjykzl7dibiwhd8sz9vmwvvgj6fpm9fzagydd095hqygrf4vn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.2.0-darwin-arm64.tar.gz"; + sha256 = "05razvng8zcvqwj6hqi0b9a648gwkmjrc5f4m3a10pvz8gf1rxvg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz"; @@ -571,8 +571,8 @@ sha256 = "17fl8apnlz4ifjzp1sq0fi4y1knxh1x2fvhlrg8j568f3svp41f8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.0.0-darwin-arm64.tar.gz"; - sha256 = "17fzb6mxbkvq0yzdd3nxsq4cc8llbwnib9djpj51h2b5qkqvr3ri"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.1.0-darwin-arm64.tar.gz"; + sha256 = "1jy9rbll0d5g4w8llys3ggj3mz59d2ljwakg1vqsq1cflly67af0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.10-darwin-arm64.tar.gz"; @@ -583,8 +583,8 @@ sha256 = "190mmw7sdw8rln9q5yv04hmn9b70cqd4piyhn8i23qf831irligr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.1-darwin-arm64.tar.gz"; - sha256 = "13cg2h7hndh1c73da7zbd5dkdkga0z2jfkwywvjd01913dajypas"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.2-darwin-arm64.tar.gz"; + sha256 = "12b397zam5m3d88kbcj1jj84qss8a81haf6bwhw7xhzq278i0rm1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.2-darwin-arm64.tar.gz"; @@ -599,8 +599,8 @@ sha256 = "0wxdhalnhid7b0p1qq7pvc1llp0x671vmw2x5k6hddpqslxzzwvy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.122.0-darwin-arm64.tar.gz"; - sha256 = "1zkiqcp5sji8g734kcmvpyhws1qg4q4drlhxprgrbys3swhp96vx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.123.0-darwin-arm64.tar.gz"; + sha256 = "06777viblb473yynw00xkhry37771gaxyqafpma4drj5qiicgmfn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/graphics/directx-shader-compiler/default.nix b/pkgs/tools/graphics/directx-shader-compiler/default.nix index 73a7a8f86ef4..cf52a8ade9fa 100644 --- a/pkgs/tools/graphics/directx-shader-compiler/default.nix +++ b/pkgs/tools/graphics/directx-shader-compiler/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "directx-shader-compiler"; - version = "1.8.2505"; + version = "1.8.2505.1"; # Put headers in dev, there are lot of them which aren't necessary for # using the compiler binary. @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "microsoft"; repo = "DirectXShaderCompiler"; rev = "v${finalAttrs.version}"; - hash = "sha256-o1yLn3Fp3a9KhR2ZhAr8K2Mf1neMUL0g1Zf7GQ0TgQU="; + hash = "sha256-d8qJ9crS5CStbsGOe/OSHtUEV4vr3sLCQp+6KsEq/A4="; fetchSubmodules = true; }; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index 134a6602f23d..fca8239debde 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "ibus-table-others"; - version = "1.3.20"; + version = "1.3.21"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-mi2vF+OH3c9lgWFxswzCbENCleTWLHNE8clzZcdcwfM="; + hash = "sha256-/3ZDQCc/u2HKlL0+kZ0g4Gbjrkk++l3lSrWQz7CvwaQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 08e8ad917e8f..65c65e2ff2ae 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.17.12"; + version = "1.17.14"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "sha256-ecs99Y7NctnKTdRT9UHiDqliinvPNMHIyb5mwT7dDL8="; + sha256 = "sha256-BPFKxJqc/p+lzUk7MHEY2j7IL6AVC/xpo5BG5YaR3vY="; }; postPatch = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9c640f4feafd..8c14298d4eb1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -527,6 +527,7 @@ mapAliases { dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as is now included in Dart Sass itself."; dat = nodePackages.dat; dave = throw "'dave' has been removed as it has been archived upstream. Consider using 'webdav' instead"; # Added 2025-02-03 + daytona-bin = throw "'daytona-bin' has been removed, as it was unmaintained in nixpkgs"; # Added 2025-07-21 dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16 dbench = throw "'dbench' has been removed as it is unmaintained for 14 years and broken"; # Added 2025-05-17 dclib = throw "'dclib' has been removed as it is unmaintained for 16 years and broken"; # Added 2025-05-25 @@ -1215,6 +1216,8 @@ mapAliases { ma1sd = throw "ma1sd was dropped as it is unmaintained"; # Added 2024-07-10 mac = monkeysAudio; # Added 2024-11-30 MACS2 = macs2; # Added 2023-06-12 + magma_2_6_2 = throw "'magma_2_6_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20 + magma_2_7_2 = throw "'magma_2_7_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20 mailcore2 = throw "'mailcore2' has been removed due to lack of upstream maintenance."; # Added 2025-06-09 mailctl = throw "mailctl has been renamed to oama"; # Added 2024-08-19 mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae183fa8dab0..a31a981e57e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -296,8 +296,6 @@ with pkgs; opencv = opencv.override { enableGtk3 = true; }; }; - beebeep = libsForQt5.callPackage ../applications/office/beebeep { }; - bloodhound-py = with python3Packages; toPythonApplication bloodhound-py; # Zip file format only allows times after year 1980, which makes e.g. Python @@ -5040,42 +5038,36 @@ with pkgs; wrapCCMulti = cc: - if stdenv.targetPlatform.system == "x86_64-linux" then - let - # Binutils with glibc multi - bintools = cc.bintools.override { - libc = glibc_multi; - }; - in - lowPrio (wrapCCWith { - cc = cc.cc.override { - stdenv = overrideCC stdenv (wrapCCWith { - cc = cc.cc; - inherit bintools; - libc = glibc_multi; - }); - profiledCompiler = false; - enableMultilib = true; - }; + let + # Binutils with glibc multi + bintools = cc.bintools.override { libc = glibc_multi; - inherit bintools; - extraBuildCommands = '' - echo "dontMoveLib64=1" >> $out/nix-support/setup-hook - ''; - }) - else - throw "Multilib ${cc.name} not supported for ‘${stdenv.targetPlatform.system}’"; + }; + in + lowPrio (wrapCCWith { + cc = cc.cc.override { + stdenv = overrideCC stdenv (wrapCCWith { + cc = cc.cc; + inherit bintools; + libc = glibc_multi; + }); + profiledCompiler = false; + enableMultilib = true; + }; + libc = glibc_multi; + inherit bintools; + extraBuildCommands = '' + echo "dontMoveLib64=1" >> $out/nix-support/setup-hook + ''; + }); wrapClangMulti = clang: - if stdenv.targetPlatform.system == "x86_64-linux" then - callPackage ../development/compilers/llvm/multi.nix { - inherit clang; - gcc32 = pkgsi686Linux.gcc; - gcc64 = pkgs.gcc; - } - else - throw "Multilib ${clang.cc.name} not supported for '${stdenv.targetPlatform.system}'"; + callPackage ../development/compilers/llvm/multi.nix { + inherit clang; + gcc32 = pkgsi686Linux.gcc; + gcc64 = pkgs.gcc; + }; gcc_multi = wrapCCMulti gcc; clang_multi = wrapClangMulti clang; @@ -5784,6 +5776,13 @@ with pkgs; llvm_20 = llvmPackages_20.llvm; bolt_20 = llvmPackages_20.bolt; + llvmPackages_21 = llvmPackagesSet."21"; + clang_21 = llvmPackages_21.clang; + lld_21 = llvmPackages_21.lld; + lldb_21 = llvmPackages_21.lldb; + llvm_21 = llvmPackages_21.llvm; + bolt_21 = llvmPackages_21.bolt; + mkLLVMPackages = llvmPackagesSet.mkPackage; }) llvmPackages_12 @@ -5809,6 +5808,12 @@ with pkgs; lldb_20 llvm_20 bolt_20 + llvmPackages_21 + clang_21 + lld_21 + lldb_21 + llvm_21 + bolt_21 mkLLVMPackages ; @@ -14605,8 +14610,6 @@ with pkgs; cataclysm-dda-git = cataclysmDDA.git.tiles; - chessx = libsForQt5.callPackage ../games/chessx { }; - chiaki = libsForQt5.callPackage ../games/chiaki { }; chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { }; @@ -15308,7 +15311,7 @@ with pkgs; # standard BLAS and LAPACK. openblasCompat = openblas.override { blas64 = false; }; - inherit (callPackage ../development/libraries/science/math/magma { }) magma magma_2_7_2 magma_2_6_2; + inherit (callPackage ../development/libraries/science/math/magma { }) magma; magma-cuda = magma.override { cudaSupport = true; @@ -15459,7 +15462,6 @@ with pkgs; inherit (callPackage ./coq-packages.nix { inherit (ocaml-ng) - ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10 ocamlPackages_4_12 @@ -15472,10 +15474,6 @@ with pkgs; ; }) mkCoqPackages - coqPackages_8_5 - coq_8_5 - coqPackages_8_6 - coq_8_6 coqPackages_8_7 coq_8_7 coqPackages_8_8 diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 1b75cdff5477..d8626077751d 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -6,7 +6,6 @@ callPackage, newScope, recurseIntoAttrs, - ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, @@ -272,7 +271,6 @@ let callPackage ../applications/science/logic/coq { inherit version - ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10 ocamlPackages_4_12 @@ -299,8 +297,6 @@ rec { in self.filterPackages (!coq.dontFilter or false); - coq_8_5 = mkCoq "8.5" { }; - coq_8_6 = mkCoq "8.6" { }; coq_8_7 = mkCoq "8.7" { }; coq_8_8 = mkCoq "8.8" { }; coq_8_9 = mkCoq "8.9" { }; @@ -318,8 +314,6 @@ rec { coq_9_0 = mkCoq "9.0" rocqPackages_9_0; coq_9_1 = mkCoq "9.1" rocqPackages_9_1; - coqPackages_8_5 = mkCoqPackages coq_8_5; - coqPackages_8_6 = mkCoqPackages coq_8_6; coqPackages_8_7 = mkCoqPackages coq_8_7; coqPackages_8_8 = mkCoqPackages coq_8_8; coqPackages_8_9 = mkCoqPackages coq_8_9; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b12f50e790f2..0271f766f196 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1398,11 +1398,11 @@ with self; }; AppSqitch = buildPerlModule { - version = "1.5.1"; + version = "1.5.2"; pname = "App-Sqitch"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.5.1.tar.gz"; - hash = "sha256-Fqo0j8Sedfj/ZQMfBiLUGSkyMhsFvWUYq5lkYYVy1pg="; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.5.2.tar.gz"; + hash = "sha256-horqXNSz6uDPrKiXK546ag+PmYiEjVNazstJVbAovNE="; }; buildInputs = [ CaptureTiny diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c6b86acc7cea..3cf3e09d014e 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -727,6 +727,7 @@ mapAliases ({ sequoia = throw "python3Packages.sequoia was replaced by pysequoia - built from a dedicated repository, with a new API."; # added 2023-06-24 setuptools_dso = setuptools-dso; # added 2024-03-03 setuptools_scm = setuptools-scm; # added 2021-06-03 + setuptoolsCheckHook = throw "The setuptoolsCheckHook has been removed, since the test command has been removed in setuptools 72.0."; # added 2024-08-06 setuptoolsTrial = setuptools-trial; # added 2023-11-11 sharkiqpy = sharkiq; # added 2022-05-21 shouldbe = throw "shouldbe was removed, because it was disabled on all python version since 3.8 and last updated in 2019."; # added 2024-05-12 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f6d116bda71e..4ba4d377852a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6701,6 +6701,8 @@ self: super: with self; { httpx = callPackage ../development/python-modules/httpx { }; + httpx-aiohttp = callPackage ../development/python-modules/httpx-aiohttp { }; + httpx-auth = callPackage ../development/python-modules/httpx-auth { }; httpx-ntlm = callPackage ../development/python-modules/httpx-ntlm { }; @@ -8521,6 +8523,8 @@ self: super: with self; { llm-git = callPackage ../development/python-modules/llm-git { }; + llm-github-copilot = callPackage ../development/python-modules/llm-github-copilot { }; + llm-grok = callPackage ../development/python-modules/llm-grok { }; llm-groq = callPackage ../development/python-modules/llm-groq { }; @@ -12027,6 +12031,8 @@ self: super: with self; { psd-tools = callPackage ../development/python-modules/psd-tools { }; + psnawp = callPackage ../development/python-modules/psnawp { }; + psrpcore = callPackage ../development/python-modules/psrpcore { }; psutil = callPackage ../development/python-modules/psutil { }; @@ -15967,6 +15973,8 @@ self: super: with self; { sasmodels = callPackage ../development/python-modules/sasmodels { }; + sat-tmp = callPackage ../development/python-modules/sat-tmp { }; + satel-integra = callPackage ../development/python-modules/satel-integra { }; sbom2dot = callPackage ../development/python-modules/sbom2dot { }; @@ -17910,6 +17918,8 @@ self: super: with self; { tilt-ble = callPackage ../development/python-modules/tilt-ble { }; + tilt-pi = callPackage ../development/python-modules/tilt-pi { }; + time-machine = callPackage ../development/python-modules/time-machine { }; timeago = callPackage ../development/python-modules/timeago { }; @@ -18309,6 +18319,8 @@ self: super: with self; { tskit = callPackage ../development/python-modules/tskit { }; + tsplib95 = callPackage ../development/python-modules/tsplib95 { }; + ttach = callPackage ../development/python-modules/ttach { }; ttfautohint-py = callPackage ../development/python-modules/ttfautohint-py { }; @@ -19201,6 +19213,8 @@ self: super: with self; { vega-datasets = callPackage ../development/python-modules/vega-datasets { }; + vegehub = callPackage ../development/python-modules/vegehub { }; + vehicle = callPackage ../development/python-modules/vehicle { }; velbus-aio = callPackage ../development/python-modules/velbus-aio { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 52292ba37151..2adcf3cc4431 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -176,5 +176,5 @@ in xfsprogs = linux; xkeyboard_config = linux; zip = all; - tests-stdenv-gcc-stageCompare = all; + tests-stdenv-gcc-stageCompare = linux; }))