From dabac4bf0c5eefbb07402189d9ba6efce3ff7b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 18 May 2022 17:37:48 +0200 Subject: [PATCH 001/106] doc: Document that the staging branches may be restricted --- doc/contributing/submitting-changes.chapter.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index 6f87e015b9cf..cded53cdd981 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -238,12 +238,16 @@ The `master` branch is the main development branch. It should only see non-break The `staging` branch is a development branch where mass-rebuilds go. Mass rebuilds are commits that cause rebuilds for many packages, like more than 500 (or perhaps, if it's 'light' packages, 1000). It should only see non-breaking mass-rebuild commits. That means it is not to be used for testing, and changes must have been well tested already. If the branch is already in a broken state, please refrain from adding extra new breakages. +During the process of a releasing a new NixOS version, this branch or the release-critical packages can be restricted to non-breaking changes. + ### Staging-next branch {#submitting-changes-staging-next-branch} The `staging-next` branch is for stabilizing mass-rebuilds submitted to the `staging` branch prior to merging them into `master`. Mass-rebuilds must go via the `staging` branch. It must only see non-breaking commits that are fixing issues blocking it from being merged into the `master ` branch. If the branch is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days and then merge into master. +During the process of a releasing a new NixOS version, this branch or the release-critical packages can be restricted to non-breaking changes. + ### Stable release branches {#submitting-changes-stable-release-branches} The same staging workflow applies to stable release branches, but the main branch is called `release-*` instead of `master`. From 698dbb85ae5234a1cdf44970947e76cd6b6e8bc5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Sep 2022 19:37:37 +0000 Subject: [PATCH 002/106] python310Packages.django-debug-toolbar: 3.5 -> 3.7 --- .../python-modules/django-debug-toolbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index b4409dc04d4c..bc54eadde8f7 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "3.5"; + version = "3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OZWO3tXZ+p+zKtQHCkj0kGSXpDFHFV+HqSgiJvLmMTg="; + hash = "sha256-LGEx21m5TNotbwKHf5in+EDkYqqNOoF7mBstnfLYe9s="; }; propagatedBuildInputs = [ From fc7ca788a3ff6f044972dcaedd3d1d33f867ca7a Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 10 Oct 2022 10:19:14 +0200 Subject: [PATCH 003/106] sylpheed: apply patch for CVE-2021-37746 --- .../networking/mailreaders/sylpheed/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 9a65bec21c20..32350bb5cfa7 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -19,13 +19,17 @@ stdenv.mkDerivation rec { (fetchpatch { # patch upstream bug https://sylpheed.sraoss.jp/redmine/issues/306 name = "patch-libsylph_ssl_c.patch"; + extraPrefix = ""; url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/mail/sylpheed/patches/patch-libsylph_ssl_c?rev=1.4&content-type=text/plain"; - sha256 = "sha256-k9OwPtHrEjaxXdH0trNqXgJMhR8kjgtei9pi6OFvILk="; + sha256 = "sha256-+FetU5vrfvE78nYAjKK/QFZnFw+Zr2PvoUGRWCuZczs="; + }) + (fetchpatch { + name = "CVE-2021-37746.patch"; + url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=ac286a71ed78429e16c612161251b9ea90ccd431"; + sha256 = "sha256-oLmUShtvO6io3jibKT67eO0O58vEDZEeaB51QTd3UkU="; }) ]; - patchFlags = [ "-p0" ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ] From 18a17d11ff6d201530bc529d65d67ce5940e36cb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 11 Oct 2022 21:16:37 +0200 Subject: [PATCH 004/106] nixos/jenkins: jdk11 -> jdk17 see https://www.jenkins.io/doc/upgrade-guide/2.361/ we'll need to do this eventually, not sure when the best point in time is --- .../services/continuous-integration/jenkins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 6cd5718f4227..a9a587b41e88 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -87,8 +87,8 @@ in { }; packages = mkOption { - default = [ pkgs.stdenv pkgs.git pkgs.jdk11 config.programs.ssh.package pkgs.nix ]; - defaultText = literalExpression "[ pkgs.stdenv pkgs.git pkgs.jdk11 config.programs.ssh.package pkgs.nix ]"; + default = [ pkgs.stdenv pkgs.git pkgs.jdk17 config.programs.ssh.package pkgs.nix ]; + defaultText = literalExpression "[ pkgs.stdenv pkgs.git pkgs.jdk17 config.programs.ssh.package pkgs.nix ]"; type = types.listOf types.package; description = lib.mdDoc '' Packages to add to PATH for the jenkins process. @@ -228,7 +228,7 @@ in { # For reference: https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript script = '' - ${pkgs.jdk11}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ + ${pkgs.jdk17}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ --httpPort=${toString cfg.port} \ --prefix=${cfg.prefix} \ -Djava.awt.headless=true \ From eca87400bd7344c7fe5d42d000e71fd595047b9b Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 16 Oct 2022 16:56:33 +0200 Subject: [PATCH 005/106] wordpressPackages.plugins.gutenberg: init at 14.3.0 --- .../web-apps/wordpress/packages/languages.json | 10 +++++----- .../web-apps/wordpress/packages/plugins.json | 14 ++++++++++---- .../wordpress/packages/wordpress-plugins.json | 1 + 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/packages/languages.json b/pkgs/servers/web-apps/wordpress/packages/languages.json index 03e49d39c454..6cf2c6ee03de 100644 --- a/pkgs/servers/web-apps/wordpress/packages/languages.json +++ b/pkgs/servers/web-apps/wordpress/packages/languages.json @@ -1,14 +1,14 @@ { "de_DE": { "path": "de_DE", - "rev": "963003", - "sha256": "167zar1gp2jb6nx5nb5367mxk7b8c481gmg75m1s82y4mzlprc55", - "version": "5.9" + "rev": "963451", + "sha256": "0zp1sz9f5vwz3ywj746la799nlaqxigja34qb83qqrsgkgaliff2", + "version": "5.8" }, "fr_FR": { "path": "fr_FR", - "rev": "932480", - "sha256": "0lmbalcvwfc6331vdazmhr2lp3w418rsp78mrj1rs7a44y8f1igj", + "rev": "967096", + "sha256": "0r40kkmm7an6zdqszqcgr07ffkfif5c9446fjxba20vslhgkj9mg", "version": "5.8" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index e474a1f3fdba..7edc6bee73fb 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -47,6 +47,12 @@ "sha256": "04x5dj79bx5avx8db991nlhrpd3qv3maniqmzwnyd8ab2zblzx83", "version": "1.0.1" }, + "gutenberg": { + "path": "gutenberg/tags/14.3.0", + "rev": "2797654", + "sha256": "0gf9spzsljhvmvhhqcgdcbrh95y2j0idmxjxsqnv2hk0miaka00d", + "version": "14.3.0" + }, "jetpack": { "path": "jetpack/tags/11.4", "rev": "2794223", @@ -90,10 +96,10 @@ "version": "0.9.3" }, "webp-converter-for-media": { - "path": "webp-converter-for-media/tags/5.3.0", - "rev": "2797448", - "sha256": "1w6i4z09rj9prj4skv9j2m45nsi1an092j2frfzf1wmdacvsrmvh", - "version": "5.3.0" + "path": "webp-converter-for-media/tags/5.3.1", + "rev": "2798010", + "sha256": "1flggxd6hw0ps3b0y32a2aj9g3zfpzbaiwzx1zn2s7zpxn508y1b", + "version": "5.3.1" }, "worker": { "path": "worker/tags/4.9.14", diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json index a66a06789235..c9b47701c11e 100644 --- a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json @@ -7,6 +7,7 @@ , "cookie-notice" , "co-authors-plus" , "disable-xml-rpc" +, "gutenberg" , "jetpack" , "jetpack-lite" , "lightbox-photoswipe" From c6cae19d1937c21213bd37127d027365942be850 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Mon, 17 Oct 2022 01:02:27 +0800 Subject: [PATCH 006/106] viu: add withSixel option; adopt --- pkgs/tools/graphics/viu/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix index 34bec2159095..ade2dd7331bf 100644 --- a/pkgs/tools/graphics/viu/default.nix +++ b/pkgs/tools/graphics/viu/default.nix @@ -1,4 +1,9 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib +, rustPlatform +, fetchFromGitHub +, libsixel +, withSixel ? false +}: rustPlatform.buildRustPackage rec { pname = "viu"; @@ -16,10 +21,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ildtjaYGbrQacJOdGDVwFv+kod+vZHqukWN6ARtJqI4="; + buildFeatures = lib.optional withSixel "sixel"; + buildInputs = lib.optional withSixel libsixel; + meta = with lib; { description = "A command-line application to view images from the terminal written in Rust"; homepage = "https://github.com/atanunq/viu"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ chuangzhu ]; }; } From 08bb29847e53c209fd5c632e1e822dd70440a373 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 17 Oct 2022 11:58:05 +0200 Subject: [PATCH 007/106] faircamp: unstable-2022-07-22 -> unstable-2022-10-08 --- pkgs/applications/misc/faircamp/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index 2113d53595da..a50c4e42706a 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -2,6 +2,10 @@ , rustPlatform , fetchgit , makeWrapper +, pkg-config +, glib +, libopus +, vips , ffmpeg , callPackage , unstableGitUpdater @@ -9,20 +13,27 @@ rustPlatform.buildRustPackage { pname = "faircamp"; - version = "unstable-2022-07-22"; + version = "unstable-2022-10-08"; # TODO when switching to a stable release, use fetchFromGitea and add a # version test. Meanwhile, fetchgit is used to make unstableGitUpdater work. src = fetchgit { url = "https://codeberg.org/simonrepp/faircamp.git"; - rev = "4803b6e0b59c1fc9922d1e498743a0171d7f324d"; - sha256 = "sha256-VliBGYZPoX65JURlBaVMCMB5DuE/gqr27KcEzAVRFxc="; + rev = "630415985127298bf82bfc210d2fc8b214758db1"; + sha256 = "sha256-4pzDey0iV7LtHI0rbbcCjjuTaFt0CR88Vl0B1RU96v0="; }; - cargoHash = "sha256-fs7CXw6CS+TtMxLtDaQiYY6fiBFl4RCttymQJDAm6dg="; + cargoHash = "sha256-GgWxxKHLGtsSGVbhli6HTfUu4TmbY4J9N7UA7AOzUkc="; nativeBuildInputs = [ makeWrapper + pkg-config + ]; + + buildInputs = [ + glib + libopus + vips ]; postInstall = '' From 120f6fec4200d7f19ef3e1c4029a872853b5f237 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 17 Oct 2022 12:04:09 +0200 Subject: [PATCH 008/106] upnp-router-control: init at 0.3.1 --- .../upnp-router-control/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/networking/upnp-router-control/default.nix diff --git a/pkgs/applications/networking/upnp-router-control/default.nix b/pkgs/applications/networking/upnp-router-control/default.nix new file mode 100644 index 000000000000..793dca750655 --- /dev/null +++ b/pkgs/applications/networking/upnp-router-control/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchurl +, intltool +, pkg-config +, wrapGAppsHook +, gssdp +, gtk3 +, gupnp +}: + +stdenv.mkDerivation rec { + pname = "upnp-router-control"; + version = "0.3.1"; + + src = fetchurl { + url = "https://launchpad.net/upnp-router-control/trunk/${version}/+download/upnp-router-control-${version}.tar.gz"; + hash = "sha256-bYbw4Z5hDlFTSGk5XE2gnnXRPYMl4IzV+kzlwfR98yg="; + }; + + nativeBuildInputs = [ + intltool + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gssdp + gtk3 + gupnp + ]; + + meta = with lib; { + # also https://gitlab.gnome.org/DnaX/upnp-router-control + homepage = "https://launchpad.net/upnp-router-control"; + description = "Access some parameters of the router and manage port forwarding"; + longDescription = '' + A GTK application to access some parameters of the router like: + the network speed, the external IP and the model name. + It can manage port forwarding through a simple GUI interface. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dce53cf1e09d..6ebb493e3efd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32199,6 +32199,8 @@ with pkgs; unison-ucm = callPackage ../development/compilers/unison { }; + upnp-router-control = callPackage ../applications/networking/upnp-router-control { }; + urh = callPackage ../applications/radio/urh { }; uroboros = callPackage ../tools/system/uroboros { }; From f7adcd674cf543938ee31f8cd1dcdccd4080841f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 22 Jun 2022 21:46:04 +0200 Subject: [PATCH 009/106] lib.licenses: add lal12 and lal13 --- lib/licenses.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 054726337783..6cae6219adbb 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -548,6 +548,16 @@ in mkLicense lset) ({ free = false; }; + lal12 = { + spdxId = "LAL-1.2"; + fullName = "Licence Art Libre 1.2"; + }; + + lal13 = { + spdxId = "LAL-1.3"; + fullName = "Licence Art Libre 1.3"; + }; + lgpl2Only = { spdxId = "LGPL-2.0-only"; fullName = "GNU Library General Public License v2 only"; From 8edb36074dfe27613feb18c7ab084216ec97b483 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 22 Jun 2022 19:00:39 +0200 Subject: [PATCH 010/106] hikounomizu: init at 0.9.2 --- pkgs/games/hikounomizu/default.nix | 77 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/games/hikounomizu/default.nix diff --git a/pkgs/games/hikounomizu/default.nix b/pkgs/games/hikounomizu/default.nix new file mode 100644 index 000000000000..6ba3ba96e4ac --- /dev/null +++ b/pkgs/games/hikounomizu/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchurl +, cmake +, pkg-config +, util-linux +, libGL +, freetype +, pugixml +, SDL2 +, SDL2_image +, openal +, libogg +, libvorbis +, libGLU +, synfigstudio +, inkscape +, imagemagick +, pngquant +, xz +}: + +stdenv.mkDerivation rec { + pname = "hikounomizu"; + version = "0.9.2"; + + src = fetchurl { + url = "http://download.tuxfamily.org/hnm/${version}/hikounomizu-${version}-src.tar.bz2"; + hash = "sha256-ZtvzQAiYG4IcdgKiBDIQFOJVnLbz1TsiIbdZr/0Y2U8="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + # for make data + util-linux + synfigstudio.synfig + inkscape + imagemagick + pngquant + xz + ]; + + buildInputs = [ + libGL + freetype + pugixml + SDL2 + SDL2_image + openal + libogg + libvorbis + libGLU + ]; + + postBuild = '' + make data + ''; + + meta = with lib; { + description = "A free platform-based fighting game"; + longDescription = '' + Hikou no mizu (ハイクの水) is a free platform-based fighting game, + licensed under the GNU GPL v3 (program) and the LAL (graphics). + It works on many operating systems including GNU/Linux, *BSD, Haiku, + OS X and Windows. + + The characters use natural powers such as water or lightning, + but they can also (mostly for now) fight the traditional way! + ''; + homepage = "https://hikounomizu.org/"; + downloadPage = "https://hikounomizu.org/download.html"; + maintainers = with maintainers; [ fgaz ]; + license = [ licenses.gpl3Plus licenses.lal13 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dce53cf1e09d..b8ce082ee0ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33892,6 +33892,8 @@ with pkgs; inherit (haskellPackages) ghcWithPackages; }; + hikounomizu = callPackage ../games/hikounomizu { }; + hyperrogue = callPackage ../games/hyperrogue { }; icbm3d = callPackage ../games/icbm3d { }; From edb08aac6b22f4f6c7f4846db0a946ac66889eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 18 Oct 2022 23:25:51 +0200 Subject: [PATCH 011/106] docker-compose: 2.11.2 -> 2.12.0 --- pkgs/applications/virtualization/docker/compose.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index ad6a02ec3b02..ab023dc4f02d 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,21 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.11.2"; + version = "2.12.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-L43BIkRaPAU0zgdVsf1a3OinbspiU0LfWZPssS91wTE="; + sha256 = "sha256-AwoWCaACq2s9rzvvpAx3GZd3oSZZPykLwYLUiUhEYfg="; }; - vendorSha256 = "sha256-PZumm//BV9iAkq1Kb9xNenqVrx73ZZUHTCUSVNqqEXA="; + postPatch = '' + # entirely separate package that breaks the build + rm -rf e2e/ + ''; + + vendorSha256 = "sha256-C7VgcbDB18dF+u422AFAfoICxGmqjREbOpUXrFlgmiM="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; From f4f6322b019454ec819aee2c77433a14776fd428 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Oct 2022 09:23:38 +0000 Subject: [PATCH 012/106] linode-cli: 5.23.0 -> 5.24.0 --- pkgs/tools/virtualization/linode-cli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 2aa9c8f6e815..02c7c5f0a473 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -11,10 +11,10 @@ }: let - sha256 = "1fv53wikx745kci86xrsq9kfsgv0a65srhywdw32cab1wywwpn2z"; + sha256 = "1xwfbfh25kwbv8q24mcxdv0h4iya5r56cc8d6d1ihp92i1k7ggk9"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.136.0"; - specSha256 = "17cxg83cav9qnrnv7i45hsn0z4a6a5yyfhzy80x1v0fshnc52dpw"; + specVersion = "4.138.0"; + specSha256 = "0gcfnrgp18r49pvpi5s7x8vmz7jmps99pqhq3maad3xcrryjjrj4"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; sha256 = specSha256; @@ -24,7 +24,7 @@ in buildPythonApplication rec { pname = "linode-cli"; - version = "5.23.0"; + version = "5.24.0"; src = fetchFromGitHub { owner = "linode"; From f4e0e749ff2f76d43884602bff65ac42bfa7d3a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Oct 2022 11:42:04 +0000 Subject: [PATCH 013/106] fsql: 0.5.0 -> 0.5.1 --- pkgs/tools/misc/fsql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 192959ec7603..0f2300a74805 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fsql"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "kshvmdn"; repo = "fsql"; rev = "v${version}"; - sha256 = "sha256-YavkN7n2Nt92T+uMwWRVv3q81DA6fFoNIJt9NYMS3rc="; + sha256 = "sha256-6KqlpFBaAWrlEjkFQhOEic569+eoYVAsnhMrg8AEPV4="; }; vendorSha256 = "sha256-xuD7/gTssf1Iu1VuIRysjtUjve16gozOq0Wz4w6mIB8="; From 2fcf20a83cf316eb202c20170c83a615f810d750 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Oct 2022 13:39:17 +0000 Subject: [PATCH 014/106] jellyfin-ffmpeg: 5.1.2-1 -> 5.1.2-2 --- pkgs/development/libraries/jellyfin-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 23df659a689f..6beceec390a8 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -8,13 +8,13 @@ nv-codec-headers = nv-codec-headers-11; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.1.2-1"; + version = "5.1.2-2"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-56IDFZnHDL3jArNd/U/ZRdHyJ54oqhY+U4XcwOLTGqQ="; + sha256 = "sha256-7Icp1vFnvhuohipGK7BqnxhhtX0iB02v5TXvh5sss3c="; }; configureFlags = old.configureFlags ++ [ From fe9fb739a9fef3ffe5de6a935bcd19e710351c89 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 19 Oct 2022 23:34:26 +0200 Subject: [PATCH 015/106] freshrss: fix greader-api --- nixos/modules/services/web-apps/freshrss.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 68780a3fe9dd..fe3b464ffc38 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -155,9 +155,17 @@ in virtualHosts.${cfg.virtualHost} = { root = "${cfg.package}/p"; + # php files handling + # this regex is mandatory because of the API locations."~ ^.+?\.php(/.*)?$".extraConfig = '' fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket}; fastcgi_split_path_info ^(.+\.php)(/.*)$; + # By default, the variable PATH_INFO is not set under PHP-FPM + # But FreshRSS API greader.php need it. If you have a “Bad Request” error, double check this var! + # NOTE: the separate $path_info variable is required. For more details, see: + # https://trac.nginx.org/nginx/ticket/321 + set $path_info $fastcgi_path_info; + fastcgi_param PATH_INFO $path_info; include ${pkgs.nginx}/conf/fastcgi_params; include ${pkgs.nginx}/conf/fastcgi.conf; ''; From 687253e0b06b631b06cab600bf105ed81cea2514 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 19 Oct 2022 08:34:13 +0200 Subject: [PATCH 016/106] nvitop: init at 0.10.0 --- pkgs/tools/system/nvitop/default.nix | 37 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/system/nvitop/default.nix diff --git a/pkgs/tools/system/nvitop/default.nix b/pkgs/tools/system/nvitop/default.nix new file mode 100644 index 000000000000..70a0311c3e43 --- /dev/null +++ b/pkgs/tools/system/nvitop/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, python3Packages +, fetchFromGitHub +, makeWrapper +}: + +python3Packages.buildPythonApplication rec { + pname = "nvitop"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "XuehaiPan"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-nGdEMLxpw2Ts0dypkoZg3r2NF4IeT1ykbRmrmf9qxrA="; + }; + + propagatedBuildInputs = with python3Packages; [ + cachetools + psutil + termcolor + nvidia-ml-py + ]; + + checkPhase = '' + $out/bin/nvitop --help + ''; + + meta = with lib; { + description = "An interactive NVIDIA-GPU process viewer, the one-stop solution for GPU process management"; + homepage = "https://github.com/XuehaiPan/nvitop"; + license = licenses.gpl3; + maintainers = with maintainers; [ GaetanLepage ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ab36fc6f57d..a003ffab1753 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21230,6 +21230,8 @@ with pkgs; nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { }; + nvitop = callPackage ../tools/system/nvitop { }; + nvtop = callPackage ../tools/system/nvtop { }; nvtop-nvidia = callPackage ../tools/system/nvtop { amd = false; }; nvtop-amd = callPackage ../tools/system/nvtop { nvidia = false; }; From dd3d6e6d661cee4150460b03585d3958597b2b29 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 20 Oct 2022 00:56:56 +0200 Subject: [PATCH 017/106] mailmap: unify sandro.jaeckel@gmail.com --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 41d983260f22..4a1413349ce4 100644 --- a/.mailmap +++ b/.mailmap @@ -1 +1,2 @@ Daniel Løvbrøtte Olsen +Sandro From c5e6503128c12c99ae4ab3a777bb5e6ab411cfea Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Thu, 25 Aug 2022 20:39:04 -0400 Subject: [PATCH 018/106] deheader: init at 1.8 --- .../tools/misc/deheader/default.nix | 68 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/development/tools/misc/deheader/default.nix diff --git a/pkgs/development/tools/misc/deheader/default.nix b/pkgs/development/tools/misc/deheader/default.nix new file mode 100644 index 000000000000..ad1cb909b0de --- /dev/null +++ b/pkgs/development/tools/misc/deheader/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, python3 +, xmlto +, docbook-xsl-nons +, fetchFromGitLab +, installShellFiles +}: + +stdenv.mkDerivation rec { + pname = "deheader"; + version = "1.8"; + outputs = [ "out" "man" ]; + + src = fetchFromGitLab { + owner = "esr"; + repo = "deheader"; + rev = version; + sha256 = "sha256-sjxgUtdsi/sfxOViDj7l8591TSYwtCzDQcHsk9ClXuM="; + }; + + buildInputs = [ python3 ]; + + nativeBuildInputs = [ xmlto docbook-xsl-nons installShellFiles ]; + + # With upstream Makefile, xmlto is called without "--skip-validation". It + # makes it require a lot of dependencies, yet ultimately it fails + # nevertheless in attempt to fetch something from SourceForge. + # + # Need to set "foundMakefile" so "make check" tests are run. + buildPhase = '' + runHook preBuild + + xmlto man --skip-validation deheader.xml + patchShebangs ./deheader + foundMakefile=1 + + runHook postBuild + ''; + + doCheck = true; + + installPhase = '' + runHook preInstall + + install -Dm755 ./deheader -t $out/bin + installManPage ./deheader.1 + + runHook postInstall + ''; + + meta = with lib; { + description = "Tool to find and optionally remove unneeded includes in C or C++ source files"; + longDescription = '' + This tool takes a list of C or C++ sourcefiles and generates a report + on which #includes can be omitted from them -- the test, for each foo.c + or foo.cc or foo.cpp, is simply whether 'rm foo.o; make foo.o' returns a + zero status. Optionally, with the -r option, the unneeded headers are removed. + The tool also reports on headers required for strict portability. + ''; + homepage = "http://catb.org/~esr/deheader"; + changelog = "https://gitlab.com/esr/deheader/-/blob/master/NEWS.adoc"; + license = licenses.bsd2; + maintainers = with maintainers; [ kaction ]; + + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93554e795c6c..f8e9c723f077 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3679,6 +3679,8 @@ with pkgs; dedup = callPackage ../tools/backup/dedup { }; + deheader = callPackage ../development/tools/misc/deheader { }; + dehydrated = callPackage ../tools/admin/dehydrated { }; deja-dup = callPackage ../applications/backup/deja-dup { }; From 3b6e2eb68328e622dd4aea63c598adeae22b50a7 Mon Sep 17 00:00:00 2001 From: Bill Huang Date: Tue, 4 Oct 2022 15:18:31 +0800 Subject: [PATCH 019/106] aiorwlock: init at 1.3.0 update aiorwlock hash remove pytest-cov add pythonImportsCheck --- .../python-modules/aiorwlock/default.nix | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/aiorwlock/default.nix diff --git a/pkgs/development/python-modules/aiorwlock/default.nix b/pkgs/development/python-modules/aiorwlock/default.nix new file mode 100644 index 000000000000..9ee21f2a7c9b --- /dev/null +++ b/pkgs/development/python-modules/aiorwlock/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, fetchPypi +, lib +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aiorwlock"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-g/Eth99LlyiguP2hdWWFqw1lKxB7q1nGCE4bGtaSq0U="; + }; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ "aiorwlock" ]; + + meta = with lib; { + description = "Read write lock for asyncio"; + homepage = "https://github.com/aio-libs/aiorwlock"; + license = licenses.asl20; + maintainers = with maintainers; [ billhuang ]; + }; +} From e48936d8c46e572bfe7e238efcb6268c7e8d3d2a Mon Sep 17 00:00:00 2001 From: Bill Huang Date: Tue, 4 Oct 2022 15:19:19 +0800 Subject: [PATCH 020/106] opencensus: init at 0.11.0 update hash use python.sitePackage add pythonImportsCheck --- .../python-modules/opencensus/default.nix | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/opencensus/default.nix diff --git a/pkgs/development/python-modules/opencensus/default.nix b/pkgs/development/python-modules/opencensus/default.nix new file mode 100644 index 000000000000..0690da3d7ba9 --- /dev/null +++ b/pkgs/development/python-modules/opencensus/default.nix @@ -0,0 +1,55 @@ +{ buildPythonPackage +, fetchPypi +, lib +, python +, unittestCheckHook +, google-api-core +}: + +let + opencensus-context = buildPythonPackage rec { + pname = "opencensus-context"; + version = "0.1.3"; + + checkInputs = [ unittestCheckHook ]; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-oDEIw8ENjIC7Xd9cih8DMWH6YZcqmRf5ubOhhRfwCIw="; + }; + }; +in +buildPythonPackage rec { + pname = "opencensus"; + version = "0.11.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-AmIWq6uJ2U2FBJLz3GWVAFXsT4QRX6bHvq/7pEo0bkI="; + }; + + buildInputs = [ + # opencensus-context is embedded in opencensus + opencensus-context + ]; + + propagatedBuildInputs = [ + google-api-core + ]; + + postInstall = '' + ln -sf ${opencensus-context}/${python.sitePackages}/opencensus/common/runtime_context \ + $out/${python.sitePackages}/opencensus/common/ + ''; + + checkInputs = [ unittestCheckHook ]; + + pythonImportsCheck = [ "opencensus" ]; + + meta = with lib; { + description = "A stats collection and distributed tracing framework"; + homepage = "https://github.com/census-instrumentation/opencensus-python"; + license = licenses.asl20; + maintainers = with maintainers; [ billhuang ]; + }; +} From f3101c2c689a72ee27a0cdc32b2ee51697f3bdf6 Mon Sep 17 00:00:00 2001 From: Bill Huang Date: Tue, 4 Oct 2022 15:19:31 +0800 Subject: [PATCH 021/106] gpustat: init at 1.0.0 update gpustat hash remove pytest-runner add pythonImportsCheck --- .../python-modules/gpustat/default.nix | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/gpustat/default.nix diff --git a/pkgs/development/python-modules/gpustat/default.nix b/pkgs/development/python-modules/gpustat/default.nix new file mode 100644 index 000000000000..fbfa2faf597b --- /dev/null +++ b/pkgs/development/python-modules/gpustat/default.nix @@ -0,0 +1,44 @@ +{ buildPythonPackage +, blessed +, fetchPypi +, lib +, mockito +, nvidia-ml-py +, psutil +, pytest-runner +, pythonRelaxDepsHook +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gpustat"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-WB6P+FjDLJWjIruPA/HZ3D0Xe07LM93L7Sw3PGf04/E="; + }; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + pythonRelaxDeps = [ "nvidia-ml-py" ]; + + propagatedBuildInputs = [ + blessed + nvidia-ml-py + psutil + ]; + + checkInputs = [ + mockito + pytestCheckHook + ]; + + pythonImportsCheck = [ "gpustat" ]; + + meta = with lib; { + description = "A simple command-line utility for querying and monitoring GPU status"; + homepage = "https://github.com/wookayin/gpustat"; + license = licenses.mit; + maintainers = with maintainers; [ billhuang ]; + }; +} From 0f2040f80c8e33266655634ee5f780c280caa82d Mon Sep 17 00:00:00 2001 From: Bill Huang Date: Tue, 4 Oct 2022 15:20:28 +0800 Subject: [PATCH 022/106] ray-bin: init at 2.0.0 use the correct redis --- .../python-modules/ray/binary-hashes.nix | 11 ++ .../python-modules/ray/default.nix | 166 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 8 + 3 files changed, 185 insertions(+) create mode 100644 pkgs/development/python-modules/ray/binary-hashes.nix create mode 100644 pkgs/development/python-modules/ray/default.nix diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix new file mode 100644 index 000000000000..28f9e2103334 --- /dev/null +++ b/pkgs/development/python-modules/ray/binary-hashes.nix @@ -0,0 +1,11 @@ +{ + cp38 = { + sha256 = "da8adfa33ff54bc61cfe80334a0ee889e0060918db6ff9215aebe32e98b1f939"; + }; + cp39 = { + sha256 = "cab13346650f88171b3f348ed352f04695b96d1ab1090ed3b80bdc93e897dbd4"; + }; + cp310 = { + sha256 = "bcf3bff9517d77ea6c98592fa16e1cfb8bc0cfa345d3be69729bfa9c5bd78a7c"; + }; +} diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix new file mode 100644 index 000000000000..c6b764181875 --- /dev/null +++ b/pkgs/development/python-modules/ray/default.nix @@ -0,0 +1,166 @@ +{ aiohttp +, aiohttp-cors +, aiorwlock +, aiosignal +, attrs +, autoPatchelfHook +, buildBazelPackage +, buildPythonPackage +, fetchPypi +, click +, cloudpickle +, colorama +, colorful +, cython +, dm-tree +, fastapi +, filelock +, frozenlist +, fsspec +, gpustat +, grpc +, grpcio +, gym +, jsonschema +, lib +, lz4 +, matplotlib +, msgpack +, numpy +, opencensus +, packaging +, pandas +, py-spy +, prometheus-client +, protobuf3_20 +, psutil +, pyarrow +, pydantic +, python +, pythonAtLeast +, pythonOlder +, pythonRelaxDepsHook +, pyyaml +, redis +, requests +, scikitimage +, scipy +, setproctitle +, smart-open +, starlette +, stdenv +, tabulate +, tensorboardx +, uvicorn +, virtualenv +}: + +let + pname = "ray"; + version = "2.0.0"; +in +buildPythonPackage rec { + inherit pname version; + format = "wheel"; + + disabled = pythonOlder "3.8" || pythonAtLeast "3.11"; + + src = + let + pyShortVersion = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; + binary-hash = (import ./binary-hashes.nix)."${pyShortVersion}"; + in + fetchPypi ({ + inherit pname version format; + dist = pyShortVersion; + python = pyShortVersion; + abi = pyShortVersion; + platform = "manylinux2014_x86_64"; + } // binary-hash); + + passthru.optional-dependencies = rec { + data-deps = [ + pandas + pyarrow + fsspec + ]; + + serve-deps = [ + aiorwlock + fastapi + pandas + starlette + uvicorn + ]; + + tune-deps = [ + tabulate + tensorboardx + ]; + + rllib-deps = tune-deps ++ [ + dm-tree + gym + lz4 + matplotlib + scikitimage + pyyaml + scipy + ]; + + air-deps = data-deps ++ serve-deps ++ tune-deps ++ rllib-deps; + }; + + nativeBuildInputs = [ + autoPatchelfHook + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ "grpcio" "click" "protobuf" ]; + + propagatedBuildInputs = [ + attrs + aiohttp + aiohttp-cors + aiosignal + click + cloudpickle + colorama + colorful + cython + filelock + frozenlist + gpustat + grpcio + jsonschema + msgpack + numpy + opencensus + packaging + py-spy + prometheus-client + protobuf3_20 + psutil + pydantic + pyyaml + requests + setproctitle + smart-open + virtualenv + ]; + + postInstall = '' + chmod +x $out/${python.sitePackages}/ray/core/src/ray/{gcs/gcs_server,raylet/raylet} + ln -sf ${redis}/bin/redis-server $out/${python.sitePackages}/ray/core/src/ray/thirdparty/redis/src/redis-server + ''; + + pythonImportsCheck = [ "ray" ]; + + meta = with lib; { + description = "A unified framework for scaling AI and Python applications"; + homepage = "https://github.com/ray-project/ray"; + license = licenses.asl20; + maintainers = with maintainers; [ billhuang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58b814a21b59..08bcbe26dc0d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -433,6 +433,8 @@ in { aiorun = callPackage ../development/python-modules/aiorun { }; + aiorwlock = callPackage ../development/python-modules/aiorwlock { }; + aiosenseme = callPackage ../development/python-modules/aiosenseme { }; aiosenz = callPackage ../development/python-modules/aiosenz { }; @@ -4035,6 +4037,8 @@ in { gpsoauth = callPackage ../development/python-modules/gpsoauth { }; + gpustat = callPackage ../development/python-modules/gpustat { }; + gpxpy = callPackage ../development/python-modules/gpxpy { }; gpy = callPackage ../development/python-modules/gpy { }; @@ -6522,6 +6526,8 @@ in { openbabel = callPackage ../development/libraries/openbabel { inherit (self) python; }; }; + opencensus = callPackage ../development/python-modules/opencensus { }; + opencv3 = toPythonModule (pkgs.opencv3.override { enablePython = true; pythonPackages = self; @@ -9616,6 +9622,8 @@ in { rawkit = callPackage ../development/python-modules/rawkit { }; + ray = callPackage ../development/python-modules/ray { redis = pkgs.redis; }; + rbtools = callPackage ../development/python-modules/rbtools { }; rcssmin = callPackage ../development/python-modules/rcssmin { }; From e00aa39f62b00093ae7e7f4667448f017ff64fa6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Oct 2022 05:29:04 +0000 Subject: [PATCH 023/106] buf: 1.8.0 -> 1.9.0 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index afd39ecc2d3b..5d5e4084085d 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yU1xPOnSQXrYdF24EsXb/x+IfoQFjIbW1KEt//7Fl5Q="; + sha256 = "sha256-KnG1FUdC8xpW/wI4E8+RzO0StKF+N7Wx1jTWNm4302M="; }; - vendorSha256 = "sha256-zEcKfMib/4/GfQC7M3f8R3v/hGh9F/KtjFs+pXDzbFk="; + vendorSha256 = "sha256-e/hkJoQ1GkSl4mhhgYVB4POult87DzWOXRLGyDVP+M0="; patches = [ # Skip a test that requires networking to be available to work. From 042138b3462b011c6679bb053357c9e4a84af756 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 4 Oct 2022 11:36:50 +0300 Subject: [PATCH 024/106] paho-mqtt-c: init at 1.3.11 --- .../libraries/paho-mqtt-c/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/paho-mqtt-c/default.nix diff --git a/pkgs/development/libraries/paho-mqtt-c/default.nix b/pkgs/development/libraries/paho-mqtt-c/default.nix new file mode 100644 index 000000000000..37a829088d81 --- /dev/null +++ b/pkgs/development/libraries/paho-mqtt-c/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, cmake, openssl }: + +stdenv.mkDerivation rec { + pname = "paho.mqtt.c"; + version = "1.3.11"; + + src = fetchFromGitHub { + owner = "eclipse"; + repo = "paho.mqtt.c"; + rev = "v${version}"; + hash = "sha256-TGCWA9tOOx0rCb/XQWqLFbXb9gOyGS8u6o9fvSRS6xI="; + }; + + postPatch = '' + substituteInPlace src/MQTTVersion.c \ + --replace "namebuf[60]" "namebuf[120]" \ + --replace "lib%s" "$out/lib/lib%s" + ''; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openssl ]; + + cmakeFlags = [ "-DPAHO_WITH_SSL=TRUE" ]; + + meta = with lib; { + description = "Eclipse Paho MQTT C Client Library"; + homepage = "https://www.eclipse.org/paho/"; + license = licenses.epl20; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad28e6378f40..f80ac0ed9cb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10025,6 +10025,8 @@ with pkgs; pagmo2 = callPackage ../development/libraries/pagmo2 { }; + paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { }; + pakcs = callPackage ../development/compilers/pakcs { # Doesn't compile with GHC 9.0 due to whitespace syntax changes # see also https://github.com/NixOS/nixpkgs/issues/166108 From 34a34da2c7c7a3f87694c13dc6267e4ba6e199e4 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 4 Oct 2022 11:59:17 +0300 Subject: [PATCH 025/106] paho-mqtt-cpp: init at 1.2.0 --- .../libraries/paho-mqtt-cpp/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/paho-mqtt-cpp/default.nix diff --git a/pkgs/development/libraries/paho-mqtt-cpp/default.nix b/pkgs/development/libraries/paho-mqtt-cpp/default.nix new file mode 100644 index 000000000000..b62e774ba513 --- /dev/null +++ b/pkgs/development/libraries/paho-mqtt-cpp/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, cmake, openssl, paho-mqtt-c }: + +stdenv.mkDerivation rec { + pname = "paho.mqtt.cpp"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "eclipse"; + repo = "paho.mqtt.cpp"; + rev = "v${version}"; + hash = "sha256-tcq0a4X5dKE4rnczRMAVe3Wt43YzUKbxsv9Sk+q+IB8="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openssl paho-mqtt-c ]; + + meta = with lib; { + description = "Eclipse Paho MQTT C++ Client Library"; + homepage = "https://www.eclipse.org/paho/"; + license = licenses.epl10; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f80ac0ed9cb4..feaaf8b56a3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10027,6 +10027,8 @@ with pkgs; paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { }; + paho-mqtt-cpp = callPackage ../development/libraries/paho-mqtt-cpp { }; + pakcs = callPackage ../development/compilers/pakcs { # Doesn't compile with GHC 9.0 due to whitespace syntax changes # see also https://github.com/NixOS/nixpkgs/issues/166108 From b656abb2329953ed9a3b144f2574376aa49be0fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Oct 2022 07:49:56 +0000 Subject: [PATCH 026/106] conftest: 0.34.0 -> 0.35.0 --- pkgs/development/tools/conftest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 3ec5ec8e6772..49b8434dbe71 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "sha256-w9rqfmNEvp6yYXBl5CVeifgrP35dL+pYBgRs3vP1W4I="; + sha256 = "sha256-rcc4Ziktoq1ZNWdCNxoNtthLzKoMYFOH/dBg2KNQVGY="; }; - vendorSha256 = "sha256-NcizXQ4wQnA1ZdT74tVbuIbFwgEp5qJfoGnHmMC7kkI="; + vendorSha256 = "sha256-jYBNDUUuTLQTCRWGAgjsvRN13RW97qt+5KREg7YBJnw="; ldflags = [ "-s" From 6d21d0c24f59f5c941e527949137c26c473f6d44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Oct 2022 08:08:15 +0000 Subject: [PATCH 027/106] datree: 1.6.37 -> 1.6.40 --- pkgs/development/tools/datree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 3bbe5697669d..2552f768dc10 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "datree"; - version = "1.6.37"; + version = "1.6.40"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = version; - hash = "sha256-oDwI4rlpTkriPD2YC8AnlPYHUchC7btYyX/X8sxmvac="; + hash = "sha256-UATF7oR7EarfqFvJhwdyz7qMxpwkk9oabk2LB/w6Y3E="; }; vendorSha256 = "sha256-gjD24nyQ8U1WwhUbq8N4dvzFK74t3as7wWZK7rh9yiw="; From bf677a72e88fd4023e6809105aa05acab43f9fd5 Mon Sep 17 00:00:00 2001 From: Kazutoshi Noguchi Date: Thu, 20 Oct 2022 17:42:29 +0900 Subject: [PATCH 028/106] qt5.qtwebengine: 5.15.8 -> 5.15.11 --- pkgs/development/libraries/qt-5/5.15/srcs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index 8c40a49ac0a7..ef625a7c763d 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -36,7 +36,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) qtwebengine = let - branchName = "5.15.8"; + branchName = "5.15.11"; rev = "v${branchName}-lts"; in { @@ -44,11 +44,11 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) src = fetchgit { url = "https://github.com/qt/qtwebengine.git"; - sha256 = "04xhg5qpnxm8hzgkanml45za64c9i5pbxhki2l2wcq4b4y7f3hyr"; + sha256 = "sha256-yrKPof18G10VjrwCn/4E/ywlpATJQZjvmVeM+9hLY0U="; inherit rev branchName; fetchSubmodules = true; leaveDotGit = true; - name = "qtwebengine-${lib.substring 0 7 rev}.tar.gz"; + name = "qtwebengine-${lib.substring 0 8 rev}.tar.gz"; postFetch = '' # remove submodule .git directory rm -rf "$out/src/3rdparty/.git" From 0df09a4a4571bedf36d317033eb242d4c23444b7 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Thu, 20 Oct 2022 12:06:44 +0200 Subject: [PATCH 029/106] thunderbird-unwrapped: 102.3.3 -> 102.4.0 https://www.thunderbird.net/en-US/thunderbird/102.4.0/releasenotes/ --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 31e8abb55a69..f4052a312a12 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,13 +5,13 @@ rec { thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.3.3"; + version = "102.4.0"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "37027f251513885d1432ee8cbe0fb2b4cb3c95b0ce88bd35f207cd7a4552d6700a63d13e0542712f796d46be6cfc165d6d1c224b30a445be7f5058fc396655fe"; + sha512 = "e2ce59eefb0c4df3eb20af01af2b7ad78a09e0fbac7bcc8800538d6655ca63a5d132c0700e2465654cc707a50aee01c62df0532f2c53b5f11c2d3a7ca881d8f0"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. From 1a3a18aa79befe48a0fac6dc6623a02a3f384247 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Thu, 20 Oct 2022 12:07:55 +0200 Subject: [PATCH 030/106] thunderbird-bin-unwrapped: 102.3.3 -> 102.4.0 https://www.thunderbird.net/en-US/thunderbird/102.4.0/releasenotes/ --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index bb326c507300..94fcb7cdddb1 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "102.3.3"; + version = "102.4.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/af/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/af/thunderbird-102.4.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "2117862d27cc35495f89ce0f013cf7afa64af058528ed9d85033f0da6513d9a8"; + sha256 = "93c9dccd3f4a81610d91f4388d0f84d91cd9e8c55458dc2992f510ed07744780"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/ar/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/ar/thunderbird-102.4.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "6d21c2ac3b202720d9c512aa24d2365508c8b887e37e08cb130128186a6dc575"; + sha256 = "f3693cbc8d7c8eaec41a6498660686a94b7c7ac541cf65193385bbc090b080c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/ast/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/ast/thunderbird-102.4.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "edf2fd51ed6525c3695ba2a73a333f80e71db56ed3465e95545cc11817db5ff7"; + sha256 = "324d925d6c6b5a0e46123b0a4bfee932dc01a1e91df0b0f0d88a5159c87909ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/be/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/be/thunderbird-102.4.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "7c151e8aa9fc9a625df19578756bea5895c9c32ec521f662f5d4c007718a6175"; + sha256 = "e89053d47291e001b60e76f01ce56c01e180a7785b3e8a80b30e85eddfcabddc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/bg/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/bg/thunderbird-102.4.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "5b0300f866c0d4f5d82dac26a49ad57a6acbc1761eff5b9a05beecebfb41827e"; + sha256 = "ebd61de1626f18fb3c4296f4a3e546064e280cffd1290fe95049adaa942453e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/br/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/br/thunderbird-102.4.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "9ff4ea160821ff92451a644d1b9adb11a931af0d2799bfd62efc4babcdda6c52"; + sha256 = "50c6ed53eb3e8db065562b4ec3d2e780385364426133fa5204141a93d7d6c400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/ca/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/ca/thunderbird-102.4.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "55209f52c756351f175583d30976d0aff65e6434a53fab26a579fe576104bc08"; + sha256 = "9c500fae332cfd1140547da498d8d5c5798a00e9fbf8036da1cc69f8f30974d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/cak/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/cak/thunderbird-102.4.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "76b8051c060f1ba667215ad3a9f7dd86674bf1644af2121f2397ad8f248fd8de"; + sha256 = "cb21ff9e839c092bf7b15dc033af66d7e0817ebccb54a93ad20a485cf2ef017d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/cs/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/cs/thunderbird-102.4.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "0d346c3116243125a63e2a3be2dbe99def481fa1be5b3013fe50354940daccea"; + sha256 = "82718115f0cbf0f609c465a9399a5947292a0ae81234802b163ec362c3d1b7b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/cy/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/cy/thunderbird-102.4.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "1e2782ddd0716094f5ea4a79221ace671c7edd3acf87c4a5f88b2fff768c5a8a"; + sha256 = "25e7f01c83e17b7181776430308fe39bf914d0da2d8a2e8351a8a2f45c791b50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/da/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/da/thunderbird-102.4.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "da350c192ad5cb9084a9fd0544600b7c518d4f68b1f097a8c7a756ca5697235a"; + sha256 = "0f7c6940092081ed29ca4ed1f3b83a8dcab040e08a09822f079a7273f04494f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/de/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/de/thunderbird-102.4.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a4218fbe3e1c791bb408bf0e9ad330c3c5b8cd4a080a2f7040889b055d0c2f14"; + sha256 = "3e1c3235af50d99f6de0815a10465e57377fc51de0ab76b923c9a9b804c3a94e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/dsb/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/dsb/thunderbird-102.4.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "46fa8c1559d2de3ddc7728c20efa40e917240ad49385a636cb7d1a1dea83370a"; + sha256 = "bc7d3206e6b1fe2ccf151fad27c7b34f42a2d2b3cc36c1505ee3f47bf94de247"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/el/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/el/thunderbird-102.4.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "1de3a316c05fd321d9cdb2c7c8d810ed0f23b9551e2cfafff5b72281cf7c309e"; + sha256 = "70abfc1e011a2901e7639e7ebfb01ac06f18732b10f2e640e5c1dbbcef3e0e6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/en-CA/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/en-CA/thunderbird-102.4.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "994b2ac276c1526f76f3cf5a50401413ac00f4238703b5c853d5b5cebd2511a3"; + sha256 = "82e8043502072528c4bdd5e267cd6d581fbeaaa125cd74977461eae1bf1da861"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/en-GB/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/en-GB/thunderbird-102.4.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "3eae960037dd0d3d2b7fc902355a832cb739bd014c5ef075e63a3ecdaf53c75a"; + sha256 = "707608d9c55c073522071732cd0541a04bb7b7b0d3bff6fa35fd2307e0320ae1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/en-US/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/en-US/thunderbird-102.4.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d6c475666c7bca01ed05926cda69ffc58135f223e7ae72df24d5714f3e1580ea"; + sha256 = "52c80623976ea2e62a52b5b62f741450e684c07e0fce72fbb5218dcadce9b4da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/es-AR/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/es-AR/thunderbird-102.4.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "5d48de31d823b1995b10a64ab809a85c1ef0f907efd30595d22d0231d73507ca"; + sha256 = "09ca8111a3c0792591515f4e7abc090148b28e2bef7e0c591c3f0eb15fa0b8d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/es-ES/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/es-ES/thunderbird-102.4.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "8816039b4a8466de5777649d740ca7e30c9902d9f0bb372742fd649fc7f9d8fc"; + sha256 = "923d07aeb9bccf7ae42baca048bd8222cccc31ffde1f090675df8df715aed21e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/es-MX/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/es-MX/thunderbird-102.4.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "f9a9ca30c9d28a5f3b0f9d160cc2b8676a5f8e74036ce7e479e23dec775ddf4b"; + sha256 = "6f03c99fbfab67d593c94f9d12f104385208040229eb403eb51472df1442aa8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/et/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/et/thunderbird-102.4.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "951bccc704cda03d34657fe61917a2e0aa11fdfe3238575dacc888ef4f012754"; + sha256 = "db864bbb22fadcdb7419565523318f97e4e57a25fe11429e27fffaf353df4a36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/eu/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/eu/thunderbird-102.4.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "70835c9c3af0e6479cad0e01b20c183cff62f8d1569d049147a0777806e83ee6"; + sha256 = "e25a04af4f402075575e1ebbc5f9a74a9de008ff303fdc13fd916c55349a83ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/fi/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/fi/thunderbird-102.4.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "70b2c3a8b7cabdd053c314167109d300b3f391f256f401f56a645eb2f7e3871c"; + sha256 = "73b8cf72eb9a34149eaf0961ce1fd7a29f46c65f5a806c451f0736c2d2b2dec2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/fr/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/fr/thunderbird-102.4.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "1f53f5cc1be471d59527e58dcce58c27567e7a93af4726d9868ee79a0e2c01ff"; + sha256 = "6bcc2d614ed0b83a8b015e3c39412d4df8de2e862d0615d6093aa826fafe0773"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/fy-NL/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/fy-NL/thunderbird-102.4.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "b41d18c1e425422a234b99e6ed8aff7e7c73fa1cb6285ea5f0e2e32932cc7b01"; + sha256 = "abbf802853ee2035d886971d3cad73124a79e78f1aa543db9ab8602a41144bb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/ga-IE/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/ga-IE/thunderbird-102.4.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "09063d0879797fca3c2e2f589251744ba8c52029a9ec86a3f13ffe8f6eb7321e"; + sha256 = "e4d9452a2c59c7f06b6851c2549b9f65a41d7ea4f059c05c793fb163ef5bb8ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/gd/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/gd/thunderbird-102.4.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "b410065a55c62671bb35eb954c573f2cf97fbbeec379faae4c4c6ed77aba5b8e"; + sha256 = "b08c04011f0de20025632e4a29a13b0d5f6296ec46e35c02e37a74ab4abfb8e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/gl/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/gl/thunderbird-102.4.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "50840082735b56d52bc2f271175f4abca337303a74a311ec5021a24ab3fe3ccf"; + sha256 = "f9d326962e33c93d351392d88897aa2f1e4c3a545c9b8e646e931fe950872cbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/he/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/he/thunderbird-102.4.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "4f507ce715c3512a23713d245304a045d07169610035b568452b2d4a702874ed"; + sha256 = "8bd8e26d383aadc97dbb4485a8644b3f49068f3772a669c2ec3c0df87f2ebcdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/hr/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/hr/thunderbird-102.4.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "216ed2cfd39dafd483943ef2d1ba3984058329cca6e2c1706d93a7f4b34bb1cc"; + sha256 = "c234210e83dccc3562ffd3cb50b37d8924a1145d5dff1db4a6a404f67da0b656"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/hsb/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/hsb/thunderbird-102.4.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "c062e346aca53f4b3b323f95220f497787161a6839f38fb10774936807b4bf81"; + sha256 = "ed513858dae38683768b0a3839b20f800011fc8817b28e09f31301f614b4f2cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/hu/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/hu/thunderbird-102.4.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "a5cf3e6c746edd752a67e3db5df82db5c2f87cd72b92880dca4ef7c2a0c5e032"; + sha256 = "5c7b48aee0a7b843b709bc614f83d814cafaebe343dececbcf7f66c858df47f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/hy-AM/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/hy-AM/thunderbird-102.4.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "af862f50f4f56668ef9f3301d67707cb0193fc4df04bf542691b4e0a0d35b283"; + sha256 = "84fcbc6317d1fd543283528d5bfd899bdfe8a7d54cc3ccde12fbf36054976808"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/id/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/id/thunderbird-102.4.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "06e4a66c9553a607c7b96a7622594a0e79c93894b71eabdfd85cc0b689571bda"; + sha256 = "53d7c3aa54a0a53eba05ad0281bbf48a05747699e8d5c874e0a31fe7e34d53aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/is/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/is/thunderbird-102.4.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "b348937b74d997f8ba09f0f285df29159bacdebbf711c0648b58558ee9e63d92"; + sha256 = "b9f313d350c687c04c74d0fce3ec898553a1c91650668a7d7dbf02e53b27847b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/it/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/it/thunderbird-102.4.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "e8bc3d399b2a8d52b0d67063dc293981acf6574d3dd3a961986ccd7fcb3cd1d2"; + sha256 = "637b1c3a60cbf3edaa65e29b602067b0ca37a4da6434c266ed2a60eae239a6be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/ja/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/ja/thunderbird-102.4.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "3ec22d6fe5202f9c9ad2c6a56f8daedf424c2d7ba2de5a89882e0735ce3e9fc8"; + sha256 = "b42908e1920cdac0fc5e1e3645f4e92e2ae891ce0ffb117d2e0db502f1ba10cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/ka/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/ka/thunderbird-102.4.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "7e23cfdbbf7d168c39ac76992a9fbe021d92cde57b19b58ddb80a0aab9a90ccb"; + sha256 = "622fcb7991199de7de373b894622290e4e7f2245ab6f8869d23512c02c3c9949"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/kab/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/kab/thunderbird-102.4.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c53bc2049d5a538c3a703aef0b02f5a64b126b84aeb9920855cb4614e96c9da5"; + sha256 = "fd3f03b334466df26e24d390027ab215e46d45bfe8cf6b1b87c6025b55426364"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/kk/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/kk/thunderbird-102.4.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "7a3dcbfeca9245b5a72d043331e4f98dbbf7bc3d66dddaa16b4309e96a67dd0b"; + sha256 = "9aa0af8d48eaf1c2f0111f2d4a57b46c8fd4b365f307b30cf6f0865440fde217"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/ko/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/ko/thunderbird-102.4.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "515825543b2660c1a6da2bd8825e64c5334ae0b07831f4af5b87100b025a4c68"; + sha256 = "da990d20167bcacc2e8ed9083f905c9b0b6cde1a7994f557865304a322be1dae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/lt/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/lt/thunderbird-102.4.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "28139cd4d56189ff3d16b2a135fb29a9d541ccd33cb7dc62f176015b9e73b8dc"; + sha256 = "468590ba13345d76ad511122a423080c789c39b8993a613be0706678d1174d70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/lv/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/lv/thunderbird-102.4.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "0a4a7d6af0b4ad933745793f85b6c504b7468cb1796728cb5b19f5be0e23813c"; + sha256 = "66ee93518731d5364ed70a49688b672b485cc77e0b2111f18905a21425ee319b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/ms/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/ms/thunderbird-102.4.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "4e6642a75afd4344a9b4ecd02f62e5ab31bbdf2c08026305a19994e13d0925be"; + sha256 = "ceed80f3eed734a3e7af87bff1f03862d7ded388484ea8cecf2873c91dcee225"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/nb-NO/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/nb-NO/thunderbird-102.4.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e93a5f0cb40f8d6940e337987519913390408ebb11dda1fb0a53fb4e6a920c60"; + sha256 = "01ba526dfb5d82cd6b51a30b06f47a85b81589aa3ba8e6d9d318603b083f1195"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/nl/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/nl/thunderbird-102.4.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "8e2a3f87eae178b3f8335f1f99d0fcf8104d386552948841874716cd86981d4d"; + sha256 = "d6f315e1168d6a5433a724e6bf3160e0089ce26abb929187b122f44e46c84652"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/nn-NO/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/nn-NO/thunderbird-102.4.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "5036f50250fc42aecf2ece02e8e2901e86626add5643b5794103086e33760c4e"; + sha256 = "f9a3195807f753f8cb7bfaffc2e1d647f79dd7afa31fe85f94d2438c08e93ffe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/pa-IN/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/pa-IN/thunderbird-102.4.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "4dd0956b509692034e5f517e57ef1ddecc00ee15aed40680bfa8f2fed56912e7"; + sha256 = "f68b60dc2d946bcff7a03ce781c77c17e68aff2e376bc6e9c84ed2be14e17b33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/pl/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/pl/thunderbird-102.4.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7330ccffc01b6357c0bc7c4781a931ef807a20052b2ee7a962d781cd75ed15b9"; + sha256 = "94d24fd3d184cb8d46e584599b8cf43462c38a2113a24921c03bdec391b74ccd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/pt-BR/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/pt-BR/thunderbird-102.4.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6ac7c34d3b89e5c18170256d6e038064d98fedc070526da226c34f55068ced1e"; + sha256 = "93f73967bd35eef0ad9bc820e07d8f8eb458ffa9415bc9f1e08c9ac9e3de876e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/pt-PT/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/pt-PT/thunderbird-102.4.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "37807584c2536d06f00a7e042f74c1a481c3d1a9570cb16f0f57d8df5b3b8d3b"; + sha256 = "e08033d393fd804504b41fbcf9e902dd3ea262a3c9346bfb89e101a7acdb1478"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/rm/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/rm/thunderbird-102.4.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "0f72208d14efd2d375f0911da4cefdff93770a89335d1d07ae8e9c93b79e68c3"; + sha256 = "04b46b74a949e5803e68dd243c16e77d6fad91997c105d1b670f553c3eff66aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/ro/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/ro/thunderbird-102.4.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "f9d3cc56bc986bf7a33920bec19c4dabb4885f5c30f95c69e964d175c1a99931"; + sha256 = "d9d8556c0c330cefda91804fc534a5443e2fc787c83d58fcf9455f6215608c0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/ru/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/ru/thunderbird-102.4.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "5d8550088ac2fcbbd0008dedcfd916f11c7c838062c50c96af8b0ff604611603"; + sha256 = "606ddd0868b3b61cf8dd87db75da52559d6e66a9cff5fb62e521a64afccbe7b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/sk/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/sk/thunderbird-102.4.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "e5ac6a6981b7dfc4c7d49119abdbe4f2beef9641c89ba0b38a0e60275ad3c525"; + sha256 = "ef94704bf009e178ffed2032cb7dbbbf5476e03cf41536796fa65e40b495f557"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/sl/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/sl/thunderbird-102.4.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a7f228c2a74b2cfd45b4ad48a1f230741628a158f172076896fcc68588a175c6"; + sha256 = "6ffac67a7fa242565946a9939faaa70ae652ee70b441e71a4768316affbe80fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/sq/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/sq/thunderbird-102.4.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e977dc827518893f426f3177cb97eb5265aa358e1921f07d8b6843192d6a9f54"; + sha256 = "9ebe4616896df6e437ca6e639ab273c6098266b72fe7946b4f1aa28f002d5198"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/sr/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/sr/thunderbird-102.4.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "0f185c385bcc6882cbd0654d4ebf5cef8c1ed8e104877886a812cbffce86a6e4"; + sha256 = "9a8979b83e7d7e129cddd7812fef4803782aa951b190c20aa50919423a0b7127"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/sv-SE/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/sv-SE/thunderbird-102.4.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a43fd70f46b059bdbc64a19cdbd72209f6f0939815c878d198ba41c22a7b1de4"; + sha256 = "1724ae0e9fe2d92afb21d8e7440a219822920e569aec801d6b1167b51862796a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/th/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/th/thunderbird-102.4.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "02f75552404ed0068dbc51c3dd6005a91d6c638fd2236d67d8a48d11c94e7274"; + sha256 = "e767d6c6dda151370c2a04c850b8f55eec4b2326be493d16af219a9737535a9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/tr/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/tr/thunderbird-102.4.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "28b97981fc225eb3e534a923bc6df3ffc4afa5043224ffe415847cf0d9ecabef"; + sha256 = "1d1bae1f7e76a0acd5f4d51a68d9805f34b2397005234ce33ecf2b9668c1caf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/uk/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/uk/thunderbird-102.4.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "082f50dee3a7e41802541c197126ab2331da9d83e391eecc251113c0cc0f9fdc"; + sha256 = "2602294d73ee0dce17960c453b0b7f188566a4b09af5c593aae4f57c13c6c6bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/uz/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/uz/thunderbird-102.4.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "0ce85eda10854f979e0c8667653126e03c268ccc4d078bc58e39fbf6ffd46fd9"; + sha256 = "57e424a2d1b3d58aa23b87d85cfcd6af7030ef9b539ad74beed6284051142fbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/vi/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/vi/thunderbird-102.4.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "f42d2f507647ca7f8ca8ce7aa377528c27ac4e2b4bfcd395eb424a71356b0a73"; + sha256 = "d4f19ac4584c5523009a660f819d43e3244d552bd0b2890fa8e52fc5cf48d9de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/zh-CN/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/zh-CN/thunderbird-102.4.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "0362aff801bcb734003607e265961932efd2059ab3bf6a967662368522eb49e9"; + sha256 = "204f5faee35bece1bd444d4d0a18973b13f2e05e481d77b25acd201fb8b5e2e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-x86_64/zh-TW/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/zh-TW/thunderbird-102.4.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "2c14d717bdc4ef8f031e71811092550c429b86306e9964020c3ab4cdd73cc011"; + sha256 = "8aac9a823ef4df7678e93316b9e312dc84fe589de520740ed2b018d9976b823d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/af/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/af/thunderbird-102.4.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "b1ba07c2903e30e52263887ae23e96ca506f33feeefb6d665968ae73b4618241"; + sha256 = "5da88620d3676d21e2dd98d514f073535e6b84e9156c5c4766de7b41aba148fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/ar/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/ar/thunderbird-102.4.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a34beacb63b18f88f817e2190826f1859bdcc1c7ef84fb4a4a8b7ea2f2ff7eb5"; + sha256 = "3d50816819f2d0a3db242f83dab9cf269f2db5b8b74efc460976070413cfa568"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/ast/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/ast/thunderbird-102.4.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "adf85142f454a44f3acb54a83a2e2117457314046f0ce22c6ba0638a737c547c"; + sha256 = "fc5508c42732b470edcf1dbd6fd9e03d66f11f5976a1dc433283b19e0657e54b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/be/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/be/thunderbird-102.4.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "6bd7732095177c6702c3af380e686f14c31114d2987d6e5e564f0181533a6978"; + sha256 = "4b68c8b1e7f0493ba3fcec4041bb86b88f770530b5842f1954ed65c2bff6ef91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/bg/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/bg/thunderbird-102.4.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f3af40e4576f224f2d2c8f11858446c13832008daad462a25e4d35bcc0be5556"; + sha256 = "08e8518a774d8ff6dd7fc944ef9cae66d565c3ecbea4e71cbb670575c8abf84f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/br/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/br/thunderbird-102.4.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3d41a4a15b0de37d4fa10aab086247b737bcada395bda86e4e681772125e7ccf"; + sha256 = "9df36d6165b4ff71383cf922e49dfe93e13add7426b43be79e72596517d01b64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/ca/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/ca/thunderbird-102.4.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1ed85a0b6c04cc181dba423ef848aa57db22cfb8526c3ec4465dfc9a664d1cf8"; + sha256 = "7caa728b60f16660d40b3c714ccca559c9998268e71a3602b64319f28908f384"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/cak/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/cak/thunderbird-102.4.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "458395aeb8e92dea90cd4dfebd2c1b5ac4549e6683af9343de3d0e8022397c14"; + sha256 = "f85fd60655fe7e09736c31c2451d78110fcfb329cac4c2550cda2119c48da11e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/cs/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/cs/thunderbird-102.4.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "eb8f9c5a5a78520a6fe9d7e33a6a3de26e2623e15be219396cc1ec6d3fef1a90"; + sha256 = "14c6b188ccb93367a3ba411b3e383d3816d6b0bcf1fa1bb48025fda30f7adf4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/cy/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/cy/thunderbird-102.4.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d298941a3f856ff534705fef9ae6c7b3979e53ea08a2ad392db34fa8713d0dd0"; + sha256 = "d82b7a995b1f92170ed6ee0a2b7056aeb69922523aaf9c66ff24f435d38b45e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/da/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/da/thunderbird-102.4.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "9ed3cd6d123169145246cc752202fffee6db55de2c2923b5bdb394f0bc441ffb"; + sha256 = "bb6967140ecb94cea0f48f4a0f937bd6734a901d5c3f947585391908dacaf05d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/de/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/de/thunderbird-102.4.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "2991288757087526928ad8c61c3bb8ecb2398bf34948036608647fe2c00be1e6"; + sha256 = "4411fe74340c1c62b6845cd70e60c133130f4e780916f998cae5a7b103dbd1f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/dsb/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/dsb/thunderbird-102.4.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "acc46f046e543cf1dd88d506de7d3ec0d67ce1fd3be0669c6b301803e80c47ac"; + sha256 = "9badc6942ad260da94230f9b223d63cceb94cb4689090dfc8d3c6df372d70692"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/el/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/el/thunderbird-102.4.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "4a5fa9516fb3e171c0b74a694d9bc29cd68b259e1bed9f45303b211b6aba45a0"; + sha256 = "c26dfdc2b5f2da4917dc18bdc92739962e2a2931cb2886c8f2f395a66c8bd841"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/en-CA/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/en-CA/thunderbird-102.4.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "ae438cac6628024660cec15d5ce6c2e746b63c484cfcac69b3e4be733e1f50f1"; + sha256 = "f8f1801eb8676a095efa20e410121ebe2eaef1517d0b549bca27b435bcaf097e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/en-GB/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/en-GB/thunderbird-102.4.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "1eaf7fc696aa584632845aa2ef93fe346c889131fb2e5f85c09ca91550616b00"; + sha256 = "57d3cc43fb1b6012d5fa91f3ed5a55fccf162137ee00e186ee1954b50f445759"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/en-US/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/en-US/thunderbird-102.4.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d90faab60b4641d509be7f1c20b7102e8bd469a9528b11604adbfec359f07cb3"; + sha256 = "e21b148eab4e643c5a66b61b892775c9761efe38db9a41e0d9d6ad63fdb9fa03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/es-AR/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/es-AR/thunderbird-102.4.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "73cd1b6aead028e22eb6a0b09076d604128b8779b4519b2b33e417eefc51277e"; + sha256 = "dd3e4356aaac24bc1be1a2a7f9e662d9d97e77971de961816f2e6cb0f46175cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/es-ES/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/es-ES/thunderbird-102.4.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "46bd4345b717bba7236829696325e00db4b6d2bfd7e3f31aba1d619615ffc0d4"; + sha256 = "70600cde32452b505fe76352f8a53f124169b20ec75c6089d45e0b3e0709aa74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/es-MX/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/es-MX/thunderbird-102.4.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "ab5ec4347cd85d4f93658b48a687d0bead8dccbdafd766b754068649772f67e1"; + sha256 = "c07ff511260781cca4e2f4ac82d7c1aa76e990fe7a0770fb9bd5551766838fcc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/et/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/et/thunderbird-102.4.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "6f2a7a2db746e068a903a266dee042353f8723be448b28b0199931cf024ab30b"; + sha256 = "156d75d2638a2e44d345ca2bd2374f321193227089827b4d2d69feb89a4dd6c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/eu/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/eu/thunderbird-102.4.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "08581d2ef770abd5fa70e6f2418633b111e316c5aa95bcb9c7c31a62d76d9591"; + sha256 = "8af2a6e5bb6e2bf2d03c97e90ce0115faf8c40121e7210c20be88b16fb2e0feb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/fi/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/fi/thunderbird-102.4.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "850a64dbf7b3a4f612d3c2c29ab7d6960c7e553ee395305e70161eff81533396"; + sha256 = "ca98fe916aa005b60511ae7c1274e64726a5f35d567ac7407a80cb0438878fe4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/fr/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/fr/thunderbird-102.4.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "c5bda9bd4909adaeec36d5bb2a17b867f9cc34a31f3ddb97ab42c91ccfb4d1f2"; + sha256 = "6c9fc2454dfd286a8efc3b8de6377044f2ccabc6e0379b9e1cc2cd16653a7840"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/fy-NL/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/fy-NL/thunderbird-102.4.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "fba378198ddab043493677225373cfdda0edeb9f5130d6a1a6141fd232ceaca7"; + sha256 = "0822c65394cda172ee1f66688db6d86c7426df44a80770a0d22d824ffacf7f7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/ga-IE/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/ga-IE/thunderbird-102.4.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "a594af3d31419ebaedcdae09ab3b519d1a2096df398e42b76fc09d76a401f6b7"; + sha256 = "70d56fd565b1ab65946819347a5b2394d179358e3eb8d1e87b24056d87a516e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/gd/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/gd/thunderbird-102.4.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "54b6921f8a3be97b81b4f769141d84fb11845b971e77fa82f383f3bc0e50d338"; + sha256 = "bb156b134b3e43b015de264e6852f9cec656dab4c395efecf6035cd937187d0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/gl/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/gl/thunderbird-102.4.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "4598af27e3aedf8af67d76874baa4f7cbddc1a7fd53be7d3c334eea075d06991"; + sha256 = "5ed959f3ea9f0961948b525bb51126a7d1786c5468868586267ff46c1b7dd121"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/he/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/he/thunderbird-102.4.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "648cc4a3e295303cfa49fc9e766848c3aa4b78d65f70ba743724a3964c4110bd"; + sha256 = "fdd0cbf39f8f0f982ec034627d68661d3392aa2657353941c4664f610497ea00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/hr/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/hr/thunderbird-102.4.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e5ee4e3d15620e78075631656704d4051d76cd04095e8737709ec5d487f9cc4f"; + sha256 = "aecf6bf555c84b6cae28cf4514efee9c6334fd1c69e3afbf045842748645f2ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/hsb/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/hsb/thunderbird-102.4.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ed50bc3e2695e2061e31ae2721ee76e13051ca85399cb493aeafb1230a1888bc"; + sha256 = "8381a36906102e17e165f8d383d0f8bba7dde4a39264e14b66bca5313a9da077"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/hu/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/hu/thunderbird-102.4.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "97494393ccc4c02f253210d9f3a7249a5bd1a8dbfba5f3bca94fd99c5a30e763"; + sha256 = "3193566d29f0407b9ba5cbde1f470d7a5fa4d501eab23d3709246a082d96ab33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/hy-AM/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/hy-AM/thunderbird-102.4.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "0d42530f12a2891caaab06eae16cf605e1272d8cbda24a595c162aae07ea7ab1"; + sha256 = "284a4cd9731abddf68e8cdd5c2c52cdfb0da22732f5d2f6b782f3311d9c297f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/id/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/id/thunderbird-102.4.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "8be0c411f75f14402cb1b34dce65848073987901fd7ef1eb5d123e3062ea90c2"; + sha256 = "cc61630f7ab5261d42bec691625bbdaaa9a1788b99807b06f3d5c34961d67432"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/is/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/is/thunderbird-102.4.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "031f157a8291b6a149d28971f3c6befdef22db81877c1ec32a6eda2d2c9497ae"; + sha256 = "2852c2c6fe22756e83d27b3718d8913cd0618b2491e1b327251fe94f081c30de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/it/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/it/thunderbird-102.4.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "73abba45b37787e534499be37ed6ee0b71eb61b9b812c4a87b41ce9492171aec"; + sha256 = "85e81bb62a94205d3886d335cc70ad2024bd66658d2b0037cf2ef72118955ec9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/ja/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/ja/thunderbird-102.4.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "91be0ddcc4f16d47348c5f62693c22a9af944bbeac12f3dbbab54da756819c8d"; + sha256 = "e5de175ef6e96d34da21ff9c82059f37867ca279c07f2aee748c21ad9fcc9133"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/ka/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/ka/thunderbird-102.4.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "347e1ad3223fcd7288a048bea5cbb3508ef9f0377091ac8654eba3f62737baf4"; + sha256 = "b32652acce69f60795ab6e8a942b15ab394cda4a2d8ada37f8f1436628e6cc18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/kab/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/kab/thunderbird-102.4.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c140e63f750c0c8ffd368b4a79831b4aea4f283db05bffdad58371cb052ed5e0"; + sha256 = "ffd8fda6889463a558c1354af2fdb30680c564c7650c0d70e9a12bc02f71ea45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/kk/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/kk/thunderbird-102.4.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "4441479e9bc91c7f2fde53904ef5dce34b8c81ad74a7a6483775644a4416b49b"; + sha256 = "c664d38e01e27b2869848d4a12bc703bb61fb60369b56dd0fba8d5225bd45069"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/ko/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/ko/thunderbird-102.4.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "84731cd21a44a556fca01fb5d72ecbcf0aa11320928b28240a49dc51849a0975"; + sha256 = "d1e116857ce58acab34af920f767d7eba9d9080a2135aa2651a0b398860b199d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/lt/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/lt/thunderbird-102.4.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a50ffdacfc5a4e0f69f4dfc8b4aee8c00a1ea8dc3e58e022ccd432d09cc5f42f"; + sha256 = "2df015a969cc5bd0571051bcac8c73e8164519bcb395dbab290a8b31e0da6eed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/lv/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/lv/thunderbird-102.4.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "5e39e7ad880674948715dbd275a9410688a153e6f822b1063710b5520604ed35"; + sha256 = "1926845d7d6c73950faa160a2e06eb530ed250e45ca1c6ca2b3dce1744d36494"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/ms/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/ms/thunderbird-102.4.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "087680b99f9ad0030a379aeeec6665a5066106a5fc1a816b9d4d56623b557194"; + sha256 = "8d029da2bc3b1dbeac391c8cf089cc24ccf7c090b7636308b5778f8f563d84fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/nb-NO/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/nb-NO/thunderbird-102.4.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6ca2c6dae3c87cb5f66dc48da1049039629c653fd144f675d86c40b2b9a6e92d"; + sha256 = "9bfce479878b1431cde83522b3a13bb85e962699ef49860be39dcf98fd4ab2ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/nl/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/nl/thunderbird-102.4.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "1d81fa00b001fa19f78897a23e5f5972673bcc8a0ca6f58172d7720ae9636d3a"; + sha256 = "b94854a1e278514930f4d6f405c99c2674a6a0d6bbd2a606e8e2931d20d64c27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/nn-NO/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/nn-NO/thunderbird-102.4.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "400d959701e7a867637cd32a8c69f53bacc69c5d082e391e0e6690ada9b921da"; + sha256 = "a3b6ea808b6b190ff60c17a173132180d07bddc0683ac12e6bf5537660aee957"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/pa-IN/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/pa-IN/thunderbird-102.4.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "e664dc2fac39de71cca8a9d7307880409af0664753a91c591befd2752bf768a9"; + sha256 = "9681f45460a6583a26e9580784f27ba565184391de142d1d23cf75e4ace0a102"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/pl/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/pl/thunderbird-102.4.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "ad83ff34ab55271f328961392d4b02679882defac3a1864a4da9145e40e87d4d"; + sha256 = "56359ce8ff9a1904954ef4c8c04d3ddeba4dfcf60e14fe3be8864c43f38023d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/pt-BR/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/pt-BR/thunderbird-102.4.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "f1f07563a9bda75ea311600f0e45286e081b2d039c54a19b8c570272727635b4"; + sha256 = "cf46c656f7ef37737dec931beb88c03ee79cb90e0cca429e22cf8d311b1b2aac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/pt-PT/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/pt-PT/thunderbird-102.4.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "33507adcfadf1db7967b0a40532f311610420798394bc6df450076407f4bb687"; + sha256 = "30a03b9bdc9e0fb3272d283f44b446011c1801608f4cdca730848598b7671dce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/rm/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/rm/thunderbird-102.4.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "7c56f1d9cd3d5d313c6acb7915911c443bbf1073b16fe406a225b5a2c45cc858"; + sha256 = "87db729d6fe4f93dfefd009d49e631b9a0540927e854d5a908951708e06ee902"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/ro/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/ro/thunderbird-102.4.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "078fa1d28e5370cad25a7f4c8e7162dbeda17b19e9ffdccf4b504222d7f8a208"; + sha256 = "dfb295a1dd9c0fcc5e2d2a2645d9b6a7a9404f0c278404501b407963a7fd7adf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/ru/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/ru/thunderbird-102.4.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "29f842188f0fcab4d1dc0b80f8af422e4445ac3958426949b5cb32921a62c856"; + sha256 = "72416015e3a56f05e31cc90970903e16d756a219c63a776177431b0688f23a56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/sk/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/sk/thunderbird-102.4.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "46fc3d121a9559573fab59165a4ef26f764b451e9d9ebd07b63cbaeb38759de1"; + sha256 = "2ff17c8a109e1031032f9deae6997b2d7a70658e89af39436618904020162afa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/sl/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/sl/thunderbird-102.4.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5252c6c511150af4aff9a0922ed5435ee235dd10cf7bda0d5f7b9b45fab390e7"; + sha256 = "fa907a23de32b00eda97533345a8e77ba3badb4b6fb4660b5b9616fc1ecaf796"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/sq/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/sq/thunderbird-102.4.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5ef982ce3d31ded7fa5ebe617d4be7fa4808a43dbbdd16c13983eb2a7f009bd8"; + sha256 = "60fc9e217138531ae014348f793bf8b159c85c253069f1e3881357f63c047946"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/sr/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/sr/thunderbird-102.4.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "104ce567e97504648656e33f180e2168be9e94c52ee9107e3a19e0bb2d521671"; + sha256 = "f6eccd0e094adec5eb092c926a59a5a162dd38c3f0919f1dca057203d3daa6cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/sv-SE/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/sv-SE/thunderbird-102.4.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "862d41270c85a7444e3a99514cadc4df79ba104b764891e3e62d2f39a0cfb65c"; + sha256 = "029918b677978a74fc5c896d529d07201e38e283256cc83aa065b721f6570b51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/th/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/th/thunderbird-102.4.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "7cb5c0a5c165455e82d9e013f865c88ae9e6782981a86164a684efef09a3238d"; + sha256 = "ca3f0bbf8e077f1521d949171353e9404939cacadefe96fb1ee6d9b86237bcd8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/tr/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/tr/thunderbird-102.4.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "543d63317a0e42d7bba23cf964e816d9aa30de44eab7f7d81ac5ba178d4975e8"; + sha256 = "d09d7fedce1a467ce32948332e9b7695d8113c3ee3078c9771cdd4a87168d164"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/uk/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/uk/thunderbird-102.4.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "87eb738708454a7082836df803d400cb6f2d7c7dd836890a26681f3c5f06d38a"; + sha256 = "834914fa4b058721d7f3d43e3fd9b0f509d4284315780999057f8960feb87fe0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/uz/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/uz/thunderbird-102.4.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a11e52fccb2cf0e96be69c59e74d3766c71b895d41a13971de369abacae5044d"; + sha256 = "d4e9309eef2f58271097e750fc46988200526ef6971f2bce7487305dfc1f8d37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/vi/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/vi/thunderbird-102.4.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "34cca2f1cda994a41a3ab772fb987f494159473f361da0835291b979dc8b0134"; + sha256 = "ef1d679ae415ebc51353f2ca475dd9c968a308150387f33c85cc1fb5fb7d3d0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/zh-CN/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/zh-CN/thunderbird-102.4.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "6fb4c51c37fe78fd6430f82869317a9b1580f042cde00ef5d0aae99b91fc7264"; + sha256 = "61e247c35e102c836c68083ecae7ab8268dcc7d4a6fa15cd81dcf2e9a9ae7053"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.3/linux-i686/zh-TW/thunderbird-102.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-i686/zh-TW/thunderbird-102.4.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "0271acf95abad4ef6957108e18f5d4149d7a6829b7ae96ccb600c1c210c24669"; + sha256 = "b464abc16f43d675a70d0b05491fbca28b8c3c9e5a6e684b2d442081b8538a2b"; } ]; } From 1f6b6f02e9798825f7189c455e59a9dc0c6e8db6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 20 Oct 2022 12:22:18 +0200 Subject: [PATCH 031/106] firefox-unwrapped: 106.0 -> 106.0.1 https://www.mozilla.org/en-US/firefox/106.0.1/releasenotes/ --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index c74ddffb4b5a..09a24cbf21ae 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = buildMozillaMach rec { pname = "firefox"; - version = "106.0"; + version = "106.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "30ced2fff818858267eaab23974f6962c5d39433ce8e26507589535fc9348f00cf5e45b90997dfb6e2361b70900547fdb0e70d741127cc6705089ea585ea2296"; + sha512 = "15f5a65a69e11dd0c463b358cafb5ad0f31db93619b9ec3f89e8c5e14d4d319d9423fe4dcd0dbbcbedc1ad444dcbd8e5e30e483220277f5b550bff6124b66519"; }; # This patch could be applied anywhere (just rebuild, no effect) From 87fa015d32b4d57ae9264e167b56987f917dc8c8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 20 Oct 2022 12:24:21 +0200 Subject: [PATCH 032/106] firefox-bin-unwrapped: 106.0 -> 106.0.1 https://www.mozilla.org/en-US/firefox/106.0.1/releasenotes/ --- .../browsers/firefox-bin/release_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index ccc9ac0d8f02..04240bfb5480 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "106.0"; + version = "106.0.1"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ach/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ach/firefox-106.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "ad550050b0203e73f312541c0598e690296186351ccbff9b5506d2a8e2392fc3"; + sha256 = "73e8b50a234cf18ad9f4ee8d5ae54a3b33a560ad1555aaad92399d5d489c4127"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/af/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/af/firefox-106.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b28a816b21a060478e26ad52d47b11a0a3b86459c15dfee4255e0c21b7a19c8e"; + sha256 = "c74ebe3630f36c9f07265c9fae64e6efa120851640c6b413a473777220cf79bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/an/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/an/firefox-106.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "a2a174788d191170484f1dbc5e0faeb5503be70bc35debc22be9c451bb88e919"; + sha256 = "dd1871d27579d521857d3c86e4bfb3eac6a229f1999cfc0ee621cb7e4be182b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ar/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ar/firefox-106.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "d481aba4e0473fd72ed51e0a40dc42e0c117078b085c9e5065c8d29dad693ea2"; + sha256 = "a2015703716433213ce8deaa99ddc521c248883359cdb6342e85e337c4ea606e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ast/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ast/firefox-106.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "6e42da18a86f8473027463d52d4916ffafb4176e007d00cb3b94e07715f5888b"; + sha256 = "5ded0e6d3b3fe582f2b0700eb0e11c57d41f5bd0ae16d2d5f380e6d716e28d15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/az/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/az/firefox-106.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "132129330c8ea9088752071f0f325f245d71e7e185329bf5bb33a88f4a32c2c0"; + sha256 = "10ac2f3970f2db6101aca9919bc2b3bc9939138e667710c3d6c8299a15c42642"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/be/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/be/firefox-106.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "8e7cab908e948a1671f71e20d6650abbae0f44c03fb5979cb9ed42bdb0d6a964"; + sha256 = "fdd878cb53813f28339d609a72fdc3da215310f6fad80dd912c667eaebbe804e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/bg/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/bg/firefox-106.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "727e6a8dfb8b3e9732793f5b7afc4d940e6bf1a088431f49e3460f1fdd2ae6dd"; + sha256 = "5875e2aeab9b270f2c0b2d07c039e12ce7d9d6470975b4a929ee854cfb9903b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/bn/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/bn/firefox-106.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "404b12be63e00854f6cb34250b30ebea76ae040feebf832bf87a6a1c90541843"; + sha256 = "a0377b5d4efbf79ab6bd3ab166dda109ed5448c171679e771d08cf8ad2ab1d02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/br/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/br/firefox-106.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "a2cee886fcd286ba606d4203fe03f7cc87426e20f9e92d311b2c3040f4429214"; + sha256 = "01215f4d29a1b4af05a7d8cbc4b26f22db5d37c39e1363b1493822791cf99b0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/bs/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/bs/firefox-106.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "51aef62414165d0bcc0494beb89eb4759191d9a8471a68d47097f0befe4d2dbb"; + sha256 = "ee6b84e55789a7c603c3354e5ffcccbd0b0bbbee529390f3f02678454b2d2bb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ca-valencia/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ca-valencia/firefox-106.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "aa1288ffa54bc200c24fb6b17468aef954e17bca0d541baebdc0bb572c8a54c7"; + sha256 = "af588ab3d57e3dd7e44354a7946da274b7db487a794b803b8ebd39b2ddefdf74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ca/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ca/firefox-106.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "c3ca275299988c8568c727c0bab03d09be884bf89d5624f1279a2af1a69d6e72"; + sha256 = "7d9b6451777d8ae449767d5349f78cab647969f5223c40a990d2032e358872c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/cak/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/cak/firefox-106.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b4c4e0177630c0b3a91d7d0c229d7e754ddb3d0b266ba671c0dba373a51f8850"; + sha256 = "895a24e38cb5ada57768ae44de17ac111f11dfc2305e9408d334a481b710f66a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/cs/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/cs/firefox-106.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "62862a10380513b52929db5ac357486061683c193061ae60cade4d9125cd6763"; + sha256 = "efdf4568777c9c33cfc84c2d966a06b1b2642185e0e2c2fd826dee2c402c0c7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/cy/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/cy/firefox-106.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "99809934952ad837b8eb0f1ad164146166ca228e2abe97e8b0f1e2cb17fa6bc9"; + sha256 = "1db8b754aba37a1b1212359681de5ab2735c3cd1eb663bf97496f18e84d0aa05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/da/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/da/firefox-106.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "f4cfafd52a05e633077cb48af297c88618047cc2b1f44fd0b769d61a1fc8c880"; + sha256 = "03fc6a07c44099474f746ccd3d72dae0b40aa86347d0015db5660bfeb5a87ca5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/de/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/de/firefox-106.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "5c49ac481e665e029cf62d8620f509f7a98b75602686c51f28dc41d979ba9aab"; + sha256 = "209cad4c90e876d2126db2cf828ba1610c956a133fd9cbb242de6466a43e07d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/dsb/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/dsb/firefox-106.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "c53a56e27f242b099015e4cd71f959248c4fb040d48b45992f4c6e5fa122131c"; + sha256 = "9edb173dc9532aa9de3dc740d31b107d7c8871fe1c82cbc8490277aab01c1b25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/el/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/el/firefox-106.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "153e5974ca1741cb6aadafe44c74d9778042c97d09c3b3fed4955a5c91ff1142"; + sha256 = "fccf555e8e6e59a3b055f451d91b3ff1c8f9e03a9d6caa88d8cabe0bd45fe0b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/en-CA/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/en-CA/firefox-106.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "67449fb227ee047f5ba62fea1a9454f37641b5233fc4fa7d7b261e0adb72767a"; + sha256 = "9b51182e6e7c46c04bf90bf46a36c138943f506a274028c0168919a5b8b1b0a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/en-GB/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/en-GB/firefox-106.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c30d7954508d83fe83e1878aeeceb0deab5dd604535420e1d3df53c91f033503"; + sha256 = "83980222caa3a7e62385bd87e43f86da1a685638c9400064aebc4be0bea3d447"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/en-US/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/en-US/firefox-106.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "37e917483bd6ea192525c48f3179707620657335d24de75499fae16da6021f9d"; + sha256 = "9158e760a1baf524d2dd5095f44e71cfb50062e00074bbd8368b88c9eb547085"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/eo/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/eo/firefox-106.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "8ad946dfa952e6fbef91dd28b83614fb359ab9795dc7870f3a17ab2990a8fd3e"; + sha256 = "0430f1e7c0284a7654fb207e68138da7aa3c8a6e788668cfe2c9921d5d013822"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/es-AR/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/es-AR/firefox-106.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "0d576665e0e3d4fd0fe1fcd0c78309310a75cdeac926d04b44f8a58b77a7e8b5"; + sha256 = "2ac1a9880364afed678a259f9c3e2082b9d1cf774b2dbcfdb8a0cac66cddcabe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/es-CL/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/es-CL/firefox-106.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "3983a0e81855a4907aa19b4c7e63615dcc4a5e7454dd203404aecea747c56933"; + sha256 = "75abcd1c04e11dfc9043f9b934aafe40c443a9023e0c39a30848457cd364a40d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/es-ES/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/es-ES/firefox-106.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "34293ac9323bdec30fec9c556fab046501b61dec02b6741666e047f008809195"; + sha256 = "f4afd36de73083e46e62dd1a71ecbfa1eb6244f61c29ccd5763519474634ce27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/es-MX/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/es-MX/firefox-106.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e944c385c7d66076856952881524c9c85a197c8007b9eb579e74872431e66437"; + sha256 = "b3d9d0101ad8794c7591f407e49ab395ea9def5ed9bf7b51ab5fe2167c49b71d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/et/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/et/firefox-106.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "468e2404a85eecc65aaa8cdf3901fb64d057ba51d2293bce8e3ca373b2b1d96f"; + sha256 = "a518a583fef63e926931bd2a200293dcabf9a22ff1f7554f03f6ebef9c614e4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/eu/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/eu/firefox-106.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "2496beb4a76bbfcb4f8c09976080c088f07aeab8adec856d46e8d97affb58967"; + sha256 = "f98694a3a3c21d836b1efb322d60989f90f31af8c06e483739cd33c73053a5b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/fa/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/fa/firefox-106.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "e9506c379b9b544a1e110f245896efd5a54b9a31c3eb3d495bcf6799ed159884"; + sha256 = "1b6afbac73fbb4c54d83d7599a67062bf64bfba3e67bf9e4fbee9249efcd62c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ff/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ff/firefox-106.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "ed3fee05a39587609d26a21d185cf137e9b4db2b4b085e4407ae956c9eb7eead"; + sha256 = "d78fcd480fe27cb04c3e5e2677598312e45786a3100037fc3fcad5fe64ae073d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/fi/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/fi/firefox-106.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b25279ca09e4b50dee423e2f090bd1f235bb757fe1410db0a9abce2633de1cc5"; + sha256 = "c2c05b0f0be4adbe9824f34e59ec131ecd53f1d41279dbe55db2f533d1837b3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/fr/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/fr/firefox-106.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6011b998f71be513c9985d1bd5a6ea401750b174a40bb4f319a74b13dda76f35"; + sha256 = "1b84a24eba4cdccbe9148ed3dae7f5990f8aceae9174c079ce735bae491592d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/fy-NL/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/fy-NL/firefox-106.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "38d0715bc0bc2e6709a34ee1de5065218a300d93c82f1e85037a2df9c892d180"; + sha256 = "11c46d35616eb8000030bba7ec711c3d2f0bd71d8fe1b00716ceb087b615949f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ga-IE/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ga-IE/firefox-106.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "1f8ec001cf25d688b12399b6ec84954630f28227e505e497fc9f6abe4a9911a3"; + sha256 = "c82a8582e7c7a290940f34747dbac10b82a3a7a1dd25f5ec29ea6760452f9ceb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/gd/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/gd/firefox-106.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "2d8e2e8a384f6fa8e765046c0b865b0585aa848ec88ee33ea93eecc0c742027b"; + sha256 = "a134d92e8ba86138a4fe48abe30e99db22a0eda3d752388b4811f5ded602b2e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/gl/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/gl/firefox-106.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b73fa8a5ad52a662184c888e9a90b047a5b9b98b3e64942a6a47b6ffe4b1029c"; + sha256 = "917ddb3b29c5e79b3133228b2369eda2f1fa8a80e1df045c7f574de98cc20589"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/gn/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/gn/firefox-106.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "4f07d668a8bf1183dee5c156a456660d035b28fccb57affee33c4300a96331f1"; + sha256 = "62d6f290a6d2c5004475a69994238425d9f86809d8bb892ab5d024fc976eb95e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/gu-IN/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/gu-IN/firefox-106.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "6b8f169fb3760fc5c054c28e2715ca3d4bc0fe6aff13d581379aaf6a33831e11"; + sha256 = "84b800fda564718c88aeabc8c80a93f81bfd793de36df1692037e5211439533d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/he/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/he/firefox-106.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "a3e1cd30cb11fd7b608daf1bd462c1d069e47805fe0d090c0c82fc11b071f051"; + sha256 = "4a45350737358be849dd662ba00ed9678c02fc3c6ee976bbe604ba22973b03f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/hi-IN/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/hi-IN/firefox-106.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "6f6eaa517a618b55fd6f69b9e4ba2254817073fbf996ab65e62b4ba8818e3d39"; + sha256 = "10893632acbc8e59a85aaa5f99e5995d483e79c707ae7b59c3db8f7538ad61fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/hr/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/hr/firefox-106.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9805a0654e77395afdc516d0d7b99d44c983d7ff5900485fe511fc3094ae895d"; + sha256 = "f948c69b4aba2cbaa0bd64fa3bff0db6ea333db055a5977edeba19fd714d39b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/hsb/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/hsb/firefox-106.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6974006302e605d138f46cb9d9032006c5ff5b67652e5ad5c7b4106b386cf25e"; + sha256 = "b5420b68bc0ac11e84545cbec819f6845464e640591c2cb472e5ecf03c1067d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/hu/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/hu/firefox-106.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "186dd336ac4ebb372b32d6f707d9b4483f50bdd3e914e02ba4ed811a6111614b"; + sha256 = "3699a369965dd8b33045dcc1add1d7b5bf3807e6ab0fe71738ad8a3d10c9b992"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/hy-AM/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/hy-AM/firefox-106.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "3b314d90ad466fb42e52a43559d31c5525f0f8435ecc51a9bfb390e1449c43b0"; + sha256 = "736ffa083db4fe0a09bee5180ce21a72d232ef93de39d328087d77c700177450"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ia/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ia/firefox-106.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "06b357d59eae2e67a847eab646aeeb320883ea30a979bb491acca928e4f0a6f0"; + sha256 = "e379bdbc02cbeea8a6ef08c699c31ab21c8a7c850165b3eadf14f9776acee0b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/id/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/id/firefox-106.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "3e6cadf8628d0e55be10170e2f61c670c178c5f2ff28f39a923488c7eff001de"; + sha256 = "494d9711fd6cb8a24a4f9ce8b5a469def31508acfa74a349f5847fab8877bdce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/is/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/is/firefox-106.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "375e7b3ad32026b64ed55c56604573f72864529e886c65054159951e775273f1"; + sha256 = "b9b5f39f8837b0196d23dcb6126649a163183a3f4a7beea9abf5d2cbc45b5431"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/it/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/it/firefox-106.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "eb098c9444c499c4b5de38ef7a9ef240be7bd2101ac003bcda31d8dc4515ee08"; + sha256 = "cf472e023000a836092a65c9bc13f3f4bbb1ccc019f0d3618f5f3901ba978c2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ja/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ja/firefox-106.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "0ab12ad4ebe7e3b123fa7e8764324f5976dcba71c1c55d114fb33d7954065a76"; + sha256 = "24ad2d46cc17176061de745853dfa149b30006d32652af4bcca0da7852d61bb0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ka/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ka/firefox-106.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "9c0f090132b8104b35adb49d2b3eb809258bf87ed0e185373f10a3ae5d5a0da9"; + sha256 = "4449b8e64a566f6db99c8474d1710dfdcb7cf9986f84ffe052fed4523a0de585"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/kab/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/kab/firefox-106.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d539844809913a2cf2bd43df3a6f61e9db802dd0675d54ba17d8e110177a59e7"; + sha256 = "22891b7087460d0409b24feb8465e2262ae48a7ca672a04ee4aadf7d6c75a735"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/kk/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/kk/firefox-106.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "1bd06c344bd4500ae82c65ca660b0a399c137dc36488b23dc9a278b79e0fcb13"; + sha256 = "433d1cf6015a8bdeb1ad7ed8ab277d12d7d4bee0ea13e0b9a05d6f9e21485706"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/km/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/km/firefox-106.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "87082f0f022f4034a387cd9bc885eb94e4fba390e12df37253f771f507a5d1f8"; + sha256 = "797e9129412851205ad74f7b319babdb80510a5e3ad5f09d2f95660cc146fff7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/kn/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/kn/firefox-106.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "d554198f454c1679d718cac2df1e95f241ead1ff0930f7bb10208b39e928ebb5"; + sha256 = "58ee62330f425ec58475012db703fdf28c0f44187fc68c64532b92812ceabbf5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ko/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ko/firefox-106.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "8034e83bb79fd0465ae49e68c6a593bbd12e795e18696e5046dcee493b62019e"; + sha256 = "30634665e61e844b46f6ee8ccf6c746b233dd91677dde760453656e38913a241"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/lij/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/lij/firefox-106.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "544e0f538c77addbe027fe2a580455f1707d1dbf15c487d972b0625481b00202"; + sha256 = "175284c0c30974322c1c95904de89b0745c14a78675e3251de90b5447831fa84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/lt/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/lt/firefox-106.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "ba1b520883a52f1346da70b1df94ed14adb6fb0bc8a955d0d10d80345115f189"; + sha256 = "a15760d13d2ffaec7d1836d283e9fb6273be0b7ff56c39fd2e90fbf8cbf7e4f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/lv/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/lv/firefox-106.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "3d40bf017452208f8838a9448985d3cc33ffa9b17eba7c67505bdeb47075545b"; + sha256 = "784e762e4b4df65bf9b0b0a201c7a1e65d13420dedf453874d0c78d829ebbfa4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/mk/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/mk/firefox-106.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "a3dc83cab89f8e543278b0e1a896689759be42a8bd4af8faa26b73e20eba77fb"; + sha256 = "b963f3c63d25b2a8aad44c49251b2fc2db17fa7b3b72b2e98556533a495361b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/mr/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/mr/firefox-106.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "aa3de42f0c9b5c1ea0a89792b17dffad005cedb195184351a5c742069673256d"; + sha256 = "8f965d02d454a6e31a81ca735a91a5f9a350ccf45fab391c79bb030a7c8249e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ms/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ms/firefox-106.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "07821c8fac0a65d03948cb15b10294af234680aa8c9b32de29d7beba28ef0397"; + sha256 = "e0709a20cb781ffb644696b50df6c5ce9add7db7dfcf0bed64a4847a45c46c6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/my/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/my/firefox-106.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "77c52ff0b9e801d1fc4d6f030ed505a3e8fdb1031eb1870146aa7df774442fd6"; + sha256 = "8bd42bef785ec15afef51aabdf23decea06aa94eca556b3713f25c36288bf8e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/nb-NO/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/nb-NO/firefox-106.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "01005c8eec7c73ca303cb4c298bd4bc25f7429ebe900334f05ba185465562d07"; + sha256 = "83279396c312b820f37f34f11ec52bcba331e8d11ade896e27dc474624feb5c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ne-NP/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ne-NP/firefox-106.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "0e4d97f942d699db4a6f60819decac98817f8c620694ed4a5c7b275adc040be6"; + sha256 = "1147aef4411e3e74d0d1ed1f3fa5dbdcdc2a36a7f67002c8eca481190d866531"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/nl/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/nl/firefox-106.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "1015a751362cabb3173ac7ba1f7309ead3c17bfb408dee9ba3c1ac54c6ea5d7f"; + sha256 = "9697a3ab2b05108c01fc8434d8b59decac8a74340d50b3fbbdd406ea04b16a39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/nn-NO/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/nn-NO/firefox-106.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "37e565496a3515737a34fb7ff7ac27318acb0095e99f4ce41035c0514ab4e415"; + sha256 = "976cb735ade2287ae2ea27faff1b9e9db115394e00adc75ece405da318df8270"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/oc/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/oc/firefox-106.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "b3040e22827e4cdef49e8b964458548fad9840f118fa90a29e302b2aa82c3f48"; + sha256 = "05c591c51075d01ac5b84b30b464ebf793431cb53eb9297e27f40023744e0b06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/pa-IN/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/pa-IN/firefox-106.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "55d3e440b71e1b23667fbe1804a2efd02e01b4e105b6cf3c30ca5ac4b7237536"; + sha256 = "c91e34d9f97ade64458c959977a2a311370afbdce2c9a3799d5805376c505e72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/pl/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/pl/firefox-106.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7bba21cfefa26f1763d72719e456d91f773ed4405a51d2abaee6bad9436f6342"; + sha256 = "9d81b7ae684e7e17eace812a788dfa43206f694a8cda25199d9b570233157da4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/pt-BR/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/pt-BR/firefox-106.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6d8e6ab969f4ef0387ff57dcd8f97af97726bc9229f518e854dc2ac13e32e7df"; + sha256 = "83ce307ea323ad4f09e4fde06f21074b6c02ad58a9f75634c85bf02218adce20"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/pt-PT/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/pt-PT/firefox-106.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2e3ff1270e7d25395d555f7383049acfade0f8a14aaaf4739e92cea829de9be5"; + sha256 = "9cd2ef64b8b5a22a9f9a73a5a6722afc50b3a524f54205bc418b1d379304baf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/rm/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/rm/firefox-106.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "1ac3c44213cc62adf9a3ee4d7f01f1561d136eabfb22ad60ddd6fb5836bfb372"; + sha256 = "3604fd722d51f94caf96a219f80f6f1407c375709c07a14191dedc53faa30ed6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ro/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ro/firefox-106.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4bfe6ef99c8caa3403bc4378e17af3b258ddc475b49faaa4eb33c23a33aca786"; + sha256 = "4df00206ee7950b2406c2d3a1b25365dc7a3d2aaf5cf8c86dce4189f6b05c18b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ru/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ru/firefox-106.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "63f852af434187ea5985de61e86bbfbb5614870328d91725e4d572cf970c3f06"; + sha256 = "ae0913701bff929b5dfa6521b19aa207f2c89a841ffd2882e10b6011d406aa9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/sco/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/sco/firefox-106.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "97024999c649e6beec469a22a09e93c2b7640a8f78dcf469cc8ad697a6babfdc"; + sha256 = "2e6386b04c8008f02d497e70a5be4b422ac700d99da925674e43c4567936d798"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/si/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/si/firefox-106.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "39af0075606356df2f0e66035e941470ded9fba8f6c6baa36404b6eb9ac7af15"; + sha256 = "b386202c5e3fa869e30285cfec881589566cfbd147aeafd651e38a4da9ac8846"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/sk/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/sk/firefox-106.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "cee9e34fd8adcd2b530023ccc76ca12d40b4d952833597b0a978748d684cfb93"; + sha256 = "1f29f08de3dfb9f203003ecca1d841e580b4bf7c3df2078134d6de26be14ab35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/sl/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/sl/firefox-106.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "5ebc57d71f31d07a5f1ddc0a7e16504957e42c91f0f87a6f4f7739dbc324f62d"; + sha256 = "dd63a87c587ba9e2ba489cd9e100f732c60297ff09eea279f0c249a6ff392921"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/son/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/son/firefox-106.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "6614b7ae09ee3fa2d8fa0109f25b87bcfa984f37757bf484cc2f838904f37ca8"; + sha256 = "39120dcd7f5b33066333fe47a0777bae144a90be97af8e7ca528ca746b717ff2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/sq/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/sq/firefox-106.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "68a3d8d03b814c707fe5537a1ef4eb9ff4b72f72e9cd9daa1cbbaedc05215084"; + sha256 = "7aa0dc316eb51f0eb80fa744c2dfbc903bd4fffce228a675bc2fc1826592133d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/sr/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/sr/firefox-106.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "85fc5bcd1f761f4fe387a74758bd01856d5d57d6694d327b2d9998614e12df6d"; + sha256 = "d9dd66f19af5f1ba67b44a24856db0b9f880d77f37a9ece171fb358552487291"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/sv-SE/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/sv-SE/firefox-106.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "49235025f75835887e37f1032bee5da9b31af128b5c281658ac5579352b8b69a"; + sha256 = "546fad48ae858fded383618b9bf35b4d235f40bcc62ecf40efd964e52e9d3b57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/szl/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/szl/firefox-106.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "fe22aedb149721bf752b51e443464262d033d52bf033171bb399458e1b9ac5a5"; + sha256 = "7f1b7214249ccb4a041eab383860a5004de208cfb1040eb7712adc0f65d6871a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ta/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ta/firefox-106.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "d9fb7a5bff46dec33a40c6d6aff3c3840b37cad85e42d00b54014b8389a48b1f"; + sha256 = "c9520b62c0516f9b7b6cfeee81d6a5880ae3ae8ecea8678428062744dc265fd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/te/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/te/firefox-106.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "1efd689eb39679f6637bc15bbdaa54b56c5537172131043d8d2e1ac6203f556e"; + sha256 = "294c701a6b47da257a7aef3acb864513c606dc68357f17ceff3f090610d9fb64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/th/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/th/firefox-106.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "b69662d1631bd4a04f2a60745ad3f6745fb2582b3c21995085e7a51ae3aa5e46"; + sha256 = "d2d57c38f19b735f9d0c63f1b90935ec5f59657b7824e46e5384f94bd6abeab6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/tl/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/tl/firefox-106.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "21645703a332229f7d630749941d6c22e51541add7bd6fd3c97c857aa8da60cc"; + sha256 = "47f6a00479833afc6af7dc045a505fba7961b093715f16e5b8e33bb9697ccd6f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/tr/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/tr/firefox-106.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "9e9bb19f146339c8fbb861fdee67e13dc06cae595b2094a171682173b1dcabb1"; + sha256 = "5191edc55d2f0b7604094c30c0eaabaa319525ef084e8e18b7bc4de6442e188a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/trs/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/trs/firefox-106.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "65635354b17d16b454eec1729064d21c43f71b0cde7e506b76acef1701ed28cd"; + sha256 = "b159860b09d16362d4f2655204a2c06fa48bb1c7be5c81749897eb57aa7a1799"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/uk/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/uk/firefox-106.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "017a293a5ad28cf9734ef208256e3a287c72d921c74a305c5e855b1d49b5c72a"; + sha256 = "d76a4e4d240d1631724b285fbebdfd9e976378e60bbb07347533b56763683911"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/ur/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/ur/firefox-106.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "a3fbe30159fde12db3bb84a4406233d4c614c7dbe6b034c11e86fb84ac8f335f"; + sha256 = "2cf7d4e8e6658162e004de86db9d98ae1d456c661aefd6f6a1ef917fbbbc7233"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/uz/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/uz/firefox-106.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7039e18d337696ab48441fb6fff74963b92db965605edfd303fec260a01c30c1"; + sha256 = "e2c3501af9eb9de310791ba9b94268fc2aedabe3936e200289c323fafeb718e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/vi/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/vi/firefox-106.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "06b111b12503ed3528b35265436e05bfda0a872c27b8b4ca142a1402e88f446e"; + sha256 = "ff5f115d3359884681f3f7a28f3335d8df1c88911f8228a52ba9c5e80bd88ba8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/xh/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/xh/firefox-106.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "def273d065c637725a25d3c562e670b3bf41e47717f7780f13dd60d0f8fff5c3"; + sha256 = "aa7a710d3c1359cc925aa6e6d503463c6eff67cf1e1f7b0db4b32e74d5140fd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/zh-CN/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/zh-CN/firefox-106.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "65a1b0717535aa8a844de44902d9b79412c58c0ebb79f4fd0c4269ff46032d73"; + sha256 = "5544af3676984c4500836e39a583d605bba5ddad08a8a6c818fa7821890af654"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-x86_64/zh-TW/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-x86_64/zh-TW/firefox-106.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "041b508b9ffc57df9870465dde37cfa6946be673822b0bbbc9d7bb2eae1a7127"; + sha256 = "d449f7d3875ff492ed8afc7fa4ce3766937e698d6e03409d814719bd7174d5d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ach/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ach/firefox-106.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "0f78efa390bd6b69fbc47d25cdd0bd79b825f09d8905d90c67ce135d06d2d053"; + sha256 = "9f16b041726372d5d947f09ae20084e423a7d66522d10fc13bb310962f0ace1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/af/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/af/firefox-106.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "a5b6791109588f45ad4eec4e6ee8f5790e3fc9586b8cbdcf605fbb5718c7cc50"; + sha256 = "51635da47398168ee27f1c546ff7c30416957e0576225b5885fa0d5afd46944c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/an/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/an/firefox-106.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ad013fe8fe4b51c4de7f61a16a1468ce0cce6466747fc8d2a1c1c68394bb87e7"; + sha256 = "59c1fcbdfaf19665f1347fe07a26ba2744a44c7c9c946634968316dc6cd6abc8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ar/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ar/firefox-106.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "4c017900084f34cb102da26f3c8f1f06d3d47b4867ab15472f20260d195315f2"; + sha256 = "e51caa00e64b352573d9dc27f73a23c37e49a701e69a2fa77487156a9128787c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ast/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ast/firefox-106.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "80cfddb3f7fd8a2de76f5d8782fe09d8d3c2c81738420f85bee2065d34817019"; + sha256 = "0b0e9804abf625490d5ba732be309a40931a876fb5c4d92b527ed14fe16aa68d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/az/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/az/firefox-106.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "36b3404968981fd6ab892db630fc40a9d1e693c7886a7ca18476c1a330cfad98"; + sha256 = "a3dbac31a3a24ba0803a8c90fd1ff918beca26d1823c8341ceed57fdfebfe466"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/be/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/be/firefox-106.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "45695b8bc7cd885b65db1dd0f8394c8b546cf6621098304555425bc9fef93eed"; + sha256 = "6d1b85c455fa034cda37c57d259ebb1a7b261338a1fc1c36987401f9eb6c758d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/bg/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/bg/firefox-106.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "db69fea00eee9451e202c931bb368c2890f1e1f9286305f46c9c4ec0754a7f1e"; + sha256 = "7b98a1b4caa746f20a1344b637ff2d02e63d6050014859202705d050caf9f797"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/bn/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/bn/firefox-106.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "43bfe35ccb66ddb899b93c3693586324b19dbad7b9506db9e845e76ef5b4a087"; + sha256 = "7cbb1f7c6a5edc7e6c601cb7b118705633f1ffea9a6841b906222192cc5f11d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/br/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/br/firefox-106.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "ff714b4f29115ac6e91aa03723195b9c6cee7d1ee31372759ca0f4493dc33c0d"; + sha256 = "914174e70aadbbdd4f03eb917aa731b8635968366cc8446cc77cae657033a232"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/bs/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/bs/firefox-106.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "59d111553a7517c3a54ef60462ad8bc0f280261c4592bf5dcc35a28d7ef37f65"; + sha256 = "9cf593de0045b3834159e60ce8029ae52708168dde86b24d131b0ed1a3ae1413"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ca-valencia/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ca-valencia/firefox-106.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "6c0a0d3836956367c29d94dfe931d555d5fb24534ec1f37ec7246e71a49a7dc6"; + sha256 = "163bc54ff5fa0978c49221c005770a4717e0662a736c9c907148652be0cebf46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ca/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ca/firefox-106.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "9fca5e0a82236503e91b1c58168690e716b67aec2690cc5c5db40a28c8537991"; + sha256 = "2c29871e0e6e5cd9017d4eaa24893f39adc9251f7be041ba51dadadce43e58b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/cak/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/cak/firefox-106.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "1e84ea686cca3138165f0767a9973e82aadac9af21f82c919597d7fb9958bf47"; + sha256 = "d60bc6e8c14b8a3afe33817e3930022ee244552443d04dd610c1944d7b90145b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/cs/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/cs/firefox-106.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "6ed2d77b44b08a753d672568578dd85086d6bd7fc82ddd82fdb2cf236d3e01e9"; + sha256 = "b9d729d027c86bb620bca4f2d0792a6242c0d1963f0e1c94f37caed59deea1df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/cy/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/cy/firefox-106.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "3684b726b7a690924f68a89ba7cac272760acc186643e7b489c18dda18773c34"; + sha256 = "97d388f2fc00182366b4674eeffa8f96d0b05af2e39f500fce67e059343bdbbf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/da/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/da/firefox-106.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "91b044f757c9139ff8dc723d8e5fecb9511f7621705486d223c132b5494c1320"; + sha256 = "155ccc093c3253ef01194e2bfbbffff0d19fe5d08a9a3895fd6a0c3ba6b1b7ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/de/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/de/firefox-106.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "52e7a2602b7043bfd208fe5852210c49a3467c7e3aa2c686d63b662ed1d11a52"; + sha256 = "955c284fdc1b89e621d846f91fdd91dc3e7aac8101a037fe4b0fa1eb1f8053cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/dsb/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/dsb/firefox-106.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "b5bf371c20fd4cc9ccaa53218e0a2340ded62901d450eec32597f8210329cac0"; + sha256 = "7f549ac2d20c33180439773c83a13abbef0f0056c8359604bfcab7d9635a9be3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/el/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/el/firefox-106.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "dab878a6bc30290cbfe950df48ca4cb72546583dad19e68e726ab29eebd8a58e"; + sha256 = "34fdcd82dc8583d8439a9df7ef5771cd33e9838ac4325681950e9c54a9eb7f92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/en-CA/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/en-CA/firefox-106.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "4f5b527775d99704247b164ed011b9e9fe67640d3d4604dd7365173ad3761557"; + sha256 = "9f16e13defab325482328d3f0466caa251ef5a3832712e51db5016f9bf6e5ed5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/en-GB/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/en-GB/firefox-106.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "8e517a9b86b1a1a0918a8249ed1fcf631a02a1e3178e1efd62d4a1d072753a89"; + sha256 = "8d7a94a808bba71e0ebfc017a96ec2c74fcfe28cf911777161f6a2908119de6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/en-US/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/en-US/firefox-106.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "92cae86525cf2b558ef360692863b6f95047f19cded45da617bd1fd338404839"; + sha256 = "7bd5efeb3b023624c61ddb4e0683e2573d0b6b49e5521ac8fc4474c8c0c09618"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/eo/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/eo/firefox-106.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "d3778d596f382f26f2f734cceea6896a735c9fd15885df8dd7169a9cae11169d"; + sha256 = "53bee07b6caf2dab18cb842ae3573556eecf1c2ceed46cfb554037d25ad41a8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/es-AR/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/es-AR/firefox-106.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "df5b7fe20d2a75e46b104d70e72520efe79c8ba23b406a5ba6ee8156d07caca9"; + sha256 = "8881872e1fa6f5303dc6cc7327a3e95da16d8f56cca34e63c66f7254f00e9658"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/es-CL/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/es-CL/firefox-106.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "b4fa53a925c27abd90efa2240a026e7a95350a7b1395ebbcd52f54d2cbedcd98"; + sha256 = "35ba78d075be404efce761219c208d3def7ee403282fa705be692e0d71cb9c52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/es-ES/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/es-ES/firefox-106.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "e1e73b7b26d6c7074e95d03dd2113570871628f8a3fdeb8b7dc723be8dccf5b5"; + sha256 = "89c9786196fca856a663502cbafdcb55a79a217fc220924fa3f3e91c3417de93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/es-MX/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/es-MX/firefox-106.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "abc7eb8161dd4971af1f40dda75731ae1c07f63b3b9f0f940a4e6f85bf043aa1"; + sha256 = "1ee912ea7423355dc51a966dc4d4d0b6c361a9f4186f24e9ee8c6d68f7f9f544"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/et/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/et/firefox-106.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "e691680d7da5c262fbcb5b90028bc82099258a2a9e973c2f3a7ac3b26dc42e84"; + sha256 = "ff21dd87e571a32d55d5bfd5a9bc16ff90dfdbdf91714bc2526c004d703397aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/eu/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/eu/firefox-106.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "848576d6797b46a5fab58dd46bbc285f7f7d2d9470675b27ba24c7ca161af8bf"; + sha256 = "907163e0021cb42c55cb84ba5b428683890688d0e506a3293c2e6df7336b913c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/fa/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/fa/firefox-106.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "826805f8f8b3ba2d3da6f115a034bd7c17163e86c01b52e1cf9b962f7adb6cbf"; + sha256 = "93dc288231d3b77cda50be5a3c12ea95281db2bb84068c9463ffd0bd20b93d22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ff/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ff/firefox-106.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "f55f87ed2e6fae44a33d842a98f850b4389ec604e05ed6e4d42b0bfa57f7e08a"; + sha256 = "a93a552e57909b286104c6d3b067beb770d3cbb3c2c6933f5769ede79e5297a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/fi/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/fi/firefox-106.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "2cb6646d6b41222ee51f22c3cc890137299001f039d4a76c092c378e959b793d"; + sha256 = "caf0865c18940bd33b38213fecf477e71ed76589f4f403f542adb1e3fe65c9ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/fr/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/fr/firefox-106.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "0b5248d5f8f3a6b4b656a2b6f152800158e21fe476f8774c1e9a031412a83a69"; + sha256 = "9ec7d97c4ba107b63daba71b4585e6fb2ac1ae5de66cd46bdce7afa188794dd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/fy-NL/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/fy-NL/firefox-106.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "281dae185d98165adcd51e348ed8aa59a9b23e2eb9d6df20091a39486f43c1a6"; + sha256 = "9ae4c647c4ed2710eff78cf3e9966cafa5ef3d92044a8b6e0df730259f6c7eb2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ga-IE/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ga-IE/firefox-106.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "e1a21ae50c7f2b3ff573b92fb0a67f809a7dccc78871363b0c3e887b876c21ff"; + sha256 = "eea019930245e8ecdfe9bbba7d848f079119574a8efcc7efa726156ee8ffb777"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/gd/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/gd/firefox-106.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "f255561bdb8abb63e1d2f7c20106d3d833dd5dea1b1a41f1d113f7713a2dee82"; + sha256 = "8740cebb2df60e63a2c5d68d369385aa7e4b00c83b6f21bf684b645a2747742b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/gl/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/gl/firefox-106.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "481fa8847fbf7d90dc4490f0047ecf449dc8d0ab830f9628864e58291b34fe61"; + sha256 = "5a5678395eb604617f1f26bb088a0a8f490ee60accc943ddb7530c14cce47956"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/gn/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/gn/firefox-106.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "4a3b767e527f8ae3843cedceba5dd652e94d091cfdafbb58026714ba5c91c9c0"; + sha256 = "6c9e8ee762bdd01acf05d08b3ba78bc297b6752833a5155c8aa65f8a9b5608d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/gu-IN/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/gu-IN/firefox-106.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "6fd8ba68af556eb4986a48d80814d4b7bae26736f04b031b2024670cfa9aab41"; + sha256 = "778e5de0eb1f22ce6962b3a197b4b8667cd05207be4536f9fd1b83fb1ecd5416"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/he/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/he/firefox-106.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d9f4eb87743b65dc147b933ac83a538ebcce3828a69a644f7a07187bfa2d332d"; + sha256 = "d079b3279dbfb36b2a9fde267de7e11a71fce9ed9767c249033461908d1af647"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/hi-IN/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/hi-IN/firefox-106.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "f0645150b6ce45a479d9dcd1d47a3b51e6d36d3a57d6b8037a370a068768717e"; + sha256 = "cd1bf706a138e4ccf2fb3491a67432e258717a06c2bbfb1ed583a80c264ad880"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/hr/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/hr/firefox-106.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "5ece91da9106d2df7c13dec07f43335cd07b5a94f52c521d5b3e79e02e4dc48f"; + sha256 = "ee6d2101e9b1b9281fd7fa2bd074cccb657d36acc961c43537206cb838af9c74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/hsb/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/hsb/firefox-106.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "9782ad8ac118ac2e6ced541708a31451c9db9a413be04a8fe091dc55fd113f40"; + sha256 = "31a1bd9112c514739e98d110453a1b9fc7c4c097e9d22498f21242cafb3e0514"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/hu/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/hu/firefox-106.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "47d1e7b7c1eec2bea308d1c6291aa0cfde90c65a8af4cdf333803893783c1225"; + sha256 = "8fddf8bffa16805c67cf9b72c6b21b0955753209ba23807bfc2de6bef4de0051"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/hy-AM/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/hy-AM/firefox-106.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "43c80eebe1c3c58553e12e623c1d9617e655b7f1bf77823c2c309fbff3486109"; + sha256 = "69fc52e3c2307fb36d6b165a814c5e55898b87026febc759dc6014c9de375962"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ia/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ia/firefox-106.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "231630880015e059596f553bac7e8b770881d366a1e90c76aeb6ba4db2f29549"; + sha256 = "9d7f9a4706ec8180795e2aab4cf5cd82295f138616888ca88ee35d76d7457166"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/id/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/id/firefox-106.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "e161ab7c90115455632d188a2c604707bf4dba1d11f38b53a3dd5937e17f4d14"; + sha256 = "4a888680e35bf060abbe36c5b9955786e162be412282dfbf2e1949003b06ca00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/is/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/is/firefox-106.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "2b2858a26c6d98fe58b71ab66ee4d726e3738b5aae0cf472aecb8c630b9e1e4f"; + sha256 = "2ff3a4bc90a77986f8d9b35a216d2abdda2f0e2c61b617a86c24e722a36e68a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/it/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/it/firefox-106.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "0b8a9a8430ca096103face77f8e03bb66822b47c6744b7885943e188f650912c"; + sha256 = "ee804ceab7b4a42e9e781ea4b2d65d877561bb85bdf1e3079514c973b27106b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ja/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ja/firefox-106.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c519dd593b8251b2a198694840c73eedb8b4b54d68ba174bf2b09d19456328cb"; + sha256 = "6875c91a033986e4600dbe8bdd2326b3d9f1233fd81162860479aeec5eeb67e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ka/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ka/firefox-106.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c1069d36ba31c5c93f5823fffd814da0456780f0a08dd889d9530a94a6c9c527"; + sha256 = "9e571e902b4925c9294f1093d161607943df0b9797c3e4dae323ad7271258a90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/kab/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/kab/firefox-106.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "b8b1021ca63bf083611d8c2da1eb23f089a196a84fccc5423c02e542ba48d257"; + sha256 = "31e00fb9ca697f18a1770be7665b981bd8fc5558cf2247f3211056603b396e08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/kk/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/kk/firefox-106.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "dbb1fdb3f7ae5f3c560849af1a944bdfbd2a2da2c6ad3288df3464f58b00dcac"; + sha256 = "3d369677b8fe663847e30c0399a2dde9e4692d209aeffb6a2411516bd5607040"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/km/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/km/firefox-106.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "5e2ad3dbdb9f0702d88b2015bb64096368458a85717bf08be50ad5a58a6756de"; + sha256 = "654218c82d49aa77e1d2c28892b027944976eed8195de5f674d651b163291fa0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/kn/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/kn/firefox-106.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "56a51bc4059e62246fc491083a3b0e7437db629fb0b251e9c4b1b6e29891f888"; + sha256 = "cda09b1ab169473fbc8a201807cbceef4382ab0a346fd428d95ba2754dc776f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ko/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ko/firefox-106.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "865eecb5d1d94e672be0a22a5851bd726722b062f64790ecf28897e3f4c1b82f"; + sha256 = "c94b4936819f53a76cdf9b50077f8ae66c69153ffb3f34b556a9ec2c6f655474"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/lij/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/lij/firefox-106.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "80f11bb6a0db1bef415247e0e340b1a54a57c909cedbf4b9eb8afe7d102b2a36"; + sha256 = "4930d71723c240f5493bd032d4a578b2dbf87073be4cd3bf3b43674d48c1efca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/lt/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/lt/firefox-106.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "9311f1080d80b34ea8a779f96179d45a91a8bb8d4c9a536cc1f44996cd7cf02a"; + sha256 = "0323e677a9748aa13a282152504751e41e19bc4692e926898a23d70b1bce8240"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/lv/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/lv/firefox-106.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "235a3b1a9983d6a25591ffcf1f8a1b97ed0a44b78640d55c1f9aa6db8d327300"; + sha256 = "6de336ecdb9ec67d3cd24416fbfa2430b54add6d5e586b672b3cae977a017933"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/mk/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/mk/firefox-106.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "20646b0c68582391c2f6fddce0e8cb94043dd5f8268eb0f156696508811e7f80"; + sha256 = "5332892231716c401846a780eb18df1f3944f29db61d0f05418a0044a51a36df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/mr/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/mr/firefox-106.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "0ec7ec41170b9741ee59fe853234d9370ce082b78ec85bcc5e2671fc80aee190"; + sha256 = "8be7fc6fea188481fc98eb1141afc3f283b716270f8281fa96fff774f2d55070"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ms/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ms/firefox-106.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "95a8ff900816b3bb4bbb5d3f69a1093cdd45031ef8ca4cd52d6947324e1f721e"; + sha256 = "c72395da50fb54753fe2488c0125e0d0b1f1c3e521538ba57f9c47a15c6b9743"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/my/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/my/firefox-106.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "56501c51e6901aa7fd806f716fe93b51e1725c5acd8709976edbb3c4e2584e9e"; + sha256 = "b2f56edaea8f9c4d4928edf913803cd2bd281af82d239b865c80e204ed7f00c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/nb-NO/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/nb-NO/firefox-106.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "10bf19ba28db4c310d9b2241ade1d13bb1ac8052f4fe701cb13d5b47fb43c93e"; + sha256 = "271e700ad7521a9f7a346b26e0ad80e2e912668eba81a0f16fb596d0a1e660b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ne-NP/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ne-NP/firefox-106.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "9c71d1e9aae97d131bde590bcd17b75966a2675980107e8687966f70be752b01"; + sha256 = "34b974927f7bc142a0cb1bb432e25ac5105ca1c3d56a7673262334cdd0888a8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/nl/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/nl/firefox-106.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "89343853986eb6f679c8e360f6fd0cf46a1631013016433f7c056c7cbf01d37d"; + sha256 = "d10248e4af2639ef157d834a72a5f863171a538454b9b78da42fdebf4c5897b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/nn-NO/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/nn-NO/firefox-106.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "413cff17d8944505b02faba4ae33bcd9aae68d996958c4aef5b1e22da6ba2725"; + sha256 = "cbe5407ee2f158bf859cb6bdb83dbefc7136aeb2c5aa14df6fb6a4ecd907e9bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/oc/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/oc/firefox-106.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "2fdefc22c58d4f6936326e1759695ed5569af73a41667194b3a7bcb5edeff093"; + sha256 = "59f81bf4f2ca3478434e53442ee910875de1b59c4e0efa81e0e57cb908a40ac9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/pa-IN/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/pa-IN/firefox-106.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "b36f30c0c47e9d4826d29ec14355b8a942e0672d6ff976eb6b4af203d165bb62"; + sha256 = "cb760a9bde61467ffc3f19401d1b6d20d70ee02cda9c1dc9d63b63dc88a79786"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/pl/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/pl/firefox-106.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "cbec3a5bb746011e3c9a4a2a51eb1941ac789f166b8cbe3d030c48ec6ec9682b"; + sha256 = "603606ad44552ddfb930527d8041eddfbb52159ac96914e1ee949594a4bea149"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/pt-BR/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/pt-BR/firefox-106.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "0e096edec0b201db30947b3b86f33df7bd22282df27b4db8c63af4ed430e0ba3"; + sha256 = "a603d3078db5f27db9a6af118001f904912e3a7eccdca862996de5af6d52d72b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/pt-PT/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/pt-PT/firefox-106.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "1fc9d4b019440ad92a947651fa4b5540761f48d63b38b10dd922dc178eebee27"; + sha256 = "222fa8104474c2cb83b289692e2d32575ad78c7aa3694ac079fbf2499c95d01b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/rm/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/rm/firefox-106.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "1f115c6f04b2bfe5664a3ec4765f3f5a3f18d5e78819cdb2a0ee77584d74011c"; + sha256 = "76c269dc85488160029d93a0726907e72d08b940b460a845533b969d444521ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ro/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ro/firefox-106.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "5230c030cb7e88f1491125c62cadd3bbaaeb9254fefe13f6cd88f159edccc985"; + sha256 = "932691e66c21d0037116b9250e927d51c3f53dbe146b20e6672034cc1f9234cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ru/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ru/firefox-106.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c9183946d255081f56de033070077eafc9715ee2dd05e112fdec4e63d6c72b6f"; + sha256 = "e12a4565d69e3e34f16f901539c706141f6be02d6d5382bdd49c22543ffc71be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/sco/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/sco/firefox-106.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "0efda19f180b52bf3bfd36162655be7b76b450fb90f5494e718522ad1dfafc81"; + sha256 = "9a19c5b3c9decc0d2f08f410b4e65312561878822d6e8cf5f7db0d2c976f2eb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/si/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/si/firefox-106.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "67986d63fa4e1c78a9a123130dc32553b023f685337ab18ed4f98b1c02a39f1a"; + sha256 = "4030598f2716585c30334151d4147b01b3ddf363c668ae971c52b779e0bf7ffa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/sk/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/sk/firefox-106.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "dabab0ee872bc6bfd5206a6be8b75b829ca6b180fe96b73e14c4a3046dcffb54"; + sha256 = "c247c6b1657e55c27ba10bd5256eb5d68a0ae51aa0a53c98d5eb03430c9401db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/sl/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/sl/firefox-106.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "fc932bf0ccc54960f1969e9c37bf924a450af14da0e28c36ed1d098111dc1eb8"; + sha256 = "5c854b94c2c84136ac320787f04702b4334d2d52e95a97bf80fe014a06df0591"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/son/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/son/firefox-106.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "aae79353a35890e8a359071e7bf58a09b2c1bca729a8b0cd1d0cc9b42080e6ce"; + sha256 = "c8ea64963e41d236541ad5e9eaabc6c87e1da684ad211627134b48c193ef9004"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/sq/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/sq/firefox-106.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5182ee1659f67c3e5f3ccaeedbe4ede39d80e1c82fe8ef87b8a885333b009fa9"; + sha256 = "86a58fc53be72682e686d7bd317117b93b1a074df4a2a4eaea781a31f295f246"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/sr/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/sr/firefox-106.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "cce4e2007b6fd7c53378026dde4fa8fbfd9f2d55e238b95241befb7df30fdd70"; + sha256 = "5241ad256931a6a59c40f2bf8478676951b6030ab89965c1085289cfbe85d62f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/sv-SE/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/sv-SE/firefox-106.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "844235c7a17f0c48ed5904fad6ec641595985d7095ed8f779845231ad904852b"; + sha256 = "55ccc7815c95a1f023cc0a0771d9ce8b7f5e309f5ecc5dd56b9a85d2c3b46f18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/szl/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/szl/firefox-106.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "f9adeccfd1c59d00dc508826ab7741da188c9e065385f323cabcc5829cec3612"; + sha256 = "9125a91d898a510ee268398684de1ff34b49b13e8a7661bc4d90ffdacf3e6252"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ta/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ta/firefox-106.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "1ca7237bb2c4016dfa24b4e4b4fdf887bf323c621ad0f5fbcd683ca7bf66499a"; + sha256 = "911c397b47ff1d3ba9e1e990d1c08e9ad6d3a092e09f8cbdca3537c81b386fe7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/te/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/te/firefox-106.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "691a55224707bd8ad416cfe3d3310b0c043cff65f8d85eccb46009983b18494f"; + sha256 = "25627e0fb575426dffda0d3c87e2f444dfff2d0b3cc2219548a033a02e990f1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/th/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/th/firefox-106.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "8f91074d15c87fa6ea7141264d51893969a2e3215bdf759c431300191274cb38"; + sha256 = "d44972ab642179ccfa6de2ec6cc6d6a4332362e23167c4a1de2f2f011ff2448f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/tl/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/tl/firefox-106.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "3946e9c605f0239ca2ca70a0a2d3bcc1d4fd1fa0821a649516cea16e46c5030f"; + sha256 = "9a5775198e4305242211a2e44ff8dbbf3b78b02b227887e3b5704af770641f50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/tr/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/tr/firefox-106.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "a0afd4098f8e450feb60214542d98f08bd1a7a6bc616c4d38f7eeae0c370bf57"; + sha256 = "ffabcb2913e2bcc678696d073170377f30f9559c3c8a0d3a7a6b16e74c4c3ac7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/trs/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/trs/firefox-106.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "1f85210d6a0d248d44db8acebf7ccd6c8a8c2b7605cc8279dc7cb7ee1f1075d9"; + sha256 = "b5d3a5d575c04ae36290a5d5142ef7f993674d2861486bec2fa1bd24520eb5e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/uk/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/uk/firefox-106.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "ad624f6dedc3dbcda79a043af431be38ddc7e05111315d100dfb3dd67486c716"; + sha256 = "3b0b32b94d9e0258c7555b09c38c71b22c6c22ef06dcf005400d0bd6a766d5d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/ur/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/ur/firefox-106.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "cd6ebe9d4dbe7c8d8ec2f24be62775e756cf3c9307d9c2fc7964a97b6db70eea"; + sha256 = "3915095ea690e0bba685e71da49b689561a122fb3914ee4ed2430d991104f16e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/uz/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/uz/firefox-106.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "fd88db7111c8a3cb73eca783b75bf9340238009d6be12ff2e061d6a71a6b548e"; + sha256 = "73e9355528be81af00fb55143f6491c798213be197b7fcfe200e80d1075c3282"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/vi/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/vi/firefox-106.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d3d1d0192813c05d61f370ef99669d014bc2b9999baa4d7aaa9af411911a75c4"; + sha256 = "0a36154fda9cd6877a2068474da60d859cc1338c38d1897ac1d9085d73bed0df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/xh/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/xh/firefox-106.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "dba3179fc89f3de7b06be8279b1144cb852679f3945ba5603c37c134f6c07de6"; + sha256 = "1befeacf0ad002e6cf7cf2ff8d57277eac4d05f2df68dd2f97ac4063cbf5c573"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/zh-CN/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/zh-CN/firefox-106.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d3011cdd8213d70c3adfcfabeb9f970a127ebc1e00b2ce6e2524ae55f31870d0"; + sha256 = "8c607afb1a79b9e3af94cbd4a1f847c8aef5fb4dbc31157a49ec52b89515d129"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0/linux-i686/zh-TW/firefox-106.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.1/linux-i686/zh-TW/firefox-106.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "1300be1465e518ff2adc273fdd1650216e5f8171407901b95019cb0ba47d5198"; + sha256 = "a5fc3a0d052781f8511da1ba585d7fa7e0ab0786d8eef596bb1744fdc9600e13"; } ]; } From a3b07e3693462f656e5473e6b1a2a15e20c24c2a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 10 Oct 2022 08:05:47 +0200 Subject: [PATCH 033/106] nixosTests.nscd: update subtest name and comment test_host_lookups can be used against different daemons speaking the nscd protocol. --- nixos/tests/nscd.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/nscd.nix b/nixos/tests/nscd.nix index 7bb6d90c3d4e..23f03b6d8262 100644 --- a/nixos/tests/nscd.nix +++ b/nixos/tests/nscd.nix @@ -40,9 +40,10 @@ in "systemd-run --pty --property=Type=oneshot --property=DynamicUser=yes --property=User=iamatest whoami" ) - # Test resolution of somehost.test with getent', to make sure we go via nscd + # Test resolution of somehost.test with getent', to make sure we go via + # nscd protocol def test_host_lookups(): - with subtest("host lookups via nscd"): + with subtest("host lookups via nscd protocol"): # ahosts output = machine.succeed("${getent'} ahosts somehost.test") assert "192.0.2.1" in output From 7987b41d44b22c865cd4360a4e20c8834ca57872 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 7 Oct 2022 10:47:45 +0200 Subject: [PATCH 034/106] nixos/nscd: nixpkgs-fmt --- nixos/modules/services/system/nscd.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index 0a59feb70664..7980ad0aed79 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -51,7 +51,8 @@ in package = mkOption { type = types.package; - default = if pkgs.stdenv.hostPlatform.libc == "glibc" + default = + if pkgs.stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc.bin else pkgs.glibc.bin; defaultText = lib.literalExpression '' @@ -77,10 +78,11 @@ in group = cfg.group; }; - users.groups.${cfg.group} = {}; + users.groups.${cfg.group} = { }; systemd.services.nscd = - { description = "Name Service Cache Daemon"; + { + description = "Name Service Cache Daemon"; before = [ "nss-lookup.target" "nss-user-lookup.target" ]; wants = [ "nss-lookup.target" "nss-user-lookup.target" ]; @@ -106,7 +108,8 @@ in # sill want to read their configuration files after the privilege drop # and so users can set the owner of those files to the nscd user. serviceConfig = - { ExecStart = "!@${cfg.package}/bin/nscd nscd"; + { + ExecStart = "!@${cfg.package}/bin/nscd nscd"; Type = "forking"; User = cfg.user; Group = cfg.group; @@ -120,7 +123,8 @@ in PIDFile = "/run/nscd/nscd.pid"; Restart = "always"; ExecReload = - [ "${cfg.package}/bin/nscd --invalidate passwd" + [ + "${cfg.package}/bin/nscd --invalidate passwd" "${cfg.package}/bin/nscd --invalidate group" "${cfg.package}/bin/nscd --invalidate hosts" ]; From 308548f2533154a2c07e476a7851f9ede4c9db61 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 4 Oct 2022 11:10:02 +0200 Subject: [PATCH 035/106] nsncd: init at unstable-2021-10-20 This is currently pointing to a custom branch that contains the missing request types from https://github.com/twosigma/nsncd/issues/37, as well as Type=notify support. --- pkgs/os-specific/linux/nsncd/default.nix | 30 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/os-specific/linux/nsncd/default.nix diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/os-specific/linux/nsncd/default.nix new file mode 100644 index 000000000000..f2005f50a580 --- /dev/null +++ b/pkgs/os-specific/linux/nsncd/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, nix-gitignore +}: + +rustPlatform.buildRustPackage rec { + pname = "nsncd"; + version = "unstable-2021-10-20"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nsncd"; + rev = "b9425070bb308565a6e4dc5aefd568952a07a4ed"; + hash = "sha256-ZjInzPJo+PWAM2gAKhlasLXiqo+2Df4DIXpNwtqQVc8="; + }; + + cargoSha256 = "sha256-hxdI+HHB0PB/zDMI21Pg5Xr9mTDn4T+OcAAenUox4bs="; + + meta = with lib; { + description = "the name service non-caching daemon"; + longDescription = '' + nsncd is a nscd-compatible daemon that proxies lookups, without caching. + ''; + homepage = "https://github.com/twosigma/nsncd"; + license = licenses.asl20; + maintainers = with maintainers; [ flokli ninjatrappeur ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29ec62363efb..4ab17ab5e7a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36594,6 +36594,8 @@ with pkgs; nhentai = callPackage ../applications/misc/nhentai { }; + nsncd = callPackage ../os-specific/linux/nsncd { }; + nvd = callPackage ../tools/package-management/nvd { }; solfege = python3Packages.callPackage ../misc/solfege { }; From 1fee002c9b20caed191b1688dbab1a6a790fb711 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Oct 2022 11:41:13 +0000 Subject: [PATCH 036/106] just: 1.5.0 -> 1.6.0 --- pkgs/development/tools/just/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index e5b9aa90f002..65b80e3d915f 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - hash = "sha256-x/4+5m/FiqH68xTHP/cyPDbQ1DtpBXJr32iTq/9GWwI="; + hash = "sha256-4ilq/ptDYjfXmkLqky8z8iwfvg9JgdP+uADcv/zeHWs="; }; - cargoSha256 = "sha256-EjX2U+H8sw+v+NEa5uCxIqG8HDl2P6PjpvWrhuF9Jr0="; + cargoSha256 = "sha256-rugnbuzynQ4lBy977e04xAvueUbViIuFSzXlQkiwM00="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 0e891e83fd9201da9e507c5ad8e20c966d19252f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Oct 2022 11:49:34 +0000 Subject: [PATCH 037/106] kubemq-community: 2.3.1 -> 2.3.2 --- pkgs/servers/kubemq-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/servers/kubemq-community/default.nix index 3e739b09a25f..9a3487fa0e95 100644 --- a/pkgs/servers/kubemq-community/default.nix +++ b/pkgs/servers/kubemq-community/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "kubemq-community"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "kubemq-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d5ZhQFVh7yzZsozlMaxkLMGdLraCFAvuQvQiSdF56wY="; + sha256 = "sha256-uomC3bO+u46LvLapXXzx57nY5DdwBk7sWXuBX1Ntrz4="; }; CGO_ENABLED=0; From abdcfec3a0ebe00a8fd2b3689bd8b2f3920886eb Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 13 Sep 2022 14:12:19 +0300 Subject: [PATCH 038/106] nixos/peertube: add nginx configuration --- nixos/modules/services/web-apps/peertube.nix | 288 ++++++++++++++++++- 1 file changed, 285 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index 1ac6c15dace9..a42d1a1a932e 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -67,6 +67,12 @@ let node ~/dist/server/tools/peertube.js $@ ''; + nginxCommonHeaders = '' + add_header Access-Control-Allow-Origin '*'; + add_header Access-Control-Allow-Methods 'GET, OPTIONS'; + add_header Access-Control-Allow-Headers 'Range,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type'; + ''; + in { options.services.peertube = { enable = lib.mkEnableOption (lib.mdDoc "Enable Peertube’s service"); @@ -145,6 +151,12 @@ in { description = lib.mdDoc "Configuration for peertube."; }; + configureNginx = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc "Configure nginx as a reverse proxy for peertube."; + }; + database = { createLocally = lib.mkOption { type = lib.types.bool; @@ -351,6 +363,8 @@ in { systemd.tmpfiles.rules = [ "d '/var/lib/peertube/config' 0700 ${cfg.user} ${cfg.group} - -" "z '/var/lib/peertube/config' 0700 ${cfg.user} ${cfg.group} - -" + "d '/var/lib/peertube/www' 0750 ${cfg.user} ${cfg.group} - -" + "z '/var/lib/peertube/www' 0750 ${cfg.user} ${cfg.group} - -" ]; systemd.services.peertube-init-db = lib.mkIf cfg.database.createLocally { @@ -410,8 +424,11 @@ in { password: '$(cat ${cfg.smtp.passwordFile})' ''} EOF - ln -sf ${cfg.package}/config/default.yaml /var/lib/peertube/config/default.yaml + umask 027 ln -sf ${configFile} /var/lib/peertube/config/production.json + ln -sf ${cfg.package}/config/default.yaml /var/lib/peertube/config/default.yaml + ln -sf ${cfg.package}/client/dist -T /var/lib/peertube/www/client + ln -sf ${cfg.settings.storage.client_overrides} -T /var/lib/peertube/www/client-overrides npm start ''; serviceConfig = { @@ -441,6 +458,269 @@ in { } // cfgService; }; + services.nginx = lib.mkIf cfg.configureNginx { + enable = true; + virtualHosts."${cfg.localDomain}" = { + root = "/var/lib/peertube"; + + # Application + locations."/" = { + tryFiles = "/dev/null @api"; + priority = 1110; + }; + + locations."= /api/v1/videos/upload-resumable" = { + tryFiles = "/dev/null @api"; + priority = 1120; + + extraConfig = '' + client_max_body_size 0; + proxy_request_buffering off; + ''; + }; + + locations."~ ^/api/v1/videos/(upload|([^/]+/studio/edit))$" = { + tryFiles = "/dev/null @api"; + root = cfg.settings.storage.tmp; + priority = 1130; + + extraConfig = '' + client_max_body_size 12G; + add_header X-File-Maximum-Size 8G always; + ''; + }; + + locations."~ ^/api/v1/(videos|video-playlists|video-channels|users/me)" = { + tryFiles = "/dev/null @api"; + priority = 1140; + + extraConfig = '' + client_max_body_size 6M; + add_header X-File-Maximum-Size 4M always; + ''; + }; + + locations."@api" = { + proxyPass = "http://127.0.0.1:${toString cfg.listenHttp}"; + priority = 1150; + + extraConfig = '' + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + + proxy_connect_timeout 10m; + + proxy_send_timeout 10m; + proxy_read_timeout 10m; + + client_max_body_size 100k; + send_timeout 10m; + ''; + }; + + # Websocket + locations."/socket.io" = { + tryFiles = "/dev/null @api_websocket"; + priority = 1210; + }; + + locations."/tracker/socket" = { + tryFiles = "/dev/null @api_websocket"; + priority = 1220; + + extraConfig = '' + proxy_read_timeout 15m; + ''; + }; + + locations."@api_websocket" = { + proxyPass = "http://127.0.0.1:${toString cfg.listenHttp}"; + priority = 1230; + + extraConfig = '' + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + + proxy_http_version 1.1; + ''; + }; + + # Bypass PeerTube for performance reasons. + locations."~ ^/client/(assets/images/(icons/icon-36x36\.png|icons/icon-48x48\.png|icons/icon-72x72\.png|icons/icon-96x96\.png|icons/icon-144x144\.png|icons/icon-192x192\.png|icons/icon-512x512\.png|logo\.svg|favicon\.png|default-playlist\.jpg|default-avatar-account\.png|default-avatar-account-48x48\.png|default-avatar-video-channel\.png|default-avatar-video-channel-48x48\.png))$" = { + tryFiles = "/www/client-overrides/$1 /www/client/$1 $1"; + priority = 1310; + }; + + locations."~ ^/client/(.*\.(js|css|png|svg|woff2|otf|ttf|woff|eot))$" = { + alias = "${cfg.package}/client/dist/$1"; + priority = 1320; + extraConfig = '' + add_header Cache-Control 'public, max-age=604800, immutable'; + ''; + }; + + locations."~ ^/lazy-static/(avatars|banners)/" = { + tryFiles = "$uri @api"; + root = cfg.settings.storage.avatars; + priority = 1330; + extraConfig = '' + if ($request_method = 'OPTIONS') { + ${nginxCommonHeaders} + add_header Access-Control-Max-Age 1728000; + add_header Cache-Control 'no-cache'; + add_header Content-Type 'text/plain charset=UTF-8'; + add_header Content-Length 0; + return 204; + } + + ${nginxCommonHeaders} + add_header Cache-Control 'public, max-age=7200'; + + rewrite ^/lazy-static/avatars/(.*)$ /$1 break; + rewrite ^/lazy-static/banners/(.*)$ /$1 break; + ''; + }; + + locations."^~ /lazy-static/previews/" = { + tryFiles = "$uri @api"; + root = cfg.settings.storage.previews; + priority = 1340; + extraConfig = '' + if ($request_method = 'OPTIONS') { + ${nginxCommonHeaders} + add_header Access-Control-Max-Age 1728000; + add_header Cache-Control 'no-cache'; + add_header Content-Type 'text/plain charset=UTF-8'; + add_header Content-Length 0; + return 204; + } + + ${nginxCommonHeaders} + add_header Cache-Control 'public, max-age=7200'; + + rewrite ^/lazy-static/previews/(.*)$ /$1 break; + ''; + }; + + locations."^~ /static/thumbnails/" = { + tryFiles = "$uri @api"; + root = cfg.settings.storage.thumbnails; + priority = 1350; + extraConfig = '' + if ($request_method = 'OPTIONS') { + ${nginxCommonHeaders} + add_header Access-Control-Max-Age 1728000; + add_header Cache-Control 'no-cache'; + add_header Content-Type 'text/plain charset=UTF-8'; + add_header Content-Length 0; + return 204; + } + + ${nginxCommonHeaders} + add_header Cache-Control 'public, max-age=7200'; + + rewrite ^/static/thumbnails/(.*)$ /$1 break; + ''; + }; + + locations."^~ /static/redundancy/" = { + tryFiles = "$uri @api"; + root = cfg.settings.storage.redundancy; + priority = 1360; + extraConfig = '' + if ($request_method = 'OPTIONS') { + ${nginxCommonHeaders} + add_header Access-Control-Max-Age 1728000; + add_header Content-Type 'text/plain charset=UTF-8'; + add_header Content-Length 0; + return 204; + } + if ($request_method = 'GET') { + ${nginxCommonHeaders} + + access_log off; + } + aio threads; + sendfile on; + sendfile_max_chunk 1M; + + limit_rate_after 5M; + + set $peertube_limit_rate 800k; + set $limit_rate $peertube_limit_rate; + + rewrite ^/static/redundancy/(.*)$ /$1 break; + ''; + }; + + locations."^~ /static/streaming-playlists/" = { + tryFiles = "$uri @api"; + root = cfg.settings.storage.streaming_playlists; + priority = 1370; + extraConfig = '' + if ($request_method = 'OPTIONS') { + ${nginxCommonHeaders} + add_header Access-Control-Max-Age 1728000; + add_header Content-Type 'text/plain charset=UTF-8'; + add_header Content-Length 0; + return 204; + } + if ($request_method = 'GET') { + ${nginxCommonHeaders} + + access_log off; + } + + aio threads; + sendfile on; + sendfile_max_chunk 1M; + + limit_rate_after 5M; + + set $peertube_limit_rate 5M; + set $limit_rate $peertube_limit_rate; + + rewrite ^/static/streaming-playlists/(.*)$ /$1 break; + ''; + }; + + locations."~ ^/static/webseed/" = { + tryFiles = "$uri @api"; + root = cfg.settings.storage.videos; + priority = 1380; + extraConfig = '' + if ($request_method = 'OPTIONS') { + ${nginxCommonHeaders} + add_header Access-Control-Max-Age 1728000; + add_header Content-Type 'text/plain charset=UTF-8'; + add_header Content-Length 0; + return 204; + } + if ($request_method = 'GET') { + ${nginxCommonHeaders} + + access_log off; + } + + aio threads; + sendfile on; + sendfile_max_chunk 1M; + + limit_rate_after 5M; + + set $peertube_limit_rate 800k; + set $limit_rate $peertube_limit_rate; + + rewrite ^/static/webseed/(.*)$ /$1 break; + ''; + }; + }; + }; + services.postgresql = lib.mkIf cfg.database.createLocally { enable = true; }; @@ -476,8 +756,10 @@ in { (lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];}) ]; - users.groups = lib.optionalAttrs (cfg.group == "peertube") { - peertube = { }; + users.groups = { + ${cfg.group} = { + members = lib.optional cfg.configureNginx config.services.nginx.user; + }; }; }; } From 661294831548257084f2b09ecfe698dd3b4ec00d Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Wed, 19 Oct 2022 21:42:57 +0300 Subject: [PATCH 039/106] rfc: init at 0.2.6 --- pkgs/tools/misc/rfc/default.nix | 48 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/tools/misc/rfc/default.nix diff --git a/pkgs/tools/misc/rfc/default.nix b/pkgs/tools/misc/rfc/default.nix new file mode 100644 index 000000000000..e58c35fef3bd --- /dev/null +++ b/pkgs/tools/misc/rfc/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, curl +, installShellFiles +, makeWrapper +}: + +stdenvNoCC.mkDerivation rec { + pname = "rfc"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "bfontaine"; + repo = "rfc"; + rev = "v${version}"; + hash = "sha256-dfaeTdJiJuKp8/k6LBP+RC60gTRHfHR5hhLD4ZWJufE="; + }; + + nativeBuildInputs = [ installShellFiles makeWrapper ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin rfc + wrapProgram $out/bin/rfc \ + --prefix PATH : ${lib.makeBinPath [ curl ]} + installManPage man/rfc.1 + + runHook postInstall + ''; + + meta = with lib; { + description = "A tool to read RFCs from the command line"; + longDescription = '' + rfc is a little tool written in Bash to read RFCs from the command-line. + It fetches RFCs and drafts from the Web and caches them locally. + ''; + homepage = "https://github.com/bfontaine/rfc"; + changelog = "https://github.com/bfontaine/rfc/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2194ba1c97..6b6463aaaf9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36742,6 +36742,8 @@ with pkgs; renderizer = callPackage ../development/tools/renderizer {}; + rfc = callPackage ../tools/misc/rfc { }; + rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker { From 1a73877305f32ff158173878dda6b86f378ff3c8 Mon Sep 17 00:00:00 2001 From: Dave Nicponski Date: Wed, 12 Oct 2022 19:47:36 -0400 Subject: [PATCH 040/106] Tweak nginx config for Let's Encrypt ACME challenges MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, this is using a "URI prefix match", but per nginx docs, ``` [...] the location with the longest matching prefix is selected and remembered. Then regular expressions are checked, in the order of their appearance in the configuration file. The search of regular expressions terminates on the first match, and the corresponding configuration is used. If no match with a regular expression is found then the configuration of the prefix location remembered earlier is used. ``` which means a config like this (from wordpress service) will override that ``` locations = { "~ /\\." = { priority = 800; extraConfig = "deny all;"; }; }; ``` 😱 Luckily, from nginx docs: ``` If the longest matching prefix location has the “^~” modifier then regular expressions are not checked. ``` Whew! --- nixos/modules/services/web-servers/nginx/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index aa782b4267e8..9cbac370612f 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -275,7 +275,10 @@ let redirectListen = filter (x: !x.ssl) defaultListen; acmeLocation = optionalString (vhost.enableACME || vhost.useACMEHost != null) '' - location /.well-known/acme-challenge { + # Rule for legitimate ACME Challenge requests (like /.well-known/acme-challenge/xxxxxxxxx) + # We use ^~ here, so that we don't check any regexes (which could + # otherwise easily override this intended match accidentally). + location ^~ /.well-known/acme-challenge/ { ${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"} ${optionalString (vhost.acmeRoot != null) "root ${vhost.acmeRoot};"} auth_basic off; From f59dde323997ff5a00ce001b7d91192f4d7309a2 Mon Sep 17 00:00:00 2001 From: Deadbeef Date: Sun, 16 Oct 2022 00:39:27 +0800 Subject: [PATCH 041/106] libirc: init at 2022-10-16 --- pkgs/development/libraries/libirc/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/libirc/default.nix diff --git a/pkgs/development/libraries/libirc/default.nix b/pkgs/development/libraries/libirc/default.nix new file mode 100644 index 000000000000..368cd7e1d859 --- /dev/null +++ b/pkgs/development/libraries/libirc/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, cmake, qtbase }: + +stdenv.mkDerivation rec { + pname = "libirc"; + version = "unstable-2022-10-15"; + + src = fetchFromGitHub { + owner = "grumpy-irc"; + repo = "libirc"; + rev = "734082ffffb6d6744070c75587159d927342edea"; + sha256 = "Qi/YKLlau0rdQ9XCMyreQdv4ctQWHFIoE3YlW6QnbSI="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DQT5_BUILD=1" + "-DQt5Core_DIR=${qtbase.dev}/lib/cmake/Qt5Core" + "-DQt5Network_DIR=${qtbase.dev}/lib/cmake/Qt5Network" + ]; + + preFixup = '' + mkdir -p $out/libirc/libirc{,client} + cp ../libirc/*.h $out/libirc/libirc + cp ../libircclient/*.h $out/libirc/libircclient + ''; + + meta = with lib; { + description = "C++ IRC library written in Qt with support for data serialization"; + homepage = "https://github.com/grumpy-irc/libirc"; + license = licenses.lgpl3; + maintainers = with maintainers; [ fee1-dead ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5760db7071a5..3a0d2c121076 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8787,6 +8787,8 @@ with pkgs; libipfix = callPackage ../development/libraries/libipfix { }; + libirc = libsForQt5.callPackage ../development/libraries/libirc { }; + libircclient = callPackage ../development/libraries/libircclient { }; libiscsi = callPackage ../development/libraries/libiscsi { }; From 075649e87cf424cbbe1d86a94b07ec1de2fb20ec Mon Sep 17 00:00:00 2001 From: Deadbeef Date: Sun, 16 Oct 2022 00:40:29 +0800 Subject: [PATCH 042/106] huggle: init at 3.4.10 --- .../misc/huggle/00-remove-third-party.patch | 25 ++++++++ .../misc/huggle/01-extensions.patch | 13 ++++ pkgs/applications/misc/huggle/default.nix | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 103 insertions(+) create mode 100644 pkgs/applications/misc/huggle/00-remove-third-party.patch create mode 100644 pkgs/applications/misc/huggle/01-extensions.patch create mode 100644 pkgs/applications/misc/huggle/default.nix diff --git a/pkgs/applications/misc/huggle/00-remove-third-party.patch b/pkgs/applications/misc/huggle/00-remove-third-party.patch new file mode 100644 index 000000000000..e1295e5f54fa --- /dev/null +++ b/pkgs/applications/misc/huggle/00-remove-third-party.patch @@ -0,0 +1,25 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index a37976e..5669366 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -59,16 +59,12 @@ if(NOT MINGW AND WIN32) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/Debug) + endif() + +-add_subdirectory(3rd/libirc/libirc libirc) +-add_subdirectory(3rd/libirc/libircclient libircclient) ++include_directories(@libirc_includes@) + + # YAML +-option(YAML_CPP_BUILD_TOOLS "Disable tests" OFF) +-option(YAML_CPP_BUILD_TESTS "Enable testing" OFF) +-option(YAML_CPP_BUILD_TOOLS "Enable parse tools" OFF) +-option(BUILD_SHARED_LIBS "Build as shared" ON) +-include_directories("3rd/yaml-cpp/include/") +-add_subdirectory(3rd/yaml-cpp) ++find_package(YAML-CPP 0.6.3 QUIET) ++include_directories(YAML_CPP_INCLUDE_DIR) ++ + if (HUGGLE_EXT) + if(NOT MINGW AND WIN32) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/Release/extensions) diff --git a/pkgs/applications/misc/huggle/01-extensions.patch b/pkgs/applications/misc/huggle/01-extensions.patch new file mode 100644 index 000000000000..aa36bb0356f7 --- /dev/null +++ b/pkgs/applications/misc/huggle/01-extensions.patch @@ -0,0 +1,13 @@ +diff --git a/src/huggle_core/definitions_prod.hpp b/src/huggle_core/definitions_prod.hpp +index 1fc5b1fb..17881ade 100644 +--- a/src/huggle_core/definitions_prod.hpp ++++ b/src/huggle_core/definitions_prod.hpp +@@ -216,7 +216,7 @@ namespace std { typedef decltype(nullptr) nullptr_t; } + #define HUGGLE_GLOBAL_EXTENSION_PATH QCoreApplication::applicationDirPath() + "/extensions" + #elif defined __linux__ + #define HUGGLE_UPDATER_PLATFORM_TYPE "linux" +- #define HUGGLE_GLOBAL_EXTENSION_PATH "/usr/local/share/huggle/extensions" ++ #define HUGGLE_GLOBAL_EXTENSION_PATH "@out@/share/huggle/extensions" + #elif defined HUGGLE_WIN + // This is needed by yaml cpp library, otherwise it won't build with MSVC + #define YAML_CPP_DLL diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix new file mode 100644 index 000000000000..85c65a0eeb4a --- /dev/null +++ b/pkgs/applications/misc/huggle/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, ncurses +, which +, cmake +, unzip +, wrapQtAppsHook +, qtwebengine +, libyamlcpp +, libirc +}: + +stdenv.mkDerivation rec { + pname = "huggle"; + version = "3.4.10"; + + src = fetchFromGitHub { + owner = "huggle"; + repo = "huggle3-qt-lx"; + rev = version; + sha256 = "UzoX4kdzYU50W0MUhfpo0HaSfvG3eINNC8u5t/gKuqI="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + wrapQtAppsHook + pkg-config + which + cmake + ]; + buildInputs = [ ncurses libyamlcpp qtwebengine libirc ]; + + patches = [ ./00-remove-third-party.patch ./01-extensions.patch ]; + postPatch = '' + rm -r src/3rd + echo ${version} > src/huggle_core/version.txt + substituteInPlace src/huggle_core/definitions_prod.hpp --subst-var out + substituteInPlace src/CMakeLists.txt --replace '@libirc_includes@' '${libirc.out}' + ''; + + cmakeFlags = [ + "-S" "/build/source/src" + "-DCMAKE_BUILD_TYPE=None" + "-DINSTALL_DATA_DIR=bin" + "-DQT5_BUILD=ON" + "-DWEB_ENGINE=ON" + "-DBUILD_SHARED_LIBS=OFF" + "-Wno-dev" + "-DHUGGLE_EXT=TRUE" + ]; + + installTargets = [ "install" ]; + + meta = with lib; { + description = "Anti-vandalism tool for use on MediaWiki-based projects"; + homepage = "https://github.com/huggle/huggle3-qt-lx"; + license = licenses.gpl3Only; + maintainers = [ maintainers.fee1-dead ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a0d2c121076..3c454f058f6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28929,6 +28929,8 @@ with pkgs; haunt = callPackage ../applications/misc/haunt { }; + huggle = libsForQt5.callPackage ../applications/misc/huggle {}; + hugo = callPackage ../applications/misc/hugo { buildGoModule = buildGo119Module; }; From 3c70d1e68a606bf4fd1491ecb69982383ca8ae04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Oct 2022 15:56:38 +0000 Subject: [PATCH 043/106] odo: 2.5.1 -> 3.0.0 --- pkgs/applications/networking/cluster/odo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/odo/default.nix b/pkgs/applications/networking/cluster/odo/default.nix index a91ac4ce33e4..10ac47e2ff66 100644 --- a/pkgs/applications/networking/cluster/odo/default.nix +++ b/pkgs/applications/networking/cluster/odo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "odo"; - version = "2.5.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "redhat-developer"; repo = "odo"; rev = "v${version}"; - sha256 = "sha256-+UvG+aDji/GtkXdt+xZB06j6NxjeK2nhBjle5K+lx/A="; + sha256 = "sha256-CtlT6nUh0oqjJSWaIqAgu9CNGVHcf+uLNWBCl950Kus="; }; vendorSha256 = null; From c295f7a4d4e11eea82b5fdb4099fac300a926661 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Oct 2022 16:01:59 +0000 Subject: [PATCH 044/106] okteto: 2.8.0 -> 2.8.1 --- pkgs/development/tools/okteto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index c4a70272fada..8536362dacad 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - sha256 = "sha256-7M/axnl6K3yrfNwdp3gkKE3c0m0zgDfW8FV7BixIxBM="; + sha256 = "sha256-YTz4W+txxs1G6NukckWkOlGwlOrS4LgMly8ilmgt5GE="; }; vendorSha256 = "sha256-/oR8R0/GC6cgCqXinCRH5x93qgRPeQmxHgZZGshrDr4="; From 373a013cab50605fe0dc8c3dab5c46e09fc9aa26 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Thu, 20 Oct 2022 19:44:28 +0200 Subject: [PATCH 045/106] claws-mail: 4.1.0 -> 4.1.1 - The Perl fix is now upstream and could be removed. - A new mechanism to determine the version requires git and other tools and can easily be replaced by the already known version. https://git.claws-mail.org/?p=claws.git;a=blob_plain;f=RELEASE_NOTES;hb=c8ddd32fa2c9bb9e61a34a3550d72cd67b36da21 --- .../networking/mailreaders/claws-mail/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 1e47c68526ad..f896cc43867c 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -98,22 +98,17 @@ let ]; in stdenv.mkDerivation rec { pname = "claws-mail"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { url = "https://claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - hash = "sha256-DhqcoNuNKp4FiuMM3H/JGXeSFOw8Vu4Min+IzCOBeo4="; + hash = "sha256-sYnnAMGJb14N6wt21L+oIOt6wZNe4Qqpr7raPPU6A0Q="; }; outputs = [ "out" "dev" ]; patches = [ ./mime.patch - # fix build with perl 5.36+ - (fetchurl { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/claws-mail/trunk/20cope_with_fix_for_1009149.patch"; - hash = "sha256-/WBslmoFvja2v2GEBntxvNtG0I3xtkUUqXO5gl5pqqs="; - }) ]; preConfigure = '' @@ -124,6 +119,8 @@ in stdenv.mkDerivation rec { ''; postPatch = '' + substituteInPlace configure.ac \ + --replace 'm4_esyscmd([./get-git-version])' '${version}' substituteInPlace src/procmime.c \ --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; From 2392241c0b54fba32d02ecac8cdfa8bcca7d2376 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 20 Oct 2022 22:05:06 +0300 Subject: [PATCH 046/106] nginxStable: 1.22.0 -> 1.22.1 --- pkgs/servers/http/nginx/stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index 5d4db3a403b6..eb3c90aa7c6c 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix args { - version = "1.22.0"; - sha256 = "0lzb4sn8hv491zad9kbpvka3m5ayjf1pxqbwllri980idyd5cgdk"; + version = "1.22.1"; + sha256 = "sha256-nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE="; } From a9cbc65ad0ad7c3059730cffde59cc4322267b07 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 20 Oct 2022 22:07:08 +0300 Subject: [PATCH 047/106] nginxMainline: 1.23.1 -> 1.23.2 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index ba84963a763c..9b1ddf5da275 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.23.1"; - sha256 = "sha256-Xu4b0cI+O5R3pFUy8fNq5heLQ9VxqWB+aVPO8m1d8eI="; + version = "1.23.2"; + sha256 = "sha256-qAzCctPXKq7nCqi1F7SGKmNcAlZ5BDTb/E1hipmbC0Y="; } From 9d676cb01d8254197d85f4771f924065d14149e5 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 20 Oct 2022 22:10:09 +0300 Subject: [PATCH 048/106] nginxQuic: 3550b00d9dc8 -> 3be953161026 --- pkgs/servers/http/nginx/quic.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index 3d151a9f3500..de5eea45c46d 100644 --- a/pkgs/servers/http/nginx/quic.nix +++ b/pkgs/servers/http/nginx/quic.nix @@ -6,8 +6,8 @@ callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; - rev = "3550b00d9dc8"; # branch=quic - sha256 = "sha256-JtE5FO4FHlDuqXd4UTXXPIFAdyyhQbOSMTT0NXh2iH4="; + rev = "3be953161026"; # branch=quic + sha256 = "sha256-maWQ0RPI2pe6L8QL7TQ1YJts5ZJHhiTYG9sdwINGMDA="; }; preConfigure = '' @@ -19,5 +19,5 @@ callPackage ./generic.nix args { "--with-stream_quic_module" ]; - version = "1.23.1-quic"; + version = "1.23.2-quic"; } From 748f6d8b0090ea111ab102f8d2e73d70d374a5a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 Oct 2022 21:51:20 +0200 Subject: [PATCH 049/106] python310Packages.plugwise: 0.25.2 -> 0.25.3 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 225dac5c0800..8852462761f9 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.25.2"; + version = "0.25.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-wHlIBysNZ0TmgdEL6sT+rqaAcH772V7k16rua2UEEso="; + sha256 = "sha256-vfdU0jzbfKJbIN343CWIwCK+tYt3ScgPhjq0+9NSiL8="; }; propagatedBuildInputs = [ From 41522f66493ef26621aed68366b421688d0af301 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Thu, 20 Oct 2022 22:22:21 +0200 Subject: [PATCH 050/106] gnomeExtensions.dash-to-dock: 74 -> 75 --- pkgs/desktops/gnome/extensions/dash-to-dock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index 5f3a2943f812..69318241c1a8 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-dash-to-dock"; - version = "74"; + version = "75"; # Temporarily switched to commit hash because stable version is buggy. src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; rev = "extensions.gnome.org-v${version}"; - sha256 = "3WNm9kX76+qmn9KWLSKwxmHHpc21kWHrBW9266TOKZ0="; + sha256 = "sha256-vHXNhJgty7x4Ef6jxUI29KYpadC3jtUqE1Nt1dWYr24="; }; nativeBuildInputs = [ From b12821971d907a8789af1382e54716163e250fb7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 20 Oct 2022 16:39:09 -0400 Subject: [PATCH 051/106] felix-fm: 1.3.0 -> 1.3.1 --- pkgs/applications/file-managers/felix-fm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 104cb9d9367e..0209a72cce25 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ewPDbrOxinu+GXegunZjumTCnkflXQk74Ovr8QStDBM="; + sha256 = "sha256-yMuV7a8nkdymgJTPuVcZ/PEA2/Vr7rQf8mpikNe3e1w="; }; - cargoSha256 = "sha256-wD0h8tXnqQOuBbFmpjMu0ZK7+omcOSqno6wFnSMTSjk="; + cargoSha256 = "sha256-yePPIehyv11f58HQzFoPh7izSPjmbhdVu9xlHD6PGRY="; checkInputs = [ zoxide ]; From 02ff423121c4a3dc62edc4c51b2a48f03e95598f Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Sat, 13 Aug 2022 16:49:20 +0000 Subject: [PATCH 052/106] bioextalign: init at 1.5.1 Part of BioPerl Extensions (BioPerl-Ext) distribution, a collection of Bioperl C-compiled extensions. These are no longer maintained but needed for Ensembl-VEP (annotation for genomics). Co-authored-by: Sandro --- .../perl-modules/Bio-Ext-Align/default.nix | 36 +++++++++++++++++++ .../perl-modules/Bio-Ext-Align/fprintf.patch | 13 +++++++ pkgs/top-level/perl-packages.nix | 2 ++ 3 files changed, 51 insertions(+) create mode 100644 pkgs/development/perl-modules/Bio-Ext-Align/default.nix create mode 100644 pkgs/development/perl-modules/Bio-Ext-Align/fprintf.patch diff --git a/pkgs/development/perl-modules/Bio-Ext-Align/default.nix b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix new file mode 100644 index 000000000000..237a4be03614 --- /dev/null +++ b/pkgs/development/perl-modules/Bio-Ext-Align/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPerlPackage, fetchFromGitHub }: + +buildPerlPackage rec { + pname = "BioExtAlign"; + version = "1.5.1"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "bioperl"; + repo = "bioperl-ext"; + rev = "bioperl-ext-release-${lib.replaceStrings ["."] ["-"] version}"; + sha256 = "sha256-+0tZ6q3PFem8DWa2vq+njOLmjDvMB0JhD0FGk00lVMA="; + }; + + patches = [ ./fprintf.patch ]; + + # Do not install other Bio-ext packages + preConfigure = '' + cd Bio/Ext/Align + ''; + + # Disable tests as it requires Bio::Tools::Align which is in a different directory + buildPhase = '' + make + ''; + + meta = { + homepage = "https://github.com/bioperl/bioperl-ext"; + description = "Write Perl Subroutines in Other Programming Languages"; + longDescription = '' + Part of BioPerl Extensions (BioPerl-Ext) distribution, a collection of Bioperl C-compiled extensions. + ''; + license = with lib.licenses; [ artistic1 ]; + }; +} diff --git a/pkgs/development/perl-modules/Bio-Ext-Align/fprintf.patch b/pkgs/development/perl-modules/Bio-Ext-Align/fprintf.patch new file mode 100644 index 000000000000..f62004a9a338 --- /dev/null +++ b/pkgs/development/perl-modules/Bio-Ext-Align/fprintf.patch @@ -0,0 +1,13 @@ +diff --git a/libs/dpalign.c b/libs/dpalign.c +index 0e07b67..0eab932 100644 +--- a/Bio/Ext/Align/libs/dpalign.c ++++ b/Bio/Ext/Align/libs/dpalign.c +@@ -40,7 +40,7 @@ int blosum62[24][24] = { + void + dpAlign_fatal(char * s) + { +- fprintf(stderr, s); ++ fputs(stderr, s); + exit(-1); + } + diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 73a753bae296..f71f736a697c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1594,6 +1594,8 @@ let }; }; + BioExtAlign = callPackage ../development/perl-modules/Bio-Ext-Align { }; + BioPerl = buildPerlPackage { pname = "BioPerl"; version = "1.7.8"; From f6f80b0493c449193b06fa5a1101312b8ae61f51 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 20 Oct 2022 14:42:10 -0700 Subject: [PATCH 053/106] cudnn: fix 8.6.0 src url after upstream change --- pkgs/development/libraries/science/math/cudnn/extension.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/cudnn/extension.nix b/pkgs/development/libraries/science/math/cudnn/extension.nix index 3804361e0ea7..ac22faeabb02 100644 --- a/pkgs/development/libraries/science/math/cudnn/extension.nix +++ b/pkgs/development/libraries/science/math/cudnn/extension.nix @@ -141,7 +141,7 @@ final: prev: let supportedCudaVersions = [ "10.2" ]; } rec { - fileVersion = "11.7"; + fileVersion = "11.8"; fullVersion = "8.6.0.163"; hash = "sha256-u8OW30cpTGV+3AnGAGdNYIyxv8gLgtz0VHBgwhcRFZ4="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; From 2c2cb5d49700807696abf003d7d544045a01ddc8 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 20 Oct 2022 23:32:37 +0100 Subject: [PATCH 054/106] shapelib: add patch for CVE-2022-0699 --- pkgs/development/libraries/shapelib/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index 1604578a10c9..c9793d5440b3 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, fetchpatch +}: stdenv.mkDerivation rec { pname = "shapelib"; @@ -9,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "1qfsgb8b3yiqwvr6h9m81g6k9fjhfys70c22p7kzkbick20a9h0z"; }; + patches = [ + (fetchpatch { + name = "CVE-2022-0699.patch"; + url = "https://github.com/OSGeo/shapelib/commit/c75b9281a5b9452d92e1682bdfe6019a13ed819f.patch"; + sha256 = "sha256-zJ7JHUtInA5q/RbkSs1DqVK+UQi2vIw2t1jqxocnQQI="; + }) + ]; + meta = with lib; { description = "C Library for reading, writing and updating ESRI Shapefiles"; homepage = "http://shapelib.maptools.org/"; From d5053942398033564cc40daf6f9f6c5b8eaf4941 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Oct 2022 01:05:53 +0200 Subject: [PATCH 055/106] python310Packages.pyprusalink: init at 1.1.0 --- .../python-modules/pyprusalink/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/pyprusalink/default.nix diff --git a/pkgs/development/python-modules/pyprusalink/default.nix b/pkgs/development/python-modules/pyprusalink/default.nix new file mode 100644 index 000000000000..7336dafe88df --- /dev/null +++ b/pkgs/development/python-modules/pyprusalink/default.nix @@ -0,0 +1,44 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "pyprusalink"; + version = "1.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-XRtbb7kceiqi8pioTWStRo0drCtQfy1t62jCMihlIec="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ + "pyprusalink" + ]; + + meta = with lib; { + description = "Library to communicate with PrusaLink "; + homepage = "https://github.com/home-assistant-libs/pyprusalink"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 320b9b2f03a4..4509e33aef52 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8412,6 +8412,8 @@ in { pyprosegur = callPackage ../development/python-modules/pyprosegur { }; + pyprusalink = callPackage ../development/python-modules/pyprusalink { }; + pyptlib = callPackage ../development/python-modules/pyptlib { }; pypubsub = callPackage ../development/python-modules/pypubsub { }; From 13eee37eb734f6e3335d5893cfd3c9c931cbf775 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Oct 2022 01:06:43 +0200 Subject: [PATCH 056/106] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 577e87f522a0..9c0d64d49466 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2357,7 +2357,8 @@ pillow ]; "prusalink" = ps: with ps; [ - ]; # missing inputs: pyprusalink + pyprusalink + ]; "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "pulseaudio_loopback" = ps: with ps; [ @@ -4054,6 +4055,7 @@ "prometheus" "prosegur" "proximity" + "prusalink" "pure_energie" "push" "pushbullet" From 0763b2b9570746e5e6dc9437ce19b209e2ef6c13 Mon Sep 17 00:00:00 2001 From: Icy-Thought Date: Fri, 21 Oct 2022 00:15:29 +0200 Subject: [PATCH 057/106] galaxy-buds-client: add desktop file --- .../audio/galaxy-buds-client/default.nix | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/galaxy-buds-client/default.nix b/pkgs/applications/audio/galaxy-buds-client/default.nix index 6e33b4aec3d9..f3a0ba8c6e93 100644 --- a/pkgs/applications/audio/galaxy-buds-client/default.nix +++ b/pkgs/applications/audio/galaxy-buds-client/default.nix @@ -6,6 +6,9 @@ , fontconfig , xorg , libglvnd +, makeDesktopItem +, copyDesktopItems +, graphicsmagick }: buildDotnetModule rec { @@ -23,13 +26,14 @@ buildDotnetModule rec { nugetDeps = ./deps.nix; dotnetFlags = [ "-p:Runtimeidentifier=linux-x64" ]; - nativeBuildInputs = [ autoPatchelfHook ]; - - buildInputs = [ - stdenv.cc.cc.lib - fontconfig + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + graphicsmagick ]; + buildInputs = [ stdenv.cc.cc.lib fontconfig ]; + runtimeDeps = [ libglvnd xorg.libSM @@ -37,7 +41,25 @@ buildDotnetModule rec { xorg.libX11 ]; + postFixup = '' + mkdir -p $out/share/icons/hicolor/256x256/apps/ + gm convert $src/GalaxyBudsClient/Resources/icon_white.ico $out/share/icons/hicolor/256x256/apps/${meta.mainProgram}.png + ''; + + desktopItems = makeDesktopItem { + name = meta.mainProgram; + exec = meta.mainProgram; + icon = meta.mainProgram; + desktopName = meta.mainProgram; + genericName = "Galaxy Buds Client"; + comment = meta.description; + type = "Application"; + categories = [ "Settings" ]; + startupNotify = true; + }; + meta = with lib; { + mainProgram = "GalaxyBudsClient"; description = "Unofficial Galaxy Buds Manager for Windows and Linux"; homepage = "https://github.com/ThePBone/GalaxyBudsClient"; license = licenses.gpl3; From ec187bf90889a4a7c90276bc7cf28de81cb15b1b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 21 Oct 2022 08:48:34 +0800 Subject: [PATCH 058/106] pantheon.wingpanel-indicator-power: 6.1.0 -> 6.2.0 --- .../pantheon/desktop/wingpanel-indicators/power/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index ac9803495574..84585f7d779a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-power"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1zlpnl7983jkpy2nik08ih8lwrqvm456h993ixa6armzlazdvnjk"; + sha256 = "sha256-TxrskbwitsilTidWifSWg9IP6BzH1y/OOrFohlENJmM="; }; patches = [ From 6aea62f93862a88a71cf28ca7b5e91500168dbd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Oct 2022 00:57:18 +0000 Subject: [PATCH 059/106] v2ray-geoip: 202210130107 -> 202210200105 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 60d0493dd759..453af56965dd 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202210130107"; + version = "202210200105"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "becf974734e41542c356a0c0ae21a619c476d500"; - sha256 = "sha256-IF7mcyiZc4CTFWSflxQBH8Z9NloCcsCymOhU85GaoEg="; + rev = "a9409c3b7c6a788e7be62c9b92a24d034f521603"; + sha256 = "sha256-CuR1xeCcuzxMMgstyjcdQKpU0n6AkA6X786LpUmANGE="; }; installPhase = '' From a8aefa107d27361c759f7e755bcef577c10e8079 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 14 Oct 2022 21:47:08 +0200 Subject: [PATCH 060/106] matrix-sdk-crypto-nodejs: fix build --- .../libraries/matrix-sdk-crypto-nodejs/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix index afb52ddd6b3c..cce2c24f184d 100644 --- a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix +++ b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix @@ -23,10 +23,6 @@ stdenv.mkDerivation rec { hash = "sha256-G2Um7vHinOuOx9U2BH14LAx+s/0Sxtlc9Nz6nPJfmU8="; }; - postPatch = '' - cd bindings/${pname} - ''; - nativeBuildInputs = [ rustPlatform.cargoSetupHook rustPlatform.rust.cargo @@ -40,6 +36,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild + cd bindings/${pname} npm run release-build --offline runHook postBuild From 49b55099eaf05b693bc1589f21e65c2c9f522ee0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 20 Oct 2022 00:14:37 -0300 Subject: [PATCH 061/106] hypr: init at unstable-2022-05-25 --- .../hyprwm/hypr/000-dont-set-compiler.diff | 18 +++++ .../window-managers/hyprwm/hypr/default.nix | 77 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 97 insertions(+) create mode 100644 pkgs/applications/window-managers/hyprwm/hypr/000-dont-set-compiler.diff create mode 100644 pkgs/applications/window-managers/hyprwm/hypr/default.nix diff --git a/pkgs/applications/window-managers/hyprwm/hypr/000-dont-set-compiler.diff b/pkgs/applications/window-managers/hyprwm/hypr/000-dont-set-compiler.diff new file mode 100644 index 000000000000..b12763b82f69 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hypr/000-dont-set-compiler.diff @@ -0,0 +1,18 @@ +diff -Naur source-old/CMakeLists.txt source/CMakeLists.txt +--- source-old/CMakeLists.txt 2022-10-19 00:55:52.766480588 -0300 ++++ source/CMakeLists.txt 2022-10-19 00:56:08.368515654 -0300 +@@ -1,7 +1,5 @@ + cmake_minimum_required(VERSION 3.4) + +-set(CMAKE_CXX_COMPILER "/bin/g++") +- + project(Hypr + VERSION 0.1 + DESCRIPTION "A Modern OOP C++ Window Manager" +@@ -54,4 +52,4 @@ + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg -no-pie -fno-builtin") + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg -no-pie -fno-builtin") + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg -no-pie -fno-builtin") +-ENDIF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG) +\ No newline at end of file ++ENDIF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG) diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix new file mode 100644 index 000000000000..673fa90c5005 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchFromGitHub +, cairo +, cmake +, glib +, gtkmm3 +, harfbuzz +, libX11 +, libXdmcp +, libxcb +, makeWrapper +, pcre2 +, pkg-config +, xcbutilcursor +, xcbutilkeysyms +, xcbutilwm +, xmodmap +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hypr"; + version = "unstable-2022-05-25"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "Hypr"; + rev = "3e3d943c446ae77c289611a1a875c8dff8883c1e"; + hash = "sha256-lyaGGm53qxg7WVoFxZ7kerLe12P1N3JbN8nut6oZS50="; + }; + + patches = [ + ./000-dont-set-compiler.diff + ]; + + nativeBuildInputs = [ + cmake + makeWrapper + pkg-config + ]; + + buildInputs = [ + cairo + glib + gtkmm3 + harfbuzz + libX11 + libXdmcp + libxcb + pcre2 + xcbutilcursor + xcbutilkeysyms + xcbutilwm + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 Hypr -t $out/bin + + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/Hypr --prefix PATH : ${lib.makeBinPath [ xmodmap ]} + ''; + + meta = with lib; { + inherit (finalAttrs.src.meta) homepage; + description = "A tiling X11 window manager written in modern C++"; + license = licenses.bsd3; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (libX11.meta) platforms; + broken = stdenv.isDarwin; # xcb/xcb_atom.h not found + mainProgram = "Hypr"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfe3cdac82e7..f0476417529e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4230,6 +4230,8 @@ with pkgs; hunt = callPackage ../tools/misc/hunt { }; + hypr = callPackage ../applications/window-managers/hyprwm/hypr { }; + hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { }; hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; From af3779f819285ba9b082c38b3594b83546dea740 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 20 Oct 2022 00:17:05 -0300 Subject: [PATCH 062/106] nixos/hypr: add module --- .../services/x11/window-managers/default.nix | 1 + .../services/x11/window-managers/hypr.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 nixos/modules/services/x11/window-managers/hypr.nix diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 36d5b3c8156d..48b413beaa86 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -23,6 +23,7 @@ in ./fvwm3.nix ./hackedbox.nix ./herbstluftwm.nix + ./hypr.nix ./i3.nix ./jwm.nix ./leftwm.nix diff --git a/nixos/modules/services/x11/window-managers/hypr.nix b/nixos/modules/services/x11/window-managers/hypr.nix new file mode 100644 index 000000000000..4c1fea71f93e --- /dev/null +++ b/nixos/modules/services/x11/window-managers/hypr.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.hypr; +in +{ + ###### interface + options = { + services.xserver.windowManager.hypr.enable = mkEnableOption (lib.mdDoc "hypr"); + }; + + ###### implementation + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "hypr"; + start = '' + ${pkgs.hypr}/bin/Hypr & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.hypr ]; + }; +} From aeed974bb538880f0af8dcb2f572baabafdd6f83 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 03:36:34 +0000 Subject: [PATCH 063/106] =?UTF-8?q?terraform-providers.aiven:=203.7.0=20?= =?UTF-8?q?=E2=86=92=203.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7c4dd2747a97..93c07be27219 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -30,13 +30,13 @@ "version": "0.1.1" }, "aiven": { - "hash": "sha256-ceicNERNIM6KDjSXF/D3NG1aTC2Mhlhbq56QbsJUuF4=", + "hash": "sha256-+Uzz2eu873lh707/zADfMK/4D5wDMxXZtAf0RU6V42M=", "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v3.7.0", - "vendorHash": "sha256-4fbbbJnWzJ4DF3YjkeH/mqS45LVc5yg7zSC9V8jGbXo=", - "version": "3.7.0" + "rev": "v3.8.0", + "vendorHash": "sha256-F+zF9xqHNCXrGxOjEoe8gaGS0C7EO0s61CjN9+9PiYk=", + "version": "3.8.0" }, "akamai": { "hash": "sha256-+EHXB2VH1UWYQ1y6Ou+5VhjH7elhfgLYW/imhN2t15Q=", From 5f3608836a4499432995c779b2ab50a9a550519d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 03:41:57 +0000 Subject: [PATCH 064/106] =?UTF-8?q?terraform-providers.nomad:=201.4.18=20?= =?UTF-8?q?=E2=86=92=201.4.19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 93c07be27219..73a6dce65fce 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -786,13 +786,13 @@ "version": "3.5.1" }, "nomad": { - "hash": "sha256-HhocWB3ZCFdeYgmA64hv1CYwqIf4EB/Q+vNrFKVB31I=", + "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/nomad", "repo": "terraform-provider-nomad", - "rev": "v1.4.18", - "vendorHash": "sha256-jS0soOe8kVnsC8Aum1zuiqHColOZmKEpu7jP74AnXmM=", - "version": "1.4.18" + "rev": "v1.4.19", + "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4=", + "version": "1.4.19" }, "ns1": { "hash": "sha256-vw3n1EBKwOThoJ+2hFa4rsMzvWCOnhoYOmJpX8LQKy8=", From f496c4a8b7ee8e88107e5633e6ffdc230664ee86 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 03:48:02 +0000 Subject: [PATCH 065/106] =?UTF-8?q?terraform-providers.yandex:=200.80.0=20?= =?UTF-8?q?=E2=86=92=200.81.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 73a6dce65fce..4e7be571154b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1284,12 +1284,12 @@ "version": "3.2.0" }, "yandex": { - "hash": "sha256-h8uMN08lwpG8gnCd4jnz/+eIfJEQnZcexW/THYLM4/8=", + "hash": "sha256-WdiJD1gt56VDFe2qVKwiYOvneixaGRie6mrxdOCklQY=", "owner": "yandex-cloud", "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", "repo": "terraform-provider-yandex", - "rev": "v0.80.0", - "vendorHash": "sha256-PKWLVh/XMinLjj343fwlgWA7K2K+yVXJQ7M6LRmmdp8=", - "version": "0.80.0" + "rev": "v0.81.0", + "vendorHash": "sha256-n+XARZuMzmxUGxFAseKyiBsKuGDUl8T6LWXzJ+6ZJ/E=", + "version": "0.81.0" } } From 328c892e1b088d6df09e53ddfd97b7cde7717d70 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 03:51:36 +0000 Subject: [PATCH 066/106] =?UTF-8?q?terraform-providers.aws:=204.35.0=20?= =?UTF-8?q?=E2=86=92=204.36.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4e7be571154b..557e1d22e657 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -102,13 +102,13 @@ "version": "2.24.1" }, "aws": { - "hash": "sha256-Pyp3LaoXL3vtF2q6g5rGdvPdszd/GB2gzfUqUyhkVeM=", + "hash": "sha256-0oN4kbAm2j32VZhcPe62M8ILEBHxeujnTMgeToDsAe4=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.35.0", - "vendorHash": "sha256-9qI3n+Py2lbSjHJKZTaFEA2dXGOgSAIZqoA1gXDbEOY=", - "version": "4.35.0" + "rev": "v4.36.0", + "vendorHash": "sha256-rIZUmZHeYJGdKSKjw14gbIH6mCEYbBe5VthnLXjqKJc=", + "version": "4.36.0" }, "azuread": { "hash": "sha256-rj/ODxmuK0Ro1KVHh4onR/evtUdKzay9BpQDgrx+eNA=", From 66e6323fc5a9a9e18cea7ccaa9ca5022da665a6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Oct 2022 04:29:31 +0000 Subject: [PATCH 067/106] checkSSLCert: 2.53.0 -> 2.54.0 --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 2bd170520fdb..9ca3ebaf0e89 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.53.0"; + version = "2.54.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-Pj2g4eZqeIWV5kb2N9cnVwV0ZASOQflZD3sChhzPbfM="; + hash = "sha256-rRzO5MYpQrDuMyQlOCupV6IR7ZZgpU2lhPpgqoEXiaY="; }; nativeBuildInputs = [ From 494f57ce057ac8a9d3cd153de9f7177e60f4b9c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Oct 2022 04:30:09 +0000 Subject: [PATCH 068/106] checkip: 0.41.0 -> 0.42.0 --- pkgs/tools/networking/checkip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index 1e371546a520..4636abf9335d 100644 --- a/pkgs/tools/networking/checkip/default.nix +++ b/pkgs/tools/networking/checkip/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "checkip"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n8dKt18Ak+H+6NKMamUaeuaPKylOxFWrLAjMg5iqEdk="; + sha256 = "sha256-cFnkuBA6cfVkhJQPUKAppWAVt3p+MXSFoyGD98HwAio="; }; vendorSha256 = "sha256-bFhSMjm9rqUUbCV9keeXm+yhzQMKrYKs1DbCt53J8aM="; From 73892e750c6fc11d382a8550f506540c81968d3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Oct 2022 05:08:16 +0000 Subject: [PATCH 069/106] python310Packages.azure-mgmt-resource: 21.2.0 -> 21.2.1 --- .../python-modules/azure-mgmt-resource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 4988406ac968..30507d1541c2 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { - version = "21.2.0"; + version = "21.2.1"; pname = "azure-mgmt-resource"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-v4pd5sTate/H8NGND1cWXe5SMepS0j0Q2C5Ee4wqGlQ="; + sha256 = "sha256-vSBg1WOT/+Ykao8spn51Tt0D7Ae5dWMLMK4DqIYFl6c="; }; propagatedBuildInputs = [ From 3ccff148e63543187506a4e93402f8d853ffdbc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Oct 2022 05:32:57 +0000 Subject: [PATCH 070/106] dsq: 0.22.0 -> 0.23.0 --- pkgs/tools/misc/dsq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index e1e370a11c23..835143fb06d7 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -15,16 +15,16 @@ buildGoModule rec { pname = "dsq"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "multiprocessio"; repo = "dsq"; rev = "v${version}"; - hash = "sha256-aFSal+MDJ7W50ZMgBkkyLaJjJoNeSGubylaRK0tbAzY="; + hash = "sha256-FZBJe+2y4HV3Pgeap4yvD0a8M/j+6pAJEFpoQVVE1ec="; }; - vendorSha256 = "sha256-RW6DdMQeuKVP4rFN13Azq+zAx6dVXmdnIA6aDMCygcI="; + vendorSha256 = "sha256-MbBR+OC1OGhZZGcZqc+Jzmabdc5ZfFEwzqP5YMrj6mY="; ldflags = [ "-X" "main.Version=${version}" ]; From af22262f1262392e0ecd9aa7027fa44ee4af3801 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Fri, 21 Oct 2022 16:38:32 +1100 Subject: [PATCH 071/106] dub: enable aarch64-linux --- pkgs/development/tools/build-managers/dub/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index ec67bcd691ed..537653ea9b75 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -150,6 +150,6 @@ stdenv.mkDerivation rec { homepage = "https://code.dlang.org/"; license = licenses.mit; maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } From 0b8181e2640ddb98ac1c4e76cd5e8e68dde4dd79 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Oct 2022 09:04:51 +0200 Subject: [PATCH 072/106] =?UTF-8?q?ocamlPackages.torch:=200.14=20=E2=86=92?= =?UTF-8?q?=200.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/torch/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index fd7036ac6c89..dddbf8a790d5 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -17,9 +17,7 @@ buildDunePackage rec { pname = "torch"; - version = "0.14"; - - useDune2 = true; + version = "0.15"; minimalOCamlVersion = "4.08"; @@ -27,7 +25,7 @@ buildDunePackage rec { owner = "LaurentMazare"; repo = "ocaml-${pname}"; rev = version; - sha256 = "sha256:039anfvzsalbqi5cdp95bbixcwr2ngharihgd149hcr0wa47y700"; + sha256 = "sha256-EXJqlAGa0LwQKY8IlmcoJs0l2eRTiUhuzMHfakrslXU="; }; buildInputs = [ dune-configurator ]; @@ -56,6 +54,5 @@ buildDunePackage rec { description = "Ocaml bindings to Pytorch"; maintainers = [ maintainers.bcdarwin ]; license = licenses.asl20; - broken = lib.versionAtLeast torch.version "1.11"; }; } From 585392ee2aa5c79ebfb323d470f17537962d7432 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Oct 2022 05:55:33 +0000 Subject: [PATCH 073/106] python310Packages.casbin: 1.17.1 -> 1.17.2 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 2d1e8ec09663..3072917f2ff1 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.17.1"; + version = "1.17.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-uh5XPhLoCnJtVnEDG+/oQvneEL1KLMWfAx+RXH/GCyE="; + hash = "sha256-wJYGo87K9Ae2HoN/ZR3S0EiX2v68vs+Vb75nA+Csass="; }; propagatedBuildInputs = [ From fca35adf039a582fc0d7f9b80cbb1150d76b2df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 21 Oct 2022 07:56:36 +0200 Subject: [PATCH 074/106] calibre-web: don't use the flask_login alias This was somehow forgotten in a11a2a6d18 (PR #196488). --- pkgs/servers/calibre-web/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index 91a5e4fdd1c5..50198b392797 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { backports_abc chardet flask-babel - flask_login + flask-login flask_principal flask-wtf iso-639 From 4f9a754936402099cd0d4ebe30e29c9d654d3d34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Oct 2022 06:23:31 +0000 Subject: [PATCH 075/106] bdf2psf: 1.210 -> 1.211 --- pkgs/tools/misc/bdf2psf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index c123f95e4451..daf0b943af6d 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.210"; + version = "1.211"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-7kHUwKQoNCHphZiUs3jwYeosiL5Kxp3rimOJX8PmwJk="; + sha256 = "sha256-Kzmqnctc2RUMbU3hVGmcfXFWiZhf5epaaj2eW4nVajU="; }; nativeBuildInputs = [ dpkg ]; From c38df8834b849cafe65cabe0f2aedb6cb8fc6b5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Oct 2022 06:25:00 +0000 Subject: [PATCH 076/106] bindfs: 1.17.0 -> 1.17.1 --- pkgs/tools/filesystems/bindfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 21d16159480f..fd98747d2fd1 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, fuse, pkg-config }: stdenv.mkDerivation rec { - version = "1.17.0"; + version = "1.17.1"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-cNpX1J53lP5UuFdb/danlDqrVK2i6OL99L4E4AEUUdw="; + sha256 = "sha256-7bSYkUTSj3Wv/E9bGAdPuXpY1u41rWkZrHXraky/41I="; }; nativeBuildInputs = [ pkg-config ]; From fed3280a7def7299858be67a822ff6d078b88f5a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Oct 2022 09:34:41 +0200 Subject: [PATCH 077/106] python310Packages.azure-mgmt-resource: disable on older Python releases --- .../azure-mgmt-resource/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 30507d1541c2..79923b254d32 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -1,36 +1,43 @@ -{ pkgs +{ lib , buildPythonPackage , fetchPypi , azure-mgmt-core , azure-mgmt-common -, isPy3k +, msrest +, pythonOlder }: - buildPythonPackage rec { - version = "21.2.1"; pname = "azure-mgmt-resource"; - disabled = !isPy3k; + version = "21.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-vSBg1WOT/+Ykao8spn51Tt0D7Ae5dWMLMK4DqIYFl6c="; + hash = "sha256-vSBg1WOT/+Ykao8spn51Tt0D7Ae5dWMLMK4DqIYFl6c="; }; propagatedBuildInputs = [ azure-mgmt-common azure-mgmt-core + msrest ]; - # has no tests + # Module has no tests doCheck = false; - pythonNamespaces = [ "azure.mgmt" ]; + pythonNamespaces = [ + "azure.mgmt" + ]; - pythonImportsCheck = [ "azure.mgmt.resource" ]; + pythonImportsCheck = [ + "azure.mgmt.resource" + ]; - meta = with pkgs.lib; { + meta = with lib; { description = "Microsoft Azure SDK for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; From aee40c2d8a2327248b8f01c824ce0ed0bcf6ba28 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 7 Oct 2022 10:53:14 +0200 Subject: [PATCH 078/106] nixos/nscd: add enableNsncd option When set, this switches from using nscd to using nsncd. It's a protocol-compatible, non-caching and much less flaky alternative. --- nixos/modules/services/system/nscd.nix | 30 +++++++++++++++++++------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index 7980ad0aed79..fdc5190d084b 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -27,6 +27,15 @@ in ''; }; + enableNsncd = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to use nsncd instead of nscd. + This is a nscd-compatible daemon, that proxies lookups, without any caching. + ''; + }; + user = mkOption { type = types.str; default = "nscd"; @@ -60,7 +69,10 @@ in then pkgs.stdenv.cc.libc.bin else pkgs.glibc.bin; ''; - description = lib.mdDoc "package containing the nscd binary to be used by the service"; + description = lib.mdDoc '' + package containing the nscd binary to be used by the service. + Ignored when enableNsncd is set to true. + ''; }; }; @@ -82,7 +94,8 @@ in systemd.services.nscd = { - description = "Name Service Cache Daemon"; + description = "Name Service Cache Daemon" + + lib.optionalString cfg.enableNsncd " (nsncd)"; before = [ "nss-lookup.target" "nss-user-lookup.target" ]; wants = [ "nss-lookup.target" "nss-user-lookup.target" ]; @@ -91,14 +104,14 @@ in environment = { LD_LIBRARY_PATH = nssModulesPath; }; - restartTriggers = [ + restartTriggers = lib.optionals (!cfg.enableNsncd) ([ config.environment.etc.hosts.source config.environment.etc."nsswitch.conf".source config.environment.etc."nscd.conf".source ] ++ optionals config.users.mysql.enable [ config.environment.etc."libnss-mysql.cfg".source config.environment.etc."libnss-mysql-root.cfg".source - ]; + ]); # In some configurations, nscd needs to be started as root; it will # drop privileges after all the NSS modules have read their @@ -109,8 +122,10 @@ in # and so users can set the owner of those files to the nscd user. serviceConfig = { - ExecStart = "!@${cfg.package}/bin/nscd nscd"; - Type = "forking"; + ExecStart = + if cfg.enableNsncd then "${pkgs.nsncd}/bin/nsncd" + else "!@${cfg.package}/bin/nscd nscd"; + Type = if cfg.enableNsncd then "notify" else "forking"; User = cfg.user; Group = cfg.group; RemoveIPC = true; @@ -123,13 +138,12 @@ in PIDFile = "/run/nscd/nscd.pid"; Restart = "always"; ExecReload = - [ + lib.optionals (!cfg.enableNsncd) [ "${cfg.package}/bin/nscd --invalidate passwd" "${cfg.package}/bin/nscd --invalidate group" "${cfg.package}/bin/nscd --invalidate hosts" ]; }; }; - }; } From e7bc3e750410e352dff35f202713aeb11b6ce0db Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 10 Oct 2022 08:19:10 +0200 Subject: [PATCH 079/106] nixosTests.nscd: dump nscd socket info with sockdump This dumps what's sent over the nscd socket to the console output, which allows debugging. --- nixos/tests/nscd.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/nixos/tests/nscd.nix b/nixos/tests/nscd.nix index 23f03b6d8262..3f22221ba9df 100644 --- a/nixos/tests/nscd.nix +++ b/nixos/tests/nscd.nix @@ -21,6 +21,24 @@ in 192.0.2.1 somehost.test ''; + systemd.services.sockdump = { + wantedBy = [ "multi-user.target" ]; + path = [ + # necessary for bcc to unpack kernel headers and invoke modprobe + pkgs.gnutar + pkgs.xz.bin + pkgs.kmod + ]; + environment.PYTHONUNBUFFERED = "1"; + + serviceConfig = { + ExecStart = "${pkgs.sockdump}/bin/sockdump /var/run/nscd/socket"; + Restart = "on-failure"; + RestartSec = "1"; + Type = "simple"; + }; + }; + specialisation = { withUnscd.configuration = { ... }: { services.nscd.package = pkgs.unscd; @@ -63,6 +81,7 @@ in assert "somehost.test" in machine.succeed("${getent'} hosts 2001:db8::1") assert "somehost.test" in machine.succeed("${getent'} hosts 192.0.2.1") + # Test host resolution via nss modules works # We rely on nss-myhostname in this case, which resolves *.localhost and # _gateway. @@ -88,6 +107,9 @@ in start_all() machine.wait_for_unit("default.target") + # give sockdump some time to finish attaching. + machine.sleep(5) + # Test all tests with glibc-nscd. test_dynamic_user() test_host_lookups() From a86e080fa4639a0ea7c9dc6855367f1266311342 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 7 Oct 2022 11:49:52 +0200 Subject: [PATCH 080/106] nixosTests.nscd: add nsncd specialisation This shows that nsncd successfully passes all the tests that we run against glibc-nscd. --- nixos/tests/nscd.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/tests/nscd.nix b/nixos/tests/nscd.nix index 3f22221ba9df..1922812ef8c8 100644 --- a/nixos/tests/nscd.nix +++ b/nixos/tests/nscd.nix @@ -43,6 +43,9 @@ in withUnscd.configuration = { ... }: { services.nscd.package = pkgs.unscd; }; + withNsncd.configuration = { ... }: { + services.nscd.enableNsncd = true; + }; }; }; @@ -126,5 +129,13 @@ in # known to fail, unscd doesn't load external NSS modules # test_nss_myhostname() + + with subtest("nsncd"): + machine.succeed('${specialisations}/withNsncd/bin/switch-to-configuration test') + machine.wait_for_unit("default.target") + + test_dynamic_user() + test_host_lookups() + test_nss_myhostname() ''; }) From 4d268b7b39df9304299000e1affa95b76594dff3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Oct 2022 10:17:28 +0200 Subject: [PATCH 081/106] python310Packages.rns: 0.3.14 -> 0.3.16 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index b0d16afd5c28..825919dc10e8 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.3.14"; + version = "0.3.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-W5zQiGzuBHzEebVZjnVUO7Htx2/hnpeBHWoBfeXuaOQ="; + hash = "sha256-+TXIxyLLIWK0lLUyh4irTYHXZLAv8zFYUGKAbA7D9qA="; }; propagatedBuildInputs = [ From 81437922b9da7560a98b5b757f65ae94c7ab617e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Oct 2022 10:17:48 +0200 Subject: [PATCH 082/106] python310Packages.lxmf: 0.2.0 -> 0.2.1 --- pkgs/development/python-modules/lxmf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index d2605a0fdd6c..8b9593857eeb 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-5GQil5ReK0DEURPDgrGxfUhhIFHrRSSmtZ+l6xA9oA8="; + hash = "sha256-ULYo2eFzBoEc5OeuRW/o35P/9oeYob8lG4T++nDrnNg="; }; propagatedBuildInputs = [ From 834c6241a7bb710c249efba0b0513aaf88c1976a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Oct 2022 10:18:09 +0200 Subject: [PATCH 083/106] python310Packages.nomadnet: 0.2.4 -> 0.2.5 --- pkgs/development/python-modules/nomadnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 28e6da843daf..1a3d745dfd0d 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.2.4"; + version = "0.2.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = version; - hash = "sha256-SfKIbgt+F4CPA5r5NHjgPXOiq3+3UtvzEQfXkmN1VR0="; + hash = "sha256-iPgdXii3SZWxSTpILBLIWY6vpBTnrpGnEosD/ttN/Yk="; }; propagatedBuildInputs = [ From dc0be730765ce529790f4bbe4a69c209ad424e78 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 21 Oct 2022 10:21:06 +0200 Subject: [PATCH 084/106] python310Packages.life360: 5.1.1 -> 5.2.0 --- pkgs/development/python-modules/life360/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix index 15a0e9891aa7..3b65081c87eb 100644 --- a/pkgs/development/python-modules/life360/default.nix +++ b/pkgs/development/python-modules/life360/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "life360"; - version = "5.1.1"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pnbruckner"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Fsv0lK0C9suVqgeaxKVuyAacHzHJJ1FHXzzy95RnhWw="; + hash = "sha256-FLYqTuH/r56mbeOsgXgcLbKtQMiHnRpccDcdDiB0YMo="; }; propagatedBuildInputs = [ From 202ea673438c553ff8868a545d9c41c7c2f7d2c5 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Fri, 21 Oct 2022 10:26:24 +0200 Subject: [PATCH 085/106] ocamlPackages.mec: Use dune 3 --- pkgs/development/ocaml-modules/mec/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/mec/default.nix b/pkgs/development/ocaml-modules/mec/default.nix index 8381cf821ed3..9811c502596d 100644 --- a/pkgs/development/ocaml-modules/mec/default.nix +++ b/pkgs/development/ocaml-modules/mec/default.nix @@ -10,6 +10,8 @@ buildDunePackage rec { sha256 = "sha256-uIcGj/exSfuuzsv6C/bnJXpYRu3OY3dcKMW/7+qwi2U="; }; + duneVersion = "3"; + minimalOCamlVersion = "4.12"; propagatedBuildInputs = [ From 7eb4d82785ac568b84f8261a31ea814dbeb6e30a Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Tue, 11 Oct 2022 09:24:21 +0200 Subject: [PATCH 086/106] ligo: 0.47.0 -> 0.53.0 --- pkgs/development/compilers/ligo/default.nix | 38 +++-- pkgs/development/compilers/ligo/ligo.patch | 151 -------------------- 2 files changed, 24 insertions(+), 165 deletions(-) delete mode 100644 pkgs/development/compilers/ligo/ligo.patch diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 632737562f8c..5fb879b21f02 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -2,41 +2,46 @@ , fetchFromGitLab , git , coq +, ocamlPackages , cacert , ocaml-crunch }: -coq.ocamlPackages.buildDunePackage rec { +ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "0.47.0"; + version = "0.53.0"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-VJs0pKA99mZXhipK1bSAZmgAHvYbGbjxdI2XyJYjSm0="; + sha256 = "sha256-WNiN9UrwXCwfxWnR5oPm9sGWelQCpooCXh43T2QaOnI="; fetchSubmodules = true; }; # The build picks this up for ligo --version LIGO_VERSION = version; + duneVersion = "3"; + strictDeps = true; nativeBuildInputs = [ ocaml-crunch git coq - coq.ocamlPackages.menhir - coq.ocamlPackages.ocaml-recovery-parser + ocamlPackages.crunch + ocamlPackages.menhir + ocamlPackages.ocaml-recovery-parser ]; - buildInputs = with coq.ocamlPackages; [ + buildInputs = with ocamlPackages; [ coq menhir menhirLib qcheck ocamlgraph bisect_ppx + decompress ppx_deriving ppx_deriving_yojson ppx_expect @@ -49,11 +54,11 @@ coq.ocamlPackages.buildDunePackage rec { core_unix pprint linenoise - dune-configurator - ctypes_stubs_js crunch - zarith_stubs_js - pure-splitmix + semver + lambda-term + tar-unix + parse-argv # Test helpers deps qcheck @@ -61,7 +66,12 @@ coq.ocamlPackages.buildDunePackage rec { alcotest-lwt # vendored tezos' deps + tezos-plonk + tezos-bls12-381-polynomial ctypes + ctypes_stubs_js + class_group_vdf + dune-configurator hacl-star hacl-star-raw lwt-canceler @@ -80,23 +90,23 @@ coq.ocamlPackages.buildDunePackage rec { irmin-pack ezjsonm data-encoding + pure-splitmix + zarith_stubs_js ]; checkInputs = [ cacert - coq.ocamlPackages.ca-certs + ocamlPackages.ca-certs ]; doCheck = false; # Tests fail, but could not determine the reason - patches = [ ./ligo.patch ]; # fix for core >= 0.15.0 - meta = with lib; { homepage = "https://ligolang.org/"; downloadPage = "https://ligolang.org/docs/intro/installation"; description = "A friendly Smart Contract Language for Tezos"; license = licenses.mit; - platforms = [ "x86_64-linux" ]; + platforms = ocamlPackages.ocaml.meta.platforms; maintainers = with maintainers; [ ulrikstrid ]; }; } diff --git a/pkgs/development/compilers/ligo/ligo.patch b/pkgs/development/compilers/ligo/ligo.patch deleted file mode 100644 index 644e158318f7..000000000000 --- a/pkgs/development/compilers/ligo/ligo.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 6926fed076c2f5aa3282dbca10538d156c045c6f Mon Sep 17 00:00:00 2001 -From: bezmuth -Date: Wed, 3 Aug 2022 15:53:10 +0100 -Subject: [PATCH] Compat with core v0.15.0 - ---- - ligo.opam | 4 +++- - ligo.opam.locked | 5 +++-- - src/bin/cli.ml | 4 ++-- - src/bin/dune | 4 +++- - src/main/helpers/cli_helpers.ml | 4 ++-- - src/main/interpreter/dune | 2 +- - src/main/interpreter/interpreter.ml | 2 ++ - vendors/ligo-utils/simple-utils/dune | 1 + - vendors/ligo-utils/simple-utils/snippet.ml | 2 +- - 9 files changed, 18 insertions(+), 10 deletions(-) - -diff --git a/ligo.opam b/ligo.opam -index 47513217f..073f68ff5 100644 ---- a/ligo.opam -+++ b/ligo.opam -@@ -10,7 +10,9 @@ license: "MIT" - # If you change the dependencies, run `opam lock` in the root - depends: [ - # Jane Street Core -- "core" {= "v0.14.1"} -+ "core" {>= "v0.14.1" & < "v0.16.0"} -+ "core_kernel" { >= "v0.14.1" & "v0.16.0"} -+ "core_unix" { >= "v0.14.1" & "v0.16.0"} - # Tooling - "odoc" { build } - "ocamlfind" { build } -diff --git a/ligo.opam.locked b/ligo.opam.locked -index fd6fccf03..458e11791 100644 ---- a/ligo.opam.locked -+++ b/ligo.opam.locked -@@ -47,8 +47,9 @@ depends: [ - "conf-rust" {= "0.1"} - "conf-which" {= "1"} - "coq" {= "8.13.2"} -- "core" {= "v0.14.1"} -- "core_kernel" {= "v0.14.2"} -+ "core" {= "v0.15.0"} -+ "core_kernel" {= "v0.15.0"} -+ "core_unix" {= "v0.15.0"} - "cppo" {= "1.6.8"} - "csexp" {= "1.5.1"} - "cstruct" {= "6.1.0"} -diff --git a/src/bin/cli.ml b/src/bin/cli.ml -index dcaa85621..e411d8f32 100644 ---- a/src/bin/cli.ml -+++ b/src/bin/cli.ml -@@ -14,7 +14,7 @@ let entry_point = - let source_file = - let name = "SOURCE_FILE" in - let _doc = "the path to the smart contract file." in -- Command.Param.(anon (name %: Filename.arg_type)) -+ Command.Param.(anon (name %: Filename_unix.arg_type)) - - let package_name = - let name = "PACKAGE_NAME" in -@@ -783,7 +783,7 @@ let main = Command.group ~preserve_subcommand_order:() ~summary:"The LigoLANG co - ] - - let run ?argv () = -- Command.run ~version:Version.version ?argv main; -+ Command_unix.run ~version:Version.version ?argv main; - (* Effect to error code *) - match !return with - Done -> 0; -diff --git a/src/bin/dune b/src/bin/dune -index 03e5f17b5..74340ae9d 100644 ---- a/src/bin/dune -+++ b/src/bin/dune -@@ -11,7 +11,9 @@ - repl - install - cli_helpers -- ligo_api) -+ ligo_api -+ core_unix.command_unix -+ core_unix.filename_unix) - (modules cli version)) - - -diff --git a/src/main/helpers/cli_helpers.ml b/src/main/helpers/cli_helpers.ml -index 3d09ee6b8..585cca6fa 100644 ---- a/src/main/helpers/cli_helpers.ml -+++ b/src/main/helpers/cli_helpers.ml -@@ -71,7 +71,7 @@ let run_command (cmd : command) = - (fun p -> Lwt.map - (fun status -> - match status with -- Caml.Unix.WEXITED 0 -> Ok () -+ Caml_unix.WEXITED 0 -> Ok () - | _ -> Error ("unknown error")) - p#status) in -- Lwt_main.run status -\ No newline at end of file -+ Lwt_main.run status -diff --git a/src/main/interpreter/dune b/src/main/interpreter/dune -index 6ccc74ff0..7d38bb822 100644 ---- a/src/main/interpreter/dune -+++ b/src/main/interpreter/dune -@@ -4,4 +4,4 @@ - (instrumentation - (backend bisect_ppx)) - (libraries tezos-013-PtJakart-test-helpers ast_aggregated ligo_interpreter -- main_errors ligo_compile build fuzz ligo_run self_ast_typed bls12-381)) -+ main_errors ligo_compile build fuzz ligo_run self_ast_typed bls12-381 core_unix.sys_unix)) -diff --git a/src/main/interpreter/interpreter.ml b/src/main/interpreter/interpreter.ml -index 0f76a286c..d9a389a6b 100644 ---- a/src/main/interpreter/interpreter.ml -+++ b/src/main/interpreter/interpreter.ml -@@ -3,6 +3,8 @@ open Simple_utils - open Ligo_interpreter.Types - open Ligo_interpreter.Combinators - -+module Sys = Sys_unix -+ - module AST = Ast_aggregated - - include AST.Types -diff --git a/vendors/ligo-utils/simple-utils/dune b/vendors/ligo-utils/simple-utils/dune -index becca2f86..a890dbf62 100644 ---- a/vendors/ligo-utils/simple-utils/dune -+++ b/vendors/ligo-utils/simple-utils/dune -@@ -6,6 +6,7 @@ - (libraries - ;; Third party - core -+ core_kernel.caml_unix - yojson - result - unix -diff --git a/vendors/ligo-utils/simple-utils/snippet.ml b/vendors/ligo-utils/simple-utils/snippet.ml -index 658f115f2..f23000590 100644 ---- a/vendors/ligo-utils/simple-utils/snippet.ml -+++ b/vendors/ligo-utils/simple-utils/snippet.ml -@@ -1,7 +1,7 @@ - (* used to show code snippets in error messages *) - - let print_code ppf (l:Region.t) (input_line: unit -> string) = -- let dumb =String.equal (Caml.Unix.getenv "TERM") "dumb" in -+ let dumb =String.equal (Caml_unix.getenv "TERM") "dumb" in - let start = l#start#line in - let start_column = l#start#offset `Byte in - let stop = l#stop#line in --- -2.36.1 - From 05bfaaa416fa7afc42f317fd5ced929b282842ef Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Fri, 21 Oct 2022 12:38:09 +0200 Subject: [PATCH 087/106] ocaml-lsp: 1.12 -> 1.14 --- pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index 4e79e0310ac6..910616601245 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -13,8 +13,8 @@ let params = if lib.versionAtLeast ocaml.version "4.14" then { name = "lsp"; - version = "1.12.4"; - sha256 = "sha256-kZuYAny8VjWdq+ipEdPSTRcGzqjNBOgXOi0dOwb52EY="; + version = "1.14.1"; + sha256 = "sha256-5kxMM90Dd5H8yb7f1NYV3abRaePqztFQ82VTnayradk="; } else if lib.versionAtLeast ocaml.version "4.13" then { name = "jsonrpc"; From 0eceb37a6c6ff38ac9269056ebfd65f6d71d9333 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 21 Oct 2022 12:21:31 +0000 Subject: [PATCH 088/106] hikounomizu: build data in parallel Co-authored-by: Sandro --- pkgs/games/hikounomizu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/hikounomizu/default.nix b/pkgs/games/hikounomizu/default.nix index 6ba3ba96e4ac..f55b77516400 100644 --- a/pkgs/games/hikounomizu/default.nix +++ b/pkgs/games/hikounomizu/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; postBuild = '' - make data + make data -j$NIX_BUILD_CORES ''; meta = with lib; { From 923ab8a2cb3898bf249a94d81918c584d8ca1e99 Mon Sep 17 00:00:00 2001 From: "\"Alexander Sieg\"" <"alex@xanderio.de"> Date: Fri, 21 Oct 2022 14:30:59 +0200 Subject: [PATCH 089/106] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 156 +++++++++--------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index aea9aa346e92..8864501724ed 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-10-20"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "48c818a86224fd9b061092509db8706b5ae9f6bc"; - sha256 = "17g4w29vgmgl3l5cwy7m8ylrm79jnz9yrr9rn60wxdf28zrig1gm"; + rev = "b488dd5aeb787e030052a0583a345aa33c580b83"; + sha256 = "0spa9nb93ksbap177prwcicixf522dzkmlzq7flgb92yfh2hwm8b"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-10-19"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "d35799b510f6582f24765dcb8b293fc4988ccc41"; - sha256 = "19njckq33dsjsr0xh8mq0vzsa25wv57ksykwxiia1afg9qnjvg0l"; + rev = "832024bdccf414d786eabdf2a05f2f117581cb36"; + sha256 = "1idxkjh3j3rzh47zlm0fc3nnbj7jzyg643xi8fap72sv597h07vd"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -702,12 +702,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2022-09-06"; + version = "2022-10-20"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "298394e61d57b6cc0a050c91e30475f0aeb421ef"; - sha256 = "001l0m5z2vg5kpnbvikj033x3qg52yn3b2lsb8fpyqbnjs2r8nma"; + rev = "e2f3b33f0a3ec1a33cc1c290951e50e287037036"; + sha256 = "0p9fa6jsvign3r470www78m8dxkc8mrq9w10q6nr52slzzp2m382"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -1722,12 +1722,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-10-20"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "853afde8027fda3eb687ea076fa4f5755c68e781"; - sha256 = "1xgyi751dgjy9x5c1nfn5rcrcxm76f7fbx04qqmrivjjlqpg9a4k"; + rev = "84739fd4059e3a8b0ed1b2ac7eba7c8a2ad76c79"; + sha256 = "0pc1183ydmn2c06zl2zgxlidcrw6fw104fxi868fifbvm13q3sd9"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1794,12 +1794,12 @@ final: prev: command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2022-10-07"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "f8d67e234aa39856ce62246cd4bf1c76f8b46245"; - sha256 = "1iq34bysnkl65gvdpsfqgimvmnpq964654c0g1ijjc0ayfk1yyd8"; + rev = "e8d4847f0ca246a605c720b4a740b57f7cdb3a65"; + sha256 = "18ih0wc7gk8kvx9bhafbdajb6jf225l25rjfjamwy83i4kcn4xl0"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; @@ -1878,12 +1878,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2022-10-15"; + version = "2022-10-20"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "356f876ef4ef194503b2e23d27af9f55c5faff32"; - sha256 = "03kbf8vrb7ws18k6w2d4zrbj0318qr82xgqxw9yfqsb4wzx8b5jx"; + rev = "70476109b783123a3a5cc1294cb7e0f2921d9f51"; + sha256 = "07pxg4k6sinhwg6n5xjk2by3pmfm545ybji9map81iqw2m3k2v3h"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -2010,24 +2010,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-10-20"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "7d3a56b9eaaa99c8c73d4838630f46e81a016362"; - sha256 = "0kxv53wnjxms3pn0dwg2z36f1lraw0fgxax4lb5i52mhwn7vg2qg"; + rev = "340c074eedb58c72aecba13acdb17e6d34779898"; + sha256 = "1p6ivb9amaassvmfz8117k3bxyf5x18zay75fc6h1f4vdm594g6c"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-10-20"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "5cbf8a2b67246dca9611b19000df9d1d04922cab"; - sha256 = "1j0bja06gpnyqh0qb6kq1grmf0dr8p4k63w1rxjynj1fnnvp3vcs"; + rev = "37d29e9ab0f1f4db7ce10ec116c14e8c74584142"; + sha256 = "0b9h9ggxkrkdavg0h9dpkm8nkicmdz7lk3ix18xl9br2vmlah3bb"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2046,12 +2046,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-10-20"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "1a07d8454d620b386ed9c04c41097862b0d0ace4"; - sha256 = "13maibc8vdd5gs194dmh2jdynjv4xryr6wjavryq2bfzh5kx6xx8"; + rev = "a6e5c0921f58fa6bee85d3c33915d8397125dc0e"; + sha256 = "1hgnbz7dk8ac5klqjdc85m149vlhdjqfrxx1l8kcxxraws3zzfsk"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -4354,12 +4354,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-08-15"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "e65a63858771db3f086c8d904ff5f80705fd962b"; - sha256 = "17qxn2ldvh1gas3i55vigqsz4mm7sxfl721v7lix9xs9bqgm73n1"; + rev = "ad1f9b413e27a8cb86893326e7b02982c69fe3f3"; + sha256 = "0w0pww74n9abxkbqwfcp2fllaixvcw8972van8mcnj3qhmg743yi"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4535,12 +4535,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-10-14"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "1a911c2e710b6b3a4b673ab2f47911faa06f5286"; - sha256 = "1n5plkqywsmrr2ji1f0mvgc3yjd984xdm2vkniyq04rhyw5mshz8"; + rev = "8087764d8c38cfa604511f57dab51ad64316c16c"; + sha256 = "09ycmhdb7rihb0dldl6pma6b8z6arx7pbh2i41avp3r30lgnxnv4"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4895,24 +4895,24 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-10-20"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "218d9b06f6b91a0d5b9d8d9c165c5c286f9521ea"; - sha256 = "0m88ykblj7nssw7l6492h742zl8cm0mhv23sb1nj73m5x95h4d4c"; + rev = "97ebf23c0d4f5a11f1d68a5abd468751b14980a1"; + sha256 = "023ndb3y0ak4id4svzj3g9lqlp8azp7bsb6y9h17mglll9kh6mdr"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-09-01"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "0ae951121da29a157d80db70c32679b428afffdc"; - sha256 = "1nslf2wfj0z4qq7zgqcx62gb31px6sqqb8rk1a10j3ply5bc7r67"; + rev = "c4be749032b39a34ad89dddacda2f93a85d43a93"; + sha256 = "19f921m51943v731mmbzvknfjwrra2vjz3ppxzh935r3cq9l8ca0"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -4979,12 +4979,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-10-17"; + version = "2022-10-20"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "49d0b5a3acf94f349a7351042d42933bf1047ad5"; - sha256 = "1a7w5jvfm89d423a3f6mjf2yf2bqx24wvignpkq3hlzzkkyvrc4g"; + rev = "9b3ea123f738391f78968e95402368c7ee48db65"; + sha256 = "05l26h1q9z5yfx70vzvkcmqd5v5j4j7napdxbjmp8pxad2yghc8q"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5039,12 +5039,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-10-01"; + version = "2022-10-20"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "bae6314522e47172564203d4f1c56dc1e39c1c14"; - sha256 = "0hwhcdswa5msxndcfcn68dq8aj6gka7vmfcvbnaxmwza23ik09cd"; + rev = "08ae56d07f175ac997324e89dd25229f7ab1bdfa"; + sha256 = "0kklva47g1jf9ab1psgbxfw3w995kvg54jxzc9zplj4z8ppmp4hw"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -5207,12 +5207,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2022-10-20"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "b10055a599af8d86ea0ae75bc2abb953ba20acbc"; - sha256 = "15c0jcyhklrf4h4mid1a3049257rkvlbsbabrcfk10g0kad71kai"; + rev = "dbb13d8fd7ff5329dbcd789ab01f460cf580ae1a"; + sha256 = "00iw8lc9d6cn5qad4iqxkf2553k6fpk0ygf9h9bhzr3xyx0bnwpb"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5627,12 +5627,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-10-09"; + version = "2022-10-19"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "8b67dd488cc4633dc3580b44bf0b30d002a2ba29"; - sha256 = "1wwk0sxd3j4fpndill5hbdq1rwmjfv8x8hmajvsxdnpc8skvyzxa"; + rev = "75cf2f7dfc640f23e476cedc3f9784ce02f4f88b"; + sha256 = "1s24x17041dhgpkql43ma33bamqr54n6g3ggl3qndqby07zp66r1"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -5735,12 +5735,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-10-20"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "3592f769f2d6b07ce3083744cd0a13442f5d4f43"; - sha256 = "1sbk30f3ajpks6wxyj1gh9b11si59hmffn12wd7a00zvgbgqa4vr"; + rev = "ee2e8c63cff0a8bfc7f4ef985ea466f10bb7e691"; + sha256 = "19mx9dg9x1yp0rvvh83xxkkb92w7wqdw6i79ncfiffigplwlcfmi"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5955,8 +5955,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "d49495fe72cbcedc944eece3611005dc0fa6acda"; - sha256 = "1ngh7dlgppicdf5f5zs26wpyc2h0pqkqmgkhq288j7ic9lpw4z5x"; + rev = "c4c358e9badb181f4a05a4d8fd0c986a1cf5001b"; + sha256 = "1wqxnnl55ms46dfjag93knmnbvc19z4vyb9nhaj0iz70n24s0qd7"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6191,12 +6191,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-10-19"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "050e23fa587ee959387fe8d67711f189caa5704b"; - sha256 = "0l7xb55r7jya594c06jswbvqk06cma2b50zhl0vw57fagir2258m"; + rev = "e9478c3e39ebeef1799f021f65eac44c39c0e5bc"; + sha256 = "0v99ysgapaq1w3249wlc4b2dm04zv8mn2f9l5b78vncgvvwi6ipf"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -9060,7 +9060,7 @@ final: prev: owner = "flazz"; repo = "vim-colorschemes"; rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9"; - sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5"; + sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416"; }; meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; @@ -10990,12 +10990,12 @@ final: prev: vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2022-08-04"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "755d96ccebbe08fb0e25d0d4f8ffaf0cf86e3217"; - sha256 = "0ndvrnkdk5mfkyifm0dvi0fsn0kc40hmz3nqadn4w894nl09cdxn"; + rev = "c0653e22a1b935d5dfef6ab61c6788e90d24baed"; + sha256 = "1mvvcms3snzc2ki3x28dx85hqx59b6k3sdiyd9359sja44fnl34j"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -12815,12 +12815,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-10-11"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "2e309e74c16700cfc5e2c32541e29b95f0a5bdd3"; - sha256 = "1mzyv9xami4y1mjj1hs2vwgfkam9gsvgv1rilb3rkihbzpk89aw0"; + rev = "9c245831abf8b2685121101888dd4814c853fddc"; + sha256 = "0jjplsl3isvqq247fh0zf28dh9s1l06ygrn345nijkl0fasspr7y"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -12828,12 +12828,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-10-18"; + version = "2022-10-20"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "aacc06295f4790ebeec166462cc775d716c1b0e7"; - sha256 = "0jfmzf6yqzp7css82ihjci4rcxsjc5laf3rbkabvd6dsa5qjbbl7"; + rev = "caaea7e9df67113b53207d4a9454ebce09eb63d2"; + sha256 = "152wb08g31fvp3n8r6v5mnnqcm0vdvj9wj0qaaw80jsys1qp1dq3"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13177,12 +13177,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-10-20"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "56604126c671aac3bebd6a33c9d1c55ac9359ce1"; - sha256 = "0czkqads8i9m0vc2np55glay0s6ii1y6nbb07sr9ck356qj6ix40"; + rev = "c9c272f8f53968473873478591bfb4f5c1418370"; + sha256 = "019kg05yczcshm7s1dw4dnc05vdglk4yk548r98mq38ara8vjb3h"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13201,12 +13201,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-10-20"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "d028cffc3dfb9f78187c6bb3c57013af3e8ab081"; - sha256 = "0l9x1kvjbsg6c2d9ww6hmf0qz8v5r34g80agqw8is5nvmbsqfa8j"; + rev = "ccf090af9b708b9ad3531527ec69e12e6d8c58fa"; + sha256 = "06k75radisg84mzb0254b9c8mm2d3j5hsmcyn74h7d53m1ccvwg0"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -13273,12 +13273,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-10-03"; + version = "2022-10-20"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "69dca24ba7f8e74f1e6f0bacbc93481ac4047f2e"; - sha256 = "1n6q7h53zbbybyi219hamagpycasvnnxjgvifsdrxw7825zdnlsy"; + rev = "82c86091b4dd999761a0494408d30e39a51f49c2"; + sha256 = "125lv3hb1vimv1bfx8dxmiap97dihm28fkhh4na98i5hjf7lhqas"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; From 3716e5901dab43d205183a394cbb6fad94313d35 Mon Sep 17 00:00:00 2001 From: "\"Alexander Sieg\"" <"alex@xanderio.de"> Date: Fri, 21 Oct 2022 14:31:20 +0200 Subject: [PATCH 090/106] vimPlugins: resolve github repository redirects --- pkgs/applications/editors/vim/plugins/generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8864501724ed..c165627d0ab8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -12936,12 +12936,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2022-09-18"; + version = "2022-10-21"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "6885b669523ff4238de99a7c653d47b081b5506d"; - sha256 = "1fwb3mmc190xam96jm743ml56idx3zvqmxf8j61yhb8879879rj6"; + rev = "26eb5300565b7bc1f5d8163ef2c49d6f0a14bc5f"; + sha256 = "0agfa4nbfwrq7zczzr93653gpk4x8i5vgv628fh1nif26idgqwki"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; From f3edf110ed27265614626698e0dfd4bfeecb15cb Mon Sep 17 00:00:00 2001 From: "\"Alexander Sieg\"" <"alex@xanderio.de"> Date: Fri, 21 Oct 2022 14:31:41 +0200 Subject: [PATCH 091/106] vimPlugins.dracula-nvim: init at 2022-10-21 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c165627d0ab8..fcc5b8db6bf1 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2610,6 +2610,18 @@ final: prev: meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; + dracula-nvim = buildVimPluginFrom2Nix { + pname = "dracula.nvim"; + version = "2022-10-21"; + src = fetchFromGitHub { + owner = "Mofiqul"; + repo = "dracula.nvim"; + rev = "ca1fc7a554386c2d31996ee28c8ad70731117bce"; + sha256 = "11jzhzr0yx67gci3gbxzif9hyvk7pw533ii0r24wbfv7nh9dvqh6"; + }; + meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; + }; + dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; version = "2022-10-03"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 54f0a669856d..8688c3322a54 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -218,6 +218,7 @@ https://github.com/monaqa/dial.nvim/,HEAD, https://github.com/sindrets/diffview.nvim/,, https://github.com/direnv/direnv.vim/,, https://github.com/doki-theme/doki-theme-vim/,, +https://github.com/Mofiqul/dracula.nvim/,HEAD, https://github.com/stevearc/dressing.nvim/,, https://github.com/Shougo/echodoc.vim/,, https://github.com/sainnhe/edge/,, From 7987c0b6ca182d22179c91a58fa8fe0a0d9f9bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Fri, 21 Oct 2022 14:35:21 +0200 Subject: [PATCH 092/106] odo: update meta data --- pkgs/applications/networking/cluster/odo/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/odo/default.nix b/pkgs/applications/networking/cluster/odo/default.nix index a91ac4ce33e4..212caa74bf6b 100644 --- a/pkgs/applications/networking/cluster/odo/default.nix +++ b/pkgs/applications/networking/cluster/odo/default.nix @@ -31,7 +31,8 @@ buildGoModule rec { meta = with lib; { description = "Developer-focused CLI for OpenShift and Kubernetes"; license = licenses.asl20; - homepage = "odo.dev"; + homepage = "https://odo.dev"; + changelog = "https://github.com/redhat-developer/odo/releases/v${version}"; maintainers = with maintainers; [ stehessel ]; platforms = platforms.unix; }; From c54a28030f9f0268c7575d1f6a6daa44da75ef34 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 18 Oct 2022 16:08:10 +0200 Subject: [PATCH 093/106] nixos/httpd: Make option adminAddr optional --- .../modules/services/web-servers/apache-httpd/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 6b43d46fdead..3ccff8aa5008 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -168,7 +168,7 @@ let ServerName ${hostOpts.hostName} ${concatMapStrings (alias: "ServerAlias ${alias}\n") hostOpts.serverAliases} - ServerAdmin ${adminAddr} + ${optionalString (adminAddr != null) "ServerAdmin ${adminAddr}"} SSLEngine off @@ -187,7 +187,7 @@ let ServerName ${hostOpts.hostName} ${concatMapStrings (alias: "ServerAlias ${alias}\n") hostOpts.serverAliases} - ServerAdmin ${adminAddr} + ${optionalString (adminAddr != null) "ServerAdmin ${adminAddr}"} SSLEngine on SSLCertificateFile ${sslServerCert} SSLCertificateKeyFile ${sslServerKey} @@ -455,8 +455,9 @@ in }; adminAddr = mkOption { - type = types.str; + type = types.nullOr types.str; example = "admin@example.org"; + default = null; description = lib.mdDoc "E-mail address of the server administrator."; }; From bd3acf7393077b15836816fd9856d16c2ffe6ed9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 21 Oct 2022 17:41:56 +0300 Subject: [PATCH 094/106] amarok: add breeze-icons to be a fallback for when there are no globally installed icons breeze-icons will be added to XDG_DATA_DIRS in the wrapper if the user has set their own icon theme then breeze-icons won't be used --- pkgs/applications/audio/amarok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 10d1bb9ca656..4e5706495902 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -2,7 +2,7 @@ , extra-cmake-modules, kdoctools , qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine , karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem -, fftw, phonon, plasma-framework, threadweaver +, fftw, phonon, plasma-framework, threadweaver, breeze-icons , curl, ffmpeg, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras }: @@ -24,7 +24,7 @@ mkDerivation rec { karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem phonon plasma-framework threadweaver curl fftw ffmpeg gdk-pixbuf libaio liblastfm libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static - pcre snappy taglib taglib_extras + pcre snappy taglib taglib_extras breeze-icons ]; enableParallelBuilding = true; From e9b1dbb4b5f45ea3e05a3f629d6a623175a57566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Oct 2022 19:32:14 +0200 Subject: [PATCH 095/106] mdcat: 0.28.0 -> 0.29.0 --- pkgs/tools/text/mdcat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 0b2a4acd0b59..cc46a5acf5f9 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "mdcat"; rev = "mdcat-${version}"; - sha256 = "sha256-l64gRoWYYLbPA0n6vNQf14CCUtnkfMnQdqbetIbWvBU="; + sha256 = "sha256-Fh2OVb4d6WHuoJM503jaN9lan/JCrxMXZjCVpvuYbRQ="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-MCldDRleFfl4UrITuMEmLo0JyR+eoi6S6zGvFOMnIBE="; + cargoSha256 = "sha256-ZwJX+kXpj6nARFDx/+LsHWLzMUGBYJvM0DA0+WZukpI="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. From c075296bff5ab1bc412e43e8a661a61032126040 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Oct 2022 17:41:15 +0000 Subject: [PATCH 096/106] inlyne: 0.2.0 -> 0.2.1 --- pkgs/applications/misc/inlyne/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index a68ec733ab71..abee5ab46c62 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -23,16 +23,16 @@ rustPlatform.buildRustPackage rec { pname = "inlyne"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "trimental"; repo = pname; rev = "v${version}"; - sha256 = "1y8nxz20agmrdcl25wry8lnpg86zbkkkkiscljwd7g7a831hlb9z"; + sha256 = "sha256-jFocERr2cW7zdLiYfAay5Dh1issKAHp6vRWYWR1Axcg="; }; - cargoSha256 = "sha256-NXVwydEn4hX/4NorDx6eE+sWQXj1jwZgzpDE3wg8OkU="; + cargoSha256 = "sha256-mH8tu8koprmHo6JJ9AwYMexy2SFR2yukZmFT060cuZ4="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; From 177e532253560cb71d992b1eec418ecc00f6b23b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Oct 2022 20:09:35 +0200 Subject: [PATCH 097/106] playwright.browsers: fix build --- pkgs/development/python-modules/playwright/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index cea762819573..24c5107f83de 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -114,7 +114,7 @@ let jq ]; } ('' - BROWSERS_JSON=${driver}/share/playwright-driver/package/browsers.json + BROWSERS_JSON=${driver}/package/browsers.json '' + lib.optionalString withChromium '' CHROMIUM_REVISION=$(jq -r '.browsers[] | select(.name == "chromium").revision' $BROWSERS_JSON) mkdir -p $out/chromium-$CHROMIUM_REVISION/chrome-linux From 55b3f2ad0b50316e9614783ed5ccb831aff11c47 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 20 Oct 2022 14:17:13 -0700 Subject: [PATCH 098/106] python3Packages.jaxlib-bin: 0.3.0 -> 0.3.22 * Drop support for python versions <3.10 * Drop support for cuDNN <8.2 * Add support for aarch64-darwin --- .../development/python-modules/jaxlib/bin.nix | 67 +++++++------------ 1 file changed, 23 insertions(+), 44 deletions(-) diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index a041edbd2cc6..1d3fb481b338 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -3,7 +3,7 @@ # https://storage.googleapis.com/jax-releases/libtpu_releases.html. # For future reference, the easiest way to test the GPU backend is to run -# NIX_PATH=.. nix-shell -p python3 python3Packages.jax "python3Packages.jaxlib.override { cudaSupport = true; }" +# NIX_PATH=.. nix-shell -p python3 python3Packages.jax "python3Packages.jaxlib-bin.override { cudaSupport = true; }" # export XLA_FLAGS=--xla_gpu_force_compilation_parallelism=1 # python -c "from jax.lib import xla_bridge; assert xla_bridge.get_backend().platform == 'gpu'" # python -c "from jax import random; random.PRNGKey(0)" @@ -35,46 +35,32 @@ let inherit (cudaPackages) cudatoolkit cudnn; in -# There are no jaxlib wheels targeting cudnn <8.0.5, and although there are -# wheels for cudatoolkit <11.1, we don't support them. assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1"; -assert cudaSupport -> lib.versionAtLeast cudnn.version "8.0.5"; +assert cudaSupport -> lib.versionAtLeast cudnn.version "8.2"; let - version = "0.3.0"; + version = "0.3.22"; pythonVersion = python.pythonVersion; - # Find new releases at https://storage.googleapis.com/jax-releases. When - # upgrading, you can get these hashes from prefetch.sh. + # Find new releases at https://storage.googleapis.com/jax-releases/jax_releases.html. + # When upgrading, you can get these hashes from prefetch.sh. See + # https://github.com/google/jax/issues/12879 as to why this specific URL is + # the correct index. cpuSrcs = { - "3.9" = fetchurl { - url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl"; - hash = "sha256-AfBVqoqChEXlEC5PgbtQ5rQzcbwo558fjqCjSPEmN5Q="; + "x86_64-linux" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp310-cp310-manylinux2014_x86_64.whl"; + hash = "sha256-w2wo0jk+1BdEkNwfSZRQbebdI4Ac8Kgn0MB0cIMcWU4="; }; - "3.10" = fetchurl { - url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp310-none-manylinux2010_x86_64.whl"; - hash = "sha256-9uBkFOO8LlRpO6AP+S8XK9/d2yRdyHxQGlbAjShqHRQ="; + "aarch64-darwin" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/mac/jaxlib-${version}-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-7Ir55ZhBkccqfoa56WVBF8QwFAC2ws4KFHDkfVw6zm0="; }; }; - gpuSrcs = { - "3.9-805" = fetchurl { - url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl"; - hash = "sha256-CArIhzM5FrQi3TkdqpUqCeDQYyDMVXlzKFgjNXjLJXw="; - }; - "3.9-82" = fetchurl { - url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl"; - hash = "sha256-Q0plVnA9pUNQ+gCHSXiLNs4i24xCg8gBGfgfYe3bot4="; - }; - "3.10-805" = fetchurl { - url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp310-none-manylinux2010_x86_64.whl"; - hash = "sha256-JopevCEAs0hgDngIId6NqbLam5YfcS8Lr9cEffBKp1U="; - }; - "3.10-82" = fetchurl { - url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp310-none-manylinux2010_x86_64.whl"; - hash = "sha256-2f5TwbdP7EfQNRM3ZcJXCAkS2VXBwNYH6gwT9pdu3Go="; - }; + gpuSrc = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp310-cp310-manylinux2014_x86_64.whl"; + hash = "sha256-rabU62p4fF7Tu/6t8LNYZdf6YO06jGry/JtyFZeamCs="; }; in buildPythonPackage rec { @@ -82,23 +68,16 @@ buildPythonPackage rec { inherit version; format = "wheel"; - # At the time of writing (2022-03-03), there are releases for <=3.10. - # Supporting all of them is a pain, so we focus on 3.9, the current nixpkgs - # python3 version, and 3.10. - disabled = !(pythonVersion == "3.9" || pythonVersion == "3.10"); + # At the time of writing (2022-10-19), there are releases for <=3.10. + # Supporting all of them is a pain, so we focus on 3.10, the current nixpkgs + # python version. + disabled = !(pythonVersion == "3.10"); - src = - if !cudaSupport then cpuSrcs."${pythonVersion}" else - let - # jaxlib wheels are currently provided for cudnn versions at least 8.0.5 and - # 8.2. Try to use 8.2 whenever possible. - cudnnVersion = if (lib.versionAtLeast cudnn.version "8.2") then "82" else "805"; - in - gpuSrcs."${pythonVersion}-${cudnnVersion}"; + src = if !cudaSupport then cpuSrcs."${stdenv.hostPlatform.system}" else gpuSrc; # Prebuilt wheels are dynamically linked against things that nix can't find. # Run `autoPatchelfHook` to automagically fix them. - nativeBuildInputs = [ autoPatchelfHook ] ++ lib.optional cudaSupport addOpenGLRunpath; + nativeBuildInputs = lib.optionals cudaSupport [ autoPatchelfHook addOpenGLRunpath ]; # Dynamic link dependencies buildInputs = [ stdenv.cc.cc ]; @@ -142,6 +121,6 @@ buildPythonPackage rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; maintainers = with maintainers; [ samuela ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-darwin" "x86_64-linux" ]; }; } From d9a6568d1ceecdb2b73a3e3d7f084a9b95066b93 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 20 Oct 2022 14:17:57 -0700 Subject: [PATCH 099/106] python3Packages.jaxlib: 0.3.15 -> 0.3.22 --- pkgs/development/python-modules/jaxlib/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 12ba67b71244..a47e4e3d9529 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -53,7 +53,7 @@ let inherit (cudaPackages) cudatoolkit cudnn nccl; pname = "jaxlib"; - version = "0.3.15"; + version = "0.3.22"; meta = with lib; { description = "JAX is Autograd and XLA, brought together for high-performance machine learning research."; @@ -96,7 +96,7 @@ let owner = "google"; repo = "jax"; rev = "${pname}-v${version}"; - sha256 = "sha256-pIl7zzl82w5HHnJadH2vtCT4mYFd5YmM9iHC2GoJD6s="; + hash = "sha256-bnczJ8ma/UMKhA5MUQ6H4az+Tj+By14ZTG6lQQwptQs="; }; nativeBuildInputs = [ @@ -235,11 +235,11 @@ let fetchAttrs = { sha256 = if cudaSupport then - "sha256-tdO4YjO985zbittb16RFWgxgUBrHYQfv5gRsA4IAkTk=" + "sha256-Z9GDWGv+1YFyJjudyshZfeRJsKShoA1kIbNR3h3GxPQ=" else if stdenv.isDarwin then - "sha256-+XYxfXBCASueqDGg0Zqcmpf7zmemYM6xCE+x0rl3j34=" + "sha256-i3wiJHD4+pgTvDMhnYiQo9pdxxKItgYnc4/4wGt2NXM=" else - "sha256-La1wC8X5aGK5mXvYy/kO8n4J+zaRZEc/DAX5zaH1D5A="; + "sha256-liRxmjwm0OmVMfgoGXx+nGBdW2fzzP/d4zmK6A59HAM="; }; buildAttrs = { @@ -293,7 +293,9 @@ buildPythonPackage { inherit meta pname version; format = "wheel"; - src = "${bazel-build}/jaxlib-${version}-cp${builtins.replaceStrings ["."] [""] python.pythonVersion}-none-${platformTag}.whl"; + src = + let cp = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; + in "${bazel-build}/jaxlib-${version}-${cp}-${cp}-${platformTag}.whl"; # Note that cudatoolkit is necessary since jaxlib looks for "ptxas" in $PATH. # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 for From bbaad9c2fa76d8bd884f25bca14b6dcdb9cc12bd Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 20 Oct 2022 14:18:08 -0700 Subject: [PATCH 100/106] python3Packages.jaxlib{-bin}: no longer need to pin the cudaPackages version --- pkgs/top-level/python-packages.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4509e33aef52..5a100604dacd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4780,9 +4780,6 @@ in { jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { cudaSupport = pkgs.config.cudaSupport or false; - # At the time of writing (2022-04-18), `cudaPackages.nccl` is broken, so we - # pin to `cudaPackages_11_6` instead. - cudaPackages = pkgs.cudaPackages_11_6; }; jaxlib-build = callPackage ../development/python-modules/jaxlib rec { @@ -4792,9 +4789,6 @@ in { }; # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'. cudaSupport = pkgs.config.cudaSupport or false; - # At the time of writing (2022-04-18), `cudaPackages.nccl` is broken, so we - # pin to `cudaPackages_11_6` instead. - cudaPackages = pkgs.cudaPackages_11_6; IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; protobuf = pkgs.protobuf3_20; # jaxlib-build 0.3.15 won't build with protobuf 3.21 }; From 38cd4258faa6ec2f9c67f8d7388233e180b111bc Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 20 Oct 2022 14:18:18 -0700 Subject: [PATCH 101/106] python3Packages.jax: 0.3.16 -> 0.3.23 --- pkgs/development/python-modules/jax/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 9970783aa3bc..07f4f5efedbd 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -21,7 +21,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.3.16"; + version = "0.3.23"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "jax-v${version}"; - hash = "sha256-4idh7boqBXSO9vEHxEcrzXjBIrKmmXiCf6cXh7En1/I="; + hash = "sha256-ruXOwpBwpi1G8jgH9nhbWbs14JupwWkjh+Wzrj8HVU4="; }; # jaxlib is _not_ included in propagatedBuildInputs because there are @@ -92,9 +92,8 @@ buildPythonPackage rec { "tests/sparse_test.py" ]; - pythonImportsCheck = [ - "jax" - ]; + # As of 0.3.22, `import jax` does not work without jaxlib being installed. + pythonImportsCheck = [ ]; meta = with lib; { description = "Differentiate, compile, and transform Numpy code"; From aa00343cbce0170993db248f9c837131a227dcd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Oct 2022 20:20:05 +0200 Subject: [PATCH 102/106] python310Packages.playwright: test driver,browsers with ofborg --- pkgs/development/python-modules/playwright/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 24c5107f83de..3852bb3c5e90 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -200,7 +200,7 @@ buildPythonPackage rec { "playwright" ]; - passthru = { + passthru = rec { inherit driver; browsers = { x86_64-linux = browsers-linux { }; @@ -210,6 +210,10 @@ buildPythonPackage rec { }.${system} or throwSystem; browsers-chromium = browsers-linux { withFirefox = false; }; browsers-firefox = browsers-linux { withChromium = false; }; + + tests = { + inherit driver browsers; + }; }; meta = with lib; { From bb96577b51766adcda5a1ad5c9d3310ae276cc47 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 21 Oct 2022 21:56:52 +0200 Subject: [PATCH 103/106] calibre-web: don't rely on flask_login alias --- pkgs/servers/calibre-web/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index 91a5e4fdd1c5..50198b392797 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { backports_abc chardet flask-babel - flask_login + flask-login flask_principal flask-wtf iso-639 From 688794c4ca9f87919c397d67789b086102e2e7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Oct 2022 23:20:40 +0200 Subject: [PATCH 104/106] python310Packages.playwright: fix x86_64-darwin hash --- pkgs/development/python-modules/playwright/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 3852bb3c5e90..d9adb09e0db1 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -43,7 +43,7 @@ let sha256 = { x86_64-linux = "0x71b4kb8hlyacixipgfbgjgrbmhckxpbmrs2xk8iis7n5kg7539"; aarch64-linux = "125lih7g2gj91k7j196wy5a5746wyfr8idj3ng369yh5wl7lfcfv"; - x86_64-darwin = "0z2kww4iby1izkwn6z2ai94y87bkjvwak8awdmjm8sgg00pa9l1a"; + x86_64-darwin = "sha256-TzprR95KHYBu9SruI4BgwCaqI7KKe3HuzgCO1A5YFiM="; aarch64-darwin = "0qajh4ac5lr1sznb2c471r5c5g2r0dk2pyqz8vhvnbk36r524h1h"; }.${system} or throwSystem; }; From 4bf5284ef49a6fa9e73c58eaec0d43f7f669fa1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Oct 2022 22:19:25 +0000 Subject: [PATCH 105/106] treesheets: unstable-2022-10-11 -> unstable-2022-10-20 --- pkgs/applications/office/treesheets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 6a0bb48c7ded..2920ae3ccf8c 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2022-10-11"; + version = "unstable-2022-10-20"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "be79e537c148d961d40137a7f83d7bdcc4119dd6"; - sha256 = "GKRxb6W9PDY7nzgPTPRPmA9GBvD4zLaZwnalZan3+m0="; + rev = "12580ce39ee89f0ae6b9bdb304f7bc68a74ecdf7"; + sha256 = "Z1BAYRcoeYOWomfwgBS/CQbejARs6sqsyZorhbJ/RdI="; }; nativeBuildInputs = [ From 949be351f6200a16ef82487864bd38c7a386f979 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 08:58:42 +0000 Subject: [PATCH 106/106] gpsd: 3.23.1 -> 3.24 --- pkgs/servers/gpsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 1327ea5d7399..d1b11dfd3d55 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "gpsd"; - version = "3.23.1"; + version = "3.24"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-C5kc6aRlOMTqRQ96juQo/0T7T41mX93y/+QP4K6abAk="; + sha256 = "sha256-AO4T9hVlUoSHSmYb4TVTq+ZhKObetc1kivm8DLNF/lw="; }; # TODO: render & install HTML documentation using asciidoctor