From 73846b372fe93b5c674ff56e59b2a1dfa70d3d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Fri, 24 Sep 2021 13:09:37 +0200 Subject: [PATCH 01/50] nixos/acme: add webroots to ReadWritePaths Since 7a10478ea7b992ffa1f19f389e53df0fe2aa936d, all /var except /var/lib/acme gets mounted in a read-only fashion. This behavior breaks the existing acme deployments having a webroot set outside of /var/lib/acme. Collecting the webroots and adding them to the paths read/write mounted to the systemd service runtime tree. Fixes #139310 --- nixos/modules/security/acme.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index bcbd17d8e10e..1a5c3592c1f1 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -192,6 +192,14 @@ let ++ data.extraLegoRenewFlags ); + # We need to collect all the ACME webroots to grant them write + # access in the systemd service. + webroots = + lib.remove null + (lib.unique + (builtins.map + (certAttrs: certAttrs.webroot) + (lib.attrValues config.security.acme.certs))); in { inherit accountHash cert selfsignedDeps; @@ -288,6 +296,8 @@ let "acme/.lego/accounts/${accountHash}" ]; + ReadWritePaths = commonServiceConfig.ReadWritePaths ++ webroots; + # Needs to be space separated, but can't use a multiline string because that'll include newlines BindPaths = [ "${accountDir}:/tmp/accounts" From 98e3e2fe9e7bae56c37b8a287c04fe967418ec64 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 20 Oct 2021 17:14:51 +0100 Subject: [PATCH 02/50] vde2: explicitly disable parallel building --- pkgs/tools/networking/vde2/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 694a2bc02056..31d4f9e3ff57 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -34,6 +34,13 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # Disable parallel build as it fails as: + # make: *** No rule to make target '../../src/lib/libvdemgmt.la', + # needed by 'libvdesnmp.la'. Stop. + # Next release should address it with + # https://github.com/virtualsquare/vde-2/commit/7dd9ed46d5dca125ca45d679ac9f3acbfb0f9300.patch + enableParallelBuilding = false; + meta = with lib; { homepage = "https://github.com/virtualsquare/vde-2"; description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network"; From f488a5250e5ea3d1774b7803bf77ea0b39071aa1 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 22 Oct 2021 09:12:57 +0900 Subject: [PATCH 03/50] thunderbird-bin: 91.1.2 -> 91.2.1 --- .../thunderbird-bin/release_sources.nix | 522 +++++++++--------- 1 file changed, 261 insertions(+), 261 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 1cdce2638beb..5af24287c171 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.1.2"; + version = "91.2.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/af/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/af/thunderbird-91.2.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f786ba47061600b2a4fce6dc537e4d5f41ef7e496ddd24e06e5cf2d2bc7ae615"; + sha256 = "953e07d7198b8b13f312ef620caf6e232c361f78dd04ebd69c753f7b75e55f42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ar/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ar/thunderbird-91.2.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "70e13fa57939ec35fed7e537c282411e022e2e596af298ff68ed06d29149ad44"; + sha256 = "29f34eac79855c01550a259d3663c662ec9bd259c0b20bf392efb0de1f44af8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ast/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ast/thunderbird-91.2.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "22ac54e15cc8d89412f26906b10d7274a90d86f298948998dabbbb63000fd9bd"; + sha256 = "284d8935a5527b58f84ba9acabc0a67c51a7e1587f843d8b0ec9555e6f6d8f4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/be/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/be/thunderbird-91.2.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "bb59b38220fc5a2e429df9bf521610678b7b3c7e47e4a3208c9e0e54860ae098"; + sha256 = "6a535aac3b4eb839a2aca1df28ac8425c142c68bd5c6907f5b9999a45b62c9c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/bg/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/bg/thunderbird-91.2.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "7a0d50876f51664074b6eefd20dc727cea2d4a0feceb721c63fa9e3872ea6d07"; + sha256 = "74dde907aaa3877651e1f2bec43a208ff36bf7d860333eaac6f8cdd20d48dc39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/br/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/br/thunderbird-91.2.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "8a49fe9b26d1a5c5b3c28209cbb6d81e785235f4e1b24e4638cf5a5fa720d68e"; + sha256 = "6b396a289addae8d5ade8355f8c93c285ce6833852149a0fed3f741d9ceea220"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ca/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ca/thunderbird-91.2.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "380d655a39c7f20067045cf2ec75e5bca0ba0e8291d187fd87ac42abbbce7dc7"; + sha256 = "0611d49fd90777b3af1bd5b5effd3b4a5b267c7c33e6476ceed906a070a0e675"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/cak/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/cak/thunderbird-91.2.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "ff12816d6dac6311b2f0a358ee4a30e80d3a346c9a2fc08c9c4d72b2e7421b03"; + sha256 = "032e7034ab5aada649258dfa43cc10d6e00cf5be6f06b8bede06d2ca19625d79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/cs/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/cs/thunderbird-91.2.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "fc8ed1c83b76329aecd9b6b7b4c2278b2703dc267ef25ad973deefff01cbb29d"; + sha256 = "b0591e3bdf5e9273269354924fcfa8001579961f089f1011226faf1f4b0ab2e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/cy/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/cy/thunderbird-91.2.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "50e10c11f341b75e4ca464911a7229d22073d72b53731ba92cbd39c52694e0d2"; + sha256 = "4087f5c5609169b6834e2eed3fdaf614826c47f3ca99177292fd379ef5d430b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/da/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/da/thunderbird-91.2.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "1c041fb7c71e9d0f07c82652129a6b48f2f633a7781c41a3c439dec1d7fcabee"; + sha256 = "b72f768cc2d9c2bad536e2467d1abfe68671b242fcac801e57297694fd41d231"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/de/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/de/thunderbird-91.2.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c9ed27ee3f1a631c6a7d7a5a854e48f3285b9f01c81bc9ee3611bbdd9f483cdc"; + sha256 = "48990ead3d84cb023e8c3e6e34113209b49e6ed3e29766fb5374fe577cd5cd94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/dsb/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/dsb/thunderbird-91.2.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "3c00604247dee961915f2aff628bd7d1f53c4f7e48bb848ef6065e41f189495d"; + sha256 = "c7e93ffe9d8ab0bc00db145771e65fec6c589208c28c3e0ecb5bb49471b9ed61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/el/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/el/thunderbird-91.2.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b9ad1ab6b7d33f477f51e4337d914f8f8d2f6d7bc1b3b884d8b71b17547c3fa0"; + sha256 = "c35372524d77123bb9827d26efcd29e0fb9de402744b22a3c99563531410e2b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/en-CA/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/en-CA/thunderbird-91.2.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "80e6b5785d334bec69455ca5f5039bbd4fbebd663ea91d17d0fbe8e33d747670"; + sha256 = "d20fa4b8c7224f35f06d384b5f37c277c56ac35f2099f59735197a0334c9f3ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/en-GB/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/en-GB/thunderbird-91.2.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "da2388577784df3faad7b40566e2e1eab2b95dd9455a1e4e3ee43433f4fb189e"; + sha256 = "af0787957918aee6bb931b30ab92722c3ea8fe1e3fd60602d172a598422f7896"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/en-US/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/en-US/thunderbird-91.2.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "1354e3ad2989749fe79b404ccae3002de8b4e269c98388d9abebe456f3de47d2"; + sha256 = "f8968d5ecf27e37bb8204291a9739ab804ef77c082e11b4e82fc7e02c8bf0da4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/es-AR/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/es-AR/thunderbird-91.2.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "f51d4a1109d30d4857673575aef173026e2c90fc7ece6835a34a0e792672cf8b"; + sha256 = "ec281675876941240ccebe0c48bbb4ae0ed442b795cd7ee1be51ec59c4331220"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/es-ES/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/es-ES/thunderbird-91.2.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "38196b265eeaef2222e624e2fb0cb7742b2171965aa0725b3d524e9199ea4f91"; + sha256 = "6436ab381f1ab7fbcf1289d50300d7238f1095022cf18d6441832a8f61df68ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/et/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/et/thunderbird-91.2.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "ab3b04c02b730f92db4f24daac688e1966349cf4c978ed06138285fcb2d72769"; + sha256 = "1e49089b98dcfebdc1465b93d625b6ea1b6fee4642ca915035fabdc97710eb0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/eu/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/eu/thunderbird-91.2.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "4431e16f70b6182b1ec2bed64d149ffc7e46f1b2536268e973eb984439eda400"; + sha256 = "c6a1418f15a019924b459b952330b9851c50907a7c12f3d430a79268ebdb7bac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/fi/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/fi/thunderbird-91.2.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "8ee9b2983d1f214f4589d7d99d1ac1a577f92dd3cc73f516dcc050079ed85904"; + sha256 = "588261a4c0e9cfa0c9f506f4fd2e9e14f123d10e96f0cc1724b4ea4607151264"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/fr/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/fr/thunderbird-91.2.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "b614dadf34774ebf45c88ae0c72c6d8779beb8310a8353aedeca1a493178c376"; + sha256 = "9ca2d54c6f6f04ee887621332cc35aeabd0f9b73db621c41e8925bafb316670a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/fy-NL/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/fy-NL/thunderbird-91.2.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "00693bbfda9377d2695fc8c7c242b0e4a3c1b745e8779ebabe5686eca4fc928a"; + sha256 = "df9bae4cc2d3bd2778047d4589ec1a8e23f7b8c7fc760817decb9341b59dc0b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ga-IE/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ga-IE/thunderbird-91.2.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "00d26b39726e2de2e799b3dff97c79a590f712f3347232600d1f2771523d0ab4"; + sha256 = "8d6445032f39152c62e98fe9093cefbaa383d2bff203734ca04a501b44a3a0c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/gd/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/gd/thunderbird-91.2.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "d9a35fbf9f4069c6f4dd796c8f9465053413d806093d1456e643c9bdb081ad45"; + sha256 = "b947847398a8e086d062f8e54f515d53e39afab48ec59ca0aceb956ea0e0917f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/gl/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/gl/thunderbird-91.2.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "9e7f237b55f81a44a984be4b4e1001c8ffd7742eb14e654397e80b4e4b765d0c"; + sha256 = "3dddbb5cc78171719ed2e7c3ba854c0a346ca5324a898c698dfb79c7881051c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/he/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/he/thunderbird-91.2.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "b86d479dd64ac86d43fbfb54c8ec36ea6b4516ded0383f81b78c11365290f21b"; + sha256 = "e77eb74db9111e54b1e492fb5752fa92ec6eed96a7146392d1ba19d63b5e2ab8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/hr/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hr/thunderbird-91.2.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "cb7e8d0dd04c5883f2ec0f47d81a751b901e0036f151ab1c0f3043ba7ebf4a74"; + sha256 = "3e4d46ecc0ef83a619775d48e4df81295e3e95ad1e9a96efeafa26d7f24b85ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/hsb/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hsb/thunderbird-91.2.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "d3141a413d82814067de2791091473e0b44f8939825cc3071b1fbe86e08dd49a"; + sha256 = "36453d6aca463fce338ac4a15c438290bdaa377aff72a56f0acefeba19860986"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/hu/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hu/thunderbird-91.2.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b76860152f68b2dfabef9847c83356af34b8fb1913d0d55a397be3d4e4e08b31"; + sha256 = "dd05c379727762fde0c2456a7bbd67cc45fb7ccfbbf88958b887d6637867e80e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/hy-AM/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/hy-AM/thunderbird-91.2.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "5aa35ed5d577befb7a37d5407bc7ff78c54314a7e5ed77bda588bd74111e263b"; + sha256 = "35e4db20ff927cf079607fd0e7d207c155f23c7890cc6347ac069c9d252f6ad3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/id/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/id/thunderbird-91.2.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0bb53b2cbed8a9412c6776435381d5c859a9993b4bd2cdf5ecd4145d13776d09"; + sha256 = "9cc7a35aed1e5808a80cade5b77d064f3bd36f08107dbbdd3b92ac11c8c83766"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/is/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/is/thunderbird-91.2.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "566058b39d98a777cb1c333b66cac66851d0c369918e58c592b8e0151b778f6f"; + sha256 = "de645fdf79f33195a7caed9461214f834fb2e52f3da764bde71608fd3783305e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/it/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/it/thunderbird-91.2.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "b88fb1b473a7b0b1a4af08a09aadf5b7502f03462a1f4661ed2897c2705e5b4d"; + sha256 = "f9a80f01d18cd36ac5c0a18d65908f329bc3d7ec506e0f201b833ed973528dca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ja/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ja/thunderbird-91.2.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6b69cd834280b36182656bd97b117c3f70bbcd947ab25e1936294a85149d3501"; + sha256 = "9345cfdb7e35fc15e94bab52f058dacecd813da210c81770f3037c6f3f982478"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ka/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ka/thunderbird-91.2.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "87d8bc04c278d8c675665d0211917a854d43a17d24173627703268a785ff2206"; + sha256 = "49e535b7b8322645b81b8137ded607cbe54e70977a07b800114421fb529b045b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/kab/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/kab/thunderbird-91.2.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "fad11f653198314683faaa758422506d27706b6dca90a4d5b0d3693810843fba"; + sha256 = "9e66e0654c5ca2d4fec6101bd40a2ab68f17ad4a27ff58db4a1c5d927d76761d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/kk/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/kk/thunderbird-91.2.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "67469c2c4e1352db94339687f93c0afefe41244bfc952d77c2e41e31a652f095"; + sha256 = "c929ef91d1ed17db64a36b5c8653e98e1be05b7bef48c062c40c0e37a88f6844"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ko/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ko/thunderbird-91.2.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "93bb5a6973bbd0eaac721ffd59c19edce400471c08d76aa629b2fe66fc98ddf9"; + sha256 = "758c31e642a796e3c8be2848e9789bf9c3d4f896790c80603491235ba126a195"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/lt/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/lt/thunderbird-91.2.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f4dda73c80cee8aaceee0f4ea0956303f9a50aa2431c6eb8a34d7d22b5fe53e9"; + sha256 = "7173cb778a4f1bc625b5dde4eedf59911eb649e29c20f8f2a2eca455696fbdfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/lv/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/lv/thunderbird-91.2.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "65325a804f5aec439501bd70e5423d56ddc5a10636b639e8db85ce8881c1586e"; + sha256 = "ec9ef897898c788521725879906c56593dd08e9b862b1ad32f7133bba7843b94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ms/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ms/thunderbird-91.2.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f2715978bc8e2d7878f8ec47b4a29cccaa42a24bd97f013f6b66aaf47db83359"; + sha256 = "1f95835843d33a80821c077b26ea5e6330ea3d1a818bb122623a6024dc98515c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/nb-NO/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/nb-NO/thunderbird-91.2.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "c252fdee3a9d9c43b46786c528bb8ac39203b7d7c746f9c9f04287cb1253ded6"; + sha256 = "f5aff84dd6016a4223df28fc92185cffc1771107bc4f7c442bef0d19ae4cccf5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/nl/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/nl/thunderbird-91.2.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "1708531ca0b765292206fa9c533200266f5eb48fbbc74daade404bdcbfdcc750"; + sha256 = "1146a72a68b454abdb3ab19e0a487e0aa46af0fec4c9261459ac20785a66f8ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/nn-NO/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/nn-NO/thunderbird-91.2.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "dc26c1333787accc73624bc5bac820af1743ea30d85e9da9a0c30f6b9b0c3bcf"; + sha256 = "a63d1124b72b4ad1e26f34b26792e576a63ade3aee161965058f6ba2144f4edc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/pa-IN/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pa-IN/thunderbird-91.2.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "fc508dd719c18c250560b5d4fc4672ce83a9f52b6103d3f33034eca89ed2935f"; + sha256 = "245692605721b9610bb730f7164c64daebad372f881842a3e2d92dd27cf2c23c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/pl/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pl/thunderbird-91.2.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "eb54040a841d0da1e84dd2a6ba3c894a57d40fdb0bf99f21b7fbbe3ea8cd755c"; + sha256 = "b3b3f9b4f4e2f310b24b148960dbbada8dedd444968f923e7295ce2e3f561bc0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/pt-BR/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pt-BR/thunderbird-91.2.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "45226857a691f8568c769f652820eb5b86b0928c271b2751014bd6e7ab29ab80"; + sha256 = "dc0a70cb19880a9ea7a076ea03c12150bf2ed6349bee7f7cd64b9ba261366e99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/pt-PT/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/pt-PT/thunderbird-91.2.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "532f18bbe7fc09793bd688e5bc48c65658e2a48285b97c611b68611e9f13257d"; + sha256 = "be20940db6d0b0399ea90e97ce4073c698c9caa822535cfdadaf5019aaa283f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/rm/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/rm/thunderbird-91.2.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "8d0f2ec43e6e00118d7c1d5877bfbc5b5c87a8e449a0358acc6e71244a0716b3"; + sha256 = "8e996281032049eeb70c12ecc10dd321b055d917edc3f16c12b073160552a76a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ro/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ro/thunderbird-91.2.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "dbfd5500b337132ab14266d2b87224c917086afe3f210127d73848d360299241"; + sha256 = "d015483952516c37169d263660776a572877d6db50b4e4bc42c9d285cc413032"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/ru/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/ru/thunderbird-91.2.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "06f6077ba98fc2605718266e57b9c5c54c3d7901f2b7233f38d7fd02d6d063a0"; + sha256 = "90404c19d3ab7d5142310ae23699b346ee07ab5704b02f3b89e1972737460448"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/sk/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sk/thunderbird-91.2.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "af1224613b3e962265d83b154cbf69053906197f2b7f12e5004ad862bef09aaa"; + sha256 = "2ed8cea88291714fe25b3f06777340536e24c1837743e6dd16bf2e66e90ed057"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/sl/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sl/thunderbird-91.2.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "597cd2732960eadd0121c4089a703cc86a0d9a361ff024fe047c8c624dc05afc"; + sha256 = "be29a12cd0d52f11f19cff89df0d0a883802328cbe036e9f01c2be7d296d5a4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/sq/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sq/thunderbird-91.2.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "c107fb5653cb7adfa79aad501e585943159fa9297ef360b193075a9b49e91d54"; + sha256 = "b9f0b22b8004af1e7704048eb7223bda77723f664aab3596a3e2fed538eab39f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/sr/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sr/thunderbird-91.2.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "33964cc6308a8e7ebc154c057f90729a92d2a9127f9d8c4592f884531d094334"; + sha256 = "1edd87244be553d61bd5db1de74068130e9a3ccfa387d21c489f9a777bbae732"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/sv-SE/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/sv-SE/thunderbird-91.2.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "91fa282c3baee03653ffe5164844e06a9813a40c360ef24e94ff525638f187de"; + sha256 = "e218a20074e50dbe20d2dba7e81d5febdbcad8031e0fd9d88aca469da9cea267"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/th/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/th/thunderbird-91.2.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "99ea8b61e102c3394073f3a817d3eeddc3cedb51436b66303730394f362e91f7"; + sha256 = "fa65b90c1cc903f3e1b743e142736b1c7e897eb6bf9a80cb0bffa60db627aba2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/tr/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/tr/thunderbird-91.2.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "bb1d417239c31c6ae9bf62cd545f2fad316915ce6bcb707f2deb65f0cc24425c"; + sha256 = "5af2e6453aa5523169d6922a8a888b757accad60802d7a457a1ee244cd74c3bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/uk/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/uk/thunderbird-91.2.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "8464520b025c29dcf3376d7c47d6c7596ff60eeabe63fc5c41082ceb4fbe148c"; + sha256 = "effad7de717f0597447a7559e666ee3cdb0a1270daa01226d662cab0be84a4dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/uz/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/uz/thunderbird-91.2.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "d4ba9eaafed3d475dd0fe3a7df7f9910fe3a95a74b9a83f2a00aa73441ae8a64"; + sha256 = "f3c8d3d4ca4c076eb8bcc8a06df32622b87b4d4ae397ee36f5de27a947d443ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/vi/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/vi/thunderbird-91.2.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "8c7f222e0c65ad2daaf37ab46fbe58e005aa89379a0a87f4b2a5f19528e0e5b2"; + sha256 = "ac464ab32927c822776b1cf873ea9b9a9473c18ac08b18534332050bde7b1dfe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/zh-CN/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/zh-CN/thunderbird-91.2.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "1cc053e2e9e751ca14da4a09c276d2c78f61ef4e7d74ac4019849f6ebc044d0d"; + sha256 = "44869c19113316a02518eb19fb5b1a7a85e266fccf7a3172d1938d758a5efa6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-x86_64/zh-TW/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-x86_64/zh-TW/thunderbird-91.2.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b77a3eb6d1e51388d1b084956b7cc579e1e3c8ed2bc72d7943ac5d6188e43938"; + sha256 = "82d915747e3e5459acba3e17663de422586f27e7bbc3a5698d992f82ee3d0cc1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/af/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/af/thunderbird-91.2.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "c2015b0cfa07309ca6afe5fefb24c1393a397b1d592dd80ec8b62bd4ef8a3d35"; + sha256 = "5ccbc3453b76c3e02a05b94905c48cdad99bb15042fb2cfc58c7f619a263da07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ar/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ar/thunderbird-91.2.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "f36b4e7452ae39bd2bf63231ab884356c7b77d6015993e09046b3d6a63443920"; + sha256 = "616fc2f0265f204b8699dd0beafc02220d7ba9b2243350730573824f6fa49462"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ast/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ast/thunderbird-91.2.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "600d102bbb18bac81e3d50c9ef9a578820b0fa1ba2a6f6d756da6e391fe0f241"; + sha256 = "046386e67e1b775f1f228e3056660db023093180f1c200f6380b6d3744b8ce4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/be/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/be/thunderbird-91.2.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "46032acc1c16e2c9bd7905799db6253cb16fb6269bb79edf6141b9d2bd5c0b15"; + sha256 = "bf64b91b16bdf4dbdfb88972432f2d2cce002a6ff8c708779511b54a05a7008f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/bg/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/bg/thunderbird-91.2.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "d21bfe3ad0c2c900de1ab9a88d62fc74c4c1767bb41121159c5c0c9bfe270a8c"; + sha256 = "f544fbff341165e8e304a8a643be60c8b742973402861b298171699c45fe622b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/br/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/br/thunderbird-91.2.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "8e20c1ce0867bafde00c3e8fc55d5841a14e91fa8039fc7259269da8bfbd4373"; + sha256 = "c76ec7e65fc4980f12e05f863d8babab09d771f9679d21c93d8dab0f76d16898"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ca/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ca/thunderbird-91.2.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "175bfb1b0ef94897ecd359c54a2767ca039a259300a5716211fa0c0593b81023"; + sha256 = "6c609f7b5886e7a7c70470d4bb35370284a454b109ca92cff9741bcc3086e9f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/cak/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/cak/thunderbird-91.2.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "65cf8763200cd10cbc016c9d447703b640c52165c691a604092376de09dc1376"; + sha256 = "f210ac1e0740c7105abd388e9b5e22d9e199ab3deb43842c3a82ecf5e6d15f01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/cs/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/cs/thunderbird-91.2.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "8d019c4f92f60c44f1340f96892c0a4060d4ceb86d188f5f81911d92ff2957f0"; + sha256 = "108d9bfa0b9bef9433f4837517d3d157d46c8578f889b9fb81bc72178f6dfe52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/cy/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/cy/thunderbird-91.2.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "29049a5f4849f7e2bde8ec122de33edb7c86e87eca46b72086e53caedcad7ef1"; + sha256 = "1bd421b89cded34d9a656b4e44b78c7b07557221b87dc99831ea7029ff6eead2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/da/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/da/thunderbird-91.2.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "39d9b429b8ee92b045abf48a605e32a577da1f61459b597698f87b1972993f2d"; + sha256 = "4db52d6017baeb8a5f925b7cfcdfb89a3ed8af9d3c1a41c4a63d122e4f214ecd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/de/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/de/thunderbird-91.2.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b8ccae9622a8fa684c48a39a409af461238325d91db5edd8d9ecbeaebf2fa999"; + sha256 = "584c0e8a03b068652f61978af053028ca3793e1679ff0ea214bc6f8a99761f0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/dsb/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/dsb/thunderbird-91.2.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "a32e1ec050968c94c2b2c1c175d13629fb5feda14e91a0e6c78a9e1bf4092ebe"; + sha256 = "f838e8b6fdfb09e44771cfe02d22abb63722c65a0e430c77aca9fb5a53a97c4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/el/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/el/thunderbird-91.2.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "7599c18f5c79d6aebb652308fa3fa9b13a4883c0dfc47e8bef6b6c118a2ed909"; + sha256 = "0b0a6cb3c77e0a4f86bd3adbd4bac229d50323a88b355e470184f932b9602e4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/en-CA/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/en-CA/thunderbird-91.2.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "47c49908cf59a8fa6ec1de512cd01907412cfc5b0f56709611b71eb0b3e6cdee"; + sha256 = "7e22ff64aed5187db9621754f1eedb158285c2514f3eca836103833ac6183f7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/en-GB/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/en-GB/thunderbird-91.2.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "9f379c2837dab6ece5306117065ddb1f19d3fa08900d5ed63abc34fff8755dda"; + sha256 = "a3be3dec0ec4789f8370c23e47b7ed0bef6802d28e3985c66d1a531a3aa986cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/en-US/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/en-US/thunderbird-91.2.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "97aaf105ff5fd3ac8b2b85ba0de87b1fe6ba01f647d32571b787591ba5f6e1cd"; + sha256 = "31c35df101e8d3f97c3df72b7660086fdf4f6612068fd03558d5f9dca2d23507"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/es-AR/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/es-AR/thunderbird-91.2.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "4db46b699d6a65fe482dd8f7bde005b5a4cccfbe7ef777f23f1aa57577d33a33"; + sha256 = "70db1a684f76886131214bb0c48dccd75763f041e06428ee6fef54a3a8d524c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/es-ES/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/es-ES/thunderbird-91.2.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "0a63e85f6992ce683f35ecfe6f0e10854fd8cada33f8a2e066d5ab140ef8c401"; + sha256 = "d0b792b494bea690adc6a2eb967a988920ca497db08c539f92349c925ccb7c33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/et/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/et/thunderbird-91.2.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "522ec0185345054abf61b84dfdb36ce3dbe01c70f5bae11aa17321d18091d759"; + sha256 = "2e4c3111435cb965972aec73eb181f7e3aac8faa03c8c8f0d7869ace109b433c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/eu/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/eu/thunderbird-91.2.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "c4e28df0193175149303d80617f04df4d229d8eee2a75129b315a0c23b22aba5"; + sha256 = "875e98a6ffcb614b3f062b7d12069eeb9f1c9dcd62916020369ede9ac76b8f92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/fi/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/fi/thunderbird-91.2.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "046b39db1f3f7c4fbe23e93053d43fe81e1b8751bb0558ad1bad3a50ab698673"; + sha256 = "982a28220ed9d6881d83baaf99540e7eb5d689b0b7fca179d4847838f2596a3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/fr/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/fr/thunderbird-91.2.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "39d15a1aa3f7c3e360e817baeb3747a49ae8f42d1b46208832eccb0107ca1b3b"; + sha256 = "f0421269313849e90eab46698176f1ca425d2bf8136748628a35b0a8baf26c06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/fy-NL/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/fy-NL/thunderbird-91.2.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "17c971a57634050faa9fe747055a671ac1ae0022a9b06a957eb05f7bb64f31cb"; + sha256 = "d49aafc5baebb88b4b2ef7ea5240babe09b16632edebf9a39081aaf183e9ae3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ga-IE/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ga-IE/thunderbird-91.2.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "58c17ea964de2b60440bb1a078222ab5b6199b83fa5f2854926b9f0c2a6cb3d3"; + sha256 = "665df98e5dd0ab4cff25b530bccfdfe4b44f2a81da9167b37aeedf7f05e1f59e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/gd/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/gd/thunderbird-91.2.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "4ee45ae272d53f523d2855083f27a0ce005d93ca95d13c2037621a87c294413c"; + sha256 = "28acbaec011f0222530d0f8411444fdf0743d05c05c1fc04a0c130208dd5e9f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/gl/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/gl/thunderbird-91.2.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "68012e665dea95fd4ce4f76dee0b246d2f94890e5a9b3c797e93ae7d450adc58"; + sha256 = "97c23e4eac308b51252c0532770961133f2540b94a9dc095c0351e39f42ab038"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/he/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/he/thunderbird-91.2.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "57125635f8fe2cb50cfe9aecdfe06502cce9c746b346083b329d5e1123d4956d"; + sha256 = "dfd4f5b4c9f396b4a512b38292b73f5a44146b3b46ab0d4e448067481e940914"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/hr/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hr/thunderbird-91.2.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f6f28200c32cc2faa4a4e4a49eed5b4343586b52ca123dbce43d32a1c5059835"; + sha256 = "07a1f4a58af9172912237c35c220efbe80fbcd44151dc0bce3e40ede38dff054"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/hsb/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hsb/thunderbird-91.2.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "6290282252b9a61fc7ffb1e29b14f31c87832bd60a066c73f9966a10f75ac327"; + sha256 = "c1b4e64ebdcc1a06d4428d3507aa1899f3d4c27ae428161f7219ea34302b1946"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/hu/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hu/thunderbird-91.2.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "fbd6be01153d67870565fc7230fba7b4a1f6151eeda54e84008b0943acfc4564"; + sha256 = "c57005f3f10938b8cfc6adef1d5452b3235605b97a23d22da1f4528b1e356d2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/hy-AM/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/hy-AM/thunderbird-91.2.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "3bfb7979fbfbf0cbdecb8b8030dd209a6e18020ff34a30223ce893c0cfe0a282"; + sha256 = "73525dc142b6762f803ced2b567a23244b22239d355fe89507cbe59ad1130edc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/id/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/id/thunderbird-91.2.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "4a8801e97b001c0e30ffc4f4a7c712017c1b1a96bf226ddc341728b22599920d"; + sha256 = "3f79327af36f3174cb303c65b13a0ae164bf24c87e367ba14bb46b1b6e2370b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/is/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/is/thunderbird-91.2.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "871a6393a716c4c8b2255a8903a4584c8ad4a7f5e1423550d3d96b9866929433"; + sha256 = "58f7012723cf4ce6673fed01d038b2517c710585c6f8724181e4a91d717b2351"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/it/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/it/thunderbird-91.2.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "8919dbd9e7b0155de288322f10bbb664189d03c1442657d07d577b33cfce0929"; + sha256 = "b0e7b9aa39a05148a0ef83d860fd2ab40d2aa1a66a31dd1e9a59d390d56c6e42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ja/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ja/thunderbird-91.2.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "42e1e1a2b55c97b05ec5424f6318d286f7fa497276ff745c6c221ee2b4c072cd"; + sha256 = "e02978eef0fc814ca190bf8bde29ae382fc2e14c61200e78ec1f43809d7cca9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ka/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ka/thunderbird-91.2.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "4da9353667f109938ebc6740039a915f67d518c109915c1ed42f1552c3be719d"; + sha256 = "b11a6e09556d9f943765badb6145c5db2b7bb54cd3016de686e821aa66308bd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/kab/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/kab/thunderbird-91.2.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "87c960236895eb1af70d2f50a839e55befc6486c4883d786b14a67e569c396ae"; + sha256 = "604f1c4a21b58b995e72ac48549802c588b0542c352de813aa4dcc02bbc0c686"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/kk/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/kk/thunderbird-91.2.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "38fdc0aa8fe98d83e52cf266776ebe7a52d7c80e98bc2372afcdeaf709ee8a06"; + sha256 = "29479a9970a622e23901c6022058d635874b41e24c7f5aef42536abc922dd1ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ko/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ko/thunderbird-91.2.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "c960038e1764cc3a0203e2cdf8349ecfee951dbeb470cb58b66c66f0542ee790"; + sha256 = "f34050010ff533a1c3949b11ad51c6902d6efec8c92904b2906ab80f95291e6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/lt/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/lt/thunderbird-91.2.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "6387197f1fa9095d64ef3e7c73272f0e0a4a7b857d4be29899bfe2c7aa88a5ec"; + sha256 = "be3e4c5bff078c2129d6f4e1a6a820efa62cce2750e3e1359dfba0ea93e58b5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/lv/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/lv/thunderbird-91.2.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "66021a590bb89b9fb50c90bc07788cbbb3d1acaceac5ebf562805d39bb59be3c"; + sha256 = "bd6ec1783bcd5efbf51f963eef3db42f71b50e8826fe4896dc7356d10f4eefce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ms/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ms/thunderbird-91.2.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "a120efceac13b976b77a49dd2883f66a03c13f3243a53b66afbb372b87c15b16"; + sha256 = "6279588bd47020c61250c211849b8fcbc4f480318a725090f316bb9f2099c31f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/nb-NO/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/nb-NO/thunderbird-91.2.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "ac5f404b3635b9b327458eb461148d94b52501621e78f2fafeff09c019651948"; + sha256 = "0f0a0fb9f6556f4207e63a12e846d2917d8e221321b51ba34860094876c3528f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/nl/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/nl/thunderbird-91.2.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f9dbbb9789a81ee6a40756039afefe542e1369b5de15d4ea728bd5fb5326c728"; + sha256 = "2f3c40fffa081ec62396fc3b715331280603b38b6d5fe5f4b16de1ab6727a713"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/nn-NO/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/nn-NO/thunderbird-91.2.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "36d0cf0f3132f5365a9cfe5b2175ac6f42dbe25c41a03fbd177509b2cf13abce"; + sha256 = "da9c9cc55abbd4f0679b53b6635868fb2a5f56165292a82903512058fa57f988"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/pa-IN/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pa-IN/thunderbird-91.2.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "776c3c215fd0e66eb81c2c91855233c4a7476aad534de555a6317b6a4f664b67"; + sha256 = "065db90edaec65fc7cb240d7793afae97110761bca269ffc4e172d0fd5dcbeae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/pl/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pl/thunderbird-91.2.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "ba2aa2dda6c477f3ecb06d0f1d223928adc9a82e46432055783741064cf1e8f6"; + sha256 = "4e0a43f1633728dbb25dcd60218b31fa45131a8189f94d8ebeff202bc251ac55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/pt-BR/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pt-BR/thunderbird-91.2.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "314023714b6babde392b8a30d11e67fe5af9f47e2738d63a6231aa72e6e0b792"; + sha256 = "a013acdee4b7e983c71dd39607103f1794b967addc57c538a8ca94437551743c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/pt-PT/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/pt-PT/thunderbird-91.2.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "ea5895b796bbdf9ed5be1277dc0f32c70abb46f37a7d48ecacf39e7b7a5af082"; + sha256 = "4bf7b530490f1fc1d031040790a568bee42206f393f8c13994551e6ff4d1ede2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/rm/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/rm/thunderbird-91.2.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d295f9390b7dedec8592751142a42bc134ff3fca5a228d084eb176677c15c4bc"; + sha256 = "829ffbd9402f5cf80cdd8b001081d6f67628c842cc3c73f8191b6f6ff1d54d52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ro/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ro/thunderbird-91.2.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "b4504dd29ce68009c78b7194914c20d41024f92420564d6f4f34369717a49a90"; + sha256 = "6bc72633a3b45faf2aa51627caf5674f1b05e16840b952f58f7f86ef6ad483b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/ru/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/ru/thunderbird-91.2.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "a8ba363a9bee130d05d028a84bfc10e8614ac3e3ee7e747d4987691d25423bb0"; + sha256 = "141787ba7f5aeb0faa2a33e0d84fda8fa8d31681c6fdd0e884a69cc339042048"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/sk/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sk/thunderbird-91.2.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "347a0e3e794bebc570aac65005edef1c311d7685d9b7ee4559121945cec1a40e"; + sha256 = "90363481a491a239e4c3da49bc87ed3ca795e4ce0eaf2239ac5a298e5d7abc10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/sl/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sl/thunderbird-91.2.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "1ae4c2615d9fc4e6b1ab270988de63ff425779945684811a1c9093940e7a9d0a"; + sha256 = "95e57777da6f9fcb41bb3116771be2e90b023315433d41e21884b34feb6a38e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/sq/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sq/thunderbird-91.2.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "207fb12cf9415e5a66bee33ee2f50adb970343b90bdde2c00c5b149e9ec829ad"; + sha256 = "d7e0a12bd5c7edfb130e4defdc25b8776fb71722fb146cd5309d52405ad231bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/sr/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sr/thunderbird-91.2.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "45e7cb91506dfe353d86b8c6ae172b4a925f6b9ee631b542bc9a0fc77315d482"; + sha256 = "b17dbc3424ce90c0360a75476d1d25568fb4e7c6e1e90a197ab332e5584cb88e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/sv-SE/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/sv-SE/thunderbird-91.2.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "634b1581237baa140d8711458cff99e979b3e33316b24925c6e5700da9603127"; + sha256 = "027f7f817823e939261c05113b3cc5518b3fff1d061e66e8fcd5703504259f2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/th/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/th/thunderbird-91.2.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "a09336e75d270e9fdfaefd4f9e90cddf1f5135602998bfdd9a198e3f1544838c"; + sha256 = "268473436cc5230bc60b38c0678eaa71c64b5f9c3780120df51c1063790e1855"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/tr/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/tr/thunderbird-91.2.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "37874416c7bdd2c2b4303a55d14a82ce55a7d8cc6d51bc3b3d215489be3bc055"; + sha256 = "79bad44e8e9dd7962d67b395d27c046d84c50f3eb66c53bc10de8a9c3d94a059"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/uk/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/uk/thunderbird-91.2.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "faa0c411431a9b27a7c58c0c394804d3125e4f4e927387df8580c37738c2db44"; + sha256 = "c363f700537f3a466fb438ec4339b5e83b60c721faa647b4ab77c907ab9b1f21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/uz/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/uz/thunderbird-91.2.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "095e56a0fa0e85bebe9bc0044fc13f5da67c7267461b27fb8024947da3f423ba"; + sha256 = "2de957d36eb6c2b5a7d33d6a06e9f4f1072981fd8530aa18d609a892f963c975"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/vi/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/vi/thunderbird-91.2.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "cae3582b504a38497dc63ba25d4be45e450b14cb588a9f52919d0fb4a5a04446"; + sha256 = "5006d6c79aff928e307a92eb3867364f206ee1d872e275d3ebf63b9a4cf286de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/zh-CN/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/zh-CN/thunderbird-91.2.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "58d542c3ceb5e36a83e424250c171477543bcd046f325c89b06f76090410b633"; + sha256 = "4893ea232fa746efc32cb0d84800b46fbdffb49a13fbc244559ca0382561ebca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.2/linux-i686/zh-TW/thunderbird-91.1.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.2.1/linux-i686/zh-TW/thunderbird-91.2.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "13dfa3e7a8b5a69ab9072c21eb22373ff36bd54c9c7c39c3480681bd911043c0"; + sha256 = "37ad46134d268639514eeb267a89aeb20fc318bde923b9eb552c281b23ae153e"; } ]; } From 941500de8f6bcd8cc3543a522b521140cfe85990 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 22 Oct 2021 09:13:12 +0900 Subject: [PATCH 04/50] thunderbird: 91.2.0 -> 91.2.1 --- .../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 bc36c81155a2..fa2c5fd0fb8c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.2.0"; + version = "91.2.1"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "1f21f77069490be2de131f6125a498c6ed0a7d10b2ff787891d8dea10019719fea8014a8b2d626a2365f10f6307b616e5f1eef2c601e4da5402c9d5fc7d35049"; + sha512 = "3152f20ad5f0fd3ce2c1672e91f07ab8921ffb5ecf487e6b0d7d7464445c8d8df106eea0bd8d912ffa84ab0ad403dfcfb19be97f50a015150c9091201a0dff6d"; }; patches = [ ]; From 1d0318e8b9e70f3997307d10d870f5901435d9a5 Mon Sep 17 00:00:00 2001 From: Astro Date: Sat, 23 Oct 2021 21:32:11 +0200 Subject: [PATCH 05/50] scryer-prolog: update dependency lexical-core to fix build --- pkgs/development/compilers/scryer-prolog/cargo.patch | 12 ++++++++++++ pkgs/development/compilers/scryer-prolog/default.nix | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/scryer-prolog/cargo.patch b/pkgs/development/compilers/scryer-prolog/cargo.patch index 61a36c9ad1c9..e704798c3acf 100644 --- a/pkgs/development/compilers/scryer-prolog/cargo.patch +++ b/pkgs/development/compilers/scryer-prolog/cargo.patch @@ -26,6 +26,18 @@ index ef25833..d9de212 100644 dependencies = [ "libc", "winapi 0.3.8", +@@ -485,9 +487,9 @@ dependencies = [ + + [[package]] + name = "lexical-core" +-version = "0.4.6" ++version = "0.4.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2304bccb228c4b020f3a4835d247df0a02a7c4686098d4167762cfbbe4c5cb14" ++checksum = "34449d00c5d4066537f4dc72320b18e3aa421e8e92669250eecd664c618fefce" + dependencies = [ + "arrayvec 0.4.12", + "cfg-if", @@ -766,15 +766,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" diff --git a/pkgs/development/compilers/scryer-prolog/default.nix b/pkgs/development/compilers/scryer-prolog/default.nix index 534379bcacfc..7c9afefe10df 100644 --- a/pkgs/development/compilers/scryer-prolog/default.nix +++ b/pkgs/development/compilers/scryer-prolog/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { # Use system openssl, gmp, mpc and mpfr. cargoPatches = [ ./cargo.patch ]; - cargoSha256 = "0gb0l2wwf8079jwggn9zxk8pz8pxg3b7pin1d7dsbd4ij52lzyi2"; + cargoSha256 = "1vf7pfhvpk7ikzibdccw7xgbywv5n4vvshjwsdsf94bhl2knrlg3"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl gmp libmpc mpfr ]; From b42d95b95b92b39c218089c8a7e0b0d798380e17 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Oct 2021 18:25:51 +0200 Subject: [PATCH 06/50] checkov: 2.0.505 -> 2.0.509 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 04b8095bfc48..a62937b8281d 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -46,7 +46,7 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.505"; + version = "2.0.509"; disabled = python3.pythonOlder "3.7"; @@ -54,7 +54,7 @@ buildPythonApplication rec { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-5udTx+aAC72R8wfn+lrWsZXgAyj/eN5nn/ly1JIkmCU="; + sha256 = "sha256-dds01scC93d/WdQTTL/JvXvfbiFAF3nEESL/zdFpOYA="; }; nativeBuildInputs = with py.pkgs; [ From 587af88ec2456c116f47dc17dc2fbe588d0e0f36 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Oct 2021 18:52:30 +0200 Subject: [PATCH 07/50] python3Packages.zeroconf: 0.36.8 -> 0.36.9 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 650f09558cbc..84e424cd3b08 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.36.8"; + version = "0.36.9"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-lsvrttfyUtQneUkQlWFpmQ99BSJp/YiVYUKY7AWh0rs="; + sha256 = "sha256-V2AiKmL3laA6Kd2lOXZ7f+7L08zMtDfvhLxayylp1CQ="; }; propagatedBuildInputs = [ From 2f6153f1f78de56dfa4b874c0e2ec5777fbe04b0 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 24 Oct 2021 18:53:14 +0200 Subject: [PATCH 08/50] yabridge: 3.5.2 -> 3.6.0 --- pkgs/tools/audio/yabridge/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index ac5767b24219..e6c70e20e79f 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -47,25 +47,25 @@ let # Derived from vst3.wrap vst3 = rec { - version = "3.7.2_build_28-patched"; + version = "3.7.3_build_20-patched"; src = fetchFromGitHub { owner = "robbert-vdh"; repo = "vst3sdk"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-39pvfcg4fvf7DAbAPzEHA1ja1LFL6r88nEwNYwaDC8w="; + sha256 = "sha256-m2y7No7BNbIjLNgdAqIAEr6UuAZZ/wwM2+iPWKK17gQ="; }; }; in multiStdenv.mkDerivation rec { pname = "yabridge"; - version = "3.5.2"; + version = "3.6.0"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = pname; rev = version; - hash = "sha256-SLiksc8lQo2A5sefKbcaJyhi8vPdp2p2Jbc7bvM0sDw="; + hash = "sha256-lgSkZ0i2DojP6HXJP3cC5FUtfv7R/nsSiHT60bPSyLc="; }; # Unpack subproject sources From a244dd9886ffacba526ad0272d236b8bb28db9b4 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 24 Oct 2021 19:13:36 +0200 Subject: [PATCH 09/50] yabridgectl: 3.5.2 -> 3.6.0 --- pkgs/tools/audio/yabridgectl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix index 35c8b0c5aeff..9e185b3ce72c 100644 --- a/pkgs/tools/audio/yabridgectl/default.nix +++ b/pkgs/tools/audio/yabridgectl/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = yabridge.src; sourceRoot = "source/tools/yabridgectl"; - cargoHash = "sha256-2x3qB0LbCBUZ4zqKIXPtYdWis+4QANTaJdFvoFbccGE="; + cargoHash = "sha256-20sh9yovZHqoUk+3aVs/D8SWY29FdPjX+NeJt35KfWM="; patches = [ # By default, yabridgectl locates libyabridge.so by using From 3378731579284e37be9586988b017f380cb9d49e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 24 Oct 2021 18:53:21 +0200 Subject: [PATCH 10/50] yabridge: Fix for wine 6.20 --- pkgs/tools/audio/yabridge/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index e6c70e20e79f..15f89a329620 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -1,6 +1,7 @@ { lib , multiStdenv , fetchFromGitHub +, fetchpatch , substituteAll , meson , ninja @@ -85,6 +86,12 @@ in multiStdenv.mkDerivation rec { src = ./hardcode-wine.patch; inherit wine; }) + # Remove with next yabridge update + (fetchpatch { + name = "fix-for-wine-6.20.patch"; + url = "https://github.com/robbert-vdh/yabridge/commit/5be149cb525a638f7fc3adf84918c8239ee50ecf.patch"; + sha256 = "sha256-x/gfn4mKZIGQ4M0o/0LlZF8i8wZDx/bkwf8wp0BGDBo="; + }) ]; postPatch = '' @@ -121,8 +128,8 @@ in multiStdenv.mkDerivation rec { ]; preConfigure = '' - sed -i "214s|xcb.*|xcb_32bit_dep = winegcc.find_library('xcb', dirs: [ '${lib.getLib pkgsi686Linux.xorg.libxcb}/lib', ])|" meson.build - sed -i "192 i '${lib.getLib pkgsi686Linux.boost}/lib'," meson.build + sed -i "221s|xcb.*|xcb_32bit_dep = winegcc.find_library('xcb', dirs: [ '${lib.getLib pkgsi686Linux.xorg.libxcb}/lib', ])|" meson.build + sed -i "199 i '${lib.getLib pkgsi686Linux.boost}/lib'," meson.build ''; installPhase = '' From 3b46f18b027c595e79c7986218bb47d565f927f7 Mon Sep 17 00:00:00 2001 From: Harrison Houghton Date: Mon, 18 Oct 2021 20:48:57 -0400 Subject: [PATCH 11/50] zbackup: fix The upstream proposed fix doesn't apply cleanly, so here's a version that does. --- pkgs/tools/backup/zbackup/default.nix | 12 +++++++++++- pkgs/tools/backup/zbackup/protobuf-api-change.patch | 11 +++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/backup/zbackup/protobuf-api-change.patch diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix index 795a45f8864d..ee5cc6fd89e9 100644 --- a/pkgs/tools/backup/zbackup/default.nix +++ b/pkgs/tools/backup/zbackup/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind }: +{ lib, stdenv, fetchFromGitHub, fetchpatch +, cmake, protobufc +, libunwind, lzo, openssl, protobuf, zlib +}: + stdenv.mkDerivation rec { pname = "zbackup"; version = "1.4.4"; @@ -10,6 +14,12 @@ stdenv.mkDerivation rec { hash = "sha256-9Fk4EhEeQ2J4Kirc7oad4CzmW70Mmza6uozd87qfgZI="; }; + patches = [ + # compare with https://github.com/zbackup/zbackup/pull/158; + # but that doesn't apply cleanly to this version + ./protobuf-api-change.patch + ]; + buildInputs = [ zlib openssl protobuf lzo libunwind ]; nativeBuildInputs = [ cmake protobufc ]; diff --git a/pkgs/tools/backup/zbackup/protobuf-api-change.patch b/pkgs/tools/backup/zbackup/protobuf-api-change.patch new file mode 100644 index 000000000000..d071709878be --- /dev/null +++ b/pkgs/tools/backup/zbackup/protobuf-api-change.patch @@ -0,0 +1,11 @@ +--- a/backup_restorer.cc ++++ b/backup_restorer.cc +@@ -48,7 +48,7 @@ + // TODO: this disables size checks for each separate message. Figure a better + // way to do this while keeping them enabled. It seems we need to create an + // instance of CodedInputStream for each message, but it might be expensive +- cis.SetTotalBytesLimit( backupData.size(), -1 ); ++ cis.SetTotalBytesLimit( backupData.size() ); + + // Used when emitting chunks + string chunk; From 10bed7eeee68c4a50ae00ac61a44687af52d0a26 Mon Sep 17 00:00:00 2001 From: Cedric Staniewski Date: Sun, 24 Oct 2021 22:18:10 +0200 Subject: [PATCH 12/50] sqlitebrowser: enable support for encrypted databases --- pkgs/development/tools/database/sqlitebrowser/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index c8ab79a34dd4..0a4df4bd21b7 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, cmake -, qtbase, qttools, sqlite, wrapGAppsHook }: +, qtbase, qttools, sqlcipher, wrapGAppsHook }: mkDerivation rec { pname = "sqlitebrowser"; @@ -16,10 +16,14 @@ mkDerivation rec { # but qscintilla is currently in a bit of a mess as some consumers expect a # -qt4 or -qt5 prefix while others do not. # We *really* should get that cleaned up. - buildInputs = [ qtbase sqlite ]; + buildInputs = [ qtbase sqlcipher ]; nativeBuildInputs = [ cmake qttools wrapGAppsHook ]; + cmakeFlags = [ + "-Dsqlcipher=1" + ]; + meta = with lib; { description = "DB Browser for SQLite"; homepage = "https://sqlitebrowser.org/"; From 437bf811a5ee900c5fdc92d60097ad1dc3991436 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Oct 2021 22:29:26 +0200 Subject: [PATCH 13/50] python3Packages.aiolookin: init at 0.0.3 --- .../python-modules/aiolookin/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/aiolookin/default.nix diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix new file mode 100644 index 000000000000..a81c817e4e07 --- /dev/null +++ b/pkgs/development/python-modules/aiolookin/default.nix @@ -0,0 +1,52 @@ +{ lib +, aiohttp +, buildPythonPackage +, faker +, fetchFromGitHub +, pytest-aiohttp +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiolookin"; + version = "0.0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ANMalko"; + repo = pname; + rev = "v${version}"; + sha256 = "15mdvrzvqpdvg9zkczzgzzc5v2ri3v5f17000mhxill1nhirxhqx"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + faker + pytest-aiohttp + pytest-mock + pytestCheckHook + ]; + + disabledTests = [ + # Not all tests are ready yet + "test_successful" + ]; + + pythonImportsCheck = [ + "aiolookin" + ]; + + meta = with lib; { + description = "Python client for interacting with LOOKin devices"; + homepage = "https://github.com/ANMalko/aiolookin"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71ce88d4672f..f2b73cd29f22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -325,6 +325,8 @@ in { aiokef = callPackage ../development/python-modules/aiokef { }; + aiolookin = callPackage ../development/python-modules/aiolookin { }; + aiolifx = callPackage ../development/python-modules/aiolifx { }; aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; From 75a5d5575c65abe079ed9f5aff1a33e7e9d079f1 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Sun, 24 Oct 2021 17:55:23 -0300 Subject: [PATCH 14/50] zettlr: 2.0.0 -> 2.0.1 --- pkgs/applications/misc/zettlr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index f8dbc9c65e4f..26b925d51a83 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "2.0.0"; + version = "2.0.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-MIFgNUuuneIIkPRVRarbx6UMoB/3sdJtKvbacUnwHX8="; + sha256 = "sha256-vnkZGxuLvj8Pjmey6NO3mcHuWbtO0bYEfgKwvgumbPA="; }; appimageContents = appimageTools.extractType2 { inherit name src; @@ -31,9 +31,9 @@ appimageTools.wrapType2 rec { extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ]; extraInstallCommands = '' mv $out/bin/{${name},${pname}} - install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop - install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png - substituteInPlace $out/share/applications/zettlr.desktop \ + install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop + install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png + substituteInPlace $out/share/applications/Zettlr.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; From 0a0795ee9ed9b7ffa856d9bb153e5a4c73e6e561 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 24 Oct 2021 23:26:51 +0200 Subject: [PATCH 15/50] svtplay-dl: 4.5 -> 4.7 --- pkgs/tools/misc/svtplay-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 360e16b1fc18..39e02497dcc8 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "4.5"; + version = "4.7"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "sha256-TiJWy5WU1VsseodfgfemAsUc5/hDwSlM03ITRYTvJbg="; + sha256 = "19ajm4bf7knnchggfbajx0c29q4sj8ffsvqmgizgsjdz48ppx2yf"; }; pythonPaths = [ cryptography pyyaml requests ]; From a1f00bc029a0eff2e2655dfbc96c5d29528aa2e9 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 24 Oct 2021 17:39:52 -0400 Subject: [PATCH 16/50] lhapdf: 6.3.0 -> 6.4.0 --- pkgs/development/libraries/physics/lhapdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 143f72541b4d..db185e299197 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lhapdf"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "0pcvigpjqzfng06n98bshhhpimiqfg416ak8lz8jdgp6nxr8fkgd"; + sha256 = "sha256-fS8CZ+LWWw3e4EhVOzQtfIk6bbq+HjJsrWLeABDdgQw="; }; nativeBuildInputs = [ makeWrapper ]; From df68c1213fe928f2539f00fe530d4937e66d125d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 24 Oct 2021 18:04:52 -0400 Subject: [PATCH 17/50] yoda: 1.9.0 -> 1.9.1 --- .../libraries/physics/yoda/default.nix | 37 +++++-------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 9398c4d2f36e..6fb9b9560aae 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,39 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, root, makeWrapper, zlib, withRootSupport ? false }: +{ lib, stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { pname = "yoda"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "1x7xi6w7lb92x8202kbaxgqg1sly534wana4f38l3gpbzw9dwmcs"; + sha256 = "sha256-xhagWmVlvlsayL0oWTihoxhq0ejejEACCsdQqFN1HUw="; }; - patches = [ - # fix a minor bug - # https://gitlab.com/hepcedar/yoda/-/merge_requests/38 - (fetchpatch { - name = "yoda-fix-fuzzy-compare-bin2d.patch"; - url = "https://gitlab.com/hepcedar/yoda/-/commit/a2999d78cb3d9ed874f367bad375dc39a1a11148.diff"; - sha256 = "sha256-BsaVm+4VtCvRoEuN4r6A4bj9XwgMe75UesKzN+b56Qw="; - }) - # fix a regression - # https://gitlab.com/hepcedar/yoda/-/merge_requests/40 - (fetchpatch { - name = "yoda-fix-for-yodagz.patch"; - url = "https://gitlab.com/hepcedar/yoda/-/commit/3338ba5a7466599ac6969e4ae462f133d6cf4fd8.diff"; - sha256 = "sha256-MZTOIt468bdPCS7UVfr5hQZUsVy3TpY/TjRrNySIL70="; - excludes = [ "ChangeLog" ]; - }) - # fix a minor bug - # https://gitlab.com/hepcedar/yoda/-/merge_requests/45 - (fetchpatch { - name = "yoda-fix-yodascale-for-gz.patch"; - url = "https://gitlab.com/hepcedar/yoda/-/commit/b03162aeaa2c99e38512ba6e4818d2e0a825b757.diff"; - sha256 = "sha256-IMuPalQ/GKcdJOKAlwE/IRWtxDdu0inoj+A9nbRl6Gs="; - }) - ]; - nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; buildInputs = [ python ] ++ (with python.pkgs; [ numpy matplotlib ]) @@ -58,6 +33,12 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckTarget = "check"; + # Workaround for https://gitlab.com/hepcedar/yoda/-/merge_requests/49 + preInstallCheck = '' + cp tests/test{1,}.yoda + gzip -c tests/test.yoda > tests/test.yoda.gz + ''; + meta = { description = "Provides small set of data analysis (specifically histogramming) classes"; license = lib.licenses.gpl3; From 47228e369e38b26745acfd0962aa54f221e78379 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Oct 2021 06:32:01 +0200 Subject: [PATCH 18/50] python3Packages.herepy: 3.5.4 -> 3.5.5 --- pkgs/development/python-modules/herepy/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix index 4b1d5913f7f8..8ce3fe25683a 100644 --- a/pkgs/development/python-modules/herepy/default.nix +++ b/pkgs/development/python-modules/herepy/default.nix @@ -9,7 +9,8 @@ buildPythonPackage rec { pname = "herepy"; - version = "3.5.4"; + version = "3.5.5"; + format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "abdullahselek"; repo = "HerePy"; rev = version; - sha256 = "0wnkyrzpahxg7yh2qf149fzgs4x2jx3lf458syzz3crm7qix2hsk"; + sha256 = "sha256-nZ+91i+IBdRDN1TsDwmk9pNceFvcV6C155Ds1MQc9z4="; }; postPatch = '' @@ -34,7 +35,9 @@ buildPythonPackage rec { responses ]; - pythonImportsCheck = [ "herepy" ]; + pythonImportsCheck = [ + "herepy" + ]; meta = with lib; { description = "Library that provides a Python interface to the HERE APIs"; From 090113970fd695a5715fb168d4b124516b501d50 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Mon, 25 Oct 2021 07:57:32 +0200 Subject: [PATCH 19/50] sysz: 1.3.0 -> 1.4.3 --- pkgs/tools/misc/sysz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/sysz/default.nix b/pkgs/tools/misc/sysz/default.nix index 4f5f90d04b0e..bf45983c106a 100644 --- a/pkgs/tools/misc/sysz/default.nix +++ b/pkgs/tools/misc/sysz/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sysz"; - version = "1.3.0"; + version = "1.4.3"; src = fetchFromGitHub { owner = "joehillen"; repo = pname; rev = version; - sha256 = "HNwsYE1Cv90IDi3A5PmRv3uHANR3ya+VOGBQ3+zkBLM="; + sha256 = "sha256-X9vj6ILPUKFo/i50JNehM2GSDWfxTdroWGYJv765Cm4="; }; nativeBuildInputs = [ makeWrapper ]; From 0dfb1669763fe8e182954f35ea2d55b9374662e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Oct 2021 08:20:20 +0200 Subject: [PATCH 20/50] sqlfluff: 0.7.0 -> 0.7.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 095c2e10b573..ada19ed158fa 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.7.0"; + version = "0.7.1"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Cqbo1L3z3bTDIXZ90GXdAulTpGhWLoTc/kYRNghZ/SE="; + sha256 = "sha256-kNoUoelD4EiNWZlXvOrWNPX+wsLCwY3329rJf83l7Wg="; }; propagatedBuildInputs = with python3.pkgs; [ From 46b9f72566a437a76dcfaef43689dae25aeb8a4c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Oct 2021 11:24:39 +0200 Subject: [PATCH 21/50] step-cli: 0.17.6 -> 0.17.7 --- pkgs/tools/security/step-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index 6908b54a2759..da76d6ba7b75 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "step-cli"; - version = "0.17.6"; + version = "0.17.7"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-xkdn6e8He/yVvTubi88tVpU8I0XNEeJSzosbkCUZODk="; + sha256 = "sha256-Qg71JcnA+20zme1ltG4J6qht4P46J5sHPjV3w4HCKPc="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorSha256 = "sha256-/aN3lXc3mPk3wIpNVjBXz35NlWNg8tob8q2oJ7Az2Bs="; + vendorSha256 = "sha256-kVvbSTybO23zb1ivCrjZqkM44ljPGD1GdBv76qCpTEQ="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; From a56b5d81eddb7eb710b04554a0a461fc9bb2cb2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Oct 2021 11:27:51 +0200 Subject: [PATCH 22/50] step-cli: add mainProgram --- pkgs/tools/security/step-cli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index da76d6ba7b75..900469909271 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -33,5 +33,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ xfix ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "step"; }; } From f6b9ffdd8aa9bd5306e9de0b9b4373ad2cfb5caf Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 25 Oct 2021 10:57:38 +0100 Subject: [PATCH 23/50] protoc-gen-grpc-web: 1.2.1 -> 1.3.0 --- .../tools/protoc-gen-grpc-web/default.nix | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/development/tools/protoc-gen-grpc-web/default.nix index c50894b31e1e..acbd23ec2929 100644 --- a/pkgs/development/tools/protoc-gen-grpc-web/default.nix +++ b/pkgs/development/tools/protoc-gen-grpc-web/default.nix @@ -1,28 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, protobuf }: +{ lib, stdenv, fetchFromGitHub, protobuf }: stdenv.mkDerivation rec { pname = "protoc-gen-grpc-web"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc-web"; rev = version; - sha256 = "sha256-NBENyc01O8NPo84z1CeZ7YvFvVGY2GSlcdxacRrQALw="; + sha256 = "sha256-piKpaylzuanhGR+7BzApplv8e/CWPoR9tG3vHrF7WXw="; }; - sourceRoot = "source/javascript/net/grpc/web"; - - # remove once PR merged - # https://github.com/grpc/grpc-web/pull/1107 - patches = [ - (fetchpatch { - name = "add-prefix.patch"; - url = "https://github.com/06kellyjac/grpc-web/commit/b0803be1080fc635a8d5b88da971835a888a0c77.patch"; - stripLen = 4; - sha256 = "sha256-Rw9Z7F8cYrc/UIGUN6yXOus4v+Qn9Yf1Nc301TFx85A="; - }) - ]; + sourceRoot = "source/javascript/net/grpc/web/generator"; strictDeps = true; nativeBuildInputs = [ protobuf ]; @@ -30,11 +19,32 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; + doCheck = true; + checkInputs = [ protobuf ]; + checkPhase = '' + runHook preCheck + + CHECK_TMPDIR="$TMPDIR/proto" + mkdir -p "$CHECK_TMPDIR" + + protoc \ + --proto_path="${src}/packages/grpc-web/test/protos" \ + --plugin="./protoc-gen-grpc-web" \ + --grpc-web_out="import_style=commonjs,mode=grpcwebtext:$CHECK_TMPDIR" \ + echo.proto + + # check for grpc-web generated file + [ -f "$CHECK_TMPDIR/echo_grpc_web_pb.js" ] + + runHook postCheck + ''; + meta = with lib; { homepage = "https://github.com/grpc/grpc-web"; changelog = "https://github.com/grpc/grpc-web/blob/${version}/CHANGELOG.md"; description = "gRPC web support for Google's protocol buffers"; license = licenses.asl20; maintainers = with maintainers; [ jk ]; + platforms = platforms.unix; }; } From 4dde9c38a4588d7609a2cfb1f6980fb34ee4b455 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 25 Oct 2021 12:12:59 +0200 Subject: [PATCH 24/50] libbpf: 0.4.0 -> 0.5.0 Signed-off-by: Sascha Grunert --- pkgs/os-specific/linux/libbpf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 649ad88a3d18..f2ebcbdcc1cf 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -7,13 +7,13 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "1by5w7g3i2fc10bi6f0j8jqi2nq0x8r973j2qx7qlfryjxr7b2v3"; + sha256 = "sha256-L23Ba+slJW/ALj8AepwByrrHgYMY5/Jh+AoD0p4qryI="; }; nativeBuildInputs = [ pkg-config ]; From 1ecc9846a705771825c704c57949f74cb8ac90a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Oct 2021 13:18:49 +0200 Subject: [PATCH 25/50] metasploit: update update.sh --- pkgs/tools/security/metasploit/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/metasploit/update.sh b/pkgs/tools/security/metasploit/update.sh index e4da457c6f57..ba41b78c0e8d 100755 --- a/pkgs/tools/security/metasploit/update.sh +++ b/pkgs/tools/security/metasploit/update.sh @@ -4,7 +4,7 @@ set -eu -o pipefail cd "$(dirname "$(readlink -f "$0")")" -latest=$(curl https://github.com/rapid7/metasploit-framework/releases.atom | xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v atom:title -n | head -n1) +latest=$(curl https://github.com/rapid7/metasploit-framework/tags.atom | xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v atom:title -n | head -n1) echo "Updating metasploit to $latest" sed -i "s#refs/tags/.*#refs/tags/$latest\"#" Gemfile From 37a5c59bdfcbfbe6abfa9b94aae6b39d502b2b5d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Oct 2021 13:22:05 +0200 Subject: [PATCH 26/50] metasploit: 6.1.10 -> 6.1.11 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 40 +++++++-------- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 54 ++++++++++----------- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 1ea4f8b05191..f26fb9850e8e 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.10" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.11" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 1eaf6d48a38c..dceb4727981e 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 822dd1ef2b1a1171d62803add58ee2afce30ea06 - ref: refs/tags/6.1.10 + revision: 341b0cd1cdf69fe22345aea6c84ae11ba45e0d98 + ref: refs/tags/6.1.11 specs: - metasploit-framework (6.1.10) + metasploit-framework (6.1.11) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -33,7 +33,7 @@ GIT metasploit-model metasploit-payloads (= 2.0.58) metasploit_data_models - metasploit_payloads-mettle (= 1.0.13) + metasploit_payloads-mettle (= 1.0.15) mqtt msgpack nessus_rest @@ -128,23 +128,23 @@ GEM arel-helpers (2.12.1) activerecord (>= 3.1.0, < 7) aws-eventstream (1.2.0) - aws-partitions (1.516.0) - aws-sdk-core (3.121.1) + aws-partitions (1.518.0) + aws-sdk-core (3.121.3) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.270.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-ec2 (1.271.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.61.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-iam (1.62.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.49.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-kms (1.50.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.103.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-s3 (1.104.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sigv4 (1.4.0) @@ -220,7 +220,7 @@ GEM jmespath (1.4.0) jsobfu (0.4.2) rkelly-remix - json (2.6.0) + json (2.6.1) little-plugger (1.1.4) logging (2.3.0) little-plugger (~> 1.1) @@ -258,7 +258,7 @@ GEM railties (~> 6.0) recog (~> 2.0) webrick - metasploit_payloads-mettle (1.0.13) + metasploit_payloads-mettle (1.0.15) method_source (1.0.0) mini_portile2 (2.6.1) minitest (5.14.4) @@ -298,7 +298,7 @@ GEM public_suffix (4.0.6) puma (5.5.2) nio4r (~> 2.0) - racc (1.5.2) + racc (1.6.0) rack (2.2.3) rack-protection (2.1.0) rack @@ -349,7 +349,7 @@ GEM rex-arch rex-ole (0.1.7) rex-text - rex-powershell (0.1.93) + rex-powershell (0.1.94) rex-random_identifier rex-text ruby-rc4 @@ -405,7 +405,7 @@ GEM ttfunk (1.7.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) - tzinfo-data (1.2021.3) + tzinfo-data (1.2021.5) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext @@ -433,7 +433,7 @@ GEM activesupport (>= 4.2, < 7.0) xmlrpc (0.3.2) webrick - zeitwerk (2.4.2) + zeitwerk (2.5.1) PLATFORMS ruby diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 91b2bd60a318..cc6dfb018b0c 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -14,13 +14,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.10"; + version = "6.1.11"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-VdnczTauHKYexXZs6U5F5v4DP8lJb8wCDy6yiPdEavI="; + sha256 = "sha256-0C93rxVWHHZha2oRKanTm4S0qig3qZreFV08PLwShSw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 8ba307e2b5a0..653cdeb53055 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,60 +104,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jx44f1hc41712k8fqmzrbpqs2j9yl0msdqcmmfp0pirkbqw6ri0"; + sha256 = "18jjc7sxpdip10iyg0sn89ywvi2iqnhi225df7j6gs0fm25azkfw"; type = "gem"; }; - version = "1.516.0"; + version = "1.518.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0njlpd4w008whz7bd7rrqs3k1m6xbm33hblzwh67pnk1frabv4q6"; + sha256 = "15x3qcmh81hf92x0gcj0h0h7yhnlzdqs6wdml56i3cq0nz9kxhs4"; type = "gem"; }; - version = "3.121.1"; + version = "3.121.3"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m46n4fn505l0qqwamc5gk88h6aqvjqc7j0pkrcngxcgh5r7hcvf"; + sha256 = "0k85khm2c53y2sq29c9rg5kmjm1fnw2glgpjsl6hbh8cq3ciaain"; type = "gem"; }; - version = "1.270.0"; + version = "1.271.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m5cc26kkh83f6c05y2a07nfz3dsdvkdf7jfrjkrhlkmdq9hha0m"; + sha256 = "0vnhcgr5pjkkplh4z2lbwp4w13kbwp236p0y1b1qiia28ra2isxv"; type = "gem"; }; - version = "1.61.0"; + version = "1.62.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15iar7b74lnvw1cafacp8vc63xy3zxa8zxmranfssa37mhk53byi"; + sha256 = "0prj048lcbkmxc6k2p7vibn3vw7cy1104dljqjvmwz12h9ds1qlf"; type = "gem"; }; - version = "1.49.0"; + version = "1.50.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xsa6nsdflwkm2wzmsr6kiy4am44f9f9459lbkrwxlcl166g05jq"; + sha256 = "1h8yzrzinckrfs8ahzqg7fs356vs1ksi5bva1bpfp0i65fjh9mw0"; type = "gem"; }; - version = "1.103.0"; + version = "1.104.0"; }; aws-sigv4 = { groups = ["default"]; @@ -594,10 +594,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a7p95md8j8lbgxx9dzygysxmrg1s80895f46f1y47k9kq9q56ry"; + sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; type = "gem"; }; - version = "2.6.0"; + version = "2.6.1"; }; little-plugger = { groups = ["default"]; @@ -664,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "822dd1ef2b1a1171d62803add58ee2afce30ea06"; - sha256 = "1wka8kvqicif1w1cqvs9r4zh7zp68m7fjv3nqlgac75f6v6xrnam"; + rev = "341b0cd1cdf69fe22345aea6c84ae11ba45e0d98"; + sha256 = "0b452ay3qg2x2pg9ma9p52mb914vsfljj4baddhpc72n2nppfbyh"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.10"; + version = "6.1.11"; }; metasploit-model = { groups = ["default"]; @@ -706,10 +706,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "108jm8nz4xs62k33w5frw15xadd17pbmwpczhvcpzh3bf54sihsr"; + sha256 = "1kl7plipccqgrjlm6aqdnp1xz44f6hnb2qmljhqay8ln2kg9f1aa"; type = "gem"; }; - version = "1.0.13"; + version = "1.0.15"; }; method_source = { groups = ["default"]; @@ -987,10 +987,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; }; rack = { groups = ["default"]; @@ -1197,10 +1197,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qpf4na2c57bypyxna7pqll8ym643cydh347v5zvlxknripjhjyz"; + sha256 = "0ib75d16j8z0chni7m9v74xpxf13164hh8kr7v7yg93zpsqxw6p5"; type = "gem"; }; - version = "0.1.93"; + version = "0.1.94"; }; rex-random_identifier = { groups = ["default"]; @@ -1477,10 +1477,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f9wlg8p1p1wa86hcskiy58abbdysdqwr4pv2dmkhkfbi94f1lmr"; + sha256 = "0w1iyvw0m2xvdr4654jnn1g27jwj84y94dvaj1k2p3lcrvndm698"; type = "gem"; }; - version = "1.2021.3"; + version = "1.2021.5"; }; unf = { groups = ["default"]; @@ -1607,9 +1607,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; + sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj"; type = "gem"; }; - version = "2.4.2"; + version = "2.5.1"; }; } From ce6a14f9d02d326582a637855e5a79ee774e35b0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 25 Oct 2021 08:11:26 -0400 Subject: [PATCH 27/50] rust-petname: 1.1.1 -> 1.1.2 --- pkgs/tools/text/rust-petname/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/rust-petname/default.nix b/pkgs/tools/text/rust-petname/default.nix index 4a3c0f596cfb..f20a9e519de9 100644 --- a/pkgs/tools/text/rust-petname/default.nix +++ b/pkgs/tools/text/rust-petname/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "rust-petname"; - version = "1.1.1"; + version = "1.1.2"; src = fetchCrate { inherit version; crateName = "petname"; - sha256 = "sha256-X1p9W+N0Nhh7CSh776ofzHmG0ayi5COLJjBncxmL8CM="; + sha256 = "sha256-DfRWGwnWVJBcbW7aPEzgPd+gfldP+ypZlk8FcPZzp8g="; }; - cargoSha256 = "sha256-jxN2EKLjf9yKkhZ4wsH72sNdk6UYAcCUrg4+qx75bWs="; + cargoSha256 = "sha256-tCVJX8NcbT+6t2kDeCMfcSDaq3O89ycj08bxTmp3JHs="; meta = with lib; { description = "Generate human readable random names"; From ea9be2b781ddeaeeeb7a7aa1571cd88795af09de Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 25 Oct 2021 14:13:09 +0100 Subject: [PATCH 28/50] deno: 1.15.2 -> 1.15.3 --- 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 4cfb2c14354c..126226205d6a 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.15.2"; + version = "1.15.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ABCItd90mtASpyf+HSQeIcn70Wjvloj7L36WM+FUt0g="; + sha256 = "sha256-IFEo2F3gayR2LmAAJXezZPXpRfZf4re3YPZRcXpqx6o="; }; - cargoSha256 = "sha256-crSx122kE7lvV32YnFsZIGRwHMb8z4bEdg5s+6Qeih8="; + cargoSha256 = "sha256-9ZpPiqlqP01B9ETpVqVreivNuSMB1td4LinxXdH7PsM="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From e9370bd8185ca22665b714a3c705ef2faf00157c Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 25 Oct 2021 10:29:10 -0400 Subject: [PATCH 29/50] vimPlugins.vim-lean: fix branch --- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index cdd3bf63aaa3..60422f412513 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -457,7 +457,7 @@ michaeljsmith/vim-indent-object mileszs/ack.vim milkypostman/vim-togglelist mindriot101/vim-yapf -mk12/vim-lean +mk12/vim-lean@main mkasa/lushtags mlr-msft/vim-loves-dafny moll/vim-bbye From f94c4b7f61f18ccd130455d4663e66d53bf93e8a Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 25 Oct 2021 10:32:56 -0400 Subject: [PATCH 30/50] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 192 ++++++++++++++-------------- 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 82c12ba380c4..19f7084e202a 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-10-22"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "95ba7898b45c3cbac77463aace447ead4e173556"; - sha256 = "063ks4yf2l9384xi7candw1069j8k465rz2sniliak9r6hy1k100"; + rev = "92f08b5af2f6316312c95c5160c6e02b76370e04"; + sha256 = "17p8bbqqsjw17b50p8pxrv30mf8n6495gwzvlfpj51yz2vvk66wv"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -101,12 +101,12 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-10-09"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "836779b75c332d3063a628fd1050a4b0a6d57882"; - sha256 = "0cv3ki2xhz1rwz9wd2lyyv8zpdyflmjmb51k1kcy16jlp2ahgxi6"; + rev = "4bb3a4c1a1e329ebefa7ff022f7b3947770f7f26"; + sha256 = "0sd81pagrrwsig1fjm4ly866wcpq4xqpf810a8q1p2bygjs95chx"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -233,12 +233,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-10-14"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "6f9506c1a8445b902e121a630613b94c8b0cd52a"; - sha256 = "0gxf67a2l1sc5svrs6jkp6rawbjj54dvsqfr0prqindpdivxihic"; + rev = "2d25cc543e828acddaa54ad4129553477e2ed22f"; + sha256 = "0hhq8ajb9biki2kbcc0vdwbgpck0fcaf7xjdi1j8jglsmqk4xw1h"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -461,12 +461,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-10-23"; + version = "2021-10-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "db05991d79230f8f4a54a186f619bf909731c1b8"; - sha256 = "053p0qfghwj06vg2n5fi30491x8qrl2aih95gw3zk2r6lg384rqg"; + rev = "3693a1aeda4ba419d4a849d1955d6b4c39a3b565"; + sha256 = "0jsjk145y5j83l48fm6n6bvyvnjzm7l50w8b6sy9h06kzs0wh2ic"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -689,12 +689,12 @@ final: prev: cmp-treesitter = buildVimPluginFrom2Nix { pname = "cmp-treesitter"; - version = "2021-09-11"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "ray-x"; repo = "cmp-treesitter"; - rev = "cdc1c4c6170278e119759da0b3c28d73f531a231"; - sha256 = "0h0hr086mdszqjk5417nk2fmnbdkyi29gmqirx15k323y53hnvd1"; + rev = "0ba0a99b43420789740642f85e3fd076f1259418"; + sha256 = "030s5qgl6fg73w16w6p7ss767w2hrsfhq7nf6nsr4hibc07wj9m9"; }; meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; @@ -870,12 +870,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2021-10-22"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "4d6cfc83622bc220891b9abba7ca82e6919fd844"; - sha256 = "1akn9sf753nj2ch2kl3j1w2bxvva3maxsg5wj52mx3mgr81bwshl"; + rev = "1e01f4556be5472ddfbc9d9cb42bd9b958d4a24e"; + sha256 = "1d6w13mw8sb0c5bkg3nn8snjw7vrnjhr5pmgmbx4pv6g8yqr2zj4"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1026,12 +1026,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-10-09"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "1a30578ff37e33e8a5687a9488c86d0d880d8893"; - sha256 = "1phjrz46ahdwg1af2n6x3y6nims4c2hwmx6z3zwi5bb7wmc0jyn8"; + rev = "a2831ac61c44f9fe98a0fb469b02b761d503bc9a"; + sha256 = "1r1lz397fga204i4a4g6zbaf457wmvb35kpd9m7n8476iay892j7"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1062,12 +1062,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-09-17"; + version = "2021-10-25"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "ca2ca0d874670ae78192b465501e9a061f9f8f06"; - sha256 = "07hg0sf2k1f3n67pj5abvalnd33vr1sdhyh1i7syk201a3kzj57n"; + rev = "8afb9c8b78fa22913179e35a5711d52ea323e182"; + sha256 = "1g0zqfvr70bg8i07rpy1bdgyzsm9rgvc4fhyhw8cb5pk9y7m9bpj"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1098,12 +1098,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2021-10-04"; + version = "2021-10-25"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "ab2c491a941dda7fcec50fe58f472c024fac96e9"; - sha256 = "0h9d8i525cafxvdqxygfx9mchmcjlaq1kza3d4jiaa8azx9bfpzr"; + rev = "805a2c5cbb587a2a3f7532b59dc2eb205d6e1832"; + sha256 = "1rpslni5zvymnq06drjv7w6rap2z8md31r98s8fgvxxymgmzflys"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1230,12 +1230,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx.nvim"; - version = "2021-10-15"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "701b2a9b04055d056cd2e3e1f6f6fa555b0c4cb6"; - sha256 = "1q8nqg5dq3m3m884s67yv2i9b8m94myyx56xyw7f3g4b4ivcsyy4"; + rev = "b9d82e63a2f5f162d84b57d12ba346d8cd5eef5d"; + sha256 = "1klysn6c8mp8s9aw5x1zxqkdb1kwbirnrm627m9mhlmyms89djzm"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1750,12 +1750,12 @@ final: prev: falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2021-07-23"; + version = "2021-10-25"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "f734d08b7d8c59be372f0364cbdbb2e3b8884574"; - sha256 = "1gfswql15fpndxmkqgw5l3c15kpv2892bhmcc8hg3wwi6d8c8g3i"; + rev = "0ecdf0fbeb441d7c4134fb28f9f5f6a3cfc1e837"; + sha256 = "1nnxps0aa5bv6gkz5gfj7a0yaj9a4f81grfaijvanlw0cxa2f51w"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; @@ -1822,12 +1822,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2021-10-16"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "41197d23b2975fb373b0affc090ff4fe52a7429c"; - sha256 = "0djjik0q4pczw3r6v2xpmww1wv6rw69jxmdpnwfxss2fdpz5a9wl"; + rev = "338c7190a535cc5cf82e9d7443964b2e4f8bf97f"; + sha256 = "1d74k0mgf8axsnksq5dh3zlangabwdx7vwfi05wx0q7vkxm545d4"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2531,12 +2531,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-10-22"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "cefd4ab194072ca608c2bc8e51f15882d6f1854e"; - sha256 = "13ljp3dri9wz1y2l1d1va1qf7bzdcvhanj2bafv06i4mjcp3i73v"; + rev = "ec24675a055f34ba3fa30e5e2855b2e4480347ca"; + sha256 = "1k3zj75lz72arx13hm08azdpqlkfjjdpsl2cb5b78bknm3prwnr5"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2820,12 +2820,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-10-08"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "869a4005f63eba5a9e6e175bca0c50d73be48e2d"; - sha256 = "08yf8cqnzbm5cb5s2ynhj15l2lw73xhmfab15jnfyx14jd9pgyk6"; + rev = "48fbae95f5ba26affb490488eb606ff127ccb0da"; + sha256 = "0f2m2b8hwpyl74f6zl2n6x4d8yimi1pqy02alkwiwrm5y6x469sc"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2964,12 +2964,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2021-10-23"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "b2e9a06a84623c3e9dcd81a9ecb3155662f392f6"; - sha256 = "0x0axm9qbadc4d264synxlfv5gr8zmf2xzs2vcich1zrxavq8bgr"; + rev = "0a40c82fea060709b95b926cd0fe1bf1229e2900"; + sha256 = "1wvcd4nix9variddhfpn9mak5m2rskhc4vgfwy4pi3hrrwixjlyh"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3060,12 +3060,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2021-10-23"; + version = "2021-10-25"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "fddd3f958af06c0239a9b019cb2e180a93cb6a9c"; - sha256 = "19fd5fc3336jlhari9yzm24wkgk7c4ycqzd3s706m9w7d05m004d"; + rev = "6469c55ce7afc8cdfb6d0b6b3fbfd331bcc26410"; + sha256 = "05gwpgzxb8swb4x5brwqipbdmc24v1j9zc2x0nv4ivwchlal6n48"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3552,12 +3552,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-10-21"; + version = "2021-10-25"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "495ae477caa40b467e8b01aa83b5d240fabf13fa"; - sha256 = "16kbzqgk3pbwkyyrzg461c7vw9rj7sa8hczv74ai4393cgcil38m"; + rev = "86f4a4daa278a00a311765eac17fb45e1e5688ae"; + sha256 = "16xax1gyni7qrrscq2lqsgsd271sb6y667rg395wwqhrgq98zd6j"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3948,12 +3948,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-10-21"; + version = "2021-10-25"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "3b1b99028340a3b31c620887b8f5b99f4193157c"; - sha256 = "0ax5i7jjp1dmcywch8392vma91rk5cmi5201lhspggl8mawkcmbs"; + rev = "fdeb794ee7c4bbf4ea13b23cea3beb823f6ce88a"; + sha256 = "1dgm3krnz476lpj96z3sw2lqgpfrfg9hhbbc628nh6w3zsk9npyk"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3972,12 +3972,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-10-19"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "a57e44b31fe65665a29dd44597dbab0801723d61"; - sha256 = "15cxpx5vdg9lqs9h7w3azg54z1di9hqzy7bkk0kw813mv7n0bcn0"; + rev = "ead9c8d0e56454475de5b07acdb175d913190940"; + sha256 = "1zj2gxq5vys5fnp8qnk9w2x0g3s106ml423k931mzad2451n57h9"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4008,12 +4008,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-10-22"; + version = "2021-10-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "b185e303bd00390325c582d0366f85298cf84299"; - sha256 = "12ssag1nlg01vy1x8ip8mfclcklmvkysf3mvg6223scawy2kggk7"; + rev = "ea6dde8081be16b334fa614930a8772d6088ec9b"; + sha256 = "0ry1iy5d4ij77b9ib4viqqmbs3yi4i92pr8sj9yzd3yn7dwl1hda"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4224,12 +4224,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-10-22"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "2fb4b6a2f3188f12bad5196e1978528d8bd1c733"; - sha256 = "1rcijb0hh85sd0j659yinfiaz49ga5fwpragfsfdib6w12nlyiyx"; + rev = "7dc04ca9ae28bded22f4c78cb29dce09b6643f38"; + sha256 = "0bs66idzq4f0infbazr1w1pl9h2chm13lds06znxvfgi30ispd32"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4248,12 +4248,12 @@ final: prev: nvim-nonicons = buildVimPluginFrom2Nix { pname = "nvim-nonicons"; - version = "2021-09-14"; + version = "2021-10-25"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-nonicons"; - rev = "c38ff086e0157b91d0951f83741170bdcf501a9d"; - sha256 = "1vjh82kjs4ki61r0lnidd8xpj6zvc0j4k76fbs7fy0ndzsbph6gw"; + rev = "27465e577d7871d4029e01eb7db95ca969c2054c"; + sha256 = "1kf2093641pyxamhv0dldkm6lml1asbq3vyicgnzxbf3qks3v5xk"; }; meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; @@ -4332,12 +4332,12 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2021-10-23"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "6cadd3a9d7202524648d5fcbf5e6da9ddd32cd19"; - sha256 = "0nnyqq969lnzakhj1wnf9llz0www358b4cj2ch6vjaih3zvw9zva"; + rev = "fd3969ec986d739d9ab01b8ec5de051c45b475d2"; + sha256 = "05d4d0x2cgls4a9j9r3gxkvyq2l66qfw5yxx9qzvnp06852j2azl"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -4536,12 +4536,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2021-10-22"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "fb655cbeb5f6e3ddf2e810e50fa0f32206f08b13"; - sha256 = "15fniwdvd5pas27zbivxkph6qcdiar6rw4njn7jblfm07c08wvxc"; + rev = "7d5dbd596e359e9402fa8f06753458c0fc77342a"; + sha256 = "0klp9pj75rlka5qizc5jyikffikxcxr5987snapc6ra52f9ik2qi"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -4704,12 +4704,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2021-10-21"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "de5acdcb595f0a97bec874693008c94f94b57060"; - sha256 = "1g0j2nnmnfkmbirpqg751pl1qxrbx6fx39r9ak0f7sl9rm8322s7"; + rev = "b8c8d23c453b73856a4857da8f35a9219c8b0ba0"; + sha256 = "1vnlq4xhpl30zmm3qawz21bs2ndn7qfizn9s011yqc76jbnk5w89"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4897,12 +4897,12 @@ final: prev: rainbow = buildVimPluginFrom2Nix { pname = "rainbow"; - version = "2021-10-18"; + version = "2021-10-25"; src = fetchFromGitHub { owner = "luochen1990"; repo = "rainbow"; - rev = "e96f502eb0e88968858a2cb0348c8e2253637bcc"; - sha256 = "02lj86yrqjpcs83z4qfh3nhiy4nsq1fdrrcy3x56701zsiml511i"; + rev = "54c79a24725af3a15d3aad20f70a56c7abbd46c3"; + sha256 = "1bd8nqlcyhxxf02p4a16gayqkdh1010b7mnlfvzy69iaf2xclyx5"; }; meta.homepage = "https://github.com/luochen1990/rainbow/"; }; @@ -5716,12 +5716,12 @@ final: prev: taskwiki = buildVimPluginFrom2Nix { pname = "taskwiki"; - version = "2021-10-10"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "tools-life"; repo = "taskwiki"; - rev = "25d47074a5bd34010648a23923432d2290e32dd7"; - sha256 = "1f7gprn1xjs2pk9kaixszhqxj5mpvg33vibhlijk830xj7gw9gcx"; + rev = "925d8ed2f522229d32d4cc39486080c244d20f7a"; + sha256 = "1vifp4j2rkl6568ax3dsx42djl0gvkxaqgxlwzrnlkygmrwv76vn"; }; meta.homepage = "https://github.com/tools-life/taskwiki/"; }; @@ -5861,12 +5861,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-10-21"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "f56222738b719f5ae94ed85fdf080690371da0b9"; - sha256 = "0sprnp1636srwa0vs93af3qbrqnhxdmrb6vmagdr66ypk8fpbibg"; + rev = "782d802d44077e07f80189560f91c86370f11e39"; + sha256 = "12ycl2mf1k838aj566zrzisvsl5050iwqjnqz002hg5qpvphc48y"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8240,12 +8240,12 @@ final: prev: vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2021-10-09"; + version = "2021-10-25"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "854e51531b3da28ccbd8e853dd947fafa72b035e"; - sha256 = "09pbg2301xyhpa4wcmw2ki3gmrz5l8f0hj9fsi32rwzfiv3qlkaj"; + rev = "27af18abfe60990410a10ade1b61b8b6350913d9"; + sha256 = "0qc12dhp2kfjkmdcxajn0gy9z5vapylmnamd8lyhk2v8hkkzr8y4"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -9765,12 +9765,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-10-17"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "c28bef69fdb26825a93ac1e90ca6f5ba19116d88"; - sha256 = "1fg60jfm5bw1m20133vl06nb8z9ckrwqq37jz493xi34j5fymi4w"; + rev = "48863461962c731cc3f701abd558ccad73a30951"; + sha256 = "1nnn6wzppxxrb72gz1sfj1r9djs69fz5vk95xigk564sp70wn8cl"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -10186,12 +10186,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-10-23"; + version = "2021-10-24"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "03bc6aa0a81f5239a22b7c1e61280a898f39ab7c"; - sha256 = "13hfwv3yb1qp4ryqg62yv79zz2pv3sb0ccricbld7kb4a8qi9q7x"; + rev = "7471de1e3d7db039886a2e6317513e21f9ad482a"; + sha256 = "0rdn4548za44kzyddh6w0kgjgdxvim0k2s3ap37c5g062vka4dj4"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -10679,12 +10679,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-10-21"; + version = "2021-10-25"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "60bec44a17f72f9bfbc04d1ea9e6f7752e240502"; - sha256 = "1h7rp0fsc49af531d7hv8v738s07fv17xx6xlpkixi4rydlsmbv1"; + rev = "3bbd6ea0c7ecb2b95d6d720a9a2f2e8e5802c5ff"; + sha256 = "1rr65xh3pb8zgrfdqh1794qk1lj4nq5772v9cj4x3g318lfll55y"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; From 260af9121e453c22b862ba57dbb13830711e22dc Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 25 Oct 2021 10:33:27 -0400 Subject: [PATCH 31/50] vimPlugins.cmp-omni: init at 2021-09-28 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 19f7084e202a..3595e142d534 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -651,6 +651,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; }; + cmp-omni = buildVimPluginFrom2Nix { + pname = "cmp-omni"; + version = "2021-09-28"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-omni"; + rev = "3fec8a57d6d230c81d24c03dd80e97c62d4eda63"; + sha256 = "018lzqxdcw78ckqm16jn0wh3pv9pjl6abcj1q2svfalmim0h6a87"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-omni/"; + }; + cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; version = "2021-10-22"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 60422f412513..0c8e0138941f 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -229,6 +229,7 @@ hrsh7th/cmp-calc@main hrsh7th/cmp-emoji@main hrsh7th/cmp-nvim-lsp@main hrsh7th/cmp-nvim-lua@main +hrsh7th/cmp-omni@main hrsh7th/cmp-path@main hrsh7th/cmp-vsnip@main hrsh7th/nvim-cmp@main From 126dfe79c00f80f1a658192e6eea3cbffe9afd6e Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 25 Oct 2021 10:34:00 -0400 Subject: [PATCH 32/50] vimPlugins.cmp-pandoc-references: init at 2021-10-11 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 3595e142d534..aab93801caab 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -663,6 +663,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-omni/"; }; + cmp-pandoc-references = buildVimPluginFrom2Nix { + pname = "cmp-pandoc-references"; + version = "2021-10-11"; + src = fetchFromGitHub { + owner = "jc-doyle"; + repo = "cmp-pandoc-references"; + rev = "9f27411d118194fc9ee6e1f86574ad8077de54be"; + sha256 = "02g6rf2pzx1syhhbhrkxzygz27q2i1hsrymjcyj9q5h31wz0qzhq"; + }; + meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/"; + }; + cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; version = "2021-10-22"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 0c8e0138941f..4491b675d9dd 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -266,6 +266,7 @@ jaredgorski/SpaceCamp jasonccox/vim-wayland-clipboard jaxbot/semantic-highlight.vim JazzCore/ctrlp-cmatcher +jc-doyle/cmp-pandoc-references jceb/vim-hier jceb/vim-orgmode jeetsukumaran/vim-buffergator From f55446b5e386baa94238c665a1cab6fac0ddc183 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 25 Oct 2021 10:34:34 -0400 Subject: [PATCH 33/50] vimPlugins.cmp-under-comparator: init at 2021-10-22 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index aab93801caab..b56154cf3376 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -723,6 +723,18 @@ final: prev: meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; + cmp-under-comparator = buildVimPluginFrom2Nix { + pname = "cmp-under-comparator"; + version = "2021-10-22"; + src = fetchFromGitHub { + owner = "lukas-reineke"; + repo = "cmp-under-comparator"; + rev = "69e88636a3f7a1630a6e1199b4039a5f110caf81"; + sha256 = "1af4l8vf66sz4vhyzlnkrg0hpwx2f7096g9rszralxq0nad1i12d"; + }; + meta.homepage = "https://github.com/lukas-reineke/cmp-under-comparator/"; + }; + cmp-vsnip = buildVimPluginFrom2Nix { pname = "cmp-vsnip"; version = "2021-08-25"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 4491b675d9dd..cb68902a30db 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -395,6 +395,7 @@ LucHermitte/lh-brackets LucHermitte/lh-vim-lib ludovicchabant/vim-gutentags ludovicchabant/vim-lawrencium +lukas-reineke/cmp-under-comparator lukas-reineke/indent-blankline.nvim lukaszkorecki/workflowish lumiliet/vim-twig From faba756358bb24a023789d35f01728a3bff89c83 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 25 Oct 2021 10:35:07 -0400 Subject: [PATCH 34/50] vimPlugins.marks-nvim: init at 2021-10-23 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b56154cf3376..72c03fc257c4 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3202,6 +3202,18 @@ final: prev: meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/"; }; + marks-nvim = buildVimPluginFrom2Nix { + pname = "marks.nvim"; + version = "2021-10-23"; + src = fetchFromGitHub { + owner = "chentau"; + repo = "marks.nvim"; + rev = "15b6960d0ad9c578fd23b8caa5acfee0d09e4600"; + sha256 = "0khw541h2x39q4a1cx96019gdfmy1m0xgkbbfqhagr02gkm8dzy4"; + }; + meta.homepage = "https://github.com/chentau/marks.nvim/"; + }; + matchit-zip = buildVimPluginFrom2Nix { pname = "matchit.zip"; version = "2010-10-18"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index cb68902a30db..a330f71c4fa0 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -59,6 +59,7 @@ carlitux/deoplete-ternjs ccarpita/rtorrent-syntax-file cespare/vim-toml@main chaoren/vim-wordmotion +chentau/marks.nvim chikatoike/concealedyank.vim chikatoike/sourcemap.vim chkno/vim-haskell-module-name From 7cbb26bb9d9b5f21834b334f9b6681f0056ee4b2 Mon Sep 17 00:00:00 2001 From: Timur Demin Date: Mon, 25 Oct 2021 19:39:38 +0500 Subject: [PATCH 35/50] librespot: 0.3.0 -> 0.3.1 (#142855) --- pkgs/applications/audio/librespot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index de1952b99128..7b7d811f5731 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "librespot"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "librespot-org"; repo = "librespot"; rev = "v${version}"; - sha256 = "0n7h690gplpp47gdj038g6ncgwr7wvwfkg00cbrbvxhv7kzqqa1f"; + sha256 = "1fv2sk89rf1vraq823bxddlxj6b4gqhfpc36xr7ibz2405zickfv"; }; - cargoSha256 = "0qakvpxvn84ppgs3qlsfan4flqkmjcgs698w25jasx9ymiv8wc3s"; + cargoSha256 = "1sal85gsbnrabxi39298w9njdc08csnwl40akd6k9fsc0fmpn1b0"; cargoBuildFlags = with lib; [ "--no-default-features" From be8a53f7aebf97ad4050eb4b9938d415d641ac3a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Oct 2021 16:39:59 +0200 Subject: [PATCH 36/50] python3Packages.pyatv: 0.8.2 -> 0.9.5 (#142821) --- pkgs/development/python-modules/pyatv/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index eaeda0ed3417..e0054c004845 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -6,6 +6,7 @@ , cryptography , deepdiff , fetchFromGitHub +, mediafile , miniaudio , netifaces , protobuf @@ -13,19 +14,23 @@ , pytest-asyncio , pytest-timeout , pytestCheckHook +, pythonOlder , srptools , zeroconf }: buildPythonPackage rec { pname = "pyatv"; - version = "0.8.2"; + version = "0.9.5"; + + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "035cjm78xakvfi7k8zahjk0xr23p9my67d8jvq5bqrd506awrl0f"; + sha256 = "sha256-7aeXTR0ecrm5+KHRCdW3+HLjU3U7Ja/J6JTU5QscCto="; }; postPatch = '' @@ -38,6 +43,7 @@ buildPythonPackage rec { audio-metadata bitarray cryptography + mediafile miniaudio netifaces protobuf @@ -55,7 +61,9 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "pyatv" ]; + pythonImportsCheck = [ + "pyatv" + ]; meta = with lib; { description = "Python client library for the Apple TV"; From d7b40b207d1fe149ea04addb0d85aca197529256 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Oct 2021 21:53:17 +0200 Subject: [PATCH 37/50] python3Packages.aiounittest: 1.4.0 -> 1.4.1 --- pkgs/development/python-modules/aiounittest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounittest/default.nix b/pkgs/development/python-modules/aiounittest/default.nix index 088131824ad7..6b736b416ee9 100644 --- a/pkgs/development/python-modules/aiounittest/default.nix +++ b/pkgs/development/python-modules/aiounittest/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aiounittest"; - version = "1.4.0"; + version = "1.4.1"; disabled = isPy27; src = fetchFromGitHub { owner = "kwarunek"; repo = pname; rev = version; - sha256 = "sha256-GbGApY4pQoFpP3RTCLdjjTnJbdz9wEXXzZRRYXgtFEM="; + sha256 = "sha256-FixGF1JLJVqTgLaWugbeu8f+SDjpHSdSLoGklYBup4M="; }; propagatedBuildInputs = [ From da56cea292285b2e0d1a187b1b5a54b637ab151a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Oct 2021 06:10:03 +0200 Subject: [PATCH 38/50] python3Packages.pykodi: 0.2.6 -> 0.2.7 --- pkgs/development/python-modules/pykodi/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pykodi/default.nix b/pkgs/development/python-modules/pykodi/default.nix index d754a44ffd38..73508e3479cd 100644 --- a/pkgs/development/python-modules/pykodi/default.nix +++ b/pkgs/development/python-modules/pykodi/default.nix @@ -8,11 +8,12 @@ buildPythonPackage rec { pname = "pykodi"; - version = "0.2.6"; + version = "0.2.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SDp2S9HeqejRM3cf4x+5RLUQMPhjieQaXoubwf9Q/d4="; + sha256 = "sha256-2fFkbZZ3RXMolaaGpkvvVfSYtNNB1bTsoRCin3GnVKM="; }; propagatedBuildInputs = [ @@ -24,7 +25,9 @@ buildPythonPackage rec { # has no tests doCheck = false; - pythonImportsCheck = [ "pykodi" ]; + pythonImportsCheck = [ + "pykodi" + ]; meta = with lib; { description = "An async python interface for Kodi over JSON-RPC"; From 11b141609b071e140486842a1c42b7b876449b2b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Oct 2021 06:19:24 +0200 Subject: [PATCH 39/50] python3Packages.rokuecp: 0.8.2 -> 0.8.4 --- pkgs/development/python-modules/rokuecp/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 9804507423ec..bfb5ddcfe5b6 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -11,13 +11,14 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.8.2"; + version = "0.8.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "ctalkington"; repo = "python-rokuecp"; rev = version; - sha256 = "sha256-2FAnshIxaA52EwwwABBQ0sedAsz561YYxXDQo2Vcp1c="; + sha256 = "sha256-vwXBYwiDQZBxEZDwLX9if6dt7tKQQOLyKL5m0q/3eUw="; }; propagatedBuildInputs = [ @@ -32,6 +33,10 @@ buildPythonPackage rec { pytest-asyncio ]; + pythonImportsCheck = [ + "rokuecp" + ]; + meta = with lib; { description = "Asynchronous Python client for Roku (ECP)"; homepage = "https://github.com/ctalkington/python-rokuecp"; From 052e144f75b6587b2d81536237ddc0690604e764 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Oct 2021 06:23:48 +0200 Subject: [PATCH 40/50] python3Packages.youless-api: 0.14 -> 0.15 --- pkgs/development/python-modules/youless-api/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index da90c3c2a74d..07b033433864 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -13,7 +13,8 @@ buildPythonPackage rec { pname = "youless-api"; - version = "0.14"; + version = "0.15"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "jongsoftdev"; repo = "youless-python-bridge"; rev = version; - sha256 = "sha256-ZHDQ+4Urv0ZxKFASsgDG12mpfRiCN2DwU6Rgc9ye5qY="; + sha256 = "sha256-77uQUAPDCFQiCpNAI0feOtHq82sE0n70IV1Njn/W29M="; }; propagatedBuildInputs = [ @@ -37,7 +38,9 @@ buildPythonPackage rec { nose ]; - pythonImportsCheck = [ "youless_api" ]; + pythonImportsCheck = [ + "youless_api" + ]; meta = with lib; { description = "Python library for YouLess sensors"; From 587ea4f6e5dbc393cf8c0887f54735e7ff724bf7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Oct 2021 06:14:59 +0200 Subject: [PATCH 41/50] python3Packages.pypoint: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/pypoint/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pypoint/default.nix b/pkgs/development/python-modules/pypoint/default.nix index b3b9107c6e0b..9980d2384f9a 100644 --- a/pkgs/development/python-modules/pypoint/default.nix +++ b/pkgs/development/python-modules/pypoint/default.nix @@ -7,13 +7,14 @@ buildPythonPackage rec { pname = "pypoint"; - version = "2.2.0"; + version = "2.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "fredrike"; repo = "pypoint"; rev = "v${version}"; - sha256 = "sha256-2PKZtn+l93de4/gPPM2Wdt04Zw+ekDadwNgL6ZKTqhY="; + sha256 = "sha256-Or7A/Br6BgiCF6OHRtN5TAt++Tu1RLS9mYRgD7Aljts="; }; propagatedBuildInputs = [ @@ -24,10 +25,12 @@ buildPythonPackage rec { # upstream has no tests doCheck = false; - pythonImportsCheck = [ "pypoint" ]; + pythonImportsCheck = [ + "pypoint" + ]; meta = with lib; { - description = "API for Minut Point"; + description = "Python module for communicating with Minut Point"; homepage = "https://github.com/fredrike/pypoint"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; From aa224e0f414ad86718c88f36283e4884ea93c111 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 25 Oct 2021 11:36:50 -0400 Subject: [PATCH 42/50] himalaya: 0.4.0 -> 0.5.1 --- .../mailreaders/himalaya/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix index b1c709b055b9..33c1cc63a7f9 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -1,33 +1,29 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub -, openssl -, pkg-config -, installShellFiles +, stdenv , enableCompletions ? stdenv.hostPlatform == stdenv.buildPlatform +, installShellFiles +, pkg-config , Security , libiconv +, openssl }: + rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6RgT/SxO4vsk8Yx2AbaNIFvnAvgDmeTXvb/v6nUJxhc="; + sha256 = "sha256-BmV4kekl0QDbX/ueSrWM5jRvqr6WQeZIs7hiXhiHBSI="; }; - cargoSha256 = "sha256-NEuIh7FwIdAWzlChna3+G0VukfV8nYZfVWa+3LxQCIA="; + cargoSha256 = "sha256-lu5xVuAw9yTeQr3gpiW5g5bdm7Alf0YXmlbSkPaXhk0="; - # use --lib flag to avoid test with imap server - # https://github.com/soywod/himalaya/issues/145 - cargoTestFlags = [ "--lib" ]; - - nativeBuildInputs = [ ] - ++ lib.optionals (enableCompletions) [ installShellFiles ] + nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; buildInputs = @@ -49,6 +45,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "CLI email client written in Rust"; homepage = "https://github.com/soywod/himalaya"; + changelog = "https://github.com/soywod/himalaya/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ yanganto ]; }; From 7d22ae1937364a483d2dd405cb1795c5c8c3ceea Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 25 Oct 2021 09:21:14 -0700 Subject: [PATCH 43/50] nixos/release-notes: fix 21.11 release name --- nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 2 +- nixos/doc/manual/release-notes/rl-2111.section.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index afe509027316..7636aa25e364 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1,5 +1,5 @@
- Release 21.11 (“?”, 2021.11/??) + Release 21.11 (“Porcupine”, 2021.11/??) In addition to numerous new and upgraded packages, this release has the following highlights: diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index bda2c40ef1ae..e7cd4b3a3d61 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -1,4 +1,4 @@ -# Release 21.11 (“?”, 2021.11/??) {#sec-release-21.11} +# Release 21.11 (“Porcupine”, 2021.11/??) {#sec-release-21.11} In addition to numerous new and upgraded packages, this release has the following highlights: From 1a83d487b75ddd4d154b5f5a11df6a3c15f3444f Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Mon, 25 Oct 2021 11:50:57 -0400 Subject: [PATCH 44/50] graphql-client: init at 0.10.0 Co-authored-by: figsoda --- .../tools/graphql-client/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/graphql-client/default.nix diff --git a/pkgs/development/tools/graphql-client/default.nix b/pkgs/development/tools/graphql-client/default.nix new file mode 100644 index 000000000000..b98f287d612d --- /dev/null +++ b/pkgs/development/tools/graphql-client/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, openssl, Security }: + +rustPlatform.buildRustPackage rec { + pname = "graphql-client"; + version = "0.10.0"; + + src = fetchCrate { + inherit version; + crateName = "graphql_client_cli"; + sha256 = "sha256-OV4kpvciEJOGfhkxPoNf1QmhdytWMhXuQAKOFJvDFA4="; + }; + + cargoSha256 = "sha256-r/pRwDLc/yGMzdZIx8SV46o63eb6qrlTb6MsUBhq97w="; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "A GraphQL tool for Rust projects"; + homepage = "https://github.com/graphql-rust/graphql-client"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aaa4638d7d18..fad6cdb25d07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13179,6 +13179,10 @@ with pkgs; mpi = mpich; }; + graphql-client = callPackage ../development/tools/graphql-client { + inherit (darwin.apple_sdk.frameworks) Security; + }; + groovy = callPackage ../development/interpreters/groovy { }; inherit (callPackages ../applications/networking/cluster/hadoop { }) From 25bb6455682f75b3b22c4bb2e7d9659fb7d60c7a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 25 Oct 2021 11:09:31 -0700 Subject: [PATCH 45/50] hqplayerd: 4.26.0-67 -> 4.26.2-69 --- pkgs/servers/hqplayerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 3bda53ad1404..035d7b4e32dc 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.26.0-67"; + version = "4.26.2-69"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm"; - sha256 = "sha256-Wbtt1yO/CE2cewOE5RynwEm+fCdOV1cxzR/XiCwj0NU="; + sha256 = "sha256-zxUVtOi4fN3EuCbzH/SEse24Qz7/0jozzDX1yW8bhCU="; }; unpackPhase = '' From 042b62583e08b05ed8e7ee0b3530ae16b495286b Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 25 Oct 2021 11:31:18 -0700 Subject: [PATCH 46/50] hqplayerd: fix gupnp version mismatches with fc34 --- pkgs/servers/hqplayerd/default.nix | 33 +++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 035d7b4e32dc..a461608badf0 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -8,14 +8,40 @@ , gcc11 , gnome , gssdp -, gupnp , lib , libgmpris , llvmPackages_10 , rpmextract , wavpack -}: +, gupnp +, gupnp-av +, meson +, ninja +}: +let + # hqplayerd relies on some package versions available for the fc34 release, + # which has out-of-date pkgs compared to nixpkgs. The following drvs + # can/should be removed when the fc35 hqplayer rpm is made available. + gupnp_1_2 = gupnp.overrideAttrs (old: rec { + pname = "gupnp"; + version = "1.2.7"; + src = fetchurl { + url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-hEEnbxr9AXbm9ZUCajpQfu0YCav6BAJrrT8hYis1I+w="; + }; + }); + + gupnp-av_0_12 = gupnp-av.overrideAttrs (old: rec { + pname = "gupnp-av"; + version = "0.12.11"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-aJ3PFJKriZHa6ikTZaMlSKd9GiKU2FszYitVzKnOb9w="; + }; + nativeBuildInputs = lib.subtractLists [ meson ninja ] old.nativeBuildInputs; + }); +in stdenv.mkDerivation rec { pname = "hqplayerd"; version = "4.26.2-69"; @@ -38,7 +64,8 @@ stdenv.mkDerivation rec { gcc11.cc.lib gnome.rygel gssdp - gupnp + gupnp_1_2 + gupnp-av_0_12 libgmpris llvmPackages_10.openmp wavpack From 2e4300bf8b7df72e95803de6fa1aea9537c3c9c7 Mon Sep 17 00:00:00 2001 From: Robbert Gurdeep Singh Date: Mon, 25 Oct 2021 22:54:53 +0200 Subject: [PATCH 47/50] element-desktop: 1.9.2 -> 1.9.3 (#142871) Changelog: https://github.com/vector-im/element-desktop/releases/tag/v1.9.3 --- .../instant-messengers/element/element-desktop-package.json | 2 +- .../networking/instant-messengers/element/pin.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 9cca8b95b821..fbc61c23b5c4 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.9.2", + "version": "1.9.3", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index a85ce6f8789c..dfb9791b3aa9 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.9.2", - "desktopSrcHash": "F1uyyBbs+U7tQzRtn+p923Z/BY8Nwxr/JTMYwsak8W8=", + "version": "1.9.3", + "desktopSrcHash": "Pb9iiCYtmuD6DzdvgY8c6pCFdVAxIIUZTWLCa7y5RMI=", "desktopYarnHash": "0iwbszhaxaxggymixljzjb2gqrsij67fwakxhd3yj9g1zds49ghh", - "webHash": "1d9kdj65yk86hx087x1p0qkm0cffaqkwgwzl74g11g264szz8ja2" + "webHash": "06lpb8i7fyimm06y6h3ngh19bx416if9lvs2ah2112vx28hs14zp" } From fc25fa882eda1666b96166002e8380d9139e42fb Mon Sep 17 00:00:00 2001 From: uniquepointer Date: Mon, 25 Oct 2021 16:31:07 -0500 Subject: [PATCH 48/50] your-editor: init at 1203 --- .../editors/your-editor/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/editors/your-editor/default.nix diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix new file mode 100644 index 000000000000..d9025c13b095 --- /dev/null +++ b/pkgs/applications/editors/your-editor/default.nix @@ -0,0 +1,36 @@ +{ pkgs, stdenv, fetchFromGitHub, lib, ... }: + +pkgs.stdenv.mkDerivation rec { + pname = "your-editor"; + version = "1203"; + + rev = "608418f2037dc4ef5647e69fcef45302c50f138c"; + src = fetchFromGitHub { + owner = "kammerdienerb"; + repo = "yed"; + rev = "608418f"; + sha256 = "KqK2lcDTn91aCFJIDg+h+QsTrl7745So5aiKCxPkeh4="; + }; + + buildInputs = [ + ]; + + configurePhase = '' + ''; + + buildPhase = '' + ''; + + installPhase = '' + patchShebangs install.sh + ./install.sh -p $out + ''; + + meta = with lib; { + description = "Your-editor (yed) is a small and simple terminal editor core that is meant to be extended through a powerful plugin architecture."; + homepage = "https://your-editor.org/"; + license = with licenses; [ mit ]; + platforms = platforms.linux; + maintainers = [ uniquepointer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fad6cdb25d07..a4fae13e7c25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33118,6 +33118,8 @@ with pkgs; yapesdl = callPackage ../misc/emulators/yapesdl { }; + your-editor = callPackage ../applications/editors/your-editor { }; + x16-emulator = callPackage ../misc/emulators/commanderx16/emulator.nix { }; x16-rom = callPackage ../misc/emulators/commanderx16/rom.nix { }; x16-run = (callPackage ../misc/emulators/commanderx16/run.nix { }) { From 14c8bf87430d4203b68be38e8073624e8d26fbab Mon Sep 17 00:00:00 2001 From: uniquepointer Date: Mon, 25 Oct 2021 16:46:23 -0500 Subject: [PATCH 49/50] Maintainers: Add uniquepointer --- maintainers/maintainer-list.nix | 7 ++++++ .../editors/your-editor/default.nix | 23 +++++++------------ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 57224c438daf..2d6a99ebb426 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11706,6 +11706,13 @@ fingerprint = "EE59 5E29 BB5B F2B3 5ED2 3F1C D276 FF74 6700 7335"; }]; }; + uniquepointer = { + email = "uniquepointer@mailbox.org"; + matrix = "@uniquepointer:matrix.org"; + github = "uniquepointer"; + githubId = 71751817; + name = "uniquepointer"; + }; unode = { email = "alves.rjc@gmail.com"; matrix = "@renato_alves:matrix.org"; diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index d9025c13b095..142795fc49a4 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -1,29 +1,21 @@ -{ pkgs, stdenv, fetchFromGitHub, lib, ... }: +{ lib, stdenv, fetchFromGitHub }: -pkgs.stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "your-editor"; version = "1203"; - rev = "608418f2037dc4ef5647e69fcef45302c50f138c"; src = fetchFromGitHub { owner = "kammerdienerb"; repo = "yed"; - rev = "608418f"; + rev = "608418f2037dc4ef5647e69fcef45302c50f138c"; sha256 = "KqK2lcDTn91aCFJIDg+h+QsTrl7745So5aiKCxPkeh4="; }; - buildInputs = [ - ]; - - configurePhase = '' - ''; - - buildPhase = '' - ''; - installPhase = '' - patchShebangs install.sh + runHook preInstall + patchShebangs install.sh ./install.sh -p $out + runHook postInstall ''; meta = with lib; { @@ -31,6 +23,7 @@ pkgs.stdenv.mkDerivation rec { homepage = "https://your-editor.org/"; license = with licenses; [ mit ]; platforms = platforms.linux; - maintainers = [ uniquepointer ]; + maintainers = with maintainers; [ uniquepointer ]; + mainProgram = "yed"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4fae13e7c25..ff254d324bc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29220,6 +29220,8 @@ with pkgs; yoshimi = callPackage ../applications/audio/yoshimi { }; + your-editor = callPackage ../applications/editors/your-editor { }; + youtube-dl = with python3Packages; toPythonApplication youtube-dl; youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light; @@ -33118,8 +33120,6 @@ with pkgs; yapesdl = callPackage ../misc/emulators/yapesdl { }; - your-editor = callPackage ../applications/editors/your-editor { }; - x16-emulator = callPackage ../misc/emulators/commanderx16/emulator.nix { }; x16-rom = callPackage ../misc/emulators/commanderx16/rom.nix { }; x16-run = (callPackage ../misc/emulators/commanderx16/run.nix { }) { From ee6735ec2270ed2c327386934abb3082148518b4 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 25 Oct 2021 19:28:12 -0400 Subject: [PATCH 50/50] your-editor: styling fixup --- pkgs/applications/editors/your-editor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index 142795fc49a4..a191943c3fd6 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Your-editor (yed) is a small and simple terminal editor core that is meant to be extended through a powerful plugin architecture."; + description = "Your-editor (yed) is a small and simple terminal editor core that is meant to be extended through a powerful plugin architecture"; homepage = "https://your-editor.org/"; license = with licenses; [ mit ]; platforms = platforms.linux;