From 9a89bf966930abf3e05139332b039f6e9dbc34ca Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 17 Mar 2023 04:20:00 +0000 Subject: [PATCH 01/81] python310Packages.pytest-twisted: 1.13.2 -> 1.14.0 --- .../python-modules/pytest-twisted/default.nix | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytest-twisted/default.nix b/pkgs/development/python-modules/pytest-twisted/default.nix index 789af6769415..198d21083e27 100644 --- a/pkgs/development/python-modules/pytest-twisted/default.nix +++ b/pkgs/development/python-modules/pytest-twisted/default.nix @@ -4,21 +4,37 @@ , greenlet , pytest , decorator +, twisted +, pytestCheckHook }: buildPythonPackage rec { pname = "pytest-twisted"; - version = "1.13.2"; + version = "1.14.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "cee2320becc5625050ab221b8f38533e636651a24644612f4726891fdf1f1847"; + sha256 = "sha256-IJv1pkUs+/th3o8BWQLBTsgSZACRFQcHS7LuTOjf4xM="; }; - buildInputs = [ pytest ]; + buildInputs = [ + pytest + ]; - propagatedBuildInputs = [ greenlet decorator ]; + propagatedBuildInputs = [ + decorator + greenlet + ]; + + nativeCheckInputs = [ + pytestCheckHook + twisted + ]; + + pythonImportsCheck = [ + "pytest_twisted" + ]; meta = with lib; { description = "A twisted plugin for py.test"; From 3e531b418e1aa5d60cee4d316334b43cdef5e2e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Mar 2023 12:29:11 +0000 Subject: [PATCH 02/81] firefox-beta-bin-unwrapped: 112.0b2 -> 112.0b3 --- .../browsers/firefox-bin/beta_sources.nix | 802 +++++++++--------- 1 file changed, 401 insertions(+), 401 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 4cbd9971a1f9..eb35d599e180 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1005 +1,1005 @@ { - version = "112.0b2"; + version = "112.0b3"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ach/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ach/firefox-112.0b3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "55396746ee49a401ea7c82d909f800d7eba326e92dc28a910712ea7a35711718"; + sha256 = "7e45e3f7a8b985f05fe32c038d8dcf707d4c7f7d544443554923e54222c10f69"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/af/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/af/firefox-112.0b3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b73bfa68625ec6e1a6d23077a580678dd0fdf319b8366f65c20185dafc1e978f"; + sha256 = "3ef52da36f6944f458af7730f3a0052f94dafe7daf81996364930dab63208cb5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/an/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/an/firefox-112.0b3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "f52aa9bd79c3501eff9662ec065f8e26531c5860fdc32a5228fd12f9a1d69917"; + sha256 = "c9d4d16d7b6035babc3ca12149dcce628ceea7c6caa05663ca9d7e4a61570cd5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ar/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ar/firefox-112.0b3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "0fd26c0e7122bc2af38d9c812fb5deddd6f8ca85bda625781fd61de685dd9872"; + sha256 = "d5dcaa8b76a9699eb9af6cc30c6de560c9b8e7ceaa96d0d208f2e30b29471dd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ast/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ast/firefox-112.0b3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "634f8f5b63f4e5103238b0dff6a5de27b63fa0abce5959cab9f22723eb1e7763"; + sha256 = "d61ba0ee0079683a47163644fd5abbd0dda0c6387c6f30d0de90abfba4f5261f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/az/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/az/firefox-112.0b3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "2b1dea32824f6bf622e1551ef1501eb0fbc29eef1611d78cf0826bf71f75452a"; + sha256 = "3cf3a5bf77bce607b26b8cf34aa3d148d9e09b0de9010b7ee6032553e165e6c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/be/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/be/firefox-112.0b3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "668735893d389b63613cdd6c35847d5e9842d7fd64f2bb79df98f119f0ae2619"; + sha256 = "bbbdd7092f34e116d9974303dc224fdbc6cf510413ff45f15d8036e27f2a8bf2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/bg/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/bg/firefox-112.0b3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "51e874da59d9309c40644ad3d480ad6f50db7c556f5d0873326e65f591e11543"; + sha256 = "47bf112189e74f5d4e87864a695915e0ecbfd454890b0f709f229869bf15bd7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/bn/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/bn/firefox-112.0b3.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "60cf87ed845a5b9ec9c25fd0c54422d5df1a220cffa040acdcbab6cac5f90cc9"; + sha256 = "8d4a77d3eed954c442c91e1f43f83c1abedcd394fa26b3b55594f6879cbfb564"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/br/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/br/firefox-112.0b3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "78d9409a97934bdc7fea4f55f19830d02abf8212fb019d1d3b36a1dd6fa86e0f"; + sha256 = "99464a0825965bf95fc20f3f02c5263e6adb9ffe95c5457724d708d7cf35345b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/bs/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/bs/firefox-112.0b3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "5309007b0605b956cdeb2c4857a2bd475cbdfac1cb2998d081b1931c96415892"; + sha256 = "d508c6cd95261589e597c3d38555d8182f1d6bb7df3fee6bf51d69ff62bb4ba6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ca-valencia/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ca-valencia/firefox-112.0b3.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c655f8b4a7cd9501df33aaa0f6dfee6ac0e3cddb91877701eb82b672c62ca70e"; + sha256 = "66c160faefc80ea3a4d7bdb8bd4ec415d6e6880decc0ae8b785ba41245fe7788"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ca/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ca/firefox-112.0b3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "7ed53427e009b63002a9770fcefabaf16b695d1362587d5e85421285ac9bc128"; + sha256 = "81aa78e972989fcfcd36f46698863806853d92514afaac7adf567aa55bd6a60e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/cak/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/cak/firefox-112.0b3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f30f034d6604d0d5fa72f5d85a811316cf2812bcb79bee6022de9bec68506022"; + sha256 = "d9631a4c750b65377210266c8461c529e2ab5fa625b78e971d11a0116ab9d1a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/cs/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/cs/firefox-112.0b3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "ac00859c967995db0cc79760e248fa566f42c5301c173a0dabb64d719ce7577b"; + sha256 = "7f90dc968b6d4c25ffef4708adf2031b29fe4b0b11a694a4d3c4c35c071a73da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/cy/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/cy/firefox-112.0b3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "45866ae73478e6e7516b93a23844214e89716542bdcc04e769f7b18d7d3defb6"; + sha256 = "1a9e15ad5733a86000a31f93a403cbb43578de54c05a97b0e6e40a8f3fd244ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/da/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/da/firefox-112.0b3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2f0416215cc403e81c326179a65ab9a2af0e836bfccab1877c00fa997228ffdb"; + sha256 = "ebf834bcae918981e89795434ae40768b826b13371acc7ec9ba08dc72aaa73b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/de/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/de/firefox-112.0b3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "4ad318d32e0e26dca381d10becd101afb544a6fadf281ccd3808e5f3ca061904"; + sha256 = "666dbf7af58657fe9b0b7f99bfbc8d46ae02305d1289e8a91be8f4aea9b46006"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/dsb/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/dsb/firefox-112.0b3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "0d18ef2b1d134b613dc9851798f5438f82e3a1ec6bdd751fa336a7053ddbc6cc"; + sha256 = "236a9920e1f6800d5625ce580cbc631a42fd30e5bf25dafe154708a0fbdc677f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/el/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/el/firefox-112.0b3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "de0c0315b8e67c608b285a33ea707fb8c86af1317d724dd8a9643ed3847aa726"; + sha256 = "0c93516a4c1902ff9be2f1e3a0e782246f6105142ce0fa2bb77401ce271efb76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/en-CA/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/en-CA/firefox-112.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "1f5604d2baba29149341d358a49c9bef2a9975901d635bc111fbf3ccc4fb921a"; + sha256 = "18e1068a3b3cbac8db7ea9525f2baca3cac3daeb817143069a92ae8684868ae8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/en-GB/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/en-GB/firefox-112.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "67b1eb3be91530e9da75d7a441b6af4a1f9686fafeaf6b7de92add80d2d1071a"; + sha256 = "ff19e3ac8ddfcf24c32f497576a5df245846b09242ced4a9da4354597b6d19c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/en-US/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/en-US/firefox-112.0b3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "8bdf79d6a7acb3f85564ad97fcf5906357b90530e51e7eac09d209475ac56135"; + sha256 = "96c66b52507aff413b5acaf9bc146908cd6725397189cb535a2e6b411ec5cf25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/eo/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/eo/firefox-112.0b3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "8643d3b2eda5b93e61d2091d77c8abfad6089ed600846ead645ca49720214eb2"; + sha256 = "150b2447d458eb34ca6139aa0046c843971749de0359503c8cbef7106b6a7838"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/es-AR/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/es-AR/firefox-112.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "48d60dd690e9e1cceaf8f515b8e51b4f26a213acffa55a8bc324e85740cbcde9"; + sha256 = "33870347b2573594f7118b53d535c4100e3aa5dfd79ead8e3e98594e35f02c44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/es-CL/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/es-CL/firefox-112.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "1ed56eeafdc3a7a26004116773c497675fcc30b4f8c3c5e290aca07e66a82391"; + sha256 = "f6a885941ea044b02823c7ee3e7e59eb7edf9fbd916c207c03a3adb1ac5e9532"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/es-ES/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/es-ES/firefox-112.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c927fcf15729383de1c40415e0948f4a7fbedccade5eb6583fdca89250c80931"; + sha256 = "388d1759395e920f60fc1cdb6b93a936ac59e80cbea18ecab1bd48274ec64241"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/es-MX/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/es-MX/firefox-112.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "c1f9be15acbf299f52a1c49712508f140e88134de72261b4c6f7014c5143fd15"; + sha256 = "fc35234ccd7428a0d16a9ed8403912d2f20a145efc89a74c743ba6e187b1a1b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/et/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/et/firefox-112.0b3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "6fbd0755b7c32cfada83d6d94adb42a983e8b33bc4610b086256cd4abf913da8"; + sha256 = "12116fb38aba397c30b61ba0d13f1eb334a2240e0cc16e303dfdb4274678ce00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/eu/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/eu/firefox-112.0b3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "c6111ce30274a888a19a17a00bed3ea323c2d327544a4bf97fba671cf19d66ba"; + sha256 = "c0c3e164e67e31ce5686479f0494749b5eb1badc157ec3b7148afe490a4296a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/fa/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/fa/firefox-112.0b3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "8598a16e1d48fbb6beb3e576741795b56c6cc1ebce5ce143d995607341e581c4"; + sha256 = "b0bd2b70aca166e66d102ab263fa9532dbff40c563ae463aeb2302d7b958e1ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ff/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ff/firefox-112.0b3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "5efbfc006a2e101a3c650963c9ff1cbd216f66c82c7460ce84f6dbf71745eeb5"; + sha256 = "c456cad156aad5c99f49a697266fa67d273b5bccae9704db6a0106e3f3e363bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/fi/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/fi/firefox-112.0b3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "729d21e2d57ab76035f06d0d66b29a387d697c5d0a7ce858c2773fc91a7d5338"; + sha256 = "c63837738b96928de3367fc0a23ba69b339d5ab81f21280681546be5bcc9a03b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/fr/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/fr/firefox-112.0b3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "35d9f24f0e6d5c907752a08354a6f31eb41da4e3f7a2ca41c05d0ee39432fbf3"; + sha256 = "d066890f90b57b5f6fc53cb3b4e70630d2f2fc4db6283b4e4c4198a68bdfc556"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/fur/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/fur/firefox-112.0b3.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "7a418568590169aac482da758b3aa36f66bde5bc7d66d92a9af9a90d9a498fda"; + sha256 = "e081e4e51f0359e41a6ddc27c9d57263c558ea2a7e80f61ce6dac29d9bee6a19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/fy-NL/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/fy-NL/firefox-112.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "66e84d4c9c3cccaa0571bcfa074179ffe2506b09435807e8dfca622cda809fa4"; + sha256 = "e021fcc87736c1ced1a81de06ceb30100e30a39f6db04789ac48f2d1c95a781d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ga-IE/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ga-IE/firefox-112.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "63ffe4004348fc89fcf9f7356db750c2188c6b70c59b1669f0f00976c8b7ac14"; + sha256 = "ee95f7e8eae3c1a7c9884bb62c96a886bfcffd41dfb7b46515ed9298720d805e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/gd/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/gd/firefox-112.0b3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "7bb88fafdb04958ac90c3452581561ea1de3d628cdf0a5aac12d42e26193d240"; + sha256 = "c111e1f78a1050e8b31b86bcdd8814a691c9b9c8a71f0659027f6c5a33fdb4b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/gl/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/gl/firefox-112.0b3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "3b8a1044208be74ae645f2d7ccb2e097310c1bc0ab9bc99a63ed962404bb3625"; + sha256 = "6eb9e74b87d47ddd1d03792067f27252d9980664e78afd661fc60910687b67a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/gn/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/gn/firefox-112.0b3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "6849e381fd05fcf1a98f2477723165efc1261c3a86e937befd92faa553e618b3"; + sha256 = "3edb762012527ed2c7c404f3fb3eaac4283bb6a8d199861bec1f2cb24fafa416"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/gu-IN/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/gu-IN/firefox-112.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "cc60d45f0febacfc656df94c9fefe3bc90fccda3afb8255ec7192fb319a02402"; + sha256 = "db7a2992c6843c7b02686133ebb49cadfdbcb6bbd955a298b3f7b66a73bfc22e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/he/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/he/firefox-112.0b3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "b74bd9ee031591edb59a6f19bdf4962dc69c6293c6fe5cc1283edfc017dbcb3b"; + sha256 = "e09c49922bce9515d8c7be8c4b3b732856b6aeddcdc10c0e7190c3cf98495cfd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/hi-IN/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/hi-IN/firefox-112.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "e799b203ab879a93930d9a357d24a12f8cab342ab59bf84c0184302ce4fdc328"; + sha256 = "6448f743d9a3522dc45c1b6be1e4c984318e37ff40b04b67c491e5131c27285e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/hr/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/hr/firefox-112.0b3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "931df65476467ef9f7ba2f93dfccef78abed33bc51959b1a6979377aeed50272"; + sha256 = "7cb65061d1bcf2e569ec641c636c5088b9fe345ba06fc228d2080f30591407e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/hsb/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/hsb/firefox-112.0b3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "d8aec47e9bf5aedeee2cc377aa6a6aff37d8ab87c95944e0dc2858eac4690d92"; + sha256 = "78a03d24c65f074baba3dd4dee539f29a78fd0d5b269f169e7a23959acbe1b1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/hu/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/hu/firefox-112.0b3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "806ffbdd6cdaf50d5bdf7667e94e3b7cc7d6380f9c85d297aa16c08a6a7e31a6"; + sha256 = "010d3d910887002cdfe0f027192acdbb8ecc020d79ef6533989729ae46233532"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/hy-AM/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/hy-AM/firefox-112.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "d5899fa4fc5275c2768f32dddc24757567660e75d28bdeab98347048066dc76e"; + sha256 = "1bb2a3784e45dcc2dc3569d527137b8aaea2ccca3139801a8060acb37a50558e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ia/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ia/firefox-112.0b3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "4af2425183d662c94597004d0e2806feb8c3bb6f2f47c0bff0c4af105a159569"; + sha256 = "b067c8cf7007fc3f8afab8b254e88c985b116e09bde24b56ca9f67a645d63b85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/id/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/id/firefox-112.0b3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1a6a234d8832c69256da8d779d33e61e1c5439a9b26224b47d7991b6ffac9388"; + sha256 = "caa1a74846f17d80dd0694b6b5e45f0e67ac19c9dca2d700ec17df12fb517972"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/is/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/is/firefox-112.0b3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "4d1877cf223bb4ff2e316076c8daa5d444e7d29d69792f67023fb3a1a648a4f5"; + sha256 = "a09d2f36353fe3cb39b69f0420ba5cd63629023c534ce95c7ef438d659161eaa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/it/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/it/firefox-112.0b3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "2a62b2dd7afaf0df7e204b407e4fd1aa3cf2b4eb5432b4dc711a5272714f80a2"; + sha256 = "6eec2dc4eda3777a040320e85d46b67269f5f3ed455e14cbdeaec7b3183a8c94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ja/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ja/firefox-112.0b3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "61467c700234a05e93e8edeb206089b842aa3e4369a04fa0f598e100bd9241db"; + sha256 = "ac6eea4ed4080f64b6e2a4f1e55fec434a8cfd2177e069c38a4700d9ddcaf2fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ka/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ka/firefox-112.0b3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "1f99776b2fd66dc0359835f3b6850cc309cef9b3a6e71a5ddc57bd1cd3cc21f4"; + sha256 = "764b2cd0b531d06845390c84a68707ba3c590325984ad0eb493050e045554538"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/kab/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/kab/firefox-112.0b3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "039e07066d2f0d6daf645140d4e76547989ba2317dba1740f871e461513242b5"; + sha256 = "d3e2481e32f3ce0816f73ee194d16267692cb90dfa44bf0af6257d06b2cb1845"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/kk/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/kk/firefox-112.0b3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a987b5f450098524ed168ab2456eae80f44f9af62b11a66549ec09385d44db37"; + sha256 = "ce9b2e0f7badb1e707ca80aeb65bbf918ed9d8affa2052d93acf150610e669a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/km/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/km/firefox-112.0b3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "88e29f0b43f2f4ce1436c0b7037a8f81181d22fc2bb51767af69467626cd8f04"; + sha256 = "8f9ff69366b06a06baa60ba36f04423b01f846342318646edb1c05efb20e4da8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/kn/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/kn/firefox-112.0b3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "f3736b3bf2494265969e88c5b9aab181a4db849a5031cd069368619862f6a60d"; + sha256 = "c05f319cc0d2f63632968dd0491c9452168e56196c83dd6a19f2e4e1b025888e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ko/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ko/firefox-112.0b3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "dd2b1aec2ca81706b571f071321ebf5ed17406ace002541a1a83241997474e28"; + sha256 = "ae3dc7e532dd3defc4ece73f04fa593d4108951e28118e47d22ea4469f90981d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/lij/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/lij/firefox-112.0b3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "f14eb0a22303fd690ccde2785a5d97416549def4e3f257ec76b0a2ac02ed52c2"; + sha256 = "2892bb5071818ea646ffb1baef35c1e2afd8a1336ccc61f1ca5c2b16dff898a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/lt/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/lt/firefox-112.0b3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "183cdf167e94c15904716dffc6eca228260ee0369327f30d500000468a8bf661"; + sha256 = "c1f2f2ac21ac4aa2baf884e2c33e627a122e5be2cfe28abe7b5955b9ccfa0356"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/lv/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/lv/firefox-112.0b3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "d44dee85e3872fbb693b493d27d7e3710a8a833abaa355f856a18ea66aacf815"; + sha256 = "9e8eefe5d71ec1a8f2584c295e9dbcab46bb5c91647ca54a2e0d8e33e609c598"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/mk/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/mk/firefox-112.0b3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "64e84176db80cba34e4e50762b4760184f4526dc82e2eba91335d95b6b7f3731"; + sha256 = "5a63aa725162b1915b16b94a237f4adec1f15c982ee4640ac3f1af9207ccd2fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/mr/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/mr/firefox-112.0b3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "9f668f8005135354ae1c8f46d2d81e651ee3d7f4427af6837a1e18597d2e84c5"; + sha256 = "b2ada28e6bc7e5805e802aea02ceff5cc84e05716363c1a57cd38ec10fe6a132"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ms/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ms/firefox-112.0b3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "3518682aa9aa1013a4148d465a39211c77d83deb95a33647e5f8421586f747df"; + sha256 = "0205f2ab90af921cd5ba92a1679ef3e2b955f806ab4da4c4817222e25ecbeda3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/my/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/my/firefox-112.0b3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "3a67b0b9c75f19057fb9a9b01e6fe82f95a9d2db6440ae8ef912ef8e7e340722"; + sha256 = "6c8620a171bb486d5fb110568f2bcdadd31a012a22d886762286724eb4d299f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/nb-NO/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/nb-NO/firefox-112.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e552c61e6b6989359ff9c3ccaf1356cb454f47ae37d93504d74b6638a5a0e93a"; + sha256 = "d2ff3b33732ecc1693f4c93f63a8b750cb25c02e5f2df91a6266ff1f54c40692"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ne-NP/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ne-NP/firefox-112.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "511eca660eb81a5b588fd74f41a45087209ed46ca84889bdb2810f046a199218"; + sha256 = "c3b25f66028043244a8da57d7d9e091c6a8d8cd0c153a157839b4aeaf66e743b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/nl/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/nl/firefox-112.0b3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "8aac8ebde87b78016f6b387fcc89c13868cf6e22e2ce0019a9360ef39f869963"; + sha256 = "66af5afead6aa2b596342d117e6d9aee3df99b5e87a4ff765cd62e98a74c28ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/nn-NO/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/nn-NO/firefox-112.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "23a51c27dc4b3e445ab96248ec8d837a84f7bcec813f3c7152d3ca9a0aaefe1e"; + sha256 = "fe48675b369b36eebfd6c25907bc12b29540698f8fbd13bc111a85fb80cd710f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/oc/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/oc/firefox-112.0b3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "db42d7c58e2258af28eef21264775c01821f35502971ee1ae0a55a9e86ed3abe"; + sha256 = "0a1ef700dd183a4d63fa74fd69e633e808b7049dd6594acd39e99d8a10e4eebe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/pa-IN/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/pa-IN/firefox-112.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c8a33f5837b14f526583c490d69cfa2c22570ecf86707d2a4d8dccfedcfe2263"; + sha256 = "d80243b94c87c6746fb905ea87f17309d646207798e5b9641f19da7a63c2d287"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/pl/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/pl/firefox-112.0b3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "27d144f7981c2f24ee8593ba7dd9d4e14148caa6b3c410f5330362b80e6b166c"; + sha256 = "7960a3ca66d1298f5c8d42211e59cbf7445f30f61537bb52e3d62819b8e1ba46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/pt-BR/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/pt-BR/firefox-112.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "39101266685e7d5189c14be4d8074556703da991aec3c54bd9706b7c40f8c0a7"; + sha256 = "239bb21c476967ac08019c463f216a6c0af2ee25a6180f8fea7ddbf98e9e141f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/pt-PT/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/pt-PT/firefox-112.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f5ef13f286e8576b9173dc01fde64661b3bdadc931649e0222e5823b13226330"; + sha256 = "ace072d1c550e9589ff8fc24d12babb625eb72b87fc8a8dbb772675fffa04a28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/rm/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/rm/firefox-112.0b3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c931759b0427b575f8bac8cf5b4b5885c6b87a12d4d352bb250c564e8dd8ac70"; + sha256 = "933fcbb0cf009af7f6ab8859e935345475a7dbcd64b550ede2ad2ec08b6d349a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ro/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ro/firefox-112.0b3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "8ac650b0ff186988a0d6f4d57f25bd10f7c7bca64de51255ede8fda5650cf951"; + sha256 = "aafd262fdfd1565babf682ca8f14d536323a56c580cadfc241b85ddbcdcff9e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ru/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ru/firefox-112.0b3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d87fee506fd1cddc271ebe57d6ffded155527bb8d0e13e5d1b09bc0b3f9a9934"; + sha256 = "4b0105bf3f127b672caaf6276d7a10484a3d96b1f59d2af08532dd7a7215f002"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sc/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/sc/firefox-112.0b3.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "e3823b4d874db0db6d204d73221d808d4be165cc7123701f2070f835888121a0"; + sha256 = "df94931cc329f8b8ee3013dc95f6636450cc9338a4328d0972fe770b7968aff5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sco/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/sco/firefox-112.0b3.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "3c96b18a9cd9335ca260bdf63081c6045caadc832a299d446ce3e4c9650983ba"; + sha256 = "d456cc9c89b5746a56c5b446a97c6495a55aac8e18a909a55d3403cd6bb1b2e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/si/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/si/firefox-112.0b3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "479b46f22f1cf1d23491a736f0fa4ff5912ccf06c369ad7d4d0bc07859aec05f"; + sha256 = "99f9511a925b16777df8e1950c56ce68e111bb0ac1eb332e0f7cb6f4de534a3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sk/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/sk/firefox-112.0b3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "6c64b98d54474ec6baef932e9ecfcd3cb573e7d6c1392c6804dcc2f53e3afe38"; + sha256 = "8aadec2e42537328b890bbcaff86d14a194abb2bd850986cac9dcf21ba7f4ff7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sl/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/sl/firefox-112.0b3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "10e1f08f4749baea435fd86757bab0803e91d06a6a861266edfa3cb31bf9d933"; + sha256 = "4af6d8fa4ec9021bddb98b0b97f940f5e8cf3676e1a32549ed52f8dda3101c7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/son/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/son/firefox-112.0b3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "36c7cbcd1484dfeaec8a705f88361907a20c445158d369f8d3cfcab7c62ce3f9"; + sha256 = "77016e2537c61ebbcd17fd72d4ff2164ab6bfa7dd0824245ed088af842381192"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sq/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/sq/firefox-112.0b3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8546e98da2258e93cec5f0e8644e9527ef350752f5b5c00bbe2c1cfd1714ea35"; + sha256 = "96f56bee14f7f04bd2996795eb2b805ac45858e7021878aeef9fa4359cfc0435"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sr/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/sr/firefox-112.0b3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "882a878e500fd9263beeaa798d39f961d9c5d2eeaa4d888e21ab1ee1af40d4c8"; + sha256 = "732891efa9a44ef318631031ec04e8b7697cb4cb446acbc95ebaa181f3b8f352"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sv-SE/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/sv-SE/firefox-112.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e3abe18d5c611f9cbbd01d412548ce105e5adae46f1d91c07d0e0b2a9c0b5ea8"; + sha256 = "d36b1964911bf0d9ab1263eaf74aebe6d9c8cf441957758b53e7a89beb95d583"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/szl/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/szl/firefox-112.0b3.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "8922c6f901b721b9a04a7e312f7ed2f5356b7d242f1eea46e56e451a6d857704"; + sha256 = "4bff66e23e172c3aa559ac30556a4037ad6ed5c677dbdd9600204eea3fc25425"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ta/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ta/firefox-112.0b3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ded7f0b62950c98976dbdf3aae278a9ce276c4af426348584d6ffc64ffb21af9"; + sha256 = "4903f9b69bb1ca205ea80846cf613bc647895b40af291ed5646678a55e2e18be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/te/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/te/firefox-112.0b3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "3cfe5876e38f2e27116c7b6d967307075bf29785b62c8c654b82e10b20ff90b5"; + sha256 = "a4abc8854330301bc802a3af9cd18417a112f0593dab7d1aecb405dc36ed7af4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/th/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/th/firefox-112.0b3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "481bbc770777e74f89f9be8e9754ca09ffddf7d27b57fbb69f51a7abb961988e"; + sha256 = "4763629e8af04123a4e7b8c78d0278865e8d6f89c3f6a3cbe9f651ee4d88e7fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/tl/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/tl/firefox-112.0b3.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "c6b8955e9e3dfab1df30dbeacaebe6996db8396233744066b097230bd25b255e"; + sha256 = "497b8b0734acf68dcbcd178b2497cc8ac6035b6149aa6d65d9bb8bbfba9c60c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/tr/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/tr/firefox-112.0b3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "5a9b5ac4883f21123e538b90ca46240e7049b431aa3600e7482258b6004e7860"; + sha256 = "794523fcee761f9bcb6280b0f128593efdcb09ff9b20d88440a2186119605d8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/trs/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/trs/firefox-112.0b3.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "f3783058be21631d7171655374bab478e774a177933f303625680715abffd35d"; + sha256 = "363221e20eca037f4e5634f6d8d4fe5486be98b7f0459357914c55fc6818499f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/uk/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/uk/firefox-112.0b3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b299304e04b028725b9c9d5717f452bcc401704273afe52287e77e6174263de1"; + sha256 = "a32b0eeb5b3129cdae61bcbbb504dcf38642c0e1207a99f548ca6aaf4da4c0e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ur/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ur/firefox-112.0b3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "8133e3d5d0ee4bbc0bfc0a318888fae6550fc991f538c0840631862c5d813ea8"; + sha256 = "fde4b30f65dcf087ea90cdb07fae9a7b25a828de522fd464fa30a6a6e173660c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/uz/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/uz/firefox-112.0b3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "a31eff2ff348d6912cfcdd61a8affcb6df273d0f8bf4d335a30a27f4831d9694"; + sha256 = "8b25e6ee128ca64beeec953984891b771effd17432b5848eccee200cfadfc2be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/vi/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/vi/firefox-112.0b3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4d8b37a549c8563237bb05858fc461ec37f51430502e66d0339d9c05b2e39829"; + sha256 = "b9c97a1deea781928d37118859211b9294af08e13c816017d0782f454fdb2261"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/xh/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/xh/firefox-112.0b3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "41d26832882ecf6d27b60179eade9d3dc8cfe1caf3d05f6d9b427e44e3483a7b"; + sha256 = "a26e56faa92b9cd893d43db669fb7d48b4451df3e0c7011ba1f37aa509cf3d6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/zh-CN/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/zh-CN/firefox-112.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "2d3e6f2e8a1c6ec8ba9e6d1b8533b5509abe57f00f191b4dfee4a794196a8057"; + sha256 = "48ad92a48bc034f00b5b100abc8cb548a74afa5330d44e8582d4dc50eaa6c673"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/zh-TW/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/zh-TW/firefox-112.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "9567f87bfe116e7d87a74a4cfb9a62ff9f7b5836660aabbae4b19b35ac501b32"; + sha256 = "fc02b6787480605a7e6c388a6e912379918dda5c833a27640ba2b81cd674db06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ach/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ach/firefox-112.0b3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "86fc72753eda740d36a7d266a40baf1478a7f2f44215ac3b8d933819bf833253"; + sha256 = "fd6efbb6835cd3b1940d2767c554b288b947d1621da4ec0f521866ce117d3d1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/af/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/af/firefox-112.0b3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "d1e3d273ae8deb2c08cc063cc0b190419429b2c4d31f766d01f287f3687da194"; + sha256 = "2c8ed270f390281869c1024f2859ed31f8f6eb1cdb25111bcc69a5613c824329"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/an/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/an/firefox-112.0b3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "0424e520e5a607486a0b0ca49b990a246885438db5792e5ae73bcc818814d271"; + sha256 = "4701be757ce5e6a0cfaa105228cf058393c0dd9b6be17336aa6878fbb51a5bf8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ar/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ar/firefox-112.0b3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "426e28278444abedc3c89b9a9bd5f3e8bd780604c60fc6aa6d2e3f870f2455e5"; + sha256 = "c4a1fb484d3567a12875c60647526201c181f6caf487d92f344deb7b8175e421"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ast/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ast/firefox-112.0b3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "2fc2fa7d00da97e396dd0131280bd5998bc602fac0d958b35e48ba6717140e9c"; + sha256 = "225deefcab138bc85de7692244a3e4a640f1202e28f9471fddc7d3f1dafd9900"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/az/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/az/firefox-112.0b3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "1a1920482d20fe5eb103f6196213ad1420af52abb06a936a56d63d42437b1be5"; + sha256 = "cb5974e3710ed6a24a79169daa53bdddbe35942c5bc000d9b3a0ad2fb7664f4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/be/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/be/firefox-112.0b3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "b468fa07d58a4df4084826567895b7686736e248021f01d0b81e73018c8f793c"; + sha256 = "202fb330e07ae5fabe19f4e30fb6e617598b8d79b1485f2355f09c5d4e5e1c4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/bg/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/bg/firefox-112.0b3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "3a69a522c7984a774e58560188b78530f50cec56510d3f3bddc07e76d17d4116"; + sha256 = "5a8996968a3bebcfa5dcf9c05f5b819ab0a4463e9e2849a38d301f367f079a25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/bn/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/bn/firefox-112.0b3.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "2ec4fad1bab1ca7141c4a77d30ff0295be3862fbab5d601e57204e01787f9d0d"; + sha256 = "1ba44bc65faba2ac0bd66dee11d446caff87ffc45ecaf1a417bcca87ebc6ab66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/br/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/br/firefox-112.0b3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "7f0952a7c568e2729846f9adc7efd5a68f589dd5a5ca33e085048572b16e0862"; + sha256 = "36013e74a785dd5f106adcc36721765f6f91ea7553947c63b970f11390d8b5ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/bs/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/bs/firefox-112.0b3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "0fab3a39d619f1c618df1da23c7bf38402c14d27c2270a7bad355c2e4153dd62"; + sha256 = "ca7d6a7ff5694583b20cb10e2e9b5695254245243fe916493bacbc157a8ec027"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ca-valencia/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ca-valencia/firefox-112.0b3.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "b0ce82c7d514798fddce87c7b511636738618d849395797298d692e3c80f194a"; + sha256 = "3b74ecb0d7a297a11f9f0baa177ef9cdb1bb3c16c0a2f53833c7b247cb52285e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ca/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ca/firefox-112.0b3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "3f65999a6d05aa92ca2e7c6ee0f2b5d998ca024b02de219330dfd8d55e3975ba"; + sha256 = "c7f258bf9286e5efd49e85dad6483b6bb64f6743d869d5c89ccde1840cb9e737"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/cak/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/cak/firefox-112.0b3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "34b9ea098d35a8b3e851ed21ff40883f9e4599401312a03b2340ed6c5b078c0a"; + sha256 = "75ba9cdf0d382afcb9172c4103ceb14468c0e25f91c1409e233cd471053dd35f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/cs/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/cs/firefox-112.0b3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b1641da89fcc3228ed20ed498480c7fa038c8f71952379ccba06e8fb12909f6a"; + sha256 = "d9268af6747ae4dd093167d3ae221a5fe91a2c3f78614fed313794727bd0245b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/cy/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/cy/firefox-112.0b3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "504f7a2da4c55da4e8f23f3720957c4c4aef2c5928b828eb1d755add0e2ac662"; + sha256 = "7e51ee320ad6f1f46f9a026cbb38a87d49044b69022faa39a32912c889646175"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/da/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/da/firefox-112.0b3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "98d0809c79b84c38a0f3abb9f0f671b1ef9a39af98e81119cfddd57f5896a420"; + sha256 = "574441bb9df851311e86779f0643975266ebf1a8698191c5ae66d06daca6f35a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/de/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/de/firefox-112.0b3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "168f86a353e3c957d8f06456c0d812d77594650eee1f9ecb11abde4b3b233c40"; + sha256 = "402e3a3f52b529e1e16fa5c594235dc80433fc7372024a8e73df57e0597a78bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/dsb/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/dsb/firefox-112.0b3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c8b55f26695561256477ba1cae2a96834b4ec5b4cd1335e15354d60bb87f50ca"; + sha256 = "b7f23e90d48a112fb003829a6f5e7ba26495ba911f80401b7dbfa56da979050c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/el/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/el/firefox-112.0b3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "f421644ddd383dcd5ddeda769e089100e9fcd411fbd905de3586bc65aa6472e3"; + sha256 = "ae6c8b95e69c6ac2055e3055d66e8311f6dfb8712ec9b2103fdb955d351c8a2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/en-CA/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/en-CA/firefox-112.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "43ce0669004841271ad56df70bb40737566528fdd76039cf068b9fb0fc5077ee"; + sha256 = "e79630b19fddcfafd6be36d9213820feaf6c4f317543495a749699e6c03587f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/en-GB/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/en-GB/firefox-112.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "5dadea5f50c87add40108d844dd3a9dca7848371e0d23e64a2a012339769b671"; + sha256 = "56191b9c44c2d8bc6239c01ca9c8de489604bff6b6a38a5d2294f3e71ed9835d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/en-US/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/en-US/firefox-112.0b3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "fd9070fca4f57b1fcd89bcbcd99af77baceb3a1cf9f6b913ba872b6a6bef7981"; + sha256 = "b1d9e8244ddfdfae0d649f874afe2f91e56146ef141287e80d84967e950ae49b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/eo/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/eo/firefox-112.0b3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "2a3fa752b56c66a1c263c895e67b7024dfe3a096faaf0d02d579340b85bb3997"; + sha256 = "e5eb0fbabbcdfa8b833644d5f155faed0345d5aecca49a04c74e6eda618d873f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/es-AR/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/es-AR/firefox-112.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "09f714d25a3bbec50acbf1c034331c1d874708efe5a9e2b6d950e62190983bf8"; + sha256 = "6aca750cd572e1634f76328cb136c40ed6c1b0d95d40af4661c42484b603f15e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/es-CL/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/es-CL/firefox-112.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "b13ca7876f86848c299631e0748038beab882a79d3d73eccbbe12270ec2e168d"; + sha256 = "0f05f255ea1f7219ba59b81cb4f955ee85c01aed90b03d2ce6a2594c3fa0b65b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/es-ES/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/es-ES/firefox-112.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "11c4e97e67a10d83d5449ff5997086e5f5841be8967e906165e3e0d73c3b4361"; + sha256 = "b26beacd1f722e1ecec27350a5e426e743c0ac095935704e2a930d2a13ee3f9e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/es-MX/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/es-MX/firefox-112.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "5d816f8ae4d9bc9832cd504942c8149edd6c9b74c5c2e0badde60650405f0449"; + sha256 = "8d9239e6ae5f40bf13bb7b097deb0db6d5ba4b85bee304116209e34358ccd3da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/et/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/et/firefox-112.0b3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "552ab594c7bfeba7349be8e41893384270aefc1ecf2494211ea545de1cefa31b"; + sha256 = "8cb6366cd787e45884a381acbf9c0feec34da769c91a13b131ff48552e75d45f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/eu/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/eu/firefox-112.0b3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "f6ffda74095133401b9e46c106d576b7bed246496f36735832e8b61ed19e900e"; + sha256 = "06c7856729f040335bfbb88faa933e716d6ebd50e584bc9e036aec05cf62af8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/fa/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/fa/firefox-112.0b3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "e6e180e29d549c567258e92f8473058ff93c0f06387ca8e01110860d70533ed6"; + sha256 = "ce29544712a38833c9df54c6de81c3e305de8e12612ce348fba379779c3b3736"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ff/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ff/firefox-112.0b3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "68ceb489b4644c248318497e03ae30a6bb001c3b04acd0c6090fa5c254ffd210"; + sha256 = "7b822538f42ac95aefb9ea46e19cd6f5f59b79ad9ee09a6b9d2ddbbdb7ce9a8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/fi/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/fi/firefox-112.0b3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "4ce32db7753ffa71a3fdf0f53f5e40dec079aa4ef853b0feb106ef61d77a542d"; + sha256 = "64e39b57ab5564d5c28cb0332592aedd6d2c793b95e82ece546792d7dfb2687c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/fr/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/fr/firefox-112.0b3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "05bc65ed25e706c8986399e8b63de60bb0ffc083597076026c765f730a0eeca0"; + sha256 = "78491283531d63b15b00d980e12d2708be521c2b5a55bd0cabd0d9c293ea8bdd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/fur/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/fur/firefox-112.0b3.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "53f110d7eabae149501169be92f6440a4fb6eb78117c9f4af85706392d79e28b"; + sha256 = "e6bf78af33ef8364a50a4de4693eed99ed44da076e5c13ae10d0ba60de313a8a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/fy-NL/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/fy-NL/firefox-112.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e000e7bcf9895be56486ad6b4c38add84a5040a03e521971ccecea26f3a3be96"; + sha256 = "76a511d238f1b1b4bbdaa00442af01d01b561b146c6dffbdbce4ded4052bea0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ga-IE/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ga-IE/firefox-112.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "c8521aa00842e685ab031a73550515e78c270816c6c2c315b7262c8dc607f3e3"; + sha256 = "39cb4c00166b9b7f460983dde113e59b8a58186400624d563cc0e8eb1e9666a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/gd/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/gd/firefox-112.0b3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "19e8b5db0f621f278cfdf4c455b69ed3dd185f06a5e26a8221495288e39faa2c"; + sha256 = "65c7bda40ac1d50b9b07153af2110c50fbbe1fb601426d0ffb4ad176ececfae7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/gl/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/gl/firefox-112.0b3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6b00b50cbdbac600bb052c26cf3c8f58f39ac9dab4c1a6216f30ab551593a825"; + sha256 = "c8f62afc3c51e4563a06f111019750a0f953abeeb01e2685c93138da6fca1b77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/gn/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/gn/firefox-112.0b3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "954b4c072c73b536c6983ef255c714dd68faeaa024618ee50c8945185d290935"; + sha256 = "e8c897978b7a943673ce7f45475b5743de57359b4483edfc0e1fc5a39c98c247"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/gu-IN/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/gu-IN/firefox-112.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "90c07f61193d579227d3a29d366ed1478a16c1896554fc987f43624fc5f09f36"; + sha256 = "8bb1463039a243fa72412da9ccd9fb8637c980e48bac95db701380056405ccf5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/he/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/he/firefox-112.0b3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a5dda773b34679a43984ce90c7cf09b21d7b6ce113fc77693f4620a4fc2d7caf"; + sha256 = "453a1e79be7733c1b3e757f63966b66a8e253fe6933d4cdb03078992ad005bb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/hi-IN/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/hi-IN/firefox-112.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "547b62ecc5fcea06bef7d9ae8289049c923a17a8f93d9ac13dbc44a1052a9ac2"; + sha256 = "6e38248bb9c1406c97ac98df120ad13d80d47e84b2038300448bbd248801a114"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/hr/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/hr/firefox-112.0b3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "49eb4f4f4adfdc140dc78e931c161cdcc81665105c65b42c8c42a35c80a30f24"; + sha256 = "86cf98d857b948f5a154eb0c11eb3c8568cd52b34a1cbc2ebb5317bb4fb1f5a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/hsb/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/hsb/firefox-112.0b3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "8c15c32c8ef5b44efd66948a8f0c9cfcaafecddea8ab0d5a1d3af7f7cdda60c8"; + sha256 = "284dfd8803d3b50ca4c872b5823b24719d7a96cd537fa9638404e0568385465a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/hu/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/hu/firefox-112.0b3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "a376b005b88e238d72862597462127dd8a1086c072ca133190ecd5ffa31cccf8"; + sha256 = "f9c2dcfb3ed57e7edc09b9c3381828b1987b6f7f5fc311ed7bc4d3231ba5dc2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/hy-AM/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/hy-AM/firefox-112.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "8b8959d88b066a29c0fbdce3674a613840d8b6ee691f7e7633e44a05ad0f455e"; + sha256 = "fa5474508ade068cf51dd20f3d0ce8fc9e15c5e9df225f4825e93b4ea745d0a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ia/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ia/firefox-112.0b3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "ef61b675d573ae28886f99cf8dded130049b7211abaeedafd9ed1cd7b6caeefe"; + sha256 = "771273640090beeb82641e79d732ddf37adf84d724b931ad443736c58ff9dd3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/id/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/id/firefox-112.0b3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "4cad3aadf08bde466e269538bb86126ba24bbc84434ea846148124dcf8aaedab"; + sha256 = "cf6a81709b810b40aca35f34e81fc9f7a356b83098697980ca9e47fb209797d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/is/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/is/firefox-112.0b3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "138d0488679d1404a9008726c14285f84b21923b55fbc0acb13bbaa5bbb4a07c"; + sha256 = "45b72d161d44e8c84c4938eccfbaeff2fd0bca26132dbafc67bd344bdc0f408a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/it/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/it/firefox-112.0b3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "e9a48a0143ad94b8d896379d90e8cb6345eb9f83013c0a5af8a65a8a82785e26"; + sha256 = "f7bcc97abc9fc855c0e63eb36994bcfb0ec7867ec365e4b00c197523f4ea38a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ja/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ja/firefox-112.0b3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9308c18b92d0632044b08b8f379ddc844027c3164e3e7ec0a2334881ddc91bdb"; + sha256 = "6e0b15e2e06dbf7efce749c78ea4c8e2847b140fb1af0e4fd47cbe24d791c568"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ka/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ka/firefox-112.0b3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "dff35b11c31c2b88408124ac9bb18dbfacd8ed995757fb1d029c6093cbb0f876"; + sha256 = "95d80e66bf4ccc98389eadaa9b4c27a658ee5f3557cba61f222a351f9dd5eb25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/kab/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/kab/firefox-112.0b3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "8754269b4a19381c8d937549753bc28da50b2a983e50c30ee892d59a577b8466"; + sha256 = "5fb3bd857d3ca6f01b70a8b57a01eb0d662e2fa48bfd0384fe83ab504fc63eaf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/kk/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/kk/firefox-112.0b3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "ee6c23c675616aa7914eae572c459ac0d24414e2a8eeccb02c9e1beb7d723a8c"; + sha256 = "5291f1066c14bdd2ae0fd4d7ed27587bf3700aaef9d3e492cfd2fa70cc38f4b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/km/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/km/firefox-112.0b3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "2b5e981a9e4f6c9bf35446c40c7089d050a26e667e1c09de663a1e42561fcb4d"; + sha256 = "4f0ea7cc4d8f8cbcb531bf833aefd0cff184f8186edec7f8a9f79863e67ade65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/kn/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/kn/firefox-112.0b3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "329b868009d91299f6e6986480833088ae3772499760df05c593e09af7cd2372"; + sha256 = "ceef5951674c987373934fda3d9d658f66a4c302eef2cf8048a59ceb6a1ab23a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ko/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ko/firefox-112.0b3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "86e1b61b8ea6a684fedd564a7a77306f86a528a1063ecadacbcb6472969c73c3"; + sha256 = "a76f87be07432079ddc9518ac7b6c6ecce4d80ed7d7f9b11b81d4e191a3da33e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/lij/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/lij/firefox-112.0b3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "e26f1d2c2907b689e9c3b8e1eec263c6af0ec4a45b6e5a49c60bd9c4106043fc"; + sha256 = "9d128dc913a66b2d4c9723ef96616306c52e2a89fda1c6cf8a84b3e8db5a8c66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/lt/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/lt/firefox-112.0b3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "3611dd950e4e075fd6cfe93cf1971b58b2646338e496f0c1a6c5ce1fe53d75a0"; + sha256 = "8a01dd960b2589f08bb984993b31ab46b424521b00ce05d427759a3dd2623558"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/lv/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/lv/firefox-112.0b3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "3d7297474479195d1f6f7b84bd10ab5e3d90d5f5f125428f90030e9d872ec13b"; + sha256 = "f8a87f1e0f476764610aa7ffa1f77569f35d6fc191f51da8c0a2d512f881121e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/mk/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/mk/firefox-112.0b3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "abfc67f3309176423b9bc7940ea9051cfe8d9bc37f8479dfae6aa34973c35ed9"; + sha256 = "566c249066c839d2927bc8c851fa26e1abbd56b8594220ab0b1b8e2870dba11e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/mr/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/mr/firefox-112.0b3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "7f6cf8f198258974f8eb7dfd8cca9863ce257ef45c9a8d9bc8e47a0a69ad29e5"; + sha256 = "8c13cc845f43a58f417944deadacd95ae097a41b81ae28f80bddeac8464ad7c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ms/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ms/firefox-112.0b3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "a2ee5ace0a082f8044311d8f19be2c85e0a9240c0c0b0fb41de360cbfb089d6b"; + sha256 = "ae4acae5d58a92d6811aa6d3cefc41441a91973d218f719dc1602c6324602923"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/my/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/my/firefox-112.0b3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "594a0a72f9e73ae1e0e3457ffd5c0ca9a538cad5b449653ed01bc134a0d9f486"; + sha256 = "500ba72bcf205b037638bfad91e852a799b0870ffa79ad7c0dea70a820a41fd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/nb-NO/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/nb-NO/firefox-112.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "231b5da2221c1b7578c9207be5a66611e4b9a87997a6a9c2eec77ef335875176"; + sha256 = "3b46885d4191b2eecd7cd02f014bdc34cc2142913e0dc80af8f967eb6b5a8cda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ne-NP/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ne-NP/firefox-112.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "fde2520f5560db603f30283fc896a17f6aa60ea1e5b8f2254fb6cc9feb62d850"; + sha256 = "c161443c4af482335ba1e92186fe6241d4652be9382f3b6d04dc7e1b5998c800"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/nl/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/nl/firefox-112.0b3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "2ca2eb4aaccd6a79f4e777a68bf583103f22b97e9dc2dd6dcd8e566bceccfa05"; + sha256 = "4c2dff3098bb943b761e00f5f2677b79f4179eb194d1fd09e22c5097e27a0702"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/nn-NO/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/nn-NO/firefox-112.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a1385b042ec255f9891ffda4e0ebb99bfd44449a091d3aeaed1443004fee8df9"; + sha256 = "51de7ca0c7142615f72a60adc7eda0c776c81a4be7298e08ae3577f0d7180d78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/oc/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/oc/firefox-112.0b3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "6cc029e84d57cedf5c605117ad1cb8fae390b725810707bcce58c4832f9f0712"; + sha256 = "7bd6b02d7b24f32e5726076b4e1fc4e5872cb12b23d9e3042e26beff07c76f30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/pa-IN/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/pa-IN/firefox-112.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "6ee37768a1724bf68b4f4031f03c2a2307fb9c16d34094d476b1ff14ceac4b7b"; + sha256 = "0a7a19e006413bdc77c5230d6c64b523615cc06dd4eb82175beee902c4ad036b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/pl/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/pl/firefox-112.0b3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "444ce2cdc080c1a61a4c2c4ad007b84dd803bd7f89e44b768af3a90d089dcdcb"; + sha256 = "4df4b9e7adb488784f5100d126a4c6ad71bc0d8b4ce0d3ea6e48d7f75d54ef4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/pt-BR/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/pt-BR/firefox-112.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "c1aa3fa50b5283c5ce19f65e38c919fd98a6a75990ea04b4ac6efa2633e77c4a"; + sha256 = "e5546555d191d194a7032547c4fe0bd80b105589306d075afe7a0b22fdbe6d15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/pt-PT/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/pt-PT/firefox-112.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "a8e057612f8d1851afe3909f65a2c834ad14a3163c2378e75710ce31582fa4ef"; + sha256 = "23f09232a8b863eb738af2dabbd1f94567641fc17cba85e3664a2e3182eecc48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/rm/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/rm/firefox-112.0b3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "2fae5f8a4cfe624b0839bb5041f39f9069968e415fee2a2194a915b944e11223"; + sha256 = "d01d41c06a2e1772607e6e97396404d19e17d19d3f6cf1ee3c001078ddbabb72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ro/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ro/firefox-112.0b3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "4b613170a3804636921d98192be0274c4003862a9abe73db90b3af1f8aaaf119"; + sha256 = "2a3e6306f376242af8cc412ae23abb0cc80b1dd31093680ba89be10496fa4c70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ru/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ru/firefox-112.0b3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "4d98bf5c649863726a6aac51be8b6302ec488bf733182eeba68f613f262ac272"; + sha256 = "e541d7b0c8e7c2d808171483ad2b6c074cdea110cb2108161859097657c8c3b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sc/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/sc/firefox-112.0b3.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "dd681b2f31c328195041dd9fe317d24b1dbccff854c1216d4ca6da416dfbf666"; + sha256 = "eb72cfb24e9f52ded6ad44a3e070f9a6c351a6c1902336b0fa714e3eac7bda2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sco/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/sco/firefox-112.0b3.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "1f0ad138c378639fabbf8e743a17d185eca531642cb12581027274e5c9ca08b9"; + sha256 = "07c3eb72214d2b4cac0d47edee71aa46f0b821eb2b6d5bdd0e80c5e12031d160"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/si/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/si/firefox-112.0b3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "ab295cbd4d3ba4dd4dacf54410f343773f0b77d626b8f6fd60bbff037f6c990e"; + sha256 = "07bc2a11048cb769351d1bb9d5a34b8ecb6b9d3c38f9ef678324eb18d223aebc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sk/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/sk/firefox-112.0b3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "0d15d109730e3344042eaf2e8889af553b1d5b5c19bfcfd7a7792f445fc85d79"; + sha256 = "4ea7716fcc9320d6fd8b760f198bb6ad52129df43395d2b5ccd81a23611d54c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sl/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/sl/firefox-112.0b3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "9d76acd56e898fcd44345c5494b5e955cd45424d6decc2ed6760d0fb2e005b2a"; + sha256 = "4b5aa23325f13265d45527d2f38c14060943a046e3fb0d394dfe2af3903772a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/son/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/son/firefox-112.0b3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "c54714ea09a58a9a74f42bd790ecf132a9d47a616b9a8919dec637a1d44aac7f"; + sha256 = "fbbe7a8d06487eb34b2459de48bc0e9f5751e42bbbf3f8e9dd8fd1d99ac45b43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sq/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/sq/firefox-112.0b3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "63f9e4e802ed33dccf69776ec9943166ede4bc776544844d9ec2353b52a25cfc"; + sha256 = "7daba093868e7636120d0340b0283fcddb7cd88db11c3525771456decb0ae415"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sr/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/sr/firefox-112.0b3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "619add5c2769b48ee10b3b41bd417526b2bf33917e9b5842c0505b76a63f2b04"; + sha256 = "15b6c1412c86309a7d86107a771d8c74df497e0a7edc7a6e5bc23b753b47a5d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sv-SE/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/sv-SE/firefox-112.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "7016af55f36b24571a40d220a4052dc452f1e5db95a3f6afbca59cdb06f0d6d3"; + sha256 = "21ffcc5c44079186ffd49ac61c00832118ce39adea2014a6ce79205d16d5a111"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/szl/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/szl/firefox-112.0b3.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "d1e04b8430fa4fd5539461526197615b29d3c5502acba6ab1cc73b608872e25e"; + sha256 = "2d38fe586e4101ac6167080b811f82d8f4cc06c5e5e3e58d5aff2818730c6614"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ta/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ta/firefox-112.0b3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "de14f539f653a6b6591914e9a5c28ba2aa15a2c785a1523e245b45cb4538d958"; + sha256 = "44137e81b556948cf22ff52b4482185d50ad572410848078854fab6dd1f1ba8a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/te/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/te/firefox-112.0b3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "ad76c68b3d42f153a3be66e9c7136144e80d8d9b5a708f038eed2c9e79012fce"; + sha256 = "b382ab85234da946f364711911efc6152bf7057e8d3a498b1346db815344391f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/th/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/th/firefox-112.0b3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "afc74679a4459a83bdc4eef2233c10d7e73ebd224c82fc7a92e3091daa571fd8"; + sha256 = "dfa0d72ccddbb62c4ecdb5aaebf2bfe2019293fbb82c4861d496976cbda4328e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/tl/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/tl/firefox-112.0b3.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "f934e3c405586e6bf7afa1e0f7c0eadb2d80934c1053042b6860776e1d6ddc99"; + sha256 = "84ddccb78c589a725e8c2d607cd7eba65f5dff3fd2acf29d66d0464ff135ed93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/tr/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/tr/firefox-112.0b3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "208757d985bc26286f5110e7f7f792eaeaae0c66e787549a20abbed223b46256"; + sha256 = "041eed5a64b2a2c1638c37fc1a497c976c1c56065f4ce308f46edac9d45f164f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/trs/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/trs/firefox-112.0b3.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "6e905c7fbdc204acba757ac6e8edbb64b167dbb96983946281474c1a4b1860f0"; + sha256 = "deff021046e8ea1cbde7d9e8ae2aff834ebcc206f5abf143eb77a3789c191ddf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/uk/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/uk/firefox-112.0b3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "bd560a5e68b99505e4ed22f7dad5fa092d50fdeb6fcdae8cae79482f063a0717"; + sha256 = "c1e55a63ed9cbbf52ab0604d13c4a7e2161c9f1b59a8688a02785cb340e550f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ur/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ur/firefox-112.0b3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "2fef7230abb9d3c8a7316d1845ddeb18448964e18dd3e2d42fbe97a0fd0b0914"; + sha256 = "4ea19582fd6b96a2f4617bf499b8c3c07b42ad4cd1b3858cae3698c36efcdecf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/uz/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/uz/firefox-112.0b3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "e41b97e5330293e90ac8144201c57f8c0790498974dcac76f6619fca2ecc894e"; + sha256 = "e25aee3dd0d0e219dfc45496022ae52aede9ef757557a532becffaa67f529ac9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/vi/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/vi/firefox-112.0b3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "96058e17e04669bc6be5bd2a51397a6507c724409f05165157b9f8d8a0624c15"; + sha256 = "0b292f41a14c89e769aee963d411ed5ca0e29716d2c3793f0525b7f77b1590e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/xh/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/xh/firefox-112.0b3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "819d77f589915cd2d8b93ef56c1925749cb9adb031ee79f1e9ba5d3bacd67645"; + sha256 = "7ff0aa0707c0c4bd448786466cff1d51c38cc00afd88b6582126b4038f109345"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/zh-CN/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/zh-CN/firefox-112.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "92e05721680fcafa7fe089574af964876510d5263ef8dbfeebb608aa0b172002"; + sha256 = "53f0b6d73fd03fb86283ecb55d144dbb261a1b0d17e1a4a8d3a322bd870d0248"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/zh-TW/firefox-112.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/zh-TW/firefox-112.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "008962e0e26fcbdce8306ae9e55a858539a09f653b284d9d3361ae44b6de4aeb"; + sha256 = "2f2aa9ba12db48ccfc3fce025e676eee84d23728dd28f2d94ed76ee427410a65"; } ]; } From 0d44f838ca622cd967d86c16aa429dcfa2c289c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 01:10:14 +0000 Subject: [PATCH 03/81] gatk: 4.3.0.0 -> 4.4.0.0 --- pkgs/applications/science/biology/gatk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/gatk/default.nix b/pkgs/applications/science/biology/gatk/default.nix index 7ace47804828..43e5382b5d50 100644 --- a/pkgs/applications/science/biology/gatk/default.nix +++ b/pkgs/applications/science/biology/gatk/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gatk"; - version = "4.3.0.0"; + version = "4.4.0.0"; src = fetchzip { url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; - sha256 = "sha256-AhXZyWbAXM5iwqxkYkMlqYUN838BjvIf5X95MVEfJ2I="; + sha256 = "sha256-svOtIS6gz9nwVgVmVQbk9z6Ufyobpn6bFbZY4zurvUI="; }; nativeBuildInputs = [ makeWrapper ]; From 3eea810b5e4ff0226d0f4d7c072918866247d72b Mon Sep 17 00:00:00 2001 From: Philipp Woelfel Date: Fri, 17 Mar 2023 20:05:36 -0600 Subject: [PATCH 04/81] Update to latest versions: pdfstudio2022.2.2, pdfstudio2021.2.1, pdfstudioviewer2022.2.2 --- pkgs/applications/misc/pdfstudio/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index 6162207693be..b5d49aa90212 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -31,23 +31,23 @@ in { pdfstudioviewer = callPackage ./common.nix rec { inherit desktopName pname program year; - version = "${year}.1.0"; + version = "${year}.2.2"; longDescription = '' PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio. ''; src = fetchurl { - url = "https://web.archive.org/web/20220909093140/https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux64.deb"; - sha256 = "sha256-za+a5vGkINLFvFoZdnB++4VGE9rfdfZf5HFNw/Af1AA="; + url = "https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux64.deb"; + sha256 = "sha256-cc8YjrMsYZqgmwp5+AA+HsqzjxzFcTT/ga31NQz/OWc="; }; jdk = jdk11; }; pdfstudio2021 = callPackage ./common.nix rec { inherit desktopName longDescription pname program year; - version = "${year}.2.0"; + version = "${year}.2.1"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; - sha256 = "sha256-wQgVWz2kS+XkrqvCAUishizfDrCwGyVDAAU4Yzj4uYU="; + sha256 = "sha256-yELpza2C3HJJIP+ZQP7x3Tfez0Nl6ctCbHCmTmpX3jo="; }; extraBuildInputs = [ (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 @@ -57,10 +57,10 @@ in pdfstudio2022 = callPackage ./common.nix rec { inherit desktopName longDescription pname program year; - version = "${year}.1.3"; + version = "${year}.2.2"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; - sha256 = "sha256-B3RrftuKsPWUWP9hwnq4i311hgZgwZLqG1pJLdilfQI="; + sha256 = "sha256-CP2cCmvedQJ/xjZWQ4wj6UZRqCsU5qK3Ta83TUVJyts="; }; extraBuildInputs = [ (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 From 8f6811433b65def7728267f31a84786cf1f0de22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 07:24:16 +0000 Subject: [PATCH 05/81] discord-canary: 0.0.149 -> 0.0.150 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 48ba7275fe74..6e8b299ab592 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.25"; ptb = "0.0.39"; - canary = "0.0.149"; + canary = "0.0.150"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -22,7 +22,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-8DHr7adczIv9FXaxPxSfZPn+8ogWLWHRp9l0JpKhoiY="; + sha256 = "sha256-8huDp1u0t9/kZbeB7bPqQUw8+HQ6rIyzKYUVN02gQfo="; }; }; x86_64-darwin = { From 4e0ac3aabc5830420f7fb41b08f35e0035676830 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 08:26:06 +0000 Subject: [PATCH 06/81] librewolf-unwrapped: 111.0-2 -> 111.0-3 --- pkgs/applications/networking/browsers/librewolf/src.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index a1a60ff909fc..63cf728a0cbf 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,8 +1,8 @@ { - "packageVersion": "111.0-2", + "packageVersion": "111.0-3", "source": { - "rev": "111.0-2", - "sha256": "0kz365pldyancbq029b3v0wpc1jchzywqjriy6276f1kwssyp8pr" + "rev": "111.0-3", + "sha256": "09vb9vi9rrm5y8ym21g52lrbbp6w4k6qpk9q13k0vxzf26wmwk5n" }, "firefox": { "version": "111.0", From d75cff2ee3bb6d91c818d43d1ba7603bb6dacd59 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 17 Mar 2023 18:40:11 +0000 Subject: [PATCH 07/81] linuxManualConfig: don't build inside source tree We can avoid the need to explicitly exclude it later if we just put it somewhere else to begin with. --- pkgs/os-specific/linux/kernel/manual-config.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index b01805e83da9..8386a555311d 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -156,8 +156,7 @@ let configurePhase = '' runHook preConfigure - mkdir build - export buildRoot="$(pwd)/build" + export buildRoot=$(mktemp -d) echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD" @@ -275,8 +274,8 @@ let mkdir -p $dev/lib/modules/${modDirVersion}/{build,source} # To save space, exclude a bunch of unneeded stuff when copying. - (cd .. && rsync --archive --prune-empty-dirs \ - --exclude='/build/' \ + (cd "$NIX_BUILD_TOP" && cd "$sourceRoot" && + rsync --archive --prune-empty-dirs \ * $dev/lib/modules/${modDirVersion}/source/) cd $dev/lib/modules/${modDirVersion}/source From aacbb6d021d617881630c27088f311a5bc0e2145 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Sat, 18 Mar 2023 16:43:42 -0400 Subject: [PATCH 08/81] tiny-cuda-nn: init 1.6 --- .../science/math/tiny-cuda-nn/default.nix | 152 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 6 + 3 files changed, 160 insertions(+) create mode 100644 pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix diff --git a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix new file mode 100644 index 000000000000..ef501dfd09a0 --- /dev/null +++ b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix @@ -0,0 +1,152 @@ +{ cmake +, cudaPackages +, fetchFromGitHub +, lib +, ninja +, pkgs +, python3Packages ? { } +, pythonSupport ? false +, stdenv +, symlinkJoin +, which +}: +let + inherit (lib) lists strings; + inherit (cudaPackages) backendStdenv cudaFlags; + + cuda-common-redist = with cudaPackages; [ + libcublas # cublas_v2.h + libcusolver # cusolverDn.h + libcusparse # cusparse.h + ]; + + cuda-native-redist = symlinkJoin { + name = "cuda-redist"; + paths = with cudaPackages; [ + cuda_cudart # cuda_runtime.h + cuda_nvcc + ] ++ cuda-common-redist; + }; + + cuda-redist = symlinkJoin { + name = "cuda-redist"; + paths = cuda-common-redist; + }; +in +stdenv.mkDerivation (finalAttrs: { + name = "tiny-cuda-nn"; + version = "1.6"; + + format = strings.optionalString pythonSupport "setuptools"; + + src = fetchFromGitHub { + owner = "NVlabs"; + repo = finalAttrs.name; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-qW6Fk2GB71fvZSsfu+mykabSxEKvaikZ/pQQZUycOy0="; + }; + + nativeBuildInputs = [ + cmake + cuda-native-redist + ninja + which + ] ++ lists.optionals pythonSupport (with python3Packages; [ + pip + setuptools + wheel + ]); + + buildInputs = [ + cuda-redist + ] ++ lib.optionals pythonSupport ( + with python3Packages; [ + pybind11 + python + ] + ); + + propagatedBuildInputs = lib.optionals pythonSupport ( + with python3Packages; [ + torch + ] + ); + + # NOTE: We cannot use pythonImportsCheck for this module because it uses torch to immediately + # initailize CUDA and GPU access is not allowed in the nix build environment. + # NOTE: There are no tests for the C++ library or the python bindings, so we just skip the check + # phase -- we're not missing anything. + doCheck = false; + + preConfigure = '' + export TCNN_CUDA_ARCHITECTURES=${ + strings.concatStringsSep ";" (lists.map cudaFlags.dropDot cudaFlags.cudaCapabilities) + } + export CUDA_HOME=${cuda-native-redist} + export LIBRARY_PATH=${cuda-native-redist}/lib/stubs:$LIBRARY_PATH + export CC=${backendStdenv.cc}/bin/cc + export CXX=${backendStdenv.cc}/bin/c++ + ''; + + # When building the python bindings, we cannot re-use the artifacts from the C++ build so we + # skip the CMake confurePhase and the buildPhase. + dontUseCmakeConfigure = pythonSupport; + + # The configurePhase usually puts you in the build directory, so for the python bindings we + # need to change directories to the source directory. + configurePhase = strings.optionalString pythonSupport '' + runHook preConfigure + mkdir -p $NIX_BUILD_TOP/build + cd $NIX_BUILD_TOP/build + runHook postConfigure + ''; + + buildPhase = strings.optionalString pythonSupport '' + runHook preBuild + python -m pip wheel \ + --no-build-isolation \ + --no-clean \ + --no-deps \ + --no-index \ + --verbose \ + --wheel-dir $NIX_BUILD_TOP/build \ + $NIX_BUILD_TOP/source/bindings/torch + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib + '' + # Installing the C++ library just requires copying the static library to the output directory + + strings.optionalString (!pythonSupport) '' + cp libtiny-cuda-nn.a $out/lib/ + '' + # Installing the python bindings requires building the wheel and installing it + + strings.optionalString pythonSupport '' + python -m pip install \ + --no-build-isolation \ + --no-cache-dir \ + --no-deps \ + --no-index \ + --no-warn-script-location \ + --prefix="$out" \ + --verbose \ + ./*.whl + '' + '' + runHook postInstall + ''; + + passthru = { + inherit cudaPackages; + }; + + meta = with lib; { + description = "Lightning fast C++/CUDA neural network framework"; + homepage = "https://github.com/NVlabs/tiny-cuda-nn"; + license = licenses.bsd3; + maintainers = with maintainers; [ connorbaker ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfecf795b209..366c7316d4bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3812,6 +3812,8 @@ with pkgs; tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { }; + tiny-cuda-nn = callPackage ../development/libraries/science/math/tiny-cuda-nn { }; + tezos-rust-libs = callPackage ../development/libraries/tezos-rust-libs { }; behave = with python3Packages; toPythonApplication behave; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de3f2ba61f0f..def6dd547240 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11694,6 +11694,12 @@ self: super: with self; { timm = callPackage ../development/python-modules/timm { }; + tiny-cuda-nn = toPythonModule (pkgs.tiny-cuda-nn.override { + cudaPackages = self.torch.cudaPackages; + python3Packages = self; + pythonSupport = true; + }); + tinycss2 = callPackage ../development/python-modules/tinycss2 { }; tinycss = callPackage ../development/python-modules/tinycss { }; From 72dd6af7ac52ac257aa523afe7e61a5484f30d9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 22:01:22 +0000 Subject: [PATCH 09/81] firefox-devedition-bin-unwrapped: 112.0b1 -> 112.0b3 --- .../firefox-bin/devedition_sources.nix | 802 +++++++++--------- 1 file changed, 401 insertions(+), 401 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index d0322eda06b0..39ead4ec8b0a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,1005 +1,1005 @@ { - version = "112.0b1"; + version = "112.0b3"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ach/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ach/firefox-112.0b3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "51f1f250a2fff0ee9df3037938a401e49c440adeaadbc919696a2d6899491451"; + sha256 = "e57b1ededa40aa75d41b3d02818b51e036d375113b2ab0741a8fbee1fe9bf13b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/af/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/af/firefox-112.0b3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "bf8a85ba0b579556fe67f26ec19c5d90aab84df81f3fea51247c5e9a9cbbed61"; + sha256 = "cd4e84f83a3b40963beeb12099ac73a6bb8156e9bd570e66f6cb05c64e98f60d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/an/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/an/firefox-112.0b3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "ec3169495ac16d6bb556528ec4b2964b7154582f960e749678a74dd207722da9"; + sha256 = "9bb35806691ab3bd5ee8787f9ff481526e3338dfa3e144102da41919dd31b62d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ar/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ar/firefox-112.0b3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "b32d5a461349f40677585ebb69e377e17274b205849d6c52abf9de5abe403ff4"; + sha256 = "a642626e88dd7deb5772ba7a0c1b51f40c2b66f594a4f86d20f987c8181d00c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ast/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ast/firefox-112.0b3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "aaf15df89db57e72c5376f1ffdb9069d2829de2239d05fa6ff259eefaa6cd091"; + sha256 = "66b15ec4adc0e0e7a488a0f31978cb393ec38368d2e7958eb963df38071b09e0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/az/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/az/firefox-112.0b3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "6de8e904e2cb8aba079b3feae4b64a41eb5faa654b4f8d4edfb5f88bdffcc65a"; + sha256 = "a8d3a28801f742f0df740aa5b990c7e68560fe2b081da82d1e5a83e4ee85366b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/be/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/be/firefox-112.0b3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "3bc70120a61306634634c556cad24a73b64d74d0a4172cb6206df19ac9888b5a"; + sha256 = "36eaf7ae3bd154c000d1ab79eb8228afe6ae2f9483fb78f310190bd747db4e51"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/bg/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/bg/firefox-112.0b3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "37d2760c4fb90c3371c1d8fc4c5d82fe3d04bb873857642b1bb32b0403bb0115"; + sha256 = "382d95ea56473c3966b52dc2f6bda24e4dfb66b373a6a8a99225827e701557eb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/bn/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/bn/firefox-112.0b3.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "474fa71b1c0ab86162f42b73d92857149df19510f4c7a65e5ff8072b47a584e3"; + sha256 = "3cf42bf9169069cdc6d3a0aa87c29e03b433edfd2a23208b1943b5ea46199620"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/br/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/br/firefox-112.0b3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "7f6840772618db61c44058bc4e5b052f521e479a350e0e4dde6d66cd0bf868fe"; + sha256 = "7a224d793a2a6e683b85b3aaa12150aeb3ba3b18ef090fe97282c601a8448bf3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/bs/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/bs/firefox-112.0b3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "b7424e14c2f445503b6f9b5cc2746783bee60bf555bd19e870b38d29166211bf"; + sha256 = "974c55c2c73f5a83e4d55a67069ae631777e88feddee29779ebed76a8996b25f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ca-valencia/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ca-valencia/firefox-112.0b3.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "28e85f3a1838220f88ed466eacb78b9b33b771a3ca5a2e2f92c9f5d1b59fae3d"; + sha256 = "15514539e852b9de5ff89504b10caad0d3226d525b3e3a17c0c67cca4aa195c9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ca/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ca/firefox-112.0b3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "cbd21f6be9a4031115c501b7cf0cfb2fa4b4b44f2183758b870b8a9660052f88"; + sha256 = "82a02c5bdebd8f83001fbeeac6b3536e43c4a4fe80e4e19b325cbe257f8832ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/cak/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/cak/firefox-112.0b3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "8347bdec54a5ec1146b4eda865d4b9c235a169edb6c4a0829ff87d4d3d082191"; + sha256 = "45a890dada14cd04266e545cde19b8efed4e44d3558a8ebf91071fe39d9c56d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/cs/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/cs/firefox-112.0b3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "abc75f49aca885329e0ab657b8a2ae554ad983d6748bc281c87a7b82aa8d080c"; + sha256 = "e6f11d459f19ee07aed63af08147c868ca4543cace39dcce6b25f2d7bee0a9d1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/cy/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/cy/firefox-112.0b3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "82959b89547c41c492925a4d9a2c7e4430c95fc1e97d9072a2b4bc4197259174"; + sha256 = "cd6efb16563398edc9f4f1095fdb6d6b8cadb8d9493268cea65f27db41d19f60"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/da/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/da/firefox-112.0b3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "bb75e38cded06b58203e0013da2430304d896fd6c9ffaafb64704f53e7f87e0c"; + sha256 = "3db61ad7a84158d33f59cd26d5f5cd1550294355fef85e391e89fca8b2c50cb2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/de/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/de/firefox-112.0b3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "017bf08ae063a5c85c938411c2a4b7a7fa1d3cb51aaf64f5b3f640a32794e566"; + sha256 = "6b854360174cd07b0de9421a180fc839842ca77f4bfb8e700eb521fa4f33a93b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/dsb/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/dsb/firefox-112.0b3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "5ee9c0882863df1724d923d2d021045fef8a19a13f7b5d8ec25c649b8238af6f"; + sha256 = "12e6d2e821d7121d307db00160938e71b9b4720d3c9434905d5055982ade3393"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/el/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/el/firefox-112.0b3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b166521a31c6cea9400e7623d43df3352f96d5fb3c0edc6a0a6666462ee6a72f"; + sha256 = "371327a0648fda5662d29566cb2a7a346cfeede13f550ddbef2ded062205be9d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/en-CA/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/en-CA/firefox-112.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "0da1b2e4a928445ee27781bc585f9778394c2e09cb7e2ee0df442ad488aa2f84"; + sha256 = "d3052f9193cf01cd47e24b46ddafb3f4ec91a2736e14716c7ab5999e20dd9576"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/en-GB/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/en-GB/firefox-112.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "3bf1bc8c8b45f99e7166155ed7fa2de7647d3a47f70186fd70f025124d4bfdb1"; + sha256 = "b08f74332230977e284494677fc4e9232ccae00a7ae292188b236db8a1a77c63"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/en-US/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/en-US/firefox-112.0b3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "c54c1f52ccc8b6cf39353bb3c034106a09de1ef5577aa5f443d5094696ae750d"; + sha256 = "7cf065c28504caff212ac1a5951ccf55935d5297d86e7706c6bad8769a057cd9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/eo/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/eo/firefox-112.0b3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "3d6f2b563d63665302c504e5ad1f6f9a4c17a6b0f955b1eccbb81937565113b8"; + sha256 = "4b0d270c9e9b9dfce056346ed759171633220dcf9ce10c2eeffab67dbb042e2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/es-AR/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/es-AR/firefox-112.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "053f1fde4bb52c636c08780ea2670c9e81a40be81832bb276bda12be30b689a1"; + sha256 = "a5b52bd527574b67fde4fa53f359f0bc170c11ea2aadbfd6e83292baf7040d5d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/es-CL/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/es-CL/firefox-112.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "cbe30f81268b032a757f108476f1fa424e76d1aafb96acb47f48b0008b3e9ebb"; + sha256 = "c65147ba46db65aba0ddee56582737cec6e5a10938bf84a400e7e4a49d42080c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/es-ES/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/es-ES/firefox-112.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "e601fff8d25f15a45811d4ee8e235bf93f0c8dd20d34341eb8da43ade1147391"; + sha256 = "65dc25f4cc20993499b559ea6067e246a290936b0d3a9b256fd23b87ea6e6031"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/es-MX/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/es-MX/firefox-112.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "3b25544eece15ebd42d4bccebdb7db7907bda7c3b080f7a289052b2577304ae4"; + sha256 = "2202045f098a1a97e99602317cb2da5fb15314d50dfd402532f377d1608cdde1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/et/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/et/firefox-112.0b3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "88b3b39a5030a9433e11c68451df172ef7b3bd276973d502d7459e23d0b8abd6"; + sha256 = "15925524cb70a22313056fdf4ae64a64ad69602427e7669246d1b78c18402f84"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/eu/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/eu/firefox-112.0b3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b50f8c3f0422bdcf48069453486268fcde372171c97a3d74289d191852510575"; + sha256 = "3ded3a5ce384edadb247d64363ca3dff75a3823ac46e08f216e4cbe9f3edcf36"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/fa/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/fa/firefox-112.0b3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "b7b757cf5090f02179e73b792106eebf67d8c06e064eec4ecd0d0f0b1043cf61"; + sha256 = "1848b01b6587a54aee1560a3bd022d1123568ec4140d0245bf600756f05d46b8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ff/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ff/firefox-112.0b3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "3073dc75e9d5526ce7431f866e584ba63553303f8511f76438adb891eb494ef0"; + sha256 = "3ecaa69f7cabb7be8a30092272b2f49d46e4e62f1fc7840e8feee1c8d0ee2793"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/fi/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/fi/firefox-112.0b3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "ade2216cda1cdf01773ad52fb89c04360e491459e775ccc0d8e05fe2c3f1939a"; + sha256 = "78fa445d08a4b440781845d88a7c82d3611ac9b82a0c8af08d02cdb04f272fa9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/fr/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/fr/firefox-112.0b3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "b44101455cbd19cc065af595aab52059555a251c24100379ce59e26d2880936f"; + sha256 = "260a0040101780c2e00db7a60efe650fc3f51018fcc1141731105eff6cbedd61"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/fur/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/fur/firefox-112.0b3.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "46d817230f1905b992bde3af2489b753e5830191e852961d07040937062c949c"; + sha256 = "57e5d139a02da32c2661d1ccf9807833e41b832bd82179ba058e0d495bbb0266"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/fy-NL/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/fy-NL/firefox-112.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e10d9b7c49c9f0c1225826c729433946cce932302852832d5a70d2b86f2e7c88"; + sha256 = "dd260153557b5d8885705b0c8420221fb00ef02c5d9c0b3e84edcfad753a0b8a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ga-IE/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ga-IE/firefox-112.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "5e38b3875c5dbeabc6f66dd51e1593136b3a45d704921be6f8a36c7c35706bf8"; + sha256 = "bfa198861aad8e947d32d7940f804910292554da1e51949cd8d79ede0fb2008b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/gd/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/gd/firefox-112.0b3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "5062746cad2000f282a85cf5cbafd5757afbcd655e38ab4d6429a52e083cafae"; + sha256 = "819095c08894d05feb0d44c130a3b5423004be008c8e500452fd3d70cacbaf4f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/gl/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/gl/firefox-112.0b3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "93ca5cbc822bc45681e5e06a75400df28f97462de1c1d0981f98c16e94f35013"; + sha256 = "6435bf73f5c8cd6c0d6fc5de9c8738825e4b90c18f8ce102aa5578f08119e8e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/gn/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/gn/firefox-112.0b3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "4746b5b8055d6f212443d9bc551c1a863ce4a9874a8ba19619948cdc6cb9118f"; + sha256 = "0f382a0055296028525d976682c446db34c344c8e5c60da4b1ef310c4336a540"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/gu-IN/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/gu-IN/firefox-112.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "85442986bd808d55c4d83a23afcc103c35c0a54ddf31a64b9d3237d805a6f9f9"; + sha256 = "e3abd677f40ba06ed106618f7db88e356ace039eeca06b8b26632b3586775d7e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/he/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/he/firefox-112.0b3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "d4ebe3166abf22df3f861c6f1e5451ef6edca34a9e9247c654abf5fb85282688"; + sha256 = "07da17a77cdd997bc3e29e094021a5e3c905158eed91e925817875b15c4ad703"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/hi-IN/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/hi-IN/firefox-112.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "86cd9fac24b2c6930adb891891f0b199f2422006a43c057f7238b6592c89e258"; + sha256 = "c1b57d4502d6f0b6c681ed8fd57ae71e7ddf5402fcb0fe8192e1aa1911858dc7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/hr/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/hr/firefox-112.0b3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ea4ab719fd777065ef8de89fb4f5a57f061268c7fc08a5daed03425746badc06"; + sha256 = "3cb02a002dce1485ef4d5f155e31bb31edb23cb4137b6aff83201a414651103c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/hsb/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/hsb/firefox-112.0b3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "791bf3ac58e54678e933ca220e4009998dbf277c8020ee09030178ee32c5c40e"; + sha256 = "b7e9a66521d6f215959e1a2c634220652841e4911ec8133028b98946f5c8a234"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/hu/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/hu/firefox-112.0b3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "342cf4ae783ee6c215daa4942d445ef0e2f74483fb2c3e375e23aef75073f66d"; + sha256 = "634f7c497e2a035d80bc001eebaf4d27cb691969a40453dbb2f709efd137837f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/hy-AM/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/hy-AM/firefox-112.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "504bbf5d5cdf1331079ed09a2ba929e8d9e897040894ec0fb0309468764762ce"; + sha256 = "009a01b2f81d1d3562320af0e9be9950de81170336d5cc647d214c6b270cc098"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ia/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ia/firefox-112.0b3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "7182cbe1720507c0c5246918dbb100129db039b03006b4cdf06d4f762654e8cf"; + sha256 = "f60b71734abc1575b610a8414e5d1be5dd96bab01f79260f999f4a8b88df836b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/id/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/id/firefox-112.0b3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "6db9f226593c6133543a9ae6e8cf0b26db72dbfaaebc304189d241a9029ef147"; + sha256 = "cce8c6353b58fcfe871ae28990687c9d83f86b0aa42e4c559ee40c0f321b7132"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/is/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/is/firefox-112.0b3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "5404b4b03edcd9448d5c81345c9e1ec6f28bddedf0ff90b47f4998568722bb6c"; + sha256 = "72978d2ad47eb8551a0187d5e507fe903df94933145b807128295fb107ba240c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/it/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/it/firefox-112.0b3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "3884d8f3b2571cfa7ca78b49c2a7fda4fca4a328a13956e1d333b4ec61bb9fd8"; + sha256 = "7c50bafb10dffbcf696f05722fc16afcc7068a67385da62004dff3f0eded6fbe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ja/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ja/firefox-112.0b3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "e3f756396454164b3deaa4bedfb2dfcd3b94c891a925a06e52f33705ca48685f"; + sha256 = "99400cdac52938f8ef06a83e6be72f8fc98ad58779a4a0e98e53205a5f9891c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ka/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ka/firefox-112.0b3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "b2e5ec6662c71900679016e16830f75d6dc09a2aec59142fb57d017c5d27e9ad"; + sha256 = "7893b5942d6690fdf87d2804a7f7a7387d12eb21e6510290c2b0119504b330b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/kab/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/kab/firefox-112.0b3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "541be0e1139413ebac9b8af3fa5478497b382768f7e3ea46ade5bfb45e0fad6b"; + sha256 = "7786d72e0cd3f490c5de8ac65b3bce715c7309b9575de0a9e15482b2bf67c215"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/kk/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/kk/firefox-112.0b3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a2b5c6944213ca0b379b977def633f19b867fcb42d711368c48005cc390c385f"; + sha256 = "75ba7ac074a02a562084f0f1fc953b6ca5c950d2303b38f9778ec61b93f4ced1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/km/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/km/firefox-112.0b3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "83b50d97ac792db6aa8ab267a83f0b129b07c99befd8c529a139bc55f9db5e15"; + sha256 = "73c251a288ffe023b2af77c9b8ce9cd1fe80507d604c809de24fded569d26c03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/kn/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/kn/firefox-112.0b3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "3feb801c2cde74d76566084524ba3be38b2e498b7ab0f8d64da87798a8596335"; + sha256 = "c105dd1dfa3c78c1d497e93c86f21eb331fb76bc0adc567c0aea78980bfe557d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ko/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ko/firefox-112.0b3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "809b806fef98e6e1c25a2d607efaeba8e9efc4c3a86d1ccc36d5d7f7f37e52d3"; + sha256 = "dd7b894ce8ff9497a2a74f2abe4a4f8500d182e9e8621f8bcda0f9ae33fa50c5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/lij/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/lij/firefox-112.0b3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "e8eaf0534574f4972f974ee3e2db8acaca26b96bb685c1181d5665b1177eb4dd"; + sha256 = "1441f6c930d7b596fb63455349b9aafd7974add6bd44892ffa979a9fbe927d79"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/lt/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/lt/firefox-112.0b3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "ca8c52113613a8695a55a988d19ddd3e3830eb19be6f20e7dbe5186087bb2d84"; + sha256 = "981b3f79d9ada6e2bc8073bfb773ead1bda5b6cfd75fba92c70ca7730de9c65b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/lv/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/lv/firefox-112.0b3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "4a78ca9215847981c378091a8942efd687bf428a8c7c0aeb2947f9614ee0435c"; + sha256 = "e58b6eb1f69450190ef8af7eaaff691db40f0d83aebcd37d42e50c480273fec2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/mk/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/mk/firefox-112.0b3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "c03731a4169782a2c6dab21e60476145f6798b5f99f15724363aa43c8cc9dc2f"; + sha256 = "345a4eae66d43762e3f73604db40af23fe2bcfd688f4ebc80b9213cf0ef6e88e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/mr/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/mr/firefox-112.0b3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "7e009338695a1742494329b143c755a1d19f653b49f787deb7e4e58983453493"; + sha256 = "ae72a0f726ba76b53604352bf4f05e2a915d24cc0486aec9023f6757893c20b8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ms/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ms/firefox-112.0b3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "24c36cb3a01601fcef177ae4b54e6197f0ffdfec54a6e4417d3c71ef508a7abe"; + sha256 = "b110ec4f541a703623362f484d321733b02dd73f94298e83bcca06d14e4c1078"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/my/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/my/firefox-112.0b3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "8c37bd11f97208f8f012ca5d7e708b79004e9dcaff4db769f946a10f973e1d57"; + sha256 = "3578b73a70f1e7622d9571547dc1c00ff64acb0184cf12d19c2fa954dcf2b1b4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/nb-NO/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/nb-NO/firefox-112.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "0a65b52f4bd6702a407b256b9c2ed83e921c7026287f93f63d447ab9ab0be6b9"; + sha256 = "528823fa659ad107af4d2deb9447e09390dcde49df5b2ceae18bf6019ce86f9d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ne-NP/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ne-NP/firefox-112.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "cad43ee48b5788f5bbfe68bc45b8963dcf6869857fb412d4eb07a63a6009d5c7"; + sha256 = "10ea6251a44e1d660daaab2de2ea751c43d9ba62ab382da68784c51a19db7144"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/nl/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/nl/firefox-112.0b3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "66b088403d9c3f4ae8d8e2f28f7c48468a604e3720b76f06797a46b846785378"; + sha256 = "ee912bc5d6f77d9ebbe622bb4c44816ca353d9a2fa958c78300d010afebe8605"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/nn-NO/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/nn-NO/firefox-112.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "00d105ce728179bde448554fecdd6052fac598152299a7284788de69423a0d2a"; + sha256 = "2e29c06803163982532b8544b16557b2256b9e807ef01aed9aa55b885423c025"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/oc/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/oc/firefox-112.0b3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "c6166908cf9eb939fa1e25e88a833329a4392d3968cdc1fbb9375602bb686b77"; + sha256 = "e48bcadbe6a0aaf4f82405e108227a3dc6464b2f238ba2e63af1e29de27ad2cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/pa-IN/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/pa-IN/firefox-112.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "b9960d6ca01ce0485c2d80170a9e1fb1de691bf1aa92c5f4e3996a03416338c1"; + sha256 = "33449c4a8d01afdc668a5688c4deaa4a8062c5518493ad925ac30331444ab7ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/pl/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/pl/firefox-112.0b3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "5897e9105d9ea69540a526c6ccb2625dd8d706e1448004092f862384c85c44fa"; + sha256 = "1cbbd2b62fe8474f695b356ec2e2c9eed1d7e5d783a30261f8fb94541bd94a44"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/pt-BR/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/pt-BR/firefox-112.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "d1d9040eb16abfb6615e26ba56456bb10b945209e04ba9951349e3a3fad6a03a"; + sha256 = "da227e808f6eceb763e755c182e284d8420c78d21a54b123c0ce0ca3fe98b224"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/pt-PT/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/pt-PT/firefox-112.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "930fb2bc665ae6d7609a0f87377dbf7b4e48e8238b466b1fa16c14849c8f9ede"; + sha256 = "dc3feac7b8c6812972f6db923a9a862531d53776e688afbd4e386e219268a4cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/rm/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/rm/firefox-112.0b3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "89587145aa8d9d4c681bf304b7370b91bdcbacf88345873b668ab3ea0a501c02"; + sha256 = "f20a8d3c30e998ffc2f7bee58f9bac7d498ef5fa945258b37625cabc96db1d70"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ro/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ro/firefox-112.0b3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c26dac3faae365e377d596b6a4ffa9129825ec21bef2d1b10a06efd13aa327a0"; + sha256 = "695ac8be0d011bb2178ff83d9477e87acdd7bbc038f1918a6ed7003a8e5aaa62"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ru/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ru/firefox-112.0b3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "93366dcec9c7361af1b41494e7fc053af400a19b269feb4784aaa0f7cfe9d907"; + sha256 = "b863d9df045678a7da526eb6374a46714929135f26fd16bf51d6601533cbccef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/sc/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/sc/firefox-112.0b3.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "c4b45f3396cc92ecbf89e2ccf26fc42ff81409f3161e8a6a4a62319c6e12440f"; + sha256 = "3ebdfabc9b3bb7d16e22ace41752dac95902696359d94290b0c0cbda4fe5b952"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/sco/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/sco/firefox-112.0b3.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "c2ddae979704ca1d90a58a6a76209c8a6d9404f8b44ed1e4a71f99203f8566fb"; + sha256 = "f5275409ba4cbaad5c6c000e37f3a43978841174cf3a8c668c080ee3d83cca23"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/si/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/si/firefox-112.0b3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "aa550c0da87ed5a750c6547e16670c40fb8abdab47be5c80d0189c7760c06fe3"; + sha256 = "d4356e1cde77634ddd0d21196ac0e1d8724fc846760247f0efaf923e531a5759"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/sk/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/sk/firefox-112.0b3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "6045f7261ad2afd4915460e15750985448856056891a6e5df95fedd0cfafbbd5"; + sha256 = "01d765520fe5cf21d9acfda005d7389f8ef571e9a50e7171ed13c1fe61bee55b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/sl/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/sl/firefox-112.0b3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "93cd8c21a6d41064ad61e62b78b7cc6879e44fdb9efc3cdb6391f667a7f478fe"; + sha256 = "7c17e0c3f0d54a0442d2dc477841694bc19baa754fc78a9b4907c5021ed2d733"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/son/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/son/firefox-112.0b3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "62f34485c3b4ef9125835e293878fe537f1a428d757e30d5c39bcc74ea2e5de5"; + sha256 = "ed6c1e71f069eb3d5d0f2bd323c5975a1a942098337eccfc379762c5cace88f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/sq/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/sq/firefox-112.0b3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "41a323ffe21f64067d264208b25a0a1ddf7ca04336913873d8a0f1ae7e228307"; + sha256 = "e0ebbc5a258e063061966e6821e1ca6a456434bbbd3bce19f4f4af850e3771c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/sr/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/sr/firefox-112.0b3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "5d3cc63dea5f51039cfbf8396ce38a94c0d3a59b4ebfe6bdbc39b5f9e774dfcb"; + sha256 = "6179d94334dbc538a51b78c7fa9c5f196303c15ba62ae1e1b1aef3517cb35493"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/sv-SE/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/sv-SE/firefox-112.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "02d1b67022ba0177b52b695f118f979e3e4fb8899085ecf72cc1556889254273"; + sha256 = "72dd39536c1a347fe361f24296527e0cb8d286a0c1ba9c22c64ac241fceadf9c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/szl/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/szl/firefox-112.0b3.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "b9d4512190d2a21f368290d4978f4d911cf5568094526c8f8cc02e01becfed02"; + sha256 = "04b65243a3e83303ef6652fa2bac659eefa9ae24fa4d6ebe86d9e42eb7284010"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ta/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ta/firefox-112.0b3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ead96fa1a6dead8bfd03374547e2405d2f7b1db1a8f238913de42cde13fb298d"; + sha256 = "97fc15b676769745379f214fb2e62b7f72f548662e83e57a3b0e1bf8ef4df543"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/te/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/te/firefox-112.0b3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "03b89dab2a291bd2edc614a45df0a83e49bd9875487a810c806d95287c82152e"; + sha256 = "6db551aef6ccfd580caa82b7417363e30a5d9e2245ea0665934e06b8845d2843"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/th/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/th/firefox-112.0b3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2af26ca795e150f88f81b4626a858a2633e1e3b2ecfc4445419edab1322de493"; + sha256 = "41dc623390a68e8656eb0b53ba650957b59bf387da6890be504c62d34eeadf69"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/tl/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/tl/firefox-112.0b3.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "cdeea682242fa8773d6ed61860b32a3687b461d279966379b0e0c39146dc3fdf"; + sha256 = "68dd617d3d235220320fa89131d5389834dfd3a44745275cbc25c9098562b5c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/tr/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/tr/firefox-112.0b3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a9190faef756fdfb7b9e4d555c569a6b0131519d8459fb9222e557b3aaa4ef02"; + sha256 = "1b2d3fa1bd5de96479d08f00577a894758892b4a18a279f1f3696d2122158112"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/trs/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/trs/firefox-112.0b3.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3d58aa7ada7c84b6cbc5ea125007fb6e1faf3a8cdea959909df92d7ee3a836de"; + sha256 = "aec06a7a1df817b1bae3b16c6eee7511a0bc1eb46f4187c6a28bf2f9e9b71461"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/uk/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/uk/firefox-112.0b3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "8ac79435a653daae5b0dcfaf6ffb9b4a4ad685b67b06f8589b07098367338b35"; + sha256 = "8dcd765b443e12b7c60387b310aca511a3b30dac289f898201443597d09d9efe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ur/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/ur/firefox-112.0b3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "329fbc0e073c8630ffa4d531d0cb7f26a55d73c07fb437861a613f91b4f21ab5"; + sha256 = "90a35015ee6c338d8648966d9d638006fbd6e3b4b138468e43455827171f286c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/uz/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/uz/firefox-112.0b3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "f71ec3ccb35dfef2fc05092d81b141bb2aefa4faab7f51267376ae1e340c09c8"; + sha256 = "56af3aef03a6b7c9c5629c127229d82a89b9c915f899807e0c93e18106f52dc8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/vi/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/vi/firefox-112.0b3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "73226419139bc03f8febae048d6fd4cc93b50db2e6a19dcd6d22640d3c21a1b7"; + sha256 = "1bdde032a2a72adac2766e8fa8b820f0bf72848740cd20b1a2415d8787108311"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/xh/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/xh/firefox-112.0b3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "1a59d5bf9511d1a792b62b5dd30d4e877567a59ec514ae5ec45952e1f3ac5f46"; + sha256 = "e7a56495c0b1a20c8a924e4059130d27484a8890ed0a8b08b1f7856a54bd3982"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/zh-CN/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/zh-CN/firefox-112.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "ead9b1414763612dec804cb9c2357a1ffc7ae84a8a9f3c0c9d80900dac50a4e8"; + sha256 = "b8e0ec651631a9c36cdff888737ad68067fa051746027556371830f014809996"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/zh-TW/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-x86_64/zh-TW/firefox-112.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "969ecb156fe70f0b1c4b2812aab242987a6af9161f65f3bdc1dbfd20776fc578"; + sha256 = "6bb2518c47a9d80bcd9a2864055f83e40aa6c4e6112fd0c4b6bcd2592bf2c700"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ach/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ach/firefox-112.0b3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "66045991569ee79935613b4b2b435aa1dbae5ed36cc9d1380fd8b9599ad61a6b"; + sha256 = "782a506de4a8f7503adadcd51ba1ce935ad582117fd72b22f39f259b1e640300"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/af/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/af/firefox-112.0b3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "f1b1ba98c45cfc9a8dd469248dbefb65e659ce8aaafcb70e1b5b8501a716d98e"; + sha256 = "dcc741cf514463cb19759cc9777b2e3001ce3b4e264a5b41b320983ae8f202fa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/an/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/an/firefox-112.0b3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "9f2c95f64f6b131e1aa8d045cdf67cd899259b2d15534a7bbcadd3441b0ae48a"; + sha256 = "c6e7d3f48c3782c9371781792bd0af8fbf3006f6c65c117456f91abc8fbe978d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ar/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ar/firefox-112.0b3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a5856f4158803ee2c226fdcff8bf522013726284736c692d8faef57591cd3b12"; + sha256 = "9dea98e726d1695e4eea476d0bd6fe468c56e64ba32c13328e2e61ed56ef1fdc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ast/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ast/firefox-112.0b3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "d2d212429ee2820e68aecac6b0b90ff5fc9bd2672493c56477b8151832e2b2d0"; + sha256 = "56a1bb8bcf150bf7a6ad83461087fdb0e4423cb5a2f733ac64472857883263b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/az/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/az/firefox-112.0b3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "3bb9d637c38e3d1572c8688805c38c23e8212a03619396ac85192feb68e46896"; + sha256 = "7573b3eb5bb90e30bccf59159913a6845a977a3a47c2ca48bddfdd9af92cd792"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/be/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/be/firefox-112.0b3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ab2ee8d2b0c3842bee542b6444731f1e74469cdc6b9329078640800c7633a384"; + sha256 = "41dad366f588666ec5852ad825db8a9f58d76118bf7a962812c8d1404cfe7d5c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/bg/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/bg/firefox-112.0b3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "dd80cf61de4cf84e8f3d3ac2209f5a34db4c611ea0e3068731f0132318b2d4eb"; + sha256 = "d9c1154e772d273178c1d387fa24d87db485fd053e57aace85729b77c54cb335"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/bn/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/bn/firefox-112.0b3.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "2ea5374085f61be6b90c9f6d42679288d58172dd4b2a576e3cce1aab7e1a0eaf"; + sha256 = "bfb570519ac184db711e93722be32011ecde6a9c3bf892f1d797404d2642a37b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/br/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/br/firefox-112.0b3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "8200b68bb183265bc8066ba86e7301c41e757ffef4462c820aac64f7e2f5bf4a"; + sha256 = "c559b1d447a67330bb7b61d1ffee6859dcafffb719b857023a43ec00926135db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/bs/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/bs/firefox-112.0b3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "f7f242e3be00e29f2495a21c4b1df25a0bc4135d572134a09943b5f6927074b7"; + sha256 = "9eccc67bb8c33d89ac30d3bc35d95ff77a929a6177bbefd9b4c23dd0f3d42f42"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ca-valencia/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ca-valencia/firefox-112.0b3.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "ad5adfb048a851a95b75436d0c76add2f3b5e422c7c78c35a64f31050d8bf319"; + sha256 = "3015b91aaddd49f1dfd406c615ba8e16128c02a46e562c07e13c89f4f3a6cf46"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ca/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ca/firefox-112.0b3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "666f7cc6c3bfe215c6f178fcfab36125296ea9da753d00933138a757e51a2fe1"; + sha256 = "5e38759676dcb0251e8ba689ba849a5d7291e26adc46371b9157bfad05c22b03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/cak/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/cak/firefox-112.0b3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "a0f24336f6c3bbc3cc215456db8e5f233852ed704aeb300f68844aaa1af18e3c"; + sha256 = "706d5c05a294516e4a1a1ec58f36cbca8d8767e22d3bed4083269dd41d980512"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/cs/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/cs/firefox-112.0b3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "8cc50eb0c0212c663261094e924ae8d9aa13512a271f9235c3855251445c5e96"; + sha256 = "55f7efc0ea8a63e9e9e27a2653c54084008d7b6ec3cd23ceebcee5a3c0072fa4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/cy/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/cy/firefox-112.0b3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "887e6948fd3249a367d10f9ca6d155a92c8d038208d6c332686b3732f1165757"; + sha256 = "f093f7096c1e8f1a9ddee3e562cacb2cb5cec38918d85650ea74748f4e071f33"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/da/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/da/firefox-112.0b3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "191237d6098a7a3da1d53e37144f328eac704a5547b60e0eb1fb36c952e41a16"; + sha256 = "8d24056fef5994f599cac5ad2866638ba6c562313525a63ad6289679b372ffec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/de/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/de/firefox-112.0b3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "6ea53b30f2cb50c854c9dc9e8beea0a18447307a3330a0563c73dbc11b4b1c84"; + sha256 = "e8185d3b38ba5dca3bf2fafd29633c263413e9280bfb47fcbf7c81ff8715e72c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/dsb/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/dsb/firefox-112.0b3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c9595d2e95f46726f0e9a607e106e8b622254b002475b18190241cc2d30ed731"; + sha256 = "f894e0dda44302fac3b827c1dad08d70455d178d7bcb9bb36ac141c0efb1d14e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/el/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/el/firefox-112.0b3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "313a68a38d70c20ec3c0bf592b9d81cc2c679b121dd32fd810358ef2977173b0"; + sha256 = "6a59549e560e3f59d2ba3e7e61007a67c37f95dbfb6f9ec510ad84014bff5cec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/en-CA/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/en-CA/firefox-112.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "4b2a24724af2ad8e87a6bc0004441700fac6552e1de595cf26639ad5bfee5337"; + sha256 = "2a05fe4603a09451d72c04b84c5c7b422001a6fb7928145a1b56d8bf04e377ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/en-GB/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/en-GB/firefox-112.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "543eee62ec72bc30834e89789c38d31b5dea134aa63fcb0b79a0234c9831d5f4"; + sha256 = "a12c0289e601781bc5d1fa79d3f7f6c732e11146fa3cef520d2b5eb30982c4bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/en-US/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/en-US/firefox-112.0b3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "5142e6b3d206fb187548f57a4596650749ed0b6b9f14c7adaac2b063dd364311"; + sha256 = "6a298b5b103b336901d764c836e3d60f30af20a5c5c78457bc0cb971e50d8722"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/eo/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/eo/firefox-112.0b3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "f2e4b1cac9c6f36d7ad0f07d74b3578c470c7bf1e34f84dfe42eb1afad52a6b4"; + sha256 = "6be54c23b9308035f74700811a721e5cedbacf1e768ebd60be0d20c616908870"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/es-AR/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/es-AR/firefox-112.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "9f81560be34608bb05aace073d5eea44641c4e46bc6358f9fb3fb5131cc08777"; + sha256 = "f8d298e2687c1100169a9506c64e80af04238c466051b7d19d1cba2aa5ba3e5c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/es-CL/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/es-CL/firefox-112.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "88eb3eb8fac7efda8679cabec17cf77401e9bb6409a5e981f801684bec56f1cf"; + sha256 = "c70624ad6cda8258508574a1f45c59135273e95886255bf946d482c8b63f5569"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/es-ES/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/es-ES/firefox-112.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "9f34e451d30937fca575b862d5471aab44d9890a70dbce60387088c2e9d82b9e"; + sha256 = "8d0010b356cc73af0ad318839a94525ff74afe4dc9f47cd57b1fce68ae8874fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/es-MX/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/es-MX/firefox-112.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "66350c6ae6476eb04e534e8872fdcb373ab82d97af819fd4c3b2db7b54b37a2b"; + sha256 = "4c4124f17c6d35622f8b2124986feead6345fd78d0cf5351799f918c6688c719"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/et/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/et/firefox-112.0b3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "eae317bbd435ae2cbf4537e23a30f98e74b8dd0c36c62fe3f1cadb23682bec19"; + sha256 = "7569b5bc8412f940f3a7ab02f4367e32cb6083b728c5ebccca2451cbb87cab41"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/eu/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/eu/firefox-112.0b3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "a568e81cd590d23dd69e533f270305650e8329c182dd2c61d90a450c5f9d3f6d"; + sha256 = "4fce029fe12a79541b7d8730312f39bcf69452893bbbfb9a3070ce1012e06ae2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/fa/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/fa/firefox-112.0b3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "62f1b20917aaf084f1dcc98470d6701f49e27dc0144889905ea137fe9578c131"; + sha256 = "905583e9baac407f6d0b0bed71eb53832255a4ed41f85aa15bc2217b5cef4fe6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ff/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ff/firefox-112.0b3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "df825d4705a712230ec6521be224b425cd64aefa736ebe847417cde407ea8efd"; + sha256 = "9be82455755511a71d175f1ecfa1c7bc061f0c1c70d14f3b7586aa0ecea3b936"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/fi/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/fi/firefox-112.0b3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "55a0ab072b36dd5d7b82002512988f29d5a18e12503184d468bd56b4dab7b973"; + sha256 = "0291357fce8f41f4028ab4b853b5fe44309bf74291b7723f1099bd5a0733cc90"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/fr/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/fr/firefox-112.0b3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "1a9257117d5bbd3794a3cad046f3dcaff41e97b3366b75f04ea0cf2ce43c1567"; + sha256 = "01227292176a119d9e17f34118602852597e3ebb1c0684da48cc54cb01a74143"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/fur/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/fur/firefox-112.0b3.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "ff25e18bb09efcb9841ab17ea28b8728a0216ff8203359f5ce6a8013c25ab382"; + sha256 = "e3243a58db9b734d0d546dfbd541a5f95bc7864e105a0bb8c82c568140c8d718"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/fy-NL/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/fy-NL/firefox-112.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "34bb2c52a729f1b5f7b6f7abbcb44f5fb235849a9cfee347d5ccd02be8da1c40"; + sha256 = "08b8d962520d7f535b2a22524f1e0ee0241553078f275a0bf5c5cfc4396c5a62"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ga-IE/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ga-IE/firefox-112.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "927d779635bac570ea20bb5e799550bc34896e63a358c09d8234418a61a3ac1c"; + sha256 = "51b5544de3863239296221d4bda811a779a5e2e097d696b9ad0c53318ab21ec0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/gd/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/gd/firefox-112.0b3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "f6e2d4d65219fb5be08a2f7673665a1333932aecd79179882b315169c563e7e3"; + sha256 = "e1be896634e7447dc02e100d352ea378a04c9a48c7735573cc12f3f36cacf19f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/gl/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/gl/firefox-112.0b3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "4d9bcd0194dde5f22314ce8683dad2a0599166eea2c59857f7275682b6428593"; + sha256 = "11af15b06eecd43200b1a44dc436f07314a1a3a13cf92ffc1a0c07a05e0f8101"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/gn/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/gn/firefox-112.0b3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "a39ca41a2719700c807440c889f5a9b465a7f7993f50d5f7fc813175cea25b3f"; + sha256 = "f50f0a2c1ddb6b5917c50c14e21ac0307636815183c2a2820d76d02af4a346ac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/gu-IN/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/gu-IN/firefox-112.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "8ea50e5afb28136e669d1c550af57f403d98f5c436a053e5e484ef9dad3a1523"; + sha256 = "8951afcb8683055425603c6afec5695a9003f56d22c810d562d864bf9e3c2eaa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/he/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/he/firefox-112.0b3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b4fdcf72dc47b4e0740a0c3e3459f01ef20cba6d55007f8902b066300dcc9916"; + sha256 = "c90624e515e29b1673a2e90c6e074f69bcd64ce41245f5f6fd7bc5c7e4da05f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/hi-IN/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/hi-IN/firefox-112.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "445c778079f54dc60bd0b1e745aa753fb1edc69a3088631898f5db6539f5cc48"; + sha256 = "3e04d4cb6bd72daa95deece94eba17771642bbc29390814e71100815f392b4fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/hr/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/hr/firefox-112.0b3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b21ac8a97c4843597dd98dcc51cc7d22413f193a2c6b3a475b130e1bbb63288e"; + sha256 = "e265fb7834fd3ca59cdb9df4b6b9917a6f55bdf9e91aefc97b9c96323f3c1127"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/hsb/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/hsb/firefox-112.0b3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "137a4c278d80bd50894c5fb690d37fb2f4bf41940db90c89d25cb7cddc69e717"; + sha256 = "982e34f5b8b73bdc8cec8709e84a36edbb709eae77450d192aa6d044262f4f64"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/hu/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/hu/firefox-112.0b3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "3710e67ae0d57c396ab84aae21fa2a8e0e1dfb9d21c6d20ad79529381a982f1e"; + sha256 = "d0251ef3b42f1a29f6f585966ec3e480102cd993a063d01f5e9bed2251fa6190"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/hy-AM/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/hy-AM/firefox-112.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e92d90e0274158d3622a949ce3b96d0c1cbed55df313a58b31c93bdd459f6fa0"; + sha256 = "349a3d5089a53869a7111b9c757e64edbe849ceb7dfbb5a31b20c67dea3c8d36"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ia/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ia/firefox-112.0b3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a00f57b53c6c0b87fa00c8c20e25f4a0bef59c36cda2af191253fa95bb34515f"; + sha256 = "3373521a73b0002818e31a16af040caa5c425068aa11c8c65f706a74633bc10f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/id/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/id/firefox-112.0b3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "ec50266023ae4fb76bf1da464c14db16ff8545361105f5994dd84c86f312f6f2"; + sha256 = "4b5364f6d737b2d0584c0c2f4bc432f2225e6234a9415919515b40656ede8258"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/is/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/is/firefox-112.0b3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d469462327a58fa2c6335c0061c52ab36bb5252ed9fff9802dc0b8849c7433b4"; + sha256 = "2d73b59fa27b20ace8dd17edb6d6394130f4652ff98b1a2a0529cf0bb9dbf06a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/it/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/it/firefox-112.0b3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "82cb4044881b176489644aeb7411aed365db1a97910f21f0d171df6a4ebc3961"; + sha256 = "23859f3a5344ce24afbbd0bea73081681f11cf5ff3a86f94d86ea79eeeb3585d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ja/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ja/firefox-112.0b3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "328a66fcbb9805b366a540cc0fb34193b7cc74437d60f94660b3ca990e75db93"; + sha256 = "edd4d2a102e6fe2cb248052547030823a7fc7b678e7a368f5ccfe44b40666eb0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ka/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ka/firefox-112.0b3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "116cfde2f18ce1edd717c19033283278cc7675d4ca0efb73ab62b3746a16c1bb"; + sha256 = "1b0da095cd57de75e3a561c75c5edd27711d2ec3e729434c7df592e9b183fe15"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/kab/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/kab/firefox-112.0b3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "27ccdfba687fbbea6285bb2a7d37dcf110a8777dd52fb5236d5e8fea098d63e6"; + sha256 = "7a56c0e4064a763b17094ec70638492c6cdd6c6f69a8589e2040e24d897aa042"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/kk/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/kk/firefox-112.0b3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "ab903a0504a0db8ce3cd9a19b82c3bdf6840a4f4bf20591ccc6fa18e31a6d40c"; + sha256 = "c69e27d1c72d8b92d1c746e1d1a82dbcef16cfac301d76df1d87daf96c8f84d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/km/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/km/firefox-112.0b3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "80e987ed55d5057b8c48e09507186ce2fcbcd449ea96bcc88aca7df6505b4194"; + sha256 = "181036a27c3e995970c4fdb6c49ff5106b8bddf44c933089f83cb371b4fa946d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/kn/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/kn/firefox-112.0b3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "1bf32ea771d4b9247e6be35033d1dfe5a38e637be489bc15f8b70354fcbabef1"; + sha256 = "42c50fdf664789ef2c71219af68ece68fbf123425ce97b9530bd4582cb6e5045"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ko/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ko/firefox-112.0b3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "dcedfc29aafaea2599f33496b8a876c88c27d9ab260e590e46916ad4c3be989f"; + sha256 = "093a9fef2162dfb01b8cef075d5ad17a7d1e1a05421fed72091e755e6f24709b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/lij/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/lij/firefox-112.0b3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "35a483dd9fc037c21c5830500ea4f0e98707a19aa999d2d5373489520a940378"; + sha256 = "f2df830ea94dcf0b221df59d5c565f39a8439583df2a54a20e247a578e7d6862"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/lt/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/lt/firefox-112.0b3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "3b1283c65ae4e3e6a9c8c5d0a98119b8ef16c70526b0cd612f08aa32b5219494"; + sha256 = "144584c9b7cbca0e93e55051b92617e8e88433028c36a0ce0b1a0ac4ef916f5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/lv/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/lv/firefox-112.0b3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "dbaba67cb570ea58cedfa25fd547c86bb9d6e2b1e6da00c7edaeeb8540c39400"; + sha256 = "bcfb4c9f2dcf63819e2a02467da496297ce5295d5ddd59afaaf088eae3048b40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/mk/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/mk/firefox-112.0b3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "8fc4e1ca58d0c05bb542f525ce3dee272ffba567734482c38680e39f12710f07"; + sha256 = "7637384ed32fe32d5c3c39e24722721e6f9007770b7732546022b8b6a9e4aca9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/mr/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/mr/firefox-112.0b3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "7a61c4cefb5612fb2bccb549cc19b84d6aa329d68c84ca4b48ee64a91ea57d5f"; + sha256 = "e1d4cacdaf6ad2131b8958a903d20700c41249e3c3a031a93150061369664b49"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ms/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ms/firefox-112.0b3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "948815263976cdde9f1a103bb0d497519cb17bdf655f5a20ff8925612fe87c81"; + sha256 = "9228c55f475cc8bafe7cfeac1cd999e2c283332cff82d02d46bcb790e2edc946"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/my/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/my/firefox-112.0b3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "ca48a482f774ef6725b488f390c15dfdf52077ef701e351fbb574d918e8b96f6"; + sha256 = "3d32e3bcc5a3c3a7aa4a7e09647ec068348395aeb126a6976b73a085792206f2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/nb-NO/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/nb-NO/firefox-112.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "27a1d390d81865142130f497f76d84bff92be708279945d9e7e3449a91050c22"; + sha256 = "de10b1023c99dbf3685c83e58bd7bed49f63cf8add9d2856b5a263627fcbc460"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ne-NP/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ne-NP/firefox-112.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "7c91efd53579378f7aaf6cbdf4981396199cfbca2bd28e462f225bfa5e547f20"; + sha256 = "6979b4661584af6bc162b13546b562c11f67accd514e9c52570891ed410dd88b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/nl/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/nl/firefox-112.0b3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "0a5a9d0854ce674c2f9c84d678e1424c4bcf07acb9b611698a210371c168034c"; + sha256 = "bc2082e9edee95fe539ad7bf2b90a80a3f008184c4dd062f39e390a30c6c004d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/nn-NO/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/nn-NO/firefox-112.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "81d9128d72ed9389828a07e4457e76a063dc984208fa948613551df9f406b3d3"; + sha256 = "9fdbe924ca5261e5545249a3d43e4a0a39f25d8142e5f507255bd2ba15ffc272"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/oc/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/oc/firefox-112.0b3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "49183189bd729aaeef2970a826aba3096b99a502dcf0b87203ebd55be3f24af6"; + sha256 = "e065dfac06020ac1706e1b70d6fefde8db5ed1357ab6be22797e323fb2dced44"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/pa-IN/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/pa-IN/firefox-112.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "4b503f248d495cbb0eee8506c590bac655fe2d8ec51691875f61ff3d44d3a8cb"; + sha256 = "c7e9807983dd169ed6e3aa259a5df2560f4fc3698a0cefefafecf12ee439753d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/pl/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/pl/firefox-112.0b3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "58ef29bcbd101e5b7bc55e414dda6bb4f5c62bdffe98b514fd9cf604eda83fec"; + sha256 = "12da595e9effda46d10a994dede3b4136226aa77c1cee7d1c6638087d9108d25"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/pt-BR/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/pt-BR/firefox-112.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "57d99f539ad21e31b802f66cc33606337dfb842ceb089c50df795658397e584a"; + sha256 = "a7891b30d7d937ca349983149532ed7d219f4f90397cb1ea63778ca4c193216d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/pt-PT/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/pt-PT/firefox-112.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "dc7b9fd92a41cc66a09ae8d1ad8f3194443d97a85fc5373222748bb2377e666e"; + sha256 = "77d749c7cbe970c41265bcfe9a3f0afc3f02a5e3880a382b01cb00afbd41e2b8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/rm/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/rm/firefox-112.0b3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "10f6f81e1e2053a3adfd3ded763fc570d49cb8ab5efed014e4726b3f5c4cd0c3"; + sha256 = "6ef950ba883d56eb53ef9b9110943a73153c2fdf91b7b0d3669818fa5b3ad0b4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ro/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ro/firefox-112.0b3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "d2179ab4ff117acc643e42c0ebba2f527a47e969783a821c765b48e1797061f9"; + sha256 = "4e56a8ec4627f7bda6a3ca26b650ea87b5c191d8876bdc53656ac614e8c70a51"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ru/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ru/firefox-112.0b3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "88a52a4d553880bb23c81474c8938b2a3a0939c28fba5c59fac793e6594dbfaf"; + sha256 = "7c12dcaf2d417758f020fe7ab9832b07442123c7645eda1e35dbd83a0706ae51"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/sc/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/sc/firefox-112.0b3.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "a1ef861439a0886805f0354fbf22d3013f627a34bf4562498d953318f18bc218"; + sha256 = "8ed09b4c916b66908db19a0befb8bf3da8ef9c59bb92b7f1120bf76a250e427a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/sco/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/sco/firefox-112.0b3.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "afca5820a0ded94fc3706b70c6c25dd151854cac74a55a8a2d601924ef0e60db"; + sha256 = "5507399e27aab620dff5d291861e9b4b50c286ae6ea96640054c38d31a7c606b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/si/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/si/firefox-112.0b3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "5aae00a412b2a4ddbf01fa9346ee1aa11ba219674f62f264c4bdacf469bc1e26"; + sha256 = "e52843ba33be6c94c7e830ee4fb87797f2ace8f2d51ffe37cc67f1505d005d71"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/sk/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/sk/firefox-112.0b3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "ca4052e3531f85b6e1129d9f350fed1835eadc1f3e25883fbfa905168a2d6900"; + sha256 = "abdc186a7073cb6c8ddceee41c171e3d3264248d4b47ca62690138229f9d8432"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/sl/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/sl/firefox-112.0b3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5e6212fbcb7f3f788bac1824c5f08f1e9e1447324f5e2009a29d53dee6b0b202"; + sha256 = "6dee4c5fffa8ed99c8d63e0cdda2cc016c2b602dc9ccd752ef079185814a8dde"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/son/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/son/firefox-112.0b3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "d5ce0f2ba243a5f50c2fb2ef173a29eb8b02bcf9e3579e6ca4cbbc07a4d3badc"; + sha256 = "d39151298291a03418ea28b664a3b134a785c1771577b98da72387e6e4489fec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/sq/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/sq/firefox-112.0b3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "4e3e6f1ae191af877aec4b31f1c8ab400b1695257e1a762f708848c9eb06619f"; + sha256 = "788747a5e18a6c1d0ebd3be7cdfa93bb74d20b611877f277ea6ebe298db7d0f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/sr/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/sr/firefox-112.0b3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "7f329230d3262e97fc1dedfc27ca53006ae70a9e75aee3f7bbcdaf9c90ed1023"; + sha256 = "1e67fb9b784efd5edb2cbc403683b40334fc99ae78828c165ffcd9da17f41a8a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/sv-SE/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/sv-SE/firefox-112.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "1b916e646338ab8ecdf53ae9f126b9fb9d426906226b693f1c2485b392ff2623"; + sha256 = "fbd66fe3e44e325c07bdfa17c9d8f20b426efcadfba6c40f461f409e54a58e48"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/szl/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/szl/firefox-112.0b3.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "d90988d662bc2e5224fad5b3b7929b020fcb189299f53beb8103303c97314799"; + sha256 = "63f4a05b0bdea660fc2d68e227f819f1f3c99a6bd5f9b38c695a4ddff743a250"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ta/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ta/firefox-112.0b3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "30d463b969eb55d09f2919d5fbfcfb3112a32feb0f5176dccf9de81976910578"; + sha256 = "79a8c2104bb20ce0c8699b2b0c7ab8423293a4f82fc9c9bafd1a0d29f55ac99b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/te/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/te/firefox-112.0b3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e8576d2ad2fd146a2c5acc46f66f68873368d8fe8fff5f77c6132ef372302157"; + sha256 = "cc3a1ca4e73d654bc2024c09c59bc26c4af1ddbf6b37c95af35e0dc07277d43d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/th/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/th/firefox-112.0b3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "3d3ab3141e45525264ec0d0373d2d6692ab03f3f05175c3c5dcbe69775bff070"; + sha256 = "e962ca885ccac7043703f1aa2c5bf56e48e1f16b83661b55c64b88ae81dffa2e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/tl/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/tl/firefox-112.0b3.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "c64ca24d32f856ccc3e8da9e085f80a1967856f8772afa6e856e073d6f55cabd"; + sha256 = "5082d1c3816428d5f5fbddf281fe44d6f7061416a50ccb98b554d4adc392f8f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/tr/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/tr/firefox-112.0b3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "59cc194034044cc32053f2f2ebae46fec0a3f9c61cc9f162ca3fb16dd03354df"; + sha256 = "8cc6288f0f4606f04b68b5cdf200a137233e9e88619104f782cbb712057d24c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/trs/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/trs/firefox-112.0b3.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "7b0b268e6846b99c95a4eed1b60ce09cc312cd0dc1e1067c561cc800c49c477d"; + sha256 = "98276c238aca6e97500648469468cd8a53e17738d24fa10d101ed7e613137734"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/uk/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/uk/firefox-112.0b3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "50fb5145b51c218b248034c5298ff09f2601567051d017a4fdb71c440290b284"; + sha256 = "6e21e02b409b954a9250e19db256837ff9b82975a7596bd8585349205836ba92"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ur/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/ur/firefox-112.0b3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "9d3e6e4146e5572bd360b10dca5a0f60b635c6fe76c685d0a1956d79ea22a5d5"; + sha256 = "f48380e3a1ad9c9e10f3856a4911d5c47d21a49a4bcd2fdef06115ea6191cccd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/uz/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/uz/firefox-112.0b3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "bad83d2293487b3cba4e870413f6f46c83cfc0375ec392aa55bb886b6bd7f8c2"; + sha256 = "294c51f2f1e39bdac52cb2dcf92a1fc8fe079574a25f23cf8474271677ba81e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/vi/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/vi/firefox-112.0b3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "03b43baffe2957754a2d4bad73062f1bca009712c2b03cd6d1eec1610c0cd616"; + sha256 = "9ce99076eb37b3fea5d4dd146fa7553fa522593feeeb254a229fd270880d014d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/xh/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/xh/firefox-112.0b3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "dae05e9946336b2f25a6ae5cb635c406b7b7ed36a3287cd4713b9df5175c3a8d"; + sha256 = "39216b22c3d02baa9fb62ab112ea5765ed916569240c423661f0c64da975e37d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/zh-CN/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/zh-CN/firefox-112.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "295d074d2d686d737e633859e196a76b8d7a4b909697f321439496ae23b27fa9"; + sha256 = "7eea15b7eed1de587e8407079ee157c380455d1d66d0294723025009181a6aaf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/zh-TW/firefox-112.0b1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b3/linux-i686/zh-TW/firefox-112.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "06c50734205a09a5675230fd8a00877603fc3a6927ff46c8d79892d014edaa4b"; + sha256 = "c08c80b3354a77a98cbf9cf44928254b76249c2a7fc1b3777118488c7c55446f"; } ]; } From b668e7df42b5093c7b1f116dd57255846976ad08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 23:23:40 +0000 Subject: [PATCH 10/81] benthos: 4.12.1 -> 4.13.0 --- pkgs/development/tools/benthos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix index 57235c3085ae..a9691e5b0f5c 100644 --- a/pkgs/development/tools/benthos/default.nix +++ b/pkgs/development/tools/benthos/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "benthos"; - version = "4.12.1"; + version = "4.13.0"; src = fetchFromGitHub { owner = "benthosdev"; repo = "benthos"; rev = "refs/tags/v${version}"; - hash = "sha256-6qBeMQSBleZTsq6sExIqkkyxJUx1yt2YhUogKYEWii0="; + hash = "sha256-i4WsoZg22HCaDq6c9bQI3oAVGzW57Y6DrULyki3Hh+U="; }; - vendorHash = "sha256-sNqWTgVgcjYEzFlneQaV3g80NTrVKeKz+mtahEOdyIw="; + vendorHash = "sha256-Q+oEYP/IpCDdwj/mLl5nVZ+t+mPYtRpNrAwta4viPMo="; doCheck = false; From b1fec2a5747ecf7aebdd2cea812bc13ae963fef7 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Sat, 18 Mar 2023 23:08:30 -0400 Subject: [PATCH 11/81] python3Packages.torchvision: switch to backendStdenv.cc from cudatoolkit.cc --- pkgs/development/python-modules/torchvision/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 9539b1bb0bfe..449d635372a0 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -15,7 +15,7 @@ let inherit (torch) cudaCapabilities cudaPackages cudaSupport; - inherit (cudaPackages) cudatoolkit cudaFlags cudaVersion; + inherit (cudaPackages) backendStdenv cudaVersion; # NOTE: torchvision doesn't use cudnn; torch does! # For this reason it is not included. @@ -65,8 +65,8 @@ buildPythonPackage { # NOTE: We essentially override the compilers provided by stdenv because we don't have a hook # for cudaPackages to swap in compilers supported by NVCC. + lib.optionalString cudaSupport '' - export CC=${cudatoolkit.cc}/bin/cc - export CXX=${cudatoolkit.cc}/bin/c++ + export CC=${backendStdenv.cc}/bin/cc + export CXX=${backendStdenv.cc}/bin/c++ export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}" export FORCE_CUDA=1 ''; From a9d6317eef09ae1fdc278d6f2edb643963586ae1 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 19 Mar 2023 00:10:06 -0700 Subject: [PATCH 12/81] gcc-arm-embedded: meta.sourceProvenance = binaryNativeCode Our gcc-arm-embedded expressions download binaries instead of building from source. Let's add the appropriate `sourceProvenance` for this kind of thing. --- pkgs/development/compilers/gcc-arm-embedded/10/default.nix | 1 + pkgs/development/compilers/gcc-arm-embedded/11/default.nix | 1 + pkgs/development/compilers/gcc-arm-embedded/12/default.nix | 1 + pkgs/development/compilers/gcc-arm-embedded/6/default.nix | 1 + pkgs/development/compilers/gcc-arm-embedded/7/default.nix | 1 + pkgs/development/compilers/gcc-arm-embedded/8/default.nix | 1 + pkgs/development/compilers/gcc-arm-embedded/9/default.nix | 1 + 7 files changed, 7 insertions(+) diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix index b10ac198430b..71d66e83afd7 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix index 62f5df9dd870..d36bd66aa3cb 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix index 668391b2645b..1fac31680fb5 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 51f3c10f6735..d805c24e002c 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 4d63f7c3ecdc..13d8c12f52ce 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 6673cb823485..a6448baa7919 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index 841084904cf9..4c2b34b0c5b7 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } From f05c5da8e0a5ebdfeaeaf9838a5a47d41d543f91 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 19 Mar 2023 08:53:37 +0100 Subject: [PATCH 13/81] ocamlPackages.ppx_cstubs: use Dune 3 --- pkgs/development/ocaml-modules/ppx_cstubs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index 88f187cc706a..1b5e96a2d8de 100644 --- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -18,20 +18,21 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "fdopen"; repo = "ppx_cstubs"; rev = version; - sha256 = "sha256-qMmwRWCIfNyhCQYPKLiufnb57sTR3P+WInOqtPDywFs="; + hash = "sha256-qMmwRWCIfNyhCQYPKLiufnb57sTR3P+WInOqtPDywFs="; }; - nativeBuildInputs = [ cppo findlib ]; + nativeBuildInputs = [ cppo ]; buildInputs = [ bigarray-compat containers + findlib integers num ppxlib From 79fa97caa3e61f4793744b7148d5bdac01f0aa4e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 19 Mar 2023 08:53:44 +0100 Subject: [PATCH 14/81] =?UTF-8?q?ocamlPackages.containers:=203.10=20?= =?UTF-8?q?=E2=86=92=203.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/containers/data.nix | 2 ++ pkgs/development/ocaml-modules/containers/default.nix | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/containers/data.nix b/pkgs/development/ocaml-modules/containers/data.nix index 980984c6ec05..bdad78cdf6f6 100644 --- a/pkgs/development/ocaml-modules/containers/data.nix +++ b/pkgs/development/ocaml-modules/containers/data.nix @@ -8,6 +8,8 @@ buildDunePackage { inherit (containers) src version doCheck; + duneVersion = "3"; + buildInputs = [ dune-configurator ]; checkInputs = [ gen iter qcheck-core ]; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 4cd6413293e5..f1c82f189bba 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -5,14 +5,16 @@ }: buildDunePackage rec { - version = "3.10"; + version = "3.11"; pname = "containers"; + duneVersion = "3"; + src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; rev = "v${version}"; - hash = "sha256-eWmju4CD30+wX3sKI8rOUEbqbQygdOtc0U4sb9vYuNA="; + hash = "sha256-tGAsg98/T6VKvG95I4qioabWM3TEKrDKlsrfUJqxCyM="; }; buildInputs = [ dune-configurator ]; From 8910b1e180e1aa3451e6e9d0dc4f72b39cee2353 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Mar 2023 17:08:53 +0000 Subject: [PATCH 15/81] yoshimi: 2.2.2.1 -> 2.2.3 --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 41a4fb834115..52e0b7f24c3e 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "yoshimi"; - version = "2.2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "Yoshimi"; repo = pname; rev = version; - hash = "sha256-fkN5VNiXRVKCCAyrG6Z2s5qLEtHQNB2874VprhHBhAg="; + hash = "sha256-zVIOHm84wx6ZFK0seS9fWZfujDz259AXTv7zljbwrUk="; }; sourceRoot = "source/src"; From 26ff0e4a27e9a6c23d4aba5eb180f397f21cf6ae Mon Sep 17 00:00:00 2001 From: mdarocha Date: Sun, 19 Mar 2023 20:38:01 +0100 Subject: [PATCH 16/81] dotnet-sdk_7: 7.0.201 -> 7.0.202 --- .../compilers/dotnet/versions/7.0.nix | 266 +++++++++--------- 1 file changed, 133 insertions(+), 133 deletions(-) diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index 4d63be883f58..824533dbfc9e 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -4,178 +4,178 @@ { aspnetcore_7_0 = buildAspNetCore { inherit icu; - version = "7.0.3"; + version = "7.0.4"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/29b10b5f-6e65-4a08-a348-488c7b2f98c0/ab7b72e8669d7edf3966cbfefcd532ca/aspnetcore-runtime-7.0.3-linux-x64.tar.gz"; - sha512 = "fff857e44179270d937543ab429ca43a4706f9189ee8f60afb67813d3690652d9da08bd3e69c7acbb7c0b2e613b9659c4d1ee7bbe089c841126efd07dc23a758"; + url = "https://download.visualstudio.microsoft.com/download/pr/f2e33ca2-e597-4d7c-b34d-60e47b5fe2fc/a22feac281b4bf63c8b5195a30e6cce1/aspnetcore-runtime-7.0.4-linux-x64.tar.gz"; + sha512 = "b0d2896928c003abf79c539c1c6be13ad560a34d8fdbe9438d916a977aa59e648d0737b57aafb25fda1c3de7c95997eccbea28ae04e4131ebfcd18c36940bcb4"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/b6b539fc-e39d-4fe0-861d-f95b92e9d9fc/0f2f004f2b6bd4409959c821bb61f97c/aspnetcore-runtime-7.0.3-linux-arm64.tar.gz"; - sha512 = "95ead701041655d9a0ab19dc8f53b7780eeca127499fc294124d466aa12daf930d756de59d7e8e8cd563a6a744b74bd5372d82fa95eca0973c94cbb1595451c1"; + url = "https://download.visualstudio.microsoft.com/download/pr/639aae36-b8fe-4bb7-86d7-0216554b6183/3b5caffe27bb78bbb10aff729d65ae03/aspnetcore-runtime-7.0.4-linux-arm64.tar.gz"; + sha512 = "5e149ccdd003dfc4413927f23b07b2f27ce915c63146e514b2f88446bd44f64df51755644b56c316b0a1388c873404fc1d39b24a0bf8066f09fc37d6f32cc03f"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/f836c792-49e6-4a81-b440-b5aeb561425d/c21cad25b413027b8ab2bc6993210675/aspnetcore-runtime-7.0.3-osx-x64.tar.gz"; - sha512 = "784d8655406535cc6844af63066e51377594de17162ff2431acd8444a5ba0c6434271b592c38f3ace2da0cdec693f3bd2e681316b972789a577e05ad1e9c2e9e"; + url = "https://download.visualstudio.microsoft.com/download/pr/eb055f27-b58f-47db-b291-91a2700396a4/7b313614b3ba0cd2f9e57b288c82f0b7/aspnetcore-runtime-7.0.4-osx-x64.tar.gz"; + sha512 = "36a573380caeac220cd7d4bb1a008f440f37eee21be4c0156b95974739264ed5b3ae1776462a5dee286f387719d3241b57141d2604463d8367038bc718d9178f"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/09261fcb-ce1b-468c-8c5d-54058e75e5be/d96eac7765210eb09f37362b793b0934/aspnetcore-runtime-7.0.3-osx-arm64.tar.gz"; - sha512 = "379dc7aea65cf0c97a919386f0e4e756321f522c6f658de303543763b0820ff9a6efc0e27c908065a5f95ff740d6ba469eaf264b1f36b017f2fd748d76787458"; + url = "https://download.visualstudio.microsoft.com/download/pr/d70d5370-7f1c-4fd9-88cb-504569112323/32a23f276392a1fb04f2f3cdd35f961b/aspnetcore-runtime-7.0.4-osx-arm64.tar.gz"; + sha512 = "07771022448fbda4248ac153d401c11ff0c9cd33ffd9a6c480e7a8618b802e7e33152673557dd92a5467199c275ff8b0fd007e132ed650d594759743d3da7f8d"; }; }; }; runtime_7_0 = buildNetRuntime { inherit icu; - version = "7.0.3"; + version = "7.0.4"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/2431d5ac-f5db-4bb1-bcf0-4a2d9725d4e4/1b0747add72af919754509f83ad08660/dotnet-runtime-7.0.3-linux-x64.tar.gz"; - sha512 = "d5cea2e674e9430174da793942b4ff5dc1b64d12c731dd3324ef520a2fb11787782f2f8ffa83023c41a0282ecb174e2a49a2c0aae1b327a58fcbd2bb06c4e256"; + url = "https://download.visualstudio.microsoft.com/download/pr/08c89e27-b593-438e-8303-af765b90e5da/28b1b06748b86a694ac4ddf43d546a32/dotnet-runtime-7.0.4-linux-x64.tar.gz"; + sha512 = "23e6aa3714410d794bd25af781046757003e3326cb8b13dc256649011815038893718b44ec2162767c7da76f1e16b170656d5726e7c01e99b9577682ecfe281e"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/9a7f3ac4-7692-4474-951e-c86beada28e0/0842fba93ad196897ce6bda3bcfd7edf/dotnet-runtime-7.0.3-linux-arm64.tar.gz"; - sha512 = "605f4d9657396eb2c9825d1576836115492221a7733f36638d9c6f14f1c15481c908b6c8dcc619ead34beb4d4991d810e2a69a8bccd7c49ed0f4d72411d1a5f4"; + url = "https://download.visualstudio.microsoft.com/download/pr/47a77eda-2e32-4106-bc84-375b873a9839/c6d88de403b103248f67f429507ea269/dotnet-runtime-7.0.4-linux-arm64.tar.gz"; + sha512 = "2726dc5a0b7b97c0e1ad22990b31133a1af46cb62d625778a9864a0047462d12ef705eebe08e73514bd10af50c06b5c9714df070f29c5203cf1c2587645d84ce"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c8f49e77-4d55-4a33-aa87-ddc034be61a2/77a50b1726446bee5a3a4dc6573568e2/dotnet-runtime-7.0.3-osx-x64.tar.gz"; - sha512 = "0c3facc23e8db48bca33e3133ca85c2c6893a56d79f83d87179e8520712cb76c699df0040dda5999591c47a128a7a3b365f62b500cf802091989a23b41eefded"; + url = "https://download.visualstudio.microsoft.com/download/pr/e4dd643a-16b8-4f1e-ba38-cdbe32cc24df/67b307accc4abbbc2238310d6ea3c516/dotnet-runtime-7.0.4-osx-x64.tar.gz"; + sha512 = "3042f6c711da88a669c92101ad3f6bd008e475230d68802f52b2748a8db6eecfd2af40665669a3d846910bcaf63ea27277f6a33bb76ec6fb3e256320e2f6dbf0"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/1dd7d303-2c33-4fa9-bb3b-150f768f75a6/2df66ae5492711c468f1e6c582a440b7/dotnet-runtime-7.0.3-osx-arm64.tar.gz"; - sha512 = "2bebf2296eb65916bf4b88c9447df442b328047794fefe4f5117a9ce2053547b6df64afbfa8f36eed9a1650af37824fb2c325568deb3e171d8e5970a4eef6520"; + url = "https://download.visualstudio.microsoft.com/download/pr/bf2d81d2-d793-43c6-af0f-763a48e1fdea/0457d06cc4e7dea7fff49e944691c72e/dotnet-runtime-7.0.4-osx-arm64.tar.gz"; + sha512 = "4451ef94395eba2dfdc1af4b43f619d58fdfdd444fb122ddf1666d6f9002d792a52c52f64940433797920fde680b999095872edc1233c5721994c2092978cc85"; }; }; }; sdk_7_0 = buildNetSdk { inherit icu; - version = "7.0.201"; + version = "7.0.202"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ec76d8ee-8776-42ce-b158-f723a221fc56/0baa1089edf0e0674d719f6a5d847b75/dotnet-sdk-7.0.201-linux-x64.tar.gz"; - sha512 = "fc9d224bf1d3600e878991fc1e8d3b1a0f21c7a8aac7b3cae0e4925ad33172cc12f56210eabfd66cfedd5f70f85918b889673401172b3999cecbeb8f2fe58863"; + url = "https://download.visualstudio.microsoft.com/download/pr/bda88810-e1a6-4cf0-8139-7fd7fe7b2c7a/7a9ffa3e12e5f1c3d8b640e326c1eb14/dotnet-sdk-7.0.202-linux-x64.tar.gz"; + sha512 = "f415a8e6c078421759a963aa0b232c092ecf2f0a8e014ba72092390aac792ed35e8f3c822b2ce91ed636cdee9342bba2b89fb4fdfd2d28dbb0ac856d828cb29f"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/35901872-1f00-48e4-9f55-e6c79823e7fd/8af43bb5e25d090c0af921974287ac2c/dotnet-sdk-7.0.201-linux-arm64.tar.gz"; - sha512 = "a4c4d0e7d51643d6a7ff3322f795f0cdf174f62689606304e4dbfb6b38717b111d0a21ecfe2efea0234947deb87383b7cdf38e96b7e4b7bc13127b0d70431b9b"; + url = "https://download.visualstudio.microsoft.com/download/pr/c1fd11b0-186a-4aa1-a578-bb1b6613886e/b67e1c9d6d90b1c99b23935273921fa1/dotnet-sdk-7.0.202-linux-arm64.tar.gz"; + sha512 = "6f03de4ef1d0f67bcf8f794beea1a1497c9b1d31c484675382ad63a686ad3047ba2e12b2739ef2bf70c12e61a462ee8abd87e96a7c48200dceab92094144b332"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/71de3463-3644-4159-a7cc-e3b613eb7167/785a9b41cc226c368f44b5742bef466b/dotnet-sdk-7.0.201-osx-x64.tar.gz"; - sha512 = "c5f9ac1ec09f78433baebdcdfe47b715ece63df89b37bd4c919afb09cbb3183f2aa85e5fb12b9842582a343ba2524c5f1d764e607d7465ecd781744473c3fce0"; + url = "https://download.visualstudio.microsoft.com/download/pr/d3fe9043-0ff4-4584-aacf-1ad41c47407b/7b84ed341359488cd0de21de1b4df6d0/dotnet-sdk-7.0.202-osx-x64.tar.gz"; + sha512 = "3e99224ecb4a6ad06b96daf7017a749dfab1a9059daed1304a35acab9eb4fcb0a97f8e1b4d8c3074536b9dd8dd98dc89db3603057ae59a59e01d459bf26f4fcc"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/92a51981-d618-43e3-a93d-d6f0d178ecc3/020dcb1797b5a73e690bd6ad511619e1/dotnet-sdk-7.0.201-osx-arm64.tar.gz"; - sha512 = "33264819fc928e2206127060935cc01f443f564c2e28eb9aecbc83865697347967c639820496f21c0a7039aacd83b548944fc2a3385f32f01079760e9d0cb677"; + url = "https://download.visualstudio.microsoft.com/download/pr/4402413a-ef81-4732-a0c0-38f11694b226/e205b8bf48d95902a6dbe1c3cccca272/dotnet-sdk-7.0.202-osx-arm64.tar.gz"; + sha512 = "9f5cc528d5d229cf2f63384afa52176f049c8d9e0d9d9be0ccb1a169be78a65a61dba7a4e74357685d434447b3d2697c062e9f240a8d8ad6b588fd433ee67acf"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.3"; sha256 = "1lswf2zcc29nrdx03gy2s5km8d3zaap5y6zdx3p90a89z767szcg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.3"; sha256 = "1gfyqn029r3s9hdm0lqkd781m8p3y11gjsj7pwki7a65bh1ynlaa"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.3"; sha256 = "03qb7ycpbsbn684n43gcf78d5zrq44vxayfp9160z7lld65lq876"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.3"; sha256 = "1x439wq5kavzwn4h12g7pw70vg6pkwfq6zvxdmlh2iks6mi43zzk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.3"; sha256 = "0lj6a130wqw6vzdik5xfgjb4nids6p500aihwb0hjavzfn172njy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.3"; sha256 = "05rxqaqcx82mwjddh32wnchi2zhs8fdqvcgmbgk126s0yswbzwsp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.3"; sha256 = "16rhk79fd6v56bww92nv9d57k7gw71sr9y1yypp7zhwagx4b3jfp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.3"; sha256 = "1lnw63y4j8v0l3j0c6khr8asb794819n56rfkmcnxgg700s3vsg2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.3"; sha256 = "1jmh6dgziin9igjnfdw3mg631akfbz2g2jnpddrgjajj9zs10zlq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.3"; sha256 = "1r34n2qyh5q762dj78fd3b4z9z4fi0mgdr3ha7js8dva70cnrywd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.3"; sha256 = "03hw0wsbqqz8fm2zvpnxyvr6z93i0pg512snvkc95vk5szcxkx33"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.3"; sha256 = "1662dh2di0dfr640v1964n0861ysv1h731gdkqsl6sqsr501wdad"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.3"; sha256 = "1hqmgxj0w7ihrpv9sdqx04iv8pmjz0zsinyymc1gbv82vfg16374"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.3"; sha256 = "1c1l23k2xxidpcgxgmf1n9zns48lhajxzac24pnzxjf22jq0nsxb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.3"; sha256 = "1flz3v6yvm2c9sncnlbxp7y374kirham4sb98y5sz4zijbgp03ps"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.3"; sha256 = "1x5i8v3n88bsv64xh456fgsa61ga589wapc3f3yliip26p1n5jxh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.3"; sha256 = "06ga185vqg9v3nqjy4ifvj4jx4nc7n0394bd9j0s2s5mhhbca0p2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.3"; sha256 = "14yqbljchrhbg2zs78lfl6fjy747ms15sqijslsslcim3mhki8bs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.3"; sha256 = "0dcz8vk84wvdc1xfz095sg3a9szc1wmlcmm0yf3ghiy2ifbsjf4g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.3"; sha256 = "1bby14npfw5frb372aw8cijb93slfp3n51563azbkxwzxk05xcpw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.3"; sha256 = "0l889zs93zr3640lm9r5bymk3mc070v1d35jzix2f7450pqnbgmc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.3"; sha256 = "0435w7rpqvjc6nnrw748bjl8dbm2dmc4gdyx2i7539cjf9kdvjlm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.3"; sha256 = "0qdbp2i4v6rslnbxb23hx0gzk2554k2x3ph6z7f0d3hivr1vip4i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.3"; sha256 = "0hciqnac7dxmsim97bz0bwpw67jf6xbdhbzvgih9lckhdillfa6l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.3"; sha256 = "111nsld40834z1q1cqgnlqrvxqlj54gnkhrys444ipikgzkp9qr0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.3"; sha256 = "1b71yipj8lsq3sri78hwbrlwrqc10rbi2zpa96vmn3ksahchdkla"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.3"; sha256 = "0k34vf3b7r0n2qw863rz2x4cp0zw1grjmp47dcca68dzmpd8ziz6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.3"; sha256 = "104czw878d5mwfwyxac337a0wbzrk50nchbrclv1jprm2kq6alsw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.3"; sha256 = "0ma5h44ibira1991czdww1pfj8g5jpgjrlzvgi8y87yl8idfs25d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.3"; sha256 = "0l5j5if39zp24i61pggf6b9fi1i4i0ky831yvwpij7f4rgfgv9np"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.3"; sha256 = "1m8wyr2f5nk784rl0q8x0ffafi0glxy1mp4j2003c4x7lnaa7a5n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.3"; sha256 = "070gnnk6pdjjwbv8l9njfq1j9pac4m4j01sidwdra2bxq94mq0zz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.3"; sha256 = "1dpy66haz3myjvycf64r8csmscfy389g6pnc4shpnqfc0fzh78ha"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.3"; sha256 = "1xbnr4x91m52kjz4n553kpnp0lx9walnw6hjadgh22711nglhxqg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.3"; sha256 = "0sv95qx5hr9k156m7b30pv9dx96kqrwz9gdcdc8mcwvj52wjazrx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.3"; sha256 = "1p5pa62laj15i4ycd3czkn4zpb3pwk8kdfyvhqi2v037j7i97ch9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.3"; sha256 = "183c48q29cqcj443hm1ssmxcgr9w28g8ffrd3fvbzxxpw7s09msa"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.3"; sha256 = "0p7c8djwz214asmmmnzlrc71rl3hydw55r788m315vndck17zwsf"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.3"; sha256 = "1mxz8k155pyqwmfj11kwnzjin1c01ggns8c7xwgby92nmkr1psan"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.3"; sha256 = "1znc4khv11f8zfg03v4mpksi667h252hwqn871ahzrq7qin3av1l"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.3"; sha256 = "0smps1sbmiq803mvmg6ix41jys0fqwfhm0ajy5sbfa9bh52lafr2"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.3"; sha256 = "10f043gigv7gwl5ic3rb109vq7cmkmfqcd479d52qscw2znfvf88"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.3"; sha256 = "10rpibw85k1b6008lqkn31w37gnljbqfa0ywc9x6skydmiwzilka"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.3"; sha256 = "1kif2kqka5frcb1ka6n955fw7qlcrsca77a308q2ypga2gwrzk56"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.3"; sha256 = "1350ckgbvszryh7vjhlggcns4p0qm65zrs34z3wn1639vq3brrsv"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.3"; sha256 = "1l3b9ysrd77xsi7r49653m7szhrxaln9dhfx1gdhcy7dl3nj6aij"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.3"; sha256 = "0z388z36ql8ynbxgmwlm0y3hka8w9m3qw1a5p76prl3vb7z27qc0"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.3"; sha256 = "0gi7lx0bwfiv1ibgdfhf0ajs65ns1q5z1201q2mky9ps6jz5ixwi"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.3"; sha256 = "18nd7xgl9ka9nqaj3fqlgc5547b70w9ab265p5avf4mimmyjy9pz"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.3"; sha256 = "0ds7p7gxldkcdnlfxpz7xsjdfj2kksfrgwkx85wdhxhc9qr1kg9f"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.3"; sha256 = "0qlv9vrv11q8v9gf6dva3jssnyaxj7lnrapl82mpl2qncfcrkv1y"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.3"; sha256 = "0gf650jwh432isj3xj0d92s7h6prag2k7psgnlxb92b82vsannaz"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.3"; sha256 = "1q9574y6d4cfn91m4rqm2ylkhr0l9yy66x9yf7nyrq9y09r37s1g"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.3"; sha256 = "0r0vjza5g53k037gnjzm15h2aib2m4flxsjixni8hk1nj6aa9gj0"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.3"; sha256 = "0z55wh5w2fph0xwvy4gs28bv7f6dlw2h0gk1qibka0dxsh331ikd"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.3"; sha256 = "1i3ycqz3dczfxrxqfw1wlly7dwqr6bmbgsihn1q8rg785ahssyjh"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.3"; sha256 = "1884cf4xg7wn8pivd0k5zkdp4m5lgpz3sc6j3qpa6szwcs362g2q"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.3"; sha256 = "02r060dpa0mqrcbzwkc0392xz3q226vmjfa5kfilsr572fsaibc5"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.3"; sha256 = "0n8r2gplffqixibllvxi0sn52yww472d9yvknpp5zy08pngdglpq"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.3"; sha256 = "1hmd53jhd3b4p4lhx1vc4ydixmi7ncpz8s7cr64dfy0ja5if5wlh"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.3"; sha256 = "1kqz6k0dmfa56x64hsa1im35q421n9c5vy8987wr8a6d3f28qg7d"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.3"; sha256 = "0sgsar8azkjifxvzgyd91xb6k52nlzxw7668vpci27f68y1zkgnw"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.3"; sha256 = "008qqamcf7yspzb66z1xp47xzzninf1p28nr2jzpg0acvzx6rwmf"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.3"; sha256 = "1biv9j628ldca94pl3s4s52q9xi6z9afv903cz21rhcj76n2n2a9"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.3"; sha256 = "12dfsrhh01m9v655w76n5yb3nilb668ca353s2q95qfijx1s4bry"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.3"; sha256 = "04bpbjsf7azamh1z7cvq60m1lv68ggw705cvard1x0hxjmk1sndr"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.3"; sha256 = "08g798gz9dfxd5123m92cpgyw00ffsc5am7pz0fgwsv06vkvfqji"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.3"; sha256 = "0qy16596waicfgvhvjbiy98cizr9xa9r0qkr4dax87394qinvg0x"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.3"; sha256 = "17abxsl6wvm5cblibxnxs2yl9cag6p8qkvykpw29hwzl4vb1mlz8"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.3"; sha256 = "0k3x9klqn43f9k23x9x8acyjn90dlacx5lwq5bviy6b4izzsj496"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.3"; sha256 = "1hn2z2vvy8bahkl9i3sjsgg08q6zbvif2a3jynhn6lgdm5maxj77"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.3"; sha256 = "1q7mppvcg9skbqh8v7mihq2q0192z7p1p7c9b5llbdwhl3rb72a7"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.3"; sha256 = "105qjpxy4lr8i62sys7i9rkpdkr32f049fm4nals1sdyl7dwxzzi"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.3"; sha256 = "1z2pp0879nfp4sb5vpzr7snfgakpl1gs075581rvp0n419gnlvsj"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.3"; sha256 = "106qg62vcsz57fi8qql5ly1vfl13w34clbj88gg8shqqv87h7v5z"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.3"; sha256 = "0hga95snhadszc41njg0wzrcp0fnb7iqsprp4pvzyzfw4m2x1b9l"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.3"; sha256 = "07crnpbma9mw6mya2fd0qpkkv8zks55p5fcdn8jff2q4p187khf1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.3"; sha256 = "0qa95ybxyb49dlv9i03klli5wg27bf4cj2km27fyw3vwz4g4dra2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.3"; sha256 = "00mrwbxy17j71divsnvw73sga7lm5s2a7nnlrc90c41bh6bchw2z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.3"; sha256 = "1rx8i4fflrjbkd9xgqj6kh4ygcc7pvbvkjsdspjbyviyrvis533l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.3"; sha256 = "1gk7nnaw6ykqsiq1sqj768q4rg26ggijgarr3ncjnjxybl2q243b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.3"; sha256 = "1adxcf1wbpk3fn311kr50p1hwvyk52d64jv9hmg68kbv9df9zivs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.3"; sha256 = "1jxrm0pchlg1pmdy8kp5f3idjvn13g0dcvklzfzpswvwwjk3bfsg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.3"; sha256 = "0isaks5p31zzq7gmi1z5ma1j0224205iblg0hxlgz1q8aaxhmxsi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.3"; sha256 = "16x8kxyn07wjsf7mr6apkrcpqsix8icrgp246g177zl0xw9f6xv1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.3"; sha256 = "00r3r8plrmavkhqbj0zlrmni5yvrwhfvp8sdpm492yy8mpp8983y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.3"; sha256 = "1hg8kdp6f50r3qdjgg3bjdl1g3ns42qvhf0rk3f7rxxcqqbkqxic"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.3"; sha256 = "17ccj3r5yd1y06m4qn9z0plllrzqh5r9ljyhi12h0q0f27s1q6fh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.3"; sha256 = "10dch69yplclksfnckkg5q3mzivkh36nfdfixqak4w0xxs8kpcya"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.3"; sha256 = "0xrqdvr4gn0j800did7894ygsy07pxxb12n5mn0m576mbg2lqf33"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.3"; sha256 = "1a7gqklr9bh37aarw905qshdcynk79xnyklsyiblynb8bpcsjy2f"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.3"; sha256 = "0jlgdkkh1g23dl994565qglg68ky6f7fyp9a3swqyvv7pgm864p7"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.3"; sha256 = "0j7iz4ciqzl7f5hvyqy0cark0bhwp6yjk9mvd3l25li0n76fydzf"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.3"; sha256 = "1z86fdwx9clqrza77biia27jh74r3i4f22xrwdqk65f5id7fls7x"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.3"; sha256 = "0h8fs13jkqq78a1jxc0nv8z4pijzhd2yfa7llfmdn35yqz69iq5g"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.3"; sha256 = "1ycb27kcf3gs11rv6ivhx4dwc7b8c7zshmicfslpms471hg318dr"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.3"; sha256 = "1xjwkq843wqbidfd9qdv1cwn1lq552n3yrk80frxz0gm3jz8g84s"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.3"; sha256 = "141nq2nchdwjvpi3s61svk9lk6bq6hvd808fspszacq7v4fd71kg"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.3"; sha256 = "0dyb7hs3g2hzflssd2wxkl1bk8zscskr7d93w5fyvpb5x7pj2qwq"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.3"; sha256 = "18yxk532qjjvpc2pw480k31mikw3kq2g51i3rnaa0jz7h7kv1g2j"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.3"; sha256 = "0xiv8xvak5nsgfqy1171d309d4a8xi9hgar3ns1ndray9m7iv565"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.3"; sha256 = "0j24dvvbqxiskn9xvmw3kdmnxx062l13jsal98bmaxidmhgyvi72"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.3"; sha256 = "1mbp9fkiqfnbr5azl0fpln6w357nj8yfqfqqpg2wnf8lggv7jm8z"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.3"; sha256 = "0a4lyv6sj0h4sj0m04zijd58p4lpz65rj89wqyw5ccihx7fma02w"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.3"; sha256 = "18768p9d0f5cv0x929hbrcwpgbvipngfkac1p81b6r0cnmmfsl45"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.3"; sha256 = "0cj5i6c3dhd84zwspbvihvrfq4irxcq8h1np3xx8zg5xk72hnnsl"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.4"; sha256 = "0frxqid2k3ccz5iyijanyqvcdfw6a13igglg6nw8mjn8yl5r5anz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.4"; sha256 = "14r8zilwl2242n1dlz83wzaqs27g54a96my8m03x2cfdfpzq3l73"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.4"; sha256 = "0vxh3fgfzlbr3jk00pjl70269x37nb63x7ginih6rrhxql9qjp90"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.4"; sha256 = "0f746iqqh3qr74j9a1snj91a4q9vb0aikjsckvagydm4fmrisi5s"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.4"; sha256 = "03dl7fraly0yfx1fkkdcds87vgw60aqaxzr34pqkv26ac9c980sr"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.4"; sha256 = "1mf4zb7rhbqhnw6bm5nhrgw4ly9bmk1q8vag30rglp9yb9fkd1i2"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.4"; sha256 = "1ycf9hwd31mcks6vgdhiicimrhjn3s4ddznyziflrdn2dcayxap4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.4"; sha256 = "170p3q2mjy31vdz43gw8202lz172ja45fzlwz9y3wz9x0cb9sfly"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.4"; sha256 = "1jz2gafjhhr34q8fk3qi82jd4x480hpgjz8h217ww9yk94qyw548"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.4"; sha256 = "1wvlpfjqc395amj6dwfv4sm0299s3hcvnv2yrwmllnrqx9zz6kvf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.4"; sha256 = "1hldg057gnlxyzsx57bq1wvsjixf6yc18v9slp71c3f0j5qa2ch8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.4"; sha256 = "1g7z7sgs89qmj3q2j21g5bbna1ypsryk6b3vgicbg5laqhi2j2hg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.4"; sha256 = "0qvwp5dzbhlmfxy8pmvm2qyma24q1nylp2g9mfjxjb87lgxgf3m6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.4"; sha256 = "00pqnl8rnyasmzjri9pya19k6w3cis7r8hhg0vpigsyw16daaf5c"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.4"; sha256 = "1w4b1priz3cvxb70p1f4qi01qx22vykxq6wcdcgmwmffgvqw2v36"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.4"; sha256 = "1wyj7mxwlzs49f50rnm89b13yvcz4a86hfsl1pdcafibww2bdzkn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.4"; sha256 = "1nrfahgj0zgagc1d0hp6pc5prwwdfd72di5w3vn9cpr2kkiy9dfi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.4"; sha256 = "0pnrj15q3nmc64r052gmx1b4anxy4ighmy8jsgb9zm0pggc0izgp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.4"; sha256 = "17pfi66zww58inq7irwhyf6vaa5zaxm59p36z0sv3qg1fz1gi19j"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.4"; sha256 = "1kh8ryb0gj11d1qm51rnwg6d7flh6dki0vgqhfr863mb6kr95cav"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.4"; sha256 = "1sk3gki48n3slj91k9fgcpa7ijcsqka77y9wnvc3smkh6zkp0rh4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.4"; sha256 = "12r0cykaj5fj3zahlnwsf9msnf0j0iwmk8b357q4vm3f3farx49c"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.4"; sha256 = "0k46cf73fsn9n0xf815qwyqlblczx5hfavbazcbllv31s58r3873"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.4"; sha256 = "1zd2sy71b3yzp9jskr968cpk0klbw48aw973pfaxpxn1az8nsncb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.4"; sha256 = "1782qv428qmn2xxkcbnc2x1szznxlclpy20bn296sn3cly09kzcx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.4"; sha256 = "05hfz20xnlxxxz2f28cd6250bvlc0myisp7xwklqk3hl4lf1rpkp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.4"; sha256 = "03v1ld1vmsiamqv8pl7ddbdv1fywsqgfa35qfpi0gvijya416skp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.4"; sha256 = "1n17qqnc63g0ggc4j76j1irxii4ykjg7pw4zhy95wd63hn8r46c1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.4"; sha256 = "1fjzqxi6z0mjk75pigf2k975jchxs86zxa8ymg3j8f400qkx8hv5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.4"; sha256 = "0q3y5cnliixqcj2690msdm49yf4f4w0wnzzfkgwg0x3zsln98aml"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.4"; sha256 = "sha256-GtMfaHjEzh1CSQWX+R+sWkyx0gy5LPk9Qk5GuU6nxNc="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.4"; sha256 = "19l4fvgapfkqc8bx9mp1b195gzsmwcqxc8913xh1y16hg7byha4q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.4"; sha256 = "0lkwpypzh8z0c4blqx3dd6s5zbrh4d1xwc6dral4jdl8ajmqvhsv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.4"; sha256 = "1c3blrivlvjx0v4ijf5wli2iby8kx9ckm5ysnqfbqw3x6yfj048w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.4"; sha256 = "0hzkf49nq149xywpgf0k8yya5krq5wlxxncmslf9sdznahkbv75x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.4"; sha256 = "1vshi2j7vxhl805nr2z1cc0h0dyi3d31nakk70y1zbsl9k0a3zil"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.4"; sha256 = "1nk336rzmcbg46d9lq71w0r9x5nra69x9vz8ggv6bqk58d6ghrr1"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.4"; sha256 = "1p8aya13an835n6ddgjjhbap4v4xagikfpp3laiq0kxjwwrc3rln"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.4"; sha256 = "1raw3wscfqwxb5sb05sl9hx886j3s9s31i8dgnmyjbcns92413hm"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.4"; sha256 = "0xylj1sr8qqn5zqy0hg4xq23by1fn8kbjrlls4zl695h348b611f"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.4"; sha256 = "1s9m0gmg02zjlnrxylqys5lydj05d7qlha9q2iqyb74aiv32r63c"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.4"; sha256 = "0pfcihbg7yxpw05i2n6cx43y9k1wzyqfqsy12ij1q9ahmzmnxf0j"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.4"; sha256 = "0iks6j0iz6wxghlnzi96jd5kf60g86g15qk887nv8w09c98ydia4"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.4"; sha256 = "02nh00kkijmrbw3815m1jpvj1hz6g1rjhkwd7f73crsaf3q8bqvi"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.4"; sha256 = "0n6c62mzzq19c37ljfr7vl7hx005lc9qs7jc200jb74vmhx0r5n7"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.4"; sha256 = "1ryn34y245fy5hq0mw0c4b0lc35f790kmmym78mmazyvxkla1irc"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.4"; sha256 = "19wy98bbg41rp04sbm0ix8bsl419dqmvz3nv18hc44nk8rn7s5m9"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.4"; sha256 = "1wq1ccqdkbr0j90crs6fixvigqcq4axkwabbfzii2zqszpzj24n5"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.4"; sha256 = "15wzkpcdqmzmzkdn5k35b7zhw6pym4g2kx5w8ydbz5yw9hz4maiq"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.4"; sha256 = "0a60h1rgmg051s2kizsy4hxpjl0ic4av668n71hmzyhrckd6g7ir"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.4"; sha256 = "13yfrfi414gkmddandcm974xpk6gwcxvjl17w8h2wjq9irdv4cdh"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.4"; sha256 = "132lj52hfjm42dyrlcmbkfja7zqnpv5x047q4v36nfk6szcz4d2n"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.4"; sha256 = "1nqcvmvmsaz64b9ml5s605yv6ghv9flvn40h4y8mnpc1md5rm0rp"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.4"; sha256 = "0q51v088sfvw89bwfijkn7da21xq2zpgq8b1i6yirngc91511yha"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.4"; sha256 = "0sg3x7cnrr39pymcylbd1sk2q1x8dn09f94d8i103x5jny2mqzvd"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.4"; sha256 = "0a7rjc5g2x21w755mpgjah3m96cw96lvl3hjisn0667ldc2qkmym"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.4"; sha256 = "1kmd8kjj2ncimnyv9npiddxpbw9b65ga6kv0h4nrvwkv8pfh7xsh"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.4"; sha256 = "05wd92drm5rmazv57bbj27y7nvi70ham9574jm28im1fxblysjcd"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.4"; sha256 = "1ivd1wck702igbvnwppvv64pcgqyvfic0wlhd62pykd62ffi2yp5"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.4"; sha256 = "054jl9819fwzxqv3m69icxq0s1fcsfhalfd116pbzv0zwcynaka6"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.4"; sha256 = "146nnyc027my95fn45yi494hli40dgy1w38akw8n2a784276hbf2"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.4"; sha256 = "0d3p7sznr4axlg0klhf47zhbzapn7km7rbmx5837hdkx1c637j8v"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.4"; sha256 = "0iwj64c01nmcwcqmgc1gcz47wn5anh0dl5vq0n5ihj1shp7f4z8p"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.4"; sha256 = "1c5swz49px7akdlijbcsd6dv2km0xyz7i2p8c5915lf4hni5pzvv"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.4"; sha256 = "0cskh5npdchjqdr30csvzflsh82vwr9zp06816243n0kwixlw36k"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.4"; sha256 = "0xmwf15jp14ydzmk4xf16gcpaddx7pjfyqfaadp86mpcny5jb9w4"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.4"; sha256 = "05pcfnq8gyrkrv970zg75yqnc5nc8gxk9qnx5qx9lrds9jjrp6xf"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.4"; sha256 = "1m7p6gwa66f1f1b0rnwja8w4fjh6kw3xvmvbbcfjqhc869knhx7n"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.4"; sha256 = "02y8h66b92sw88xadih2wgqkmb1ndciwkg231xlnb8sjdzsa7ax6"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.4"; sha256 = "12g23wdsv0k8v97ja873gv20asw1m9k76zj57z9knm0iskgc23yz"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.4"; sha256 = "0m43mmlchpaihfp8chhjgbysfvapbhyx69y194yfh86sj4h5yhkk"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.4"; sha256 = "16ygc2rbjank2psnqyb55r87i9y8prw1r1h0qc696wi1cfwwvs60"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.4"; sha256 = "0hlprdbrs4f9799j8ai4dm5ds73pn97513nxq2gh6n8hvy4dvkxp"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.4"; sha256 = "1sf08lmm6210bmbbn36qswqdxig1s5mpmikz0bqiljk5nqx4h4lk"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.4"; sha256 = "0knw2cmph9vjwbpjvgg0mb2lc6phjghjprfk1g9ars10g0amwvc8"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.4"; sha256 = "11l360qg8bjd18nkvzsgn9fvbmgpzj8i5g8rdyaic17rqsyqhlb1"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.4"; sha256 = "010z2117rh9a9zycfqxnnbfwyy42aq3fxfqdd1g2aqnrijyaxz5b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.4"; sha256 = "0zkl287jycd8v43x2s6zrhl97ww7i0h2lr9jbwgf3vl2p5hph3rq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.4"; sha256 = "1gv4z67ig2k2fm4529l8k255d36j1795nv42a93z1ljdvm00hxck"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.4"; sha256 = "0ryc1x9h6vy5vpjxswmy3cycqr61d82zz2ipfxywcqzaisfcga5q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.4"; sha256 = "0ig02wwn9hvxv8v9mgn220bljfdfpar2cjia257cvg7qrpbkmq4v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.4"; sha256 = "04hlqhav56p9iwbbf0qmkqq4hfc4dvi4az2xf9clyc472a5drzvd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.4"; sha256 = "0wcla38nsskgd2fh7knc3d1f9hm2hmgw8254c1hrkni97z1fc59b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.4"; sha256 = "052ddbl11ldq9h1sp139lbhnsw6ykaw6fmplirvv6hjgfiswb62p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.4"; sha256 = "06mpp52grwzqw2j5nvcmmnd7kwrgk6d3mca8rfypwfdaa2y532dy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.4"; sha256 = "sha256-BXCVsf43e/1teOcBPdrS5R/dLns7rsQTRLMQsdbB8BQ="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.4"; sha256 = "0kangki5hkq4py7xalvh600nc9n11la4dbb7hkak40472hz4mzsz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.4"; sha256 = "1lzia5py84ksr9i24vm6c31cd5vq5qdbc7m81kmxybbwnlj0nl96"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.4"; sha256 = "06vszg959k3qib181qxz5q8w4v9di2a2ksvmf9wxgxc8lp285fbz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.4"; sha256 = "1a642v302cldbvgdygbzix6cj9b6rb9g3iadsaxdsnjhpc9xmmyl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.4"; sha256 = "1ihl8airysgz4y289ynbnbc4zy4rrckcq4n2c3gf4d33ghh3sq2v"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.4"; sha256 = "0ihw34gp8d2q3wc1vg34pk7p94xll4mib88csv4h9kqynpayfjdr"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.4"; sha256 = "1a1p3r7d7m7441zdvms6g86i5lsfxwkw1rzi6f3kp6av41xrmz07"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.4"; sha256 = "194fj00ksr5pjy2disnxgk4nwyb8cx00dsgq1mrvvm3qvwvw0nlb"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.4"; sha256 = "0gc527gmj7da24880gg3lbxgff7551jbqkzwk9dwvc8b4kvw7b72"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.4"; sha256 = "0095zjp2f2i06ybdm68x7b6ymxk70d1gyrkmwk31k5xv5f4wzh8v"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.4"; sha256 = "01parlmhjdgs5xsg9x87743l5nd6pyprvf9a6y2w0zsj00ijv36s"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.4"; sha256 = "1sky1i97zphj0b2j3b9sbsq22qqs2wlv7ri92cqf4rmp6j8nzxjp"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.4"; sha256 = "1683262zb7wsigjsyb87dyz9rflsmr5p3nlg1nqkshgdl11z8h2c"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.4"; sha256 = "18231pjsfgb62x2ciwz8vdq195firbhha1v4k3w7115d94vqf8nb"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.4"; sha256 = "11liny45arxmlxss93hv58mnx3shqsnh1qdw76kl5hmh7x4cgh73"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.4"; sha256 = "1r5qngcrk6d8h3sivz04mlyly61pzb5z84bjbrgspyvnzqg4dnnj"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.4"; sha256 = "15i5agj7zj026mqni4dbfwfyhglx0kjkqdfl1qnmg5xgyihbj76q"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.4"; sha256 = "03k8045r8br5wyhinq3spriy81gav3157cvh8hb31f651lprz5ij"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.4"; sha256 = "1am7sahsajrlmgp4rj1d79v1ncgaa94b2cw68jhmkx5za7hcssmp"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.4"; sha256 = "1kax8b4l3sxna6lgazzazzfagxawhjm0dhpymdmh9p76ghm101x4"; }) ]; }; } From d093086a2b20a4b2183e85ee86d663f54dcebfef Mon Sep 17 00:00:00 2001 From: mdarocha Date: Sun, 19 Mar 2023 20:38:24 +0100 Subject: [PATCH 17/81] buildDotnetModule: add support for using combinePackages as dotnet-sdk This allows packages that require several dotnet versions to build (like BeatSaberModManager) to properly depend on the dotnet-sdk specific deps. This in turns avoids having to regenerate the deps of those packages after each dotnet-sdk update. This also changes nuget-to-nix to accept a file with a list of exclusions instead of a folder. --- doc/languages-frameworks/dotnet.section.md | 2 +- .../dotnet/build-dotnet-module/default.nix | 17 ++++++++++++----- .../dotnet/nuget-to-nix/nuget-to-nix.sh | 7 ++++--- .../compilers/dotnet/build-dotnet.nix | 4 ++-- .../compilers/dotnet/combine-packages.nix | 15 ++++++++++----- 5 files changed, 29 insertions(+), 16 deletions(-) diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 30a12d4e8ffa..2152f86165c0 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -88,7 +88,7 @@ To package Dotnet applications, you can use `buildDotnetModule`. This has simila * `runtimeDeps` is used to wrap libraries into `LD_LIBRARY_PATH`. This is how dotnet usually handles runtime dependencies. * `buildType` is used to change the type of build. Possible values are `Release`, `Debug`, etc. By default, this is set to `Release`. * `selfContainedBuild` allows to enable the [self-contained](https://docs.microsoft.com/en-us/dotnet/core/deploying/#publish-self-contained) build flag. By default, it is set to false and generated applications have a dependency on the selected dotnet runtime. If enabled, the dotnet runtime is bundled into the executable and the built app has no dependency on Dotnet. -* `dotnet-sdk` is useful in cases where you need to change what dotnet SDK is being used. +* `dotnet-sdk` is useful in cases where you need to change what dotnet SDK is being used. You can also set this to the result of `dotnetSdkPackages.combinePackages`, if the project uses multiple SDKs to build. * `dotnet-runtime` is useful in cases where you need to change what dotnet runtime is being used. This can be either a regular dotnet runtime, or an aspnetcore. * `dotnet-test-sdk` is useful in cases where unit tests expect a different dotnet SDK. By default, this is set to the `dotnet-sdk` attribute. * `testProjectFile` is useful in cases where the regular project file does not contain the unit tests. It gets restored and build, but not installed. You may need to regenerate your nuget lockfile after setting this. diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 311eb2b293e5..32e8cbd2b1ad 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -121,11 +121,13 @@ let # this contains all the nuget packages that are implicitly referenced by the dotnet # build system. having them as separate deps allows us to avoid having to regenerate # a packages dependencies when the dotnet-sdk version changes - sdkDeps = dotnet-sdk.packages; + sdkDeps = lib.lists.flatten [ dotnet-sdk.packages ]; - sdkSource = mkNugetSource { - name = "dotnet-sdk-${dotnet-sdk.version}-source"; - deps = [ sdkDeps ]; + sdkSource = let + version = dotnet-sdk.version or (lib.concatStringsSep "-" dotnet-sdk.versions); + in mkNugetSource { + name = "dotnet-sdk-${version}-source"; + deps = sdkDeps; }; nuget-source = symlinkJoin { @@ -271,7 +273,12 @@ stdenvNoCC.mkDerivation (args // { echo "Writing lockfile..." echo -e "# This file was automatically generated by passthru.fetch-deps.\n# Please dont edit it manually, your changes might get overwritten!\n" > "$depsFile" - nuget-to-nix "$tmp/nuget_pkgs" "${sdkDeps}" >> "$depsFile" + + excluded_sources="${lib.concatStringsSep " " sdkDeps}" + for excluded_source in ''${excluded_sources[@]}; do + ls "$excluded_source" >> "$tmp/excluded_list" + done + nuget-to-nix "$tmp/nuget_pkgs" "$tmp/excluded_list" >> "$depsFile" echo "Succesfully wrote lockfile to $depsFile" ''; } // args.passthru or { }; diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh index 390c96751fac..ce2a7070ea31 100755 --- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh +++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh @@ -7,14 +7,15 @@ export PATH="@binPath@" export LC_ALL=C if [ $# -eq 0 ]; then - >&2 echo "Usage: $0 [path to excluded package source] > deps.nix" + >&2 echo "Usage: $0 [path to a file with a list of excluded packages] > deps.nix" exit 1 fi pkgs=$1 tmp=$(realpath "$(mktemp -td nuget-to-nix.XXXXXX)") trap 'rm -r "$tmp"' EXIT -excluded_source=$(realpath "${2:-$tmp/empty}") + +excluded_list=$(realpath "${2:-/dev/null}") export DOTNET_NOLOGO=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1 @@ -37,7 +38,7 @@ for package in *; do for version in *; do id=$(xq -r .package.metadata.id "$version/$package".nuspec) - if [[ -e "$excluded_source/$id.$version".nupkg ]]; then + if grep -qxF "$id.$version.nupkg" "$excluded_list"; then continue fi diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index c51eca24b58c..05e145c48f6f 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -42,10 +42,10 @@ let sdk = ".NET SDK ${version}"; }; - packageDeps = mkNugetDeps { + packageDeps = if type == "sdk" then mkNugetDeps { name = "${pname}-${version}-deps"; nugetDeps = packages; - }; + } else null; in stdenv.mkDerivation (finalAttrs: rec { diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 7ca28e2fdc43..930339d8dbbd 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -1,20 +1,20 @@ -packages: +dotnetPackages: { buildEnv, makeWrapper, lib }: # TODO: Rethink how we determine and/or get the CLI. # Possible options raised in #187118: # 1. A separate argument for the CLI (as suggested by IvarWithoutBones # 2. Use the highest version SDK for the CLI (as suggested by GGG) # 3. Something else? -let cli = builtins.head packages; +let cli = builtins.head dotnetPackages; in -assert lib.assertMsg ((builtins.length packages) > 0) +assert lib.assertMsg ((builtins.length dotnetPackages) > 0) ''You must include at least one package, e.g `with dotnetCorePackages; combinePackages [ sdk_3_1 aspnetcore_5_0 ];`'' ; buildEnv { name = "dotnet-core-combined"; - paths = packages; + paths = dotnetPackages; pathsToLink = [ "/host" "/packs" "/sdk" "/sdk-manifests" "/shared" "/templates" ]; ignoreCollisions = true; nativeBuildInputs = [ @@ -29,6 +29,11 @@ assert lib.assertMsg ((builtins.length packages) > 0) --prefix LD_LIBRARY_PATH : ${cli.icu}/lib ''; passthru = { - inherit (cli) icu packages; + inherit (cli) icu; + + versions = lib.catAttrs "version" dotnetPackages; + packages = lib.remove null (lib.catAttrs "packages" dotnetPackages); }; + + inherit (cli) meta; } From 3e04ba2c1d134acedfe3ba1632b56a1b01ef2965 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Sun, 19 Mar 2023 20:33:55 +0100 Subject: [PATCH 18/81] BeatSaberModManager: regenerate deps, remove add-runtime-identifier.patch --- .../add-runtime-identifier.patch | 12 ------------ pkgs/games/BeatSaberModManager/default.nix | 17 +++++++---------- pkgs/games/BeatSaberModManager/deps.nix | 8 -------- 3 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 pkgs/games/BeatSaberModManager/add-runtime-identifier.patch diff --git a/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch b/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch deleted file mode 100644 index a7d17b59a35b..000000000000 --- a/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/BeatSaberModManager/BeatSaberModManager.csproj -+++ b/BeatSaberModManager/BeatSaberModManager.csproj -@@ -14,6 +14,7 @@ - true - true - Resources/Icons/Icon.ico -+ @runtimeIdentifier@ - - - - -Diff finished. Tue Oct 18 23:16:23 2022 diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/games/BeatSaberModManager/default.nix index a0a5a5accca2..840cdb59ec9b 100644 --- a/pkgs/games/BeatSaberModManager/default.nix +++ b/pkgs/games/BeatSaberModManager/default.nix @@ -27,20 +27,17 @@ buildDotnetModule rec { fetchSubmodules = true; # It vendors BSIPA-Linux }; - # This _must_ be specified in the project file and it can only be one so - # obviously you wouldn't specify it as an upstream project. Typical M$. - # https://github.com/NixOS/nixpkgs/pull/196648#discussion_r998709996 - # https://github.com/affederaffe/BeatSaberModManager/issues/5 - patches = [ - (substituteAll { - src = ./add-runtime-identifier.patch; - runtimeIdentifier = dotnetCorePackages.systemToDotnetRid stdenv.targetPlatform.system; - }) + dotnet-sdk = with dotnetCorePackages; combinePackages [ + sdk_7_0 + sdk_6_0 ]; - dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-runtime = dotnetCorePackages.runtime_7_0; + projectFile = [ "BeatSaberModManager/BeatSaberModManager.csproj" ]; + + executables = [ "BeatSaberModManager" ]; + nugetDeps = ./deps.nix; runtimeDeps = [ diff --git a/pkgs/games/BeatSaberModManager/deps.nix b/pkgs/games/BeatSaberModManager/deps.nix index 0e7bacf55e78..64115dd683e9 100644 --- a/pkgs/games/BeatSaberModManager/deps.nix +++ b/pkgs/games/BeatSaberModManager/deps.nix @@ -25,9 +25,6 @@ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.14"; sha256 = "0q43lxc5wdw5vaypzc068yx8q1s85sj3yw1lcdjr0ps7nzzv4laa"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.14"; sha256 = "16qzgzgr4b0pl471mvdd9kzaw77hzgrsqmlj4ry7gq0vcn3vpx1p"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.14"; sha256 = "0jq2sk2mmgwxm0c3f6yls2swksmpqdjrr9s3i65g0r001f475dds"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) @@ -36,11 +33,6 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.14"; sha256 = "04pnpxxgisy1zqwc0yx6blsbn6v9dyx6hklpf97702xkvc3rnp8n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.14"; sha256 = "1mmmv3jlf99qkp2n79v2x20x0c6h7j8vp24qnh3shdcqxmj3b6w7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.14"; sha256 = "1047xhl0dxc1b9rrzv7q353v3nb4q6r140ks93gdag24fi0m9qin"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.14"; sha256 = "0z73vf33fj4qya582mzha24c98qhg69y6qkcvbg5zs03h7333zyz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.14"; sha256 = "0jq6xa6pj6fa6sbims848a2gz827az8rks644ml59rj1iylhrr38"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) From ff68cad0728e4aae10033b7b63db866e77c9049f Mon Sep 17 00:00:00 2001 From: Ali Caglayan Date: Tue, 14 Mar 2023 16:57:20 +0100 Subject: [PATCH 19/81] git-ps-rs: init at version 6.5.0 Added the `gps` packaged as `git-ps-rs` for managing patch stacks. Signed-off-by: Ali Caglayan --- pkgs/development/tools/git-ps-rs/default.nix | 40 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/tools/git-ps-rs/default.nix diff --git a/pkgs/development/tools/git-ps-rs/default.nix b/pkgs/development/tools/git-ps-rs/default.nix new file mode 100644 index 000000000000..c7306bb24dcd --- /dev/null +++ b/pkgs/development/tools/git-ps-rs/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, stdenv +, pkg-config +, libgpg-error +, gpgme +, dbus +, openssl +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "git-ps-rs"; + version = "6.5.0"; + + src = fetchFromGitHub { + owner = "uptech"; + repo = "git-ps-rs"; + rev = version; + hash = "sha256-4wSm3H+98ZJZ+fZdLYshPKafRkPq98Pv3Lwh9o0be6U="; + }; + + cargoHash = "sha256-1p46xvo7abMPlVP8BeQ1j/8QQpK3kCgbTL3cdidfq04="; + + nativeBuildInputs = [ + pkg-config + gpgme # gpgme runs a small script at build time so has to go here + ]; + + buildInputs = [ openssl dbus libgpg-error ] + ++ lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "Tool for working with a stack of patches"; + homepage = "https://git-ps.sh/"; + license = licenses.mit; + maintainers = with maintainers; [ alizter ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c33c8bba2220..0466ea740403 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1900,6 +1900,10 @@ with pkgs; git-privacy = callPackage ../applications/version-management/git-privacy { }; + git-ps-rs = callPackage ../development/tools/git-ps-rs { + inherit (darwin.apple_sdk.frameworks) Security; + }; + git-publish = python3Packages.callPackage ../applications/version-management/git-publish { }; git-quick-stats = callPackage ../applications/version-management/git-quick-stats { }; From dc5ffba52d2adae602086770c9521d7d6d7397b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 17 Mar 2023 16:56:43 +0100 Subject: [PATCH 20/81] nixos/portunus: fix portunus not only listening on localhost Closes #221678 --- nixos/modules/services/misc/portunus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix index f60cbe347713..5504fb942968 100644 --- a/nixos/modules/services/misc/portunus.nix +++ b/nixos/modules/services/misc/portunus.nix @@ -238,7 +238,7 @@ in PORTUNUS_SERVER_BINARY = "${cfg.package}/bin/portunus-server"; PORTUNUS_SERVER_GROUP = cfg.group; PORTUNUS_SERVER_USER = cfg.user; - PORTUNUS_SERVER_HTTP_LISTEN = "[::]:${toString cfg.port}"; + PORTUNUS_SERVER_HTTP_LISTEN = "127.0.0.1:${toString cfg.port}"; PORTUNUS_SERVER_STATE_DIR = cfg.stateDir; PORTUNUS_SLAPD_BINARY = "${cfg.ldap.package}/libexec/slapd"; PORTUNUS_SLAPD_GROUP = cfg.ldap.group; From 7de3f08ce38aca9fddb5db7bcb7741fd389be9ef Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 17 Mar 2023 18:41:07 +0000 Subject: [PATCH 21/81] linuxManualConfig: unpack directly into $dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit linux is unusual in that we include its sources in an output. There's no point unpacking into /build when we're going to copy the sources into $dev later. Let's unpack directly into the final destination of the code, and save copying a whole kernel source tree (often across filesystems!). This also means that Kbuild knows the location of the sources, which will allow us to install the GDB scripts — some scripts are generated, and some are not, so the generated ones end up in the build directory, accompanied by symlinks to the non-generated ones in the source directory. --- .../linux/kernel/manual-config.nix | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 8386a555311d..babc7607b94f 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -115,6 +115,20 @@ let hash = "sha256-bBOyJcP6jUvozFJU0SPTOf3cmnTQ6ZZ4PlHjiniHXLU="; }); + preUnpack = '' + # The same preUnpack is used to build the configfile, + # which does not have $dev. + if [ -n "$dev" ]; then + mkdir -p $dev/lib/modules/${modDirVersion} + cd $dev/lib/modules/${modDirVersion} + fi + ''; + + postUnpack = '' + mv -Tv "$sourceRoot" source 2>/dev/null || : + export sourceRoot=$PWD/source + ''; + postPatch = '' sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|' @@ -185,6 +199,12 @@ let buildFlags = [ "KBUILD_BUILD_VERSION=1-NixOS" + + # Set by default in the kernel since a73619a845d5, + # replicated here to apply to older versions. + # Makes __FILE__ relative to the build directory. + "KCPPFLAGS=-fmacro-prefix-map=$(sourceRoot)/=" + kernelConf.target "vmlinux" # for "perf" and things like that ] ++ optional isModular "modules" @@ -261,7 +281,6 @@ let ]; postInstall = optionalString isModular '' - mkdir -p $dev cp vmlinux $dev/ if [ -z "''${dontStrip-}" ]; then installFlagsArray+=("INSTALL_MOD_STRIP=1") @@ -271,12 +290,7 @@ let unlink $out/lib/modules/${modDirVersion}/build unlink $out/lib/modules/${modDirVersion}/source - mkdir -p $dev/lib/modules/${modDirVersion}/{build,source} - - # To save space, exclude a bunch of unneeded stuff when copying. - (cd "$NIX_BUILD_TOP" && cd "$sourceRoot" && - rsync --archive --prune-empty-dirs \ - * $dev/lib/modules/${modDirVersion}/source/) + mkdir $dev/lib/modules/${modDirVersion}/build cd $dev/lib/modules/${modDirVersion}/source From 41f788b1217b05d8661ebb77bfc9d9f3f65b5dd2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 19 Mar 2023 23:55:12 +0000 Subject: [PATCH 22/81] linuxManualConfig: use the default make target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We've basically been reimplementing this — by default it contains vmlinux, dtbs (on applicable architectures), modules, and architecture specific stuff like $(KBUILD_IMAGE) and a couple of other miscellaneous files. --- pkgs/os-specific/linux/kernel/manual-config.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index babc7607b94f..fa21ab3b6155 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -198,18 +198,14 @@ let ''; buildFlags = [ + "DTC_FLAGS=-@" "KBUILD_BUILD_VERSION=1-NixOS" # Set by default in the kernel since a73619a845d5, # replicated here to apply to older versions. # Makes __FILE__ relative to the build directory. "KCPPFLAGS=-fmacro-prefix-map=$(sourceRoot)/=" - - kernelConf.target - "vmlinux" # for "perf" and things like that - ] ++ optional isModular "modules" - ++ optionals buildDTBs ["dtbs" "DTC_FLAGS=-@"] - ++ extraMakeFlags; + ] ++ extraMakeFlags; installFlags = [ "INSTALL_PATH=$(out)" From e3a689d97cb2ca7743d156ebc0b25039d6e84b65 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 19 Mar 2023 22:29:51 +0100 Subject: [PATCH 23/81] chromiumBeta: 112.0.5615.20 -> 112.0.5615.29 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d867b05d020b..1e0a5fb8f717 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "112.0.5615.20", - "sha256": "0qxifnc2xk2zkmpzc1pzd95ym3i829qzgzd83qh7ah9p64c76f9y", - "sha256bin64": "11c7k87fnfhaynhpp2rjzpzydrl096fjx3gw589nvq1lckbg9nsd", + "version": "112.0.5615.29", + "sha256": "0k9dn1gzfr2j353ppza1nypj0a4b27p9n742cms3z8583da8kw6p", + "sha256bin64": "04m77ndsfygpb1g11iyscvfszgykbr5n3s6bh1shnpkpdbvx3dki", "deps": { "gn": { "version": "2023-02-17", From c2ecaab4eed9685171143954a33542c7da1b07c0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 19 Mar 2023 22:29:51 +0100 Subject: [PATCH 24/81] chromiumDev: 113.0.5638.0 -> 113.0.5653.0 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d867b05d020b..5a1c013cb920 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "113.0.5638.0", - "sha256": "0v4hminx765swv0iakg5qw7rk6zc67cn5p9x625jaizz50ahpfib", - "sha256bin64": "07snjlizj30mzcm5fbsg6ibd4jqmcwiykdwrpqmdqq902c3gwc3r", + "version": "113.0.5653.0", + "sha256": "1s1as01javi8z4sax70rx4cn03lwfis75rkv58yk7sfhj3qafzhk", + "sha256bin64": "1i1zkdq8qzm8r5lg10qmqaycx45m2qc9fzjql0si0amy81sdkfsn", "deps": { "gn": { "version": "2023-02-24", From aacfc0950b84657b32ebb4106e21eef4db8e626b Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Mon, 13 Mar 2023 23:34:09 +0200 Subject: [PATCH 25/81] regreet: 2023-02-27 -> 2023-03-19 --- pkgs/applications/display-managers/greetd/regreet.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/display-managers/greetd/regreet.nix b/pkgs/applications/display-managers/greetd/regreet.nix index e989d9782b1a..31ad614ac263 100644 --- a/pkgs/applications/display-managers/greetd/regreet.nix +++ b/pkgs/applications/display-managers/greetd/regreet.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage { pname = "regreet"; - version = "unstable-2023-02-27"; + version = "unstable-2023-03-19"; src = fetchFromGitHub { owner = "rharish101"; repo = "ReGreet"; - rev = "2bbabe90f112b4feeb0aea516c265daaec8ccf2a"; - hash = "sha256-71ji4x/NUE4qmBuO5PkWTPE1a0uPXqJSwW1Ai1amPJE="; + rev = "fd496fa00abc078570ac85a47ea296bfc275222a"; + hash = "sha256-pqCtDoycFKV+EFLEodoTCDSO5L+dOVtdjN6DVgJ/7to="; }; - cargoHash = "sha256-rz2eMMhoMtzBXCH6ZJOvGuYLeHSWga+Ebc4+ZO8Kk1g="; + cargoHash = "sha256-8FbA5FFJuRt5tvW1HGaaEZcr5g6OczcBeic1hCTQmUw="; buildFeatures = [ "gtk4_8" ]; From 692c28ec10f0ddbf043d6c70720a62e7293d4833 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Mon, 13 Mar 2023 23:35:06 +0200 Subject: [PATCH 26/81] nixos/regreet: init --- .../manual/release-notes/rl-2305.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/programs/regreet.nix | 75 +++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 nixos/modules/programs/regreet.nix diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 5bc5a8245211..85fdd07ded2b 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -75,6 +75,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [woodpecker-server](https://woodpecker-ci.org/), a simple CI engine with great extensibility. Available as [services.woodpecker-server](#opt-services.woodpecker-server.enable). +- [ReGreet](https://github.com/rharish101/ReGreet), a clean and customizable greeter for greetd. Available as [programs.regreet](#opt-programs.regreet.enable). + ## Backward Incompatibilities {#sec-release-23.05-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 314d67419b7f..bf0f0c7a684e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -220,6 +220,7 @@ ./programs/proxychains.nix ./programs/qdmr.nix ./programs/qt5ct.nix + ./programs/regreet.nix ./programs/rog-control-center.nix ./programs/rust-motd.nix ./programs/screen.nix diff --git a/nixos/modules/programs/regreet.nix b/nixos/modules/programs/regreet.nix new file mode 100644 index 000000000000..89b93737f4a2 --- /dev/null +++ b/nixos/modules/programs/regreet.nix @@ -0,0 +1,75 @@ +{ lib +, pkgs +, config +, ... +}: +let + cfg = config.programs.regreet; + settingsFormat = pkgs.formats.toml { }; +in +{ + options.programs.regreet = { + enable = lib.mkEnableOption null // { + description = lib.mdDoc '' + Enable ReGreet, a clean and customizable greeter for greetd. + + To use ReGreet, {option}`services.greetd` has to be enabled and + {option}`services.greetd.settings.default_session` should contain the + appropriate configuration to launch + {option}`config.programs.regreet.package`. For examples, see the + [ReGreet Readme](https://github.com/rharish101/ReGreet#set-as-default-session). + + A minimal configuration that launches ReGreet in {command}`cage` is + enabled by this module by default. + ''; + }; + + package = lib.mkPackageOptionMD pkgs [ "greetd" "regreet" ] { }; + + settings = lib.mkOption { + type = lib.types.either lib.types.path settingsFormat.type; + default = { }; + description = lib.mdDoc '' + ReGreet configuration file. Refer + + for options. + ''; + }; + + extraCss = lib.mkOption { + type = lib.types.either lib.types.path lib.types.lines; + default = ""; + description = lib.mdDoc '' + Extra CSS rules to apply on top of the GTK theme. Refer to + [GTK CSS Properties](https://docs.gtk.org/gtk4/css-properties.html) for + modifiable properties. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + services.greetd = { + enable = lib.mkDefault true; + settings.default_session.command = lib.mkDefault "${lib.getExe pkgs.cage} -s -- ${lib.getExe cfg.package}"; + }; + + environment.etc = { + "greetd/regreet.css" = + if lib.isPath cfg.extraCss + then {source = cfg.extraCss;} + else {text = cfg.extraCss;}; + + "greetd/regreet.toml".source = + if lib.isPath cfg.settings + then cfg.settings + else settingsFormat.generate "regreet.toml" cfg.settings; + }; + + systemd.tmpfiles.rules = let + user = config.services.greetd.settings.default_session.user; + in [ + "d /var/log/regreet 0755 greeter ${user} - -" + "d /var/cache/regreet 0755 greeter ${user} - -" + ]; + }; +} From d57568fcad7e3a9364850cb1c25d7a34693c02d5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 17 Mar 2023 18:44:06 +0000 Subject: [PATCH 27/81] linuxManualConfig: install GDB scripts These are required to debug kernel modules. Since we're now able to do that, there's another reason besides BTF to enable DEBUG_INFO, so I've done that for pre-BTF kernel modules as well here. For GDB to get configured correctly, vmlinux-gdb.py has to be two directories up from scripts/gdb, and vmlinux has to be next to vmlinux-gdb.py. The least invasive way to satisfy these constraints is to make vmlinux a symlink, which GDB will resolve before looking for vmlinux-gdb.py. Tested both ways of getting the scripts into GDB that I know of: gdb /nix/store/7n77ijlxkxr6d613h02lr707kvjx6j1k-linux-6.1.19-dev/vmlinux \ -iex 'add-auto-load-safe-path /nix/store/7n77ijlxkxr6d613h02lr707kvjx6j1k-linux-6.1.19-dev/lib/modules/6.1.19/build/vmlinux-gdb.py' \ -ex 'lx-version' \ -ex 'q' gdb /nix/store/7n77ijlxkxr6d613h02lr707kvjx6j1k-linux-6.1.19-dev/vmlinux \ -ex 'source /nix/store/7n77ijlxkxr6d613h02lr707kvjx6j1k-linux-6.1.19-dev/lib/modules/6.1.19/build/vmlinux-gdb.py' \ -ex 'lx-version' \ -ex 'q' Also tested that the strip changes don't result in meaningful output size changes (there's some small variation due to BTF data not always coming out the same size, which is unrelated), and built every kernel I can on x86_64 to make sure I'm not relying on build system behaviour specific to newer kernels. --- .../os-specific/linux/kernel/common-config.nix | 7 +++---- .../os-specific/linux/kernel/manual-config.nix | 18 +++++++++++++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4b1318d91159..77efa268d3ef 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -36,10 +36,7 @@ let debug = { # Necessary for BTF - DEBUG_INFO = mkMerge [ - (whenOlder "5.2" (if (features.debug or false) then yes else no)) - (whenBetween "5.2" "5.18" yes) - ]; + DEBUG_INFO = yes; DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes; # Reduced debug info conflict with BTF and have been enabled in # aarch64 defconfig since 5.13 @@ -62,6 +59,8 @@ let SUNRPC_DEBUG = yes; # Provide access to tunables like sched_migration_cost_ns SCHED_DEBUG = yes; + + GDB_SCRIPTS = yes; }; power-management = { diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index fa21ab3b6155..4c5ec86b1e6a 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -277,7 +277,6 @@ let ]; postInstall = optionalString isModular '' - cp vmlinux $dev/ if [ -z "''${dontStrip-}" ]; then installFlagsArray+=("INSTALL_MOD_STRIP=1") fi @@ -297,12 +296,16 @@ let # from a `try-run` call from the Makefile rm -f $dev/lib/modules/${modDirVersion}/build/.[0-9]*.d - # Keep some extra files on some arches (powerpc, aarch64) - for f in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do - if [ -f "$buildRoot/$f" ]; then - cp $buildRoot/$f $dev/lib/modules/${modDirVersion}/build/$f + # Keep some extra files + for f in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o \ + scripts/gdb/linux vmlinux vmlinux-gdb.py + do + if [ -e "$buildRoot/$f" ]; then + mkdir -p "$(dirname "$dev/lib/modules/${modDirVersion}/build/$f")" + cp -HR $buildRoot/$f $dev/lib/modules/${modDirVersion}/build/$f fi done + ln -s $dev/lib/modules/${modDirVersion}/build/vmlinux $dev # !!! No documentation on how much of the source tree must be kept # If/when kernel builds fail due to missing files, you can add @@ -345,6 +348,11 @@ let sed -i Makefile -e 's|= ${buildPackages.kmod}/bin/depmod|= depmod|' ''; + preFixup = '' + # Don't strip $dev/lib/modules/*/vmlinux + stripDebugList="$(cd $dev && echo lib/modules/*/build/*/)" + ''; + requiredSystemFeatures = [ "big-parallel" ]; meta = { From 407d5232a4ce48b73d37a7633b3105cf34769d99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Mar 2023 02:06:48 +0000 Subject: [PATCH 28/81] tmux-xpanes: 4.1.3 -> 4.1.4 --- pkgs/tools/misc/tmux-xpanes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmux-xpanes/default.nix b/pkgs/tools/misc/tmux-xpanes/default.nix index a410eaa9238c..30ecf358388f 100644 --- a/pkgs/tools/misc/tmux-xpanes/default.nix +++ b/pkgs/tools/misc/tmux-xpanes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tmux-xpanes"; - version = "4.1.3"; + version = "4.1.4"; src = fetchFromGitHub { owner = "greymd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e0dEkkEkColBQ0PgOQpoVbIkR3aVsrMZoSGbg4O11SU="; + sha256 = "sha256-kS8VrD0CT350Y1ql6ta47nXdEzmuqEpFJeXRw58yMGc="; }; buildInputs = [ openssl perl ]; From 90cc287d6e2d9a9f02d8edbf5f8b2cac6006e939 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Mar 2023 02:14:38 +0000 Subject: [PATCH 29/81] slsa-verifier: 2.0.1 -> 2.1.0 --- pkgs/tools/security/slsa-verifier/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/slsa-verifier/default.nix b/pkgs/tools/security/slsa-verifier/default.nix index 188052452db2..c02ff85f04f6 100644 --- a/pkgs/tools/security/slsa-verifier/default.nix +++ b/pkgs/tools/security/slsa-verifier/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "slsa-verifier"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "slsa-framework"; repo = "slsa-verifier"; rev = "v${version}"; - hash = "sha256-Gef8TQSd6bTWIzFOQ9xjqB49We7IKBu9p/Lb426nNbc="; + hash = "sha256-Y4qZMECw3o8Mr4w2mYe2sUyYes4J+SkO3rqfiuSYw2Y="; }; - vendorHash = "sha256-1syIEjvqYHCiOLf8Fc2vghFKfN6ADM05By11jGNZODs="; + vendorHash = "sha256-xDJLt9aQW3hJtbC15R+eMRVQOi/dYuYMWMsGNCkjaSQ="; CGO_ENABLED = 0; GO111MODULE = "on"; From fa871f9f5a01f9d0b1dd5bb66a84df3f5f2a0e78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Mar 2023 04:13:44 +0000 Subject: [PATCH 30/81] python310Packages.tesserocr: 2.5.2 -> 2.6.0 --- pkgs/development/python-modules/tesserocr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index f852e29c002c..ce272b9d7a46 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "tesserocr"; - version = "2.5.2"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1bmj76gi8401lcqdaaznfmz9yf11myy1bzivqwwq08z3dwzxswck"; + sha256 = "sha256-d0MNJytT2s073Ur11WP9wkrlG4b9vJzy6BRvKceryaQ="; }; # https://github.com/sirfz/tesserocr/issues/314 From edf81049b1e89ed31f17722429e77fcba87f31c3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Mar 2023 06:40:08 +0100 Subject: [PATCH 31/81] ocaml-ng.ocamlPackages_4_01_0.csv: remove at 1.5 --- pkgs/development/ocaml-modules/csv/1.5.nix | 38 ---------------------- pkgs/top-level/ocaml-packages.nix | 5 +-- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/csv/1.5.nix diff --git a/pkgs/development/ocaml-modules/csv/1.5.nix b/pkgs/development/ocaml-modules/csv/1.5.nix deleted file mode 100644 index ef4ae4484d83..000000000000 --- a/pkgs/development/ocaml-modules/csv/1.5.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchzip, ocaml, findlib, ocamlbuild }: - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-csv"; - version = "1.5"; - - src = fetchzip { - url = "https://github.com/Chris00/ocaml-csv/releases/download/${version}/csv-${version}.tar.gz"; - sha256 = "1ca7jgg58j24pccs5fshis726s06fdcjshnwza5kwxpjgdbvc63g"; - }; - - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - - strictDeps = true; - - createFindlibDestdir = true; - - configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; - - buildPhase = "ocaml setup.ml -build"; - - doCheck = true; - checkPhase = "ocaml setup.ml -test"; - - installPhase = '' - runHook preInstall - ocaml setup.ml -install - runHook postInstall - ''; - - meta = with lib; { - description = "A pure OCaml library to read and write CSV files"; - homepage = "https://github.com/Chris00/ocaml-csv"; - license = licenses.lgpl21; - maintainers = [ maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 28e3db6d64c9..32b96e2dbcc3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -265,10 +265,7 @@ let cstruct-unix = callPackage ../development/ocaml-modules/cstruct/unix.nix {}; - csv = - if lib.versionAtLeast ocaml.version "4.2" - then callPackage ../development/ocaml-modules/csv { } - else callPackage ../development/ocaml-modules/csv/1.5.nix { }; + csv = callPackage ../development/ocaml-modules/csv { }; csv-lwt = callPackage ../development/ocaml-modules/csv/lwt.nix { }; From 832ce14a2103077ce137b2b6808636a656d7777c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Mar 2023 06:40:21 +0100 Subject: [PATCH 32/81] =?UTF-8?q?ocamlPackages.csv:=20fix=20for=20OCaml=20?= =?UTF-8?q?=E2=89=A5=205.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/csv/csvtool.nix | 4 +++- pkgs/development/ocaml-modules/csv/default.nix | 6 +++++- pkgs/development/ocaml-modules/csv/lwt.nix | 18 ++++++++++-------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/csv/csvtool.nix b/pkgs/development/ocaml-modules/csv/csvtool.nix index 12c0dfa160e6..05d9a440f9c1 100644 --- a/pkgs/development/ocaml-modules/csv/csvtool.nix +++ b/pkgs/development/ocaml-modules/csv/csvtool.nix @@ -4,7 +4,9 @@ let inherit (ocamlPackages) buildDunePackage csv uutf; in buildDunePackage { pname = "csvtool"; - inherit (csv) src version useDune2; + inherit (csv) src version; + + duneVersion = "3"; buildInputs = [ csv uutf ]; diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index d4c3d72a6d80..7510dcede3a9 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -9,7 +9,11 @@ buildDunePackage rec { sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk"; }; - useDune2 = true; + preConfigure = '' + substituteInPlace src/dune --replace '(libraries bytes)' "" + ''; + + duneVersion = "3"; meta = { description = "A pure OCaml library to read and write CSV files"; diff --git a/pkgs/development/ocaml-modules/csv/lwt.nix b/pkgs/development/ocaml-modules/csv/lwt.nix index c90dc019b9d4..8e91decfd65f 100644 --- a/pkgs/development/ocaml-modules/csv/lwt.nix +++ b/pkgs/development/ocaml-modules/csv/lwt.nix @@ -1,14 +1,16 @@ -{ lib, buildDunePackage, ocaml, csv, ocaml_lwt }: - -if lib.versionOlder ocaml.version "4.02" -then throw "csv-lwt is not available for OCaml ${ocaml.version}" -else +{ lib, buildDunePackage, csv, lwt }: buildDunePackage { pname = "csv-lwt"; - inherit (csv) src version useDune2 meta; + inherit (csv) src version meta; - propagatedBuildInputs = [ csv ocaml_lwt ]; + preConfigure = '' + substituteInPlace lwt/dune --replace '(libraries bytes' '(libraries ' + ''; - doCheck = lib.versionAtLeast ocaml.version "4.03"; + duneVersion = "3"; + + propagatedBuildInputs = [ csv lwt ]; + + doCheck = true; } From 7a4961ed2bdc1d6b7e61692b6e6599150b44cb60 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 20 Mar 2023 09:44:14 +0200 Subject: [PATCH 33/81] python3Packages.wxPython_4_{0,1}: drop --- .../python-modules/wxPython/4.0.nix | 88 ----------- .../python-modules/wxPython/4.1.nix | 146 ------------------ pkgs/top-level/python-aliases.nix | 2 + pkgs/top-level/python-packages.nix | 14 -- 4 files changed, 2 insertions(+), 248 deletions(-) delete mode 100644 pkgs/development/python-modules/wxPython/4.0.nix delete mode 100644 pkgs/development/python-modules/wxPython/4.1.nix diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix deleted file mode 100644 index 64123cafd4a1..000000000000 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchPypi -, setuptools -, pkg-config -, which -, cairo -, pango -, python -, doxygen -, ncurses -, libintl -, wxGTK -, gtk3 -, IOKit -, Carbon -, Cocoa -, AudioToolbox -, OpenGL -, CoreFoundation -, pillow -, numpy -, six -}: - -buildPythonPackage rec { - pname = "wxPython"; - version = "4.0.7.post2"; - format = "other"; - - src = fetchPypi { - inherit pname version; - sha256 = "5a229e695b64f9864d30a5315e0c1e4ff5e02effede0a07f16e8d856737a0c4e"; - }; - - doCheck = false; - - nativeBuildInputs = [ pkg-config which doxygen setuptools wxGTK ]; - - buildInputs = [ ncurses libintl ] - ++ (if stdenv.isDarwin - then - [ AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL ] - else - [ gtk3 ] - ); - - propagatedBuildInputs = [ - numpy - pillow - six - ]; - - DOXYGEN = "${doxygen}/bin/doxygen"; - - preConfigure = lib.optionalString (!stdenv.isDarwin) '' - substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ - --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")' - substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ - --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ - ("gdk", "${gtk3}/lib/libgtk-x11-2.0.so"), - ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), - ("appsvc", None) - ]}' - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' - # Remove the OSX-Only wx.webkit module - sed -i "s/makeETGRule(.*'WXWEBKIT')/pass/" wscript - ''; - - buildPhase = '' - ${python.pythonForBuild.interpreter} build.py -v --use_syswx dox etg --nodoc sip build_py - ''; - - installPhase = '' - ${python.pythonForBuild.interpreter} setup.py install --skip-build --prefix=$out - ''; - - passthru = { wxWidgets = wxGTK; }; - - - meta = { - description = "Cross platform GUI toolkit for Python, Phoenix version"; - homepage = "http://wxpython.org/"; - license = lib.licenses.wxWindows; - }; - -} diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix deleted file mode 100644 index 4b3e62a2eece..000000000000 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ /dev/null @@ -1,146 +0,0 @@ -{ lib -, stdenv -, fetchPypi -, fetchpatch -, buildPythonPackage -, setuptools -, which -, pkg-config -, python -, isPy27 -, doxygen -, cairo -, ncurses -, pango -, wxGTK -, gtk3 -, AGL -, AudioToolbox -, AVFoundation -, AVKit -, Carbon -, Cocoa -, CoreFoundation -, CoreMedia -, IOKit -, Kernel -, OpenGL -, Security -, WebKit -, pillow -, numpy -, six -, libXinerama -, libSM -, libXxf86vm -, libXtst -, libGLU -, libGL -, xorgproto -, gst_all_1 -, libglvnd -, mesa -, webkitgtk -, autoPatchelfHook -}: -let - dynamic-linker = stdenv.cc.bintools.dynamicLinker; -in -buildPythonPackage rec { - pname = "wxPython"; - version = "4.1.1"; - disabled = isPy27; - format = "other"; - - src = fetchPypi { - inherit pname version; - sha256 = "0a1mdhdkda64lnwm1dg0dlrf9rs4gkal3lra6hpqbwn718cf7r80"; - }; - - # ld: framework not found System - postPatch = '' - for file in ext/wxWidgets/configure*; do - substituteInPlace $file --replace "-framework System" "" - done - ''; - - # https://github.com/NixOS/nixpkgs/issues/75759 - # https://github.com/wxWidgets/Phoenix/issues/1316 - doCheck = false; - - nativeBuildInputs = [ - which - doxygen - gtk3 - pkg-config - setuptools - ] ++ lib.optionals stdenv.isLinux [ - autoPatchelfHook - ]; - - buildInputs = [ - gtk3 - ncurses - ] ++ lib.optionals stdenv.isLinux [ - libXinerama - libSM - libXxf86vm - libXtst - xorgproto - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - libGLU - libGL - libglvnd - mesa - webkitgtk - ] ++ lib.optionals stdenv.isDarwin [ - AGL - AudioToolbox - AVFoundation - AVKit - Carbon - Cocoa - CoreFoundation - CoreMedia - IOKit - Kernel - OpenGL - Security - WebKit - ]; - - propagatedBuildInputs = [ - pillow - numpy - six - ]; - - DOXYGEN = "${doxygen}/bin/doxygen"; - - preConfigure = lib.optionalString (!stdenv.isDarwin) '' - substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ - --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ - ("gdk", "${gtk3}/lib/libgtk-x11-3.0.so"), - ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), - ("cairoLib = None", "cairoLib = ctypes.CDLL('${cairo}/lib/libcairo.so')"), - ("appsvc", None) - ]}' - ''; - - buildPhase = '' - ${python.pythonForBuild.interpreter} build.py -v build_wx dox etg --nodoc sip build_py - ''; - - installPhase = '' - ${python.pythonForBuild.interpreter} setup.py install --skip-build --prefix=$out - wrapPythonPrograms - ''; - - meta = with lib; { - description = "Cross platform GUI toolkit for Python, Phoenix version"; - homepage = "http://wxpython.org/"; - license = licenses.wxWindows; - maintainers = with maintainers; [ tfmoraes ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b251be559dd4..a6afb78a7564 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -289,6 +289,8 @@ mapAliases ({ weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01 webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29 websocket_client = websocket-client; # added 2021-06-15 + wxPython_4_0 = throw "wxPython_4_0 has been removed, use wxPython_4_2 instead"; # added 2023-03-19 + wxPython_4_1 = throw "wxPython_4_1 has been removed, use wxPython_4_2 instead"; # added 2023-03-19 WSME = wsme; # added 2023-02-19 xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31 XlsxWriter = xlsxwriter; # added 2023-02-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d900cef9ec56..561a634bd1cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12596,20 +12596,6 @@ self: super: with self; { wurlitzer = callPackage ../development/python-modules/wurlitzer { }; - wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { - inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL; - wxGTK = pkgs.wxGTK30.override { - withWebKit = true; - }; - }; - - wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix { - inherit (pkgs.darwin.apple_sdk.frameworks) AGL AudioToolbox AVFoundation AVKit Carbon Cocoa CoreMedia CoreFoundation IOKit Kernel OpenGL Security WebKit; - wxGTK = pkgs.wxGTK31.override { - withWebKit = true; - }; - }; - wxPython_4_2 = callPackage ../development/python-modules/wxPython/4.2.nix { wxGTK = pkgs.wxGTK32.override { withWebKit = true; From cea14e1d8dcbbe59b9ed68cf9504222e6b6ef878 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Mon, 20 Mar 2023 10:15:23 +0100 Subject: [PATCH 34/81] kops: drop 1.23 --- pkgs/applications/networking/cluster/kops/default.nix | 6 ------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 7 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 555af740b926..264f293e4d9a 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -49,12 +49,6 @@ in rec { mkKops = generic; - kops_1_23 = mkKops rec { - version = "1.23.4"; - sha256 = "sha256-hUj/kUyaqo8q3SJTkd5+9Ld8kfE8wCYNJ2qIATjXqhU="; - rev = "v${version}"; - }; - kops_1_24 = mkKops rec { version = "1.24.3"; sha256 = "sha256-o84060P2aHTIm61lSkz2/GqzYd2NYk1zKgGdNaHlWfA="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 585b698756c6..0dba4df7e14c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38200,7 +38200,6 @@ with pkgs; # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_23 kops_1_24 kops_1_25 ; From 1d28868d3da1a15c4d750c13618083267a362440 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Mon, 20 Mar 2023 10:14:52 +0100 Subject: [PATCH 35/81] kops: 1.24.3 -> 1.24.5 --- pkgs/applications/networking/cluster/kops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 264f293e4d9a..8d1f77bf6afe 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -50,8 +50,8 @@ rec { mkKops = generic; kops_1_24 = mkKops rec { - version = "1.24.3"; - sha256 = "sha256-o84060P2aHTIm61lSkz2/GqzYd2NYk1zKgGdNaHlWfA="; + version = "1.24.5"; + sha256 = "sha256-U5OSiU0t2gyvyNd07y68Fb+HaXp5wQN4t0CBPOOMd/M="; rev = "v${version}"; }; From c7834ab085028622c1fc5447c1a7915b4913694e Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Mon, 20 Mar 2023 10:05:20 +0100 Subject: [PATCH 36/81] kops: 1.25.3 -> 1.25.4 --- pkgs/applications/networking/cluster/kops/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 8d1f77bf6afe..ffa89cbf896b 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -56,7 +56,7 @@ rec { }; kops_1_25 = mkKops rec { - version = "1.25.3"; + version = "1.25.4"; sha256 = "sha256-Q40d62D+H7CpLmrjweCy75U3LgnHEV2pFZs2Ze+koqo="; rev = "v${version}"; }; From a37accb136b0263e54b8a38e184c70d5c853b7c6 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Mon, 20 Mar 2023 10:08:42 +0100 Subject: [PATCH 37/81] kops: 1.25.4 -> 1.26.2 --- pkgs/applications/networking/cluster/kops/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index ffa89cbf896b..107117c08b89 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -60,4 +60,10 @@ rec { sha256 = "sha256-Q40d62D+H7CpLmrjweCy75U3LgnHEV2pFZs2Ze+koqo="; rev = "v${version}"; }; + + kops_1_26 = mkKops rec { + version = "1.26.2"; + sha256 = "sha256-PY/dcKyciPg3OyUPeBwYed6ADprpI2/+8d8SuGTXWqc="; + rev = "v${version}"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dba4df7e14c..a12814ec5e67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38202,8 +38202,9 @@ with pkgs; mkKops kops_1_24 kops_1_25 + kops_1_26 ; - kops = kops_1_25; + kops = kops_1_26; lguf-brightness = callPackage ../misc/lguf-brightness { }; From 57a727064266c570de636220f2f06fe859719687 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 25 Feb 2023 09:20:43 +0300 Subject: [PATCH 38/81] gitea: create static gzip and brotli files --- .../version-management/gitea/default.nix | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 3141d08cdcec..cda16784a9f7 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -5,11 +5,15 @@ , makeWrapper , git , bash +, gitea , gzip , openssh , pam , sqliteSupport ? true , pamSupport ? true +, runCommand +, brotli +, xorg , nixosTests }: @@ -61,7 +65,21 @@ buildGoModule rec { --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} ''; - passthru.tests = nixosTests.gitea; + passthru = { + data-compressed = runCommand "data-compressed" { + nativeBuildInputs = [ brotli xorg.lndir ]; + } '' + mkdir $out + lndir ${gitea.data}/ $out/ + + # Create static gzip and brotli files + find -L $out -type f -regextype posix-extended -iregex '.*\.(css|html|js|svg|ttf|txt)' \ + -exec gzip --best --keep --force {} ';' \ + -exec brotli --best --keep --no-copy-stat {} ';' + ''; + + tests = nixosTests.gitea; + }; meta = with lib; { description = "Git with a cup of tea"; From 6b9d81b953b1dd6df343d404b322cdf72bd10e10 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 2 Mar 2023 20:41:59 +0300 Subject: [PATCH 39/81] forgejo: create static gzip and brotli files --- .../version-management/forgejo/default.nix | 94 +++++++++++-------- 1 file changed, 56 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 8693e6d208fa..6127aec2bbe2 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -1,9 +1,11 @@ { bash +, brotli , buildGoModule , common-updater-scripts , coreutils , curl , fetchurl +, forgejo , git , gzip , jq @@ -15,6 +17,8 @@ , pam , pamSupport ? true , sqliteSupport ? true +, xorg +, runCommand , stdenv , writeShellApplication }: @@ -66,46 +70,60 @@ buildGoModule rec { --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} ''; - passthru.tests = nixosTests.forgejo; + passthru = { + data-compressed = runCommand "data-compressed" { + nativeBuildInputs = [ brotli xorg.lndir ]; + } '' + mkdir $out + lndir ${forgejo.data}/ $out/ - passthru.updateScript = lib.getExe (writeShellApplication { - name = "update-forgejo"; - runtimeInputs = [ - common-updater-scripts - coreutils - curl - jq - nix - ]; - text = '' - releases=$(curl "https://codeberg.org/api/v1/repos/forgejo/forgejo/releases?draft=false&pre-release=false&limit=1" \ - --silent \ - --header "accept: application/json") - - stable=$(jq '.[0] - | .tag_name[1:] as $version - | ("forgejo-src-\($version).tar.gz") as $filename - | { $version, html_url } + (.assets | map(select(.name | startswith($filename)) | {(.name | split(".") | last): .browser_download_url}) | add)' \ - <<< "$releases") - - archive_url=$(jq -r .gz <<< "$stable") - checksum_url=$(jq -r .sha256 <<< "$stable") - release_url=$(jq -r .html_url <<< "$stable") - version=$(jq -r .version <<< "$stable") - - if [[ "${version}" = "$version" ]]; then - echo "No new version found (already at $version)" - exit 0 - fi - - echo "Release: $release_url" - - sha256=$(curl "$checksum_url" --silent | cut --delimiter " " --fields 1) - sri_hash=$(nix hash to-sri --type sha256 "$sha256") - - update-source-version "${pname}" "$version" "$sri_hash" "$archive_url" + # Create static gzip and brotli files + find -L $out -type f -regextype posix-extended -iregex '.*\.(css|html|js|svg|ttf|txt)' \ + -exec gzip --best --keep --force {} ';' \ + -exec brotli --best --keep --no-copy-stat {} ';' ''; - }); + + tests = nixosTests.forgejo; + + updateScript = lib.getExe (writeShellApplication { + name = "update-forgejo"; + runtimeInputs = [ + common-updater-scripts + coreutils + curl + jq + nix + ]; + text = '' + releases=$(curl "https://codeberg.org/api/v1/repos/forgejo/forgejo/releases?draft=false&pre-release=false&limit=1" \ + --silent \ + --header "accept: application/json") + + stable=$(jq '.[0] + | .tag_name[1:] as $version + | ("forgejo-src-\($version).tar.gz") as $filename + | { $version, html_url } + (.assets | map(select(.name | startswith($filename)) | {(.name | split(".") | last): .browser_download_url}) | add)' \ + <<< "$releases") + + archive_url=$(jq -r .gz <<< "$stable") + checksum_url=$(jq -r .sha256 <<< "$stable") + release_url=$(jq -r .html_url <<< "$stable") + version=$(jq -r .version <<< "$stable") + + if [[ "${version}" = "$version" ]]; then + echo "No new version found (already at $version)" + exit 0 + fi + + echo "Release: $release_url" + + sha256=$(curl "$checksum_url" --silent | cut --delimiter " " --fields 1) + sri_hash=$(nix hash to-sri --type sha256 "$sha256") + + update-source-version "${pname}" "$version" "$sri_hash" "$archive_url" + ''; + }); + }; meta = with lib; { description = "A self-hosted lightweight software forge"; From 5081f9dc05800d59f2ad16c345a62047bc02d59d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 20 Mar 2023 10:53:14 +0100 Subject: [PATCH 40/81] signal-desktop: disable wayland for now --- .../networking/instant-messengers/signal-desktop/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index e6116c9b4286..bfc72e75cc13 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -151,7 +151,8 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + # Currently crashes see https://github.com/NixOS/nixpkgs/issues/222043 + #--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ) From f3dd69a480b26f9743780030132d19268fde19f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Mar 2023 10:23:21 +0000 Subject: [PATCH 41/81] python310Packages.pyscreenshot: 3.0 -> 3.1 --- pkgs/development/python-modules/pyscreenshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix index 0457edb1450e..1daeb9408778 100644 --- a/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/pkgs/development/python-modules/pyscreenshot/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyscreenshot"; - version = "3.0"; + version = "3.1"; src = fetchPypi { inherit pname version; - sha256 = "dd4fdfaeb617483913a6b16845b9f428de5db28758979f4b6cf8f236d292b908"; + sha256 = "sha256-jA6T8K72amv+Vahqv87WvTlq5LT2zB428EoorSYlWU0="; }; propagatedBuildInputs = [ From 36b0252c0e55f0952684a03be701197fad4c3e21 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 20 Mar 2023 12:50:48 +0200 Subject: [PATCH 42/81] got: 0.83 -> 0.86 --- .../version-management/got/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index e601b1165f5d..be57a4cf5bb1 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -1,28 +1,37 @@ { lib, stdenv, fetchurl , pkg-config, openssl, libbsd, libevent, libuuid, libossp_uuid, libmd, zlib, ncurses, bison +, autoPatchelfHook }: stdenv.mkDerivation rec { pname = "got"; - version = "0.83"; + version = "0.86"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-kNhU6OR9IUNPL72D90nhq2X5vmVW7YUmpnq/EOUvG/8="; + hash = "sha256-FHjLEkxsvkYz4tK1k/pEUfDT9rfvN+K68gRc8fPVp7A="; }; - nativeBuildInputs = [ pkg-config bison ]; + nativeBuildInputs = [ pkg-config bison ] + ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; buildInputs = [ openssl libbsd libevent libuuid libmd zlib ncurses ] ++ lib.optionals stdenv.isDarwin [ libossp_uuid ]; - preConfigure = lib.optionals stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' # The configure script assumes dependencies on Darwin are install via # Homebrew or MacPorts and hardcodes assumptions about the paths of # dependencies which fails the nixpkgs configurePhase. substituteInPlace configure --replace 'xdarwin' 'xhomebrew' ''; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + # error: conflicting types for 'strmode' + "-DHAVE_STRMODE=1" + # Undefined symbols for architecture arm64: "_bsd_getopt" + "-include getopt.h" + ]); + doInstallCheck = true; installCheckPhase = '' From dc82424c06a297662729b83be942e6c352779b63 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Mon, 20 Mar 2023 08:07:19 -0400 Subject: [PATCH 43/81] open-stage-control: fix src hash It looks like upstream retagged v1.23.0 since the bump PR was merged. The hash is stable now so I guess I'll wait a day or two next time before bumping open-stage-control... --- pkgs/applications/audio/open-stage-control/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 4100d166a25e..caab41a11436 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -8,7 +8,7 @@ buildNpmPackage rec { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-P3aTGt/T59JE2oy8uRhD8h2NXX/ZXno6qY0frpcir7A="; + hash = "sha256-5QMBJw6H9TmyoSMkG5rniq1BdVYuEtQsQF1GGBkxqMI="; }; # Remove some Electron stuff from package.json From c9f87ea4d2b8102f7d749cd13525f797caa90441 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 20 Mar 2023 07:40:17 -0400 Subject: [PATCH 44/81] geant4: 11.0.3 -> 11.0.4 --- pkgs/development/libraries/physics/geant4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 58fc0c07cd5b..4e635a08414b 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -47,12 +47,12 @@ in lib.warnIf (enableQT != false) "geant4: enableQT is deprecated, please use enableQt" stdenv.mkDerivation rec { - version = "11.0.3"; + version = "11.0.4"; pname = "geant4"; - src = fetchurl{ + src = fetchurl { url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz"; - hash = "sha256-cvi2h1EtbmMNxsZMXEG6cRIgRoVAEymZ0A5PzhkIrkg="; + hash = "sha256-4wofoo0vLPd8/9CFY8EonpL8R9mcg5Wa9H/ve9UDSyc="; }; cmakeFlags = [ From 65de6e9ee772510a5cbe39ecdd0ca012ce9dd4df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Mar 2023 03:35:58 +0000 Subject: [PATCH 45/81] ttop: 0.8.6 -> 1.0.1 --- pkgs/tools/system/ttop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ttop/default.nix b/pkgs/tools/system/ttop/default.nix index e22054eeefa8..359adeebf58f 100644 --- a/pkgs/tools/system/ttop/default.nix +++ b/pkgs/tools/system/ttop/default.nix @@ -2,14 +2,14 @@ nimPackages.buildNimPackage rec { pname = "ttop"; - version = "0.8.6"; + version = "1.0.1"; nimBinOnly = true; src = fetchFromGitHub { owner = "inv2004"; repo = "ttop"; rev = "v${version}"; - hash = "sha256-2TuDaStWRsO02l8WhYLWX7vqsC0ne2adxrzqrFF9BfQ="; + hash = "sha256-x4Uczksh6p3XX/IMrOFtBxIleVHdAPX9e8n32VAUTC4="; }; buildInputs = with nimPackages; [ asciigraph illwill parsetoml zippy ]; From 89b4b811419f1f293a738958e75898112c54f41c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 18 Mar 2023 12:09:38 +0100 Subject: [PATCH 46/81] vscode-extensions.genieai.chatgpt-vscode: init at 0.0.2 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a59aef07ef3d..9ba40aa8cda1 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1242,6 +1242,23 @@ let }; }; + genieai.chatgpt-vscode = buildVscodeMarketplaceExtension { + meta = { + changelog = "https://marketplace.visualstudio.com/items/genieai.chatgpt-vscode/changelog"; + description = "A Visual Studio Code extension to support ChatGPT, GPT-3 and Codex conversations"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=genieai.chatgpt-vscode"; + homepage = "https://github.com/ai-genie/chatgpt-vscode"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.drupol ]; + }; + mktplcRef = { + name = "chatgpt-vscode"; + publisher = "genieai"; + version = "0.0.2"; + sha256 = "sha256-mdBSZ8BAJ1dFy5MXBPMwXlSmNsY5vD/+gBAI+3+QT84="; + }; + }; + github = { codespaces = buildVscodeMarketplaceExtension { mktplcRef = { From 6ba2ffa05c3be99787fd5c4a2a05e7717bbcf168 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 19 Mar 2023 15:54:08 +0000 Subject: [PATCH 47/81] linux_4_19_hardened: mark broken on x86_64 According to Hydra, this hasn't built for almost a year. --- pkgs/top-level/linux-kernels.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index a0b0f2d00ad0..e3ada0fdbaa2 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -46,7 +46,9 @@ let inherit sha256; }; extraMeta = { - broken = kernel.meta.broken || (stdenv.isx86_64 && lib.versions.majorMinor version == "5.4"); + broken = kernel.meta.broken || (stdenv.isx86_64 && + lib.versionAtLeast version "4.19" && + lib.versionOlder version "5.5"); }; }; kernelPatches = kernel.kernelPatches ++ [ From 8c719d58e19838a605bd1bb634602fc0996087f6 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 19 Mar 2023 16:08:54 +0000 Subject: [PATCH 48/81] linux_4_14_hardened: mark broken --- pkgs/top-level/linux-kernels.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index e3ada0fdbaa2..8ab653c6533e 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -46,9 +46,10 @@ let inherit sha256; }; extraMeta = { - broken = kernel.meta.broken || (stdenv.isx86_64 && - lib.versionAtLeast version "4.19" && - lib.versionOlder version "5.5"); + broken = + kernel.meta.broken || + lib.versions.majorMinor version == "4.14" || + (stdenv.isx86_64 && lib.versionAtLeast version "4.19" && lib.versionOlder version "5.5"); }; }; kernelPatches = kernel.kernelPatches ++ [ From cdd6211abba5bc20248fd16da8f1da6af2fcdee0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 20 Mar 2023 11:07:02 +0000 Subject: [PATCH 49/81] linux_testing_bcachefs: fix meta kernel.override overrides the invocation of buildLinux, not the function in the file that defines the specific kernel version, so we need to pass the arguments that buildLinux expects. --- .../linux/kernel/linux-testing-bcachefs.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 115d8ad93149..39cb461c87e9 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -12,14 +12,12 @@ # NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility (kernel.override ( args // { - argsOverride = { - version = "${kernel.version}-bcachefs-unstable-${commitDate}"; + version = "${kernel.version}-bcachefs-unstable-${commitDate}"; - extraMeta = { - branch = "master"; - maintainers = with lib.maintainers; [ davidak Madouura pedrohlc ]; - }; - } // argsOverride; + extraMeta = { + branch = "master"; + maintainers = with lib.maintainers; [ davidak Madouura pedrohlc ]; + }; kernelPatches = [ { name = "bcachefs-${currentCommit}"; From 663caaa684c07484b6fa63df882db237cfc903e6 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 19 Mar 2023 16:10:39 +0000 Subject: [PATCH 50/81] linux_testing_bcachefs: mark broken on aarch64 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 39cb461c87e9..b6f897b024e0 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchpatch , kernel , commitDate ? "2023-02-01" @@ -16,6 +17,7 @@ extraMeta = { branch = "master"; + broken = stdenv.isAarch64; maintainers = with lib.maintainers; [ davidak Madouura pedrohlc ]; }; From 32abfcc92306345b124aa2201d337d5c6f2a7469 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 12:01:16 +0000 Subject: [PATCH 51/81] build(deps): bump cachix/install-nix-action from 19 to 20 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 19 to 20. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v19...v20) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/check-maintainers-sorted.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-maintainers-sorted.yaml b/.github/workflows/check-maintainers-sorted.yaml index 2c2473250d82..fc03988b068d 100644 --- a/.github/workflows/check-maintainers-sorted.yaml +++ b/.github/workflows/check-maintainers-sorted.yaml @@ -16,7 +16,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v19 + - uses: cachix/install-nix-action@v20 with: # explicitly enable sandbox extra_nix_config: sandbox = true From 4678ba645491c24597e9b75eddd83fd65f0832e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Mon, 20 Mar 2023 09:30:21 -0300 Subject: [PATCH 52/81] linuxKernel.kernels.linux_zen: 6.2.6-zen1 -> 6.2.7-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 1464bd40e208..3d332fbc5233 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,9 +4,9 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.2.6"; #zen + version = "6.2.7"; #zen suffix = "zen1"; #zen - sha256 = "1cbga42b4kz03kgf5vxzh93fa8kgszffki5pwalxj6a2rab8888c"; #zen + sha256 = "1giy45ndzs4pfvwlc1p8zb7qci86ampbjwl93jwxcdn76k8gygzh"; #zen isLqx = false; }; # ./update-zen.py lqx From acde26c95a126acc3036d0ffab58da98e570216b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Mon, 20 Mar 2023 09:32:03 -0300 Subject: [PATCH 53/81] linuxKernel.kernels.linux_lqx: 6.2.6-lqx1 -> 6.2.7-lqx1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 3d332fbc5233..4d4a704e218c 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -11,9 +11,9 @@ let }; # ./update-zen.py lqx lqxVariant = { - version = "6.2.6"; #lqx + version = "6.2.7"; #lqx suffix = "lqx1"; #lqx - sha256 = "1b454badr366pbxiyz7h2n47405wy5pa35rdkk1is8q574yf6scy"; #lqx + sha256 = "0dk79cglqrbsmlz9vimd714km5v717r1066r4bas20r3gi0zlzhi"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From 90116fa82f56467620762e1aaf1f4501eeeadc42 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 20 Mar 2023 08:58:04 -0400 Subject: [PATCH 54/81] argc: 0.15.0 -> 0.15.1 Diff: https://github.com/sigoden/argc/compare/v0.15.0...v0.15.1 Changelog: https://github.com/sigoden/argc/releases/tag/v0.15.1 --- pkgs/development/tools/argc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/argc/default.nix b/pkgs/development/tools/argc/default.nix index 491ddd3a21d0..ce1e569b56de 100644 --- a/pkgs/development/tools/argc/default.nix +++ b/pkgs/development/tools/argc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "argc"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "sigoden"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2J9Xx2DlMTh8o7T/tNZm3QK69gkQo3lj8kBVHhESMTs="; + sha256 = "sha256-hN8M12evYxqNSsQKm0oRf3/b7WUf8k8pWa+0vRHstv4="; }; - cargoSha256 = "sha256-2gZGEpYNR7/mOleAfhDf3hZq1vRKlfWwT25DFIi5w8o="; + cargoSha256 = "sha256-JCFBA9LuNILJs4flzD/bGpv/R2vxMlA0aFTVdGKKs5I="; nativeBuildInputs = [ installShellFiles ]; From 6715882cb7a82eea378646eb2c4b02f698fbc88c Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 20 Mar 2023 09:01:53 -0400 Subject: [PATCH 55/81] cargo-about: 0.5.4 -> 0.5.5 Diff: https://github.com/EmbarkStudios/cargo-about/compare/0.5.4...0.5.5 Changelog: https://github.com/EmbarkStudios/cargo-about/blob/0.5.5/CHANGELOG.md --- pkgs/development/tools/rust/cargo-about/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix index b3b49da4a48a..af749efbed8d 100644 --- a/pkgs/development/tools/rust/cargo-about/default.nix +++ b/pkgs/development/tools/rust/cargo-about/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-zr9Y07VoW8XQELzw7C1QT8Ared8ntH9yjncZqZJ1uj4="; + sha256 = "sha256-OAKTEU4+m9QMW/EMhCrN5HTMSjnPzEU0ISCeauI76SY="; }; - cargoSha256 = "sha256-L01NvZbJggOMcoBLXZw8peiCQxA1DPqnrZVx2pMb40o="; + cargoSha256 = "sha256-BGopHg4giLVie+z7kjlb9rTvLTovFyJ/emCF4j0Va04="; nativeBuildInputs = [ pkg-config ]; From bc6e8aba91c55ad20dabf732974d63b2168e3361 Mon Sep 17 00:00:00 2001 From: LeixB Date: Wed, 15 Mar 2023 17:35:08 +0100 Subject: [PATCH 56/81] liblinear: 2.43 -> 2.46 --- pkgs/development/libraries/liblinear/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index f30d4a2d73bd..56d81e0481d0 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -1,28 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames }: +{ lib, stdenv, fetchFromGitHub }: let - soVersion = "4"; + soVersion = "5"; in stdenv.mkDerivation rec { pname = "liblinear"; - version = "2.43"; + version = "2.46"; src = fetchFromGitHub { owner = "cjlin1"; repo = "liblinear"; rev = "v${builtins.replaceStrings ["."] [""] version}"; - sha256 = "sha256-qcSMuWHJgsapWs1xgxv3fKSXcx18q8cwyIn3E4RCGKA="; + sha256 = "sha256-mKd6idfr6mIIDEie8DCS+drtfpgKoS/5UXI0JenTxlA="; }; - postPatch = '' - substituteInPlace blas/Makefile \ - --replace "ar rcv" "${stdenv.cc.targetPrefix}ar rcv" \ - --replace "ranlib" "${stdenv.cc.targetPrefix}ranlib" - ''; + makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ]; outputs = [ "bin" "dev" "out" ]; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; - buildFlags = [ "lib" "predict" "train" ]; installPhase = '' From ca226cafce2081eed6525674d3c2b1570d2ceae7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 14 Mar 2023 15:05:41 +0100 Subject: [PATCH 57/81] gpu-viewer: init at 2.26 --- pkgs/applications/misc/gpu-viewer/default.nix | 74 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/applications/misc/gpu-viewer/default.nix diff --git a/pkgs/applications/misc/gpu-viewer/default.nix b/pkgs/applications/misc/gpu-viewer/default.nix new file mode 100644 index 000000000000..9c6f67c5fea3 --- /dev/null +++ b/pkgs/applications/misc/gpu-viewer/default.nix @@ -0,0 +1,74 @@ +{ lib +, fetchFromGitHub +, pkg-config +, meson +, ninja +, gtk4 +, libadwaita +, python3Packages +, gobject-introspection +, vulkan-tools +, python3 +, wrapGAppsHook +, gdk-pixbuf +, lsb-release +, glxinfo +, vdpauinfo +, clinfo +}: + +python3.pkgs.buildPythonApplication rec { + pname = "gpu-viewer"; + version = "2.26"; + + format = "other"; + + src = fetchFromGitHub { + owner = "arunsivaramanneo"; + repo = pname; + rev = "v${version}"; + hash = "sha256-3GYJq76g/pU8dt+OMGBeDcw47z5Xv3AGkLsACcBCELs="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + gtk4 + libadwaita + vulkan-tools + gdk-pixbuf + ]; + + pythonPath = with python3Packages; [ + pygobject3 + click + ]; + + # Prevent double wrapping + dontWrapGApps = true; + + postFixup = '' + makeWrapper ${python3.interpreter} $out/bin/gpu-viewer \ + --prefix PATH : "${lib.makeBinPath [ clinfo glxinfo lsb-release vdpauinfo vulkan-tools ]}" \ + --add-flags "$out/share/gpu-viewer/Files/GPUViewer.py" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --chdir "$out/share/gpu-viewer/Files" \ + ''${makeWrapperArgs[@]} \ + ''${gappsWrapperArgs[@]} + ''; + + + meta = with lib; { + homepage = "https://github.com/arunsivaramanneo/GPU-Viewer"; + description = "A front-end to glxinfo, vulkaninfo, clinfo and es2_info"; + maintainers = with maintainers; [ GaetanLepage ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b5ef1079c13..50810c1058ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4946,6 +4946,8 @@ with pkgs; stdenv = gcc9Stdenv; }; + gpu-viewer = callPackage ../applications/misc/gpu-viewer { }; + greg = callPackage ../applications/audio/greg { pythonPackages = python3Packages; }; From 5c5f710388f0d94a222c91c79c0c812d2b65fdde Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 20 Mar 2023 14:32:10 +0100 Subject: [PATCH 58/81] gitea: 1.18.5 -> 1.19.0 ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.19.0 --- nixos/tests/gitea.nix | 2 +- .../version-management/gitea/default.nix | 4 ++-- .../version-management/gitea/static-root-path.patch | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index a8b5567c2075..86d4fce37929 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -93,7 +93,7 @@ let api_token = server.succeed( "curl --fail -X POST http://test:totallysafe@localhost:3000/api/v1/users/test/tokens " + "-H 'Accept: application/json' -H 'Content-Type: application/json' -d " - + "'{\"name\":\"token\"}' | jq '.sha1' | xargs echo -n" + + "'{\"name\":\"token\",\"scopes\":[\"all\"]}' | jq '.sha1' | xargs echo -n" ) server.succeed( diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 3141d08cdcec..a09476a20582 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -15,12 +15,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.18.5"; + version = "1.19.0"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-OGPn4fknYfzmuAi6CL8m/Ih4uRNraVDmpBm20qT3lKk="; + hash = "sha256-9nDzXSGYxYw34/Ekmj44VdGLVhRsGL2e5gfyoyPUqGQ="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/gitea/static-root-path.patch b/pkgs/applications/version-management/gitea/static-root-path.patch index e486397d9cf1..7f70329c6040 100644 --- a/pkgs/applications/version-management/gitea/static-root-path.patch +++ b/pkgs/applications/version-management/gitea/static-root-path.patch @@ -1,10 +1,10 @@ -diff --git a/modules/setting/setting.go b/modules/setting/setting.go -index 45e55a2..9d18ee4 100644 ---- a/modules/setting/setting.go -+++ b/modules/setting/setting.go -@@ -667,7 +667,7 @@ func NewContext() { +diff --git a/modules/setting/server.go b/modules/setting/server.go +index 183906268..fa02e8915 100644 +--- a/modules/setting/server.go ++++ b/modules/setting/server.go +@@ -319,7 +319,7 @@ func loadServerFrom(rootCfg ConfigProvider) { OfflineMode = sec.Key("OFFLINE_MODE").MustBool() - DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() + Log.DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() if len(StaticRootPath) == 0 { - StaticRootPath = AppWorkPath + StaticRootPath = "@data@" From 7ebafc91abe22556231ea59fb8fcf805b20c844f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 16 Mar 2023 10:39:32 +0000 Subject: [PATCH 59/81] hello-wayland: unstable-2020-07-27 -> unstable-2023-03-16 Only changes are to the README and a cross-compilation fix. --- pkgs/applications/graphics/hello-wayland/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/hello-wayland/default.nix b/pkgs/applications/graphics/hello-wayland/default.nix index b11e2be9daf6..7ecc43c44907 100644 --- a/pkgs/applications/graphics/hello-wayland/default.nix +++ b/pkgs/applications/graphics/hello-wayland/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation { - pname = "hello-wayland-unstable"; - version = "2020-07-27"; + pname = "hello-wayland"; + version = "unstable-2023-03-16"; src = fetchFromGitHub { owner = "emersion"; repo = "hello-wayland"; - rev = "501d0851cfa7f21c780c0eb52f0a6b23f02918c5"; - sha256 = "0dz6przqp57kw8ycja3gw6jp9x12217nwbwdpgmvw7jf0lzhk4xr"; + rev = "f6a8203309977af03cda94765dd61367c189bea6"; + sha256 = "FNtc6OApW/epAFortvujNVWJJVI44IY+Pa0qU0QdecA="; }; nativeBuildInputs = [ imagemagick pkg-config ]; From 238d4c33349143212f7ae925750ac09e8633463f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 17 Mar 2023 09:52:14 +0000 Subject: [PATCH 60/81] b4: 0.12.1 -> 0.12.2 --- pkgs/development/tools/b4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix index 8ef941653e41..2e6f1f42a74a 100644 --- a/pkgs/development/tools/b4/default.nix +++ b/pkgs/development/tools/b4/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "b4"; - version = "0.12.1"; + version = "0.12.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-BFvuxwcHG2KCv5LAeus50IDJ2mBCyixg3ETq9UzPmSA="; + sha256 = "tvSv14v3iigFWzifCQl5Kxx4Bfs1V/XXHvvaNoKqvm4="; }; # tests make dns requests and fails From f129d39c779f090a2ee1e284f479e1450e767458 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 19 Mar 2023 19:19:23 -0400 Subject: [PATCH 61/81] nix-init: 0.1.1 -> 0.2.0 Diff: https://github.com/nix-community/nix-init/compare/v0.1.1...v0.2.0 Changelog: https://github.com/nix-community/nix-init/blob/v0.2.0/CHANGELOG.md --- pkgs/tools/nix/nix-init/default.nix | 50 ++++++++++++++++--- .../{license.nix => get-nix-license.nix} | 28 +++++------ 2 files changed, 56 insertions(+), 22 deletions(-) rename pkgs/tools/nix/nix-init/{license.nix => get-nix-license.nix} (74%) diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix index c60f88022ccc..3453a1b74c66 100644 --- a/pkgs/tools/nix/nix-init/default.nix +++ b/pkgs/tools/nix/nix-init/default.nix @@ -1,43 +1,81 @@ { lib +, writeText , rustPlatform , fetchFromGitHub +, curl , installShellFiles , makeWrapper , pkg-config +, bzip2 +, libgit2_1_5 +, openssl +, zlib , zstd , stdenv , darwin +, spdx-license-list-data , nix , nurl -, callPackage -, spdx-license-list-data }: +let + get-nix-license = import ./get-nix-license.nix { + inherit lib writeText; + }; +in + rustPlatform.buildRustPackage rec { pname = "nix-init"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-init"; rev = "v${version}"; - hash = "sha256-x9UrBCnEGz6nI1XGBLjIeiF3qi3EvynAfafiuhQdt9Q="; + hash = "sha256-/lH8zO6ah7/HVZ7jOxTgs2iKND1UlGP5EQLtx6JsFxo="; }; - cargoHash = "sha256-RUfprANAbj8w8LPRwQEF9SD9fhWb1CEcwbvOa6DX9Xk="; + cargoHash = "sha256-jI/hysUq3JGe0hdZTQQw49BfcTWMx6jg+QAkd1QeBv4="; nativeBuildInputs = [ + curl installShellFiles makeWrapper pkg-config ]; buildInputs = [ + bzip2 + curl + libgit2_1_5 + openssl + zlib zstd ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + darwin.apple_sdk.frameworks.CoreFoundation ]; + buildNoDefaultFeatures = true; + buildFeatures = [ "reqwest/rustls-tls" ]; + + checkFlags = [ + # requires internet access + "--skip=lang::rust::tests" + ]; + + postPatch = '' + mkdir -p data + ln -s ${get-nix-license} data/get-nix-license.rs + ''; + + preBuild = '' + cargo run -p license-store-cache \ + -j $NIX_BUILD_CORES --frozen \ + data/license-store-cache.zstd ${spdx-license-list-data.json}/json/details + ''; + postInstall = '' wrapProgram $out/bin/nix-init \ --prefix PATH : ${lib.makeBinPath [ nix nurl ]} @@ -46,8 +84,6 @@ rustPlatform.buildRustPackage rec { ''; GEN_ARTIFACTS = "artifacts"; - NIX_LICENSES = callPackage ./license.nix { }; - SPDX_LICENSE_LIST_DATA = "${spdx-license-list-data.json}/json/details"; ZSTD_SYS_USE_PKG_CONFIG = true; meta = with lib; { diff --git a/pkgs/tools/nix/nix-init/license.nix b/pkgs/tools/nix/nix-init/get-nix-license.nix similarity index 74% rename from pkgs/tools/nix/nix-init/license.nix rename to pkgs/tools/nix/nix-init/get-nix-license.nix index 0a1ad4fce122..2aa514bd3465 100644 --- a/pkgs/tools/nix/nix-init/license.nix +++ b/pkgs/tools/nix/nix-init/get-nix-license.nix @@ -1,10 +1,12 @@ -# vendored from src/licenses.nix +# vendored from src/get-nix-license.nix { lib, writeText }: let inherit (lib) + attrNames concatMapAttrs + concatStringsSep filterAttrs flip id @@ -14,9 +16,6 @@ let optionalAttrs pipe warn - attrNames - concatStringsSep - length ; licenseMap = flip concatMapAttrs licenses @@ -60,18 +59,17 @@ let else warn "${k}: ${concatStringsSep ", " v}")); - inserts = lint (mapAttrsToList - (k: v: '' xs.insert("${k}", "${v}");'') - (deprecatedAliases // licenseMap)); + arms = lint (concatStringsSep "\n " + (mapAttrsToList + (k: v: ''"${k}" => Some("${v}"),'') + (deprecatedAliases // licenseMap))); in -writeText "license.rs" '' - fn get_nix_licenses() -> rustc_hash::FxHashMap<&'static str, &'static str> { - let mut xs = std::collections::HashMap::with_capacity_and_hasher( - ${toString (length inserts)}, - Default::default(), - ); - ${concatStringsSep "\n " inserts} - xs +writeText "get-nix-license.rs" '' + pub fn get_nix_license(license: &str) -> Option<&'static str> { + match license { + ${arms} + _ => None, + } } '' From e32f3c7ea9b3ae7cc4d1447fe917d2d96eba3587 Mon Sep 17 00:00:00 2001 From: "\"traxys\"" <"quentin+dev@familleboyer.net"> Date: Mon, 20 Mar 2023 14:45:06 +0100 Subject: [PATCH 62/81] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 34a8a185df1c..cc75ef5fe7b2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -189,8 +189,8 @@ final: prev: src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "1319824e2cbbb8471f7da56a8d787a664bb8faae"; - sha256 = "01wpbwpramrfiwj0s5xv21ynjjy3wqllx3vbnpj94vcfk18qmx9m"; + rev = "4b8f537dadf5f9abbdd1554584bec9c04843909c"; + sha256 = "0sb94hi4qph8wg9agkg5kvqzfjnqnk683y05r0waw69r4iarsfar"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -3444,12 +3444,12 @@ final: prev: go-nvim = buildVimPluginFrom2Nix { pname = "go.nvim"; - version = "2023-03-18"; + version = "2023-03-20"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "4ddd66affd76ccd29fb60e2abde77f743d5f7449"; - sha256 = "1a62dvixny281103cq165yzbklnvz90p4yj5y7pwy54cwn6a5mww"; + rev = "933ff9f0d84975122ec62ef98f78511db5c313c1"; + sha256 = "02pr6c8ljv34xd9h6y01i71l8nrapspyg1dm8vcybl5jjq85xrmv"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4223,12 +4223,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-03-19"; + version = "2023-03-20"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "b306eb3d0f32b792929735c6d528c38d0f1dc0cd"; - sha256 = "1say6d6kyb5186rbw65jys8j2b7d7ksv8grxkba7lihbf97zpscq"; + rev = "887eb75591520a01548134c4623617b639289d0b"; + sha256 = "14kncmkrjgfkw1wynhgqslgybmzalnq9ps07k7kbccpsjmqafggp"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4859,12 +4859,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-03-19"; + version = "2023-03-20"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "9992c66c2a832a17302ca3179a82516544565f9b"; - sha256 = "1yzspxsnk6vlrcl51xksfnhvlg58q8mj66iwqqpk1ddxkx7vl485"; + rev = "a192887fd0c29275cf2acb4a83bcbdf63399f8df"; + sha256 = "0vqr4sm49x0mcd250mc39nsax49dlzyx9al8nkbxc5k881w4f93f"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5319,8 +5319,8 @@ final: prev: src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "7b1e0a371c4b631bc185eb8dcea00bb6005e02b0"; - sha256 = "09bh4cixa4ks6rw4qrmdwinwaz7va312abm1wm3bp2a42ralx8da"; + rev = "0a8e312923671e78499b2e204f0f678379ba92c1"; + sha256 = "1n9l21dcwh2g5rps7kn761qbmdy822q67djlgrlmd9gml45s0klz"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5351,12 +5351,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-03-17"; + version = "2023-03-20"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "dc02950e0364db853b2ed4a169e38d7de8ec95ad"; - sha256 = "0hnrvw63qssx01n1j4qv20xgd66ys2ilpy9j36wqs4gcncchp9ch"; + rev = "039ff3212ec43cc4d3332956dfb54e263c8d5033"; + sha256 = "17a6lpqv99b89g7kakbzw97hpkqmw729if4j8gq8svza3fjcq2pg"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -6263,12 +6263,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-03-18"; + version = "2023-03-20"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "5a871409199d585b52b69952532e3fb435e64566"; - sha256 = "13dr00ms9vghbb979rpd627qd90nfx9afhz8hjrpkhr9qm8jlry0"; + rev = "736c39e4bab977f0171c78328415c6402c58e64a"; + sha256 = "1079bdrnrlw4qkpibpnkznkpnih71r8zxl2s47ad8hvvr586k9ld"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6311,12 +6311,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2023-03-17"; + version = "2023-03-20"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "9e3f9854f1cb3db2a8b1617b8e5847555624f3ff"; - sha256 = "0wsvfi43i48bs6i8gx9ipx4x5xrdd179vzyf8666yjnpy2dv50d0"; + rev = "51e88e4f5eeadbd92a75cae71c5cbb75f3cb6765"; + sha256 = "0lq4dl92wvnql9i5c8kbfja4jzzlzps0v6nmpy7qalrxhfp5gyn2"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6335,12 +6335,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2023-03-04"; + version = "2023-03-20"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "cdd24539bcf114a499827e9b32869fe74836efe7"; - sha256 = "1iwpfls99mibmp8s2zw21hngvhqhnj6v03ddrv17qd2pwgdaarm4"; + rev = "f1ffbc3f5736add66c31e02f4c53d238e040600b"; + sha256 = "0djb5n86ypd94gb06fgf7p25sina1xfrnb7894v4pga9fc1fl4fp"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -6531,32 +6531,32 @@ final: prev: src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "1d79a64a88af47ddbb55f4805ab537d11d5b908e"; - sha256 = "u9ZLBL4FY/bkvl4+ofKifyEHM9+KhqeYovhr9VQYG7c="; + rev = "a50723e35f57f89fb67019127a16d90f16edfef8"; + sha256 = "0k7q6isrnk9qqymiz5vzkspq5ff5m4bkb66ayn8bsp6v7qdrkzyz"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-03-19"; + version = "2023-03-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "4536156f32b8ab0aab264e3cd7819fc8e3daede4"; - sha256 = "1y6lczvsv4bygh79gqbihxsaygmnhin4bwdi59hb7bjgi6xy8j8f"; + rev = "25b656a4b771ee7d440e506280b9ae546d6f7233"; + sha256 = "02qg57wkrg2if1kbailyy2qw84c1wfa9rmv8cv8ljzxfqhf9f380"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-03-19"; + version = "2023-03-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "c1fa59698850cafa4cae686e652d1512a01dcf3c"; - sha256 = "1gmzcw57k8s24wj9llkw7xn45y9cdn6s8dimbjnlpb218z72j00c"; + rev = "446a463500ea2ee22c9b44f059b1117997f5aaeb"; + sha256 = "0l6jwqg6i0z5w0q3z7956rc3wc3w2h320237clvxvkq3brf33f0a"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; From f58a0dc2d4450b95ea1fd79f366388a0ccd58ddd Mon Sep 17 00:00:00 2001 From: traxys Date: Mon, 20 Mar 2023 11:51:22 +0100 Subject: [PATCH 63/81] vimPlugins.openscad-nvim: init at 2022-04-15 --- .../editors/vim/plugins/generated.nix | 12 +++++ .../editors/vim/plugins/overrides.nix | 19 ++++++++ .../patches/openscad.nvim/program_paths.patch | 44 +++++++++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 4 files changed, 76 insertions(+) create mode 100644 pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index cc75ef5fe7b2..9172ea07dbdf 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6873,6 +6873,18 @@ final: prev: meta.homepage = "https://github.com/tyru/open-browser.vim/"; }; + openscad-nvim = buildVimPluginFrom2Nix { + pname = "openscad.nvim"; + version = "2022-04-15"; + src = fetchFromGitHub { + owner = "salkin-mada"; + repo = "openscad.nvim"; + rev = "197ca5ea7ca53702c453f862e7f4734b51c7023e"; + sha256 = "1f0xd9gaacg7avrnsyigal4iz8645z50fgpwjfxis9nrjlia7h73"; + }; + meta.homepage = "https://github.com/salkin-mada/openscad.nvim/"; + }; + orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; version = "2023-03-17"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d8c06088dc77..2983b9c4d1bb 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -24,6 +24,7 @@ , git , gnome , himalaya +, htop , jq , khard , languagetool @@ -31,6 +32,7 @@ , meson , nim , nodePackages +, openscad , pandoc , parinfer-rust , ripgrep @@ -50,6 +52,7 @@ , nodejs , xdotool , xorg +, zathura , zsh # command-t dependencies @@ -729,6 +732,22 @@ self: super: { configurePhase = "cd vim"; }); + # The plugin depends on either skim-vim or fzf-vim, but we don't want to force the user so we + # avoid choosing one of them and leave it to the user + openscad-nvim = super.openscad-nvim.overrideAttrs (old: { + buildInputs = [ zathura htop openscad ]; + + patches = [ ./patches/openscad.nvim/program_paths.patch ]; + + postPatch = '' + substituteInPlace lua/openscad.lua --replace '@zathura-path@' ${zathura}/bin/zathura + substituteInPlace autoload/health/openscad_nvim.vim --replace '@zathura-path@' ${zathura}/bin/zathura + substituteInPlace lua/openscad/terminal.lua --replace '@htop-path@' ${htop}/bin/htop + substituteInPlace autoload/health/openscad_nvim.vim --replace '@htop-path@' ${htop}/bin/htop + substituteInPlace lua/openscad.lua --replace '@openscad-path@' ${openscad}/bin/openscad + ''; + }); + orgmode = super.orgmode.overrideAttrs (old: { dependencies = with self; [ (nvim-treesitter.withPlugins (p: [ p.org ])) ]; }); diff --git a/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch b/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch new file mode 100644 index 000000000000..9bfcee2e34a4 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch @@ -0,0 +1,44 @@ +diff --git a/autoload/health/openscad_nvim.vim b/autoload/health/openscad_nvim.vim +index 9022d55..30ef53f 100644 +--- a/autoload/health/openscad_nvim.vim ++++ b/autoload/health/openscad_nvim.vim +@@ -7,7 +7,7 @@ function! s:check_nvim_version_minimum() abort + endfunction + + function! s:check_zathura_installed() abort +- if !executable('zathura') ++ if !executable('@zathura-path@') + call health#report_error('has(zathura)','install zathura') + else + call health#report_ok("zathura is installed") +@@ -15,7 +15,7 @@ function! s:check_zathura_installed() abort + endfunction + + function! s:check_htop_installed() abort +- if !executable('htop') ++ if !executable('@htop-path@') + call health#report_error('has(htop)','install htop') + else + call health#report_ok("htop is installed") +diff --git a/lua/openscad.lua b/lua/openscad.lua +index 7dff2fb..4382003 100644 +--- a/lua/openscad.lua ++++ b/lua/openscad.lua +@@ -101,7 +101,7 @@ end + + function M.manual() + local path = U.openscad_nvim_root_dir .. U.path_sep .. "help_source" .. U.path_sep .. "openscad-manual.pdf" +- api.nvim_command('silent !zathura --fork ' .. path) ++ api.nvim_command('silent !@zathura-path@ --fork ' .. path) + end + + function M.help() +@@ -119,7 +119,7 @@ end + + function M.exec_openscad() + -- maybe just use api.jobstart .. instead +- api.nvim_command[[ call jobstart('openscad ' . shellescape(expand('%:p')), {'detach':1}) ]] ++ api.nvim_command[[ call jobstart('@openscad-path@ ' . shellescape(expand('%:p')), {'detach':1}) ]] + end + + function M.default_mappings() diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 5767e5b8502b..cff1c845d678 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -578,6 +578,7 @@ https://github.com/sonph/onehalf/,, https://github.com/rmehri01/onenord.nvim/,main, https://github.com/tyru/open-browser-github.vim/,, https://github.com/tyru/open-browser.vim/,, +https://github.com/salkin-mada/openscad.nvim/,HEAD, https://github.com/nvim-orgmode/orgmode/,, https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD, https://github.com/vuki656/package-info.nvim/,, From 068c6de7f6f6658219a846e835cba1f9bf18e591 Mon Sep 17 00:00:00 2001 From: "\"traxys\"" <"quentin+dev@familleboyer.net"> Date: Mon, 20 Mar 2023 14:45:55 +0100 Subject: [PATCH 64/81] vimPlugins.nvim-treesitter: update grammars --- .../editors/vim/plugins/nvim-treesitter/generated.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 7ae521bbb65a..35b6299d104f 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -995,6 +995,17 @@ }; meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua"; }; + luadoc = buildGrammar { + language = "luadoc"; + version = "40a67ee"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-luadoc"; + rev = "40a67ee798eb3c989fffde0277ff6de740ebaf34"; + hash = "sha256-vhiUaZms4Je/TBTTepQiuddl0sKodrHcrBCauBPgu7Y="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-luadoc"; + }; luap = buildGrammar { language = "luap"; version = "bfb38d2"; From 656709bceb2d9f86c5b971f0ec53bbfbac0de543 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 20 Mar 2023 15:34:09 +0100 Subject: [PATCH 65/81] pkgsMusl.xterm: fix build (#220731) --- pkgs/applications/terminal-emulators/xterm/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 5eb565227a94..78c64e9ca3c3 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -54,8 +54,13 @@ stdenv.mkDerivation rec { "--with-app-defaults=$(out)/lib/X11/app-defaults" ] ++ lib.optional enableDecLocator "--enable-dec-locator"; - # Work around broken "plink.sh". - NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig"; + env = { + # Work around broken "plink.sh". + NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig"; + } // lib.optionalAttrs stdenv.hostPlatform.isMusl { + # Various symbols missing without this define: TAB3, NLDLY, CRDLY, BSDLY, FFDLY, CBAUD + NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; + }; # Hack to get xterm built with the feature of releasing a possible setgid of 'utmp', # decided by the sysadmin to allow the xterm reporting to /var/run/utmp From 8aa9c82256e957b98e3057f245a32f105db7d31a Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Mon, 20 Mar 2023 15:34:11 +0100 Subject: [PATCH 66/81] vscode-extensions.streetsidesoftware.code-spell-checker: 2.19.0 -> 2.20.3 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 9ba40aa8cda1..ce9a7660b181 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2675,8 +2675,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.19.0"; - sha256 = "sha256-c95u++tkK8hToauulY8faNITUmsCBEeC2B8mHY0oEmA="; + version = "2.20.3"; + sha256 = "sha256-28ybNBobXoq194d9VGD9kOq/OWscJkSlgSZ7ViaNQtw="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; From 0810a6e018ee759de935e25a330f7710f2c4ca9c Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Mon, 2 May 2022 17:31:17 +0200 Subject: [PATCH 67/81] nixos/prometheus.alertmanagerIrcRelay: init Co-authored-by: Martin Weinelt --- .../manual/release-notes/rl-2305.section.md | 2 + nixos/modules/module-list.nix | 1 + .../prometheus/alertmanager-irc-relay.nix | 107 ++++++++++++++++++ 3 files changed, 110 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/alertmanager-irc-relay.nix diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index b8d15ebd7ed4..2c56b7e23747 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -47,6 +47,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [goeland](https://github.com/slurdge/goeland), an alternative to rss2email written in golang with many filters. Available as [services.goeland](#opt-services.goeland.enable). +- [alertmanager-irc-relay](https://github.com/google/alertmanager-irc-relay), a Prometheus Alertmanager IRC Relay. Available as [services.prometheus.alertmanagerIrcRelay](options.html#opt-services.prometheus.alertmanagerIrcRelay.enable). + - [tts](https://github.com/coqui-ai/TTS), a battle-tested deep learning toolkit for Text-to-Speech. Mutiple servers may be configured below [services.tts.servers](#opt-services.tts.servers). - [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 49cb5c6a491f..1c976de0ef0e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -735,6 +735,7 @@ ./services/monitoring/nagios.nix ./services/monitoring/netdata.nix ./services/monitoring/parsedmarc.nix + ./services/monitoring/prometheus/alertmanager-irc-relay.nix ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/prometheus/default.nix ./services/monitoring/prometheus/exporters.nix diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager-irc-relay.nix b/nixos/modules/services/monitoring/prometheus/alertmanager-irc-relay.nix new file mode 100644 index 000000000000..b81d5f6db5e0 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/alertmanager-irc-relay.nix @@ -0,0 +1,107 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.prometheus.alertmanagerIrcRelay; + + configFormat = pkgs.formats.yaml { }; + configFile = configFormat.generate "alertmanager-irc-relay.yml" cfg.settings; +in +{ + options.services.prometheus.alertmanagerIrcRelay = { + enable = mkEnableOption (mdDoc "Alertmanager IRC Relay"); + + package = mkOption { + type = types.package; + default = pkgs.alertmanager-irc-relay; + defaultText = literalExpression "pkgs.alertmanager-irc-relay"; + description = mdDoc "Alertmanager IRC Relay package to use."; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = mdDoc "Extra command line options to pass to alertmanager-irc-relay."; + }; + + settings = mkOption { + type = configFormat.type; + example = literalExpression '' + { + http_host = "localhost"; + http_port = 8000; + + irc_host = "irc.example.com"; + irc_port = 7000; + irc_nickname = "myalertbot"; + + irc_channels = [ + { name = "#mychannel"; } + ]; + } + ''; + description = mdDoc '' + Configuration for Alertmanager IRC Relay as a Nix attribute set. + For a reference, check out the + [example configuration](https://github.com/google/alertmanager-irc-relay#configuring-and-running-the-bot) + and the + [source code](https://github.com/google/alertmanager-irc-relay/blob/master/config.go). + + Note: The webhook's URL MUST point to the IRC channel where the message + should be posted. For `#mychannel` from the example, this would be + `http://localhost:8080/mychannel`. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.alertmanager-irc-relay = { + description = "Alertmanager IRC Relay"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/alertmanager-irc-relay \ + -config ${configFile} \ + ${escapeShellArgs cfg.extraFlags} + ''; + + DynamicUser = true; + NoNewPrivileges = true; + + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ProtectHome = "tmpfs"; + + PrivateTmp = true; + PrivateDevices = true; + PrivateIPC = true; + + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictRealtime = true; + RestrictSUIDSGID = true; + + SystemCallFilter = [ + "@system-service" + "~@cpu-emulation" + "~@privileged" + "~@reboot" + "~@setuid" + "~@swap" + ]; + }; + }; + }; + + meta.maintainers = [ maintainers.oxzi ]; +} From 5a35e7ea4aa482075316a5a2fd1cea0e9dbfbae3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 20 Mar 2023 11:14:30 -0400 Subject: [PATCH 68/81] nixpkgs-review: 2.8.0 -> 2.9.0 Diff: https://github.com/Mic92/nixpkgs-review/compare/2.8.0...2.9.0 Changelog: https://github.com/Mic92/nixpkgs-review/releases/tag/2.9.0 --- .../package-management/nixpkgs-review/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 95a86032c13e..a864f02ea4fa 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -3,31 +3,35 @@ , fetchFromGitHub , bubblewrap +, nix-output-monitor , cacert , git , nix , withSandboxSupport ? false +, withNom ? false }: python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "sha256-v8IRRmONb10sPndfsuaUYMrGbbosj48cbfgANZCtIN0="; + sha256 = "sha256-SNAroKkPXiX5baGPRYnzqiVwPwko/Uari/tvjIU7/4k="; }; makeWrapperArgs = let - binPath = [ nix git ] ++ lib.optional withSandboxSupport bubblewrap; + binPath = [ nix git ] + ++ lib.optional withSandboxSupport bubblewrap + ++ lib.optional withNom nix-output-monitor; in [ "--prefix PATH : ${lib.makeBinPath binPath}" - "--set NIX_SSL_CERT_FILE ${cacert}/etc/ssl/certs/ca-bundle.crt" + "--set-default NIX_SSL_CERT_FILE ${cacert}/etc/ssl/certs/ca-bundle.crt" # we don't have any runtime deps but nix-review shells might inject unwanted dependencies "--unset PYTHONPATH" ]; From 9180097c41486bed157f73327be0ba772b21e659 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 20 Mar 2023 16:20:16 +0100 Subject: [PATCH 69/81] sonarr: 3.0.9.1549 -> 3.0.10.1567 --- pkgs/servers/sonarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index d47ea4c544a0..ac5ae80cdc26 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sonarr"; - version = "3.0.9.1549"; + version = "3.0.10.1567"; src = fetchurl { url = "https://download.sonarr.tv/v3/main/${version}/Sonarr.main.${version}.linux.tar.gz"; - sha256 = "sha256-Ba1nrvnlmVkPI+OEpwShNxfNLrpxS+N7wsx3ajkcGoQ="; + hash = "sha256-6zdp/Bg+9pcrElW5neB+BC16Vn1VhTjhMRRIxGrKhxc="; }; nativeBuildInputs = [ makeWrapper ]; From 72f784dbbe5511cb2433a369212212e56a7d9c72 Mon Sep 17 00:00:00 2001 From: Kaleb Pace Date: Sun, 19 Mar 2023 22:51:56 -0500 Subject: [PATCH 70/81] balena-cli: fix linux binary with patchelf --- pkgs/tools/admin/balena-cli/default.nix | 63 ++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index be84937ce038..2f09fbf1afad 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -1,8 +1,8 @@ { lib , stdenv , fetchzip +, testers }: - let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -21,27 +21,76 @@ let aarch64-darwin = "1ihxyf35px3s6q2yk4p3dy03rcj93hy96bj3pxqlv0rp05gnsf02"; x86_64-windows = "104hc3qvs04l2hmjmp0bcjr5g5scp4frhprk1fpszziqhdmhwa40"; }.${system} or throwSystem; -in -stdenv.mkDerivation rec { - pname = "balena-cli"; - version = "15.1.1"; + version = "15.1.1"; src = fetchzip { url = "https://github.com/balena-io/balena-cli/releases/download/v${version}/balena-cli-v${version}-${plat}-standalone.zip"; inherit sha256; }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "balena-cli"; + inherit version src; installPhase = '' runHook preInstall mkdir -p $out/bin cp -r ./* $out/ - ln -s $out/balena $out/bin/balena runHook postInstall ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = '' + # Override default cache directory so Balena CLI's unavoidable update check does not fail due to write permissions + BALENARC_DATA_DIRECTORY=./ balena --version + ''; + inherit version; + }; + + # https://github.com/NixOS/nixpkgs/pull/48193/files#diff-b65952dbe5271c002fbc941b01c3586bf5050ad0e6aa6b2fcc74357680e103ea + preFixup = + if stdenv.isLinux then + let + libPath = lib.makeLibraryPath [ stdenv.cc.cc ]; + in + '' + orig_size=$(stat --printf=%s $out/balena) + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/balena + patchelf --set-rpath ${libPath} $out/balena + chmod +x $out/balena + new_size=$(stat --printf=%s $out/balena) + ###### zeit-pkg fixing starts here. + # we're replacing plaintext js code that looks like + # PAYLOAD_POSITION = '1234 ' | 0 + # [...] + # PRELUDE_POSITION = '1234 ' | 0 + # ^-----20-chars-----^^------22-chars------^ + # ^-- grep points here + # + # var_* are as described above + # shift_by seems to be safe so long as all patchelf adjustments occur + # before any locations pointed to by hardcoded offsets + var_skip=20 + var_select=22 + shift_by=$(expr $new_size - $orig_size) + function fix_offset { + # $1 = name of variable to adjust + location=$(grep -obUam1 "$1" $out/bin/balena | cut -d: -f1) + location=$(expr $location + $var_skip) + value=$(dd if=$out/balena iflag=count_bytes,skip_bytes skip=$location \ + bs=1 count=$var_select status=none) + value=$(expr $shift_by + $value) + echo -n $value | dd of=$out/balena bs=1 seek=$location conv=notrunc + } + fix_offset PAYLOAD_POSITION + fix_offset PRELUDE_POSITION + '' else ''''; + dontStrip = true; + meta = with lib; { description = "A command line interface for balenaCloud or openBalena"; longDescription = '' @@ -58,4 +107,4 @@ stdenv.mkDerivation rec { sourceProvenance = [ sourceTypes.binaryNativeCode ]; mainProgram = "balena"; }; -} +}) From 466240f8cbe39cbeb6d02d2a2039297e348e1a4e Mon Sep 17 00:00:00 2001 From: Delan Azabani Date: Tue, 7 Mar 2023 16:26:57 +0800 Subject: [PATCH 71/81] osu-lazer-bin: 2023.301.0 -> 2023.305.0 --- pkgs/games/osu-lazer/bin.nix | 84 ++++++++++++++++++++++++++-------- pkgs/games/osu-lazer/update.sh | 20 +++++++- 2 files changed, 83 insertions(+), 21 deletions(-) diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index cf17332785fd..20d09d83a094 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -1,28 +1,68 @@ -{ appimageTools, lib, fetchurl }: +{ lib +, stdenv +, fetchurl +, fetchzip +, appimageTools +}: -appimageTools.wrapType2 rec { +let pname = "osu-lazer-bin"; - version = "2023.301.0"; + version = "2023.305.0"; + name = "${pname}-${version}"; - src = fetchurl { - url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - sha256 = "sha256-0c74bGOY9f2K52xE7CZy/i3OfyCC+a6XGI30c6hI7jM="; + osu-lazer-bin-src = { + aarch64-darwin = { + url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; + sha256 = "sha256-nL5j0b4vD/tTYPPBLiMxiPWLHnP5hqco0DJ+7EZRSZY="; + }; + x86_64-darwin = { + url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; + sha256 = "sha256-Er48BIzJlSzDaGb6IfhZoV62kj5GJ/rw9ifUw+ZCJkc="; + }; + x86_64-linux = { + url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; + sha256 = "sha256-W3XJ7HtJM5iFI8OOTTu8IBHMerZSCETHMemkoTislK8="; + }; + }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); + + linux = appimageTools.wrapType2 rec { + inherit name pname version meta; + + src = fetchurl (osu-lazer-bin-src); + + extraPkgs = pkgs: with pkgs; [ icu ]; + + extraInstallCommands = + let contents = appimageTools.extract { inherit pname version src; }; + in + '' + mv -v $out/bin/${pname}-${version} $out/bin/osu\! + install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications + for i in 16 32 48 64 96 128 256 512 1024; do + install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png + done + ''; }; - extraPkgs = pkgs: with pkgs; [ icu ]; + darwin = stdenv.mkDerivation rec { + inherit name pname version meta; - extraInstallCommands = - let contents = appimageTools.extract { inherit pname version src; }; - in '' - mv -v $out/bin/${pname}-${version} $out/bin/osu\! - install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications - for i in 16 32 48 64 96 128 256 512 1024; do - install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png - done + src = fetchzip (osu-lazer-bin-src // { stripRoot = false; }); + + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + APP_DIR="$out/Applications" + mkdir -p "$APP_DIR" + cp -r . "$APP_DIR" + runHook postInstall ''; + }; meta = with lib; { - description = "Rhythm is just a *click* away (AppImage version for score submission and multiplayer)"; + description = "Rhythm is just a *click* away (AppImage version for score submission and multiplayer, and binary distribution for Darwin systems)"; homepage = "https://osu.ppy.sh"; license = with licenses; [ mit @@ -30,8 +70,14 @@ appimageTools.wrapType2 rec { unfreeRedistributable # osu-framework contains libbass.so in repository ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = [ maintainers.delan ]; + maintainers = with maintainers; [ delan stepbrobd ]; mainProgram = "osu!"; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; }; -} + + passthru.updateScript = ./update-bin.sh; +in +if stdenv.isDarwin +then darwin +else linux + diff --git a/pkgs/games/osu-lazer/update.sh b/pkgs/games/osu-lazer/update.sh index df1dbcc3c519..3a4c96000ea6 100755 --- a/pkgs/games/osu-lazer/update.sh +++ b/pkgs/games/osu-lazer/update.sh @@ -3,7 +3,8 @@ set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -deps_file="$(realpath "./deps.nix")" +deps_file="$(realpath ./deps.nix)" +bin_file="$(realpath ./bin.nix)" new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases?per_page=1" | jq -r '.[0].name')" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" @@ -15,7 +16,22 @@ fi cd ../../.. if [[ "$1" != "--deps-only" ]]; then - update-source-version osu-lazer "$new_version" + update-source-version osu-lazer "$new_version" + sed -Ei.bak '/ *version = "/s/".+"/"'"$new_version"'"/' "$bin_file" + rm "$bin_file.bak" + for pair in \ + 'aarch64-darwin osu.app.Apple.Silicon.zip' \ + 'x86_64-darwin osu.app.Intel.zip' \ + 'x86_64-linux osu.AppImage' \ + ; do + set -- $pair + nix-prefetch-url "https://github.com/ppy/osu/releases/download/$new_version/$2" | while read -r hash; do + nix --extra-experimental-features nix-command hash to-sri --type sha256 "$hash" | while read -r hash; do + sed -Ei.bak '/ *'"$1"' = "sha256-/s@".+"@"'"$hash"'"@' "$bin_file" + rm "$bin_file.bak" + done + done + done fi $(nix-build . -A osu-lazer.fetch-deps --no-out-link) "$deps_file" From 2c5b18dc0b33164a928e6830b69659e58d143d4d Mon Sep 17 00:00:00 2001 From: Delan Azabani Date: Tue, 7 Mar 2023 17:00:47 +0800 Subject: [PATCH 72/81] osu-lazer: 2023.301.0 -> 2023.305.0 --- pkgs/games/osu-lazer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index f3aea2a333af..1de04bc06b94 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2023.301.0"; + version = "2023.305.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-SUVxe3PdUch8NYR7X4fatbmSpyYewI69usBDICcSq3s="; + sha256 = "sha256-gkAHAiTwCYXTSIHrM3WWLBLbC7S9x1cAaEhSYvtNsvQ="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; From 2b37a4822c57187c5fe50bc7480108571da7be7a Mon Sep 17 00:00:00 2001 From: StepBroBD Date: Mon, 6 Mar 2023 22:57:23 -0700 Subject: [PATCH 73/81] osu-lazer-bin: adding support for darwin systems * osu-lazer-bin: added darwin binary distribution for osu-lazer * osu-lazer-bin: sha256 and metadata changes * maintainers: add stepbrobd * osu-lazer-bin: fixed sha256 for x86_64-darwin * osu-lazer-bin: adding support for darwin systems (delan/nixpkgs#2) * osu-lazer-bin: follows formatting guideline provided by #219954 * osu-lazer-bin: fixed sha256 for all platforms using new update-bin.sh * osu-lazer-bin: added a new update script for osu-lazer-bin * osu-lazer-bin: passthru.updateScript * osu-lazer-bin: add unzip to update script --- maintainers/maintainer-list.nix | 10 ++++++++ pkgs/games/osu-lazer/update-bin.sh | 40 ++++++++++++++++++++++++++++++ pkgs/games/osu-lazer/update.sh | 24 +++--------------- 3 files changed, 54 insertions(+), 20 deletions(-) create mode 100755 pkgs/games/osu-lazer/update-bin.sh diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9681c7718017..ce149da00d08 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14120,6 +14120,16 @@ githubId = 22163194; name = "Stel Abrego"; }; + stepbrobd = { + name = "StepBroBD"; + github = "StepBroBD"; + githubId = 81826728; + email = "Hi@StepBroBD.com"; + matrix = "@stepbrobd:matrix.org"; + keys = [{ + fingerprint = "5D8B FA8B 286A C2EF 6EE4 8598 F742 B72C 8926 1A51"; + }]; + }; stephank = { email = "nix@stephank.nl"; matrix = "@skochen:matrix.org"; diff --git a/pkgs/games/osu-lazer/update-bin.sh b/pkgs/games/osu-lazer/update-bin.sh new file mode 100755 index 000000000000..a2ed671f232c --- /dev/null +++ b/pkgs/games/osu-lazer/update-bin.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../../../. -i bash -p unzip curl jq common-updater-scripts +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +bin_file="$(realpath ./bin.nix)" + +new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases?per_page=1" | jq -r '.[0].name')" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./bin.nix)" +if [[ "$new_version" == "$old_version" ]]; then + echo "Already up to date." + exit 0 +fi + +cd ../../.. + +echo "Updating osu-lazer-bin from $old_version to $new_version..." +sed -Ei.bak '/ *version = "/s/".+"/"'"$new_version"'"/' "$bin_file" +rm "$bin_file.bak" + +for pair in \ + 'aarch64-darwin osu.app.Apple.Silicon.zip' \ + 'x86_64-darwin osu.app.Intel.zip' \ + 'x86_64-linux osu.AppImage'; do + set -- $pair + echo "Prefetching binary for $1..." + prefetch_output=$(nix --extra-experimental-features nix-command store prefetch-file --json --hash-type sha256 "https://github.com/ppy/osu/releases/download/$new_version/$2") + if [[ "$1" == *"darwin"* ]]; then + store_path=$(jq -r '.storePath' <<<"$prefetch_output") + tmpdir=$(mktemp -d) + unzip -q "$store_path" -d "$tmpdir" + hash=$(nix --extra-experimental-features nix-command hash path "$tmpdir") + rm -r "$tmpdir" + else + hash=$(jq -r '.hash' <<<"$prefetch_output") + fi + echo "$1 ($2): sha256 = $hash" + sed -Ei.bak '/ *'"$1"' = /{N;N; s@("sha256-)[^;"]+@"'"$hash"'@}' "$bin_file" + rm "$bin_file.bak" +done diff --git a/pkgs/games/osu-lazer/update.sh b/pkgs/games/osu-lazer/update.sh index 3a4c96000ea6..1ecca32d54a3 100755 --- a/pkgs/games/osu-lazer/update.sh +++ b/pkgs/games/osu-lazer/update.sh @@ -3,35 +3,19 @@ set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -deps_file="$(realpath ./deps.nix)" -bin_file="$(realpath ./bin.nix)" +deps_file="$(realpath "./deps.nix")" new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases?per_page=1" | jq -r '.[0].name')" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" if [[ "$new_version" == "$old_version" ]]; then - echo "Up to date" - exit 0 + echo "Up to date" + exit 0 fi cd ../../.. if [[ "$1" != "--deps-only" ]]; then - update-source-version osu-lazer "$new_version" - sed -Ei.bak '/ *version = "/s/".+"/"'"$new_version"'"/' "$bin_file" - rm "$bin_file.bak" - for pair in \ - 'aarch64-darwin osu.app.Apple.Silicon.zip' \ - 'x86_64-darwin osu.app.Intel.zip' \ - 'x86_64-linux osu.AppImage' \ - ; do - set -- $pair - nix-prefetch-url "https://github.com/ppy/osu/releases/download/$new_version/$2" | while read -r hash; do - nix --extra-experimental-features nix-command hash to-sri --type sha256 "$hash" | while read -r hash; do - sed -Ei.bak '/ *'"$1"' = "sha256-/s@".+"@"'"$hash"'"@' "$bin_file" - rm "$bin_file.bak" - done - done - done + update-source-version osu-lazer "$new_version" fi $(nix-build . -A osu-lazer.fetch-deps --no-out-link) "$deps_file" From 0112d0bdfa02c635c341cb09264648ef8a935700 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 20 Mar 2023 18:13:04 +0100 Subject: [PATCH 74/81] hyprpicker: Fix eval with aliases disabled utillinux -> util-linux, aliased 2020-11-24 --- .../window-managers/hyprwm/hyprpicker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix index 176b0de54e0b..dcc6ea9c1cf3 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix @@ -13,7 +13,7 @@ , libthai , pango , pcre -, utillinux +, util-linux , wayland , wayland-protocols , wayland-scanner @@ -55,7 +55,7 @@ stdenv.mkDerivation { wayland-scanner wlroots libXdmcp - utillinux + util-linux ]; configurePhase = '' From 2676c648eaa25553d4c89ec4042ce0813d350eb1 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 20 Mar 2023 18:22:53 +0100 Subject: [PATCH 75/81] fastnetmon-advanced: init at 2.0.335 (#218609) --- pkgs/servers/fastnetmon-advanced/default.nix | 55 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/servers/fastnetmon-advanced/default.nix diff --git a/pkgs/servers/fastnetmon-advanced/default.nix b/pkgs/servers/fastnetmon-advanced/default.nix new file mode 100644 index 000000000000..34e85914e77a --- /dev/null +++ b/pkgs/servers/fastnetmon-advanced/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, fetchurl, autoPatchelfHook, bzip2 }: + +stdenv.mkDerivation rec { + pname = "fastnetmon-advanced"; + version = "2.0.335"; + + src = fetchurl { + url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb"; + hash = "sha256-2WdCQX0AiLTPGM9flVSXgKMrTGCwSXk9IfyS5SRKroY="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + bzip2 + ]; + + unpackPhase = '' + ar xf $src + tar xf data.tar.xz + + # "These binaries are not part of FastNetMon and we shipped them by accident. They will be removed in next stable build" + rm opt/fastnetmon/app/bin/{generate_rsa_keys,license_app,fastnetmon_license_server} + + # ships with both 2_0_0 and 2_3_0 but the shared objects are not versioned and only 2_3_0 has the necessary symbols + rm -rf opt/fastnetmon/libraries/libclickhouse_2_0_0/ + + # unused libraries, which have additional dependencies + rm opt/fastnetmon/libraries/gcc1210/lib/libgccjit.so.0.0.1 + rm opt/fastnetmon/libraries/poco_1_10_0/lib/libPocoCryptod.so.70 + rm opt/fastnetmon/libraries/poco_1_10_0/lib/libPocoCrypto.so.70 + rm opt/fastnetmon/libraries/poco_1_10_0/lib/libPocoJWTd.so.70 + rm opt/fastnetmon/libraries/poco_1_10_0/lib/libPocoJWT.so.70 + rm opt/fastnetmon/libraries/wkhtmltopdf-0.12.3/wkhtmltox/lib/libwkhtmltox.so.0.12.3 + ''; + + installPhase = '' + mkdir -p $out/libexec/fastnetmon + cp -r opt/fastnetmon/app/bin $out/bin + cp -r opt/fastnetmon/libraries $out/libexec/fastnetmon + + addAutoPatchelfSearchPath $out/libexec/fastnetmon/libraries + ''; + + meta = with lib; { + description = "A high performance DDoS detector / sensor - commercial edition"; + homepage = "https://fastnetmon.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ yuka ]; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db2f3cb8a31a..bdc20e62f5c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24775,6 +24775,8 @@ with pkgs; exim = callPackage ../servers/mail/exim { }; + fastnetmon-advanced = callPackage ../servers/fastnetmon-advanced { }; + fcgiwrap = callPackage ../servers/fcgiwrap { }; fedigroups = callPackage ../servers/fedigroups { From 2af44e355256e7a9d7377acfd4aeb3153dbffd81 Mon Sep 17 00:00:00 2001 From: Andrew Hamon Date: Mon, 20 Mar 2023 10:58:14 -0700 Subject: [PATCH 76/81] watchman: add version to binary --- pkgs/development/tools/watchman/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 7a042ac8bc73..c68683dbecb0 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" "-DENABLE_EDEN_SUPPORT=NO" # requires sapling (formerly known as eden), which is not packaged in nixpkgs "-DWATCHMAN_STATE_DIR=${stateDir}" + "-DWATCHMAN_VERSION_OVERRIDE=${version}" ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; From e0371f9d20bc08b2ac72813e83d1e678442bd30e Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 17 Mar 2023 21:57:25 +0300 Subject: [PATCH 77/81] mastodon: 4.1.0 -> 4.1.1 --- pkgs/servers/mastodon/default.nix | 33 +++++++++++++++---------------- pkgs/servers/mastodon/source.nix | 4 ++-- pkgs/servers/mastodon/version.nix | 2 +- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index d942bb0b2e5f..8f34d284df21 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -72,15 +72,13 @@ stdenv.mkDerivation rec { rm -rf ~/node_modules/.cache # Create missing static gzip and brotli files - gzip -9 -n -c ~/public/assets/500.html > ~/public/assets/500.html.gz - gzip -9 -n -c ~/public/packs/report.html > ~/public/packs/report.html.gz - find ~/public/assets -maxdepth 1 -type f -name ".*.json" | while read file; do - gzip -9 -n -c $file > $file.gz - done - brotli --best -f ~/public/packs/report.html -o ~/public/packs/report.html.br - find ~/public/assets -type f -regextype posix-extended -iregex '.*\.(css|js|json|html)' | while read file; do - brotli --best -f $file -o $file.br - done + gzip --best --keep ~/public/assets/500.html + gzip --best --keep ~/public/packs/report.html + find ~/public/assets -maxdepth 1 -type f -name '.*.json' \ + -exec gzip --best --keep --force {} ';' + brotli --best --keep ~/public/packs/report.html + find ~/public/assets -type f -regextype posix-extended -iregex '.*\.(css|js|json|html)' \ + -exec brotli --best --keep {} ';' ''; installPhase = '' @@ -107,15 +105,16 @@ stdenv.mkDerivation rec { fi done + # Remove execute permissions + chmod 0444 public/emoji/*.svg + # Create missing static gzip and brotli files - find public -maxdepth 1 -type f -regextype posix-extended -iregex '.*\.(css|js|svg|txt|xml)' | while read file; do - gzip -9 -n -c $file > $file.gz - brotli --best -f $file -o $file.br - done - find public/emoji -type f -name "*.svg" | while read file; do - gzip -9 -n -c $file > $file.gz - brotli --best -f $file -o $file.br - done + find public -maxdepth 1 -type f -regextype posix-extended -iregex '.*\.(css|js|svg|txt|xml)' \ + -exec gzip --best --keep --force {} ';' \ + -exec brotli --best --keep {} ';' + find public/emoji -type f -name '.*.svg' \ + -exec gzip --best --keep --force {} ';' \ + -exec brotli --best --keep {} ';' ln -s assets/500.html.gz public/500.html.gz ln -s assets/500.html.br public/500.html.br ln -s packs/sw.js.gz public/sw.js.gz diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 891e96d68481..b51afb602c2b 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -2,8 +2,8 @@ { fetchgit, applyPatches }: let src = fetchgit { url = "https://github.com/mastodon/mastodon.git"; - rev = "v4.1.0"; - sha256 = "00nc80s1hz4sdpq81hsv2r9da3bjn4lgwpk7w24zy2016iwjjwbb"; + rev = "v4.1.1"; + sha256 = "1c0mxz45pkgmyw81z025n1ps1dkdq92337h7sd865w2fbgmzg50l"; }; in applyPatches { inherit src; diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix index c283b30007c5..4a8abaf4eb4b 100644 --- a/pkgs/servers/mastodon/version.nix +++ b/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"4.1.0" +"4.1.1" From 336e5cc12618d4dc8ff178e750350fda22357927 Mon Sep 17 00:00:00 2001 From: Woze Parrot Date: Mon, 20 Mar 2023 15:44:34 -0400 Subject: [PATCH 78/81] seaweedfs: 3.43 -> 3.44 --- pkgs/applications/networking/seaweedfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index ee75ee6df648..7d493b7e4993 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.43"; + version = "3.44"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-u2HGawshd2OdkchgpZUN6P2fTBSwJk+RjHAYYEpPgCg="; + hash = "sha256-buis2OSN/mvI38LvRthy+9xPbpHj+guXNoTEuDUcKYw="; }; - vendorHash = "sha256-Q6B+iqUb97ZayjYDe4OOhkWj1Cxy+ILQxxEU2Jw/Als="; + vendorHash = "sha256-U8K2aQMVJsJWESN5BWjwrEWGzGTB8c/eMh0GJ75Xs7U="; subPackages = [ "weed" ]; From e12230e71628a460bf82a8477242280868efe799 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Mar 2023 20:45:47 +0100 Subject: [PATCH 79/81] =?UTF-8?q?why3:=201.5.1=20=E2=86=92=201.6.0;=20ocam?= =?UTF-8?q?lPackages.lambdapi:=202.2.1=20=E2=86=92=202.3.1=20(#220986)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit why3: 1.5.1 → 1.6.0 ocamlPackages.lambdapi: 2.2.1 → 2.3.1 Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- .../science/logic/easycrypt/default.nix | 13 ++++++++----- pkgs/applications/science/logic/why3/default.nix | 4 ++-- pkgs/development/ocaml-modules/lambdapi/default.nix | 13 ++++++------- pkgs/development/tools/analysis/frama-c/default.nix | 9 +++++++++ 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix index da4ff212e294..abd2b0cb2758 100644 --- a/pkgs/applications/science/logic/easycrypt/default.nix +++ b/pkgs/applications/science/logic/easycrypt/default.nix @@ -11,11 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256:09rdwcj70lkamkhd895p284rfpz4bcnsf55mcimhiqncd2a21ml7"; }; - # Fix build with Why3 1.5 - patches = fetchpatch { - url = "https://github.com/EasyCrypt/easycrypt/commit/d226387432deb7f22738e1d5579346a2cbc9be7a.patch"; - sha256 = "sha256:1zvxij35fnr3h9b5wdl8ml17aqfx3a39rd4mgwmdvkapbg3pa4lm"; - }; + patches = lib.lists.map fetchpatch [ + # Fix build with Why3 1.5 + { url = "https://github.com/EasyCrypt/easycrypt/commit/d226387432deb7f22738e1d5579346a2cbc9be7a.patch"; + hash = "sha256:1zvxij35fnr3h9b5wdl8ml17aqfx3a39rd4mgwmdvkapbg3pa4lm"; } + # Fix build with Why3 1.6 + { url = "https://github.com/EasyCrypt/easycrypt/commit/876f2ed50a0434afdf2fb20e7c50b8a3e26bb06e.patch"; + hash = "sha256-UycfLZWYHNsppb7qHSRaAF4Y0UnwoFueEG0wUcBUPYE="; } + ]; nativeBuildInputs = with ocamlPackages; [ dune_3 diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 55b59ff2e3b0..df8be359d123 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "why3"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-vNR7WeiSvg+763GcovoZBFDfncekJMeqNegP4fVw06I="; + hash = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw="; }; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/lambdapi/default.nix b/pkgs/development/ocaml-modules/lambdapi/default.nix index 1478687fe5e3..ddb428f720ee 100644 --- a/pkgs/development/ocaml-modules/lambdapi/default.nix +++ b/pkgs/development/ocaml-modules/lambdapi/default.nix @@ -1,5 +1,5 @@ { lib -, fetchFromGitHub +, fetchurl , buildDunePackage , alcotest , dedukti @@ -17,15 +17,14 @@ buildDunePackage rec { pname = "lambdapi"; - version = "2.2.1"; + version = "2.3.1"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; - src = fetchFromGitHub { - owner = "Deducteam"; - repo = pname; - rev = version; - hash = "sha256-p2ZjSfiZwkf8X4fSNJx7bAVpTFl4UBHIEANIWF7NGCs="; + src = fetchurl { + url = "https://github.com/Deducteam/lambdapi/releases/download/${version}/lambdapi-${version}.tbz"; + hash = "sha256-7ww2TjVcbEQyfmLnnEhLGAjW4US9a4mdOfDJw6NR1fI="; }; nativeBuildInputs = [ menhir ]; diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 1039a549d93e..491da08310bf 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -4,6 +4,15 @@ , gdk-pixbuf, wrapGAppsHook }: +let why3_1_5 = why3.overrideAttrs (o: rec { + version = "1.5.1"; + src = fetchurl { + url = "https://why3.gitlabpages.inria.fr/releases/${o.pname}-${version}.tar.gz"; + hash = "sha256-vNR7WeiSvg+763GcovoZBFDfncekJMeqNegP4fVw06I="; + }; + }); in +let why3 = why3_1_5; in + let mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"; runtimeDeps = with ocamlPackages; [ From f01862e271cac854e8e90eb9c6a273a1035901e0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 20 Mar 2023 20:49:01 +0100 Subject: [PATCH 80/81] gitea.data-compressed: improve drv name `data-compressed` is to undescriptive for a store-path. Same for forgejo. --- pkgs/applications/version-management/forgejo/default.nix | 2 +- pkgs/applications/version-management/gitea/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 6127aec2bbe2..88fb7ff7bf5b 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -71,7 +71,7 @@ buildGoModule rec { ''; passthru = { - data-compressed = runCommand "data-compressed" { + data-compressed = runCommand "forgejo-data-compressed" { nativeBuildInputs = [ brotli xorg.lndir ]; } '' mkdir $out diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index cda16784a9f7..045226d7d991 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -66,7 +66,7 @@ buildGoModule rec { ''; passthru = { - data-compressed = runCommand "data-compressed" { + data-compressed = runCommand "gitea-data-compressed" { nativeBuildInputs = [ brotli xorg.lndir ]; } '' mkdir $out From 1f24ebb428c036ebc01b9da6b106b79f93957d6d Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 20 Mar 2023 16:53:08 -0300 Subject: [PATCH 81/81] elixir-ls: rename elixir_ls to elixir-ls --- doc/languages-frameworks/beam.section.md | 2 +- pkgs/development/beam-modules/default.nix | 2 +- pkgs/development/beam-modules/elixir-ls/default.nix | 6 +++--- pkgs/development/beam-modules/elixir-ls/update.sh | 2 +- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/beam-packages.nix | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 707da43e9dd7..b246da3a81ab 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -128,7 +128,7 @@ You will need to run the build process once to fix the hash to correspond to you ###### FOD {#fixed-output-derivation} -A fixed output derivation will download mix dependencies from the internet. To ensure reproducibility, a hash will be supplied. Note that mix is relatively reproducible. An FOD generating a different hash on each run hasn't been observed (as opposed to npm where the chances are relatively high). See [elixir_ls](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/beam-modules/elixir-ls/default.nix) for a usage example of FOD. +A fixed output derivation will download mix dependencies from the internet. To ensure reproducibility, a hash will be supplied. Note that mix is relatively reproducible. An FOD generating a different hash on each run hasn't been observed (as opposed to npm where the chances are relatively high). See [elixir-ls](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/beam-modules/elixir-ls/default.nix) for a usage example of FOD. Practical steps diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 23982fb2a789..22d2b337f1cb 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -73,7 +73,7 @@ let # Remove old versions of elixir, when the supports fades out: # https://hexdocs.pm/elixir/compatibility-and-deprecations.html - elixir_ls = callPackage ./elixir-ls { inherit elixir fetchMixDeps mixRelease; }; + elixir-ls = callPackage ./elixir-ls { inherit elixir fetchMixDeps mixRelease; }; lfe = lfe_1_3; lfe_1_3 = lib'.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; }; diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 72862d5b9689..acf73d094a2b 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -23,7 +23,7 @@ mixRelease { sha256 = pinData.depsSha256; }; - # elixir_ls is an umbrella app + # elixir-ls is an umbrella app # override configurePhase to not skip umbrella children configurePhase = '' runHook preConfigure @@ -31,12 +31,12 @@ mixRelease { runHook postConfigure ''; - # elixir_ls require a special step for release + # elixir-ls require a special step for release # compile and release need to be performed together because # of the no-deps-check requirement buildPhase = '' runHook preBuild - mix do compile --no-deps-check, elixir_ls.release + mix do compile --no-deps-check, elixir-ls.release runHook postBuild ''; diff --git a/pkgs/development/beam-modules/elixir-ls/update.sh b/pkgs/development/beam-modules/elixir-ls/update.sh index eaa73815d735..be85b4c6d642 100755 --- a/pkgs/development/beam-modules/elixir-ls/update.sh +++ b/pkgs/development/beam-modules/elixir-ls/update.sh @@ -23,7 +23,7 @@ if ("$latest_version" === "$current_version") { .\"sha256\" = \"$tarball_hash\" | \ .\"depsSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json - const new_mix_hash = $(nix-build -A elixir_ls.mixFodDeps 2>&1 | \ + const new_mix_hash = $(nix-build -A elixir-ls.mixFodDeps 2>&1 | \ tail -n 1 | \ sd '\s+got:\s+' '') diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4d9c2add0151..652a519a71fa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -416,6 +416,8 @@ mapAliases ({ electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 + elixir_ls = elixir-ls; # Added 2023-03-20 + # Emacs emacs28NativeComp = emacs28; # Added 2022-06-08 emacs28Packages = emacs28.pkgs; # Added 2021-10-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4537502abbe4..453137ba68c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16583,7 +16583,7 @@ with pkgs; erlang erlangR25 erlangR24 erlangR23 erlangR22 erlangR21 erlang_odbc erlang_javac erlang_odbc_javac elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 - elixir_ls; + elixir-ls; erlang_nox = beam_nox.interpreters.erlang; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index c727db80db6a..06987c456445 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -108,7 +108,7 @@ in # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR24.elixir`. inherit (self.packages.erlang) - elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_ls; + elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls; inherit (self.packages.erlang) lfe lfe_1_3; };