From 0c59d1f2a3799c6004435b91d682b4448511ea3c Mon Sep 17 00:00:00 2001 From: Benjamin Sayers Date: Thu, 25 Aug 2022 16:44:10 +0100 Subject: [PATCH 01/58] nixos/docs: updated MBR partitioning steps --- .../manual/from_md/installation/installing.chapter.xml | 9 +++++++++ nixos/doc/manual/installation/installing.chapter.md | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/from_md/installation/installing.chapter.xml b/nixos/doc/manual/from_md/installation/installing.chapter.xml index 0112458674b5..59a11fdfe275 100644 --- a/nixos/doc/manual/from_md/installation/installing.chapter.xml +++ b/nixos/doc/manual/from_md/installation/installing.chapter.xml @@ -243,6 +243,15 @@ OK # parted /dev/sda -- mkpart primary 1MB -8GB + + + + + Set the root partition’s boot flag to + on. This allows the disk to be booted from. + + +# parted /dev/sda -- set 1 boot on diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index 7254f9d18406..d4c0e74939d1 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -183,7 +183,13 @@ update /etc/fstab. # parted /dev/sda -- mkpart primary 1MB -8GB ``` -3. Finally, add a *swap* partition. The size required will vary +3. Set the *root* partition's boot flag to on. This allows the disk to be booted from. + + ```ShellSession + # parted /dev/sda -- set 1 boot on + ``` + +4. Finally, add a *swap* partition. The size required will vary according to needs, here a 8GiB one is created. ```ShellSession From c9627929279ebba679a357e3d5169e8011b2d692 Mon Sep 17 00:00:00 2001 From: Benjamin Sayers Date: Fri, 2 Sep 2022 11:39:25 +0100 Subject: [PATCH 02/58] nixos/docs: revised MBR partitioning steps --- nixos/doc/manual/from_md/installation/installing.chapter.xml | 4 ++-- nixos/doc/manual/installation/installing.chapter.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/from_md/installation/installing.chapter.xml b/nixos/doc/manual/from_md/installation/installing.chapter.xml index 59a11fdfe275..e0ff368b800c 100644 --- a/nixos/doc/manual/from_md/installation/installing.chapter.xml +++ b/nixos/doc/manual/from_md/installation/installing.chapter.xml @@ -247,8 +247,8 @@ OK - Set the root partition’s boot flag to - on. This allows the disk to be booted from. + Set the root partition’s boot flag to on. This allows the + disk to be booted from. # parted /dev/sda -- set 1 boot on diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index d4c0e74939d1..b1e58b14b783 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -183,7 +183,7 @@ update /etc/fstab. # parted /dev/sda -- mkpart primary 1MB -8GB ``` -3. Set the *root* partition's boot flag to on. This allows the disk to be booted from. +3. Set the root partition's boot flag to on. This allows the disk to be booted from. ```ShellSession # parted /dev/sda -- set 1 boot on From 60a7d2e58dc4da15dd5f8d2e9c87ec94845a3a68 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 3 Sep 2022 22:25:49 -0400 Subject: [PATCH 03/58] libAfterImage: fix compatibility with giflib 5 --- pkgs/development/libraries/libAfterImage/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index b414d79b0ad2..3bbbe49eb294 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -54,6 +54,13 @@ stdenv.mkDerivation { # workaround '-p0' patchflags below. stripLen = 1; }) + + # fix https://github.com/root-project/root/issues/10990 + (fetchpatch { + url = "https://github.com/root-project/root/pull/11243/commits/e177a477b0be05ef139094be1e96a99ece06350a.diff"; + hash = "sha256-2DQmJGHmATHawl3dk9dExncVe1sXzJQyy4PPwShoLTY="; + stripLen = 5; + }) ]; patchFlags = [ "-p0" ]; From fa5155a4e5994774267a6bd529e5f175d203fd4e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 3 Sep 2022 22:27:02 -0400 Subject: [PATCH 04/58] libAfterImage: pass --without-x explicitly This fixes build on GitHub Actions macOS machines. --- pkgs/development/libraries/libAfterImage/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index 3bbbe49eb294..a569b59621e0 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -81,7 +81,8 @@ stdenv.mkDerivation { "--disable-mmx-optimization" "--${if static then "enable" else "disable"}-staticlibs" "--${if !static then "enable" else "disable"}-sharedlibs" - ] ++ lib.optional withX "--with-x"; + "--${if withX then "with" else "without"}-x" + ]; meta = with lib; { homepage = "http://www.afterstep.org/afterimage/"; From a1b37896b5f286cfd5abf5083a6b1fa5559e49b8 Mon Sep 17 00:00:00 2001 From: Marek Generowicz Date: Mon, 5 Sep 2022 14:36:14 +0300 Subject: [PATCH 05/58] ledger-live-desktop: 2.46.0 -> 2.46.2 ledger-live-desktop: 2.46.0 -> 2.46.2 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 7e84dd43893f..10c95a91eda2 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.46.0"; + version = "2.46.2"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-QbCiOzASqicd0Tns1sV9ZVoc/GmuoohB9wB/g0Z6uFA="; + hash = "sha256-fSfES+6+LCRTLdOy3RJaHzv0zRXkqT+0Rsdt2kSeU18="; }; appimageContents = appimageTools.extractType2 { From 9f8ee9cffee589eb038c04c391cc505452fdb003 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 6 Sep 2022 23:53:34 +0200 Subject: [PATCH 06/58] python310Packages.numba-scipy: fix build Caused by a stall substitute --- pkgs/development/python-modules/numba-scipy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/numba-scipy/default.nix b/pkgs/development/python-modules/numba-scipy/default.nix index cd01bce1d135..f67d0be92270 100644 --- a/pkgs/development/python-modules/numba-scipy/default.nix +++ b/pkgs/development/python-modules/numba-scipy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { postPatch = '' # https://github.com/numba/numba-scipy/pull/76 substituteInPlace setup.py \ - --replace "scipy>=0.16,<=1.6.2" "scipy>=0.16" + --replace "scipy>=0.16,<=1.7.3" "scipy>=0.16" ''; checkInputs = [ From 7668535584910a292d613bde54b31b8c70422404 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 04:01:01 +0000 Subject: [PATCH 07/58] linode-cli: 5.22.0 -> 5.22.0 --- pkgs/tools/virtualization/linode-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 6ae156734909..7dfe15d67d62 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -13,8 +13,8 @@ let sha256 = "1fv53wikx745kci86xrsq9kfsgv0a65srhywdw32cab1wywwpn2z"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.133.0"; - specSha256 = "1jcjfnagjihcy03fcmn5sghdf7a80798xjgj1x7z3ncqwd5aggwg"; + specVersion = "4.135.0"; + specSha256 = "082rkpj8yl6s75y5i9zz287059fxf6zh9hdmdwa463lr6ig90kl4"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; sha256 = specSha256; From 50ba9f397a320246c0c3e9f9f32b463026306415 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 04:08:35 +0000 Subject: [PATCH 08/58] audible-cli: 0.2.1 -> 0.2.3 --- pkgs/tools/misc/audible-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/audible-cli/default.nix b/pkgs/tools/misc/audible-cli/default.nix index 48fe07fff72e..81b071ce0aad 100644 --- a/pkgs/tools/misc/audible-cli/default.nix +++ b/pkgs/tools/misc/audible-cli/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "audible-cli"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "mkb79"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-KPuAY/QMO2029tD4DMGCwmKuqpnxXAALYT+wE1ApfsI="; + sha256 = "sha256-z7oLY+xu+rTHgIWLFQU/TTSQtxChwhfu8nXoI05QqLw="; }; propagatedBuildInputs = with python3Packages; [ aiofiles audible click httpx pillow tabulate toml tqdm packaging setuptools questionary ]; From d487adc4ea9f9b949cd161dce7b5162cf0ff19a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 9 Sep 2022 10:26:34 +0200 Subject: [PATCH 09/58] thunderbird: 102.2.1 -> 102.2.2 https://www.thunderbird.net/en-US/thunderbird/102.2.2/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 08a94291c9de..0c34c2b17469 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -39,13 +39,13 @@ rec { }; thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.2.1"; + version = "102.2.2"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "7b69cfffb5de56690cbbd97f6b627733072dee498a15adfece990f9019df8df948762ce8eb2ca2d91ef12ff56262fb1905476d8a477aed70bc71cd2f9f986ea4"; + sha512 = "fe72ddb81d35d4a85b25a6d955a0b0f705aeda2dca0f572efca7ce94041c4ddcead6c690bda8d4bded4c43e12a15669f9608db6debec38d8b5157a914e280db5"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. From 5fe60b2fe5c86abea8aa27408fa6e45abb3dad75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 9 Sep 2022 10:28:32 +0200 Subject: [PATCH 10/58] thunderbird-bin: 102.2.1 -> 102.2.2 https://www.thunderbird.net/en-US/thunderbird/102.2.2/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 0181bdb6a2ae..3b944b91d08b 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.2.1"; + version = "102.2.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/af/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/af/thunderbird-102.2.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "d38c09e55cf1438269d80461672a615c155e975d65c8c35f5879f4236702c9eb"; + sha256 = "81f0274a9358a25a70589923a114d92452f2f693490e93ebdf65efa955c6e36a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ar/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ar/thunderbird-102.2.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "881eb9bafcea2646ab0830cc5a7d3ed2979b0e745ddb7a018336ed7b8382e491"; + sha256 = "27ebc77615606d1b7c3c2a2d5f9a3b1cf5343c7f17fa127467a410c02336780e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ast/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ast/thunderbird-102.2.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "17cba24fa82d4b3a16be5d44ea9be4b7bb1aff4b206841d5eb169815951a9f7f"; + sha256 = "05cf9d371640de3421c42ea464f6de6bdb1bc4eaff6ee43bbcff82513d034776"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/be/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/be/thunderbird-102.2.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "271b5d606fc489918cec8d8d316f0b8cf295a296b95a1dd458dd0b7f68fe148b"; + sha256 = "9c85da8f62f1300462c2bad9d19988c17ef7cc1bf093703b3c8d695c1049b832"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/bg/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/bg/thunderbird-102.2.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "1e68a8cd66f72712f74bc3735af6c0016256ebfe1c7c2e820624268ed8837350"; + sha256 = "3235edcae2382d6198fa66ac2c03f4e01fbf0890c7dc944921abfadb38e8303d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/br/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/br/thunderbird-102.2.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "82ab077f9a5f43875c6c82ad7d0e17f9c0b893e0bf307574fa8506e3220c8604"; + sha256 = "0c690d54d04b585f106d2ebf47aec2643ef730dff513ee3ef20d7d5ce884bfce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ca/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ca/thunderbird-102.2.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "2ed8291572dbfaee211f5b9fdb97d4faa591f853815d9eaa43b704270551b02e"; + sha256 = "814820aada02f77ac7f7bbf46488269b12f4112bd0d27820ec4cfbe9b07195e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/cak/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/cak/thunderbird-102.2.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "a5e472616951c799e6dbbdfedc3e8ba497812b027ab22c909166c3e452a29d74"; + sha256 = "12bfe570291becd5aa074be7dacba8f6b01068d9046e0c35aa0016cd7487b198"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/cs/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/cs/thunderbird-102.2.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "1d3d1e0355275152050a0c5d32fc0b0f6b53f336d02837ca7653416888e271b5"; + sha256 = "dbabd84e1380447fdd7435362fcdc0daf60af718693381336195d31790cd2331"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/cy/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/cy/thunderbird-102.2.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4b2f3cc7e1e81abdc52969cd08cd3586e14ea2ff574c8c3b334109dab00ccd64"; + sha256 = "2817bb295ea0f6d180dcdaed2e5152b1e89e25eb9d12eaebae6f5d74b7e9c06a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/da/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/da/thunderbird-102.2.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "89613187e078a6f341ad8799cb4980cca770b2a0ccb0969740f53e5e7073f00b"; + sha256 = "de91ba53ab1a416c5326611930c4b8031e9f7038791164e08ec9079ae49a6111"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/de/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/de/thunderbird-102.2.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "4b7a030cb532a94a6eb3cc1343144bb90abcb7b2fcd3df81dc126b831d0a2740"; + sha256 = "547576de35e0e7950d0d1150167e4bba6d7802abe498c97324fd3856a0d0eb51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/dsb/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/dsb/thunderbird-102.2.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e1d05cac1f513ba573239dd677da6edb94cda9badef57b168f498b5bc218a3ee"; + sha256 = "e64baa142d019eacf84ed9a30ca9490a7aa34cc647774f4b4be4eb9e852875da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/el/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/el/thunderbird-102.2.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d63891c05b56970021fdc455fe67d2d6f27233670e436b52522cfd012c503c74"; + sha256 = "e04c18427b47eda0583e62ec88a07bcba8b625d47762e355bbba0b5dd81807fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/en-CA/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/en-CA/thunderbird-102.2.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "34c81ec572000433e356ec5f13dbe461ca788b19ca0af9fc34ab50d7feda9cd1"; + sha256 = "cbb9ab2c74fa24e70be67defd94ea4777f7d4f45ba4e6f6074915dcb72756c43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/en-GB/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/en-GB/thunderbird-102.2.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "2e9aeef97495ebe462a62cfd0d9966b66cdf0a0464a8d5d012cf3d430b4a28cb"; + sha256 = "8b86fa495e54a99ef5bba2d6f1b507138ac85a5425e88f2e568e82501337b679"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/en-US/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/en-US/thunderbird-102.2.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "92883c21319411096c355569c43b6cae2cbe7770c1814a9997ea7b9746431271"; + sha256 = "a406c23d5e7cc372d68cd5d08f3c86c611fcb63a9b78a944e3e1a048fcb6dbec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/es-AR/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/es-AR/thunderbird-102.2.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "51730734c71b67ffc865646453fec802e92852fd9ab7eb371d31d9c3e843f810"; + sha256 = "831b31ce85bb7668befc8eed476befad689805c1ca5b2393ff433a391e2069bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/es-ES/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/es-ES/thunderbird-102.2.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c61667e937b15fdb22e03b7875a474e422069800780df73529b6811cdb384824"; + sha256 = "5e942c3308489d73f3c2f3a923d5fd4e8712e0b10f5a9d4e785b743afb92ffdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/es-MX/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/es-MX/thunderbird-102.2.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "7c5a404101f20fd9624c5402e8ba2c0699986739302de5739ad3304e2ea234f6"; + sha256 = "eb0ba009a05c402c215ca04bc32ca85e130fb26feb16d8f484dd5a6780f2d0ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/et/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/et/thunderbird-102.2.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5fb2498c2a7e1a76512ace5421bfff47a1ef336cf95f671e85188dce7c8fea78"; + sha256 = "1020c72f7316ee97510b7f6d8cceea49753f3f00d33cf33f6246abb492eca0ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/eu/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/eu/thunderbird-102.2.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "0eb3f3ca7e23e950ebafbdb6d4f4200279cc8e18a042a91ad163eb83c939c704"; + sha256 = "2c95c74fdb3115d2ac41b5ddf5fba8da63fb0946b87d1bc77740298ca55c0b40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/fi/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/fi/thunderbird-102.2.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "ae76c531ac5b826593310b2b4b2e01d877dd246379a7ae8427f6039eb5dd581f"; + sha256 = "0407e22920c7830d9f4214a6e42cd85fbbeff2c2422c3c9c10d5ec7330f4795f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/fr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/fr/thunderbird-102.2.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "3b344b3348487c393ea72012eb6fd82dd647e31cb1dd0c305dbe6aafa8438c53"; + sha256 = "8a3da1833d1088d87ef9a73e1dcdd875b0db5aa57bba659c7423e6a9052beb9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/fy-NL/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/fy-NL/thunderbird-102.2.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3143c39b7e3aac2d90e6d68e2d1f782a306fdabd69641a4aa31afd02b6cd172f"; + sha256 = "880e2585652b91265030345cb4bcf8aebbc5361a49d31edbe0a193b954df5214"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ga-IE/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ga-IE/thunderbird-102.2.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "db877b69e105c8d14b6ff420448712eafbaf6580a13fd415eb5112930a8633b8"; + sha256 = "e19acf7c7e3013cb39114615ad19dbc28d62b9b538d0cdffda44f50c4e105781"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/gd/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/gd/thunderbird-102.2.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3025fcddde35315267b3f0cc9d57696c5462bbe6705fb26b7a1be1eb670ca984"; + sha256 = "c4ac7117cad296e84aece7868d8747f7d70b9a5a94f2a7b2c7eb4711790dc5c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/gl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/gl/thunderbird-102.2.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "39469544764d5607d73d3ffc0eafbcd2117072b2af6dba1a4a7ab43c3af2eb75"; + sha256 = "b8a73f3349113154a2b330b44570138e0a715c0452058034ac33cdde1cd1d896"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/he/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/he/thunderbird-102.2.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "52c67f10bda950e12822207d41c6b425079d29f0d1d5654bb10b6e1d88751828"; + sha256 = "6a26ca35bec64b24d71d50e5c2bdf2139e442768a89153169d33ce8ba6b31d2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/hr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/hr/thunderbird-102.2.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "e584a8f724d8e337743f9ad22e637089c5771c082091e221aad55b97541e0c16"; + sha256 = "3c2010dd691155bd1f3184870905994a58f70e7911b5ab51496cfe6ae89597e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/hsb/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/hsb/thunderbird-102.2.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "0304b06dd0f23ca59f85e34e3068cd9ac3275c815e2e2004358540b38cf058c9"; + sha256 = "6adb0e04a8a3c9104f343ad6365acd2889499fbca192b80ff86652636d09a3b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/hu/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/hu/thunderbird-102.2.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ef155776003ddccfe863e920f31b45f673ef445c01556d69b6ed086561a74768"; + sha256 = "a46951b9a21b804685024ada9f386b6d81393bc66516affe2abf996d88835f40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/hy-AM/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/hy-AM/thunderbird-102.2.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c65a335777b3cd9ab95b14007a9b6f10304b17c267388889a7f299ea61c44fbf"; + sha256 = "37f04ccbe1a0ab6a2e25118aaf50186e2555f186f0d8a1b3352caa9b6158ee18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/id/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/id/thunderbird-102.2.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "a407cd50ed7b4fce63b2607632a82c4e9b853b76ba522a564aae219afd0034ed"; + sha256 = "9e754ea12d18fb9257712a95a93883685bc0afc3be1ebaec03d3aee5c2960efc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/is/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/is/thunderbird-102.2.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "6035248bcfde9fea269fa10ff3a87f035e3552b8cf76c10dfc86dd889cc7e958"; + sha256 = "c046d691e9a11b59ec8dcb325ed072a47e7e447e2abe06a8e52e280879d38386"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/it/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/it/thunderbird-102.2.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "afeef80077a18120cff1854d54067ccbc92b30f9c0e75b41067ec1e398340eb9"; + sha256 = "6d3e7bd4eaec2b8a88bebf883ade76be411a073f9c12ec0a9bb3c66cc9981e8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ja/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ja/thunderbird-102.2.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1d98a3c50d1aff70bec9ae9335708a85cf4458fbe0ff49db45a57f4d29614de4"; + sha256 = "5400f7453a76a5c761b8c22b4f50d444bd8112c3afe3a43b0e6338cfda4fe56e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ka/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ka/thunderbird-102.2.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "5c749efe25f328be5f17ba2b2eeda41af0ce69f0f3e9cbc8bb55d58a3990d99a"; + sha256 = "840cc16f368ebc3e6aa357ce3b41bacbafdccb510729fae8f1b76fc1c5bfb621"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/kab/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/kab/thunderbird-102.2.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "93b93383e4bad3b4f930bcbc35d178639a50fd7a30eaac573bc74b895955ec5a"; + sha256 = "c67e24314357d8f2d1e857339c234dbb1813e1ba4df0e107d25f3aefefebcac2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/kk/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/kk/thunderbird-102.2.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "298e2c42888f29b90fdc6589b6336c5c2261a5331f5d52db89ee5b6618ec120f"; + sha256 = "5b23cacf902762ec8f90536e3f1cb951077d674495fbfa3764707197dc413d89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ko/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ko/thunderbird-102.2.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "75625d041a0193cfd8015174a1eaddd7315f3030258e58828df4b3521863bba8"; + sha256 = "1c236ec1fe62e2e7969a4821aaad80a143347a5b775ea8ebb75b51c08c2acc80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/lt/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/lt/thunderbird-102.2.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "c5705caf0c71efb566a0d1828ec36e940940eeee23d37b9d66246abbb28114bc"; + sha256 = "ec59fae4f57313a4bb4ea9009369af1f12ad82e24f9013c8b34a73fc41762713"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/lv/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/lv/thunderbird-102.2.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "d26ea9198e8d5e9ae5f51fa2456181bd979694d7bc9bcab8f3a82c01233760d6"; + sha256 = "99828bf55cf13781efbaac4e0e99d42b669bd9be0f78302fd69efb6270dd225f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ms/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ms/thunderbird-102.2.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6dca09cd5f9306d102bca42d01607b63e1219324d1107447a728bab8693aeb8b"; + sha256 = "f8f6c88e562650d9c19988ad9bb878fec1c79af5a163beff1693a203f79341c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/nb-NO/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/nb-NO/thunderbird-102.2.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "8d2a62dd4ccade7544ecfc6a4f88bd354f70089cf161f2fe92aeb9886e6f6411"; + sha256 = "cbdab2fcf1bfd0dcac3c1e0e988bce513d789f6bba8e1b7cc65db1cf997b36d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/nl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/nl/thunderbird-102.2.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b82895cfc2058be4b7818ea17521deb014a17659ddb57c093cbdc26ab3e7f7cb"; + sha256 = "d8b3e422b7aa8baf63f4f8b057c57aa824e5e0b9cf9588f0076567cc2ef70559"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/nn-NO/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/nn-NO/thunderbird-102.2.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "aea319db70387a2f075776fcf07b29e433ca16f898af70689d9cd4ed9d98d52f"; + sha256 = "7b5eff29d874d33f07ea5e38b51fe1d0c2451b9d07ee9eea164ace136e6c86c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/pa-IN/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/pa-IN/thunderbird-102.2.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "02c366563dd39f64ae11f9377c62434291aaedd951cea43e867a236dcd99dc2d"; + sha256 = "ddee5093d6caccfe6f8666efc4978194302beea23396c7884c18144b077934c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/pl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/pl/thunderbird-102.2.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "5e2b8d486eacda9a8913e0ab60e2c4079d3fb89e827ca1fba871f2b6295c6cbc"; + sha256 = "ca14c3d7061aa0c0cc65651b21d10a83f375b730ca9d372095408e729d8e31dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/pt-BR/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/pt-BR/thunderbird-102.2.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "83339737a6ff360f1036a5b11b56f6d6648011f0c206a13da2b557aa85f4e2a0"; + sha256 = "0d4801320dd611ef12a858e0f1da9ba1077634d73c510c7660aebcfbec423ce7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/pt-PT/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/pt-PT/thunderbird-102.2.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4950899b2da0a706f39767199ec412e9da2b670bf15c29153244c5eb3a317731"; + sha256 = "a54938d91562d0fcab6875395b58f18dcc51f22727a289ecdf402f1cdc48639e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/rm/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/rm/thunderbird-102.2.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "d9030e30196b03c341b1fd9078447d9baf7542a119617494ea73d11192f194e0"; + sha256 = "b9df55f6fb6268bc534e0a82636af2fbbb7e046b46c6134bd50abf37254671f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ro/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ro/thunderbird-102.2.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "d3be25f071698102abc71b50d71253326a9201ff9db3e7935afdd27d728985e1"; + sha256 = "6c2ce54a34d5a1a6e3e29431998955793dd49157db74679951f537f61fcbac74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ru/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ru/thunderbird-102.2.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "f9a520adaca32180b01f18fb9b8280145075248378a4a1fd273c9687733cbf42"; + sha256 = "fac401762dd4cd9ca5870064212fbf928d63751827446a6e5ea870fdbdde4aae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/sk/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/sk/thunderbird-102.2.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "4045843feb9303bc65612d1060f874d21fdf39c0abadc84c84af0017b1fcee32"; + sha256 = "928958768474f0fe3d081be979891ca54a162fc24d7e8e27930d9035d330ffaa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/sl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/sl/thunderbird-102.2.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d914ee5a953b4ec651e634d7c2b971987ccb2ebdd130dd3ee4ab3d0cae274f59"; + sha256 = "a34dddb780a858e61a665661d1e2384cf853b431229689d860fef3622c9d0e0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/sq/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/sq/thunderbird-102.2.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "2fd3128af2a55cae9a8adc248afcc9497d602f0d36cb2cd7ff51aaca1b064487"; + sha256 = "fcae87e539cfa1b73ee78de3ca3d23a81d6b6cdaa81e22e819b07355b7112a2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/sr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/sr/thunderbird-102.2.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "2c5ffe0a8f4d431c37cb7f39fbd145937839425232aa72e173b88fa49628ded6"; + sha256 = "524da643994d056e0ecc1eb5d241eb4cc906e71fe0c821cec5eef78cadf695c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/sv-SE/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/sv-SE/thunderbird-102.2.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e98429f73e6379ebfb2bf98f9396f86025e158543e664b2b219875964dae6e1c"; + sha256 = "40ad15ecddd5d936da810f470faba93157c0b453503a48a83f7e69d2f6f742c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/th/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/th/thunderbird-102.2.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "605a86e6be2eabd0ade653f93fe62e6ae47eb80951fa9c7ab9035d13bc22e52f"; + sha256 = "b08db7a7a5f15aa7d0257858942f861457941b27e2ae2d73f0c65876c8fa2b11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/tr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/tr/thunderbird-102.2.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "51dfa4db80dd7596c24e6a0b67e1196d59b9083de63550862fccb6672535825a"; + sha256 = "126defec4dbab1cb25f23899542166628201ecc1d80ed566b99e427f1ce6e6cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/uk/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/uk/thunderbird-102.2.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a6fcd5719501d801ed0e9f39ac100309945e567d535e6972791ca97c509131fd"; + sha256 = "5b9af3defc3547caba361e3ebd460a3682a09a1207bac5abee08b67cb530d710"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/uz/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/uz/thunderbird-102.2.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e4666827e963fd2180babba2a117425cadff2bf47674e30225ec4f046cde1adf"; + sha256 = "af88cbbd45ae2c168c52d0d2f19d4940a4d448e4c3b68125eb359a2c6dbffb36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/vi/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/vi/thunderbird-102.2.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "67cfdc9bb1753852250aeb523f2f91ec2fdfcab910ca1e38ac61e3922f281ee9"; + sha256 = "dd6071e000258aae9406e7750238c96101a5280989a68b955b4ad3129a62768a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/zh-CN/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/zh-CN/thunderbird-102.2.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "f2bcca607b71c567f0ba3414e668e033633f05fff7404a1cd321d165172a36b6"; + sha256 = "da9f27ff43aa88c9e394b75b246a27639ef51f95203e955d16d3075872b43c0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/zh-TW/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/zh-TW/thunderbird-102.2.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e827be51e3af98fd484bb82d387754e5375cb7a5749bd1b8d0401632172165ed"; + sha256 = "57006f7eb829e7a2e8f6323bd01276e065b98da51a5b40e9d52c5fe057afe224"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/af/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/af/thunderbird-102.2.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "42e10d674f9bc1220a1ae08f5c20551ceb9030700991681b32df137fb1fbbda6"; + sha256 = "45b8a62bfa3a1c4c0d33a9c6332c3db769d6262740fdf63523cdac6a73c877f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ar/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ar/thunderbird-102.2.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d5a6370d2e20fea976165cc0d84c13832b8ded075fefdc98f21e1ab530dc8624"; + sha256 = "aa0c2fa1e459e3c7089fc0ca35c0abd259deca9f1a2dbea9a788f41e9bb9d927"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ast/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ast/thunderbird-102.2.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "19f2ac39f04b47fb2789b0c0df8b9e0634062bcd3f117cf2cf776a39d701ec7e"; + sha256 = "7c6d00d2d4bc270159fe383001070192612c360b19307d3f30564b251740e8e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/be/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/be/thunderbird-102.2.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "4e007951f445b5c9daf36523535db459e869b50b732a8e82f64b3c0d898c512f"; + sha256 = "1834f3bff9a9e59a350c4da3fc9accc06e7948db4be13a888b5ffbf41bd3665f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/bg/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/bg/thunderbird-102.2.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "6430c82f5ebc4daa2fc099d54f0aacc1d680a4c603fe69fe117490d58d9c7af3"; + sha256 = "77e09e97aa320c88c952a99ccf1f81b64374ed96dc124268baf138e0c41b9f1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/br/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/br/thunderbird-102.2.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "84568e1ec4284d1f81cf5f5627de0e19db7a32f57cb621210df27f61178961ea"; + sha256 = "256d12149eae5a9cd171f45b8fca86c69ab2161058921019d1decbb1c4931e60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ca/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ca/thunderbird-102.2.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "496bd038e349d2480c7ca8c05f8ec9ccd93d0e17210cf1ffe8f65c470a2db5ad"; + sha256 = "e1311c92360ed218361341f61529b2c4abd6c90a8458fd95c9401db9d4103011"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/cak/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/cak/thunderbird-102.2.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f1e811a5f1e821ecffb6d4d110f19fe55ef153992cbcf53980fd56c16552f663"; + sha256 = "34e6a9743bfbb88d6ddb00fc8343c4da5a7849dcc913ac1e9a17e44b35666da4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/cs/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/cs/thunderbird-102.2.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "6ff1add590d03bb49fab16ead5b549eb32c5767998ecc955c394163ef36d8554"; + sha256 = "c650dd57f13520963f59eb67931c6fa12c862515c31a505d026df0d5aef78342"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/cy/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/cy/thunderbird-102.2.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "6605ab434753eda8d9f67eb57d470616e9c3b202978d655738bdd4f478cbfd42"; + sha256 = "56511f4b9dfe2c4525c960a2031031881049adc8b4ef3daed9f8d12cf8dd81bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/da/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/da/thunderbird-102.2.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "7f60ac0c21c4894dbaacc43e74753e5dd29a768a31167eb3b0ad86c0333c247e"; + sha256 = "fde094d4ea03acafc9804964d14c4ffe091467f4bbc0871552344aadde758345"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/de/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/de/thunderbird-102.2.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "9d9ee8d7d92cbfa94732d915cfd4fd86278ff08225c4099d421f48527c5b279a"; + sha256 = "3ab1e257a58e01a107989a62854a407f9faf5ee4d1f6223221ad6fc9bd8a08ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/dsb/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/dsb/thunderbird-102.2.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "37c2ea9d16be51d4cbd9eff62d0a146681d52caa63e2407e1f0d8d422b7c62de"; + sha256 = "28fe086cad5e27a9baa68b28d9556914a385796d2420c2238f83f08c61efc982"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/el/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/el/thunderbird-102.2.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e3804af2c4a34c8ec6679e7a06449d00416641d17f2d58d15e745b25cac4fb82"; + sha256 = "94eaf766fae60a5204a8fef9306db32a32ccd670bc77fecf8f062b6f6c12096a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/en-CA/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/en-CA/thunderbird-102.2.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "6d2dc53467776fc068935a1181c3ec7f6c2ab9c6387ff8c12b4f689b904e9430"; + sha256 = "01652e32486efe2a610a3649d93128ecbb4d83c2b88a9f635775e95600255d56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/en-GB/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/en-GB/thunderbird-102.2.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "f0a2db3262832de3cf5edf4721327538af261a8eaae831337a1f1f732045f1a2"; + sha256 = "444a6814a90f982a9b515ae34831b0a421dc3543f50492219553d3c918f03913"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/en-US/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/en-US/thunderbird-102.2.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "04754457bbcd3b037c27cf5c1186ab1224fc01d3b1106c76ca21d26770ff28a1"; + sha256 = "66c7f533483337423fec636873278dc9d7af72acbee25cd4696b055006faae34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/es-AR/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/es-AR/thunderbird-102.2.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "9fd407ef93b7c613709312350b5ba520f06c5b0d664e315ef671f85e5af50ac0"; + sha256 = "74b59f5777a884b281f64872ce268f5a096a571e5b37158f26757725f569f4e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/es-ES/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/es-ES/thunderbird-102.2.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a3975e3489c8c67374a7ade117a45c85aa42c5379670204571dce0118f7aaf8f"; + sha256 = "feea88b74e5b3576a333b4a9b867afaf4412540ba45103ade194af28013a1259"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/es-MX/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/es-MX/thunderbird-102.2.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "857d1f4073ffbfa81a1ad17d219ccde4f8a8b18adc6e3e2f844020be32e1c5a8"; + sha256 = "fbf4a44defa20ee88152ad45ed2368bbf97f4d1979e7ac731ba08e7d0caf1be9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/et/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/et/thunderbird-102.2.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "37b5f428f5f16dc80736de0c2f23ca24003de5d4639e1500f303b1f4aa664460"; + sha256 = "abd03a775f1295e16dbbb2c4116f5193fc73b99e39b3a0f9e7a5de9eced240c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/eu/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/eu/thunderbird-102.2.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "0e4a8abe3b956d304d79218d63f64b01ef566122d00d025ef69c07f73aa87fec"; + sha256 = "90f90a640af343f87279af424da423d927dfaf3a08d9155a9469d42a734e7bfa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/fi/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/fi/thunderbird-102.2.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "0a3242f6d791ab5f1be52b67d8f95ac8245bc7cf556f9dda814c2827d8f60e40"; + sha256 = "d8fbcad40e09ad5d193d3a520ee9fec023df89e545e9aae75bface677d2b2c8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/fr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/fr/thunderbird-102.2.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "32c67c444bbe3d920aa4c30226fdbf469d5caba7a066b3d84270d0f9e0daabe5"; + sha256 = "a78e8962cd4121e5a4a2ceb573d7b69a61ed3706163ff47c6d1c960847cb7ded"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/fy-NL/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/fy-NL/thunderbird-102.2.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "0405585c63321c44f3f459356db4bbd0cf73cccf7ae6c8684b13152e3aa3b7f3"; + sha256 = "39f416be5d19d31c84fd8c02805a1d5fdadb665aabccaeee78ab1e53fffaa9ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ga-IE/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ga-IE/thunderbird-102.2.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "54e4e55b3339d6436591d8967de6c1cffab94da38d064df6fc0d8b85c4475d84"; + sha256 = "d270e50e6c79f37401c080567caec4e852a3138a3f3fe095a759d1d6e118b691"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/gd/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/gd/thunderbird-102.2.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "46130971e0b49bb45c6895d7cf9ec890d7f95fda6479bba38cf180d36e4c4eb7"; + sha256 = "62723dd4145b2aab4d91e3d7be6763474c23eb969407b532eb21e8e95d00c497"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/gl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/gl/thunderbird-102.2.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6e0ae14bb163b5a10c58cbdd49793e69d9d5042b0045f40be4c595781ad84c92"; + sha256 = "933795b2c0d3ab6b56d943470f3c0b5df3b4907acbdccb9f7f70ea300e094a50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/he/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/he/thunderbird-102.2.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "6d353e9ec5a72366b991854aea9163385ab902c812690c0161790c882343e5a4"; + sha256 = "265d98ccba83b5eff448318d2208e11cbac484d0eec01f796bfee590d4473657"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/hr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/hr/thunderbird-102.2.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "a05a828b434cb2677b1d3c9f317d5448db003c1373edbb84d1822182a93d3e7c"; + sha256 = "bc120009485b1d3b91cbd87018b6e4af229d1beabb2f6aed18d498ec58cb6fdb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/hsb/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/hsb/thunderbird-102.2.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4573f6938c41160f1d4c79be035f24426bc83d9440b36ca269004b729a5564e2"; + sha256 = "8d1cf043172256f022d6ead46545b36cc366570838d6d45814b78b8484d504e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/hu/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/hu/thunderbird-102.2.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "727246ee523554d64ff72611d353aead8c8b79e8f55cf187b3fb3d9f442a947e"; + sha256 = "93c1ab56e082c2e9d579031570e496175f7fa701840a5a8c25604ecb0b333c78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/hy-AM/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/hy-AM/thunderbird-102.2.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "467c8af9d3cfdbd18ea04214369b9d262c9d925a171a2f56548af00ec85a3611"; + sha256 = "f141fdd4521ad0bd2c7133f8a7b87bfea09f2c82be7c72271370555f80426c8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/id/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/id/thunderbird-102.2.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "4177b047863412c9ef91d8552440b7fa1f848b8675cc55b881a4cc5fdb157303"; + sha256 = "708aa8829a18291d7e2cced2be4f161cdd2752cf6b642200159d7e4f20b496ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/is/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/is/thunderbird-102.2.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "cb8cc7838fe3c4182d887c711c636b66d017b1854a2fadbb0f6e862a54a66d40"; + sha256 = "de55318223875e4a43a35159a1c9ee795367d8ad447f29e4bb285fcb450f3e05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/it/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/it/thunderbird-102.2.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "9e9214820e407c0067cf60a3b360e8f5a608225a41708a0fd25d00fb91e46d00"; + sha256 = "722b270098611484878e2a6cb912aababe665e781a469bbdb46818ff18e077e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ja/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ja/thunderbird-102.2.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ffa126f9b4a25165163df6eca65299c553b087fc2313f6dd1c7b266d41a1769f"; + sha256 = "96f27b3877f0b23d8fd09efc5ceb6a5162d0c704abcc84ae34493e120da69cea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ka/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ka/thunderbird-102.2.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "563eb58790172bf3a037f5828786dfb7624e3f03b81c1a57a4126f102e9572f8"; + sha256 = "75e43501045da981ce21f3b52391379f03de3f4df731ff85bd83e2881b2adc71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/kab/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/kab/thunderbird-102.2.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c79ff5505434a23ef88c2b1aadd9e70562ad9ea77fdb379169e3495725cad1a3"; + sha256 = "5a2861bc768fededbcf7d3fd0e9bc565be2fd5badfb18524edf762425e8da933"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/kk/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/kk/thunderbird-102.2.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "bfc4037fa631727d454c5b22af1e8861b436c40aa2bafda007221e5d5a813dd7"; + sha256 = "1014bcbb12c623164871e3416bde2218326d887d527c1f76d8579b451a673d81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ko/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ko/thunderbird-102.2.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "386921200c4b6544407994c5d1d73a3671a383f1e5b69d5f34b7a8ec727bc646"; + sha256 = "03ed9709c1bfa2066f8ab596faf5f4b9a37174bde7da3d32448770021d1bf48f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/lt/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/lt/thunderbird-102.2.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "2027b59fc1a8f11dbc8ce693296a26604e9ba579e34df02e9f0c8243eda38e94"; + sha256 = "cc06df43b59a768415d6d07051eb67892e8e849ef0ff1799ad094dbe1671a954"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/lv/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/lv/thunderbird-102.2.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "a5179ee6caa6847b36e9494e09d3c233beb9bb8651c586b11ce160b054e12d73"; + sha256 = "362877abf9d52b936fdde5913655ad3e88097503415cdd38bffc35032094bd92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ms/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ms/thunderbird-102.2.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "6d1f11d137da476fe7dbe04e7d5692c5dc81931d30e116217083ad187fdc37cc"; + sha256 = "64224aa3c1032528e9a233e992c95be4f8fa72c27a95e8ca38803265c2dd9c41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/nb-NO/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/nb-NO/thunderbird-102.2.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d7a50f3f8734d249e565cbf1078627fb0e3cfa42f293574127bd2fa549652be9"; + sha256 = "389f8bdfdbe6b6f05a6bc4154b2381aa4810787d18bb22a4f4dafd3f2f7f4e17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/nl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/nl/thunderbird-102.2.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "8962f690d105d4589df0279770b63f0b90485cb499f86e953393dd4116a87b2c"; + sha256 = "409729a161f278ff03c5505aca4ea4894c4fb973a3ab34bad9375a8aeea898c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/nn-NO/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/nn-NO/thunderbird-102.2.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d0b940decdc8d77a0a6371ded16c551d8ce081134c4bb7d795adde39c5844254"; + sha256 = "bd3712769496d416f4c3a5df2ccca46cfdfbd1ffd55346af5abb9fa7c50410ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/pa-IN/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/pa-IN/thunderbird-102.2.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "dd5a2d9b78085786039ca20ef88f991285ff7b59ce47857b7d81bc74faa6ec54"; + sha256 = "47ffb31c017241cfb6cfbd9a205b159adfd21be9b079f996a5d4ba05b0cc20d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/pl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/pl/thunderbird-102.2.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "9da17d31bbacc006c2a9530d42d864ea56c9cf5b84a73d03add270bc275543b0"; + sha256 = "ca50e4489e3a949f37b2310e7fb1d24bf24c26e7000bacd051ab77968397a882"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/pt-BR/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/pt-BR/thunderbird-102.2.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "81fee2a7ba6a2b0b8607e412324b2eebd1dc3f28194dc7de1efa5af9f1fa23a6"; + sha256 = "3a411aa23669d0c2b9146cd64986d7e9bfda6832e3b86a8f17f08a4fcbc05ab4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/pt-PT/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/pt-PT/thunderbird-102.2.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "82e354e1642b8018c0a6f2ccc3d3d38f3a7aa39333a30d9a6ea7c6c52df6d6f5"; + sha256 = "10613a544aff584af3da980ecf511f180b1d3cf7fe01828e2a37f593487bca6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/rm/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/rm/thunderbird-102.2.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d7fa26de70531e74931892a78a5148f95df92d29a94e7ce5aeef11168c1069ce"; + sha256 = "60797ab2c9393806bd5ab3b4b9fb9048775fb30c58ccc436f4b21a0a39ceaf97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ro/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ro/thunderbird-102.2.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c4392159cabd3cf19b575d8a0598b0d52a1f9fb993234d1170240c6c6a5e4fa6"; + sha256 = "40f11c3afad15a07f506b5b8d7dd74317b37720a398e890dd73911882ab9354e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ru/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ru/thunderbird-102.2.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "ac3d6fc7b555298ae05cb3b0fef2b6264ff11a5961f5e044664022e80bb9ae34"; + sha256 = "10935eb98bc6d83fe9b8e5e567a9f30a00abff8b5b3e4c527ecebd7ee56ec122"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/sk/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/sk/thunderbird-102.2.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "41cc5938d5b64508bcc095ddfbe3eef3cde3dd88a8f145ed279bf825785fde50"; + sha256 = "07e6c734108896e827e97671afe30aa709e701b2e64f1d1b692aee7155479cb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/sl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/sl/thunderbird-102.2.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "f8fb013b2705ce34749d1470e799d47c09b5ba94a9580a5e2d12be8b660c58c7"; + sha256 = "b862cd06ba4a1c8a16269d2c7fda76c7b97aebf0d60ac6828cc7b3dbb51b6468"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/sq/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/sq/thunderbird-102.2.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "dc7407c4cb28070693b7862bc29b465a4d96c473b5b4f553d238390c694804a1"; + sha256 = "28792eca6aa976a712c4f2c619e22c70263f7941c2c99a3aa9d83e5eb6cf00b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/sr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/sr/thunderbird-102.2.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "640731bbc689acb4874bc0f439f34213e30812bafae3ef94471945b13ae27243"; + sha256 = "69460ea89828e4db9a93f2a005a146a503f5fd5c022665cedfbf9ee62bd826e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/sv-SE/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/sv-SE/thunderbird-102.2.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "6d71d4ffa6393bc997566dc604992c093c24bd3a978b947704f82f03893fccfd"; + sha256 = "08cf31fe3ad5d214278c9c79ad84defa2166d2b84917a6e7b11b7abfe113df09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/th/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/th/thunderbird-102.2.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "faecaf65b8737dc63d2ea469ba1181c1e0a71c334baf29c8677730faecffb57c"; + sha256 = "ef0c353c78ead98ffdf929912631dc3bee4087acd070dec878ce3bf9709a8f23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/tr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/tr/thunderbird-102.2.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "c6401dfca452996547b3f33dead4690f9e376313920ef7880774c8a3e556b213"; + sha256 = "fe9e77c1739e33c5e226253a79070dd6e15d813d81cfbadca187cbeaa6fada9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/uk/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/uk/thunderbird-102.2.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "05fc335e16ad0c28a59a6ba51566161f92c0053b12b0ec56409e62eaf77fa2b2"; + sha256 = "3e12f9228479fb2361186eeee6174f4256990c829b369b4f762e75e89a7cfd12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/uz/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/uz/thunderbird-102.2.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "5690ad8156e70dba56ed7664f99ac335409e88f5fc0d05be530774fdeedd20ee"; + sha256 = "ad59e3da2b1b3f20f910e979d85e60253b07f11410dca635399681cb50d372ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/vi/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/vi/thunderbird-102.2.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "41cb6da3b59cfa31ebf28e67f93349977dcd640df5491fa451f19bc0670aa2d9"; + sha256 = "a0342a62cd34cb6879e38717c05e272d2f45990078d0b920906ce400db3cc206"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/zh-CN/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/zh-CN/thunderbird-102.2.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "79f9f7e1620efa56ab2a8f3a1d1aea91cf82a0c12b6f0bbac01bbd5fdc6b3c63"; + sha256 = "6506ef24bcf862da6860a166a1a14c95187518e72bbb560b114eceb9d77a7c8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/zh-TW/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/zh-TW/thunderbird-102.2.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "763790430eff0c8689cb045e30920b1c0fe239a324ce739b153f8a16ccb07b25"; + sha256 = "479d149ec221ddead41c6e6b8f3f854487ea833ff80fe6efa31061600938299e"; } ]; } From 09e010b4996cc75a3dd91eb76687a44e30f2e973 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Fri, 9 Sep 2022 08:34:03 -0400 Subject: [PATCH 11/58] discord-canary: 0.0.138 -> 0.0.139 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 91e38aae5c7a..33ceb5ef9d1e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.19"; ptb = "0.0.29"; - canary = "0.0.138"; + canary = "0.0.139"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -22,7 +22,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-NojoHrrgdvLiMgWYPClXzWjWXuvHz7urhyHzMnZwvBY="; + sha256 = "sha256-/PfO0TWRxMrK+V1XkYmdaXQ6SfyJNBFETaR9oV90itI="; }; }; aarch64-darwin = { From f27e3fc965d4a60389b86e3d38611bc6b090855e Mon Sep 17 00:00:00 2001 From: zendo Date: Thu, 8 Sep 2022 00:15:31 +0800 Subject: [PATCH 12/58] qtutilities: 6.7.0 -> 6.8.0 --- pkgs/development/libraries/qtutilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index cce0afc55e1b..1fd5eed05a9b 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.7.0"; + version = "6.8.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RjVmrdUHDBelwagWD5Mx+S3tdFO7I0+8RmFR7hwoe8o="; + hash = "sha256-I8VvVGlz6rQLWd7Fq0q58VFFj+EHGiwkayam2Cj3aJQ="; }; buildInputs = [ qtbase cpp-utilities ]; From 7eae589178859e7d2fb0e4a79152a9a0954d9223 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 18:19:09 +0000 Subject: [PATCH 13/58] fioctl: 0.27 -> 0.28 --- pkgs/tools/admin/fioctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index 5f64adfaff26..db6740838484 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fioctl"; - version = "0.27"; + version = "0.28"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-RnVwvD/Iy6UvztnQ03LFaCLWHrS6Aw5Ir4e033bBW7g="; + sha256 = "sha256-ki00uIGStRRGEG2cEGPJWgt4Vc3pEIpCr37g0SMPc9o="; }; vendorSha256 = "sha256-ObS/100Tfq4rhOrwU+PPBzDwY3tKwH+Z0wm0bX0W8cE="; From 8fbc5c51adf1605b46eebd146a3b6ae2d8054ed2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 21:19:49 +0000 Subject: [PATCH 14/58] python310Packages.resampy: 0.3.1 -> 0.4.1 --- pkgs/development/python-modules/resampy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index 90dd3e680e4b..f5d59d0fecf2 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "resampy"; - version = "0.3.1"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bmcfee"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kqRWW50VQO8H02vHgbdHo578c2jXX4fgF8AY6JuQOSI="; + hash = "sha256-8qhYhkTtq7DwEvw+B4Ul4SMAPxweTgDIOtebmElkcsg="; }; propagatedBuildInputs = [ From 6e55797c645ae368a68f1c1b4982949ad1c57993 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 01:28:51 +0000 Subject: [PATCH 15/58] nanovna-saver: 0.4.0 -> 0.5.1 --- .../science/electronics/nanovna-saver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index 06b77294da7e..67b600b19f17 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -6,13 +6,13 @@ }: python3.pkgs.buildPythonApplication rec { pname = "nanovna-saver"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "NanoVNA-Saver"; repo = pname; - rev = "v${version}"; - sha256 = "1n1bh46spdyk7kgvv95hyfy9f904czhzlvk41vliqkak56hj2ss1"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-2/A9uFYa682cvK2uzvBLZBDouhS6C6Q91v8Pun7GgSw="; }; nativeBuildInputs = [ wrapQtAppsHook ]; From 5d1454bbc5e9621ab62c81585ab2ae8d7ae03d03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 01:32:13 +0000 Subject: [PATCH 16/58] nats-server: 2.8.4 -> 2.9.0 --- pkgs/servers/nats-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 9e13e3e9c19b..ea7ea53c8753 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.8.4"; + version = "2.9.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hybCAVgHSwby8oSO0T2ZuqAYbqtZDc/adSPMOTdeI+w="; + sha256 = "sha256-zKDaem388xngSbpF1cK/hffLWMlrROJ00OBBSjzeMqk="; }; - vendorSha256 = "sha256-sK79szerxz42Y6V6NyDAveeMOx0XFq28Tjx27JkEWW4="; + vendorSha256 = "sha256-p+UMKVHDm6ypr1ftwb6L/kPocUrSp05un71T1WlLWbA="; doCheck = false; From 121fcfc9c3a77eaf01d284305b5ef99ca2e77791 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 03:30:54 +0000 Subject: [PATCH 17/58] python310Packages.uproot: 4.3.3 -> 4.3.5 --- pkgs/development/python-modules/uproot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 50bbb8b6fd21..81a6cf99da0b 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "4.3.3"; + version = "4.3.5"; # fetch from github for tests src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot4"; - rev = "refs/tags/${version}"; - sha256 = "sha256-7wc5KmnjCA90zOaq3qi5V1vvXi4tPwor8tK20i9WrTY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-oAL4FjrNNm7xCQq275pnY/UjfAxRWgLgYBS/lCq+uwE="; }; propagatedBuildInputs = [ From e66c3076a36288677357354046e2d28e0ded0701 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 06:21:57 +0000 Subject: [PATCH 18/58] rpi-imager: 1.7.2 -> 1.7.3 --- pkgs/tools/misc/rpi-imager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index 56899ae3c343..ab4933f52d88 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "rpi-imager"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9/kZ9GVfLRdKxzyZ3E11aILkJWIeojt9Ew+vKktveoU="; + sha256 = "sha256-D2FNg8SEUDQA466jfxBFhK0t8/5WJHx1fBTaCH0N+UQ="; }; nativeBuildInputs = [ cmake util-linux ]; From 4193bc7b4e846079d554a4ad1199930f1eb05578 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 07:54:37 +0000 Subject: [PATCH 19/58] sqlfluff: 1.3.0 -> 1.3.1 --- pkgs/development/tools/database/sqlfluff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 9a91278608fc..9bd6dfd75c96 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-IPBq1jFUCJXG/XW1M1AoD3pfj2/jnGR1NLgbO5zcqFg="; + hash = "sha256-IUHV08X6U5GHuKsFh6yYetKX+nRf7C6PIXb+b7AD9po="; }; propagatedBuildInputs = with python3.pkgs; [ From eb990ed56d7b9803737afba49ed310c79ebf4f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Mieszczak?= Date: Wed, 7 Sep 2022 18:08:52 +0200 Subject: [PATCH 20/58] qmk: 1.1.0 -> 1.1.1 --- pkgs/tools/misc/qmk/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index e7c02c6942d0..144038f60f41 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -5,16 +5,17 @@ , dfu-programmer , dfu-util , gcc-arm-embedded +, gnumake , teensy-loader-cli }: python3.pkgs.buildPythonApplication rec { pname = "qmk"; - version = "1.1.0"; + version = "1.1.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-dxV3yeaOt/4IlpurNq60IHE6UlBi3OUqBu2kDajNpeE="; + sha256 = "sha256-3QKOCevNYfi9+MuCkp36/A4AfZelo4A7RYGbRkF3Mmk="; }; nativeBuildInputs = with python3.pkgs; [ @@ -27,12 +28,13 @@ python3.pkgs.buildPythonApplication rec { appdirs argcomplete colorama - qmk-dotty-dict + dotty-dict hid hjson jsonschema milc pygments + pyserial pyusb pillow ] ++ [ # Binaries need to be in the path so this is in propagatedBuildInputs @@ -41,6 +43,7 @@ python3.pkgs.buildPythonApplication rec { dfu-util teensy-loader-cli gcc-arm-embedded + gnumake pkgsCross.avr.buildPackages.binutils pkgsCross.avr.buildPackages.binutils.bintools pkgsCross.avr.buildPackages.gcc8 From 33b4303a8cdada9debcf370e4ac4a3ccb2668afe Mon Sep 17 00:00:00 2001 From: zendo Date: Thu, 8 Sep 2022 00:16:29 +0800 Subject: [PATCH 21/58] tagparser: 9.4.0 -> 11.5.0 --- pkgs/development/libraries/tagparser/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/development/libraries/tagparser/default.nix index deeb7552069f..06f316522217 100644 --- a/pkgs/development/libraries/tagparser/default.nix +++ b/pkgs/development/libraries/tagparser/default.nix @@ -1,20 +1,21 @@ { stdenv -, pkgs +, lib , fetchFromGitHub , cmake , cpp-utilities , zlib +, isocodes }: stdenv.mkDerivation rec { pname = "tagparser"; - version = "9.4.0"; + version = "11.5.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - sha256 = "097dq9di19d3mvnlrav3fm78gzjni5babswyv10xnrxfhnf14f6x"; + hash = "sha256-qgopl32cFQFQTYu9WBOzPeU69J8K49SREX7X0Pw7Als="; }; nativeBuildInputs = [ cmake ]; @@ -23,7 +24,11 @@ stdenv.mkDerivation rec { cpp-utilities zlib ]; - meta = with pkgs.lib; { + cmakeFlags = [ + "-DLANGUAGE_FILE_ISO_639_2=${isocodes}/share/iso-codes/json/iso_639-2.json" + ]; + + meta = with lib; { homepage = "https://github.com/Martchus/tagparser"; description = "C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags"; license = licenses.gpl2; From cb007d184aaebba8313b9c125aa4509c2e39907f Mon Sep 17 00:00:00 2001 From: zendo Date: Sat, 10 Sep 2022 16:55:03 +0800 Subject: [PATCH 22/58] tageditor: 3.3.10 -> 3.7.5 --- pkgs/applications/audio/tageditor/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index 320a26b8172d..46f75442157c 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -1,9 +1,8 @@ { stdenv -, pkgs +, lib , fetchFromGitHub , pkg-config , cmake - , cpp-utilities , qtutilities , mp4v2 @@ -18,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.3.10"; + version = "3.7.5"; src = fetchFromGitHub { owner = "martchus"; - repo = "tageditor"; + repo = pname; rev = "v${version}"; - sha256 = "16cmq7dyalcwc8gx1y9acngw5imjh8ydp4prxy7qpzk4fj3kpsak"; + hash = "sha256-/0zzzOEkzNr1aIpPFdflFaM/0HTs3TlIRxau3Yt+Hog="; }; nativeBuildInputs = [ @@ -32,10 +31,10 @@ stdenv.mkDerivation rec { cmake wrapQtAppsHook ]; + buildInputs = [ mp4v2 libid3tag - pkg-config qtbase qttools qtx11extras @@ -45,7 +44,7 @@ stdenv.mkDerivation rec { tagparser ]; - meta = with pkgs.lib; { + meta = with lib; { homepage = "https://github.com/Martchus/tageditor"; description = "A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska"; license = licenses.gpl2; @@ -53,4 +52,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - From cd87aef066e4bdbb1139845500072bd252d37c5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 11:23:09 +0000 Subject: [PATCH 23/58] deno: 1.25.1 -> 1.25.2 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index a28b0dba4b62..185065d1a56f 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.25.1"; + version = "1.25.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nKMQDfCU1HsOfdzVwmgCIWa/rUmvufHlsS9jcDwcZzw="; + sha256 = "sha256-yi4isp5VuQnLq2KYyti6czlVhycmxOs0a9G6rzkCgqo="; }; - cargoSha256 = "sha256-jFoVQK74gnhC6Ume/PHe8NG7rNeTkwPMBBWn/hT7nCs="; + cargoSha256 = "sha256-fHOTL8qipOOjI91a73wMXUm0tD78O1eHhCAtRyClmWc="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds From 06e4f6fd65963d96bd8078026a793173d4bd615d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 10 Sep 2022 13:37:08 +0200 Subject: [PATCH 24/58] fava: 1.22.2 -> 1.22.3 Fixes CVE-2022-2589. https://github.com/beancount/fava/compare/v1.22.2...v1.22.3 --- pkgs/applications/office/fava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 27281b5d5264..10cd1e998504 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -2,12 +2,12 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.22.2"; + version = "1.22.3"; format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-Oarh0a0q+PYFojsYmdX763vFRSQhtm09z4ruSxXDpSA="; + sha256 = "sha256-e8/VOn0WmrUO69x/4hKGtgKuj11U1Qv7OUhfOL/p5Ds="; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; From 3afff7f75c0d640c4ee73f72c335dbdd86298a3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 11:41:41 +0000 Subject: [PATCH 25/58] flexget: 3.3.25 -> 3.3.26 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 030836b1b0c9..13b326b0678b 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.25"; + version = "3.3.26"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-kfpri6AFNb9GcAIDVhFV1uSDSNNSopReWRKuvWifcTU="; + hash = "sha256-5THgUOQv9gPUh9emWiBs/tSNsOX4ZVh+jvKEpWsy05w="; }; postPatch = '' From 56067eed7534ccc1beff8c8b3663bff5e3000a06 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 10 Sep 2022 19:51:44 +0800 Subject: [PATCH 26/58] cinnamon.warpinator: fix updateScript --- pkgs/desktops/cinnamon/warpinator/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index a720c2fb4cbe..0fafc538cda6 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -10,6 +10,7 @@ , gettext , polkit , glib +, gitUpdater }: python3.pkgs.buildPythonApplication rec { @@ -72,6 +73,12 @@ python3.pkgs.buildPythonApplication rec { chmod -x+X $out/libexec/warpinator/*.py ''; + passthru.updateScript = gitUpdater { + inherit pname version; + attrPath = "cinnamon.warpinator"; + ignoredVersions = "^master.*"; + }; + meta = with lib; { homepage = "https://github.com/linuxmint/warpinator"; description = "Share files across the LAN"; From 38417e0e291949b8a30923678bc923dedc0a4b70 Mon Sep 17 00:00:00 2001 From: bezmuth Date: Sat, 30 Jul 2022 07:03:16 +0100 Subject: [PATCH 27/58] tezos-base58: init at 1.0.0 --- maintainers/maintainer-list.nix | 6 +++++ .../ocaml-modules/tezos-base58/default.nix | 27 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/development/ocaml-modules/tezos-base58/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 68d2be868fc6..7fc5f300bc64 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15274,6 +15274,12 @@ fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; }]; }; + bezmuth = { + email = "benkel97@protonmail.com"; + name = "Ben Kelly"; + github = "bezmuth"; + githubId = 31394095; + }; cafkafk = { email = "cafkafk@cafkafk.com"; matrix = "@cafkafk:matrix.cafkafk.com"; diff --git a/pkgs/development/ocaml-modules/tezos-base58/default.nix b/pkgs/development/ocaml-modules/tezos-base58/default.nix new file mode 100644 index 000000000000..9a3079fc0e7f --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos-base58/default.nix @@ -0,0 +1,27 @@ +{ buildDunePackage, fetchurl, lib +, zarith, digestif, fmt +}: + +buildDunePackage rec { + pname = "tezos-base58"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/tarides/tezos-base58/releases/download/${version}/${pname}-${version}.tbz"; + sha256 = "14w2pff5dy6mxnz588pxaf2k8xpkd51sbsys065wr51kbv1f36da"; + }; + + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + zarith digestif fmt + ]; + + meta = with lib; { + description = "Base58 encoding for Tezos"; + homepage = "https://github.com/tarides/tezos-base58/"; + license = licenses.mit; + maintainers = with maintainers; [ bezmuth ]; + }; + +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 04dfa7365dc8..19bef0b7c05b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1421,6 +1421,8 @@ let terminal_size = callPackage ../development/ocaml-modules/terminal_size { }; + tezos-base58 = callPackage ../development/ocaml-modules/tezos-base58 { }; + theora = callPackage ../development/ocaml-modules/theora { }; toml = callPackage ../development/ocaml-modules/toml { }; From e6abed6cae3d445122155fe62dc969858c0ddc93 Mon Sep 17 00:00:00 2001 From: bezmuth Date: Wed, 3 Aug 2022 16:04:48 +0100 Subject: [PATCH 28/58] ocamlPackages.integers_stubs_js: init at 1.0 --- .../integers_stubs_js/default.nix | 28 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/ocaml-modules/integers_stubs_js/default.nix diff --git a/pkgs/development/ocaml-modules/integers_stubs_js/default.nix b/pkgs/development/ocaml-modules/integers_stubs_js/default.nix new file mode 100644 index 000000000000..fc06efae7e04 --- /dev/null +++ b/pkgs/development/ocaml-modules/integers_stubs_js/default.nix @@ -0,0 +1,28 @@ +{ + lib, fetchFromGitHub, buildDunePackage +, zarith_stubs_js +}: + +buildDunePackage rec { + pname = "integers_stubs_js"; + version = "1.0"; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "o1-labs"; + repo = pname; + rev = version; + sha256 = "sha256-lg5cX9/LQlVmR42XcI17b6KaatnFO2L9A9ZXfID8mTY="; + }; + + propagatedBuildInputs = [ zarith_stubs_js ]; + doCheck = true; + + meta = { + description = "Javascript stubs for the integers library in js_of_ocaml"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bezmuth ]; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 19bef0b7c05b..30437fb92cfb 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -533,6 +533,8 @@ let integers = callPackage ../development/ocaml-modules/integers { }; + integers_stubs_js = callPackage ../development/ocaml-modules/integers_stubs_js { }; + io-page = callPackage ../development/ocaml-modules/io-page { }; ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; From 725fe60de069ccdb8ba22da63d740cc572c559cb Mon Sep 17 00:00:00 2001 From: bezmuth Date: Wed, 3 Aug 2022 16:04:24 +0100 Subject: [PATCH 29/58] ocamlPackages.ctypes_stubs_js: init at 0.1 --- .../ocaml-modules/ctypes_stubs_js/default.nix | 36 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix diff --git a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix new file mode 100644 index 000000000000..f7e50ddca700 --- /dev/null +++ b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix @@ -0,0 +1,36 @@ +{ + lib, fetchFromGitLab, buildDunePackage +, integers_stubs_js, ctypes, ppx_expect +, js_of_ocaml-compiler +, nodejs +}: + +buildDunePackage rec { + pname = "ctypes_stubs_js"; + version = "0.1"; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = pname; + rev = version; + sha256 = "sha256-OJIzg2hnwkXkQHd4bRR051eLf4HNWa/XExxbj46SyUs="; + }; + + propagatedBuildInputs = [ integers_stubs_js ]; + checkInputs = [ + ctypes + js_of_ocaml-compiler + ppx_expect + nodejs + ]; + doCheck = true; + + meta = { + description = "Js_of_ocaml Javascript stubs for the OCaml ctypes library"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bezmuth ]; + homepage = "https://gitlab.com/nomadic-labs/ctypes_stubs_js"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 30437fb92cfb..547050b4f39b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -274,6 +274,10 @@ let ctypes = callPackage ../development/ocaml-modules/ctypes { }; + ctypes_stubs_js = callPackage ../development/ocaml-modules/ctypes_stubs_js { + inherit (pkgs) nodejs; + }; + dap = callPackage ../development/ocaml-modules/dap { }; data-encoding = callPackage ../development/ocaml-modules/data-encoding { }; From e3fc2290e04a036c44b228324068491485e97bb5 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 14:33:46 +0200 Subject: [PATCH 30/58] trueseeing: 2.1.4 -> 2.1.5 --- pkgs/tools/security/trueseeing/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/trueseeing/default.nix b/pkgs/tools/security/trueseeing/default.nix index 4aa9e1852aee..49b12c3c9d2f 100644 --- a/pkgs/tools/security/trueseeing/default.nix +++ b/pkgs/tools/security/trueseeing/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "trueseeing"; - version = "2.1.4"; + version = "2.1.5"; format = "flit"; src = fetchFromGitHub { owner = "alterakey"; repo = pname; rev = "v${version}"; - hash = "sha256-zc0AOv7OFmEPLl//eykbh538rM2j4kXBLHt5bgK1IRY="; + hash = "sha256-7iQOQ81k2bPBber4ewyvDy82s26j4P3Vv8MzSs04KAw="; }; nativeBuildInputs = with python3.pkgs; [ @@ -26,8 +26,14 @@ python3.pkgs.buildPythonApplication rec { lxml pypubsub pyyaml + docker ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "attrs~=21.4" "attrs>=21.4" + ''; + # Project has no tests doCheck = false; From 80c40aaa91f094a08bdea47dadd275d277849204 Mon Sep 17 00:00:00 2001 From: linsui Date: Sat, 10 Sep 2022 19:47:11 +0800 Subject: [PATCH 31/58] sticky: fix updateScript --- pkgs/applications/misc/sticky/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 98c844c696ce..9710399ab635 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -7,6 +7,7 @@ , gspell , gtk3 , gobject-introspection +, gitUpdater }: python3.pkgs.buildPythonApplication rec { @@ -73,6 +74,13 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru = { + updateScript = gitUpdater { + inherit pname version; + ignoredVersions = ''master.*''; + }; + }; + meta = with lib; { description = "A sticky notes app for the linux desktop"; homepage = "https://github.com/linuxmint/sticky"; From 42e79f018c32de3c0999cc8112dd8235443ee5c2 Mon Sep 17 00:00:00 2001 From: Blake Sweeney Date: Sat, 10 Sep 2022 13:08:13 +0000 Subject: [PATCH 32/58] chicken: fix darwin build --- pkgs/development/compilers/chicken/5/chicken.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 0df2476c4ba2..c86731c49363 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { ] ++ (lib.optionals stdenv.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "C_COMPILER=$(CC)" + "LINKER_OPTIONS=-headerpad_max_install_names" ]); nativeBuildInputs = [ From fa9a186ec3989c86a0790ce0d952547c39521537 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 10 Sep 2022 15:18:21 +0200 Subject: [PATCH 33/58] wdomirror: fix build --- pkgs/tools/wayland/wdomirror/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/wayland/wdomirror/default.nix b/pkgs/tools/wayland/wdomirror/default.nix index 5d69ce66f6d4..10facbca50c1 100644 --- a/pkgs/tools/wayland/wdomirror/default.nix +++ b/pkgs/tools/wayland/wdomirror/default.nix @@ -40,8 +40,14 @@ stdenv.mkDerivation { runHook postInstall ''; + postPatch = '' + substituteInPlace meson.build \ + --replace "werror=true" "werror=false" + ''; + meta = with lib; { description = "Mirrors an output of a wlroots compositor to a window"; + homepage = "https://github.com/progandy/wdomirror"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ jpas ]; From 06455bca50047ced38da3b993a52c8d372d00384 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 09:20:10 +0000 Subject: [PATCH 34/58] arc-kde-theme: 20220810 -> 20220908 --- pkgs/data/themes/arc-kde/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/arc-kde/default.nix b/pkgs/data/themes/arc-kde/default.nix index 267e1b8b8b5d..fc94e4e7c802 100644 --- a/pkgs/data/themes/arc-kde/default.nix +++ b/pkgs/data/themes/arc-kde/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "arc-kde-theme"; - version = "20220810"; + version = "20220908"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "arc-kde"; rev = version; - sha256 = "sha256-atL0sW3AedQl7PabOQOjeJ5U8a4/J4x0rxFCbxJ4ONA="; + sha256 = "sha256-dxk8YpJB4XaZHD/O+WvQUFKJD2TE38VZyC5orn4N7BA="; }; makeFlags = [ "PREFIX=$(out)" ]; From 9518ee5a82d3596a4217e89ef38d4b620cd44f11 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 10 Sep 2022 21:06:36 +0800 Subject: [PATCH 35/58] adapta-kde-theme: remove ouputHash --- pkgs/data/themes/adapta-kde/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/data/themes/adapta-kde/default.nix b/pkgs/data/themes/adapta-kde/default.nix index 4feeeaa6c002..a93e78480b00 100644 --- a/pkgs/data/themes/adapta-kde/default.nix +++ b/pkgs/data/themes/adapta-kde/default.nix @@ -13,11 +13,6 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - # Make this a fixed-output derivation - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - ouputHash = "0rxhk8sp81vb2mngqr7kn9vlqyliq9aqj2d25igcr01v5axbxbzb"; - meta = { description = "A port of the Adapta theme for Plasma"; homepage = "https://git.io/adapta-kde"; From 382c0364cb14156d8dbea9e4ee40b220f94c4670 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 10 Sep 2022 21:07:30 +0800 Subject: [PATCH 36/58] arc-kde-theme: remove ouputHash --- pkgs/data/themes/arc-kde/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/data/themes/arc-kde/default.nix b/pkgs/data/themes/arc-kde/default.nix index 267e1b8b8b5d..138e32f1cbfc 100644 --- a/pkgs/data/themes/arc-kde/default.nix +++ b/pkgs/data/themes/arc-kde/default.nix @@ -13,11 +13,6 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - # Make this a fixed-output derivation - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - ouputHash = "2c2def57092a399aa1c450699cbb8639f47d751157b18db17"; - meta = { description = "A port of the arc theme for Plasma"; homepage = "https://git.io/arc-kde"; From da591641de51aa938aa1f2454b0e53e4b6bf2e73 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 9 Sep 2022 21:13:24 -0400 Subject: [PATCH 37/58] nil: init at unstable-2022-09-10 --- pkgs/development/tools/nil/default.nix | 28 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/nil/default.nix diff --git a/pkgs/development/tools/nil/default.nix b/pkgs/development/tools/nil/default.nix new file mode 100644 index 000000000000..72684f89e1d4 --- /dev/null +++ b/pkgs/development/tools/nil/default.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +let + date = "2022-09-10"; +in + +rustPlatform.buildRustPackage rec { + pname = "nil"; + version = "unstable-${date}"; + + src = fetchFromGitHub { + owner = "oxalica"; + repo = pname; + rev = date; + sha256 = "sha256-yqg46An5TPl6wsv5xflK4T90fTho4KXIILoV71jSl28="; + }; + + cargoSha256 = "sha256-MabVHbNGWpeUztwedXRXHBfgEostxk0aWpGCHlpnhJo="; + + CFG_DATE = date; + + meta = with lib; { + description = "A language server for Nix Expression Language"; + homepage = "https://github.com/oxalica/nil"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ figsoda oxalica ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ad70e1a4d6d..f63c0a1a4187 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16748,6 +16748,8 @@ with pkgs; nailgun = callPackage ../development/tools/nailgun { }; + nil = callPackage ../development/tools/nil { }; + ninja = callPackage ../development/tools/build-managers/ninja { }; nimbo = with python3Packages; callPackage ../applications/misc/nimbo { }; From d8579c81c7b48a1659e1604d42aedf61441e408d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 14:43:11 +0000 Subject: [PATCH 38/58] oh-my-zsh: 2022-09-07 -> 2022-09-08 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 07b3632d24a0..c862ffaed4c7 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-09-07"; + version = "2022-09-08"; pname = "oh-my-zsh"; - rev = "875a4553204679cc1e3023a7d0e0bf2cf7d60800"; + rev = "dfa88b4d369f6afc7205af0b399a0ef05a4bef2e"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "iPW6u4LxXFNL1n9NzhoA9uGAZvykx+sDI0syYwUf4+k="; + sha256 = "BzJAQIZXKoj1LtQQvM4LEA0V8yKoND4hVxzQA+weESk="; }; strictDeps = true; From 7c1e8880288511379574ffc8a3beff410a8db8ea Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 10 Sep 2022 16:46:44 +0200 Subject: [PATCH 39/58] papirus-icon-theme: 20220808 -> 20220910 https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/releases/tag/20220910 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 880fc6f42341..cf90cf675729 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20220808"; + version = "20220910"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-eOsqBIo7Bs/5mbD8x2Q+RO49Cqxd1KoqNbTsiV9RDWg="; + sha256 = "sha256-ohZe7TCvbQcJmUyFY7DN6BgfAAqW1HhXi1UXXPh0t4Q="; }; nativeBuildInputs = [ gtk3 papirus-folders ]; From 93a0067a9c85c17764f7755947e6ecf52dc47d8a Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 10 Sep 2022 09:51:56 -0500 Subject: [PATCH 40/58] tkrzw: fix building on impure platforms --- pkgs/development/libraries/tkrzw/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/development/libraries/tkrzw/default.nix index fc90c6e304fd..4ede98f75099 100644 --- a/pkgs/development/libraries/tkrzw/default.nix +++ b/pkgs/development/libraries/tkrzw/default.nix @@ -10,12 +10,16 @@ stdenv.mkDerivation rec { hash = "sha256-G7SVKgU4b8I5iwAlGHL/w8z0fhI+Awe3V6aqFsOnUrA="; }; + postPatch = '' + substituteInPlace configure \ + --replace 'PATH=".:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PATH"' "" + ''; + enableParallelBuilding = true; doCheck = false; # memory intensive meta = with lib; { - broken = stdenv.isDarwin; description = "A set of implementations of DBM"; homepage = "https://dbmx.net/tkrzw/"; maintainers = with maintainers; [ ehmry ]; From 60fb2f509d11b8916bffc97ffcfd422d8e2535bb Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 10 Sep 2022 18:01:32 +0300 Subject: [PATCH 41/58] discord: add artturin to maintainers i've been merging discord-canary updates lately so i want to be notified about them --- .../networking/instant-messengers/discord/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 33ceb5ef9d1e..f6b94b6f4e30 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -53,7 +53,7 @@ let downloadPage = "https://discordapp.com/download"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ MP2E devins2518 ]; + maintainers = with maintainers; [ MP2E devins2518 artturin ]; platforms = [ "x86_64-linux" "x86_64-darwin" ] ++ lib.optionals (branch != "stable") [ "aarch64-darwin" ]; }; From 7b6656f69a09c74606d69edf74aaecafbfa2832f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 05:43:15 +0000 Subject: [PATCH 42/58] python310Packages.zope_contenttype: 4.5.0 -> 4.6 --- pkgs/development/python-modules/zope_contenttype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix index 15010d80a145..bb748eaec900 100644 --- a/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/pkgs/development/python-modules/zope_contenttype/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.contenttype"; - version = "4.5.0"; + version = "4.6"; src = fetchPypi { inherit pname version; - sha256 = "c12d929c67ab3eaef9b8a7fba3d19cce8500c8fd25afed8058c8e15f324cbd5b"; + sha256 = "sha256-NnVoeLxSWzY2TQ1b2ZovCw/TuaUND+m73Eqxs4rCOAA="; }; checkInputs = [ zope_testrunner ]; From d26e46121315b6ba26e0650b0f0ca85b17671ab7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 06:52:16 +0000 Subject: [PATCH 43/58] python310Packages.zwave-me-ws: 0.2.5.1 -> 0.2.6 --- pkgs/development/python-modules/zwave-me-ws/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zwave-me-ws/default.nix b/pkgs/development/python-modules/zwave-me-ws/default.nix index d6241b593abe..5dfc432e5248 100644 --- a/pkgs/development/python-modules/zwave-me-ws/default.nix +++ b/pkgs/development/python-modules/zwave-me-ws/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zwave-me-ws"; - version = "0.2.5.1"; + version = "0.2.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Z-Wave-Me"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-BcUUDn7PCpFRtQ3QDx0W3qXB4JmvRxMFoWoCeA8bS6o="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-4c8SHTecX2E8/O7JQ19uT6MFoUVd20sjmR+oYc1ic34="; }; nativeBuildInputs = [ From bf3dc2dad06d11f84d7f669a75237bbb15ca36c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 15:07:06 +0000 Subject: [PATCH 44/58] python310Packages.pylink-square: 0.14.1 -> 0.14.2 --- pkgs/development/python-modules/pylink-square/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index 9de892352760..e572ec542fbc 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylink-square"; - version = "0.14.1"; + version = "0.14.2"; format = "setuptools"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "square"; repo = "pylink"; rev = "refs/tags/v${version}"; - hash = "sha256-eCVNDPXtZAuzGb4ZOnjEmE1pKPOl52xRfZy+ppfxS3g="; + hash = "sha256-4jmFU8jlrEAYTAQH+uQCWrzqwKX4onb7Xk4iTYzx9dI="; }; propagatedBuildInputs = [ psutil six future ]; From 04de14ead39407fa18d195dc9ccb54f6ce8486bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Sep 2022 15:08:33 +0000 Subject: [PATCH 45/58] openxr-loader: 1.0.24 -> 1.0.25 --- pkgs/development/libraries/openxr-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 51f86ef38604..13f60524463e 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.24"; + version = "1.0.25"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-levPWBSwfw1N2tcBqQXtXznA7dzQRqVf/Rp2owGUamE="; + sha256 = "sha256-8fCz+t+PcZflq3sYdn+J6AdWHkG6UyDNcQmJ21b9p80="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; From f46bc2dd02df23719d50b1d334819ceac5977104 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sat, 10 Sep 2022 11:22:19 -0400 Subject: [PATCH 46/58] discord: add infinidoge to maintainers --- .../networking/instant-messengers/discord/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index f6b94b6f4e30..f8a10e48f52d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -53,7 +53,7 @@ let downloadPage = "https://discordapp.com/download"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ MP2E devins2518 artturin ]; + maintainers = with maintainers; [ MP2E devins2518 artturin infinidoge ]; platforms = [ "x86_64-linux" "x86_64-darwin" ] ++ lib.optionals (branch != "stable") [ "aarch64-darwin" ]; }; From 07bf4e55d13890b3e5407c5f66166625defc4cfa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 03:13:29 +0000 Subject: [PATCH 47/58] python310Packages.dropbox: 11.33.0 -> 11.34.0 --- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 6240567e883a..7f0d01ec96f9 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.33.0"; + version = "11.34.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-re1TYujoLWjvDE0/ikTMQmXufdS1Q5IMViiFY2/QRMw="; + hash = "sha256-bahl78c0MGu4AoANO/FWYq/DQWPC4T8WVdRHKzwg444="; }; propagatedBuildInputs = [ From 17c9f2c7b370c0ae810fb12a513765811983e5c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 04:45:06 +0000 Subject: [PATCH 48/58] python310Packages.zigpy-deconz: 0.18.0 -> 0.18.1 --- pkgs/development/python-modules/zigpy-deconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 3f7c7b46bff6..30a08a37a628 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.18.0"; + version = "0.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2M25g3iJWW6kT17P9PVAPD09E5QXuOJN75yjWsLY/cI="; + hash = "sha256-in40vbSupz0DhYZQYkGo5nUBt8sEwJ15wZCMVq4YRbA="; }; propagatedBuildInputs = [ From 6a66cf1b901efaf1b711c7d4423fc09e001ad13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 10 Sep 2022 17:56:33 +0200 Subject: [PATCH 49/58] nixos/gollum: add package option --- nixos/modules/services/misc/gollum.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index a4bed2da8a2f..ca6f42736a10 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -87,6 +87,14 @@ in description = lib.mdDoc "Specifies the path of the repository directory. If it does not exist, Gollum will create it on startup."; }; + package = mkOption { + type = types.package; + default = pkgs.gollum; + defaultText = literalExpression "pkgs.gollum"; + description = lib.mdDoc '' + The package used in the service + ''; + }; }; config = mkIf cfg.enable { @@ -120,7 +128,7 @@ in Group = config.users.groups.gollum.name; WorkingDirectory = cfg.stateDir; ExecStart = '' - ${pkgs.gollum}/bin/gollum \ + ${cfg.package}/bin/gollum \ --port ${toString cfg.port} \ --host ${cfg.address} \ --config ${pkgs.writeText "gollum-config.rb" cfg.extraConfig} \ From ad0108d803c9e74c08d70061301d8780e428abe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 10 Sep 2022 18:01:37 +0200 Subject: [PATCH 50/58] nixos/gollum: add test --- nixos/tests/all-tests.nix | 1 + nixos/tests/gollum.nix | 14 ++++++++++++++ pkgs/applications/misc/gollum/default.nix | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/gollum.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f3cde7e23a16..230ad47f3bfa 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -189,6 +189,7 @@ in { gobgpd = handleTest ./gobgpd.nix {}; gocd-agent = handleTest ./gocd-agent.nix {}; gocd-server = handleTest ./gocd-server.nix {}; + gollum = handleTest ./gollum.nix {}; google-oslogin = handleTest ./google-oslogin {}; gotify-server = handleTest ./gotify-server.nix {}; grafana = handleTest ./grafana.nix {}; diff --git a/nixos/tests/gollum.nix b/nixos/tests/gollum.nix new file mode 100644 index 000000000000..833db87f2f32 --- /dev/null +++ b/nixos/tests/gollum.nix @@ -0,0 +1,14 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "gollum"; + + nodes = { + webserver = { pkgs, lib, ... }: { + services.gollum.enable = true; + }; + }; + + testScript = { nodes, ... }: '' + webserver.wait_for_unit("gollum") + webserver.wait_for_open_port(${toString nodes.webserver.config.services.gollum.port}) + ''; +}) diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 3f77b890455b..cafebfad39a2 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, bundlerUpdateScript, ruby, makeWrapper, git, docutils }: +{ lib, bundlerApp, bundlerUpdateScript, ruby, makeWrapper, git, docutils, nixosTests }: bundlerApp rec { pname = "gollum"; @@ -10,6 +10,7 @@ bundlerApp rec { nativeBuildInputs = [ makeWrapper ]; passthru.updateScript = bundlerUpdateScript "gollum"; + passthru.tests.gollum = nixosTests.gollum; meta = with lib; { description = "A simple, Git-powered wiki with a sweet API and local frontend"; From 8c309aa43ae9e5e4dbdd542e4e5e49253d3dd763 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 31 Aug 2022 16:49:45 +0000 Subject: [PATCH 51/58] =?UTF-8?q?gnome.networkmanager-openvpn:=201.8.18=20?= =?UTF-8?q?=E2=86=92=201.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/-/compare/1.8.18...1.10.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/tools/networking/networkmanager/openvpn/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix index 2e46d6239601..e988fc13528a 100644 --- a/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -3,7 +3,7 @@ , fetchurl , substituteAll , openvpn -, intltool +, gettext , libxml2 , pkg-config , file @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "NetworkManager-openvpn"; - version = "1.8.18"; + version = "1.10.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "U9+wrPZEeK3HKAdPFi9i5gv/YqYFvYl+uIsmfnBXkno="; + sha256 = "V0XUEH8zmKl6+7k/aSObUQyeRet/ti1g2e0Kcpf00QE="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - intltool + gettext pkg-config file libxml2 From 767485a0dee24329e2b34cd4af0c08ea21e959ea Mon Sep 17 00:00:00 2001 From: pennae Date: Thu, 1 Sep 2022 19:23:59 +0200 Subject: [PATCH 52/58] lib/options: deprecate docbook text and literalDocBook deprecate literalDocBook by adding a warning (that will not fire yet) to its uses and other docbook literal strings by adding optional warning message to mergeJSON. --- lib/options.nix | 5 ++- nixos/doc/manual/default.nix | 3 +- .../option-declarations.section.md | 19 ++++----- .../option-declarations.section.xml | 26 ++++++------- .../from_md/release-notes/rl-2211.section.xml | 19 +++++++++ .../manual/release-notes/rl-2211.section.md | 4 ++ nixos/lib/make-options-doc/default.nix | 29 +++++++------- nixos/lib/make-options-doc/mergeJSON.py | 39 ++++++++++++++++++- nixos/modules/misc/documentation.nix | 19 ++++++++- 9 files changed, 118 insertions(+), 45 deletions(-) diff --git a/lib/options.nix b/lib/options.nix index a56e579ab84d..dea85f0db04c 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -284,7 +284,10 @@ rec { */ literalDocBook = text: if ! isString text then throw "literalDocBook expects a string." - else { _type = "literalDocBook"; inherit text; }; + else + lib.warnIf (lib.isInOldestRelease 2211) + "literalDocBook is deprecated, use literalMD instead" + { _type = "literalDocBook"; inherit text; }; /* Transition marker for documentation that's already migrated to markdown syntax. diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 1cd769b6a544..d61bbaddf764 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -6,6 +6,7 @@ , extraSources ? [] , baseOptionsJSON ? null , warningsAreErrors ? true +, allowDocBook ? true , prefix ? ../../.. }: @@ -28,7 +29,7 @@ let stripAnyPrefixes = lib.flip (lib.foldr lib.removePrefix) prefixesToStrip; optionsDoc = buildPackages.nixosOptionsDoc { - inherit options revision baseOptionsJSON warningsAreErrors; + inherit options revision baseOptionsJSON warningsAreErrors allowDocBook; transformOptions = opt: opt // { # Clean up declaration sites to not refer to the NixOS source tree. declarations = map stripAnyPrefixes opt.declarations; diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index 8bf73a66456b..7fdc77b964a1 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -44,26 +44,23 @@ The function `mkOption` accepts the following arguments. : A textual representation of the default value to be rendered verbatim in the manual. Useful if the default value is a complex expression or depends on other values or packages. - Use `lib.literalExpression` for a Nix expression, `lib.literalDocBook` for - a plain English description in DocBook format. + Use `lib.literalExpression` for a Nix expression, `lib.literalMD` for + a plain English description in [Nixpkgs-flavored Markdown]( + https://nixos.org/nixpkgs/manual/#sec-contributing-markup) format. `example` : An example value that will be shown in the NixOS manual. - You can use `lib.literalExpression` and `lib.literalDocBook` in the same way + You can use `lib.literalExpression` and `lib.literalMD` in the same way as in `defaultText`. `description` -: A textual description of the option, in DocBook format, that will be +: A textual description of the option, in [Nixpkgs-flavored Markdown]( + https://nixos.org/nixpkgs/manual/#sec-contributing-markup) format, that will be included in the NixOS manual. During the migration process from DocBook - to CommonMark the description may also be written in CommonMark, but has - to be wrapped in `lib.mdDoc` to differentiate it from DocBook. See - the nixpkgs manual for [the list of CommonMark extensions]( - https://nixos.org/nixpkgs/manual/#sec-contributing-markup) - supported by NixOS documentation. - - New documentation should preferably be written as CommonMark. + to CommonMark the description may also be written in DocBook, but this is + discouraged. ## Utility functions for common option patterns {#sec-option-declarations-util} diff --git a/nixos/doc/manual/from_md/development/option-declarations.section.xml b/nixos/doc/manual/from_md/development/option-declarations.section.xml index d7c7f7716bea..ba604d109ad2 100644 --- a/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -69,8 +69,10 @@ options = { verbatim in the manual. Useful if the default value is a complex expression or depends on other values or packages. Use lib.literalExpression for a Nix expression, - lib.literalDocBook for a plain English - description in DocBook format. + lib.literalMD for a plain English + description in + Nixpkgs-flavored + Markdown format. @@ -82,7 +84,7 @@ options = { An example value that will be shown in the NixOS manual. You can use lib.literalExpression and - lib.literalDocBook in the same way as in + lib.literalMD in the same way as in defaultText. @@ -93,18 +95,12 @@ options = { - A textual description of the option, in DocBook format, that - will be included in the NixOS manual. During the migration - process from DocBook to CommonMark the description may also be - written in CommonMark, but has to be wrapped in - lib.mdDoc to differentiate it from DocBook. - See the nixpkgs manual for - the - list of CommonMark extensions supported by NixOS - documentation. - - - New documentation should preferably be written as CommonMark. + A textual description of the option, in + Nixpkgs-flavored + Markdown format, that will be included in the NixOS + manual. During the migration process from DocBook to + CommonMark the description may also be written in DocBook, but + this is discouraged. diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 9b08a5444594..ad241fa6e5a1 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -577,6 +577,25 @@ as coreboot’s fork is no longer available. + + + Option descriptions, examples, and defaults writting in + DocBook are now deprecated. Using CommonMark is preferred and + will become the default in a future release. + + + + + The + documentation.nixos.options.allowDocBook + option was added to ease the transition to CommonMark option + documentation. Setting this option to false + causes an error for every option included in the manual that + uses DocBook documentation; it defaults to + true to preserve the previous behavior and + will be removed once the transition to CommonMark is complete. + + The udisks2 service, available at diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 584a17cfca2c..b9ae7f5586f9 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -197,6 +197,10 @@ Use `configure.packages` instead. - memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available. +- Option descriptions, examples, and defaults writting in DocBook are now deprecated. Using CommonMark is preferred and will become the default in a future release. + +- The `documentation.nixos.options.allowDocBook` option was added to ease the transition to CommonMark option documentation. Setting this option to `false` causes an error for every option included in the manual that uses DocBook documentation; it defaults to `true` to preserve the previous behavior and will be removed once the transition to CommonMark is complete. + - The udisks2 service, available at `services.udisks2.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed. This also means that polkit will now actually be disabled by default. The default for `security.polkit.enable` was already flipped in the previous release, but udisks2 being enabled by default re-enabled it. diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 3f98e2cf87b8..43dbff0e68dd 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -34,6 +34,10 @@ # instead of printing warnings for eg options with missing descriptions (which may be lost # by nix build unless -L is given), emit errors instead and fail the build , warningsAreErrors ? true +# allow docbook option docs if `true`. only markdown documentation is allowed when set to +# `false`, and a different renderer may be used with different bugs and performance +# characteristics but (hopefully) indistinguishable output. +, allowDocBook ? true }: let @@ -127,26 +131,23 @@ in rec { ]; options = builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix)); + # merge with an empty set if baseOptionsJSON is null to run markdown + # processing on the input options + baseJSON = + if baseOptionsJSON == null + then builtins.toFile "base.json" "{}" + else baseOptionsJSON; } '' # Export list of options in different format. dst=$out/share/doc/nixos mkdir -p $dst - ${ - if baseOptionsJSON == null - then '' - # `cp $options $dst/options.json`, but with temporary - # markdown processing - python ${./mergeJSON.py} $options <(echo '{}') > $dst/options.json - '' - else '' - python ${./mergeJSON.py} \ - ${lib.optionalString warningsAreErrors "--warnings-are-errors"} \ - ${baseOptionsJSON} $options \ - > $dst/options.json - '' - } + python ${./mergeJSON.py} \ + ${lib.optionalString warningsAreErrors "--warnings-are-errors"} \ + ${lib.optionalString (! allowDocBook) "--error-on-docbook"} \ + $baseJSON $options \ + > $dst/options.json brotli -9 < $dst/options.json > $dst/options.json.br diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index 1a1af11337e7..eae9ca031244 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -212,8 +212,17 @@ def convertMD(options: Dict[str, Any]) -> str: return options -warningsAreErrors = sys.argv[1] == "--warnings-are-errors" -optOffset = 1 if warningsAreErrors else 0 +warningsAreErrors = False +errorOnDocbook = False +optOffset = 0 +for arg in sys.argv[1:]: + if arg == "--warnings-are-errors": + optOffset += 1 + warningsAreErrors = True + if arg == "--error-on-docbook": + optOffset += 1 + errorOnDocbook = True + options = pivot(json.load(open(sys.argv[1 + optOffset], 'r'))) overrides = pivot(json.load(open(sys.argv[2 + optOffset], 'r'))) @@ -241,9 +250,33 @@ for (k, v) in overrides.items(): severity = "error" if warningsAreErrors else "warning" +def is_docbook(o, key): + val = o.get(key, {}) + if not isinstance(val, dict): + return False + return val.get('_type', '') == 'literalDocBook' + # check that every option has a description hasWarnings = False +hasErrors = False for (k, v) in options.items(): + if errorOnDocbook: + if isinstance(v.value.get('description', {}), str): + hasErrors = True + print( + f"\x1b[1;31merror: option {v.name} description uses DocBook\x1b[0m", + file=sys.stderr) + elif is_docbook(v.value, 'defaultText'): + hasErrors = True + print( + f"\x1b[1;31merror: option {v.name} default uses DocBook\x1b[0m", + file=sys.stderr) + elif is_docbook(v.value, 'example'): + hasErrors = True + print( + f"\x1b[1;31merror: option {v.name} example uses DocBook\x1b[0m", + file=sys.stderr) + if v.value.get('description', None) is None: hasWarnings = True print(f"\x1b[1;31m{severity}: option {v.name} has no description\x1b[0m", file=sys.stderr) @@ -254,6 +287,8 @@ for (k, v) in options.items(): f"\x1b[1;31m{severity}: option {v.name} has no type. Please specify a valid type, see " + "https://nixos.org/manual/nixos/stable/index.html#sec-option-types\x1b[0m", file=sys.stderr) +if hasErrors: + sys.exit(1) if hasWarnings and warningsAreErrors: print( "\x1b[1;31m" + diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 5dcdc8f96c44..e85ad4efd008 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -99,7 +99,7 @@ let exit 1 } >&2 ''; - inherit (cfg.nixos.options) warningsAreErrors; + inherit (cfg.nixos.options) warningsAreErrors allowDocBook; }; @@ -255,6 +255,23 @@ in ''; }; + nixos.options.allowDocBook = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether to allow DocBook option docs. When set to `false` all option using + DocBook documentation will cause a manual build error; additionally a new + renderer may be used. + + ::: {.note} + The `false` setting for this option is not yet fully supported. While it + should work fine and produce the same output as the previous toolchain + using DocBook it may not work in all circumstances. Whether markdown option + documentation is allowed is independent of this option. + ::: + ''; + }; + nixos.options.warningsAreErrors = mkOption { type = types.bool; default = true; From d98322834b496876723a529b92c2f80eeae0a60c Mon Sep 17 00:00:00 2001 From: pennae Date: Thu, 1 Sep 2022 19:44:36 +0200 Subject: [PATCH 53/58] nixos/*: fix docbook deprecation notices mostly no rendering changes except in buildkite, which used markdown where docbook was expected without marking up its markdown. --- nixos/modules/programs/rust-motd.nix | 2 +- .../buildkite-agents.nix | 2 +- nixos/modules/services/desktops/espanso.nix | 2 +- .../services/misc/sourcehut/default.nix | 2 +- .../prometheus/exporters/rtl_433.nix | 2 +- .../monitoring/prometheus/exporters/v2ray.nix | 2 +- nixos/modules/services/networking/i2pd.nix | 6 +- .../networking/keepalived/default.nix | 8 +-- .../strongswan-swanctl/param-constructors.nix | 2 +- .../services/networking/wpa_supplicant.nix | 8 +-- nixos/modules/services/web-apps/dolibarr.nix | 42 +++++++------- .../modules/services/web-apps/writefreely.nix | 56 +++++++++---------- nixos/modules/system/boot/networkd.nix | 12 ++-- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 14 files changed, 73 insertions(+), 75 deletions(-) diff --git a/nixos/modules/programs/rust-motd.nix b/nixos/modules/programs/rust-motd.nix index 671e701cd195..f89b5e038387 100644 --- a/nixos/modules/programs/rust-motd.nix +++ b/nixos/modules/programs/rust-motd.nix @@ -7,7 +7,7 @@ let format = pkgs.formats.toml { }; in { options.programs.rust-motd = { - enable = mkEnableOption "rust-motd"; + enable = mkEnableOption (lib.mdDoc "rust-motd"); enableMotdInSSHD = mkOption { default = true; type = types.bool; diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix index 3d29a641a195..7c8f77580ff6 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -9,7 +9,7 @@ let inherit name; value = mkOption { default = null; - inherit description; + description = lib.mdDoc description; type = types.nullOr types.lines; } // (if example == null then {} else { inherit example; }); }; diff --git a/nixos/modules/services/desktops/espanso.nix b/nixos/modules/services/desktops/espanso.nix index 4ef6724dda0a..cbc48034795e 100644 --- a/nixos/modules/services/desktops/espanso.nix +++ b/nixos/modules/services/desktops/espanso.nix @@ -6,7 +6,7 @@ in { meta = { maintainers = with lib.maintainers; [ numkem ]; }; options = { - services.espanso = { enable = options.mkEnableOption "Espanso"; }; + services.espanso = { enable = options.mkEnableOption (lib.mdDoc "Espanso"); }; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/misc/sourcehut/default.nix b/nixos/modules/services/misc/sourcehut/default.nix index dd0e016a1da7..9177f3cd022e 100644 --- a/nixos/modules/services/misc/sourcehut/default.nix +++ b/nixos/modules/services/misc/sourcehut/default.nix @@ -101,7 +101,7 @@ let todosrht ]); mkOptionNullOrStr = description: mkOption { - inherit description; + description = lib.mdDoc description; type = with types; nullOr str; default = null; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix b/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix index 42bf1788aea9..1f7235cb7830 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix @@ -16,7 +16,7 @@ in }; "${field}" = lib.mkOption { type = int; - inherit description; + description = lib.mdDoc description; }; location = lib.mkOption { type = str; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix b/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix index 185506cfc2b7..a019157c664b 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix @@ -11,7 +11,7 @@ in v2rayEndpoint = mkOption { type = types.str; default = "127.0.0.1:54321"; - description = '' + description = lib.mdDoc '' v2ray grpc api endpoint ''; }; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 47f4a42aa5dd..b60cbe664b6f 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -396,12 +396,12 @@ in }; precomputation.elgamal = mkEnableTrueOption "Precomputed ElGamal tables" // { - description = '' + description = lib.mdDoc '' Whenever to use precomputated tables for ElGamal. - i2pd defaults to false + {command}`i2pd` defaults to `false` to save 64M of memory (and looses some performance). - We default to true as that is what most + We default to `true` as that is what most users want anyway. ''; }; diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix index 1ab25c879916..e9df08f00c37 100644 --- a/nixos/modules/services/networking/keepalived/default.nix +++ b/nixos/modules/services/networking/keepalived/default.nix @@ -268,11 +268,11 @@ in type = types.nullOr types.path; default = null; example = "/run/keys/keepalived.env"; - description = '' + description = lib.mdDoc '' Environment variables from this file will be interpolated into the - final config file using envsubst with this syntax: $ENVIRONMENT - or ''${VARIABLE}. - The file should contain lines formatted as SECRET_VAR=SECRET_VALUE. + final config file using envsubst with this syntax: `$ENVIRONMENT` + or `''${VARIABLE}`. + The file should contain lines formatted as `SECRET_VAR=SECRET_VALUE`. This is useful to avoid putting secrets into the nix store. ''; }; diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix index 8245b25719e4..dc6d8f48e626 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -152,7 +152,7 @@ rec { option = mkOption { type = types.attrsOf (types.submodule {options = paramsToOptions params;}); default = {}; - inherit description; + description = lib.mdDoc description; }; render = postfix: attrs: let postfixedAttrs = mapAttrs' (name: nameValuePair "${name}-${postfix}") attrs; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 6c58bcfbbf18..119575bdddb4 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -187,12 +187,12 @@ in { }; allowAuxiliaryImperativeNetworks = mkEnableOption (lib.mdDoc "support for imperative & declarative networks") // { - description = '' + description = lib.mdDoc '' Whether to allow configuring networks "imperatively" (e.g. via - wpa_supplicant_gui) and declaratively via - . + `wpa_supplicant_gui`) and declaratively via + [](#opt-networking.wireless.networks). - Please note that this adds a custom patch to wpa_supplicant. + Please note that this adds a custom patch to `wpa_supplicant`. ''; }; diff --git a/nixos/modules/services/web-apps/dolibarr.nix b/nixos/modules/services/web-apps/dolibarr.nix index 2b2e2a6214dc..5335c439329c 100644 --- a/nixos/modules/services/web-apps/dolibarr.nix +++ b/nixos/modules/services/web-apps/dolibarr.nix @@ -48,12 +48,12 @@ in { # interface options.services.dolibarr = { - enable = mkEnableOption "dolibarr"; + enable = mkEnableOption (lib.mdDoc "dolibarr"); domain = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' Domain name of your server. ''; }; @@ -61,35 +61,35 @@ in user = mkOption { type = types.str; default = "dolibarr"; - description = '' + description = lib.mdDoc '' User account under which dolibarr runs. - - If left as the default value this user will automatically be created - on system activation, otherwise you are responsible for - ensuring the user exists before the dolibarr application starts. - + ::: {.note} + If left as the default value this user will automatically be created + on system activation, otherwise you are responsible for + ensuring the user exists before the dolibarr application starts. + ::: ''; }; group = mkOption { type = types.str; default = "dolibarr"; - description = '' + description = lib.mdDoc '' Group account under which dolibarr runs. - - If left as the default value this group will automatically be created - on system activation, otherwise you are responsible for - ensuring the group exists before the dolibarr application starts. - + ::: {.note} + If left as the default value this group will automatically be created + on system activation, otherwise you are responsible for + ensuring the group exists before the dolibarr application starts. + ::: ''; }; stateDir = mkOption { type = types.str; default = "/var/lib/dolibarr"; - description = '' + description = lib.mdDoc '' State and configuration directory dolibarr will use. ''; }; @@ -98,33 +98,33 @@ in host = mkOption { type = types.str; default = "localhost"; - description = "Database host address."; + description = lib.mdDoc "Database host address."; }; port = mkOption { type = types.port; default = 3306; - description = "Database host port."; + description = lib.mdDoc "Database host port."; }; name = mkOption { type = types.str; default = "dolibarr"; - description = "Database name."; + description = lib.mdDoc "Database name."; }; user = mkOption { type = types.str; default = "dolibarr"; - description = "Database username."; + description = lib.mdDoc "Database username."; }; passwordFile = mkOption { type = with types; nullOr path; default = null; example = "/run/keys/dolibarr-dbpassword"; - description = "Database password file."; + description = lib.mdDoc "Database password file."; }; createLocally = mkOption { type = types.bool; default = true; - description = "Create the database and database user locally."; + description = lib.mdDoc "Create the database and database user locally."; }; }; diff --git a/nixos/modules/services/web-apps/writefreely.nix b/nixos/modules/services/web-apps/writefreely.nix index c363760d5c2d..dec00b46f335 100644 --- a/nixos/modules/services/web-apps/writefreely.nix +++ b/nixos/modules/services/web-apps/writefreely.nix @@ -133,45 +133,45 @@ let in { options.services.writefreely = { enable = - lib.mkEnableOption "Writefreely, build a digital writing community"; + lib.mkEnableOption (lib.mdDoc "Writefreely, build a digital writing community"); package = lib.mkOption { type = lib.types.package; default = pkgs.writefreely; defaultText = lib.literalExpression "pkgs.writefreely"; - description = "Writefreely package to use."; + description = lib.mdDoc "Writefreely package to use."; }; stateDir = mkOption { type = types.path; default = "/var/lib/writefreely"; - description = "The state directory where keys and data are stored."; + description = lib.mdDoc "The state directory where keys and data are stored."; }; user = mkOption { type = types.str; default = "writefreely"; - description = "User under which Writefreely is ran."; + description = lib.mdDoc "User under which Writefreely is ran."; }; group = mkOption { type = types.str; default = "writefreely"; - description = "Group under which Writefreely is ran."; + description = lib.mdDoc "Group under which Writefreely is ran."; }; host = mkOption { type = types.str; default = ""; - description = "The public host name to serve."; + description = lib.mdDoc "The public host name to serve."; example = "example.com"; }; settings = mkOption { default = { }; - description = '' - Writefreely configuration (config.ini). Refer to - + description = lib.mdDoc '' + Writefreely configuration ({file}`config.ini`). Refer to + for details. ''; @@ -183,7 +183,7 @@ in { theme = mkOption { type = types.str; default = "write"; - description = "The theme to apply."; + description = lib.mdDoc "The theme to apply."; }; }; @@ -192,7 +192,7 @@ in { type = types.port; default = if cfg.nginx.enable then 18080 else 80; defaultText = "80"; - description = "The port WriteFreely should listen on."; + description = lib.mdDoc "The port WriteFreely should listen on."; }; }; }; @@ -203,60 +203,60 @@ in { type = mkOption { type = types.enum [ "sqlite3" "mysql" ]; default = "sqlite3"; - description = "The database provider to use."; + description = lib.mdDoc "The database provider to use."; }; name = mkOption { type = types.str; default = "writefreely"; - description = "The name of the database to store data in."; + description = lib.mdDoc "The name of the database to store data in."; }; user = mkOption { type = types.nullOr types.str; default = if cfg.database.type == "mysql" then "writefreely" else null; defaultText = "writefreely"; - description = "The database user to connect as."; + description = lib.mdDoc "The database user to connect as."; }; passwordFile = mkOption { type = types.nullOr types.path; default = null; - description = "The file to load the database password from."; + description = lib.mdDoc "The file to load the database password from."; }; host = mkOption { type = types.str; default = "localhost"; - description = "The database host to connect to."; + description = lib.mdDoc "The database host to connect to."; }; port = mkOption { type = types.port; default = 3306; - description = "The port used when connecting to the database host."; + description = lib.mdDoc "The port used when connecting to the database host."; }; tls = mkOption { type = types.bool; default = false; description = - "Whether or not TLS should be used for the database connection."; + lib.mdDoc "Whether or not TLS should be used for the database connection."; }; migrate = mkOption { type = types.bool; default = true; description = - "Whether or not to automatically run migrations on startup."; + lib.mdDoc "Whether or not to automatically run migrations on startup."; }; createLocally = mkOption { type = types.bool; default = false; - description = '' - When is set to - "mysql", this option will enable the MySQL service locally. + description = lib.mdDoc '' + When {option}`services.writefreely.database.type` is set to + `"mysql"`, this option will enable the MySQL service locally. ''; }; }; @@ -264,15 +264,15 @@ in { admin = { name = mkOption { type = types.nullOr types.str; - description = "The name of the first admin user."; + description = lib.mdDoc "The name of the first admin user."; default = null; }; initialPasswordFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path to a file containing the initial password for the admin user. - If not provided, the default password will be set to nixos. + If not provided, the default password will be set to `nixos`. ''; default = pkgs.writeText "default-admin-pass" "nixos"; defaultText = "/nix/store/xxx-default-admin-pass"; @@ -284,13 +284,13 @@ in { type = types.bool; default = false; description = - "Whether or not to enable and configure nginx as a proxy for WriteFreely."; + lib.mdDoc "Whether or not to enable and configure nginx as a proxy for WriteFreely."; }; forceSSL = mkOption { type = types.bool; default = false; - description = "Whether or not to force the use of SSL."; + description = lib.mdDoc "Whether or not to force the use of SSL."; }; }; @@ -299,7 +299,7 @@ in { type = types.bool; default = false; description = - "Whether or not to automatically fetch and configure SSL certs."; + lib.mdDoc "Whether or not to automatically fetch and configure SSL certs."; }; }; }; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 25e30c9303bd..cb60117f0eb8 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1257,11 +1257,10 @@ let default = {}; example = { Route = "fd00::/64"; }; type = types.addCheck (types.attrsOf unitOption) check.network.sectionIPv6RoutePrefix; - description = '' + description = lib.mdDoc '' Each attribute in this set specifies an option in the - [IPv6RoutePrefix] section of the unit. See - systemd.network - 5 for details. + `[IPv6RoutePrefix]` section of the unit. See + {manpage}`systemd.network(5)` for details. ''; }; }; @@ -1413,10 +1412,9 @@ let default = []; example = [ { ipv6RoutePrefixConfig = { Route = "fd00::/64"; LifetimeSec = 3600; }; } ]; type = with types; listOf (submodule ipv6RoutePrefixOptions); - description = '' + description = lib.mdDoc '' A list of ipv6RoutePrefix sections to be added to the unit. See - systemd.network - 5 for details. + {manpage}`systemd.network(5)` for details. ''; }; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 0207bfba82ad..edc6dfdc15ae 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -584,7 +584,7 @@ in example = literalExpression '' import pkgs.path { system = "x86_64-darwin"; } ''; - description = '' + description = lib.mdDoc '' pkgs set to use for the host-specific packages of the vm runner. Changing this to e.g. a Darwin package set allows running NixOS VMs on Darwin. ''; From ec75c8efff8eab18dc8ec7c5016d589c0c705f95 Mon Sep 17 00:00:00 2001 From: pennae Date: Sat, 3 Sep 2022 16:35:28 +0200 Subject: [PATCH 54/58] workflows: check that nixos manual does not use docbook option docs the nixos manual should not use docbook for module option documentation, only markdown, to make future transition to a markdown-only world easier and less painful. this check will ensure that all options documentation (even plain text that would not be interpreted specially by neither markdown nor docbook) is declared as being markdown. --- .github/workflows/manual-nixos.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 64829a191369..86825eb5aef3 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -27,5 +27,13 @@ jobs: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' - - name: Building NixOS manual + - name: Building NixOS manual with DocBook options run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true nixos/release.nix -A manual.x86_64-linux + - name: Building NixOS manual with Markdown options + run: | + export NIX_PATH=nixpkgs=$(pwd) + nix-build \ + --option restrict-eval true \ + --arg configuration '{ documentation.nixos.options.allowDocBook = false; }' \ + nixos/release.nix \ + -A manual.x86_64-linux From c45deeb2aa67019d216a3dd1baca4a5157bdf123 Mon Sep 17 00:00:00 2001 From: pennae Date: Sat, 3 Sep 2022 16:35:28 +0200 Subject: [PATCH 55/58] workflows: add check for docbook/md manual equality we want to make sure that rendering the manual from markdown without going through docbook produces (semantically) the same output as with going through docbook. to ensure this we'll build the manual twice, run each manual through html-tidy to generate a normalized form and diff the normalized forms. we don't want to compare raw output because that exposes us to a lot of whitespace we'd have to reproduce exactly in the MD render. this check may be relaxed even further in the future, but hopefully not by much. --- .github/workflows/compare-manuals.sh | 21 +++++++++ .github/workflows/manual-rendering.yml | 63 ++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100755 .github/workflows/compare-manuals.sh create mode 100644 .github/workflows/manual-rendering.yml diff --git a/.github/workflows/compare-manuals.sh b/.github/workflows/compare-manuals.sh new file mode 100755 index 000000000000..b2cc68c7831d --- /dev/null +++ b/.github/workflows/compare-manuals.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p html-tidy + +set -euo pipefail +shopt -s inherit_errexit + +normalize() { + tidy \ + --anchor-as-name no \ + --coerce-endtags no \ + --escape-scripts no \ + --fix-backslash no \ + --fix-style-tags no \ + --fix-uri no \ + --indent yes \ + --wrap 0 \ + < "$1" \ + 2> /dev/null +} + +diff -U3 <(normalize "$1") <(normalize "$2") diff --git a/.github/workflows/manual-rendering.yml b/.github/workflows/manual-rendering.yml new file mode 100644 index 000000000000..6c4a9507c5ca --- /dev/null +++ b/.github/workflows/manual-rendering.yml @@ -0,0 +1,63 @@ +name: "Check NixOS Manual DocBook rendering against MD rendering" + + +on: + schedule: + # * is a special character in YAML so you have to quote this string + # Check every 24 hours + - cron: '0 0 * * *' + +permissions: + contents: read + +jobs: + check-rendering-equivalence: + permissions: + issues: write # for peter-evans/create-or-update-comment to create or update comment + if: github.repository_owner == 'NixOS' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: cachix/install-nix-action@v17 + with: + # explicitly enable sandbox + extra_nix_config: sandbox = true + - uses: cachix/cachix-action@v10 + with: + # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. + name: nixpkgs-ci + signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' + + - name: Build DocBook and MD manuals + run: | + export NIX_PATH=nixpkgs=$(pwd) + nix-build \ + --option restrict-eval true \ + -o docbook nixos/release.nix \ + -A manual.x86_64-linux + nix-build \ + --option restrict-eval true \ + --arg configuration '{ documentation.nixos.options.allowDocBook = false; }' \ + -o md nixos/release.nix \ + -A manual.x86_64-linux + + - name: Compare DocBook and MD manuals + id: check + run: | + .github/workflows/compare-manuals.sh \ + docbook/share/doc/nixos/options.html \ + md/share/doc/nixos/options.html + + # if the manual can't be built we don't want to notify anyone. + # while this may temporarily hide rendering failures it will be a lot + # less noisy until all nixpkgs pull requests have stopped using + # docbook for option docs. + - name: Comment on failure + uses: peter-evans/create-or-update-comment@v2 + if: ${{ failure() && steps.check.conclusion == 'failure' }} + with: + issue-number: 189318 + body: | + Markdown and DocBook manuals do not agree. + + Check https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }} for details. From 9bc0d6697913529a8ad98302f3fe7a7793ddf591 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 17:02:04 +0000 Subject: [PATCH 56/58] python310Packages.awscrt: 0.14.5 -> 0.14.6 --- pkgs/development/python-modules/awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 4d6875ad5782..7390d861dd3e 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.14.5"; + version = "0.14.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-5dmPTN86DtEtGTgvX1T8QfvPdqZNdyBQP3lt4e4tH3o="; + hash = "sha256-sLh9kM4HcsLrvljvdyLBa0FkkJyTT9zbwumKGTHN1UE="; }; buildInputs = lib.optionals stdenv.isDarwin [ From cc36652f8d6cba8d752845435b3d7ef66627d2fe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Sep 2022 10:55:35 -0700 Subject: [PATCH 57/58] nextcloud-client: 3.5.4 -> 3.6.0 (#190155) Co-authored-by: Doron Behar --- pkgs/applications/networking/nextcloud-client/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 51b95a3f2a4d..bf05d9d1fae2 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.5.4"; + version = "3.6.0"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-ennKNUuoyhpVfG1XPzJKrop0i77BAB3C2MNqZPOXNkc="; + sha256 = "sha256-wAxq5xFlofn2xEguvewMvGcel9O+CN/1AycR3tv/xMA="; }; patches = [ @@ -77,8 +77,6 @@ mkDerivation rec { qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" - # See also: https://bugreports.qt.io/browse/QTBUG-85967 - "--set QML_DISABLE_DISK_CACHE 1" # make xdg-open overrideable at runtime "--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}" ]; From eaba40695eeae3e9aeb4492e60d438c111b25f87 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Sep 2022 10:55:45 -0700 Subject: [PATCH 58/58] tor: 0.4.7.8 -> 0.4.7.10 (#190647) --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 75492e877386..db6f890eda8b 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.7.8"; + version = "0.4.7.10"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-nppcZ60qzdXw+L4U7Vkf7QdrFwir+DRAZpkKD6Zv4ZU="; + sha256 = "sha256-ZH5W36Weo22rBSAn/Px2Y5BcgmwDUJNjxFaQDs1DWls="; }; outputs = [ "out" "geoip" ];