From 52b52c1abd9cd0e728fd357bae63c303c2f2049f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 17:03:44 +0000 Subject: [PATCH 001/163] emscripten: 2.0.27 -> 3.0.0 --- pkgs/development/compilers/emscripten/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index c514b86a6c42..af78b56c097f 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "2.0.27"; + version = "3.0.0"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "1dpfib2nmbvskqlaqw3kvaay69qpa7d155hd4w05c2xgmahmrd4n"; + sha256 = "sha256-HlXcPKlmBTwEKgTfeMg6QoMKMbK++bpv2fu1DyolrHs="; rev = version; }; From 6821948a15675d9479b4dbd9454bef83cb1587ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Mar 2022 21:38:59 +0000 Subject: [PATCH 002/163] xrootd: 5.4.1 -> 5.4.2 --- pkgs/tools/networking/xrootd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index ffc348370983..a4c90f95e90d 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "xrootd"; - version = "5.4.1"; + version = "5.4.2"; src = fetchFromGitHub { owner = "xrootd"; repo = "xrootd"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-rr6cZ6tyrpCQyKcPBWwGsRAsLbjTXAoTtxf+u1UmvZo="; + sha256 = "sha256-k6uAJbUhpwnRrSeGn4JQiHDBrGJNQDf5vG2a+je5ByU="; }; outputs = [ "bin" "out" "dev" "man" ]; From 5d304d0098d8f5857103b5674a37f2ba86692ed7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 03:00:31 +0000 Subject: [PATCH 003/163] ciao: 1.20.0 -> 1.21.0-m1 --- pkgs/development/compilers/ciao/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ciao/default.nix b/pkgs/development/compilers/ciao/default.nix index a5cdcb82bc05..2ce32631562a 100644 --- a/pkgs/development/compilers/ciao/default.nix +++ b/pkgs/development/compilers/ciao/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ciao"; - version = "1.20.0"; + version = "1.21.0-m1"; src = fetchFromGitHub { owner = "ciao-lang"; repo = "ciao"; rev = "v${version}"; - sha256 = "sha256-Xp0ZQRi7mOO2WN/2hO6zgobDG3S0BEV+SgsaduBZ30U="; + sha256 = "sha256-o9EQS7KsoTg458Uw+1shgKE6NlZO495XE/rLq6/1S4g="; }; configurePhase = '' From f75f8092d8808c7c28b887dba0fafd2c10b80031 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 08:26:32 +0000 Subject: [PATCH 004/163] google-java-format: 1.14.0 -> 1.15.0 --- pkgs/development/tools/google-java-format/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/development/tools/google-java-format/default.nix index 35a7d7e71995..ddc26be1c647 100644 --- a/pkgs/development/tools/google-java-format/default.nix +++ b/pkgs/development/tools/google-java-format/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.14.0"; + version = "1.15.0"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-DSfT5Yw6nZHYm0JNRn+r3iToxntGYmBhU7zQGzg+vXc="; + sha256 = "sha256-o1a7AjaynFejq2ePF6ewJ6rWA7CWDBg6GPH+Mi5POOo="; }; dontUnpack = true; From 8213bd819954ee50e740392ed20dfec150eae207 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 15 Mar 2022 00:23:25 +0400 Subject: [PATCH 005/163] vscode: gtk2 is not a dependency --- pkgs/applications/editors/vscode/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 672eb4b27ba1..030b696e14e6 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,6 +1,6 @@ { stdenv, lib, makeDesktopItem , unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook -, gtk2, atomEnv, at-spi2-atk, autoPatchelfHook +, atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap , writeShellScriptBin @@ -64,7 +64,7 @@ let }; buildInputs = [ libsecret libXScrnSaver libxshmfence ] - ++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk ] ++ atomEnv.packages); + ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk ] ++ atomEnv.packages); runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; From 541064d899ce51d291c0aca27834b740ab21ea4b Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 14 Mar 2022 21:54:07 +0100 Subject: [PATCH 006/163] sndbus-cpp: init at 1.1.0 --- .../libraries/sdbus-cpp/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/libraries/sdbus-cpp/default.nix diff --git a/pkgs/development/libraries/sdbus-cpp/default.nix b/pkgs/development/libraries/sdbus-cpp/default.nix new file mode 100644 index 000000000000..d665a6d94a5a --- /dev/null +++ b/pkgs/development/libraries/sdbus-cpp/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, systemd +, expat +}: + +stdenv.mkDerivation rec { + pname = "sdbus-cpp"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "kistler-group"; + repo = "sdbus-cpp"; + rev = "v${version}"; + sha256 = "sha256-AjaZ6YmMlnN0jAcUBkft01XHkrze0nSr3dUMechsLrQ="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + systemd + expat + ]; + + cmakeFlags = [ + "-DBUILD_CODE_GEN=ON" + ]; + + meta = with lib; { + homepage = "https://github.com/Kistler-Group/sdbus-cpp"; + changelog = "https://github.com/Kistler-Group/sdbus-cpp/blob/v${version}/ChangeLog"; + description = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API"; + longDescription = '' + sdbus-c++ is a high-level C++ D-Bus library for Linux designed to provide expressive, easy-to-use API in modern C++. + It adds another layer of abstraction on top of sd-bus, a nice, fresh C D-Bus implementation by systemd. + It's been written primarily as a replacement of dbus-c++, which currently suffers from a number of (unresolved) bugs, + concurrency issues and inherent design complexities and limitations. + ''; + mainProgram = "sdbus-c++-xml2cpp"; + license = licenses.lgpl2Only; + platforms = platforms.linux; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 071bf333e6f5..d966b8d9cb58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1100,6 +1100,8 @@ with pkgs; redfang = callPackage ../tools/networking/redfang { }; + sdbus-cpp = callPackage ../development/libraries/sdbus-cpp { }; + sdlookup = callPackage ../tools/security/sdlookup { }; sx-go = callPackage ../tools/security/sx-go { }; From 188743537d4a306dd8dbe5aa5e9cc2b671215d81 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 15 Mar 2022 00:24:17 +0400 Subject: [PATCH 007/163] vscode: don't dump all the commands to a file This is necessary due to cp -r ./* commands that copy this debug file --- pkgs/applications/editors/vscode/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 030b696e14e6..d704497b4f0c 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -72,6 +72,7 @@ let dontBuild = true; dontConfigure = true; + noDumpEnvVars = true; installPhase = '' runHook preInstall From 33e1d138c0eaefc3e5649c7c807c693c1f72cae9 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 16 Mar 2022 18:05:56 +0100 Subject: [PATCH 008/163] python3Packages.dnspython: fix build on darwin by disabling failing tests --- pkgs/development/python-modules/dnspython/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 40b3d7a36dec..59730bff71ec 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -24,6 +25,11 @@ buildPythonPackage rec { disabledTests = [ # dns.exception.SyntaxError: protocol not found "test_misc_good_WKS_text" + ] ++ lib.optionals stdenv.isDarwin [ + # unable to get local issuer certificate + "test_async" + "test_query" + "test_resolver_override" ]; nativeBuildInputs = [ From 39a1e04f4a9fab42615bcd80a37c7f79a3db4c54 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 20 Mar 2022 22:35:08 +0000 Subject: [PATCH 009/163] linuxPackages.rtl8821au: 2021-11-05 -> 2022-03-08 Fixes the build with Linux 5.17. --- pkgs/os-specific/linux/rtl8821au/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index 5800405f2839..dc693f01f572 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl8821au"; - version = "${kernel.version}-unstable-2021-11-05"; + version = "${kernel.version}-unstable-2022-03-08"; src = fetchFromGitHub { owner = "morrownr"; repo = "8821au-20210708"; - rev = "dd9f442d86535fb749ab06f38f97160484d9f04b"; - sha256 = "0d90zd45b8934wxy51q1x39lx4n3i28zjm6jcq98wkm4lypgphxv"; + rev = "2c0c6fef81c0c7dcf8fa06fc4ab72168abc4f7bb"; + sha256 = "sha256-Hdzi3pGqH71O0Jenjd/myG4+rZDLC/CcWHkjDoXBxS0="; }; nativeBuildInputs = [ bc nukeReferences ]; From c4527f5bd82b93b15e21936c7d00350332baa228 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Mar 2022 19:08:05 +0000 Subject: [PATCH 010/163] firefox-beta-bin-unwrapped: 98.0b5 -> 99.0b6 --- .../browsers/firefox-bin/beta_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 7fa0ae18549f..ab3cfb9ef52b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "98.0b5"; + version = "99.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ach/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ach/firefox-99.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "d572a56bbdaf004ff33ca5ea1079680a2af9b5b8ba9ca3989b34ba6d5d34abbb"; + sha256 = "a540c52dbb973a85ee0f9fb116f7812e624d925dce77fe14a310f4bf5e6a0b58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/af/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/af/firefox-99.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "ac544b28cf44236f1d1e46ee5e1b3484c97cf732bc857eeae3682b501ccd9867"; + sha256 = "0f15edf10fc6ccb9f8bfba5cd6bbe83ac11df1b01fe9d5a1888f9b83a20b6d49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/an/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/an/firefox-99.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "18eff485b959812f916f6925d4adf32a30e1fd3b82040db1ffb1c03aa9e76a5e"; + sha256 = "769c936702fd344395e2fb949ddd2782f0e35096889c7c84027edfd9f08f5790"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ar/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ar/firefox-99.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "cb33eedbc186386dbe5bd96d294a202a3f4d43e72affcf62b2f5608580262902"; + sha256 = "401b84fb1ce243e657018b0f6c98acc7838c7abcb0ed93772d56b1082135b479"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ast/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ast/firefox-99.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "34461a0d3e89768cf951f7a1d12a61732a66b38cc7f4493b028b1c49f810e265"; + sha256 = "2876d7dc456ead1a0efd867e3f683ea432589049ad85adf7ca5e7824f9dcfe66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/az/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/az/firefox-99.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "6a7084f81c269b572f4d8b19ac686a97187be217e1a8e1a6d993470f60374d1b"; + sha256 = "c83d7bf96d74241657ae84dcd0b63328dc521cdb4be639577473305bc0d024b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/be/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/be/firefox-99.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "85b951a4c3a9f73f74cf4374b142fe86306e26480461e665fee92d4d920fa716"; + sha256 = "35942f40d0604f382a383a9f737d59bdd6141ec6066d7da54422fe02928c46f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/bg/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/bg/firefox-99.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "03de393f231f1b54babb254a139e71a051861656f050f31605a8351f2a33507b"; + sha256 = "f55d30618fd8eccfba51fc82fbcf37fa3eed550b168ed603a14a69511ee4955c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/bn/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/bn/firefox-99.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "ba3b9743502aeb38f510873854dd054ba21250394097f12b2f3ff8883c6c1e97"; + sha256 = "462741a2dd135d7f0cbe12ca93bba398a621613af5611f1cae364a281863388f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/br/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/br/firefox-99.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "56478d56ef1a6e4340262eff9f5f64925aa62bea4774e41cfe97069760dc3505"; + sha256 = "2f08c5b70e49b9151757a80821011cc6ac8bb9d68b282aeb33b9928bec2609f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/bs/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/bs/firefox-99.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "b76eb84e8c2282a7ca11cd3208aa4445b52ff24fd06e0f4a2445b326c71b42c3"; + sha256 = "08802aa569f3e4c9307dbdf0216cc96e851ee88d663d52f22559bae99df3c551"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ca-valencia/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ca-valencia/firefox-99.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "4f9325f1d1fbaa28a5be6599e2db4f55e69e5e10b0f11496e1c36e83c50ceced"; + sha256 = "49fc70e96542fb26e536570395f6f8302e4271306f0298739c537a7d03af3585"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ca/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ca/firefox-99.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1f110c78565cace8c1def9c0343c0d4b2a0632d25a03fc0cda9462daa8292d41"; + sha256 = "c1a1ae01536b9b885ee66033f8d828ef63cf3211fa3ec52ad8cd8c688e8bb1cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/cak/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/cak/firefox-99.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "843ef97f99c5d0396485e9821a0600a2f2a724ff76b147c7883c3b05c89c34ef"; + sha256 = "536ebd5224b5a53b4660d9113172fcd73862307da6c41f007a2cdb71b35a6dc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/cs/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/cs/firefox-99.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "52394ebc3694fefedf33a65626020bf78610bd8d8fd732605f254d0532f3e804"; + sha256 = "3d25003533ce79e9a32e4dccb92235994b076dce620a73b4f3efac2c04887596"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/cy/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/cy/firefox-99.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "5952065bc634b3a008798ac329172e68eafb9c18c84e99520465ffeadd36ebae"; + sha256 = "04e5c7f3195ee0a55b3c2c27cf030a1cebeabfcb833e77a2b099916bfac07b8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/da/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/da/firefox-99.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "7346203ba006416b010c05ba217792caa53fe5472b1239450100d0d75b2be301"; + sha256 = "707a9d7991c925989af516681542ba7cf1f4cabeaa3eea7d8be44a76184ae440"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/de/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/de/firefox-99.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "272d56431cae04275648d25cb9b85c0d555cb839eed6bcd9bb8c088ba4983d58"; + sha256 = "e2601df88ee67fc7d4d0d675f53dfb96f34a2c2e3dffdf1ee811561e3ddfa7a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/dsb/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/dsb/firefox-99.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "5ce9c6d56b286aacf049580ca971cc5737498f62b6a9c177aa7634bec8ad13e7"; + sha256 = "479ec9ec8fc128dc971976611b31d12ea58b1a3119c9019c8fcf4e224486b8dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/el/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/el/firefox-99.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "2624a40add509da75dc22e8438147b7556fab463dd44793b918bd91826a5a3f7"; + sha256 = "fc0075428e18c918bbeb1b25e367e7bf0a4aacc7a27c6acd382f326dfefa65d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/en-CA/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/en-CA/firefox-99.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "bb91268d5bdd7ca82642363c33af05223375596c4b2d4cf51195d1478985ec5b"; + sha256 = "1f1f10900d3c3ecfc1ec55e06d38bbe89462abc25bf2aa97bad2a785970b52fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/en-GB/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/en-GB/firefox-99.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "5c9e84e4116e2d65f87a8959bf384b51e9e1edbaab165d506c9e8051813bc767"; + sha256 = "36ec8955482e37178f6b333681ae3e998a65701b90541ed6f98b452d04515b27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/en-US/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/en-US/firefox-99.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "389b11d44e6b50684e309b89bbc7baca1e86a2be26c3809b490b77fc3ccdb48a"; + sha256 = "e316f005fbefcec2c55d9dd2452392c82155b080abb51d36eddcccfead742ca8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/eo/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/eo/firefox-99.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "fd1a3ec9000492ddd64eaa2fb60bcbbd2a7af8b4fccbe78690378eb9ac365c07"; + sha256 = "0fab5a6ed664f3be18c9aa81c51015b75b3cb9a8bed5bae3322eca57d76fa0b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-AR/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/es-AR/firefox-99.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "788018660eaf7b02a5e0279447e508863ebb75fed18299d4ae0279cb36f842a2"; + sha256 = "e24a821243c0f2ba758c00334ee40900b3d8eec2d137db774512a1b5907dd0e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-CL/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/es-CL/firefox-99.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "3556d494d08f129aec339642a28dcae9f051cb0baef4344cf5bcec7326186f26"; + sha256 = "5ba1376f6c47b8afb320f7aa36ae1bc6a6dd45350a843f641889fa0f9bd6d4f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-ES/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/es-ES/firefox-99.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "15a3d9d872d3e2e3ef2a795767b64a495f4b992aa72a80558d67b8f294d5b959"; + sha256 = "73d3f8a7ad44d175fc73993ad1ddf2115cda48d33422493e80f5f5fcb0805f13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-MX/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/es-MX/firefox-99.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "9bcc96e62902977cb2f5f10fad4ada00c19a453d4c598787e92ce4e54e6adfdf"; + sha256 = "cd3267b82d6a02a1f2797069373e95726262c603902a655fb138699b5546e34b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/et/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/et/firefox-99.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "b0cbbc22406961bd076d0a8792e7a166280a52e29804129db8c39f5f24248fe3"; + sha256 = "07f95fc1bef61d7c1f8b85ae9e774cab7c79c8d8e2d1d82fe80ea6b8f33e7a6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/eu/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/eu/firefox-99.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "d82729e8551f3d4e9782d70c30e0aac3d1033acd57c0bb61c3073dfc7d1e8642"; + sha256 = "da979dfebd9e18d524e20f05c04dcb9abf42eced67d0d59b2e2b8fd0f2860d4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fa/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/fa/firefox-99.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "66de45bf96a23242566ef04ae6e402e08b35964e42c704e4f4350171f28e3b74"; + sha256 = "7afddd9ca0568fc844e68f67325ceb2f5a4bf8ed35095076b60e98e334001575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ff/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ff/firefox-99.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "851ab51c00f3e59439dd7f482fa3361634600e5c2b63be5784472df912288b86"; + sha256 = "291a80a59157da3eee5f8f8c4c4647713fa639e940200dee7a6f2ff6d44dc55a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fi/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/fi/firefox-99.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b1857154f9a49ac0acf8e99bf2491af4dd84cab2b1f1965acdd321311305c7a1"; + sha256 = "b5d42423703cbf205fab56d64125d5d68c5466553dbdf47d05e29c98a1bf4c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/fr/firefox-99.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "59e4d31c6532096215b223f41a3a5e59c29db0e9007d8b26260997878223efe7"; + sha256 = "95ac9b6b2be9e5996dd3ed3a84c62bf1f29715063c0af3475c02fe5614436800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fy-NL/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/fy-NL/firefox-99.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "56707c16711c7c90cadd66eaf3084498769827fdacf6fb73b4eca60185c1b2d6"; + sha256 = "d4b0eaa62170cf651d92b3feb361632a2a202b971661e1111cd343c54abfe98c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ga-IE/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ga-IE/firefox-99.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "afd4b994549beb079ec0d04669824904d7f16e9ddd9cf323095ce32277d7865a"; + sha256 = "01e383677c6fe5d3c73b29339d62b8cc5e8fa6120a6c1f31509eac9020eb7a42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gd/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/gd/firefox-99.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "1e96751aeee49e229afc0715d2d1b93f216b159a716075b6481d59add59c8e35"; + sha256 = "ba0c05f8ccb21224781824178b41794f04585dc22c60bb4b3db3a230be304eaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/gl/firefox-99.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "2950aed5bf345de03873a8a0ab35885aa766a88776213d5f58798235e8130094"; + sha256 = "540cf483ba69cb35eb0878d07af059f023e453359962217fa4f91ed6e9ceeb8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gn/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/gn/firefox-99.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "6f4afd656511c8cfbb933b8680ddee2bbf3ff584021193058e7eacabd152cf03"; + sha256 = "222de0e732642bb0ab30687312bbd2fe83b0ca42497a1e8aab2a56658b1f3fa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gu-IN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/gu-IN/firefox-99.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "0b9cd7febe314aed67e85fba904b000dccd97d983e944a093699d80eb53134b0"; + sha256 = "c2d5751f5b5d3c419c4a5bc61ecf900638f2f4f93e44dfe4b888c467e17ae368"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/he/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/he/firefox-99.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6a122b779d99bc42ddbdd85e97649953185f472c97d352d4e0f0cf96198bcca8"; + sha256 = "00e4b80dbe25ff5daee56b2eeca471b5bda4186b50a676b72ee3b6dd85f52935"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hi-IN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/hi-IN/firefox-99.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "551b20cc433c045a4e28628498548f6cc114998158386062be926238b674239d"; + sha256 = "cc762a99b9443f45c326971dd3f0fbe10c46abc4ab54a31916d8f344942fe645"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/hr/firefox-99.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "15f1814fb99544f7b093ba6cf6de98be069696175d9ccd93db049b8e0a723a78"; + sha256 = "6f935f65ef177e330b53c35818d14cdc135436f79497b6e59e748365a2942767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hsb/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/hsb/firefox-99.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "bc89304cd1f68d18de7d8711f334a14d972c35eb4a779e212ff470157b15525c"; + sha256 = "4ec5aaf93f6bebd218817ee6552b352822c016209e5b528bb96f65fc1b89ec69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hu/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/hu/firefox-99.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "f7a85d9d1d529f245d456eab76ad26cecb6a1d58a5da15b5b6d20544af989772"; + sha256 = "5042f7330efadd917d38f9e5415477f507258ba8462e5600ab1ab15755707db2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hy-AM/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/hy-AM/firefox-99.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f5b6c4ea7c8817f9b8740aa0954c74c7cedf30e659bdeec4b9b468ac7430ae25"; + sha256 = "479d9f677b0dc81f9286e4b9b8c89cc3a34de3c51d1e2088c7463adcb8cc7d35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ia/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ia/firefox-99.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "24d68a73da9e817f02233a4c39e1a6d56aa26d15b17a964de0d10cd65ff8f6aa"; + sha256 = "42a882486fdd29a89220c3a2604873d338b9187d5545fac9da59929a4f865deb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/id/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/id/firefox-99.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "86f7e09688943b242a83bda19b770f4720aa495c9f8503a79d22abb8a24793a0"; + sha256 = "483885d63782b4dc2f6444438f5f4c4f291600a5ca669b2630c6ee5fccdd4382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/is/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/is/firefox-99.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "52cbbd83f54f4e93b08d874f7f68cdaa168bb663c10c4a3534918bfef4812793"; + sha256 = "23c62d13ce11f8c5497ab32a80e0f6b49e56f711c9e42673baf37022e3feb364"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/it/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/it/firefox-99.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "aeb7529d9a7dc88a23094589fd30c04f2d1366e5dae9a92bb16a7c9bbaf476ba"; + sha256 = "7a3006a99a20a54ad104389c7203bfd6c24b0aa53c02ca4d14a24e34503cf6a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ja/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ja/firefox-99.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9cf3e5bf609bd86f7cea748df34279fb9f421e76a3e3935e33e5af1b3ba32f06"; + sha256 = "05ca3af44e2d723edd2777c91714962459b889122dd669d72c91d83ecefded54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ka/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ka/firefox-99.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "c6d6d9524aeafef73aed12d2757520903a53deff32ddf55873e038f1a1b3e37b"; + sha256 = "9979bd999157dcbca6b70ca967401b61c574ed3a6d2dd62d436692dbd26fa0b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/kab/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/kab/firefox-99.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c238bd3d49236ccc80d85b8ea9a5bfe95f7a93bdd9fc82f09dde2de314412027"; + sha256 = "e2e5c9220501b8c481cc2c1a159b49b5adc243bdaad715afd7cf32aae89237c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/kk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/kk/firefox-99.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "b34c10751ef34dbc41157711fc4f02c5c9d26104be971b1c9001704c2e695e3e"; + sha256 = "67a0794f7ff2206955d47a2af2f9eeeb0b308526348e86845ec9fcaaaeff9ede"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/km/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/km/firefox-99.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "859629828f358f3b7933f98292f3df0047fa012cfdbc4db652eea0fcebd944a8"; + sha256 = "79de967bb49baaf50633e11c03487b9f696eb924a6c2cb4ca776849c03709f71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/kn/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/kn/firefox-99.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "ae70facbaecd4b11d8e39eb6b40615c63e37eb9020933b443326c3ec6849277a"; + sha256 = "acf8833a43bbca67be2f7c883e8c9fd3b65b5e43f61e803a5ac188ca2724273a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ko/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ko/firefox-99.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "63b939612cb311aa31b9f2293e82cd0aafb1a857318db2f8cb022cd0d868324c"; + sha256 = "669aeb1fc430810d5347cb85df3e1f53240573c3b37c621c5ab9f384b2883f31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/lij/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/lij/firefox-99.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "85c8edd159ad5b2843673a9beda883a349bebf1133ad64fef2685a61bbbb8d4e"; + sha256 = "1c29ba78ad9834ce598c31fc40999861556d91e3a43a3a39b8eef08eac59a8f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/lt/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/lt/firefox-99.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "fa5d9116fbb25a8c1b816357de21aa8e376ee0983c12ae6c842c0a015071829e"; + sha256 = "caf5e72d891e001b5874cd9eb39359535d0e7a3e9e806bdf6c9bbc2ad5cb1543"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/lv/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/lv/firefox-99.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "e744ece030a07f84c9cbf8a952c5dc2ab8fc3cb3889405978f79665917ab62a5"; + sha256 = "48e2e31c5fe889be4ff3cbdf1bab671537ca66a55c59f63ae9f09a31f4222c9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/mk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/mk/firefox-99.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "466d376a9f0caf60242aa0abb945b8899ac9d80080da3c4546c74d9e2e6c131c"; + sha256 = "cb26ff5fd9f9b4dbda62b173459173a5d0d39fd4caada1877a1f9750080f239a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/mr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/mr/firefox-99.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "c3077f608d9a5f655b50a0a14c024f5f8bca2dd6ab75901915fc379ec5e31311"; + sha256 = "d8c95476b496d42e876080d2809fb349442f159afd385bdaa0444ae776f2bfb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ms/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ms/firefox-99.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "de64870f7300f66ec653af11f4d38320c1b63f6ac2bcda3b7d21610ab83598e0"; + sha256 = "3be2c35dc0d5cb98b616eb573d436326238ea0f03b6dbb5ec3c6e9f0b6d3f677"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/my/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/my/firefox-99.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "91ecbb951fe4d987b226b40a9bb7efec4119cb43371fb57c98deecb538704ae6"; + sha256 = "f24161a028dd225cc9e57636544fdf2fece02129e65388bf63bee752b23be712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/nb-NO/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/nb-NO/firefox-99.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "bcccecd3ae6b89c6972a24d41967d20b487d55da6d0d489de0e69da6d9e95c0d"; + sha256 = "1699b0cdfd96cef9193bbee9a461b3867783d93ca98974efec4e998ecd430847"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ne-NP/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ne-NP/firefox-99.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "808f5583b067f74ed584804ea4a32ca86bab336f808944ee5877c7a964bc84d6"; + sha256 = "c0d6ed8fa1ad7853adb10c83d6422fe2a41254522655d52e1ac4fbe88412996f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/nl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/nl/firefox-99.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "2bdd1003f0a77b0c2d3703fcf952aa82dc8e0e56801945810fbe2343ff45c4f4"; + sha256 = "cfc70746d63c465066e924ac3740e5c0ab7d19dfade9d32698e9c3903dfb8bfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/nn-NO/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/nn-NO/firefox-99.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "c31423b965a44848021ab8b148ebef815451c706c0ed21e2272cc4d9a6404fa0"; + sha256 = "700145c367d4177fabcbb183653498d4c3c0d23fa1686456f564912a62b1550c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/oc/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/oc/firefox-99.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "ce8dac45e0643307e3664f529fd8f22a80e3089bb17593febd730bdd554920a9"; + sha256 = "a657ab1229f0f670d113efe6ee7f008544682f60ce936edbb4d68a2a81b60a8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pa-IN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/pa-IN/firefox-99.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "1dbcb8f8a7097cfc9d52ae1702bb29995f1585a0e817a0bfc587dfb0779cf975"; + sha256 = "a3641a38f87342e9511baf1866226da4875160c30b573893fa85eba644c5195a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/pl/firefox-99.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "3549823c524d86ef0b60174425c49c6fd91bfbd8e7f8dce371eea882d0e09fea"; + sha256 = "045ebe8f05147249b6516b412b1d1fbd9208f894e503000228a0e630c63f444f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pt-BR/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/pt-BR/firefox-99.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "67b85d1b5229e7dcc0207ece3fcee3e5b3b086086103ceecfe34c80333d4c2c9"; + sha256 = "23c50ecf3cf14217fa8c865f7ab1d7321c6815ff4c68c10630fef9d72904883e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pt-PT/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/pt-PT/firefox-99.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "b7ebf1834baed814479bc2471ebd1090fe9f662b80cf177542cb0cf118f82774"; + sha256 = "17c937a8afa36f4260ce6d3ea79a07b9119ba12b1710c43d27ff05538e6971a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/rm/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/rm/firefox-99.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "bb19bcd207a6823c6ca304f13acbd7640aba4bb9fac14a4ce4fe5a3280823091"; + sha256 = "836195c4a54dd90d7a32c031114a56fa561d1c2e3b8f930227871e6325dc6262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ro/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ro/firefox-99.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "f22e4c6b8024e724dc2bf09bc1f7d66109551a07acf9c2c638165ecc6e9280fb"; + sha256 = "6c0c29c8b91013897b03866e242f9dd6a67c44440f1405c4b356dbb7a935a09a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ru/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ru/firefox-99.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "7896e4fb06f0566f07069f724a0e1e96f9532eabf76108efa92738a92a6ae8d8"; + sha256 = "73e15ebb5ceefe5d76ec3563378cb7c7704fb821fcf5b583fb709995a0efcb7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sco/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/sco/firefox-99.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "3ab3b8ccdbba37af17943df1d5f5b070a1c3826a55fbbba0c71a1a3f2342a3ec"; + sha256 = "2f8ba8588f33fc783976617d662a29acbf41a78851dd781dfc26d7e0ac4d97e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/si/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/si/firefox-99.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "4dd9bbca09dab4c57edc9a3def8fe768888f698e01186a5154a9b5fdcf68cda9"; + sha256 = "5fa2169531665633c3481c177490110cb6a9bd959172f0ae94b2e5a6475a1bd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/sk/firefox-99.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "8db73e84467ef07a82f75224e36d4038fb29bb3d6246624cebab9c645a65d1a1"; + sha256 = "abeb0a6de0522a4e2aa47c8ce02b8c478a21165153fc3c6edda8642777cba266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/sl/firefox-99.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "eab61eb7a5d353ae33573be8eb37c141820e545945229ab9db248263b7033c17"; + sha256 = "c0019a21096573635aae9f2b97c50557dc011b670f05f1fcf0779732e2f7dc92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/son/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/son/firefox-99.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "41d282f7d6ebd9e0a084c4a4e8e7f6b59a9433feb4c006c5ada699a4e4d2e19d"; + sha256 = "ccd58c05db49f4e5295794c73248bb267bb87173aa7e0dcaa63cbe6593e9fc85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sq/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/sq/firefox-99.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8213721fa3601bc529f5fc2a97f7f64adf544b994c607947e94e104d5ff5c96b"; + sha256 = "5ff7791b6d9ff215e8e466b27902716a9de6018ee9ef0efd639579847178760f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/sr/firefox-99.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f8ed04bae5dd80366ed92be6437b01887310d914b306b172e303da78a878df0f"; + sha256 = "709df8593b8257191313b456288de9952a9e6308a3663a21e40733b4eb3b7353"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sv-SE/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/sv-SE/firefox-99.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a9dfbc40e42b55ae876cb44499ed2b245c184acc4299b358fe6844c6f80092e7"; + sha256 = "ff25b85789453457aa9c035395bd5588c252804d5801d8e111a24e64d69e4d1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/szl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/szl/firefox-99.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "8f2f3fcfef222377dce579308736948dbfdf29e7a0aff42a8b553990238bbb4b"; + sha256 = "1da12d4d2046e953010fd5d064dfe468fd97e65f5003c8d746cb70479bd66187"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ta/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ta/firefox-99.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "900de26055afc2ddf81d4480deab7711f0232ce034fde90f01e7314526866eb7"; + sha256 = "494d240702bbcb9124d56c835ac4e3642e37bd873a5209ba9b99bcb338f40fda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/te/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/te/firefox-99.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "f1b34ccfe1a28f7c3f9ccb1700ec91c2c8c0eab45b074dc38386818969c1d945"; + sha256 = "acebd79510550d690adb1444e906dc82d9f38e86bd5a93e5e72f711d2d3e49f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/th/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/th/firefox-99.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "7458224a8dfcfa1480ea95a4dcf6dfdb62d1e9576838820855cb23baba23bb94"; + sha256 = "b6f90c5a89a8116c1049da7a3a34fb6d82114b261f978f0a2237dd32a10462bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/tl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/tl/firefox-99.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "6441f1bd46807575c11b209a35b9f5003d418c7ea439ffa8c7abd18355635bc9"; + sha256 = "961afa78a723382ef7e4cb49cd0f32cca39dd921dbe8168a8e835bbb244ff4a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/tr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/tr/firefox-99.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "c65364bcb6078efc0e856bac29ee758bceb016e838cf74723768de3872e57e71"; + sha256 = "15efd87bb2654ebd7921b72e0653639c4a3da51af7bee06b284d9abd0e395c1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/trs/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/trs/firefox-99.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3ae90a452b99a039e4d9590d92d4c58ce5684c6237c1d3bf7679ff3b422c99ac"; + sha256 = "78bffcf079bb4e9518fb7ae6deddf395837c16e5a942b66fdeef67c9137d950b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/uk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/uk/firefox-99.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4dfffaf009936d7dfd6614c496fca8884076293122cae401255ef34304176bde"; + sha256 = "08995e6b88aaa2af8dab0a95d27312f5e97df3ad7e1a6f0096b0803d835ef6c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ur/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ur/firefox-99.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "7fb0f40583398617a3469c1a0ba5a83443857b872b9b6b0deeda957b3796ae02"; + sha256 = "8530f5bcb6bdcc1f5a3127d0ab6c94f19e4a28df2a6c4291c821aaf9c85f379a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/uz/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/uz/firefox-99.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "4b943e4439c8f07d3de7f9ac9e17b2af3a1d2a29bd4b917fd11664e1ea249e76"; + sha256 = "67c7aa4e6095f8073cb94339f63aef2eedf51e096985ca175e983bbca4089498"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/vi/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/vi/firefox-99.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "08dd3aea42b2589fa141aab23d5f9c925d57cbf45619fc9b7b2d64ec13e29dc4"; + sha256 = "14ee8e4ab854e5443f537fa05ca83befc679c5c78db4323c54dc85ed58702435"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/xh/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/xh/firefox-99.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "b1130919b88f96d866dd54938dfb63250df118a6861e8a0eb8b32943c027ca33"; + sha256 = "ff4c8b2e0bc0a5231ba19bf058baaa7b455b2d8469f56ec97283d26539405641"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/zh-CN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/zh-CN/firefox-99.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "9f1186860c19e4f6301ab0bdf39c2824038bb14b225dd8b8e43cca5b838ca92c"; + sha256 = "0a9228bb1a0629351a62636db29ce428bfb1ed704222b66d1dd369e6fdb3d503"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/zh-TW/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/zh-TW/firefox-99.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "70e66f4edb9e6c39b404205094eed21e8df186571c581f67f8176c78d5a41098"; + sha256 = "42531087bef983024116ee5eb4d42197ddf6252c798944e7674648b76fdf57b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ach/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ach/firefox-99.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "7a133f4f6ed1b67715ace63839dc2d4a1dd79537ff168177ad5a329d4c482292"; + sha256 = "15488bccadd886bea058313e062b811120f42978ab5d9f7ed05ccef88026bdf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/af/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/af/firefox-99.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "b8b214903b2aca2b0e5d4de1f152e67c5a71ac6917903d92f2000629b51aae97"; + sha256 = "7a8a204badfb379007c116d4e7476111d19e72928ae3ed8557b1a7de7535d4d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/an/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/an/firefox-99.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "884696456c121f511b0661bf9972492e01a23d3e106b00c219c598855df7557f"; + sha256 = "4fdcb8886f89c586b1f58eee2300276536bc06d024aa9864a447235e74f5e31c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ar/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ar/firefox-99.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "676ac6c717cc21496baa6135d18bc7cb625e58c3e12c261bdac2a99401c38ec8"; + sha256 = "dc621abab4c6e678e8910569b21fbb01c4ca54e0ca80b0585c5ae2124f199e8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ast/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ast/firefox-99.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "c86f2615962a16d7766ae21598f82caf77f0cea341e0b931dc1b9ed90a9c2f02"; + sha256 = "afbe9810b9f326ee8b561acff2e2cb809793177daf00bd467bbfae245648fc56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/az/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/az/firefox-99.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "14875cec0478392c2dc4c79de855f1c338e7737132f6a4522e65e02478072d4a"; + sha256 = "806a98e46682d180348f772de1aacad415948e77845d00087d4717c40a4814cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/be/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/be/firefox-99.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "9aa8bf0ada8766019bf9c6aaec64c005239c3d9d82c494e81ddede4f822b0bc8"; + sha256 = "ecaeb8a69b0c1a8330748e9db299bab7920c3f7f0e3825a35cc0ac6e06ee35a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/bg/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/bg/firefox-99.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a822d9daaa748c6f64628dd7f4fa2cd0b8bdbf57a77710bab2cce990aa052874"; + sha256 = "cf499eb69e98f38eb211c1c962ea81a8617bf169b4e6309fe900f82ce38b8c45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/bn/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/bn/firefox-99.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "209a83d4d7372b7f2ab578622c3e77110929bc4a1d572c2b3d084e5c2b183d90"; + sha256 = "40d828000019191f9a5f45ac49eae01f66b3251326cdffdc395089bec2396f66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/br/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/br/firefox-99.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "20258167e5f470435d01fea08faaa1854872d5bde35c3a48e4028e8a61e5e894"; + sha256 = "8ea216bc32179311769ec3eb9e8fa25aac44f75502a9f6d9b20c3ac0c2f6c336"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/bs/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/bs/firefox-99.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "948ed50f652aa1f0d16de7923b29d6c4ae1e9f87a16cf4d6e195a94e7c0bb196"; + sha256 = "d85c1085e8dd29f69ee7a41bebcbc6ef85118423e1684026a47e71b2072d74b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ca-valencia/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ca-valencia/firefox-99.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "65eb92ee9f63176db9efb700ce8b26c2f9d1d4a4ce2d66ce2b12bf0a083f0db4"; + sha256 = "ef80441301799de2d0043eaac8537a4e994e232666a315db4acfb3cbdfdd70d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ca/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ca/firefox-99.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "ff3d52f5060ce6b69a52ab54baf53ff767a6a948fc5385b38452ff1ddd32d10a"; + sha256 = "f5888c5c06b29afc8314f7c4bd3201c511cd8fa07322f990d7f58978e5a9d31f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/cak/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/cak/firefox-99.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "d8dedf187004a64a6484657230796066be8819be188b6c73edf23a2e516015aa"; + sha256 = "4ad994ecb37604cf9caa8035750325853fd9a87072439e17b2bd0cb4b6066634"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/cs/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/cs/firefox-99.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5f6e10610a2f3431ea75f36b5abe3a79ae2a877fc912733be7b7ded63c2d0434"; + sha256 = "688096996df92cc3d070c43ceea6abebc8dec53d458fb3bcecda0a63bb048269"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/cy/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/cy/firefox-99.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "c6bfdb386e2dbef46666582b97057dc4d87da0a3da708f0834cbfb46f01553d4"; + sha256 = "c10ab338b8785a0937d6ace161c36f3c05a8016d5b3d7051155eb412985c71cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/da/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/da/firefox-99.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d657648c3bd243d005b7b8ae9b720c3dd14ebd7fab10a5aeda332abec34adae7"; + sha256 = "04a25829cd6f56b5d05c0ccd2d26fd1e28838902388b8dd1fa2472eb84770360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/de/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/de/firefox-99.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "653c7ac40b697418ef9335b5d84b4791126a4d88499c7643b8691ec7f7f2674d"; + sha256 = "ee5530c4477d8a0df77f4fec8112ce1f606aee109e97cbd37aca6ddf25c4f52c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/dsb/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/dsb/firefox-99.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "caf1f6164adc422f9b6d15998acace1644b3b7422cc049302151e3edf060c8c4"; + sha256 = "0f85121b622f28c84bf76666dac0282528a1d380506f03ddd0944de7f2b07afd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/el/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/el/firefox-99.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a500f80b351209b849689cea6eb558f039c2ccfa2f88544473c9e6b6592d5d73"; + sha256 = "99bdc3c28894fa8141e5e1cf9585717b91686ab0082a57b4d7aa43e8a6394505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/en-CA/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/en-CA/firefox-99.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "4c3c78cdaa65537de0577889eaf2029981e57b70a079111f26a53cc28ed234c8"; + sha256 = "5facba35ff29bee9609c94df4672df4375b7d20ea424b1b64e911bdeba5db26e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/en-GB/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/en-GB/firefox-99.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "5ad92e4c565807f377900c3c588b2e7090335259bb529b71af45b37b9a081067"; + sha256 = "e2ffe099d47813c705422758e78ddccc97fe99673379b2a6115d9e298df32074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/en-US/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/en-US/firefox-99.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c5dd205aa822a311fcda06018ba79fec68ee8c2b05d5ecad1d2dcb103da87509"; + sha256 = "edd09800502881bb1a3e49042c0eb1c0618bf2a0507a38dca9dc4e3fb391dc97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/eo/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/eo/firefox-99.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "613140f6f288290d93a0a41811372a46debcf9de05dd1858dcc5a97e242bd657"; + sha256 = "678f340edfc6cfc8ca9b88032856119c0474f6944e8d67778e098100154f9a9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-AR/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/es-AR/firefox-99.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "ab6cd6c4e09cf5dce87a5f072068b7c49c203296a5ce0c32fe41fad4d4fec495"; + sha256 = "2d2fc35fae3617bfa1ea2ac466211b64ce58b13fdcda8f301ad31f13f90d968b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-CL/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/es-CL/firefox-99.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "93349da0b0a1529e8b5855519175f61e064445572b9acbdaac68695f7157ef14"; + sha256 = "df84c0a9ca7a896b02d83d13ffb238e90cf69926feb3c8e0d6edfca842f8defc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-ES/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/es-ES/firefox-99.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "e5d6800770146e6c1e4cc4d91202ca4749b6d922ee5965bd82a6acf7448f2677"; + sha256 = "1f87c85a46b57f99ae9bf98256fd115a15e1a86a4c9860cd3faa3c9bcc424806"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-MX/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/es-MX/firefox-99.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "22aa961e8d40f0d4bface131a19ff0cc0f88b9f66bc9b63c3038ae2b878cadcb"; + sha256 = "eb865eff70bd7042cd5e54e2251b9111b18d484fe1dea4d4ba57e7dc9ea2a5db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/et/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/et/firefox-99.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "722ba0c78b51491d8943823e0aa972147c0504d7c65dd7c5eea29377abcfc571"; + sha256 = "beb51d1ea549633f09feaf220e96c3b0506c3b38baaa0772079b0f7efad2b281"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/eu/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/eu/firefox-99.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "96b12801ae70101cbf4620e1fbc8e4cc074e4f07017179586cbc5ab208fe9f0d"; + sha256 = "d7da5f728c7858e8773ceff7e30ca28f238af7aa618711de1286100512fa2378"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fa/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/fa/firefox-99.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "cc97cd08c428bc52616f6db25e9dd50f9162c29758d6c44160ebdfe745211d0e"; + sha256 = "606190d0434108a4f8c2bf87629ca119339211856ec9fda619a0bc6c2bfc620c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ff/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ff/firefox-99.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "982fab751bf71de830c9f5866943962f3095e70c4918f65201f8f51c99070898"; + sha256 = "2b3a7038abaa4ba5ffbdc48eba4e6cd2c03bdf438f8ea9b70f15c1968bb59b80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fi/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/fi/firefox-99.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "c5e9739a2b8f60d578a8a1f22f947d25e8eb14049ffdf57a3948a50e34400156"; + sha256 = "a2025ddf884826afea3a16a87716398658bf55fb5ac5b647331f4f25166555ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/fr/firefox-99.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "7441aeda63c2e90a26a342c80846a4ea0a48d4d4807aa2fe39337401d9002a54"; + sha256 = "31adba6a0615ff23388686959327ee0e68812c4341bcf92878fb58a7c01712fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fy-NL/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/fy-NL/firefox-99.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "83d26111f5d82644ba1601df382aa57da851f69284cc4fcb88d943a79fa5709d"; + sha256 = "8f691e303e2d1fe5e7548184d1186f4d4a811b65cbbe6e839243a12ecef8eced"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ga-IE/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ga-IE/firefox-99.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "1c845264e89286cf8a5171f372930189455b3e2e0b959f8e271799c4bb00b074"; + sha256 = "e8a4903ceb272389a7e1461693a7e6727990432ba4a6d5c98898af5475e6d164"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gd/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/gd/firefox-99.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "a8e7e5e6cc3da1aae7c016dcfd28bebf35b4f5ef9a4687fdc48175126dfd1043"; + sha256 = "bf6f72c6a2ecf977dc2b14be911c13f59951dea4a4d6c40cd16afd38ffc63553"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/gl/firefox-99.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "20b081e9f5443f247520f6b78283666c695c574fe3113384b81c8bc1b6e100c8"; + sha256 = "af31f670691de33b3943d5a1e9f12b9b64fe53d25ef45eb44cdc44430208c201"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gn/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/gn/firefox-99.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "6dab96866f64e882c8b7a42c6b66146b9c6f34e0934304dd192aed28692acd05"; + sha256 = "f1a554806a9f51f8c4892eb23c65aa53f96390ca7e5e032f2c96cb26f9deb077"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gu-IN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/gu-IN/firefox-99.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "a81691a57dc6d64c425254688baedbe16589887e99a88328efa391d7c22a7cd2"; + sha256 = "2686a4fea05aee55741ef0333c916d4be8c5573f6e7e80b587a8d2bce3c2dacc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/he/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/he/firefox-99.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "e22bfd17a291bf7e890f80b054a9a608a8b7537a401c2fba0ea97bfda531a06a"; + sha256 = "f4c18f2cc00f93636db310f9d9279d43bea6ef193aa693c7761ff1066e9b46fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hi-IN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/hi-IN/firefox-99.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "ff107e3b42e93ccea47c0f4b6fac05fec1904333e1173cfd193028b1c7a02ed4"; + sha256 = "8a2646bcd741965d8a6835ca8d38dfbe66b607c87d9cd3b32b861dabc5e7b916"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/hr/firefox-99.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "50f460b541ae13cd78699642e0853bd198d9c2604c74e1894b716a7226a82b17"; + sha256 = "46b59ab47cc8fb194c6f5f20a1ccc2f2fb963f2c3944e91aeabdb829c1e3d483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hsb/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/hsb/firefox-99.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "13acea425da7fe917fec2f7daeea24f7705c6af770f02918097cf795dca4f4f3"; + sha256 = "f4bac6b25259c55d7892477dfe7bde36d09ee85399096eebfcb3a0c5bba54d1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hu/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/hu/firefox-99.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "f0ca828539b50b41c478b1c48ad96c3db25bf2dcc3eef5924e55b477b01a7339"; + sha256 = "d14bc01ca1936e05f9f58a6516f1af98029d71e41f6cac7aeb6055c3a25455b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hy-AM/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/hy-AM/firefox-99.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "93b756eefb43ec5ccb8c2da88804ceff1388db4cee07cdc1e4d9e745b5b8c971"; + sha256 = "90f4b0aa50a353109ce313543abee0606c4155a2610105ef9537319e3bf9f137"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ia/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ia/firefox-99.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "5b4a364a9e288e9b83b0c99ffba35ebfeb37984e0d1b4fbdb9003f5eeb490bb2"; + sha256 = "384c3a0db8fe5448c17815d5ecab4e18ab25ec4ae75319b4b0075741d285fc4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/id/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/id/firefox-99.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "5b6438b6e2d27ed1e5b3139b707610f21b977b3080b83e5cec1375482124895a"; + sha256 = "c8067e2bbe42bc9b639098e463f69c53475d949ce883dc2f108a80d62424c0f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/is/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/is/firefox-99.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "882246ace511dc8b8daf9370d134002cca9c470c2420c7110325813c86ef17a3"; + sha256 = "33b049fb59684b094b919646994c446c29d4d3c533ef97ed5c592b86b621ca2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/it/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/it/firefox-99.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "d49c6a19ab9538bb731ea4b0bf272dd35aca39bac41cba5e440d9aa3b61497fe"; + sha256 = "1f3e0d9fc78f51946f2d35ca6ab977f53fd58ad0f80412dbba23fe97c9b8bb0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ja/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ja/firefox-99.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "da3e2b86437ccebe811b1b0f7c79d8a875a9f682596cafc3a30d216b584d3412"; + sha256 = "41fd54681fa8ff564fbc202cef68cf4f63b44764dca8090386eef4f0d7395de8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ka/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ka/firefox-99.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "7a6889b3e6859ae3af55a5df7c7d13d7b52be3a8b0643ff9b14b7ebd436cf2a0"; + sha256 = "a46ee22485e1a51c0a955a66a388a4afcad842ba162fdfa4ccf8826fab26cc55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/kab/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/kab/firefox-99.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1a7942f57ed945628815b3ee536b892acec11a7d4a5c7ecb31bfb6c61fd05996"; + sha256 = "33192258d78d383eebcd465bf333d3a59b92dcd87fce6dca72bbe59fd10ffc4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/kk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/kk/firefox-99.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "7eb32c26f0e4551abe340567558644a41c101edea66042eeffef299b35f53959"; + sha256 = "90bb4cab46a5827bc2e9abbcc79952f033b132fae628fb0f9697a55c69b9e049"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/km/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/km/firefox-99.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "608e5e80d8e5bd48e327f1b827835ae0ddb2dcfb2921d33c1e9bb895da695641"; + sha256 = "0b70f38800d315af8377a8a7db8f1769b559ba06f92fc90bea3ef9c07dcda86e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/kn/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/kn/firefox-99.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "9b9eb2dea61ac0dd76252321caa2afaa98a3c0b64faf3d1f354e9b9cf02b1761"; + sha256 = "dcb383343a002dec453abe185c02735d52e0f579e940104af9311b701a4a1d81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ko/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ko/firefox-99.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "58217c4383dcd7720c7362839c9326c93e8cdf0982fefc4844b2c6ba66ea0360"; + sha256 = "a60f64fcb7fe7456ce76f696bc17e1bfb6c2a3997ff79e090ed49735c6443a44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/lij/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/lij/firefox-99.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "89f99e044b69d89219974772d385f5d86b64c9f12ba1ac9a2790dd61ccfd44b5"; + sha256 = "a2dcd9632c637a52695a0d2aa085c329a7ecd19443bbba27c232839f9b64ed6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/lt/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/lt/firefox-99.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "303ebd0555d448182167b9bff79f72dd7fa247c1fd259c3af0d1ee3f0f4e339f"; + sha256 = "c6113f95e4c8387b9de8373838fd08638c25438995f27380f30e2e22bb211877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/lv/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/lv/firefox-99.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "f89d9021207399c9ba56db03add2ed8e10fca3b8273f2cc4ef79814730af9cde"; + sha256 = "302a146408cd24bd215ab2a1ada0b6306e30e549663f9ab85cdce528a79eb088"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/mk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/mk/firefox-99.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "12d5492f712b993df46a2083fd2d3958da8d5bcde7e11ef83482b3d6c0c0e5ea"; + sha256 = "72288455347b225f2e773df5bfc82d51709b493a2f7aa46b78da0b5fb4d89b35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/mr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/mr/firefox-99.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "26937f627cd4c14bc354c9e39378e56ef06ea18519f5b6344ca6ebcbe1ffbe1e"; + sha256 = "f67ebc75fcebc1ef25ab6838ff34a27395d3babed0e08014c47b213a4724b9d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ms/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ms/firefox-99.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "2de70b33a112c662a158493a14e05ca45904a0ba9ca71d2416ba59ce81bf4192"; + sha256 = "612625f0ef927d42b9ab526c10f67c443d60bf0714f57570eb76ce97f84c2f4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/my/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/my/firefox-99.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "dd3b9ec61dca822106c3b88df842f0380a75c1262bef82be1aef6040df308e1c"; + sha256 = "b3bc2ffb890f6ae3316be0cf7a987b186268cca8d9df4cd1ee6f390e689f1148"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/nb-NO/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/nb-NO/firefox-99.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "997a5202f5da86b665595b7f0a4c793527428c1d78c60831ac6b52961ee466bf"; + sha256 = "0751f4007a434ad1241459e13841f66c32664b1c2eba53fe936c559acb609a36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ne-NP/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ne-NP/firefox-99.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "80577c41032e229cba1c2130ef66a428daa0ce238a12f15e1815460c02f0fa93"; + sha256 = "72e278fbb6e073166de952f70c9542e5de2fbda9615205a5ca8e4abfcaf2a199"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/nl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/nl/firefox-99.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "15d92dd24481329ca8f742bd71ffa6a5dd20a4c6362dde813f4dcba663da65c2"; + sha256 = "5fc45ef4391c93b081e5690d9c759547e47bfba389bb6143c5f00353a18cf22e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/nn-NO/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/nn-NO/firefox-99.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "59d49f04138c120b6f9e4ea8d9b902f90dad86fcc16ff82af47bc198635f5747"; + sha256 = "1d7182f883569941f4a7c2e7445f5b2f39f2b9ace02b42c7f4c18108539c2778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/oc/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/oc/firefox-99.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "3b82478ace0de50b1e9e60715da1e90f97e6e938577c75d2be44d313354291cf"; + sha256 = "5a9100e569886a334cd5f6518f279a537482fa0a32ae0e663ddb3afc47b3f405"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pa-IN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/pa-IN/firefox-99.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "62eeb120929b980e1b0c30a38054a84e821b3895f73be938274f52cb19791038"; + sha256 = "fd310dab3a60759d98059ed81cf6c2cbf9a422ec9b56a590ce774e1a5377576c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/pl/firefox-99.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a5a304bc7671a16ce9e41158ad34ac7e49406740d22decddab2c5a004a76a8f6"; + sha256 = "79a8d53d9143d9208af8f63c96385b94a2b4ff2bcad40bfbc8250d792b1b3688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pt-BR/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/pt-BR/firefox-99.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ed8e69b18fa20ff70effd6417d3e457ce4e820907bf550d9f8aca5ab135e12a5"; + sha256 = "bbd6b280549cc9b446346e5a3bb3bf7d091782c6b17d27e22767cb5056bfa789"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pt-PT/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/pt-PT/firefox-99.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "c5d3904f8f09309b0c75f80676f156261dd63bc37817283bc21f577c99c900f1"; + sha256 = "7b246df8ad2f65bf29d97dab9d8f78a66fd7f5287820d4db21ca284b82ebf939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/rm/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/rm/firefox-99.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "e7b96b422b949121511e4cb289958c9efa96f0d0e3808e20a97aa03b4c441529"; + sha256 = "a721ab8316ad1a3dd12407a2b68986dbbf32632b40c1151640dedae9ad7815c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ro/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ro/firefox-99.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "6333056941db9f5ae7679c3aa4213570f1add3f60fbf67729a97b7210788744b"; + sha256 = "66d9d112528b9b6f01cde01d7a251c28821e30b435316f5bc0afaaf9436052af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ru/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ru/firefox-99.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "05c050f50704b62324aa699856c3a6cb57e2d5bce783f9e39861a3cb92c7eeff"; + sha256 = "a7de24d79cf333da45b474d8ef9eb5b5034f18eb79b8d8590cd5f39c7d5de130"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sco/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/sco/firefox-99.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "6519d91cf5798d4b14ea3743ab4b1ce547031b346926b8504c16aaad61a9f023"; + sha256 = "9d8754c1a5e2c4f22d1ff5cfbd39f5092840e9910f58f0468fcdf8df4306639d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/si/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/si/firefox-99.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "7abbf189b2229f911a0aec5fc294ac0efd9e7ac9d657aae08e7f867cd0128179"; + sha256 = "9dec327ac9b519dad9d61cfbebdff117f61f3a44715379ddd1db38891a13346a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/sk/firefox-99.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "b02a4906ca96a545af361f5aa29437d3d4c873c3ca29db4ebb36fa2128b3a540"; + sha256 = "8b8a8278d15d848361a854f898c021e2ba875da54921cb5c5aef260929134b11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/sl/firefox-99.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b1cf1ce7d68359b1d18059434c0aa13ef9871a82cd3c3e81fe5bb9c3ed7249df"; + sha256 = "f605f1d0e94e3ebda1491efde196bdf33c35ec6c34703a6d5559afbc47dc4c17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/son/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/son/firefox-99.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "6eb2146f30a6e4b73f5d5ccff0b6a9483753ec135cafb9d16ee7d693de26f9dc"; + sha256 = "7d0b0338f9ed0dd5e214199cc4eb10624d07078beb9945281f01721a829dbf9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sq/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/sq/firefox-99.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "ac7c65f8569531fecb469e37ae8728fe42ef0ab7d542be4051cef398c2db0fe3"; + sha256 = "546c338eb2cb4d185e597f0ab94186856ddcad7a7725837e9f0d3b6460363242"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/sr/firefox-99.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "acce4ec2bbf346fa76c5d40a8bf3ee3696484b8de4e57135678a3a60ca5c3857"; + sha256 = "851482b831381a8fee93e7f2bf627675d6a0a39b6024b613c319e28341211bff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sv-SE/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/sv-SE/firefox-99.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "7260ac1017a5b4452b5aec0de30894c6619c5f480aa6f1df67a9e876ac83fcde"; + sha256 = "5116d06eee5bfe3d906ce833ad5ee6ec01df739ede6d2a0bb742964f5142b695"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/szl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/szl/firefox-99.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "b9327040072808ef614944b659304ce14c6aeceac82afcfd45454d610ec9d019"; + sha256 = "503a4fedd181a8fa1b5ce578a6e950d7c8e8c9d641a04bac617a4d5505c54802"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ta/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ta/firefox-99.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "a4c5d9b87878d269be2b6314c1347093e04c8d21300344e3435288da0e325cea"; + sha256 = "8291466aba0e6bc86665a605e81e01ab2fdc3e94310f90284319a585a7688d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/te/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/te/firefox-99.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "4d0f8b73c3cc034604330787a4d8fcc914eaf4cf7a3187041bf924b6a450d62b"; + sha256 = "6d5e52745638471ace3790e1d162f3eec0814f7f38e49e3041cdbdde84c14ebb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/th/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/th/firefox-99.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "c152c0e843a69e6c099995707d838b1540b58b9c74f42241926ff2415321c63d"; + sha256 = "1983264e9e0681edfbfb1425a24af506b9c451bb2947d153aeab4d421a2dad94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/tl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/tl/firefox-99.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "da96cd06713a231bfeb10a1c077586579aef855ffeab88de13e9508cceef0661"; + sha256 = "42b44c25ad8c5e7f69f4500411d41575a44efb943fb62da5c2a0844a79f1bbec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/tr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/tr/firefox-99.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "b7789d13580a7149f7c3c03a234d40e56f95782654e0c7b24078d95106a316e5"; + sha256 = "68e01ef5fe17667548b218b1b69b7ad9b9017647b5695623e6ab6b2ee7e704a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/trs/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/trs/firefox-99.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "1c6fc47bf87316ccb5cb767d0a42aa685cc2d75a923138803897d0aee0035c24"; + sha256 = "29adf4bc2783130d5b64edd8ea812000748938538b90f47e1f9ec704cf183752"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/uk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/uk/firefox-99.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "647f29a9cffaf16abdf8be253503fee7df5b54cfe90e311a7d1f978bfe53243f"; + sha256 = "6953e34511ccb537fbbf2a6cca6369c2f8252e3025dc459bb809ffd44f602ea1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ur/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ur/firefox-99.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "2451a832ef04df012d6114c6a9bb6f99a2dfd673f4d5a1ae5fd2b048fda3ea2c"; + sha256 = "6479f088e60bc401346ba93be6711d83f42e113c3cd9c71e02fe72e2fee18d2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/uz/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/uz/firefox-99.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "c8b0f6dce66303ff77c33d33516f41070ad470d04ea7a159d8a2407e072b4617"; + sha256 = "99217c54b034c995203bcb290b6b07ddcf8dfe3f0d4f67876656e5930a813e75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/vi/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/vi/firefox-99.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "fd08bf4e07e05535c39469307bf423f64d16df910e3dbe29f608818eaf63b5b8"; + sha256 = "0b714adab63f4551e2837b6fe439f1193d2c097cccd0d938e6ee069bf6273cf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/xh/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/xh/firefox-99.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "b1b07960637d5bcc3c540ecd3ea91c9aae6d602506416093afeb68ffc9a84e37"; + sha256 = "f15315fdc1e03b0bb2f834240f35a695b3f1173494b2ee1eaa36d7b154fcca4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/zh-CN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/zh-CN/firefox-99.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b21137ca94f8426338635c2173be59474f07fe7d6eae7bdbd062311a5593dc3c"; + sha256 = "a959f20cea8596ef0447f0823056a6e500fdc6d38fe9bdbea06fdbb8ebe93973"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/zh-TW/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/zh-TW/firefox-99.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "652c5ce25e695ccf5cb8145f1c71660bf39e6bd9b2a951f468cd1d1967811f2b"; + sha256 = "e2c8da8c23fbb7817ef215c035042d04f6a2a0705de9924c66c80759deb67e1c"; } ]; } From ff37bc3937954483d1c269b3c5996fda5b58bb98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Mar 2022 19:12:59 +0000 Subject: [PATCH 011/163] firefox-devedition-bin-unwrapped: 98.0b5 -> 99.0b6 --- .../firefox-bin/devedition_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index c3d034cd5a1e..25a81d11efaf 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "98.0b5"; + version = "99.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ach/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ach/firefox-99.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "75ed4180a84010f7bb509f9f8107e303c6243008071f0ab925313aab0e4dea60"; + sha256 = "0bb4605a97661502cb23fe2ebfdb1a31831f8ca015349b3105d1245fcaa5eb69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/af/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/af/firefox-99.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b4c380c4d73ecb913a1ffcf0dc0d3dd771240f1188204f728464df8a65671013"; + sha256 = "564fd8895c6fa6aecebd5a7250bd73df45a6e51f90845d9597e59cd9175b6c2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/an/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/an/firefox-99.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "247918ac04cdef6ad1452f1d7cb0754f48c70cdffc2e20a3187901c72a023f30"; + sha256 = "76035e42b93995e6cda0de737981760a0025013bc3330142b95ba7329d54153b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ar/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ar/firefox-99.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "68514334b54f4a626d7eb37f563bb39f418d6be4b980c7d3d31f417153d51482"; + sha256 = "31abbbdf4378559e6b612fd3b0167bbaad332edc47d6ff67e8d9aa7e01130808"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ast/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ast/firefox-99.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "cf6a2ade0caaed45038a1237d4881c2e07867d1ba283432e7464ffee5c84258d"; + sha256 = "1c4a2c370c3f566823c722082a3a9f149050cb7a891f3a1f21b7ca8ec899ca92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/az/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/az/firefox-99.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "5c481ca36bb79dbfa5f4e6b83c76a0746b6f4f3fb69200642315a9226ec04809"; + sha256 = "b1d0effa84614c985001705630da49b70f09e91be3715795fc18d926303b6b95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/be/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/be/firefox-99.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "676169af51ba1089aeeedc1c57fc19bf383fbeff03df5b13ef401b63ec9aa249"; + sha256 = "d0ace001eff838f8dcb80090a193307e143a5c1f3b1dac143ded5af3fecbdfda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/bg/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/bg/firefox-99.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "5e030aeb833b356b145c8ee624ec18facd95c16dbed374d1f2e90c4c14427404"; + sha256 = "784d6029972a843829783581796263899371c777cf669f0e4f6978f35a8d6199"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/bn/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/bn/firefox-99.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "7211a76921bb81307bb14bb57c5e062fde21de58fa61ef4f676652cc2c5d365f"; + sha256 = "7cdc3a6f35c2a56b87a58eaf3112148c51b2d2d0fe5d9afc5deccfb2d2269b2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/br/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/br/firefox-99.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "a2a6dcaba8188b205207bbf815b899a8413a494af1e87060b1da73cda1a8ca0f"; + sha256 = "abbe12c9d887ea98d85479105bf2640bdbe3d295def41b626d3d8feef3627b36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/bs/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/bs/firefox-99.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "fd0bfad035287c35a809c1fbeff9b00e78f6c5a067e8b301c30b76ef37922dc2"; + sha256 = "fc1076c2eda5623869a3af5c850fb51cf8611501f51984c85f690b4c545cc93b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ca-valencia/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ca-valencia/firefox-99.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "ab4d58c4640a4b0e65d824e62a898aa19674d37929c1748a27e4aed8e5be0e97"; + sha256 = "d328055c61c96c92dd05989c23a3f8f49b36cb755f72118c21331f986ba3b44d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ca/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ca/firefox-99.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0429ac4f1050234a28ac1cb3fea8eeef0a763e4c316154e6f02452fde434d968"; + sha256 = "6a020e56c5f4136deff38f07d94b516971af1a31a804384a50396dbf6241877e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/cak/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/cak/firefox-99.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "c69d5c22998d097213fc0016a344c967064193e81fdf45b2bfd5f1687883690d"; + sha256 = "c6298bdeba82a637bb3903aaf73b9de9f0a3ce4ec22637b1ee1340273b7e36af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/cs/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/cs/firefox-99.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "7d06915a6b86c9bc8bf408fabbb2db73f56c3f0dc3a81d7c11324b564bde3d51"; + sha256 = "1facd79fe087052af58205d2a0a9acce68a1d9bc58d1a3bd3e49b740f6e51647"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/cy/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/cy/firefox-99.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "3e7ea4aebf641697f182c1ed5cd8848a4aac239f1fd7082f5deaf7911ca99f5f"; + sha256 = "e7305badc55114c4a39edc317202338b3e61feba9844fc2cd8edc1518486736a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/da/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/da/firefox-99.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b151987307e07fdc86ee14a9c0487c3be73b954d28c5beffd9b00ee05740da15"; + sha256 = "6b1d2403e1e74c97c763476a128c56079d546967c87f1b225ac790d9acb6940d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/de/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/de/firefox-99.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "433edd8dc45eee166d14d1340453637985f8e606d635ebffed09f20c93cf851e"; + sha256 = "c8d01b9a1bbcdeb1fa0fa63ff553209d095280ebad4eb03efa47e029505b8204"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/dsb/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/dsb/firefox-99.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "46b731e6ebac3d2e729e69a2d671b5980f6a2d8ccf83c1e6828feab93bff73ce"; + sha256 = "bea09c23f3099c85e415bb05916ab9e3374f78e897e2b8549fb9f67895b7c052"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/el/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/el/firefox-99.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "a6f5e1ce2b6333468a250c1a28bdcb7e44539315ecaf3da09091f7cf3c08f3db"; + sha256 = "bd740ab9aaad78e4b16e42d610ea1b914db95e2f8396f0e9c4803e38c9810f20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/en-CA/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/en-CA/firefox-99.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "bc56c9b18f7d8ecbbdb6f3d4b56607bcf9355156174d537e0e85d41f32876be4"; + sha256 = "acf5c9da684d5f7bb5b25e5fbd62d5dfafb1a5f33bd6c7baa385a37967e516a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/en-GB/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/en-GB/firefox-99.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "35b574db65cd0f4511d745892690dd2e64fa4c0ca1eeb2be56ad2259b45f48c5"; + sha256 = "76cfab3fb29274bcec47ce72e88f783668653d3f8ea4ad00637bdd7ad5d32364"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/en-US/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/en-US/firefox-99.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "2968f69125d5a203c2edb96bdb9a922d26064c7f903d5d1b9d7f5d0f7a4aef8e"; + sha256 = "798f68125a37ac1e60d72dff3a773cd167075a58d523d7d9659cd5fb511e2dcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/eo/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/eo/firefox-99.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "7f5abde625cf25801bede74f74cdc1413c3dee3a4288eaf75d5e967ce133a88a"; + sha256 = "0b65dc59679b42a298484d3901f3f47d6073f08e260a792a6e80d9c5a0e6ad0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-AR/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-AR/firefox-99.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "1626c5996088df57740cd8907d61210c8081bb0a2a1b19d8bc9129c14fbd6dfe"; + sha256 = "3a894741998ee1a2adb6def1c8d548b2c5fcab8fbea655a013dbeef9a29ab228"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-CL/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-CL/firefox-99.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "5bed3b64b239ded8424a27b01a8456248e317b8e2b8ee92ef50c9462574189b5"; + sha256 = "1964534e196d426a9d6dbe664dc16790f010214cfba85e98f5df728e110e0a74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-ES/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-ES/firefox-99.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "cf79cade9876dede8e6a4886875181d153169ca4f8ae5bfa9958c48f2abdcdf2"; + sha256 = "32b21ccb56fbe2e46aba0e21c417e2a7d3404a0a3487186c75d042fd84c5033a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-MX/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-MX/firefox-99.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "544ec72d7f304ba702c134d1325f6589e30354d3d4b03d641451bc2f560446cc"; + sha256 = "d70ff15a4cced1028433e603151af021be98d1026322203f0412605685611e5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/et/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/et/firefox-99.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5a5775bc02aa61edf7d218ffc9506e70ca2dfb781f0abf5e4aabc288328deb1d"; + sha256 = "df844133edc74d396a2fe66b0a71efda2c4797ca7110a12c4c7e620cbacbfe8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/eu/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/eu/firefox-99.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "27bdd41a21e159e19bc9ef1464f1f76ac48126decd2942b4a18d4ea0777db743"; + sha256 = "1ca8ba1a7ba29a0c21d7bdf5cbb046fa0e145a9bdad5debd93d121b512a060a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fa/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fa/firefox-99.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "7e3d58ae913c919aab4f716308a9fdc6cfb590538b0dd0b90aad3dc099caead9"; + sha256 = "a4c223f683bf75c96650d939c56aa17bfeca975ba8863e44dd5ce0449b436b3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ff/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ff/firefox-99.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "553b4b1025749f374f82acac4e529799d9e555754e63ae4a8bdf016ac8ed620e"; + sha256 = "6b165789213fc3f9c3f46457a04974e3c718b2c0aebd44c57c7bf8f41c73687b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fi/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fi/firefox-99.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "7514590c9dc0d9181ae439a637640ee1dee40e00e9283008a54ac3a07ec8256a"; + sha256 = "eea67a8d94f324a9ab74caae5a7755f9505781ff690760a06a62ad034ba76bd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fr/firefox-99.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ffd7579cdb4e6c8f5e1e66b26e3b064362292d93776313b9ded9da4a3b764cb0"; + sha256 = "d4cc1a70f8d020870ccac0b023574b9c0f39fd44bbbcfd8a35f6c688183f2a9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fy-NL/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fy-NL/firefox-99.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "1f8457a73eb013abd48669f4cf1e109d307f307881e1d9b46ba9aafb09ecaebb"; + sha256 = "df49ee1a9db407819fcc7baa9c6bc9c6fc9ab2c2b57b08d85c9478f1b0aaf6c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ga-IE/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ga-IE/firefox-99.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "6e9798462e2c2c0c50927276595c42539880cee4f58d00808cdfc5113aba9399"; + sha256 = "e7e846a95ba695a8a3edf233ad31117f4d35d4942784c5f6c5a1ebed7f2f8e4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gd/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gd/firefox-99.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "95f41bc7fb4c6fa19851827e0712bc8d7c9344eddc3c341172478fea583265ad"; + sha256 = "48ef5fa12ec7415ad23a5a40f2f882147e03ecc074b33b173f413e53cc0cdde6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gl/firefox-99.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b785913074c6d311380b382b63d57c2eae45dffee759d1aa0cd2d0c12f736e1b"; + sha256 = "b44500b87f3b2219ba10e06bd937ba06784fc00085be12a16f69fe26f7733317"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gn/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gn/firefox-99.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "1b7b37e1569244fdb6a11fa1d8d371d01756150bf376662b2b0246a4f08bfb37"; + sha256 = "0e521a61d44d1058ceb566ae58272e41f0aab7f2267555781bb3235ff5e3a59c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gu-IN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gu-IN/firefox-99.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "8623a915fcc694e5c8295bc1b95b4c6a37aacd0aed505f91239a2ab48fba8d72"; + sha256 = "2179c82d7763294f5adedb8c905ed5e009a4d3d176fae58c7503404015214c51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/he/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/he/firefox-99.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "52cf134be5f9981534a93d454cd7a893fd605026ad814a7257ba0e59f4cbbe1c"; + sha256 = "69383070d17f2ae68363e8a29efc53e2748b8f784137c854162ec0132295a9e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hi-IN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hi-IN/firefox-99.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "e06f6fc47a98f4564a65d236f8c322e5eaaedb98d049171dfa1fafaaec8bb690"; + sha256 = "71e57a59cfc523d5c1c73c9b5547b3247170865a95022e5bd3098967c3e6002c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hr/firefox-99.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a93e7425c0cbcd7579fb4de0a7ece495d77c01eb2ce2a11a9413bc6a8baae3a3"; + sha256 = "9ea82b192336e83c7ac450dc7068f2730c031f43633a87b7fa554651cf64a912"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hsb/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hsb/firefox-99.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "66b42537cbd4d2338fd6a07b86c52c44f1210124f4c3572518c5bf7f0be217a5"; + sha256 = "e3814f823f3bde2812751e9dd6a2b51a8861952eb04cb845d543a9252501dbba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hu/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hu/firefox-99.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "637e898fc7bec9727fa489498abf1e6989a32e5f8b92340d0f645aa1150885c5"; + sha256 = "e647f86de2e7687e23320aa0f36d96743f5da2cf43b2d83444a41506d13face9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hy-AM/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hy-AM/firefox-99.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "b1b6b24039321e322f0b7d1fd2c59de13029aa56017e48e5211c18838744e9e5"; + sha256 = "21cc172fad6136a17df0a6ae4c6e90ec72a02db744cfcb5252cedcf48223e543"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ia/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ia/firefox-99.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5ad069400e47bae81e7e8581e81763905b3334ca5146672317e2986fde7fbfbe"; + sha256 = "5f0c85a36ec40ef57cfa2bbbc1a4663ce10c8659e0d6ecad67ea993186c9cbb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/id/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/id/firefox-99.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0c80a2786e149afb12de10a49584d6017980e3b52fa1c411d9db289ee537290f"; + sha256 = "e6671d2ac6b63ea4f2a84d1d0e89038ef1030d85e84d6b47c5b878ddc8d96b60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/is/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/is/firefox-99.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "39ebabcb230336731e5be1d4024add0d639b3ef0c9d9d94a9b59b5bcf00c6263"; + sha256 = "5bcafb210fa3aa06d56f17972d94c17faaaa2937948890b993bbc6c9bfbeecad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/it/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/it/firefox-99.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "8646c156daf2b9e76f1cc93bda605186c8041114bcafa8b67aa27c767297a830"; + sha256 = "3c14104a82a312324c1d42644eca6f80b7375f946a42edcb0a23f8a824bd0eb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ja/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ja/firefox-99.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "ac9284b3b994f9e3505808cc94391e04e62fc70a75a7ec4919dec56b79a63f84"; + sha256 = "00713bc8710add3312294aa755c881701ebbb2d00e1f5f242ca12d102ab6f19b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ka/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ka/firefox-99.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "3627584688564c9fbaab025f1fc97eb988dc8b5c4eed58bd55f3fa1cb08bcd12"; + sha256 = "ba6985797ef85bdccb1f81053456baddbe2cfd9e1097e42b20617270f681c1ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/kab/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/kab/firefox-99.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "b0a8e54764b3f0d947894d0daf2a5031d43a65e19fd3bfcda7f0499ff065441b"; + sha256 = "8be17598d305e257005ba0f9ef2f7053ee7e79bf3c1b4caade77c8e5a7e8a57c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/kk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/kk/firefox-99.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "b6cc1c4cbe1cae43a45f5fe1b2ea1ca6c3d0de7cf2d085b7e5536232c9213bf8"; + sha256 = "7e142151f26355256d2923b183fa1d225e3ed26026cbedf9abcebef301dc1045"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/km/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/km/firefox-99.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "069f7428b290da1db567a21ae0a5dc54a0cea3ab0012248658d3a273c9b45abb"; + sha256 = "0df166d5a55e52ad60f8873afff5c1c43816ef99b56e1d817b4d4c29f173def5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/kn/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/kn/firefox-99.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "a7ba3abc8eaa5348b47b287b98961506e87c40740c25b88e0da611153e95f992"; + sha256 = "193c7b709c03212ba91ea99da00c6b1c53edebbc9390d7321bd9815e5ced8233"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ko/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ko/firefox-99.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "ec46b6e6f2c852272dc5247053a55797468ba911dad70d4b1d927465ddd6ba5b"; + sha256 = "d265a984bcc6a381f715eff5e2501acde0c8793b111e15877f7d4e9086ddcf10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/lij/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/lij/firefox-99.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "c401224b42efadc03055787bc20df523cfbde82b65d1b885a0ef6ff23bed9a21"; + sha256 = "4a8327447982439a2f9e5ecff39b77ddd2bfdcb081d9b6f89848f2c93db3b3ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/lt/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/lt/firefox-99.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "323f765f5db4ceb5dcd167ccb4c997bfe820498aa2249a1fa2557285a1f2ad5f"; + sha256 = "cb2a9545762247192f909c1600097b1198fbddfed1c383adf5dfa9666ddc0e80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/lv/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/lv/firefox-99.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "053e095300c9c1ccb3d8fff574aff799c40215482cb977087255d69dabf9362e"; + sha256 = "6ed249ade30c7d2d5ff290c4b65d3eaf3df4e49e112412cb3153da15bcf23fcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/mk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/mk/firefox-99.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "946d5de91994de14941bbd9a4a1ded228b97eb76d503c8aeb164d1a718758257"; + sha256 = "56af16c66d20eaae2d6b487c3bec4f438d21effd3e3b1582579bb9c1836956d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/mr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/mr/firefox-99.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "ed084fcb7285e047548c0969914bc43fa3572cbbb5faae91dc85688e2de77a7b"; + sha256 = "fa6f5e496fdac7eda06220a423683f608d6c49b0e3caada52b9fd903b5ebcbe9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ms/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ms/firefox-99.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "58fcdd5fc46f80aef8a736dab07ffce340175ef07845a3c09da0f7056b30df3a"; + sha256 = "0820d7fcdeb7226d067f920e7cb8a0bb3bfd98ea931d468ae58ed54e074dd1f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/my/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/my/firefox-99.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "3049e29781a51f1e9c1f5da7ffccdcc52b71ffd5e7e068a17b364d7b71b91982"; + sha256 = "20ab8faa3a4aa4b4f94f6c057d4fc9602201a55482d492bc6dd7acc5173364a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/nb-NO/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/nb-NO/firefox-99.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "10c4764716f879429754d9665f439c2b23dab89c9a1d159ed229569b987ccb26"; + sha256 = "77bf24610d6ad64859c83125909b70b3dd768e90e563971461f2c18fa2cd7693"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ne-NP/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ne-NP/firefox-99.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "a46fbe8f8058d9280d28412bac9e3172d9554f0da6c5f5bfc97258e15bb1a5b6"; + sha256 = "fe5477509d83a14875e0409f99e2336abba237da75d1e56d753e27b7d1016c9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/nl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/nl/firefox-99.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "a99eadaf1d78c5afab26f951f3ee69d49326bac0db27132ac931651a2fa7eb39"; + sha256 = "3b67159e8d34c836d5367a2e17b54bd2aa274e1f602ae42649afc2ba2fa1429f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/nn-NO/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/nn-NO/firefox-99.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b7da10f47cc22661606c3e2d7ce1885a4b6a5aea42ef7e17ec80766d9c5d92fb"; + sha256 = "4faf2904a8b9a0c315c222d7e810d2fb3e24947dda1e006ddd1f727d2f9f967a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/oc/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/oc/firefox-99.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "653bc3cbcc3145ed8b93f3835486f2756c51318c74c8ce3006fec19420b771e3"; + sha256 = "1dfa10fd1d9f958d487023144b7fad8ca8d1e528954f11e28509b7e22e48a341"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pa-IN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pa-IN/firefox-99.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "efc1573dd48edebe52a4ef241132715db0a41b75db7e857f3abd0631fc2e5d02"; + sha256 = "e6e4cc03a47ab8ff0546457b2ee0b55b8702463ed5666c15c0d2d98716fa84d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pl/firefox-99.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "a856f24cfdc51898dcad5e2ccd9f9bb406622d33daaf03362fbabfa11893b413"; + sha256 = "525023c756ff0a0eae303c02ef9b7155fdad5f0f41bc4e539be5ca21d1af0ceb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pt-BR/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pt-BR/firefox-99.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1cdfb66a7616eefe00025f70f1e5fd317890a141e5495066971fc53e3102106d"; + sha256 = "1a8070c38035f97ed771b02e59b3c2b0ef0073560c8ba285be9779fd4e99b61f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pt-PT/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pt-PT/firefox-99.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c8a127fd0bc4edb0eaad1b06e32e050ffe1df11ef657e05d89de3ec97f8fe607"; + sha256 = "ea356edfa8b398ea16719993cf05e65b5c63b4d2c4e589a9a26814ae275e4be2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/rm/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/rm/firefox-99.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "6c4f66d3b22cf226ff9fbfd05e0ce463d80044bccf8228721b5b8cc5476e8d1b"; + sha256 = "f07ca7d4233860a6271eaa972358bd05b834c7f56c4b64d45eb9af72bcf2dd9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ro/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ro/firefox-99.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "08d7eab6ce8f18abde13feab2ceaabcc3e23652730a3ee7dc98d8c9234043b0b"; + sha256 = "fccb8f523251dba30a73f6ec9259113142514b6d4657f63b88f5b9d9e8a01923"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ru/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ru/firefox-99.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "e6fa1e2b5b3d0ce7586fba3c0d2f9c34514c767bae4a5066052df2bfb511907d"; + sha256 = "d87928af8f4a0b28abdcd0386755a3f4f70d7e17e455fe5913b1e177c3edff2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sco/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sco/firefox-99.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "2c6e9d6804839a525925ad29adfafdda06ecdac1ccf034a2afbcffd5d13dfa66"; + sha256 = "de3bda2032217c56213f64b31332e8e6ea9598c7f31f3dce1a7b136c40c3153d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/si/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/si/firefox-99.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "f3172fa7c4655496565322f717f176d908ad60d97c99692a92bfb948186d17a9"; + sha256 = "22dbdccec8073bd1d83cc236fc563aa97a3607a92e9b3908d4c8c0307dca8b08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sk/firefox-99.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "78f88185772cf164bf548d134b00d602cc9cbfe88a5b29e9c4a0c93f3de74efc"; + sha256 = "d5f73c93ef57cd600a2c4269a99a498896b580ec99b549db8b0ee1537a644bb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sl/firefox-99.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "15f31bf52e10de228b50be002deddc1cc89ee6a882def6420d1055f021f75b6a"; + sha256 = "12459b203b0de94241b243b07b9f54e7ae612f7887581c5cd3ac7ca2a08a54d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/son/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/son/firefox-99.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "b4412fe101e6de2ca6f66d818823e48e337f06490645bd58455c6e4f9aa6723d"; + sha256 = "2d44c84feaa5c5e3595055289f84f320b447664d01c653b0a3b50f1da24b1a78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sq/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sq/firefox-99.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "420aaf8816745afabe98906716a8b23d0e0f84de677538a102ebc290c0f57154"; + sha256 = "fa3f9724380818a71d895252631b354ffb692f35679eb9b8ffa5b2beede8ab61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sr/firefox-99.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "573aedef6185562efcb03d11e0fe2c19f28f16d593f598b529eab5c80648d91f"; + sha256 = "c2e5ad218b8cbadfda7c455266e018a6eaf9b450a905e8a73b01d02b7efed608"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sv-SE/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sv-SE/firefox-99.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "13a4fb70bf63f3f99321998e6e01a1eebe745eeefb33848b345c2020c0e8befd"; + sha256 = "12060ac843f03a7544db8631c7f53bcd0cc6fb15d62cd997b02a83f0560722aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/szl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/szl/firefox-99.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "8daa190aa592e6e11fefed3558c3f91cbcee630e20c3a452ff88d333b483885b"; + sha256 = "71ace92d020f3fbd1d5e223dfaa01e3a53ac625ba5ecf074153aad8ccb640ede"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ta/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ta/firefox-99.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "21cff7fb1234defe7732e4e933e24cacfe27b782c37c447f079662ddb6a58d85"; + sha256 = "6ace267aab85845babad8b11b68e154e1128b920ed16b8b8d011d53f6dced16c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/te/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/te/firefox-99.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "4f9fb449f2524d47994fa17e8a561b8706f48b36566cf36c39b590a26b04ec55"; + sha256 = "e381faff48999b63b4981695e7c80bb946b44503ab5275344f12b7005ed49ef3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/th/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/th/firefox-99.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "f9fedd16f2ddf56c8be38579b29ae2c09b4e62228674decb88475be72eed93a1"; + sha256 = "6c2ddea1c0ccf0521b9b647827569b78ac2143163895e67476051f8496011b66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/tl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/tl/firefox-99.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "b62e425beec561b02a273e2a432eec4e857683ad83295376e902852245ee7b27"; + sha256 = "9d949c9c61922756d0f2dbcff76906191d438d161c74fbe7d702c7372c11b5d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/tr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/tr/firefox-99.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ce56109695065dbbc78251d436d490bccc895a1a668c3507d6231f71a1046ada"; + sha256 = "88763e4847b865603a7d953d54b86e6a053d2476209b4046bcb09149275690f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/trs/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/trs/firefox-99.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "38451517de283d29f3147b41b1438c99a74eecc3fe56c042637344585bb4d8e7"; + sha256 = "b6e7aa724a06f85e4eaae7e1c55e3ed1ec9a6b5664150745a257bd3f63310d53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/uk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/uk/firefox-99.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "ab9d0993bf83de703245b62fac86453c091ca46f2b0bb3e96c8cd1be30fba295"; + sha256 = "69b200c0c4c92430f188ea12bf5e60aae18203a76e61cc163738d46c3627b137"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ur/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ur/firefox-99.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "8d5d39a0c363817c4d728c6d6d9cf215d136e60ea989a0578cf76930f5caac5e"; + sha256 = "330bb00cc0c0882a1e8aa06fdf7d283eaeef04500a9bfccef50f7b2ab8becf81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/uz/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/uz/firefox-99.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e1b4738410bec169f0947c2d6df5048c3c1ca51f632a2a94233be51963bb0947"; + sha256 = "a9b7087c1deec3aedcc2c279b135b113e79739a28e31ba6cd090541505e5d9e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/vi/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/vi/firefox-99.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "b950e0e6fbb707f4c0dd70b491b100f890255077ab756af92d419e0d0518cf27"; + sha256 = "76b034ed53b8c99cf7909a6a5651627fcd9cdebd7f8ccdbd3d2286cb19dc7eaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/xh/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/xh/firefox-99.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "e01cb86ff2b60435d5717dca42e522c5a4824c09486067574cedf8de09d98064"; + sha256 = "a1c9ec73200bea835c46879d8196b380a3157c98404e6a009fbdb24b1662ddde"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/zh-CN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/zh-CN/firefox-99.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e388cf188ed66903c46c0694aac5725ae1f2015ba3faba4645277d6456719721"; + sha256 = "74fd44c26c503014d0fc3a32dbb726feefd572ce52697879a392996243b5811d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/zh-TW/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/zh-TW/firefox-99.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b6cdace1499535a36e4573914b49a2c3e4ce9cffbad250438bbaab78f3dbe4fc"; + sha256 = "a9d86ddb8f5388370a28ac643e3d21a411625b7098aca9c399551f8e2c125da9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ach/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ach/firefox-99.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "d269fe06dfb496fdb6b9ce50d7ea4c9064e8070bbc2a47e6e6641aa79a13e772"; + sha256 = "67b0501117e5d93046031860df5dc6eef3fc3126f0b10240cc13b83f6f1cfdb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/af/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/af/firefox-99.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "0c6a0ddb0937c59ff5b88d09ef291e685cb29f8435b4fb6227eb0c12b82d20b5"; + sha256 = "43b9b1107fb13b97f6b955b3abaa4f1d590bbb1747859e54bb306c9578fbdfe6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/an/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/an/firefox-99.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "efd0afc4e2ce06b094a2c1fb005c246bf8dad02fa9b8e2a0037e6f88f0fccb19"; + sha256 = "da752ce8f7a9a0769c93f6f1817649354f892c440cdd48f0dd75739baedcff40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ar/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ar/firefox-99.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "29ef8698f0026dedf638fa32a2ed32d0014e131f41500969d271ca62c38f5cc2"; + sha256 = "e67fc64daef74e78eee12a1e5d4c1ef5a89a8278d19187d9e0c67ac5ea350623"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ast/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ast/firefox-99.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "244697199ae0e2895f242c64bd6f23d641deb124950ded7a0c0e8d1e18017636"; + sha256 = "115cb0605bfb7629b854d242634cd2797b5072f735c840a6611325faf7bc3f77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/az/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/az/firefox-99.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "77bf85d57fb887f5f1e0073daf09807286e2e5d835ecd9400f698dcf0108a949"; + sha256 = "c839a19dc4f5d938fe7a5426a8abd7b228c89a262201c019b4b53953211aea78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/be/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/be/firefox-99.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "6e18fb3773dea1a99c9ea383868a9db07e2bf2a0ba30b9acd283107a3b557b17"; + sha256 = "94c8e688578059f8c4f7fd2a65a8fd77280b4047e845efd6ea66e34f5320d119"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/bg/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/bg/firefox-99.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1be4cc0e4a2b9c4cd00813cade9b09db97f3cec3087d103c0204cfb64bceee12"; + sha256 = "9f7acb26e7cd9193e9e435da3e2f4e9d9ee82195cc18e8de8295cba2446da1f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/bn/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/bn/firefox-99.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "c18cf7a7dd09718fd59457e8eb7153229061e4962e29abde5e83add456e2f086"; + sha256 = "93f31b395a9a42386b0de322db1f675810a3db106a0e8c583f18ad4dd0c56488"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/br/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/br/firefox-99.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "d6ac7e4e279ce4858f77cf3613c05b4d6dc0ac0be4cfd66aa880b5761f9dbd02"; + sha256 = "a04a2b2f2b70f33bfe288d9907291aa61f2daa64d0d6802c784d7b4f44b38326"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/bs/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/bs/firefox-99.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "b785f4a680031be8ab963a66df4d61dbc54510fcd400d7e061c54e4bff554dd9"; + sha256 = "154456c3aeefe93d6891306fe295342aa02c294bf64693fe93943ae836fc796d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ca-valencia/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ca-valencia/firefox-99.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "69ccaf431b505db72245a8a6bce287dff88993055cfa3bdafbb31ef9783598bc"; + sha256 = "c00ab86f77e5113f85feb8eb14b74c2c144e9c7e08c4442b06b749ffccde2cf1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ca/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ca/firefox-99.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d779e8ca6fcf77cd4c5e0edb4883d0d28dcba2eba456de9cd4216d96e7aedb03"; + sha256 = "07de1d9c72f9d5487b9ff57ec609a2b6ce37a8b09fc81200a6cc6610a7e66b9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/cak/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/cak/firefox-99.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "dcedaaaaf1d9acac61fdedaf893d288052df18a925f8853722934ef54e92a71f"; + sha256 = "ee05ba6ce42f873ab79032553302caae28069d84c5105192623f1261d2d3d609"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/cs/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/cs/firefox-99.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b761e7d712a9ad951a00ee73f36eb5a764faa1285ce22af168e4dbe1516edfbf"; + sha256 = "9b2af581c1c70b72cbf82cf656f94e65058063f0fd6807d99760dfe9b68af808"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/cy/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/cy/firefox-99.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "f640b0ffc029f473c3638ec8e08884997533d087cc8590a35458571403b5396d"; + sha256 = "f638faf94045b5e739736926e4b3e173f8830542287d46aed70337d9ac3a4495"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/da/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/da/firefox-99.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "0e56091cf2787215884df9c1dc0e2c208021fa99088d0dce18324b18b0b57aa5"; + sha256 = "3dad188b310fef15b704ca788b320d502a0a6ee59538296176fb17d2b440163a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/de/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/de/firefox-99.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "39d1c2ee79f1434f263ff804122d9dc20744c8c050513c95c75d7c424a5325c1"; + sha256 = "1bdb5b60bdf16126de86ba1413eb5ac4184f727b3e57a36d424dfe39647f53be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/dsb/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/dsb/firefox-99.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "09544d8f51134e5f74c5d90b98844e49ee5b0be7ed5c63e2fa9753a08cfd2600"; + sha256 = "b306d40607d73314c0e3e87bb1bce65369846be3e370943088a8e7e9731098fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/el/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/el/firefox-99.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "c76d10c0f9036b33e5e0048fafa7b4d8571af5e27f25d7dc92c336ffac2726da"; + sha256 = "45202f79f9cbf2a44bfefa9ce50bd0a6b88485207105db4df1f26f547c1f556b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/en-CA/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/en-CA/firefox-99.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c85152d5ba80dc5a843312da61aed21834257bede5019b1042353a7955ef0e35"; + sha256 = "78020bb6fa9395fc4e2cf40645e127d0f6d6dfca4044e5c00f63a90e24824add"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/en-GB/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/en-GB/firefox-99.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "52696aed9eaf8be1994c88ed50925cc32f8139aa92ed9f9e1ed91d8c01468e44"; + sha256 = "647947c0b765d1142947d3cb35ceb308946090e928ecbd4cf8c3eba4b57afa47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/en-US/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/en-US/firefox-99.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "e60a2d3079cb76ce879cda5d9c67ca33938d501c3ceb517fd69b58e6f932bf2c"; + sha256 = "4249f742c2918d66af2e7defe1c6b34870f258fe047ae7b38f91b0394b453cbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/eo/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/eo/firefox-99.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "0f27a6f422d03c65879233a22cf469cf287d24d7c250dcea2bf8d845af303bd7"; + sha256 = "1726df9605c7deafd6963c18c4b8dbd4bbbed86814fa9932367fd04f6ef609fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-AR/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-AR/firefox-99.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "639027a3d48570d8bc98965802f9b7661d545ece751ad1d734e7e303f8649962"; + sha256 = "c3820a35047f21efc721889fa0003d8e74e13858aad4d3aea038c01b5cd6c657"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-CL/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-CL/firefox-99.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "44f2a552486e6f22b111e793d0e69a67e635929f02f6f3da814dd2daf22210c2"; + sha256 = "b1f5bf697007d8b6ac9f1fa057f292bcfb860d71229a7d0ad6d611ab02991211"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-ES/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-ES/firefox-99.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "02e56e76df00d39b0a8fd68038a9e8c956ceb512867d453f47209cdb9ce65597"; + sha256 = "de33571140d165d0422b2e4543893bab6435b6626333a05bfef39682ef759db0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-MX/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-MX/firefox-99.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "2386378b0917c770b419ea6561823ab0cfebe36c28a36e7747c47fe68201f95d"; + sha256 = "f681be5b92c8959e0e8c90cf4c7f6cd9197e11be1828797e853310a49dc76698"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/et/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/et/firefox-99.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "382c77faf5501c3f03c626b1a8c99bbbd0d60cff39ab1b0ed33c7a3903866d03"; + sha256 = "476a0ccde58372bffea3ebfb0d88795b31db2ec622f9c1b99df51287aa8ba69b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/eu/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/eu/firefox-99.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "9db254a521cb2185c82522121ba5f7d75a819298abb3c301b6a8b06007d242da"; + sha256 = "d465a6a4a01853724894fd81e31b63b80e830cee268298d6e037e6877ae77661"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fa/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fa/firefox-99.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "16576d6924c772e5d05285a8a9367e3cfbe407f26f96c499fd829529bfd3db4e"; + sha256 = "cf8ac9c8d667ccb0066db1d20a9f43af807e40d1746931e001ec900b34fbbc02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ff/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ff/firefox-99.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "e26dd072353546dab184c4fd527525bb23201a8ed05c3c2bb672cf5a3da2e776"; + sha256 = "86dcb3f9e1d899973eaccd3caf401471b36ff70f4a4693fa9f857083e8641a2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fi/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fi/firefox-99.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "e785cc2e7c9abefcf9b4114f778def4789635e1bd0f354082ba1040435d9c4f1"; + sha256 = "ca0b830aa6ec724aa31f957e7c84156726c26fa0a74ace80ecdea899a8091f82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fr/firefox-99.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "7debe05c2c0128f6a125c627b26e441547d4da485ab263c5b5190cf5cc04b3a5"; + sha256 = "e94a7a54ba806e2b4baa0159d2f8cb96e79abc9c01e2526821cac8253c6ad495"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fy-NL/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fy-NL/firefox-99.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6da5b56b5df3fda1f8ac8f35ed80a0150e66809ab4ae18af8e114a7e45bd10a6"; + sha256 = "cae5c9c607c0dc99e4645f756befce2c9c4ae83b7edc39cf12af81781b33a7b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ga-IE/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ga-IE/firefox-99.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "e145c6ec469038e9cc2e195770fd5eb467bc3859c465d9c570df06e1af0d9532"; + sha256 = "b9b1cb2a48cd17179d5e3a8a3fca9ac25c3367ff6281f632d826cd6a9bb4a633"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gd/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gd/firefox-99.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "d95b7f7aad0d343bdfd8814f38ea59ebc277ea85426fb447173b0a1b4efd9a74"; + sha256 = "b5454de81ba2fee053e98dcb37d3703b5385a51561e45fa32f6872494cfc047b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gl/firefox-99.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "def309ff0f7916df41f34ffe9ec2260a0738da4a2657020641d6d03ee2faed93"; + sha256 = "be3b3decd8e75740a317f105bfa2e4c919ad7f31e391845fb60b299fae7bea7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gn/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gn/firefox-99.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "1dfb7e8a36039e5bb434f1273cf9356a3826444f0f6b058897d16d4b9b0d8676"; + sha256 = "394562b739f81ec43a954f7393c5177f87d3d5b36d404d97e2e483f3000bb615"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gu-IN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gu-IN/firefox-99.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "1c3e77637bba527e9a229665fc4a4921f0b26e05c14e5257a0b28507db34f08d"; + sha256 = "d2e36f37146b48cbc710af7663ad8b4f7770dbb5f6a557e3f54d637e7061ad90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/he/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/he/firefox-99.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d54c2e3377e75dea8400d9b5486259f9be1158e44f520439912052bc2097624a"; + sha256 = "17bbbd7768ff852dc1f27b224b77dfdaaebabaf531028c71a371bf302a9dd92d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hi-IN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hi-IN/firefox-99.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "a91f89a416dc77cda507aa9a1bea653f48249f55ba4655489a4376ea92cf066c"; + sha256 = "2f431a3e50ac0b74a2bda65652a5aa45c0e1b44ef0837645ec49e30c6d0d7fbc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hr/firefox-99.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ce38b5bc0b04a1bd86e2f5cf345c25718103d347803eb72d46f1cb90553695be"; + sha256 = "e57e5fe2cb59c25002e9c06cd3298d9cb75c4437ddc9556590d6c56a1eac57bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hsb/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hsb/firefox-99.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "201ec9e0bb4058d7183024545af8eefe0cd3505fe557b2d541d8a7330c2797fa"; + sha256 = "7c1eefa455afacf5b3b1ee1d04b6e793e2db210912dae58910093c70a21a73f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hu/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hu/firefox-99.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "997a9884e4669e6e883703934e4d747f784f38fb374ee43c7d30f82b9462bb2c"; + sha256 = "d2b02034ce6686e0743af6444acc2a23ed657124bd7bb6ddfaf6d24cf11730b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hy-AM/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hy-AM/firefox-99.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "fb97cbf935b6ae92c8c17be640820e4be73fed59d385bdeb2435ac2253c66651"; + sha256 = "75589d2abd9488269693c0a0440d6359bafb354b1b5ee91b90306871903eda0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ia/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ia/firefox-99.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "d999259f970084c684cf543460efc6faa3677eb839c67e9743af24232d81ecc9"; + sha256 = "b26efd6320a41a558383e22db49cbcdd930161fb48ad0032d24e44b57b01f0c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/id/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/id/firefox-99.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d9bcf799f9d744ba94197900e2032cbc42e4eb3f5ee2d429ede4e2ca47c45d63"; + sha256 = "d50fff8b0ff7ae5546ad3f25e485ef51280bd022708e3d0aae97d99f79788f0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/is/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/is/firefox-99.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "69e55dfe9e542f9c4e0cdcd75e24c346ac565012b2214ad99534ff643d5b1a9e"; + sha256 = "4cf7fbadac8084b8e134f6110ee07076ddd93cf00a10b6ef3d6276df9080bdc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/it/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/it/firefox-99.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "b10c9af0a38a7cc456d7392dbb4a01a964e68fcaf963868011ba104a01c10f59"; + sha256 = "6fabf495a730600869f6d1e2d9382120361f5061e3a893321f68a6378f7eeddc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ja/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ja/firefox-99.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "114df4baff98d81d046a069b6a3271f3cd385cafff9681bb1bdd988a4b806eb3"; + sha256 = "95a537b3306ae1f6bfe9c4076042d6c29c6478c0f32e5aa4a01e800c1d2a75a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ka/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ka/firefox-99.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "79cbe62f30dc117fb656db52ba61895dc830f2f53b8f02edb69809a8fdfe4722"; + sha256 = "e73b2b555f7318650ca1ea20f9d8c1fbc933d230eba3eaeb5e5a47dac24797b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/kab/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/kab/firefox-99.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "babe5ff8170ac703bc95db0c9b54e6c05c12e198dcdd42f0fce9eb2b2a366606"; + sha256 = "cd55879a883ac4e4efef972d6200284d6839dc786e7dad4c3a81fd88b89b18ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/kk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/kk/firefox-99.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a4e3648681178444d8527539523fcd177741ca74a11cf608ae7cfe9608ff46d0"; + sha256 = "cf2dd9ae9cd6347eaf976cdcf4a6cce81abb741b0cc273063cbe1274d271e05b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/km/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/km/firefox-99.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "42dd57a33216a86ccfaf915dbc2513b6ff9441ff5820cf51b0a97bdaecf1c00c"; + sha256 = "f0f3982e7d838841a01b24c330ed3e74416073c40470293447551aacb5411506"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/kn/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/kn/firefox-99.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "8b296ec5f02e7135209f83c53bb4d18c652336a4068b17db99b10dc9d3500744"; + sha256 = "3e2953e55e3bc7fa76ff77aac08f79b20bbf2be52683c08b3d54a323a1754ed7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ko/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ko/firefox-99.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "85829c8e7d52e7e5879d52897ffee0763f3aa03b754647a4d4c0e2d59cfad230"; + sha256 = "5c5bec8a40dbea26674eb2d4b7160c1c2f3ef37f68d67c24a7ca6a2cf77eac85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/lij/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/lij/firefox-99.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "89f0205a14d7b97c635382d3e2ea045103eda9df9f0b7184e7655626b34e39f6"; + sha256 = "7cc492c5eff065cc3cbceb292d18d833e9f2bf76ace0d5ca960256290f049f94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/lt/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/lt/firefox-99.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "f9f88f5d24d5edcd157a030b482c50175bda9a9d4d95499b668227438045b6a0"; + sha256 = "b4b56e01e65ffe4f7232daf661df178d4af1d813e1c8122c4ba56aada0b2ef52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/lv/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/lv/firefox-99.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "7da0fd946c235948ce659947e53f389955e12a10251d2ad564ba6808e13aee76"; + sha256 = "b13ac2b90f13813b8252c5eb817d0f55f770a58e05f8a98b1a08fdf59fc9191a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/mk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/mk/firefox-99.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "9ffa05fc839c67e5c709b6203627b75b7bf7765e5e52e7151561ae0ff36d43f8"; + sha256 = "6b1d2598350feb901e86f332598688853b607c7c14c13ac228610d16e89eeda3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/mr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/mr/firefox-99.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "ff45d74bd695b8677ba76ab1cf6a7726ac08d7ea0c6ed6f705dfedc536df8112"; + sha256 = "9a6a47fc20500b4421b12381374f0a8ecfa9a0929a54a6f6dba73e1c2e5a6c81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ms/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ms/firefox-99.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "9494973f7facf05b5636bce50a39151596b827a3444ce80a601c66e55b488af0"; + sha256 = "e79c4f88952ec9061b4d90f8ca5970be8b5c19cbc1df8d9970b9b23c801103a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/my/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/my/firefox-99.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "ef0b115274304dd0925d643903f15ac7d6c26281ad5ec57c6b73a0a0beb97486"; + sha256 = "f8ce25b87b639843fa6fab4651326719f229f91a4d6b3a6ef17d0e9f4035b1f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/nb-NO/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/nb-NO/firefox-99.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "79c7211ec24d7855f890cd83a65411302f0ad4296ed19fecb86969e62ab6c01a"; + sha256 = "03f5550bf0c0f33c3cf252cbad1650204e008d852e6db46a6f7fb6f6b5ac10ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ne-NP/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ne-NP/firefox-99.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "b4fd3ba21a5c906cdeab13d4db78c4d8c43dae758211d8edb6570d49561b9f26"; + sha256 = "5d94d2dbdbdadf6abb7250772e6e046b9ce03cbf5e4c920ef7e8b5cae69359b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/nl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/nl/firefox-99.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "cfbfaffe54246e4ced8a35edd67b5e28567d9d61ed4fe867f11fc479864e8a6d"; + sha256 = "3045ce321c102e2c114a48a46526572a2c52d228b44ab35d8241d92bd65dd9fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/nn-NO/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/nn-NO/firefox-99.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "74487e82d428166a870b0593ea7be3de9b912132542ff98bd3276e1b9091fc21"; + sha256 = "a16aa9b6de0ac4213492ca117eb47fbd4994824c0f080001baa9136231fb69cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/oc/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/oc/firefox-99.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "004d5e020a627f95572f2c52bcdbd0ef52b66134c5ad64328c810ba2a910cfba"; + sha256 = "70bf39cd4c3fc4ef772dd71d97f71fdc92324ce2caf9d359cc1d3f3d1557c3a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pa-IN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pa-IN/firefox-99.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "4102b176aa98362b3ea6bca76bc5ad3fee3849b833f192d55c02ec72bbd7fcd5"; + sha256 = "951263906c05aa6f60a65d77e917a95ce10e8ae31f156acac7f47ab4ec36deab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pl/firefox-99.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "acc2990be46dde74e93acc0e20d5c59acd2ec9b0ca2d3db1bc641eba9e17dd6d"; + sha256 = "476ca14396dd7ee636ed1e74a20d9d0ff3b0c452e5b5f61eae6f0594ba060f3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pt-BR/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pt-BR/firefox-99.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "c1a286c4369f13a6df8dbbeb9ef60dea11d36d38e1403d8e9bb8387fac2226d8"; + sha256 = "33ea09c993bddcc36621ae633713e758ac33349847604995e05fce0d26be398f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pt-PT/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pt-PT/firefox-99.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "35805803b8487ed6f28bf8cf6ffba764c479cf0eb11bd418ae2613831ede598a"; + sha256 = "fd4b924d8afa163ec40a2f5ca6ae0b89e1a22a8be8b8fbf9f43012159d0b7172"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/rm/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/rm/firefox-99.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "deb2e23159d458e4e2b030678075d793a0d68e87fad38473267e7e7d57939715"; + sha256 = "97ce5f4af9e8ed2af039255e284ce1b55b6a3ac0eacf4c40be82b635b1df0f2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ro/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ro/firefox-99.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "bb0c6227d2903080645a7c7ed0665db6922beda6438d7b82060d890b9ace2a64"; + sha256 = "a959d39333b98c5a479e6975dfa82a4c2b3efe5d69d2d99fddc8d2aabdbe95ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ru/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ru/firefox-99.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b06680a771d8a347c25b65a56cf76bbfa1294fc8c7a2a303bf92175aec1e952e"; + sha256 = "e4f65bbf839054b7009e01461cf4a0b943e1373df054e9b40797b5d233654aac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sco/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sco/firefox-99.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "0519564a5e34f3c9c9ae9605f520da542bd69f20f9410c47739e30ed290ac5f5"; + sha256 = "fac16861dbc011655c3b36b31d5e0816a09e1f88e34032d247d09f691c097ddd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/si/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/si/firefox-99.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "8a5d4685384eaec411a278f92aa2c09f667df430cb65920dbf4f2a22ab749b22"; + sha256 = "93423cb2cccf166f374fb4b8779f337fa1cfdff67f0f2c463a398a35ecd251bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sk/firefox-99.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "6083bdf468dae23a0cd69506e04615f7312dfce6ee0fad744432f316001b23b0"; + sha256 = "e63c2240f7b791b01c94084dbb28d74ddd6528a7bd1e62bb74ee9271d0fd81f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sl/firefox-99.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "42ae9e4a00b8a939a934505e5b4898dfc5edf2ef7c63451784770ae8e942dc3e"; + sha256 = "87064873e57431bb9cfd3e231df07753c8f644e218ea0318b3731baa05b16c1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/son/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/son/firefox-99.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "2d808b21afc4b1af9ea72880acac4c017566e74d7a6635d0a3e9302159961f2d"; + sha256 = "6ecdf2061f0787fc9adcd27465211446df45751d103e279aa50f278361061728"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sq/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sq/firefox-99.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "799099d98be61d2ef50988e4a0dcc910a3d089c8b1b156c340bc6f306f0c05bf"; + sha256 = "47783d01b35119b158c746c5ccede7e4832d15317958030306035d1b448b77dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sr/firefox-99.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "0627104342fa014aa267b4874d88592aad131b8b71ae9da4864233217dac9fcd"; + sha256 = "4aa1908894de6eb3640b497361d5245ed3379d29ffe6e10401540cc1c10cb965"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sv-SE/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sv-SE/firefox-99.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "cf22010a41298f31839c61c749b7f643f92b792050d62060305284d77fc21b35"; + sha256 = "2334fb5859711a4471f06a9eb81907d0b41ba52a8fce05b7cec320a0d31a4167"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/szl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/szl/firefox-99.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "588fed1f0dc77c8d5a18ddb33d04c5570efe80adf3e96895b1b0243e82e92535"; + sha256 = "39ad1c9f4da42278f2a1b3c125aa7e2a8005376a6f458a03851d42f85d116dee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ta/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ta/firefox-99.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "6d10537d9268c509fed6bfd86eb53351b772ea2ba96c0f386d589765b0f1153c"; + sha256 = "24055aedcf23fcde0dc519bc2124a8d42c82ddd74dda46b694a20d25ff76d2ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/te/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/te/firefox-99.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "4ececc1167184b3a531f8176f4282b34b2f5e2c98f329af7dc67ac5be5efefe7"; + sha256 = "18a90860a6428ab31229c975927b264d75b2e2f186f83ef270262f7598053d48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/th/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/th/firefox-99.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "2860a9bf015972a38b1a15bfb532b87c65e2edb7b9ea8ed2db8ee6ab03d4e281"; + sha256 = "b965a21a0585cc07714c39ba33afc5ce757294d595c7617ba5b330a0d1d8cf0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/tl/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/tl/firefox-99.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "97134e6fc0b07c910f8a2ca263943724e3f5790d62b4f0d2fc697c3d5a15a6ec"; + sha256 = "cd1fb6553daf6b123e6545cf0553038b2f16c12ae4a21425e253c68124a8ce42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/tr/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/tr/firefox-99.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "5b38cc44c7d8aa425e70903f192f2ccf8cf4dbcd40952d0014a6f16c81ec66fa"; + sha256 = "2a2c6abfa119022520e8a3ab4c430c282a7a3f7d5e72d2a67d070a64398b2bb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/trs/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/trs/firefox-99.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "e5e7db1ca4c8bff1623bd2b78b1d66617510419a893f324af8092de1a9476a51"; + sha256 = "aae079859fcf211c1e465a00a6a07514397a9f715bc02d704daf062e3d75220a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/uk/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/uk/firefox-99.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "357410778b50cd6da76d178dbc88efe9bdf01e71895699e1616ef4dff253aae1"; + sha256 = "04ebb332d79d0a9aef5d2e93b2aa8dae0ded8d4e4c639d192ac969e8033ffa24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ur/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ur/firefox-99.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "f38359d87aa018b4bd8fee63829a04e7d552c928b945f74c3f2e0ec21524ea03"; + sha256 = "8a8d6d6503657665882ccea44a56b324253adc8d98eba20696ecfd096311821f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/uz/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/uz/firefox-99.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b23c4436a5fe3edb954c2ddc16ff16756d672a89afed91e0753b6f9c7018e9d9"; + sha256 = "e2990d6a4c3bfb5547bdac49a2499c7dd958d0b8e665b636e0ffd6e9aebaab58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/vi/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/vi/firefox-99.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "7156717a71e9fcc8d98eb0fd544b5a3bcd8ade7e805e7a2806b3b3ac363e2402"; + sha256 = "b7c2a4d8c1c400f44fcad7e91572134328097d183c76b8e22d5eaa0a4959d35f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/xh/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/xh/firefox-99.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "5e5b2764b860bf45e5cc738c1d6ce989a6f85b226ebd4ab59d236295ef596a51"; + sha256 = "e3dc9942f397812564b5d7728bb4857f0c217183300ac0ab28590921f56bda34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/zh-CN/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/zh-CN/firefox-99.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "74fbfe561438450fc28539c6d88e16e89abcfabcb025dc57aef87bb2aa64bee0"; + sha256 = "11ff62d8f465b9ce17591177f1fc98d6dcbbd819332f65bcffd685d43b5aa285"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/zh-TW/firefox-98.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/zh-TW/firefox-99.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "12467aa41392d7429a91d01e35894fe5bf3d18cfc4091e349490f063e4b69247"; + sha256 = "406200aceeae06ce5ae2d736d8ff42713e2275b5f369682cd49946326c5cf21d"; } ]; } From dca930fa9f9a192e17f5839e727b2402ce39db63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Mar 2022 05:54:12 +0000 Subject: [PATCH 012/163] libsForQt5.bismuth: 2.3.0 -> 3.0.0 --- pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix index ecd28b496da3..cfa58c0078ea 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "bismuth"; - version = "2.3.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "Bismuth-Forge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b+dlBv1M4//oeCGM2qrQ3s6z2yLql6eQWNqId3JB3Z4="; + sha256 = "sha256-6kSqZtJijQBqvYcyAoSRLl/RxgUubst2SJw/adiBIj4="; }; cmakeFlags = [ From a4bf7fed594d9133ee9e520a07ac0bc2c723d070 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Mar 2022 06:38:50 +0000 Subject: [PATCH 013/163] jmol: 14.32.33 -> 14.32.39 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 246618d4eafe..a747b96dd180 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.32.33"; + version = "14.32.39"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-aImV5zgXjsXdRJLrYIomDymXHRhxuOwGYAwpMIr7wak="; + sha256 = "sha256-ekwipWWGsXYECJBOmw0+uIWHDpdF8T8jZUo6LeqD6Io="; }; patchPhase = '' From 78667b5e08261645ad1242a6280a02600e195ebb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Mar 2022 20:47:41 +0000 Subject: [PATCH 014/163] parallel: 20220222 -> 20220322 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 2eca9f6891a5..b39cfda17d6f 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20220222"; + version = "20220322"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-+BaCuGPq1/uaEUdUAB6ShvlUVQpXo882yQA6gEempEU="; + sha256 = "sha256-35PM9qn1Ka0hJrcEKu8EhmA+k4x3tAWTnEFwLTik5tg="; }; outputs = [ "out" "man" "doc" ]; From 856a2985804078f66a5aba95de4902aa42838dc5 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 10 Mar 2022 01:15:06 -0800 Subject: [PATCH 015/163] phosh: 0.15.0 -> 0.16.0 --- pkgs/applications/window-managers/phosh/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 2c01a37aa43c..b52d8e7a470b 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-ZEfYjgSaj4vVdfgdIcg0PWwlFX90PIm5wvdn9P/8tvo="; + sha256 = "sha256-nxQYVWUXT1fNgOTRB3iWCLWYI/STk8vtguTbPPNTHdg="; }; nativeBuildInputs = [ @@ -108,8 +108,6 @@ stdenv.mkDerivation rec { postFixup = '' mkdir -p $out/share/wayland-sessions ln -s $out/share/applications/sm.puri.Phosh.desktop $out/share/wayland-sessions/ - # The OSK0.desktop points to a dummy stub that's not needed - rm $out/share/applications/sm.puri.OSK0.desktop ''; passthru = { From 47190314dfb7c62cb39e7d831237303b330ac8fb Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Thu, 24 Mar 2022 21:17:45 +0100 Subject: [PATCH 016/163] treewide: replace defunct git://github.com urls with https:// Github has removed support for git://github.com and recommends https://github.com instead. See https://github.blog/2021-09-01-improving-git-protocol-security-github/ --- pkgs/applications/misc/slic3r/default.nix | 2 +- pkgs/applications/networking/p2p/twister/default.nix | 2 +- .../version-management/git-and-tools/darcs-to-git/default.nix | 2 +- pkgs/applications/video/byzanz/default.nix | 2 +- pkgs/development/compilers/ghcjs/ghcjs-base.nix | 2 +- pkgs/development/interpreters/scsh/default.nix | 2 +- pkgs/development/tools/parsing/hammer/default.nix | 2 +- pkgs/os-specific/linux/disk-indicator/default.nix | 2 +- pkgs/tools/audio/pa-applet/default.nix | 2 +- pkgs/tools/networking/carddav-util/default.nix | 2 +- pkgs/tools/package-management/nixui/default.nix | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index f4dd6c7185f5..164c08fa5619 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "slic3r"; src = fetchgit { - url = "git://github.com/alexrj/Slic3r"; + url = "https://github.com/alexrj/Slic3r"; rev = version; sha256 = "1pg4jxzb7f58ls5s8mygza8kqdap2c50kwlsdkf28bz1xi611zbi"; }; diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 9c708b795885..cb48a790b543 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -7,7 +7,7 @@ let twisterHTML = srcOnly { name = "twister-html"; src = fetchgit { - url = "git://github.com/miguelfreitas/twister-html.git"; + url = "https://github.com/miguelfreitas/twister-html.git"; rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b"; sha256 = "0scjbin6s1kmi0bqq0dx0qyjw4n5xgmj567n0156i39f9h0dabqy"; }; diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix index f4b7d38bebcf..9b29a6aaa7a0 100644 --- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "2015-06-04"; src = fetchgit { - url = "git://github.com/purcell/darcs-to-git.git"; + url = "https://github.com/purcell/darcs-to-git.git"; rev = "e5fee32495908fe0f7d700644c7b37347b7a0a5b"; sha256 = "0lxcx0x0m1cv2j4x9ykpjf6r2zg6lh5rya016x93vkmlzxm3f0ji"; }; diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index a9eee05d238f..07322d89fabe 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "byzanz"; src = fetchgit { - url = "git://github.com/GNOME/byzanz"; + url = "https://github.com/GNOME/byzanz"; rev = "1875a7f6a3903b83f6b1d666965800f47db9286a"; sha256 = "0a72fw2mxl8vdcdnzy0bwis4jk28pd7nc8qgr4vhyw5pd48dynvh"; }; diff --git a/pkgs/development/compilers/ghcjs/ghcjs-base.nix b/pkgs/development/compilers/ghcjs/ghcjs-base.nix index ca0086a918ab..17fec9fea0ae 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs-base.nix +++ b/pkgs/development/compilers/ghcjs/ghcjs-base.nix @@ -10,7 +10,7 @@ mkDerivation { pname = "ghcjs-base"; version = "0.2.0.3"; src = fetchgit { - url = "git://github.com/ghcjs/ghcjs-base"; + url = "https://github.com/ghcjs/ghcjs-base"; sha256 = "15fdkjv0l7hpbbsn5238xxgzfdg61g666nzbv2sgxkwryn5rycv0"; rev = "85e31beab9beffc3ea91b954b61a5d04e708b8f2"; }; diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index ce44624497da..cc7caeb02ebc 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "0.7pre"; src = fetchgit { - url = "git://github.com/scheme/scsh.git"; + url = "https://github.com/scheme/scsh.git"; rev = "f99b8c5293628cfeaeb792019072e3a96841104f"; fetchSubmodules = true; sha256 = "0ci2h9hhv8pl12sdyl2qwal3dhmd7zgm1pjnmd4kg8r1hnm6vidx"; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index 402f83bea16b..46f1982a6fab 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "e7aa734"; src = fetchgit { - url = "git://github.com/UpstandingHackers/hammer"; + url = "https://github.com/UpstandingHackers/hammer"; sha256 = "01l0wbhz7dymxlndacin2vi8sqwjlw81ds2i9xyi200w51nsdm38"; rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533"; }; diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index 8a083b8b894d..ac30a947ad91 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "unstable-2014-05-19"; src = fetchgit { - url = "git://github.com/MeanEYE/Disk-Indicator.git"; + url = "https://github.com/MeanEYE/Disk-Indicator.git"; rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da"; sha256 = "10jx6mx9qarn21p2l2jayxkn1gmqhvck1wymgsr4jmbwxl8ra5kd"; }; diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index 6adc24e5300d..6454a14b4265 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "unstable-2012-04-11"; src = fetchgit { - url = "git://github.com/fernandotcl/pa-applet.git"; + url = "https://github.com/fernandotcl/pa-applet.git"; rev = "005f192df9ba6d2e6491f9aac650be42906b135a"; sha256 = "1242sdri67wnm1cd0hr40mxarkh7qs7mb9n2m0g9dbz0f4axj6wa"; }; diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix index ed3f78d4da4a..d300fe9f27a5 100644 --- a/pkgs/tools/networking/carddav-util/default.nix +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "0.1-2014-02-26"; src = fetchgit { - url = "git://github.com/ljanyst/carddav-util"; + url = "https://github.com/ljanyst/carddav-util"; rev = "53b181faff5f154bcd180467dd04c0ce69405564"; sha256 = "0f0raffdy032wlnxfck6ky60r163nhqfbr311y4ry55l60s4497n"; }; diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix index 0e6ff9ec7055..061e5a56f4a9 100644 --- a/pkgs/tools/package-management/nixui/default.nix +++ b/pkgs/tools/package-management/nixui/default.nix @@ -3,7 +3,7 @@ let version = "0.2.1"; src = fetchgit { - url = "git://github.com/matejc/nixui.git"; + url = "https://github.com/matejc/nixui.git"; rev = "845a5f4a33f1d0c509c727c130d0792a5b450a38"; sha256 = "1ay3i4lgzs3axbby06l4vvspxi0aa9pwiil84qj0dqq1jb6isara"; }; From f3bda2f2c0ed785b28d32671b4321f71ccd17c19 Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Thu, 24 Mar 2022 21:27:40 +0100 Subject: [PATCH 017/163] docs: replace defunct git://github.com urls with https:// --- doc/languages-frameworks/vim.section.md | 2 +- .../services/continuous-integration/buildbot/master.nix | 4 ++-- pkgs/applications/science/math/sage/README.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index a615d585b151..a3b47461a6bd 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -286,7 +286,7 @@ Sample output1: "reload" = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "reload"; src = fetchgit { - url = "git://github.com/xolox/vim-reload"; + url = "https://github.com/xolox/vim-reload"; rev = "0a601a668727f5b675cb1ddc19f6861f3f7ab9e1"; sha256 = "0vb832l9yxj919f5hfg6qj6bn9ni57gnjd3bj7zpq7d4iv2s4wdh"; }; diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index aaa159d3cb18..80c6c6abfd0b 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -64,7 +64,7 @@ in { description = "Factory Steps"; default = []; example = [ - "steps.Git(repourl='git://github.com/buildbot/pyflakes.git', mode='incremental')" + "steps.Git(repourl='https://github.com/buildbot/pyflakes.git', mode='incremental')" "steps.ShellCommand(command=['trial', 'pyflakes'])" ]; }; @@ -74,7 +74,7 @@ in { description = "List of Change Sources."; default = []; example = [ - "changes.GitPoller('git://github.com/buildbot/pyflakes.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)" + "changes.GitPoller('https://github.com/buildbot/pyflakes.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)" ]; }; diff --git a/pkgs/applications/science/math/sage/README.md b/pkgs/applications/science/math/sage/README.md index 26e91fc63133..c3a81c2109ee 100644 --- a/pkgs/applications/science/math/sage/README.md +++ b/pkgs/applications/science/math/sage/README.md @@ -17,7 +17,7 @@ If the build broke as a result of a package update, try those solutions in order - fix the problem yourself. First clone the sagemath source and then check out the sage version you want to patch: ``` -[user@localhost ~]$ git clone git://github.com/sagemath/sage.git +[user@localhost ~]$ git clone https://github.com/sagemath/sage.git [user@localhost ~]$ cd sage [user@localhost sage]$ git checkout 8.2 # substitute the relevant version here ``` @@ -41,7 +41,7 @@ You can [login the sage trac using GitHub](https://trac.sagemath.org/login). You Here's the gist, assuming you want to use ssh key authentication. First, [add your public ssh key](https://trac.sagemath.org/prefs/sshkeys). Then: ``` -[user@localhost ~]$ git clone git://github.com/sagemath/sage.git +[user@localhost ~]$ git clone https://github.com/sagemath/sage.git [user@localhost ~]$ cd sage [user@localhost sage]$ git remote add trac git@trac.sagemath.org:sage.git -t master [user@localhost sage]$ git checkout -b u/gh-/ develop From cccc419102db620bc9877b997aa01a33da2ba8ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Mar 2022 19:18:33 +0000 Subject: [PATCH 018/163] prometheus-redis-exporter: 1.36.0 -> 1.37.0 --- pkgs/servers/monitoring/prometheus/redis-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 4b60c5a28d0e..fa654c3a4656 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.36.0"; + version = "1.37.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-n+LvWl0KMAay90GQg42ODcvxX9QbvQ1Ixo4PfJYEAWA="; + sha256 = "sha256-S60/SwbMp6INf98MGc26zMZH8q7gBynyaT/ivN7o0rA="; }; vendorSha256 = "sha256-u9FfKOD6kiCFTjwQ7LHE9WC4j2vPm0ZCluL8pC4aQIc="; From 0482c2252cd8a09967dcd437937c0ff4249dfef2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Mar 2022 00:38:57 +0000 Subject: [PATCH 019/163] sqlfluff: 0.11.1 -> 0.11.2 --- pkgs/development/tools/database/sqlfluff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 4ecb24d3712e..cc6757e239a7 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-wd/tuFOoWhts/i+FCNVXmREUHAsh6hYOUowCyZjg92Y="; + hash = "sha256-iEjfp6QXMIk/ehq0Ypa8JXv3/u40w39NHz7HhC1KBms="; }; propagatedBuildInputs = with python3.pkgs; [ From 69c490670e58fa2d337d99a8503b46e2daf2aa5a Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 25 Mar 2022 18:32:06 -0700 Subject: [PATCH 020/163] phoc: 0.12.0 -> 0.13.0 --- pkgs/applications/misc/phoc/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 7acdcdf02c45..53b949d9383b 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -33,6 +33,12 @@ let url = "https://github.com/swaywm/wlroots/commit/66593071bc90a1cccaeedc636eb6f33c973f5362.patch"; sha256 = "sha256-yKf/twdUzrII5IakH7AH6LGyPDo9Nl/gIB0pTThSTfY="; }) + # xdg-activation: Allow to submit tokens + (fetchpatch { + name = "allow-to-submit-tokens.patch"; + url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/4c59f7d46a949548caa55805b00922f846d58525.patch"; + sha256 = "sha256-1kUIt6lV3HXN2BBBER8sjYVLTvgqELdSeFullJjNGo8="; + }) # xwayland: Allow to retrieve startup-id via _NET_STARTUP_INFO (fetchpatch { name = "allow-to-retrieve-startup-id-via-net-startup-info.patch"; @@ -43,7 +49,7 @@ let }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -51,7 +57,7 @@ in stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kfMM/YjgAktpOKHNcxxl1FPVbgATPDNRhEJ/sVT1LYs="; + sha256 = "sha256-65u59S6ntvkoQUO5BvkHZVcbj6cHIU4CgHWjzFo6s94="; }; nativeBuildInputs = [ From 6267c15f4d0810504236c216799247add9ea210c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Mar 2022 08:47:12 +0000 Subject: [PATCH 021/163] python310Packages.types-protobuf: 3.19.14 -> 3.19.15 --- pkgs/development/python-modules/types-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index a4d8d7ccf7b0..5393a1604c9c 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.19.14"; + version = "3.19.15"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ANWbHgfICPLwPGyouksHcoFYW7KBSKMCDPv37F/H+4Y="; + sha256 = "sha256-03HQpbMueMLWhDKaXUSR04Xm6tyrSXs3xBFy3tMoxdk="; }; propagatedBuildInputs = [ From 1f1511a30c45afd2f92782c71744fd8d159215e3 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 26 Mar 2022 13:15:53 +0100 Subject: [PATCH 022/163] SDL2_sound: init at 2.0.1 --- .../libraries/SDL2_sound/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/libraries/SDL2_sound/default.nix diff --git a/pkgs/development/libraries/SDL2_sound/default.nix b/pkgs/development/libraries/SDL2_sound/default.nix new file mode 100644 index 000000000000..3a2d05c31a10 --- /dev/null +++ b/pkgs/development/libraries/SDL2_sound/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, SDL2 +, flac +, libmikmod +, libvorbis +, timidity +, AudioToolbox +, CoreAudio +}: + +stdenv.mkDerivation rec { + pname = "SDL2_sound"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "icculus"; + repo = "SDL_sound"; + rev = "v${version}"; + sha256 = "sha256-N2znqy58tMHgYa07vEsSedWLRhoJzDoINcsUu0UYLnA="; + }; + + patches = [ + (fetchpatch { + # https://github.com/icculus/SDL_sound/pull/32 - fix build on darwin + # can be dropped on the next update + url = "https://github.com/icculus/SDL_sound/commit/c15d75b7720113b28639baad284f45f943846294.patch"; + sha256 = "sha256-4GL8unsZ7eNkzjLXq9QdaxFQMzX2tdP0cBR1jTaRLc0="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DSDLSOUND_DECODER_MIDI=1" ]; + + buildInputs = [ SDL2 flac libmikmod libvorbis timidity ] + ++ lib.optionals stdenv.isDarwin [ AudioToolbox CoreAudio ]; + + meta = with lib; { + description = "SDL2 sound library"; + platforms = platforms.unix; + license = licenses.zlib; + homepage = "https://www.icculus.org/SDL_sound/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 705900fdbd0e..2df5f51b3cd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20094,6 +20094,10 @@ with pkgs; SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { }; + SDL2_sound = callPackage ../development/libraries/SDL2_sound { + inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio; + }; + SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; SDL2_ttf_2_0_15 = callPackage ../development/libraries/SDL2_ttf/2.0.15.nix { }; From e68446288efdd86b1930383b2c03c7b93bfb41ee Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 24 Mar 2022 10:18:43 -0600 Subject: [PATCH 023/163] maintainers: add rgrinberg --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fea30c749542..6da7318831d4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10398,6 +10398,12 @@ githubId = 811827; name = "Gabriel Lievano"; }; + rgrinberg = { + name = "Rudi Grinberg"; + email = "me@rgrinberg.com"; + github = "rgrinberg"; + githubId = 139003; + }; rgrunbla = { email = "remy@grunblatt.org"; github = "rgrunbla"; From da264c508d28719b51f9d680e2e091b20e68d8a2 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 21 Mar 2022 18:09:24 -0600 Subject: [PATCH 024/163] ablog: init at 0.10.23 --- pkgs/applications/misc/ablog/default.nix | 36 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/misc/ablog/default.nix diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/applications/misc/ablog/default.nix new file mode 100644 index 000000000000..b6a3a1dfdb56 --- /dev/null +++ b/pkgs/applications/misc/ablog/default.nix @@ -0,0 +1,36 @@ +{ lib +, python3 +}: + +with python3.pkgs; + +buildPythonApplication rec { + pname = "ablog"; + version = "0.10.23"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-fqqB17dNzcDZmFw3nj85T5zvMzY6SN/JxbB3IASOas8="; + }; + + propagatedBuildInputs = [ + feedgen + sphinx + invoke + watchdog + python-dateutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + nativeBuildInputs = [ setuptools-scm ]; + + meta = with lib; { + description = "ABlog for blogging with Sphinx"; + homepage = "https://ablog.readthedocs.io/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ rgrinberg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40ea0a4f8bbe..9168471e5ce6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -914,6 +914,8 @@ with pkgs; abduco = callPackage ../tools/misc/abduco { }; + ablog = callPackage ../applications/misc/ablog { }; + acct = callPackage ../tools/system/acct { }; accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { }; From 45134bb912698266b3b86da012b30d7c328220a4 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Tue, 22 Mar 2022 18:58:48 -0400 Subject: [PATCH 025/163] libsForQt5.qwt6_1: init at 6.1.6 --- pkgs/development/libraries/qwt/6_1.nix | 31 ++++++++++++++++++++++++++ pkgs/top-level/qt5-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/qwt/6_1.nix diff --git a/pkgs/development/libraries/qwt/6_1.nix b/pkgs/development/libraries/qwt/6_1.nix new file mode 100644 index 000000000000..4e3a179e7520 --- /dev/null +++ b/pkgs/development/libraries/qwt/6_1.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: + +stdenv.mkDerivation rec { + pname = "qwt"; + version = "6.1.6"; + + src = fetchurl { + url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2"; + sha256 = "sha256-mUYNMcEV7kEXsBddiF9HwsWQ14QgbwmBXcBY++Xt4fY="; + }; + + propagatedBuildInputs = [ qtbase qtsvg qttools ]; + nativeBuildInputs = [ qmake ]; + + postPatch = '' + sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri + ''; + + qmakeFlags = [ "-after doc.path=$out/share/doc/qwt-${version}" ]; + + dontWrapQtApps = true; + + meta = with lib; { + description = "Qt widgets for technical applications"; + homepage = "http://qwt.sourceforge.net/"; + # LGPL 2.1 plus a few exceptions (more liberal) + license = licenses.qwt; + platforms = platforms.unix; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index bab473bd8a0c..ce748d6334a8 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -212,6 +212,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qwt = callPackage ../development/libraries/qwt/6.nix { }; + qwt6_1 = callPackage ../development/libraries/qwt/6_1.nix { }; + soqt = callPackage ../development/libraries/soqt { }; telepathy = callPackage ../development/libraries/telepathy/qt { }; From f405c5987407fda41903c5d6ff311fdad7430ef8 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Tue, 22 Mar 2022 16:53:46 -0400 Subject: [PATCH 026/163] libsForQt5.qwt: 6.1.6 -> 6.2.0 --- pkgs/applications/networking/linssid/default.nix | 6 +++--- pkgs/applications/radio/pothos/default.nix | 4 ++-- pkgs/applications/science/electronics/caneda/default.nix | 4 ++-- pkgs/development/libraries/qwt/6.nix | 4 ++-- pkgs/tools/audio/opl3bankeditor/common.nix | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 090f53cffb62..72128a5ef95c 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkg-config, boost, wirelesstools, iw, qwt, wrapQtAppsHook }: +{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkg-config, boost, wirelesstools, iw, qwt6_1, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "linssid"; @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; - buildInputs = [ qtbase qtsvg boost qwt ]; + buildInputs = [ qtbase qtsvg boost qwt6_1 ]; patches = [ ./0001-unbundled-qwt.patch ]; postPatch = '' - sed -e "s|/usr/include/qt5.*$|& ${qwt}/include|" -i linssid-app/linssid-app.pro + sed -e "s|/usr/include/qt5.*$|& ${qwt6_1}/include|" -i linssid-app/linssid-app.pro sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro sed -e 's|^LIBS .*= .*libboost_regex.a|LIBS += -lboost_regex|' \ -e "s|/usr|$out|g" \ diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix index 817013dbf3ec..1b36b36829a0 100644 --- a/pkgs/applications/radio/pothos/default.nix +++ b/pkgs/applications/radio/pothos/default.nix @@ -9,7 +9,7 @@ , poco , qtbase , qtsvg -, libsForQt5 +, qwt6_1 , nlohmann_json , soapysdr-with-plugins , portaudio @@ -38,7 +38,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config doxygen wrapQtAppsHook ]; buildInputs = [ - pcre poco qtbase qtsvg libsForQt5.qwt nlohmann_json + pcre poco qtbase qtsvg qwt6_1 nlohmann_json soapysdr-with-plugins portaudio alsa-lib muparserx python3 ]; diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index 6a9a491af1ee..1adac4832a13 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: +{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt6_1}: mkDerivation rec { pname = "caneda"; @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase qttools qtsvg qwt ]; + buildInputs = [ qtbase qttools qtsvg qwt6_1 ]; meta = { description = "Open source EDA software focused on easy of use and portability"; diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index a9fa29ba4d4f..dbf3b1abef45 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "qwt"; - version = "6.1.6"; + version = "6.2.0"; src = fetchurl { url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2"; - sha256 = "sha256-mUYNMcEV7kEXsBddiF9HwsWQ14QgbwmBXcBY++Xt4fY="; + sha256 = "sha256-kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA="; }; propagatedBuildInputs = [ qtbase qtsvg qttools ]; diff --git a/pkgs/tools/audio/opl3bankeditor/common.nix b/pkgs/tools/audio/opl3bankeditor/common.nix index 04f4d3aae5ab..982b8f8349f3 100644 --- a/pkgs/tools/audio/opl3bankeditor/common.nix +++ b/pkgs/tools/audio/opl3bankeditor/common.nix @@ -9,7 +9,7 @@ , pkg-config , qttools , qtbase -, qwt +, qwt6_1 , rtaudio , rtmidi }: @@ -43,7 +43,7 @@ mkDerivation rec { buildInputs = [ qtbase - qwt + qwt6_1 rtaudio rtmidi ]; @@ -52,7 +52,7 @@ mkDerivation rec { mkdir $out/{bin,Applications} mv "${binname}.app" $out/Applications/ - install_name_tool -change {,${qwt}/lib/}libqwt.6.dylib "$out/Applications/${binname}.app/Contents/MacOS/${binname}" + install_name_tool -change {,${qwt6_1}/lib/}libqwt.6.dylib "$out/Applications/${binname}.app/Contents/MacOS/${binname}" ln -s "$out/Applications/${binname}.app/Contents/MacOS/${binname}" $out/bin/${mainProgram} ''; From fbc8d491eca5b547d8cce39964d8650a40d3f4c6 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 23 Mar 2022 16:30:00 -0400 Subject: [PATCH 027/163] qwt: remove qwt v5.x derivation --- pkgs/development/libraries/qwt/default.nix | 32 ---------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 34 deletions(-) delete mode 100644 pkgs/development/libraries/qwt/default.nix diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix deleted file mode 100644 index a5dcfedb8491..000000000000 --- a/pkgs/development/libraries/qwt/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, qt4, qmake4Hook }: - -stdenv.mkDerivation rec { - pname = "qwt"; - version = "5.2.3"; - - src = fetchurl { - url = "mirror://sourceforge/qwt/${pname}-${version}.tar.bz2"; - sha256 = "1dqa096mm6n3bidfq2b67nmdsvsw4ndzzd1qhl6hn8skcwqazzip"; - }; - - propagatedBuildInputs = [ qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; - - postPatch = '' - sed -e "s@\$\$\[QT_INSTALL_PLUGINS\]@$out/lib/qt4/plugins@" -i designer/designer.pro - sed -e "s|INSTALLBASE.*=.*|INSTALLBASE = $out|g" -i qwtconfig.pri - ''; - - preConfigure = '' - qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${pname}-${version}" - ''; - - meta = with lib; { - description = "Qt widgets for technical applications"; - homepage = "http://qwt.sourceforge.net/"; - # LGPL 2.1 plus a few exceptions (more liberal) - license = lib.licenses.qwt; - platforms = platforms.unix; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40672ae4dd5b..6a1c14e79102 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19923,8 +19923,6 @@ with pkgs; qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray {}; - qwt = callPackage ../development/libraries/qwt {}; - qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix { inherit (darwin.apple_sdk.frameworks) AGL; }; From 50df75459ee8581be6acf32c82bcfd6a4415e263 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Wed, 23 Mar 2022 16:35:55 -0400 Subject: [PATCH 028/163] libsForQt5.qwt: rename 6.nix to default.nix --- pkgs/development/libraries/qwt/{6.nix => default.nix} | 0 pkgs/top-level/qt5-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/libraries/qwt/{6.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/default.nix similarity index 100% rename from pkgs/development/libraries/qwt/6.nix rename to pkgs/development/libraries/qwt/default.nix diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index ce748d6334a8..4b00b704d5fb 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -210,7 +210,7 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea quazip = callPackage ../development/libraries/quazip { }; - qwt = callPackage ../development/libraries/qwt/6.nix { }; + qwt = callPackage ../development/libraries/qwt/default.nix { }; qwt6_1 = callPackage ../development/libraries/qwt/6_1.nix { }; From 47fb5151cb3f3293363b8b02eef820267da8b8a7 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Sat, 26 Mar 2022 13:27:34 -0400 Subject: [PATCH 029/163] libsForQt5.qwt: cleanup metadata --- pkgs/development/libraries/qwt/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index dbf3b1abef45..46cfc426efa4 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { license = lib.licenses.qwt; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; - branch = "6"; }; } From 78a79342a52c36e356450624a729ade17e45fc95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Mar 2022 20:37:10 +0000 Subject: [PATCH 030/163] gdcm: 3.0.10 -> 3.0.11 --- pkgs/development/libraries/gdcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 708d3c67db35..de7bf815b044 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "gdcm"; - version = "3.0.10"; + version = "3.0.11"; src = fetchFromGitHub { owner = "malaterre"; repo = "GDCM"; rev = "v${version}"; - sha256 = "sha256-KFN13kGE0E8gQBgtErvkW7Fa+3YYqQh0RA2bPS90WUI="; + sha256 = "sha256-rGR0yQImLG3kBp6/QoEMLFrFtgAIN6y9lZ3OmtAUVcY="; }; cmakeFlags = [ From 8ceca9f36b9ca33a55ba857563c9b1e4f7963485 Mon Sep 17 00:00:00 2001 From: uakci Date: Wed, 22 Dec 2021 07:14:59 +0100 Subject: [PATCH 031/163] mplus-outline-fonts: init github release --- .../fonts/mplus-outline-fonts/default.nix | 58 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 40 insertions(+), 20 deletions(-) diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index 75e8899e664a..b99d984d30cb 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -1,25 +1,45 @@ -{ lib, fetchzip }: +{ lib, fetchzip, fetchFromGitHub }: -let - version = "063a"; -in fetchzip { - name = "mplus-${version}"; +let pname = "mplus-outline-fonts"; +in { + osdnRelease = fetchzip { + name = "${pname}-osdn"; + url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-063a.tar.xz"; + sha256 = "16jirhkjs46ac8cdk2w4xkpv989gmz7i8gnrq9bck13rbil7wlzr"; + postFetch = '' + mkdir -p $out/share/fonts/truetype/${pname} + tar xvJf $downloadedFile + mv */*.ttf $out/share/fonts/truetype/${pname} + ''; - url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; + meta = with lib; { + description = "M+ Outline Fonts (legacy OSDN release)"; + homepage = "https://mplus-fonts.osdn.jp"; + maintainers = with maintainers; [ henrytill ]; + platforms = platforms.all; + license = licenses.mit; + }; + }; - postFetch = '' - tar -xJf $downloadedFile --strip-components=1 - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype - ''; + githubRelease = fetchFromGitHub { + name = "${pname}-github"; + owner = "coz-m"; + repo = "MPLUS_FONTS"; + rev = "336fec4e9e7c1e61bd22b82e6364686121cf3932"; + sha256 = "1ha92hyzcfbbq682c50k8clbhigc09rcb9mxjzjwqfj9rfp348id"; + postFetch = '' + mkdir -p $out/share/fonts/{truetype,opentype}/${pname} + tar xvzf $downloadedFile + mv */fonts/ttf/* $out/share/fonts/truetype/${pname} + mv */fonts/otf/* $out/share/fonts/opentype/${pname} + ''; - sha256 = "1khbkch2r96ppifc93bmy1v047pgciyhfmcjb98ggncp5ix885xz"; - - meta = with lib; { - description = "M+ Outline Fonts"; - homepage = "https://mplus-fonts.osdn.jp/about-en.html"; - license = licenses.mit; - maintainers = with maintainers; [ henrytill ]; - platforms = platforms.all; + meta = with lib; { + description = "M+ Outline Fonts (GitHub release)"; + homepage = "https://mplusfonts.github.io"; + maintainers = with maintainers; [ henrytill ]; + platforms = platforms.all; + license = licenses.ofl; + }; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5ee3327e03c..68361b095caf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24084,7 +24084,7 @@ with pkgs; mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { }; - mplus-outline-fonts = callPackage ../data/fonts/mplus-outline-fonts { }; + mplus-outline-fonts = recurseIntoAttrs (callPackage ../data/fonts/mplus-outline-fonts { }); mro-unicode = callPackage ../data/fonts/mro-unicode { }; From 6c5a2b69b459786834d893986a7ecf201ce92138 Mon Sep 17 00:00:00 2001 From: uakci Date: Wed, 23 Mar 2022 19:27:54 +0100 Subject: [PATCH 032/163] maintainers: add uakci --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/data/fonts/mplus-outline-fonts/default.nix | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4a66ffa1eafb..e5a755c069e8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12765,6 +12765,12 @@ githubId = 1983821; name = "Eric Wolf"; }; + uakci = { + name = "uakci"; + email = "uakci@uakci.pl"; + github = "uakci"; + githubId = 6961268; + }; udono = { email = "udono@virtual-things.biz"; github = "udono"; diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index b99d984d30cb..d9cfadd5f088 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -15,7 +15,7 @@ in { meta = with lib; { description = "M+ Outline Fonts (legacy OSDN release)"; homepage = "https://mplus-fonts.osdn.jp"; - maintainers = with maintainers; [ henrytill ]; + maintainers = with maintainers; [ henrytill uakci ]; platforms = platforms.all; license = licenses.mit; }; @@ -37,7 +37,7 @@ in { meta = with lib; { description = "M+ Outline Fonts (GitHub release)"; homepage = "https://mplusfonts.github.io"; - maintainers = with maintainers; [ henrytill ]; + maintainers = with maintainers; [ henrytill uakci ]; platforms = platforms.all; license = licenses.ofl; }; From e501354c13f89ac0671883ade1459b3353c39121 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 26 Mar 2022 23:25:36 +0100 Subject: [PATCH 033/163] pdns-recursor: 4.6.0 -> 4.6.1 --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index d106e154277a..7b3b81ace277 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "1wmwkw8x39rall3673cngz0vpgc1z5vx29qy5r6mkg5fk29ma1nz"; + sha256 = "1sqwasqxz4svn5rckrwr05gzk7qzdhzzzjr1l2l7xa44if8011bv"; }; nativeBuildInputs = [ pkg-config ]; From 693e3b95f0aa00a63195abeac5a6e6cce5c7f72a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Mar 2022 02:36:32 +0000 Subject: [PATCH 034/163] kustomize: 4.5.2 -> 4.5.3 --- pkgs/development/tools/kustomize/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index ef258b736c95..dcaafe676e9a 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "4.5.2"; + version = "4.5.3"; # rev is the commit of the tag, mainly for kustomize version command output rev = "b2d65ddc98e09187a8e38adc27c30bab078c1dbf"; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "sha256-l24uKKcTt5b7V/IHjJNMtVce55CEGdZVYlCzjUnEp1A="; + sha256 = "sha256-sy429uTTYvjnweZlsuolBamcggRXmaR8uxD043GUIQE="; }; doCheck = true; @@ -25,7 +25,7 @@ buildGoModule rec { # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "sha256-GR1ohesxjxpMl1B7hWtBUAWWU8X7wHPAKdMoGM5L/VQ="; + vendorSha256 = "sha256-5kMMSr+YyuoASgW+qzkyO4CcDHFFANcsAZTUqHX5nGk="; meta = with lib; { description = "Customization of kubernetes YAML configurations"; From 30c395c55478ae3d7ce93d0ca948f7b1214bcd9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Mar 2022 05:48:35 +0000 Subject: [PATCH 035/163] mapcache: 1.12.0 -> 1.12.1 --- pkgs/servers/mapcache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mapcache/default.nix b/pkgs/servers/mapcache/default.nix index 744a529496da..3eae9c2b33cb 100644 --- a/pkgs/servers/mapcache/default.nix +++ b/pkgs/servers/mapcache/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mapcache"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "MapServer"; repo = pname; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-13lOQC4PJtByhvceuF00uoipLFHrFiyJrsy2iWcEANc="; + sha256 = "sha256-NuiZMWcmsN5wDCd37Hvj3cazwT3Ea+OknV/YR3urZB0="; }; nativeBuildInputs = [ From f23a1c20331be05303613768834baebdc7b6240c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sat, 26 Mar 2022 13:08:50 -0600 Subject: [PATCH 036/163] =?UTF-8?q?gnome-keyring:=20checkInputs=20python2?= =?UTF-8?q?=20=E2=86=92=20python3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/core/gnome-keyring/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix index 8c9815509e2d..afbec6f8c5d1 100644 --- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -5,7 +5,7 @@ , dbus , libgcrypt , pam -, python2 +, python3 , glib , libxslt , gettext @@ -51,8 +51,7 @@ stdenv.mkDerivation rec { p11-kit ]; - # In 3.20.1, tests do not support Python 3 - checkInputs = [ dbus python2 ]; + checkInputs = [ dbus python3 ]; configureFlags = [ "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories From d7e9eb35e20efc5a56a564355e35ac4dbaf5f6d1 Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Mon, 21 Mar 2022 21:25:15 +0000 Subject: [PATCH 037/163] nominatim: init at 4.0.1 --- pkgs/servers/nominatim/default.nix | 68 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/servers/nominatim/default.nix diff --git a/pkgs/servers/nominatim/default.nix b/pkgs/servers/nominatim/default.nix new file mode 100644 index 000000000000..4b7f9e3e2577 --- /dev/null +++ b/pkgs/servers/nominatim/default.nix @@ -0,0 +1,68 @@ +{ stdenv, lib, fetchFromGitHub, fetchurl +, clang-tools, cmake, bzip2, zlib, expat, boost, git, pandoc, gzip +, postgresql_12 +, python3, python3Packages, php +}: + +let + countryGrid = fetchurl { + # Nominatim docs mention https://www.nominatim.org/data/country_grid.sql.gz but it's not a very good URL for pinning + url = "https://web.archive.org/web/20220323041006/https://nominatim.org/data/country_grid.sql.gz"; + sha256 = "sha256-/mY5Oq9WF0klXOv0xh0TqEJeMmuM5QQJ2IxANRZd4Ek="; + }; +in +stdenv.mkDerivation rec { + pname = "nominatim"; + version = "4.0.1"; + + src = fetchFromGitHub { + owner = "osm-search"; + repo = "Nominatim"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-sKI/KBKveb5kAWJ7y1xw+ZF1thynr402rJhVjkIdFMo="; + }; + + nativeBuildInputs = [ + cmake + clang-tools + git + pandoc + php + ]; + + buildInputs = [ + bzip2 + zlib + expat + boost + python3 + # python3Packages.pylint # We don't want to run pylint because the package could break on pylint bumps which is really annoying. + # python3Packages.pytest # disabled since I can't get it to run tests anyway + # python3Packages.behave # disabled since I can't get it to run tests anyway + postgresql_12 + ]; + + propagatedBuildInputs = with python3Packages; [ + pyyaml + python-dotenv + psycopg2 + psutil + jinja2 + PyICU + datrie + ]; + + postPatch = '' + mkdir -p ./data + ln -s ${countryGrid} ./data/country_osm_grid.sql.gz + ''; + + meta = with lib; { + description = "Search engine for OpenStreetMap data"; + homepage = "https://nominatim.org/"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.mausch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60a0e7918868..4334e96dce08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1103,6 +1103,8 @@ with pkgs; midimonster = callPackage ../tools/audio/midimonster { }; + nominatim = callPackage ../servers/nominatim { }; + pferd = callPackage ../tools/misc/pferd {}; qFlipper = libsForQt515.callPackage ../tools/misc/qflipper { }; From df698858835ebd614d15773267fc4071c8da1139 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Mar 2022 14:38:55 +0200 Subject: [PATCH 038/163] strace: 5.16 -> 5.17 ChangeLog: https://github.com/strace/strace/releases/tag/v5.17 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 865784171786..1fd8db8c6e2e 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.16"; + version = "5.17"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3H2yMP8+V8JJgwupSsqyuGLaH8qsVUF+m4UEGoM8ooU="; + sha256 = "sha256-X7KY29EzH9HhvJTFwyOVhg03YQG4fGzT0bqfmqFcFh8="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 9e9ec58470b0d47f3a8c61d20539afa382d711b6 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 26 Mar 2022 15:37:36 +0200 Subject: [PATCH 039/163] dsq: init at 0.9.0 --- pkgs/tools/misc/dsq/default.nix | 60 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 62 insertions(+) create mode 100644 pkgs/tools/misc/dsq/default.nix diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix new file mode 100644 index 000000000000..2451800b41f9 --- /dev/null +++ b/pkgs/tools/misc/dsq/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildGoModule +, runCommand +, nix-update-script +, dsq +, diffutils +}: + +buildGoModule rec { + pname = "dsq"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "multiprocessio"; + repo = "dsq"; + rev = version; + hash = "sha256-JzS94kfvgZDz4tIXa4veY3XSFeMDBN61sU8/+5V5y9Y="; + }; + + vendorSha256 = "sha256-9Exy2VLxOd4lgwbIOZ6NJ45NABO9a0rLjmZ+Cd7jjLM="; + + nativeBuildInputs = [ diffutils ]; + + passthru = { + updateScript = nix-update-script { attrPath = pname; }; + + tests = { + pretty-csv = runCommand "${pname}-test" { } '' + mkdir "$out" + cat < "$out/input.csv" + first,second + 1,a + 2,b + EOF + cat < "$out/expected.txt" + +-------+--------+ + | first | second | + +-------+--------+ + | 1 | a | + | 2 | b | + +-------+--------+ + EOF + ${dsq}/bin/dsq --pretty "$out/input.csv" 'select first, second from {}' > "$out/actual.txt" + diff "$out/expected.txt" "$out/actual.txt" + ''; + }; + }; + + meta = with lib; { + description = "Commandline tool for running SQL queries against JSON, CSV, Excel, Parquet, and more"; + homepage = "https://github.com/multiprocessio/dsq"; + license = licenses.asl20; + maintainers = with maintainers; [ liff ]; + # TODO: Remove once nixpkgs uses macOS SDK 10.14+ for x86_64-darwin + # Undefined symbols for architecture x86_64: "_SecTrustEvaluateWithError" + broken = stdenv.isDarwin && stdenv.isx86_64; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a3c993705ce..29aa67d295e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -341,6 +341,8 @@ with pkgs; deadnix = callPackage ../development/tools/deadnix { }; + dsq = callPackage ../tools/misc/dsq { buildGoModule = buildGo118Module; }; + each = callPackage ../tools/text/each { }; eclipse-mat = callPackage ../development/tools/eclipse-mat { }; From 805dd40e78a7a630040a6220a756fe716f424981 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 27 Mar 2022 13:33:12 +0000 Subject: [PATCH 040/163] =?UTF-8?q?n8n:=200.169.0=20=E2=86=92=200.170.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/n8n/node-packages.nix | 158 +++++++++--------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 9f806be2e2c6..ab66b28fe17a 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -139,13 +139,13 @@ let sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; }; }; - "@fontsource/open-sans-4.5.6" = { + "@fontsource/open-sans-4.5.8" = { name = "_at_fontsource_slash_open-sans"; packageName = "@fontsource/open-sans"; - version = "4.5.6"; + version = "4.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.6.tgz"; - sha512 = "bQuNS0H1VL1VLC6FwmReHlpJaICVe/seODU3Q9cpTQbJ5OtRD4TwWMrAjfTxqcFNollA6O0AlE4BnRSWMQLfvw=="; + url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.8.tgz"; + sha512 = "3b94XDdRLqL7OlE7OjWg/4pgG825Juw8PLVEDm6h5pio0gMU89ICxfatGxHsBxMGfqad+wnvdmUweZWlELDFpQ=="; }; }; "@icetee/ftp-0.3.15" = { @@ -481,13 +481,13 @@ let sha512 = "BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg=="; }; }; - "@types/node-17.0.21" = { + "@types/node-17.0.23" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.21"; + version = "17.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz"; - sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz"; + sha512 = "UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw=="; }; }; "@types/node-fetch-2.6.1" = { @@ -967,13 +967,13 @@ let sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A=="; }; }; - "aws-sdk-2.1096.0" = { + "aws-sdk-2.1101.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1096.0"; + version = "2.1101.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1096.0.tgz"; - sha512 = "q+hotU57U8bGpz1pf5CkO4z630ay0xGJ9HedahKPZ0Xk3/X0GH+QFYPBWJ5IMTtO30bjfPH0zTaL2vJmMXLBrQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1101.0.tgz"; + sha512 = "7lyVb7GXGl8yyu954Qxf6vU6MrcgFlmKyTLBVXJyo3Phn1OB+qOExA55WtSC6gQiQ7e5TeWOn1RUHLg30ywTBA=="; }; }; "aws-sign2-0.7.0" = { @@ -1768,13 +1768,13 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "convict-6.2.1" = { + "convict-6.2.2" = { name = "convict"; packageName = "convict"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/convict/-/convict-6.2.1.tgz"; - sha512 = "Mn4AJiYkR3TAZH1Xm/RU7gFS/0kM5TBSAQDry8y40Aez0ASY+3boUhv+3QE5XbOXiXM2JjdhkKve3IsBvWCibQ=="; + url = "https://registry.npmjs.org/convict/-/convict-6.2.2.tgz"; + sha512 = "3MsROJiEFN3BAzeFit1t87t7EUFzd44MNd13MLSikV2dsnDl7znwKgtYPPONtnDzxiDW0nBAsxVhSRNrjUrTTg=="; }; }; "cookie-0.4.1" = { @@ -4252,13 +4252,13 @@ let sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; - "micromatch-4.0.4" = { + "micromatch-4.0.5" = { name = "micromatch"; packageName = "micromatch"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"; - sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"; + sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; }; }; "millisecond-0.1.2" = { @@ -4324,13 +4324,13 @@ let sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; - "minimist-1.2.5" = { + "minimist-1.2.6" = { name = "minimist"; packageName = "minimist"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"; + sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; }; "minipass-2.9.0" = { @@ -4351,13 +4351,13 @@ let sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; }; }; - "mkdirp-0.5.5" = { + "mkdirp-0.5.6" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; + sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; }; }; "mkdirp-1.0.4" = { @@ -4504,49 +4504,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.110.0" = { + "n8n-core-0.111.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.110.0"; + version = "0.111.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.110.0.tgz"; - sha512 = "E+BrrAxO1TZbu19NDO66rubih6DNSoUdceM6S9pjtAEQukya9J2BAqnPsrZJ7Trs97W2q8G4wSKP4G6lzKobhQ=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.111.0.tgz"; + sha512 = "fZLLJ60yIuuX+geKGQrO6jk+kxn1UaCJMoWEi2FVE+InTmi+/r51Bv6LGoapoW0Oz+Em+CDq0wE7Yzg3xNx7fw=="; }; }; - "n8n-design-system-0.15.0" = { + "n8n-design-system-0.16.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.15.0.tgz"; - sha512 = "ZHlJJdaZ8ug9OV/SbqdF4FSEqTAoGBO+jqPECcUiYmHbL3BHcY8ZgWcnzmTnIPYTRGtIdc8snv3ti1USgASE5Q=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.16.0.tgz"; + sha512 = "X7Qa+DoXRyJL4gqh7x59udnPIBYAUgDvhchL33dpI/Rgq9gaFajT9eAuOFQnXKMUaL0FZ5hu3rRGcAmwwEA/bA=="; }; }; - "n8n-editor-ui-0.136.0" = { + "n8n-editor-ui-0.137.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.136.0"; + version = "0.137.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.136.0.tgz"; - sha512 = "582dHNfp4upne8IhcaYznSPq26wsruAK5ZmOSfjcQMJqVBOm26IKFXCwn7ZL3KxNznmlHLHTfbAsrjE+ZTKPTA=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.137.0.tgz"; + sha512 = "/wYAIh/3RtVaFxY+vtVEACfo6xsVOi3cEPWd+GSFCK/AMxXs517CNGbwNz54geqaGNUH+rhhUz87C0pG+TgiUg=="; }; }; - "n8n-nodes-base-0.167.0" = { + "n8n-nodes-base-0.168.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.167.0"; + version = "0.168.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.167.0.tgz"; - sha512 = "9+pCjtPDptMO3nBqfizwsQ7+C+QUYPbW4YGT/X0+CaF+2wMkGEbKGADH6V0eWHHWKtzcyoLXqldSnilboXXxmw=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.168.0.tgz"; + sha512 = "TyIL5Gwn+qvfi+1nNkQTPfrJYMqjx2P2OCiDWAMfzahauJyJpfJMYpIEKF3UxoKXCfWpBYPmHVoov6GadEOR1w=="; }; }; - "n8n-workflow-0.92.0" = { + "n8n-workflow-0.93.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.92.0"; + version = "0.93.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.92.0.tgz"; - sha512 = "d16p4co9I6v+AxVOxXyeWAgUY/7PwwlgJFaKH8XTA/fRARah3/DzLdb9Kmq5I1fqtr1VoZ+a1uTQCJi11bnRzA=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.93.0.tgz"; + sha512 = "IqZrnTKdIZD7aeL9/FiwoI7w1WBgeBmqZVXRF+OGtIHooK/lDkHpy17hoXXqAyeATiVf2licgl8F/zMvSsnuJA=="; }; }; "named-placeholders-1.1.2" = { @@ -4693,13 +4693,13 @@ let sha512 = "AtiTVUFHLiiDnMQ43zi0YgkzHOEWUkhDgPlBXrsDzJiJvB29Alo4OKxHQ0ugF3gRqRQIneCLtZU3yiUo7pItZw=="; }; }; - "nodemailer-6.7.2" = { + "nodemailer-6.7.3" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.7.2"; + version = "6.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.2.tgz"; - sha512 = "Dz7zVwlef4k5R71fdmxwR8Q39fiboGbu3xgswkzGwczUfjp873rVxt1O46+Fh0j1ORnAC6L9+heI8uUpO6DT7Q=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.3.tgz"; + sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g=="; }; }; "nopt-4.0.3" = { @@ -6430,22 +6430,22 @@ let sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g=="; }; }; - "ssh2-1.7.0" = { + "ssh2-1.8.0" = { name = "ssh2"; packageName = "ssh2"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2/-/ssh2-1.7.0.tgz"; - sha512 = "u1gdFfqKV1PTGR2szS5FImhFii40o+8FOUpg1M//iimNaS4BkTyUVfVdoydXS93M1SquOU02Z4KFhYDBNqQO+g=="; + url = "https://registry.npmjs.org/ssh2/-/ssh2-1.8.0.tgz"; + sha512 = "NVIRkIwJvWl+mcRozp+EBzHMVCcbDKBea64ToPdZEk43yAVGwmfqYZRPFRnnvGjsKC34wYCmiupTcKgCVNVNNg=="; }; }; - "ssh2-sftp-client-7.2.2" = { + "ssh2-sftp-client-7.2.3" = { name = "ssh2-sftp-client"; packageName = "ssh2-sftp-client"; - version = "7.2.2"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-7.2.2.tgz"; - sha512 = "qZYivU1zezyRomCf+TtsCYVAsc0TDQWzxJMMUN8NknEPonm2TYGxJAzrW8acUh2ILYgA0ZPOJElLV/qp9nRVYQ=="; + url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-7.2.3.tgz"; + sha512 = "Bmq4Uewu3e0XOwu5bnPbiS5KRQYv+dff5H6+85V4GZrPrt0Fkt1nUH+uXanyAkoNxUpzjnAPEEoLdOaBO9c3xw=="; }; }; "sshpk-1.17.0" = { @@ -7579,10 +7579,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.169.0"; + version = "0.170.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.169.0.tgz"; - sha512 = "mqZJUnulA/xNelNxebJeYioQeLtzNSFD8vzEsoxzoVbeaRkXQeC6CVBCldSGUMMSPcw2QchnzAKp9YauRE5cAA=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.170.0.tgz"; + sha512 = "aY4A9+P7K6iinxFyDZl9Jdin283csAbiMStjfxLX5IfO75/aNbjXhSmpjclV9PCUuuTonvoMiVMTvpbCaeImqg=="; }; dependencies = [ (sources."@azure/abort-controller-1.0.5" // { @@ -7642,7 +7642,7 @@ in sources."kuler-2.0.0" ]; }) - sources."@fontsource/open-sans-4.5.6" + sources."@fontsource/open-sans-4.5.8" sources."@icetee/ftp-0.3.15" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" @@ -7694,7 +7694,7 @@ in sources."@types/lodash-4.14.180" sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.21" + sources."@types/node-17.0.23" (sources."@types/node-fetch-2.6.1" // { dependencies = [ sources."form-data-3.0.1" @@ -7763,7 +7763,7 @@ in ]; }) sources."avsc-5.7.3" - (sources."aws-sdk-2.1096.0" // { + (sources."aws-sdk-2.1101.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -7934,7 +7934,7 @@ in }) sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."convict-6.2.1" + sources."convict-6.2.2" sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" @@ -8277,7 +8277,7 @@ in sources."merge-descriptors-1.0.1" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."millisecond-0.1.2" sources."mime-1.6.0" sources."mime-db-1.52.0" @@ -8285,7 +8285,7 @@ in sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.5" + sources."minimist-1.2.6" (sources."minipass-2.9.0" // { dependencies = [ sources."yallist-3.1.1" @@ -8327,19 +8327,19 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.110.0" // { + (sources."n8n-core-0.111.0" // { dependencies = [ sources."qs-6.10.3" ]; }) - sources."n8n-design-system-0.15.0" - sources."n8n-editor-ui-0.136.0" - (sources."n8n-nodes-base-0.167.0" // { + sources."n8n-design-system-0.16.0" + sources."n8n-editor-ui-0.137.0" + (sources."n8n-nodes-base-0.168.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.92.0" + sources."n8n-workflow-0.93.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -8371,14 +8371,14 @@ in sources."node-fetch-2.6.7" (sources."node-pre-gyp-0.11.0" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."rimraf-2.7.1" sources."semver-5.7.1" ]; }) sources."node-ssh-12.0.4" sources."nodeify-1.0.1" - sources."nodemailer-6.7.2" + sources."nodemailer-6.7.3" sources."nopt-4.0.3" sources."normalize-path-3.0.0" sources."npm-bundled-1.1.2" @@ -8643,8 +8643,8 @@ in sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" - sources."ssh2-1.7.0" - sources."ssh2-sftp-client-7.2.2" + sources."ssh2-1.8.0" + sources."ssh2-sftp-client-7.2.3" sources."sshpk-1.17.0" sources."stack-trace-0.0.10" sources."standard-as-callback-2.1.0" @@ -8662,7 +8662,7 @@ in sources."supports-color-7.2.0" (sources."tar-4.4.19" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."yallist-3.1.1" ]; }) From dae89279bb2164e943f8e3eb70f147840650e133 Mon Sep 17 00:00:00 2001 From: skykanin <3789764+skykanin@users.noreply.github.com> Date: Thu, 10 Mar 2022 21:05:08 +0100 Subject: [PATCH 041/163] ani-cli: init at 1.9 --- pkgs/applications/video/ani-cli/default.nix | 44 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/applications/video/ani-cli/default.nix diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix new file mode 100644 index 000000000000..6883587b4b81 --- /dev/null +++ b/pkgs/applications/video/ani-cli/default.nix @@ -0,0 +1,44 @@ +{ fetchFromGitHub +, makeWrapper +, stdenvNoCC +, lib +, gnugrep +, gnused +, curl +, openssl +, mpv +, aria2 +}: + +stdenvNoCC.mkDerivation rec { + pname = "ani-cli"; + version = "1.9"; + + src = fetchFromGitHub { + owner = "pystardust"; + repo = "ani-cli"; + rev = "v${version}"; + sha256 = "sha256-oYiq3Mnuhba5NELJXqVN3gY/d0RfQIqW13YtdcmYKK4="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm755 ani-cli $out/bin/ani-cli + + wrapProgram $out/bin/ani-cli \ + --prefix PATH : ${lib.makeBinPath [ gnugrep gnused curl openssl mpv aria2 ]} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/pystardust/ani-cli"; + description = "A cli tool to browse and play anime"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ skykanin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62a3006dd704..af17dcfd2a98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -190,6 +190,8 @@ with pkgs; ankisyncd = callPackage ../servers/ankisyncd { }; + ani-cli = callPackage ../applications/video/ani-cli { }; + aocd = with python3Packages; toPythonApplication aocd; astrolog = callPackage ../applications/science/astronomy/astrolog { }; From 9f5796be499b061cee78bd7afb747ae8025a5cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 27 Mar 2022 16:48:33 +0200 Subject: [PATCH 042/163] lib/trivial: actually expose warnIfNot and throwIf --- lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index 0e94e821bea5..1f06283790a8 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -66,7 +66,7 @@ let stringLength sub substring tail trace; inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max - importJSON importTOML warn warnIf throwIfNot checkListOfEnum + importJSON importTOML warn warnIf warnIfNot throwIf throwIfNot checkListOfEnum info showWarnings nixpkgsVersion version isInOldestRelease mod compare splitByAndCompare functionArgs setFunctionArgs isFunction toFunction From c5dead21cdbfa0e0185cf79d06cf9e40814eef3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 23 Mar 2022 21:55:19 -0600 Subject: [PATCH 043/163] treewide: cleanup old throw aliases --- pkgs/desktops/xfce/default.nix | 5 --- pkgs/top-level/aliases.nix | 51 ------------------------------- pkgs/top-level/python-aliases.nix | 2 -- 3 files changed, 58 deletions(-) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 1ec4cec5b31d..0205a7226398 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -169,8 +169,6 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4_power_manager = xfce4-power-manager; xfce4_appfinder = xfce4-appfinder; xfce4_dev_tools = xfce4-dev-tools; - xfce4mixer = xfce4-mixer; - xfce4mixer_pulse = xfce4-mixer-pulse; xfce4notifyd = xfce4-notifyd; xfce4taskmanager = xfce4-taskmanager; xfce4terminal = xfce4-terminal; @@ -204,8 +202,6 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4_windowck_plugin = xfce4-windowck-plugin; xfce4_pulseaudio_plugin = xfce4-pulseaudio-plugin; - xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18 - gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17 xfce4-dict-plugin = throw "deprecated 2020-04-19: xfce4-dict-plugin is now part of xfce4-dict."; # added 2020-04-19 # added 2019-11-04 @@ -217,7 +213,6 @@ lib.makeScope pkgs.newScope (self: with self; { xinitrc = xfce4-session.xinitrc; libglade = throw "libglade has been removed"; inherit (pkgs.gnome) gtksourceview; - xfce4-mixer-pulse = xfce4-mixer; thunar-bare = thunar.override { thunarPlugins = []; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b4d2d850bf08..a793fa063f95 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -61,7 +61,6 @@ mapAliases ({ aircrackng = throw "'aircrackng' has been renamed to/replaced by 'aircrack-ng'"; # Converted to throw 2022-02-22 airtame = throw "airtame has been removed due to being unmaintained"; # Added 2022-01-19 aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream"; # Added 2020-11-30 - alienfx = throw "alienfx has been removed"; # Added 2019-12-08 alsaLib = alsa-lib; # Added 2021-06-09 alsaOss = alsa-oss; # Added 2021-06-10 alsaPluginWrapper = alsa-plugins-wrapper; # Added 2021-06-10 @@ -98,11 +97,9 @@ mapAliases ({ bashInteractive_5 = bashInteractive; # Added 2021-08-20 bash_5 = bash; # Added 2021-08-20 bashburn = throw "bashburn has been removed: deleted by upstream"; # Added 2022-01-07 - batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # Added 2019-12-10 bazaar = throw "bazaar has been deprecated by breezy"; # Added 2020-04-19 bazaarTools = throw "bazaar has been deprecated by breezy"; # Added 2020-04-19 bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22 - beegfs = throw "beegfs has been removed"; # Added 2019-11-24 beret = throw "beret has been removed"; # Added 2021-11-16 bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07 bitbucket-cli = throw "bitbucket-cli has been removed: abandoned by upstream"; # Added 2022-03-21 @@ -110,7 +107,6 @@ mapAliases ({ blastem = throw "blastem has been removed from nixpkgs as it would still require python2"; # Added 2022-01-01 bluezFull = bluez; # Added 2019-12-03 bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # Added 2020-12-10 - bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # Added 2019-12-10 bpftool = bpftools; # Added 2021-05-03 brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24 bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22 @@ -153,9 +149,7 @@ mapAliases ({ checkbashism = throw "'checkbashism' has been renamed to/replaced by 'checkbashisms'"; # Converted to throw 2022-02-22 chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15 chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07 - cide = throw "cide was deprecated on 2019-09-11: abandoned by upstream"; cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22 - cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # Added 2019-12-10 ckb = throw "'ckb' has been renamed to/replaced by 'ckb-next'"; # Converted to throw 2022-02-22 callPackage_i686 = pkgsi686Linux.callPackage; creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01 @@ -184,8 +178,6 @@ mapAliases ({ concurrencykit = libck; # Added 2021-03 conntrack_tools = throw "'conntrack_tools' has been renamed to/replaced by 'conntrack-tools'"; # Converted to throw 2022-02-22 cool-old-term = throw "'cool-old-term' has been renamed to/replaced by 'cool-retro-term'"; # Converted to throw 2022-02-22 - coprthr = throw "coprthr has been removed"; # Added 2019-12-08 - coredumper = throw "coredumper has been removed: abandoned by upstream"; # Added 2019-11-16 corsmisc = throw "corsmisc has been removed (upstream is gone)"; # Added 2022-01-24 couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 @@ -248,7 +240,6 @@ mapAliases ({ deisctl = throw "deisctl was removed ; the service does not exist anymore"; # added 2022-02-06 deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06 deltachat-electron = deltachat-desktop; # added 2021-07-18 - diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # Added 2019-12-10 deluge-1_x = throw '' Deluge 1.x (deluge-1_x) is no longer supported. @@ -337,7 +328,6 @@ mapAliases ({ firefox-esr-wrapper = throw "'firefox-esr-wrapper' has been renamed to/replaced by 'firefox-esr'"; # Converted to throw 2022-02-22 firefoxWrapper = throw "'firefoxWrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 firefox-wrapper = throw "'firefox-wrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 - firestr = throw "firestr has been removed"; # Added 2019-12-08 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # Added 2020-12-29, modified 2021-01-10 flameGraph = throw "'flameGraph' has been renamed to/replaced by 'flamegraph'"; # Converted to throw 2022-02-22 @@ -352,10 +342,6 @@ mapAliases ({ fme = throw "fme was removed, because it is old and uses Glade, a discontinued library"; # Added 2022-01-26 foldingathome = fahclient; # Added 2020-09-03 font-awesome-ttf = throw "'font-awesome-ttf' has been renamed to/replaced by 'font-awesome'"; # Converted to throw 2022-02-22 - fontconfig-ultimate = throw '' - fontconfig-ultimate has been removed. The repository has been archived upstream and activity has ceased for several years. - https://github.com/bohoomil/fontconfig-ultimate/issues/171. - ''; # Added 2019-10-31 fontconfig-penultimate = throw '' fontconfig-penultimate has been removed. @@ -412,7 +398,6 @@ mapAliases ({ gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15 gnome-themes-standard = throw "'gnome-themes-standard' has been renamed to/replaced by 'gnome-themes-extra'"; # Converted to throw 2022-02-22 gnome_user_docs = gnome-user-docs; # Added 2019-11-20 - gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries"; # Added 2019-12-10 gnome_doc_utils = throw "'gnome_doc_utils' has been renamed to/replaced by 'gnome-doc-utils'"; # Converted to throw 2022-02-22 gnome_themes_standard = throw "'gnome_themes_standard' has been renamed to/replaced by 'gnome-themes-standard'"; # Converted to throw 2022-02-22 @@ -463,7 +448,6 @@ mapAliases ({ gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22 gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22 gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01 - gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10 guileCairo = throw "'guileCairo' has been renamed to/replaced by 'guile-cairo'"; # Converted to throw 2022-02-22 guile-gnome = throw "guile-gnome has been removed"; # Added 2022-01-16 guileGnome = throw "guile-gnome has been removed"; # Added 2022-01-16 @@ -485,7 +469,6 @@ mapAliases ({ heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22 heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06 hepmc = hepmc2; # Added 2019-08-05 - hexen = throw "hexen (SDL port) has been removed: abandoned by upstream"; # Added 2019-12-11 hicolor_icon_theme = throw "'hicolor_icon_theme' has been renamed to/replaced by 'hicolor-icon-theme'"; # Converted to throw 2022-02-22 holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01 htmlTidy = throw "'htmlTidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22 @@ -523,7 +506,6 @@ mapAliases ({ jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15 jbuilder = throw "'jbuilder' has been renamed to/replaced by 'dune_1'"; # Converted to throw 2022-02-22 jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version"; # Added 2021-04-26 - jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; joseki = throw "'joseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 journalbeat7 = throw "journalbeat has been removed upstream. Use filebeat with the journald input instead"; @@ -554,7 +536,6 @@ mapAliases ({ kerberos = libkrb5; # moved from top-level 2021-03-14 kexectools = kexec-tools; # Added 2021-09-03 keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22 - keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived"; # Added 2019-12-10 keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14 kgx = gnome-console; # Added 2022-02-19 kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 @@ -597,9 +578,6 @@ mapAliases ({ libgpgerror = libgpg-error; # Added 2021-09-04 libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # Added 2022-01-21 libgumbo = throw "'libgumbo' has been renamed to/replaced by 'gumbo'"; # Converted to throw 2022-02-22 - libindicate = throw "libindacate has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 - libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 - libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14 libjpeg_drop = libjpeg_original; # Added 2020-06-05 libjson_rpc_cpp = throw "'libjson_rpc_cpp' has been renamed to/replaced by 'libjson-rpc-cpp'"; # Converted to throw 2022-02-22 @@ -617,7 +595,6 @@ mapAliases ({ libressl_3_2 = throw "'libressl_3_2' has reached end-of-life "; # Added 2022-03-19 librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 libseat = seatd; # Added 2021-06-24 - libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it"; # Added 2019-12-10 libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used"; # Added 2020-06-22 libsysfs = throw "'libsysfs' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22 libtidy = throw "'libtidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22 @@ -730,9 +707,7 @@ mapAliases ({ matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 matrique = spectral; # Added 2020-01-27 - mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # Added 2019-12-08 mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # Added 2020-05-23 - mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # Added 2019-12-10, modified 2020-11-25 mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04 meme = meme-image-generator; # Added 2021-04-21 memtest86 = throw "'memtest86' has been renamed to/replaced by 'memtest86plus'"; # Converted to throw 2022-02-22 @@ -747,7 +722,6 @@ mapAliases ({ minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14 - mirage = throw "mirage has been removed from nixpkgs, as it's unmaintained"; # Added 2019-12-10 mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # Added 2020-08-15 mlt-qt5 = throw "'mlt-qt5' has been renamed to/replaced by 'libsForQt5.mlt'"; # Converted to throw 2022-02-22 mobile_broadband_provider_info = throw "'mobile_broadband_provider_info' has been renamed to/replaced by 'mobile-broadband-provider-info'"; # Converted to throw 2022-02-22 @@ -772,9 +746,6 @@ mapAliases ({ mysql-client = hiPrio mariadb.client; mysql = mariadb; # moved from top-level 2021-03-14 - # NOTE: 2018-07-12: legacy alias: - # grsecurity business is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ - # floating point textures patents are expired, # so package reduced to alias mesa_drivers = mesa.drivers; @@ -826,7 +797,6 @@ mapAliases ({ nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15 now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # Added 2021-08-05 nxproxy = throw "'nxproxy' has been renamed to/replaced by 'nx-libs'"; # Converted to throw 2022-02-22 - nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream"; ### O ### @@ -834,7 +804,6 @@ mapAliases ({ OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16 OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16 oauth2_proxy = oauth2-proxy; # Added 2021-04-18 - oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream"; # Added 2019-12-10 octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set"; # Added 2021-01-24 ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # Added 2021-07-12 ofp = throw "ofp is not compatible with odp-dpdk"; @@ -854,7 +823,6 @@ mapAliases ({ opensans-ttf = throw "'opensans-ttf' has been renamed to/replaced by 'open-sans'"; # Converted to throw 2022-02-22 openssh_with_kerberos = throw "'openssh_with_kerberos' has been renamed to/replaced by 'openssh'"; # Converted to throw 2022-02-22 orchis = orchis-theme; # Added 2021-06-09 - osquery = throw "osquery has been removed"; # Added 2019-11-24 osxfuse = macfuse-stubs; # Added 2021-03-20 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02 owncloudclient = throw "'owncloudclient' has been renamed to/replaced by 'owncloud-client'"; # Converted to throw 2022-02-22 @@ -977,16 +945,12 @@ mapAliases ({ tlauncher = throw "tlauncher has been removed because there questionable practices and legality concerns"; tsearch_extras = postgresqlPackages.tsearch_extras; - phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed"; # Added 2019-11-22 - phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed"; # Added 2019-11-22 - phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed"; # Added 2019-11-22 pinentry_curses = pinentry-curses; # Added 2019-10-14 pinentry_emacs = pinentry-emacs; # Added 2019-10-14 pinentry_gnome = pinentry-gnome; # Added 2019-10-14 pinentry_gtk2 = pinentry-gtk2; # Added 2019-10-14 pinentry_qt = pinentry-qt; # Added 2019-10-14 pinentry_qt5 = pinentry-qt; # Added 2020-02-11 - pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package"; # Added 2019-12-10 privateer = throw "privateer was removed because it was broken"; # Added 2021-05-18 processing3 = processing; # Added 2019-08-16 procps-ng = throw "'procps-ng' has been renamed to/replaced by 'procps'"; # Converted to throw 2022-02-22 @@ -1023,7 +987,6 @@ mapAliases ({ qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02 qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02 qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15 - qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # Added 2019-12-10 qt5ct = libsForQt5.qt5ct; # Added 2021-12-27 qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04 @@ -1040,13 +1003,11 @@ mapAliases ({ radare2-cutter = cutter; # Added 2021-03-30 raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # Added 2020-12-24 rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2"; # Added 2022-01-01 - rdf4store = throw "rdf4store has been removed from nixpkgs"; # Added 2019-12-21 rdiff_backup = throw "'rdiff_backup' has been renamed to/replaced by 'rdiff-backup'"; # Converted to throw 2022-02-22 rdmd = throw "'rdmd' has been renamed to/replaced by 'dtools'"; # Converted to throw 2022-02-22 readline5 = throw "readline-5 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20 readline62 = throw "readline-6.2 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20 readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # Added 2021-04-22 - recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10 redkite = throw "redkite was archived by upstream"; # Added 2021-04-12 redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25 renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2"; # Added 2022-01-12 @@ -1099,7 +1060,6 @@ mapAliases ({ scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07 sdlmame = mame; # Added 2019-10-30 seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 - seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)"; sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22 shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15 @@ -1113,8 +1073,6 @@ mapAliases ({ skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired"; # Added 2020-10-31 slack-dark = slack; # Added 2020-03-27 slic3r-prusa3d = throw "'slic3r-prusa3d' has been renamed to/replaced by 'prusa-slicer'"; # Converted to throw 2022-02-22 - slim = throw "slim has been removed. Please use a different display-manager"; # Added 2019-11-11 - slimThemes = throw "slimThemes has been removed because slim has been also"; # Added 2019-11-11 slurm-full = throw "'slurm-full' has been renamed to/replaced by 'slurm'"; # Converted to throw 2022-02-22 slurm-llnl = slurm; # renamed July 2017 slurm-llnl-full = slurm-full; # renamed July 2017 @@ -1152,7 +1110,6 @@ mapAliases ({ spice_protocol = throw "'spice_protocol' has been renamed to/replaced by 'spice-protocol'"; # Converted to throw 2022-02-22 spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011"; # added 2021-05-03 spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead"; # Added 2021-03-21 - spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead"; # Added 2019-10-16 spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead"; # Added 2021-03-21 spidermonkey_68 = throw "spidermonkey_68 has been removed. Please use spidermonkey_91 instead"; # added 2022-01-04 # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell @@ -1260,12 +1217,10 @@ mapAliases ({ usb_modeswitch = throw "'usb_modeswitch' has been renamed to/replaced by 'usb-modeswitch'"; # Converted to throw 2022-02-22 usbguard-nox = usbguard; # Added 2019-09-04 utillinux = util-linux; # Added 2020-11-24 - uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries"; ### V ### v4l_utils = v4l-utils; # Added 2019-08-07 - v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages"; vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists"; varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26 @@ -1275,8 +1230,6 @@ mapAliases ({ vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05 vimbWrapper = throw "'vimbWrapper' has been renamed to/replaced by 'vimb'"; # Converted to throw 2022-02-22 - vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed"; # Added 2019-12-05 - vimprobable2-unwrapped = vimprobable2; # Added 2019-12-05 virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # Added 2021-07-21 virtuoso = throw "virtuoso has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-15 virtmanager = virt-manager; # Added 2019-10-29 @@ -1291,8 +1244,6 @@ mapAliases ({ way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13 webbrowser = throw "webbrowser was removed because it's unmaintained upstream and was marked as broken in nixpkgs for over a year"; # Added 2022-03-21 webkit = throw "'webkit' has been renamed to/replaced by 'webkitgtk'"; # Converted to throw 2022-02-22 - webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk"; # Added 2019-12-05 - webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk"; # Added 2019-12-05 weechat-matrix-bridge = throw "'weechat-matrix-bridge' has been renamed to/replaced by 'weechatScripts.weechat-matrix-bridge'"; # Converted to throw 2022-02-22 whirlpool-gui = throw "whirlpool-gui has been removed as it depended on an insecure version of Electron"; # added 2022-02-08 wicd = throw "wicd has been removed as it is abandoned"; # Added 2021-09-11 @@ -1302,10 +1253,8 @@ mapAliases ({ wineStaging = throw "'wineStaging' has been renamed to/replaced by 'wine-staging'"; # Converted to throw 2022-02-22 wineUnstable = throw "'wineUnstable' has been renamed to/replaced by 'winePackages.unstable'"; # Converted to throw 2022-02-22 wineWayland = wine-wayland; - winswitch = throw "winswitch has been removed from nixpkgs"; # Added 2019-12-10 winusb = throw "'winusb' has been renamed to/replaced by 'woeusb'"; # Converted to throw 2022-02-22 wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22 - wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead"; # Added 2019-11-18 wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31 ### X ### diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4718d942d8ee..0abf2b589864 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -37,7 +37,6 @@ mapAliases ({ asyncio-nats-client = nats-py; # added 2022-02-08 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 - bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # added 2019-11-27 carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 class-registry = phx-class-registry; # added 2021-10-05 ConfigArgParse = configargparse; # added 2021-03-18 @@ -120,7 +119,6 @@ mapAliases ({ tensorflow-build_2 = tensorflow-build; # added 2021-11-25 tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 - topydo = throw "topydo was moved to pkgs.topydo"; # added 2017-09-22 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 websocket_client = websocket-client; # added 2021-06-15 From a8ef08b624e780ed150c7a74f81af0876ff0e186 Mon Sep 17 00:00:00 2001 From: David Knaack Date: Sun, 27 Mar 2022 17:22:43 +0200 Subject: [PATCH 044/163] starship: use system libgit2 --- pkgs/tools/misc/starship/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 01d25560ab7c..a27674290d67 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -4,6 +4,8 @@ , rustPlatform , installShellFiles , libiconv +, libgit2 +, pkg-config , nixosTests , Security , Foundation @@ -20,9 +22,9 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-mqUE4JzNBhvtDpT2LM23eHX8q93wtPqA+/zr/PxEDiE="; }; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security Foundation ]; + buildInputs = [ libgit2 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation ]; postInstall = '' for shell in bash fish zsh; do From a3954182ba44ea70d6e6e782e5787884e05d857e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sat, 26 Mar 2022 23:49:40 -0600 Subject: [PATCH 045/163] nixos/gnome: change telepathy service from default true to default false --- nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ nixos/modules/services/x11/desktop-managers/gnome.nix | 1 - 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index a820ec10b82b..89f2091f123e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -690,6 +690,13 @@ before, you will need to have it enabled using GSettings. + + + services.telepathy will no longer be + enabled by default for GNOME desktops, one should enable it in + their configs if using Empathy or Polari. + + If you previously used diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 5425841c9de2..37ed92bb729d 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -279,6 +279,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.gnome.experimental-features.realtime-scheduling` option has been removed, as GNOME Shell now [uses rtkit](https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2060). Use `security.rtkit.enable = true;` instead. As before, you will need to have it enabled using GSettings. +- `services.telepathy` will no longer be enabled by default for GNOME desktops, one should enable it in their configs if using Empathy or Polari. + - If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`. - Ntopng (`services.ntopng`) is updated to 5.2.1 and uses a separate Redis instance if `system.stateVersion` is at least `22.05`. Existing setups shouldn't be affected. diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 4a54de5e766e..b308ed736ff8 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -386,7 +386,6 @@ in services.gnome.rygel.enable = mkDefault true; services.gvfs.enable = true; services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); - services.telepathy.enable = mkDefault true; systemd.packages = with pkgs.gnome; [ gnome-session From 595f7a5a766b3dddfd272a1f3482a43098adafe2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Mar 2022 15:33:34 +0000 Subject: [PATCH 046/163] python310Packages.nocasedict: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/nocasedict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index a9cb021a8413..982f2abe880d 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "nocasedict"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "86e2dae49e34de7c31b65b486c8f9aa58b66dc2e8ee9b34c390c6c58885c85a0"; + sha256 = "sha256-giC5e6BrCOst7e13TEBsd+DKDVNSrnEkn2+dHyoXvXs="; }; checkInputs = [ From a87f6f9b909134e98ebbc324308f5d3afac08490 Mon Sep 17 00:00:00 2001 From: ash Date: Sun, 27 Mar 2022 15:19:30 +0100 Subject: [PATCH 047/163] eiciel: init at 0.9.13.1 --- pkgs/tools/filesystems/eiciel/default.nix | 56 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/tools/filesystems/eiciel/default.nix diff --git a/pkgs/tools/filesystems/eiciel/default.nix b/pkgs/tools/filesystems/eiciel/default.nix new file mode 100644 index 000000000000..1e676dea77c7 --- /dev/null +++ b/pkgs/tools/filesystems/eiciel/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, stdenv +, acl +, gnome +, gtkmm3 +, meson +, ninja +, pkg-config +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "eiciel"; + version = "0.9.13.1"; + + outputs = [ "out" "nautilusExtension" ]; + + src = fetchFromGitHub { + owner = "rofirrim"; + repo = "eiciel"; + rev = version; + sha256 = "0rhhw0h1hyg5kvxhjxkdz03vylgax6912mg8j4lvcz6wlsa4wkvj"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + acl + gtkmm3 + gnome.nautilus + ]; + + mesonFlags = [ + "-Dnautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-3.0" + ]; + + postPatch = '' + substituteInPlace meson.build --replace "compiler.find_library('libacl')" "compiler.find_library('acl')" + chmod +x img/install_icons.sh + patchShebangs img/install_icons.sh + ''; + + meta = with lib; { + description = "Graphical editor for ACLs and extended attributes"; + homepage = "https://rofi.roger-ferrer.org/eiciel/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ sersorrel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d69ddef73cc7..c8f4433669d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33310,6 +33310,8 @@ with pkgs; dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; + eiciel = callPackage ../tools/filesystems/eiciel { }; + emu2 = callPackage ../applications/emulators/emu2 { }; apt = callPackage ../tools/package-management/apt { }; From c951914f43c4f7cabcd633a2d6b10ba4f85406a2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Mar 2022 17:40:34 +0200 Subject: [PATCH 048/163] stellarium: 0.21.3 -> 0.22.0 ChangeLog: https://github.com/Stellarium/stellarium/releases/tag/v0.22.0 --- .../applications/science/astronomy/stellarium/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 0963b4c17e02..7b5f28fbd848 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,25 +1,25 @@ { stdenv, lib, mkDerivation, fetchFromGitHub , cmake, freetype, libpng, libGLU, libGL, openssl, perl, libiconv -, qtscript, qtserialport, qttools +, qtscript, qtserialport, qttools, qtcharts , qtmultimedia, qtlocation, qtbase, wrapQtAppsHook }: mkDerivation rec { pname = "stellarium"; - version = "0.21.3"; + version = "0.22.0"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "sha256-TQMLy5ziBF7YqPDzPwgjY5FHxxMUe7MXo/TGxQ1nGcg="; + sha256 = "sha256-scG/SS9emEmrZunv6n3Vzcchoh0Cf9rDOkuxAMnxNk4="; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; buildInputs = [ freetype libpng libGLU libGL openssl libiconv qtscript qtserialport qttools - qtmultimedia qtlocation qtbase + qtmultimedia qtlocation qtbase qtcharts ]; preConfigure = lib.optionalString stdenv.isDarwin '' From b53ee0c6eb7b9b07224477f892b5474222d8d910 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 27 Mar 2022 17:48:45 +0200 Subject: [PATCH 049/163] bind: add meta.changelog --- pkgs/servers/dns/bind/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 81722805e273..9dbaa744b30f 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { homepage = "https://www.isc.org/bind/"; description = "Domain name server"; license = licenses.mpl20; - + changelog = "https://downloads.isc.org/isc/bind9/cur/${lib.versions.majorMinor version}/CHANGES"; maintainers = with maintainers; [ globin ]; platforms = platforms.unix; From f17d854d1eec287dc5018849c3b25ac77e064762 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Mar 2022 15:50:21 +0000 Subject: [PATCH 050/163] python310Packages.nocaselist: 1.0.4 -> 1.0.5 --- pkgs/development/python-modules/nocaselist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index e7947eba92ae..5fc6bd6f8e66 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "nocaselist"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "73a9c0659e7135c66e46a6ab06e2cb637ce9248d73c690ebd31afb72a4e03ac0"; + sha256 = "sha256-4cEsoq6dNFs0lI8sj2DjiUYZ4r4u0otOzF5/HeoRfR0="; }; checkInputs = [ From 1207aa204ea33a009c78cb2e9438a8164f55145a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 27 Mar 2022 10:07:13 -0600 Subject: [PATCH 051/163] gnome-user-share: add upstream meson >= 0.61 patch --- pkgs/desktops/gnome/core/gnome-user-share/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/gnome/core/gnome-user-share/default.nix b/pkgs/desktops/gnome/core/gnome-user-share/default.nix index bab13a6ccd19..4c33b76b0124 100644 --- a/pkgs/desktops/gnome/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome/core/gnome-user-share/default.nix @@ -35,6 +35,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/gnome-user-share/commit/8772980d4732c15505b15dccff2ca3c97e96d49d.patch"; sha256 = "03clzhrx72pq1cbmg2y24hvw4i1xsvrg9ip113fi5bc3w4gcji7p"; }) + # fix compilation with meson >=0.61 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-user-share/-/commit/c31b0a8f33b95c0077cd5ee2102a71a49bee8abe.patch"; + hash = "sha256-kH+cPBmSErWxsw+IyyjWgENi4I3ZcKjSA9+em8u4DYs="; + }) ]; postPatch = '' From 52aa495303a72cd14991ae612215b991be2c2a87 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 27 Mar 2022 19:47:48 +0300 Subject: [PATCH 052/163] maintainers/scripts/remove-old-aliases.py: add option to only operate on throws --- maintainers/scripts/remove-old-aliases.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/maintainers/scripts/remove-old-aliases.py b/maintainers/scripts/remove-old-aliases.py index 8ed326cbc204..c5629c829594 100755 --- a/maintainers/scripts/remove-old-aliases.py +++ b/maintainers/scripts/remove-old-aliases.py @@ -28,6 +28,11 @@ def process_args() -> argparse.Namespace: default=1, help="operate on aliases older than $year-$month", ) + arg_parser.add_argument( + "--only-throws", + action="store_true", + help="only operate on throws. e.g remove throws older than $date", + ) arg_parser.add_argument("--file", required=True, type=Path, help="alias file") arg_parser.add_argument( "--dry-run", action="store_true", help="don't modify files, only print results" @@ -36,7 +41,7 @@ def process_args() -> argparse.Namespace: def get_date_lists( - txt: list[str], cutoffdate: datetimedate + txt: list[str], cutoffdate: datetimedate, only_throws: bool ) -> tuple[list[str], list[str], list[str]]: """get a list of lines in which the date is older than $cutoffdate""" date_older_list: list[str] = [] @@ -57,7 +62,11 @@ def get_date_lists( except ValueError: continue - if my_date is None or my_date > cutoffdate or "preserve, reason:" in line.lower(): + if ( + my_date is None + or my_date > cutoffdate + or "preserve, reason:" in line.lower() + ): continue if "=" not in line: @@ -67,7 +76,7 @@ def get_date_lists( print(f"RESOLVE MANUALLY {line}") elif "throw" in line: date_older_throw_list.append(line) - else: + elif not only_throws: date_older_list.append(line) return ( @@ -160,6 +169,7 @@ def main() -> None: """main""" args = process_args() + only_throws = args.only_throws aliasfile = Path(args.file).absolute() cutoffdate = (datetime.strptime(f"{args.year}-{args.month}-01", "%Y-%m-%d")).date() @@ -170,13 +180,12 @@ def main() -> None: date_older_throw_list: list[str] = [] date_older_list, date_sep_line_list, date_older_throw_list = get_date_lists( - txt, cutoffdate + txt, cutoffdate, only_throws ) converted_to_throw: list[tuple[str, str]] = [] - converted_to_throw = convert_to_throw(date_older_list) - if date_older_list: + converted_to_throw = convert_to_throw(date_older_list) print(" Will be converted to throws. ".center(100, "-")) for l_n in date_older_list: print(l_n) From e5132de7db8730b08d64380d01f2bc29cfe863ce Mon Sep 17 00:00:00 2001 From: Hernawan Faiz Abdillah Date: Sun, 6 Mar 2022 14:45:41 +0700 Subject: [PATCH 053/163] rhythmbox: fix python plugin PYTHONPATH --- pkgs/applications/audio/rhythmbox/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 4898648599c3..2f35f1fe65ca 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -10,6 +10,7 @@ , libnotify , libdmapsharing , gnome +, gobject-introspection , totem-pl-parser , tdb , json-glib @@ -65,6 +66,9 @@ in stdenv.mkDerivation rec { totem-pl-parser gnome.adwaita-icon-theme + gobject-introspection + python3.pkgs.pygobject3 + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -83,6 +87,12 @@ in stdenv.mkDerivation rec { "--with-libsecret" ]; + preFixup = '' + gappsWrapperArgs+=( + --prefix PYTHONPATH : "${python3.pkgs.pygobject3}/${python3.sitePackages}:$out/lib/rhythmbox/plugins/" + ) + ''; + enableParallelBuilding = true; passthru = { From 069fd78e321b6a293c2221fd28c269ca2780f355 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 25 Mar 2022 16:20:24 +0100 Subject: [PATCH 054/163] nheko: 0.9.2 -> 0.9.3 --- .../networking/instant-messengers/nheko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 080ceda94b4a..750511ebf152 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -33,13 +33,13 @@ mkDerivation rec { pname = "nheko"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "sha256-roC1OIq0Vmj5rABNtH4IOMHX9aSlOMFC7ZHueuj/PmE="; + sha256 = "sha256-h1Yahz7Rt7+r55RFTSVj6E14nWnjCs0CecljceaWgaQ="; }; nativeBuildInputs = [ From 50bb412f5bedf5280f375d772e4f087054346ecc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Mar 2022 17:04:14 +0000 Subject: [PATCH 055/163] python310Packages.panel: 0.12.6 -> 0.12.7 --- pkgs/development/python-modules/panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index c5da10a30b07..48247112d958 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "panel"; - version = "0.12.6"; + version = "0.12.7"; format = "wheel"; @@ -23,7 +23,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-ARAbBM0QYZlZqV51lMRoEZEQH1jlHRhlon3nfTi7dnM="; + hash = "sha256-VcoMGYT48WduyuyTB/4KJybT/pBKV0hB1pSpZGagAeA="; }; propagatedBuildInputs = [ From 4a1b37d60106d9328a3c856fc9116930744dbdae Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 27 Mar 2022 19:17:32 +0200 Subject: [PATCH 056/163] gmailctl: add comment why unstable is tracked --- pkgs/applications/networking/gmailctl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index 579b945ee37e..9fc1e25a92d7 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -6,6 +6,8 @@ buildGoModule rec { pname = "gmailctl"; + # on an unstable version because of https://github.com/mbrt/gmailctl/issues/232 + # and https://github.com/mbrt/gmailctl/commit/484bb689866987580e0576165180ef06375a543f version = "unstable-2022-03-24"; src = fetchFromGitHub { From 882ecdce35dc3d9c61bc9f6ef883bfe2d817d878 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 16 Mar 2022 18:06:14 +0100 Subject: [PATCH 057/163] electrum: 4.1.5 -> 4.2.1 --- pkgs/applications/misc/electrum/default.nix | 39 +++------------------ 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 29a129192960..f9ef802ce422 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -21,7 +21,7 @@ }: let - version = "4.1.5"; + version = "4.2.1"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -37,7 +37,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "1ps8yaps5kfd7yv7bpdvssbwm6f5qivxcvhwn17cpddc2760a7nk"; + sha256 = "sha256-BoikYSsQZAv8WswIr5nmBsGmjZbTXaLAbdO2QtPvc7c="; extraPostFetch = '' mv $out ./all @@ -45,19 +45,6 @@ let ''; }; - py = python3.override { - packageOverrides = self: super: { - - aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec { - version = "0.18.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0"; - }; - }); - }; - }; - in python3.pkgs.buildPythonApplication { @@ -66,7 +53,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "188r4zji985z8pm9b942xhmvv174yndk6jxagxl7ljk03wl2wiwi"; + sha256 = "sha256-2SxSTH9P380j2KaCbkXjgmQO7K2z81AG6PMA/EMggXA="; }; postUnpack = '' @@ -74,27 +61,9 @@ python3.pkgs.buildPythonApplication { cp -ar ${tests} $sourceRoot/electrum/tests ''; - postPatch = '' - substituteInPlace contrib/requirements/requirements.txt \ - --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" - - # according to upstream, this is fine - # https://github.com/spesmilo/electrum/issues/7361 - substituteInPlace contrib/requirements/requirements.txt \ - --replace "qdarkstyle<2.9" "qdarkstyle>=2.7" - ''; - - patches = [ - # trezorlib 0.13 compatibility - (fetchpatch { - url = "https://github.com/spesmilo/electrum/commit/97e61cfacdca374103e4184f0f9a07a0c5757afb.patch"; - sha256 = "sha256-RGVBO9IskC+lQOHNGjrqH6EM/inNPJlcD9sSWedyT5E="; - }) - ]; - nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiohttp aiohttp-socks aiorpcx From c71aaa5c84502e3703779312911e501c75e58755 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Mar 2022 17:50:50 +0000 Subject: [PATCH 058/163] php74Packages.phpstan: 1.4.10 -> 1.5.0 --- pkgs/development/php-packages/phpstan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index af889e10fa7f..fccb3886af15 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "1.4.10"; + version = "1.5.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-KFGxvk95Zx1bONyDkZsJP7VRzrInSfN2R5Nk3waYz1w="; + sha256 = "sha256-dgsBpFnolIMrSwNHZ9+mSW1zMJ/RbvYIWBUksDiYeqE="; }; dontUnpack = true; From c22627a866dd32137fb9e717ebd2ce5cafe944ca Mon Sep 17 00:00:00 2001 From: "\"Minijackson\"" <"minijackson@riseup.net"> Date: Sun, 27 Mar 2022 19:59:14 +0200 Subject: [PATCH 059/163] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 486 +++++++++--------- 1 file changed, 243 insertions(+), 243 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 10ecd55bcaef..6be129fe11d2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-03-19"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "7566440e339af515f47b28f9e82fe63d58883082"; - sha256 = "06ybma15xba2fbb9068lzc04p3sqj1mzgf77v4xvdcym4rc8nccf"; + rev = "b9f6067529ef123b8ace705ea356869f66aad320"; + sha256 = "1wcdshvq2nw1dx8xxzplvq519bzzb3qgf7lh0sqafjd19nzgwiji"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-03-20"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "5c7019f394588bdc29d7573f5063198c2803dfe4"; - sha256 = "1cb80msbhmh03ibxf95scgrpl3awj1i2mc3caj38nqpymn8kfyqy"; + rev = "80dcd648d389965603246c2c5a4554e3e4aa184c"; + sha256 = "1a38q83sgv13aw3iy40mjzkg1wsc5zmf5mmkjqpdcgv5aixyb8m5"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -437,12 +437,12 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2021-12-18"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "1c59b784c53afaf7b9ca63186da99e5d46e3e429"; - sha256 = "0zq261nv2jzhqqzaldr5l6dlriyy23zv8rsn3k7fg91q3vjawn4i"; + rev = "05f9b2831abc693996b335494337b88e616e9eed"; + sha256 = "09a5r51k8926v51ma45jfqqwwjnk52yy5ql9swmrxnvnrdsjah3p"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -533,12 +533,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-03-22"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "6096305ca7a63e05b9c9355f42fc00a9a467e3a3"; - sha256 = "05z9qw51x5gh3vw1nlgkip90igw33cq8h684c5gnf10rqyc1c9sv"; + rev = "e9606bfa350f277d54a61742d560e6122dc4d32c"; + sha256 = "1vyg48ghr8fd15fh41pk5qlgngdqkw8gwhkkyq9hbvs2mxw8x80c"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -881,12 +881,12 @@ final: prev: cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; - version = "2022-01-02"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "d6f837f4e8fe48eeae288e638691b91b97d1737f"; - sha256 = "0cmfjqps7j3056y8avkrfz40kx8qcdxf4v1xvfv03nrw9xdwwh5y"; + rev = "85f2767842a35064f61128b71b8dab1e38c413c4"; + sha256 = "13s04x9vx3n854q9abb0knls5aycxigbwqgllfmp2xgaycgxqksa"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; @@ -965,12 +965,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-03-21"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "8e27595afad82e56a659257896de85072447703c"; - sha256 = "1jcw2n1j8bjs1x3y0jxh8gajkir2xnncmk6zx8360fm28y6lc90s"; + rev = "16e74f9b31d20b8dfc8933132beed4c175d824ea"; + sha256 = "0nrfm8517fz31qrg0gfh888q7wcbxxkbpcp39ycvwkdfxpq1bzwr"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1038,12 +1038,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-03-20"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "8a2b2f3b302e3a35184b1107dfb3781aa76e442a"; - sha256 = "1sh0ilkddf8kfhp6fnq5br4yqaqk2g0nm3bz5xdwrf5jmphr4mi0"; + rev = "03b2a8f81102f2994f4888760e0f08385d841c3f"; + sha256 = "1ilzpdyis41p1x6wbkavjpva5hvxclagw6hjn76vpmwibnz99pfy"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1230,24 +1230,24 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-03-22"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "d8767f5dd617ae5a97a68c50342e85f482e85492"; - sha256 = "0wfd3ya71d3059p7hskf69rn1c2x9ysfvfgk6k05ah4m7finsh6p"; + rev = "ad255350b66809d4af3aae75f4fb4dd576a06ab4"; + sha256 = "17l6ajaj03d5v8abi8m754ypqwhz1nw232n15y8av15ll0pb7gk0"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-03-21"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "f88e1b425d96b331a5375d6e35c741abdedc858d"; - sha256 = "1r4fbz8xzk331blizh8i4fkls3cyli9pzms6xnqksjgik2mbsh37"; + rev = "7a1cb8fb1cbdf136bba50a22ddcc056e83dc435c"; + sha256 = "0jj966bansbfzbhbfgyqciis36s7z46n9n8ihy2m7vxynibbf9yp"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1350,12 +1350,12 @@ final: prev: ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp.vim"; - version = "2022-03-22"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "8150fdd845a8c26326ceb9418d054370863e826c"; - sha256 = "0y9x39jjw8bk3vnwcvpr6s3nxmdhs30z982fxm6g5i7ksa7wj2v4"; + rev = "40ee62ef9b415da647618b08d1b28d19180a22eb"; + sha256 = "1f73gfbc59lx36xfdh2y6fcan2ia59m9vx1bjq32hj987iw2wxhy"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; @@ -1796,24 +1796,24 @@ final: prev: dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2022-03-21"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "d552ad035c041a75e9d284adf2099f5bdea5d293"; - sha256 = "0024igmd05zc84ya08zms7m0nmdrah1ahvmdpfm056nmkw77phhn"; + rev = "d7723a842a6cfa2f62cf85530ab66eb418521dc2"; + sha256 = "1qzil8rwpdzf64gq63ds0cf509ldam77l3fz02g1mia5dry75r02"; }; meta.homepage = "https://github.com/dracula/vim/"; }; dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-03-17"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "96552c9199dc4e169d1c54a21300365ffa483da9"; - sha256 = "0xh8wnmk3y71mqfcbai0sf7s94kh4f5ward05c8rkwx9rhlasajv"; + rev = "31f12fff6e71a14ddce30bfc7ec9b29a2137ccde"; + sha256 = "0kjx04q2hnbvw68wh3d9li9p9s5d07j308kfhawpnhnmv6g57nzw"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -1893,12 +1893,12 @@ final: prev: embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2022-01-10"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "2740b2f15708dee3a5b390709e07a69255f75d75"; - sha256 = "1y1i5wzs1w20k6yyr6l8861bph7xj50ks66yxy7kc97f18jrpra6"; + rev = "3f7f03aa2ae0d4185792aaf9b960bca0d22c48fd"; + sha256 = "0gv2ivrwsrhnsr2kh56yj3m1l4ydwq27vllzxa5vkpbb11jydf3d"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -1990,12 +1990,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2022-03-18"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "1bd5158943eea629de30db02449aa06633e1fcee"; - sha256 = "1z6hlarj2xj00hia6ns58qwibpaf48h6w8aawsc46ihjib1zs38q"; + rev = "290bea8e8a782586de32bb8d0bfb056ff8acdb9c"; + sha256 = "0sjg8hb6z9c7kscx26jkdxl31qy244w76iywy8xp7143kb9p0qx1"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2014,12 +2014,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-03-21"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "540355537e529f00ff770f1647929957b0aa8088"; - sha256 = "1p5sjz24khgmfwmkq6brl8l1z3w7zfb4pgz3xriqij5w0h5nkdin"; + rev = "45950d39965150a6c6bff1979303e735460379d0"; + sha256 = "067aild4sr5zd08fn2dna9ndycf5i4w524kkz88yzhyr7h5rc0w4"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2123,12 +2123,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-03-14"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "76ffbc613a058902a9166c09f3cae48073bc9276"; - sha256 = "1c56xzwkhrhq0mmk518zhz6dg1q6l9cibiavfj71l5arhbh8d5vk"; + rev = "cc42c16a793cba102ac75574ab187a77995ba06b"; + sha256 = "1qz87l2da378wcbbck6n9p82apl594x2kxldl4sxhy88rbbqi2vb"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -2147,12 +2147,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-03-05"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "ad07b2844021b20797adda5b483265802559a693"; - sha256 = "1gar4pcdh4waxsjr423s4s1bdxplg01bgalp414pwbc4zwzrdh3b"; + rev = "e302658e765cf20e6af5a1be8cc07a996d6ee2cc"; + sha256 = "15s2k776wf4qs3w101q6dwip8abqhsxb1f7xnx41zq7j1r09i20r"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2291,12 +2291,12 @@ final: prev: ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2022-03-21"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "957dbf2cc405af362bb544823517de4ddc57e7b2"; - sha256 = "144q5gq3lnr4pgl92iqj13g3v5zd5795dh6bw91b8s78fz7bf9jn"; + rev = "f48626bf5b64067a84b644bcc56afac686046966"; + sha256 = "0v2m05980r5zq77b11nghjgz0yr70a88gd7jv0d0iy2z6ah63sxv"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -2387,12 +2387,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-03-19"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "3791dfa1ee356a3250e0b74f63bad90e27455f60"; - sha256 = "1497v5hr89ccixnnc91y6w3cmr9jpbp75g3rrakffijm6zdl8pvk"; + rev = "2a107231d92fa37224efdbc475abfba71f94b5ee"; + sha256 = "0i17r2c48csff7pl0k1vvc5j61xh3qv4xq6v75raz937w0kj6hfg"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2651,24 +2651,24 @@ final: prev: hoon-vim = buildVimPluginFrom2Nix { pname = "hoon.vim"; - version = "2022-01-29"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "urbit"; repo = "hoon.vim"; - rev = "f287adb9ce5f99a2a8b806833ab1582ba162aab0"; - sha256 = "0nlmcz79qcmrkfji5mdc66p1pxrz5i68m50013fr66zqcccnynjk"; + rev = "233d48ab2621877d8899b7a75b70f379ce36a066"; + sha256 = "0bq8vd6dnf39y3686snaywp8krmjghfsxnnm0k1cyv20g1mf54s5"; }; meta.homepage = "https://github.com/urbit/hoon.vim/"; }; hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2022-03-18"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "4f1acb666667b2b914efc407ba44b4d305529331"; - sha256 = "1i2gib6kdbj6sqfhz72n5gq72g2viw28z64dc1cmm4wwafcxzc4c"; + rev = "e2f978b50c2bd9ae2c6a4ebdf2222c0f299c85c3"; + sha256 = "1si2ibxidjn0l565vhr77949s16yjv46alq145b19h15amwgq3g2"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2735,12 +2735,12 @@ final: prev: impatient-nvim = buildVimPluginFrom2Nix { pname = "impatient.nvim"; - version = "2022-02-21"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "lewis6991"; repo = "impatient.nvim"; - rev = "7abfc924714d3b7f19f3674cca0231cf6ef2050f"; - sha256 = "04q08syijlia2m8dbaf0854y4zp73j0ms1vg8wa7kr80rwvkrvbz"; + rev = "989eefca3539b9958df100e8e3130f55eafe1709"; + sha256 = "0cypb6nm0jlgf4cbsazwplvniiqrnda32nk2nkaqm0dbprs920sv"; }; meta.homepage = "https://github.com/lewis6991/impatient.nvim/"; }; @@ -2795,12 +2795,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-03-09"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "9915d46ba9361784c70036bb7259c436249e5b0c"; - sha256 = "0gcfm7hppgm2f909q6y8gs369mrh8flhbriyv5waq0ir15752cv4"; + rev = "ebedbed53690a53cd15b53c124eb29f9faffc1d2"; + sha256 = "1wsxvlpq78vyvgz6g0ji07dy1b10bsfr1qk9qdpj2n5592zp8zlk"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2976,12 +2976,12 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2022-03-04"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "a4b2830cedfc57152bd4e6b27050a41f02229295"; - sha256 = "0kmc6cgnsdim5yhjcy1hxcfp17a6pslj2zbray8jsfl9xkc2jl74"; + rev = "a2c96eda9d5b0dde03d2e22d0888e40426cd38dd"; + sha256 = "1x9f3gd4bgj3f1c75bp58mvaxll4rw55vznqckc0w0p1bcwq9faw"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -3108,12 +3108,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-03-21"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "21bf810e3bce3e06d148b4848febcb69bec34b49"; - sha256 = "0m64qqilanz1qgssgyy2h8zlkyngn2nbnwwx15mwls9v0sllc0ns"; + rev = "c22a0a6d288488a05a74aaa53dac4d2d71f7a30d"; + sha256 = "0rb1gw3ndrjw5k1l2ckm936xp83krrwi3ylr27il8mdf4xllw3y8"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3216,12 +3216,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2022-01-26"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "81c3ed800ce24bc09802899c1dc0c0b4d8d4f9b2"; - sha256 = "1ahbd3l2jjjjcwsvjlbr0q4vhhlsngz9jwvmrkl5a7q9c7h0y7m6"; + rev = "59b2c6b0ab5ad41ce42db89f05c8ea67020099ff"; + sha256 = "0laz118k20sm3bn6r81f8pg9n77k5038c0vhgpbj349k3zraygjq"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -3300,12 +3300,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2022-03-13"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "4a4f0724a520bd4e1a59ce55b7ecb51e44aa9b19"; - sha256 = "17plc8wqa9npvy757qhmm7lk4rcjvm8f340djfi49b9cddpp739s"; + rev = "00c30733467be30a72311e08030bba34ceb4f6df"; + sha256 = "1psyvz4qb28mlkbxjs5xy6l4vhw9jyzc0j460xx2phiiz7raq852"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -3491,24 +3491,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-03-18"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "181b14348f513e6f9eb3bdd2252e13630094fdd3"; - sha256 = "12795wh3md90p3q1zmhar4v4vf1mmhixmd4dycqmk5bcalv8j8ma"; + rev = "f14175e142825c69c5b39e8f1564b9945a97d4aa"; + sha256 = "0x6f88ixb6xd5nh3d8y5sql8yfyqs5fnpvdkdv9ywp7swzaydgqc"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-03-21"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "680d42a49e2e798cbbc0ea5dc96f298b3039dfff"; - sha256 = "04fhmp3idalm97qpmj7jn6cs7myr2jz0jy3yzw3rqxmf33b17m7w"; + rev = "d03f0c32b2aa763915401421f6b084315936590f"; + sha256 = "0qrryj40v70wl1mwn3jc0f50ygslc0848gppki5sxv1aq56a58ps"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3527,12 +3527,12 @@ final: prev: lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; - version = "2022-03-17"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "69848496f34a27e7c534fca5f3626c08f4fdc754"; - sha256 = "1qm6yv474ija8mbmr33rd2wmalrj8gdzl1ji6q68wr7jrwjs3ds7"; + rev = "fa7694fe221ca595d6f8c4f1aab531b4c1d48d7b"; + sha256 = "14cs574nk0hr6mbf80gcjdarwbngbgj73s1grn6yczr2gqqqmhwk"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3599,12 +3599,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-03-10"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "596270a53ac5e19a3b9f9f1777d7e99dcf67f71e"; - sha256 = "0zzdks5dgfz19srflvxa4jj9gxzbany6a697p000vaq5zb59k9v2"; + rev = "82f74e8ec5d21a8ec9ebe1175c330a0b6e490212"; + sha256 = "0hgcgj84d92js6i6skwzznz0ym8cgzwr4pz5aqi038g8ldpcx0ki"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -3635,12 +3635,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-03-22"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "758e28b67216a54fdb154a4606acb73eac950a30"; - sha256 = "1nrvkz6q3a0cmf3aw09fk46scawh02xvk5hawbcyszh2sig4km11"; + rev = "b0763e58ccb8b203f87fcd58fe2fecb095119f96"; + sha256 = "0qbyvz7l9p9iia7mh41119zdgz2v8xrkp8wcxl6hyxqri18j49yn"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -3683,12 +3683,12 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2022-03-13"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "62b921fe7c61180560d6d31baae67c6ed5da2d1e"; - sha256 = "0xnh92vvdrqcj2kwssq1d3jg53lzsz1kpl3vn9dinkrxp4l0pdz1"; + rev = "e3f0718d53347e884f9f2282c35df0063ec6f9b1"; + sha256 = "13j611r2hzz2ldbvir89bxab4cicy5nrg9s780dsriz2g4slj5hg"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -3731,12 +3731,12 @@ final: prev: Navigator-nvim = buildVimPluginFrom2Nix { pname = "Navigator.nvim"; - version = "2022-03-07"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "numToStr"; repo = "Navigator.nvim"; - rev = "6bfcf7da965a03fd1e170aa6870b92b16bf739ee"; - sha256 = "1vx3ibxsn4gdq44pqhykygmim1cq1pj6qrd8cs9lpkm1vq1gz35w"; + rev = "58d07e658c15b61ef7b6e375073b1f06934bc28f"; + sha256 = "0d40rilwcxi7q36fnk4xpyx1cq3nb4yf22j8k8zq6mwg5h4j648r"; }; meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; @@ -4007,12 +4007,12 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-01-26"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "0d665b05efa344977208c230f164440e3a5ce52f"; - sha256 = "1ckz7lrnwgnijf6mm6dxamqhwkr0y0wswc5gcm3np37r58yc5mbh"; + rev = "bccf41d62e874fd614d83c8b0e942cdda6b98012"; + sha256 = "163pfqa33n1hzz3wb02ymisvl070lz1apcgyn349xbq4fz7ry3b9"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -4079,12 +4079,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-03-21"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "9aeaf79c5ad01930705a0534a35adbdba9eb5f13"; - sha256 = "0v1lqfdkzafsh7v6i0cyhc9mgy6gwyqvlya3722qdrrrramp1yfy"; + rev = "168c17fa9373fe5e4927fe59acf448e2c531132a"; + sha256 = "1ad6wx8wi7mc28vbkl1zz72z7yy6x6mk9rfnkxdhwpwddmqpg6v0"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4271,12 +4271,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-03-22"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "ba29285dca9740609f05b9674e3de7708e2ecfc9"; - sha256 = "1959x47sjbb1bl63yfgj30g6s751k4pwchcg2j9y9gm067qnz3r7"; + rev = "f9b0f96f61a4aa136f9fd6a04e60829f50eda9b0"; + sha256 = "0p28x0xsahr9z1a4zgnjlxrdb7wv8p82gh0gc9rbfprym230k9lg"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4391,12 +4391,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-03-22"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "71bb21da7faa6676629ebac5e8818b701da46f80"; - sha256 = "0ids4nlg6lhdabkp9pr9jnkghkpwkk1qxvim39a2i0gvqxx4qkz4"; + rev = "7253974f8bd8c805a2a1cf7456b4d47913f4a094"; + sha256 = "0xy80c1wra3ir8v0ywrrmyswprbzknlwf69q9g33g29zsmgfx9dr"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4439,12 +4439,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-03-15"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "6617498bea01c9c628406d7e23030da57f2f8718"; - sha256 = "0ah6jmi8d1z0r38l9mgs46nfn4kfkqxr2vxhkcgllgp6aamhq85k"; + rev = "f3ebca37d6ef1ff22d1f2c764a9e619d1fe5f3c7"; + sha256 = "0w5xsj55iz30khiw4y47h43i40z2ly607bm8hvddpvrd50i5vcz1"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -4583,12 +4583,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-03-16"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "3d0575a777610b364fea745b85ad497d56b8009a"; - sha256 = "041ypcwa2k737hp9dh3zs1hyx2n2zh9apjnya11zj5xhng76h0ih"; + rev = "e6d7ba5847fbe5f33ba211cf28d3cea72cfa9865"; + sha256 = "0w57cxj07law5igbxvblfk59pv5c8z714dm80njb168ldgy26kz6"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -4667,12 +4667,12 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2022-03-20"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "00dce9bff1d0dd74782734b0d2ca6d50499af9fc"; - sha256 = "0mgl88n7ngq6d6wgqcn5s6s4087pk102mvz8jqsj363zx6q7b80b"; + rev = "1ad35eada2972c055b181c73852438a6ea51b484"; + sha256 = "1kv7p2lcilvkvzl9whdkxgg94vk9fa9d1bikwhahxv2zxzk10qkz"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; @@ -4715,12 +4715,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-01-27"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "e2a80d5f51c326d6623979d614dd7968ef752061"; - sha256 = "1m8sc88g8sk41m4ml62zn7dn05q1ns8xr20c7bldqaz9rwqbhqny"; + rev = "dd1e8dc1daac110cd86dccc159007deac856a89b"; + sha256 = "1hzbn9v42z0m8s6fnf2r5navcshclsfpc88sasack5c1nvsvv43s"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -4787,12 +4787,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-03-21"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "48e59a45b6fddcaadea6e14de0fe92cc4605261f"; - sha256 = "14x031raf0sh2s6syjmq3vqbwwj0pz1sky1f9s10cfh03sz5z54z"; + rev = "7d5a6dc46dd2ebaeb74b573922f289ae33089fe7"; + sha256 = "1dz2q6n2ibq9l2js088wfp2y5md6z8lqs6hy02xajglvb0d9g3fg"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4895,12 +4895,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2022-02-10"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "208d983e9bab4d0eb98b4642636e1b4f41c5280a"; - sha256 = "0yq7whrlzrwiyk6xzakvrf9drrr21gy2s5318rnn9r01mp27z6in"; + rev = "3bbf9cb2e36200d67c150d71d49011c133d3bbb8"; + sha256 = "1jif3knz78mqf6sgckfwin1wx6ad4wppdc2y0hcxlj2kwm17xqzk"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -4919,24 +4919,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-03-20"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "e87ee0e3c30368fa97085125ffe13ee37c0daf70"; - sha256 = "0bn74v8ydr71acs204r6580fs636gh00wfk8z6wlbhp4krrwdi1n"; + rev = "524758a207f9c5bf3888b446d9f93192a837b8a7"; + sha256 = "0kz7qhirm7gkklmyysanndm4pimvfm0p0qzz3q96hv01hpm3d17y"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-03-22"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "3e2ac54e1638da214dab58f9edf01ad93f57261d"; - sha256 = "04yjpb3b91j09xwmyxq0bp6zcn2lh3rb86dsp9h1s80wz1hbik7l"; + rev = "97691940d1c9cdaef2ca73c4fae50987fdcadc6c"; + sha256 = "13cz5hjp7w1fmjw35n41gw3yyizs9y3jnbz228j6n8zz3awdin9g"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4979,12 +4979,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-03-02"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "7c6b5fe0926f52854f193d058cd98d2e74c3d483"; - sha256 = "1zrgiazmqbn6664ji9gxvn36dsmp9v11nk99yl12c7fxdjlvfpql"; + rev = "2885b60e9f9b90b4e2a32b0f8adf8571bf1f390e"; + sha256 = "0q1dph3pz2ygz1wccjgcdfqyb4faj47rv2v9a4p4ngw2vd00qjgy"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -5027,12 +5027,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-02-19"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "4415d1aaa56f73b9c05795af84d625c610b05d3b"; - sha256 = "1n2301a0jxf2z79bc5hp97r48vsh25hy9bfrx12my6ag839ayyyj"; + rev = "09e62319974d7d7ec7e53b974724f7942470ef78"; + sha256 = "0f64alh5mf6zjnbxqsx21m3dcldqshx7a7z46qg0pfbnn9fx7swq"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -5135,36 +5135,36 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2022-03-17"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "77752edb0f8378a21f92b8a4dcad984177f24c7f"; - sha256 = "0vh2aa9c9626vxxmpcfkhpfmibvzk7gv31rn65lb140mdnkrqvh8"; + rev = "e520a0c81a5a1997ecffd846ccd9c6e63b7859c6"; + sha256 = "1xvh5mmjc4w4rkp8h1qwxfqz3kcrqvhxnl66x19j098d1h7aqsb6"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; onedark-vim = buildVimPluginFrom2Nix { pname = "onedark.vim"; - version = "2022-03-08"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "d472198ec6d6a0d148dd0b4cdcf1b60e845311af"; - sha256 = "00sjcihagbdka2mcld584ba2s5g99qbbjh6wgga7n90pkqcqmlw4"; + rev = "7db2ed5b825a311d0f6d12694d4738cf60106dc8"; + sha256 = "0jxnymbj83y0wfwv6ixxzlx1zyh9mlv1krq5g9wqhz4w6n9rkmqx"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-03-20"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "37dcc6e9ff9b58e352a4aa6d109a4b053f41ef11"; - sha256 = "025p78jzc3n8c663gmzixd7ajg7fi58r84aan8fhfsrh8paygf7v"; + rev = "46b0ffb97f3778a1f6f5da6471a42f3f64bbf238"; + sha256 = "13gyfz9fxgzvmcwwv19f8csmanv52144gvr5xdgvcg5nygkmydcp"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5231,12 +5231,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-02-25"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "c576ab3f1488ee86d60fd340d01ade08dcabd256"; - sha256 = "0g2h6wq2v315s1g5wh2qfvslly00iglx9sixqrq9xncrs34n4w25"; + rev = "4dedd3b08f8c6e3f84afbce0c23b66320cd2a8f2"; + sha256 = "09sqfak384lhqr37003bq4wm9v0hi690ilag89z6cw5c0fnsysbl"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -5255,12 +5255,12 @@ final: prev: papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2022-03-17"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "546570250026ac65c5e2a8a9533fa3a33928352d"; - sha256 = "1naajhn9ii20dx215ksz9fw30xlyvmk0zwsp2flvnwm6jc7wzxji"; + rev = "afde171829b1416125bf07a81fc28e4490aa91b2"; + sha256 = "1iz8aqmwbnfha2agcxy7cd2v0znz8vzpz7iyvd15hxx7zbqlwz1d"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -5653,12 +5653,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-03-21"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "8d1e1488f78306facb98f1eeb518b8ed7843c9b5"; - sha256 = "1lx3hl3lvz92isa07cczmivnc9ffpwim6yayl6l8msrc0ycqsaa2"; + rev = "93967110eb45d7234802c0c0e2ef909968e8461e"; + sha256 = "1mphqq650d3x0g2nl4pkgflp3hsi68agzj807r64x82p3266abzs"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5797,12 +5797,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2022-03-17"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "ad22bd03cefac7d6a483f092a36499e9cce6dad5"; - sha256 = "1d2zkr5r6c7zy4x516ckp57dri3hplmdrzgdq02k0xsvmwispjl0"; + rev = "9f89fe6d9762ef89973bbb698c750dd21b94ec44"; + sha256 = "0r1k71rjlcly5pyi1vdzr22xdssikzsm5q4g2xzjp9v497fycg1h"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5845,12 +5845,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-03-20"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "0a3f765335acde2bdf33504a62fe944a5d6d907e"; - sha256 = "1dzbwfic9li5bsc33k6y14avniqbp6hhgkpznwriy8d0pww6p11v"; + rev = "f665a87f88b7b891aa5e1f91236b5bab29c2faaf"; + sha256 = "1i90yyrm7ji8wf3if431al9ggcnps37k3lsnga3ixqa5pr7xsrg9"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -6134,12 +6134,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-03-22"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "3af5db3e15916d28d0fed9eab478da07b4bc4937"; - sha256 = "1zjcd2pmbn42ss74qbmvz3kar6yn3bz1f1bc4v0r7y2ajrp2m4wy"; + rev = "a8d183fdd97de3c1ee54c0e5f0efe9e95a19d866"; + sha256 = "0rhpasj5jw7jhij6pqjrsb48gwf4hrpadh8ab9d611v6akkkxlvv"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -6581,12 +6581,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-03-09"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "84efd93ec772696c1cce2aada4d39f2756953964"; - sha256 = "1n23d24nr9q857pgmzkcl6v49c1gs4bqabfdwjik18nxkjxq2zhk"; + rev = "c6f5104ff309649ebbaec283bbd1ab54511dd109"; + sha256 = "1b3z4i5jlxjk44x245b5sqnzcn5k1jww8viy0394hj6zqf7ink2w"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -6738,12 +6738,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-03-20"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "1a72a92b641e1dab42036c07e2571b43c55bfaa1"; - sha256 = "1iywxpdy03z1wna8ms1nh1xak1ajya3q8mnlzpfr1vdxp64idy22"; + rev = "cf2d6d34282afd90f0f5d2aba265a23b068494c2"; + sha256 = "042w0l8hdcxaj3pmbp0w1mqmivfm48pv3vlcz6d423qiljbkrk9k"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6919,12 +6919,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-02-28"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "e97d0c1046512e975a9f3fa95afe98f312752b1c"; - sha256 = "00j1q6g7js9ais6s1vi18x165k1zrx988zbp0yr1gcd5n2xnknbi"; + rev = "9f969e7f72d19966756318d61f2562f67dbb1f9c"; + sha256 = "118hwkn9cw2wsqigqvbpvbhbag6ywc325lvn088dfpzbn9k7vfmr"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -7039,12 +7039,12 @@ final: prev: typescript-vim = buildVimPluginFrom2Nix { pname = "typescript-vim"; - version = "2020-12-08"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "leafgarland"; repo = "typescript-vim"; - rev = "67e81e4292186889a1a519e1bf3a600d671237eb"; - sha256 = "1mpp4n7qgz3yq4vka8h5sbngc14w5bzd9s9c2csbv9ds8w0lpi0g"; + rev = "52f3ca3474d51f5021696ffb7297d989e49121ac"; + sha256 = "12qcp82jkaa6nmdb0s4an29bfp9mzkkkxz2sfhm93x5506g8gk4l"; }; meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; @@ -7159,12 +7159,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-03-07"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "b7da086d9f370b65ffeec6af76c8a37cf5e43336"; - sha256 = "1ln0icwhmcrzkmn0ln75xn1inik5hyn6938i479128ysznplz8fm"; + rev = "11d8fb106515a4c4e6016742053356c9f0434fed"; + sha256 = "1gjaqmkrxg5x6mpb7dnznbbzrv3iadcw7snxjx7bzmr0b24mddcp"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -7423,12 +7423,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-02-28"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "e2498d72dcc123115ed1d0fe1449beba6dadecc2"; - sha256 = "0zr7ldn3kwx45qyi27bzbgy63va7hwvp9n2awrvgd3zsk1nq9kbq"; + rev = "a306a7abfd8b4450fcfdc0384dadb996148d2c1b"; + sha256 = "0qvz41rpdbcsszh0n4jhjrw9anyzsh4r1j694a3ryjj58gg9smjy"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -7795,12 +7795,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-03-18"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "d2a5259c6ec617688b918a39d9fb4548f6886e5c"; - sha256 = "1qzjzvkw44wylnk0sa4w2kzjb44w18cls4hjaglkbri9k7za8rr9"; + rev = "6fd4fecaf8b1da31c625e5f02822778d4a2a08b5"; + sha256 = "0h9z49r20wyqwvj4dr5grq0zdaz2d728jxc29l5q3rb1nh9nqbfi"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7939,12 +7939,12 @@ final: prev: vim-commentary = buildVimPluginFrom2Nix { pname = "vim-commentary"; - version = "2021-09-14"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-commentary"; - rev = "627308e30639be3e2d5402808ce18690557e8292"; - sha256 = "0d056h2vh3bzc3mcijq90y5c7rvg01zzxyfc826h4f79y1fz8jnp"; + rev = "3654775824337f466109f00eaf6759760f65be34"; + sha256 = "09iv58r0z3dv5fd6g8zq542rc5hz81gd5h0ncnvhx9drrl6f86ip"; }; meta.homepage = "https://github.com/tpope/vim-commentary/"; }; @@ -8071,12 +8071,12 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-03-06"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "23514a579ce6df28fd956070d9e2ac1051855115"; - sha256 = "0pabwgszd6s03y1mykxxvipn4cwkzch4jgb18iqcnpbpgbsyghl6"; + rev = "d6b9957a1e13f34fb66795fad729c611b2513922"; + sha256 = "14a0mbhcw10400g6ybj6h8nq5bis9hba76qvjx5mph7vbb3rhjwn"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -8179,12 +8179,12 @@ final: prev: vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2022-03-18"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "d811f46ea3f84c4a8419ad30c74267249b3aadc6"; - sha256 = "02rp0x4v77qzdhicfzysl25lb83146jggdqdqmsfqrlf3x1ivdgs"; + rev = "9dde0c97cc39ca1cf49cbe7ecd350d153a0426c3"; + sha256 = "0ba2lsc2jwgplgqsnq69dngiybcs4ad0il19xlk250msxpr5l8xq"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -8359,12 +8359,12 @@ final: prev: vim-endwise = buildVimPluginFrom2Nix { pname = "vim-endwise"; - version = "2022-03-20"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "e5ba8b12a87895626ef65d6509ce719bc7e062c3"; - sha256 = "1g0w9mpg45c57khhqxlj58frfkshz99f0kgssawwa8sy4n25w2qj"; + rev = "8faf48b69b04af120e162ce113ea21eac322e3b4"; + sha256 = "0zfgsqs2mal1yh8x4lj1kx2ib80clsh9s9swh44cq5ga5glfkyn8"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; }; @@ -8419,12 +8419,12 @@ final: prev: vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2022-01-13"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "e2c9e01abd2734919e65dd6fe6c84ca2a9b65a7d"; - sha256 = "02ilz95fmp2j9azpxia38hka2n81x5x3b1knaidiaf1pifl0c7zn"; + rev = "01aa41b276b45e2df2cb680ab38e78ea7e5786c1"; + sha256 = "149hnk9ja9vnw5vr7axliyqh0l2xz6i4l3lngdlzi1xic0xfwxf5"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -8611,12 +8611,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-03-09"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "46652a304f0b89f36d70cee954d77e467ec0f6de"; - sha256 = "174qmalqmg8miq7ixc0c3w66qpc46c9rxvpw6sn8qalyifb0z7fj"; + rev = "321328c6c5901a597348155fc0e83b800544dcb0"; + sha256 = "11sd87c9vw1gs9pkvv0y24yqhkack0yxv5mg50ss6v7mjjdngv66"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -9850,12 +9850,12 @@ final: prev: vim-obsession = buildVimPluginFrom2Nix { pname = "vim-obsession"; - version = "2021-03-22"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-obsession"; - rev = "82c9ac5e130c92a46e043dd9cd9e5b48d15e286d"; - sha256 = "0lfcba8sk25l5yp3agh6pwniddf8jx627ikpr8i2z9ary2fqsj98"; + rev = "d2818a614ec3a5d174c6bb19e87e2eeb207f4900"; + sha256 = "08scgvpc5rmcc6xwbqir1b8y4fx58im5gn55fpg33s5346lxwd62"; }; meta.homepage = "https://github.com/tpope/vim-obsession/"; }; @@ -9970,12 +9970,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2022-02-21"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "18db93968ae0f2aa89ee68e18f5785381ab169cc"; - sha256 = "0a4261fkvgfaw1vsm5fgqm27rlcx8gpj2hkrk8kg9bjaijniqgd8"; + rev = "23b0846e26d946bda9ebcd267839fea83435aff2"; + sha256 = "0fydc0xs7pfx681s6v2l4w7z6c7ldajhsaffi23a0p9g5k0vchk6"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -10678,12 +10678,12 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2022-03-21"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "0633b4a1ce6cc32b07d1b473de8d25f5565d579c"; - sha256 = "0bk68zpl4rv414773c9g1vi1qwqcrqp832lmx2hmlraak80dkk0z"; + rev = "edffd9ee2cfafa3aba291f105a1d4f9f0e2d5701"; + sha256 = "1rkn4qawz3p0h1pz0g712k3iz72qvapqd8k1f05kbabxymw6yqd7"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; @@ -10774,12 +10774,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-03-18"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "3c40345e100624e2a8946457839e80f526acbe3b"; - sha256 = "1xla1q6nhv7r2hyidnsvd47k3gyj6j16bzkmr9y9c1q2szwfjbdp"; + rev = "57d23f6f44203374edcbb7d41903a491ec8cbed7"; + sha256 = "0371pv4pl99icxhbqbqfx7ds1i1kwv1k9p28i5pxayngkyhd7l39"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -10918,12 +10918,12 @@ final: prev: vim-surround = buildVimPluginFrom2Nix { pname = "vim-surround"; - version = "2022-01-30"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-surround"; - rev = "baf89ad26488f6a7665d51b986f5c7ad2d22b30b"; - sha256 = "0kzp1g2zw2an0z7bb8h4xs8jf17z0mnn0zf6v1wkipvz6nvp7di8"; + rev = "9857a874632d1b983a7f4b1c85e3d15990c8b101"; + sha256 = "0ihcqrgvrllnrll9vgg1ywmhsvf43dwdpqv89r8mi70wsnzbgk3v"; }; meta.homepage = "https://github.com/tpope/vim-surround/"; }; @@ -11015,12 +11015,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-03-08"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "16a3b6da1bab42473d42d7e02d89d549d7a5e138"; - sha256 = "1hlw3268x3i0pbmyj5b56kng6a9348rmh3dg8jrhq1jyy75r6m09"; + rev = "56bbfa295fe62123d2ebe8ed57dd002afab46097"; + sha256 = "0ggk1c5767hjjfg1nwdm880bj9cgj6bgvf25dgjhwx83xxhzpp6d"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -11327,12 +11327,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2022-03-21"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "f8914382614eaba8995fc109917ab4b1c186795f"; - sha256 = "0b221w5kdlkibjw6m9k72lmj939dmnqm9a2wzdp8k4z6ig22nkgr"; + rev = "4fcd3797e380f2e4c8ea8be31ec6469e6f86f971"; + sha256 = "135jggj34pdczjby1p2vpr1b30whcabsfxjgvyrra45hlg45kzgn"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -11483,12 +11483,12 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2021-12-29"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "17aaeece90075ee4990da21ef662107a243fdbc9"; - sha256 = "0mvx5im6ryrnqq0mq0z4lfks20cryz8rnrl8347nrhw9vsb1sb2v"; + rev = "d6c9b8e06c1e7b3f14abc772ad61d73e687eede6"; + sha256 = "015jr832zwa7gcakbllifh3r45iyfywraswsm70vvbam165wwxph"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -11699,12 +11699,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-03-22"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "449ffc306a8540d686f095b8b76d5d81f1f14d07"; - sha256 = "1fadbxarddmk85zk7w30208injr8v7bpmscnpcmphd15xym3s19j"; + rev = "99ce7a74699f12e05bf6059125d767b05ceb212b"; + sha256 = "0hj26vyq8cbw5zsq94i4hay27fs9z5xxyniflz975ddii8189qa9"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -11712,12 +11712,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-03-21"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "332ce001ea5950276ce771760fb7125461071021"; - sha256 = "0p833kw9xb75sg9cfw2qp6yr9nfypdyj18sf3kq8qnyqz5hiz4kk"; + rev = "c2cb0ced676fd41ce7f6e33a3f09122cb738436b"; + sha256 = "00vzqcw2gygq6rgwjy4dl2m1p6pdkwqpj3j1gbzjg4g6av4q8py1"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -11965,12 +11965,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-03-16"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "e32a82c322c680fa3aeef615874cf049669a360b"; - sha256 = "193bdarjk23ny526yyn6w39chsgy3rzpf1iwlwgik4g125jld9y4"; + rev = "89bba25c96866662ca38c2428f73eb64b0351ba3"; + sha256 = "0yrhvd9c0g6ay02b77sr657hn7ambcifwjfqsjywmnirr4zja45p"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; From 5cfa6817b3c4414ff96935f5aa89fab541da476a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Mar 2022 17:59:20 +0000 Subject: [PATCH 060/163] php74Extensions.memcached: 3.1.5 -> 3.2.0 --- pkgs/development/php-packages/memcached/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index 2a9d6685b7ca..5e56882c9d24 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -2,13 +2,13 @@ buildPecl rec { pname = "memcached"; - version = "3.1.5"; + version = "3.2.0"; src = fetchFromGitHub { owner = "php-memcached-dev"; repo = "php-memcached"; rev = "v${version}"; - sha256 = "sha256-AA3JakWxjk7HQl+8FEEGqLVNYHrjITZg3G25OaqAqwY="; + sha256 = "sha256-g9IzGSZUxLlOE32o9ZJOa3erb5Qs1ntR8nzS3kRd/EU="; }; internalDeps = [ From 9b94bfa1684d55a4aeb54e860a97d91b6f8c7c6e Mon Sep 17 00:00:00 2001 From: "\"Minijackson\"" <"minijackson@riseup.net"> Date: Sun, 27 Mar 2022 20:05:08 +0200 Subject: [PATCH 061/163] vimPlugins: resolve github repository redirects --- pkgs/applications/editors/vim/plugins/generated.nix | 4 ++-- pkgs/applications/editors/vim/plugins/vim-plugin-names | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6be129fe11d2..69fad132b296 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5835,12 +5835,12 @@ final: prev: pname = "salt-vim"; version = "2017-07-01"; src = fetchFromGitHub { - owner = "saltstack"; + owner = "vmware-archive"; repo = "salt-vim"; rev = "6ca9e3500cc39dd417b411435d58a1b720b331cc"; sha256 = "0r79bpl98xcsmkw6dg83cf1ghn89rzsr011zirk3v1wfxclri2c4"; }; - meta.homepage = "https://github.com/saltstack/salt-vim/"; + meta.homepage = "https://github.com/vmware-archive/salt-vim/"; }; SchemaStore-nvim = buildVimPluginFrom2Nix { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 7adc6834232f..c4a10973ac2f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -727,7 +727,6 @@ sainnhe/everforest sainnhe/gruvbox-material sainnhe/sonokai sakhnik/nvim-gdb -saltstack/salt-vim samoshkin/vim-mergetool sbdchd/neoformat sblumentritt/bitbake.vim @@ -958,6 +957,7 @@ vimwiki/vimwiki vito-c/jq.vim vmchale/ats-vim vmchale/dhall-vim +vmware-archive/salt-vim vn-ki/coc-clap voldikss/vim-floaterm vuki656/package-info.nvim From 006d42d8f002ddd2c37744fb2b9154e0783e1e0b Mon Sep 17 00:00:00 2001 From: "\"Minijackson\"" <"minijackson@riseup.net"> Date: Sun, 27 Mar 2022 20:12:07 +0200 Subject: [PATCH 062/163] vimPlugins.telescope-ui-select-nvim: init at 2022-03-20 --- .../editors/vim/plugins/generated.nix | 18 +++++++++++++++--- .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 69fad132b296..6ef572dd5a37 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -581,12 +581,12 @@ final: prev: ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2022-03-13"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "yunlingz"; repo = "ci_dark"; - rev = "d32e5be4eb144789743aef0fa412176b91410bcc"; - sha256 = "13gxf8jc7fd7fxy2zlqi7jc98p0lijs00bsknxnf9cglp1xi81i6"; + rev = "3acf3a52921708c4c7c6c8ca8590e63bf86d0eff"; + sha256 = "1x2242mzv3vflaq6k7xdp5xc52hsykw9693szmnvfb72i0mhrf4c"; }; meta.homepage = "https://github.com/yunlingz/ci_dark/"; }; @@ -6688,6 +6688,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/"; }; + telescope-ui-select-nvim = buildVimPluginFrom2Nix { + pname = "telescope-ui-select.nvim"; + version = "2022-03-20"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-ui-select.nvim"; + rev = "186a124a01d7f19e6fcf608d4e1cc61d61ebe939"; + sha256 = "1lx11d4m0gcbvbb3bvxaciihnlsj1gi30ja1p0i9w7dm748d57zb"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/"; + }; + telescope-ultisnips-nvim = buildVimPluginFrom2Nix { pname = "telescope-ultisnips.nvim"; version = "2021-09-26"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c4a10973ac2f..c778e8c572c8 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -597,6 +597,7 @@ nvim-telescope/telescope-fzy-native.nvim nvim-telescope/telescope-github.nvim nvim-telescope/telescope-project.nvim nvim-telescope/telescope-symbols.nvim +nvim-telescope/telescope-ui-select.nvim nvim-telescope/telescope-z.nvim nvim-telescope/telescope.nvim nvim-treesitter/completion-treesitter From 353d2713512d648f9444ce3eeee678f52b5dfec2 Mon Sep 17 00:00:00 2001 From: wahjava Date: Sun, 27 Mar 2022 23:43:27 +0530 Subject: [PATCH 063/163] fnc: init at 0.10 (#165667) Co-authored-by: Sandro --- .../version-management/fnc/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/version-management/fnc/default.nix diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix new file mode 100644 index 000000000000..1e234dea5e3e --- /dev/null +++ b/pkgs/applications/version-management/fnc/default.nix @@ -0,0 +1,40 @@ +{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }: + +stdenv.mkDerivation rec { + pname = "fnc"; + version = "0.10"; + + src = fetchurl { + url = "https://fnc.bsdbox.org/tarball/${version}/fnc-${version}.tar.gz"; + sha256 = "1phqxh0afky7q2qmhgjlsq1awbv4254yd8wpzxlww4p7a57cp0lk"; + }; + + buildInputs = [ libiconv ncurses zlib ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + preInstall = '' + mkdir -p $out/bin + ''; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + test "$($out/bin/fnc --version)" = '${pname} ${version}' + runHook postInstallCheck + ''; + + meta = with lib; { + description = "Interactive ncurses browser for Fossil repositories"; + longDescription = '' + An interactive ncurses browser for Fossil repositories. + + fnc uses libfossil to create a fossil ui experience in the terminal. + ''; + homepage = "https://fnc.bsdbox.org"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ abbe ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 321eb6b012d0..eee9d95028f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25734,6 +25734,8 @@ with pkgs; fmsynth = callPackage ../applications/audio/fmsynth { }; + fnc = callPackage ../applications/version-management/fnc { }; + focuswriter = libsForQt5.callPackage ../applications/editors/focuswriter { }; foliate = callPackage ../applications/office/foliate { }; From 4f9ef8f97478e66372254ae7ae12758c2b84a4d6 Mon Sep 17 00:00:00 2001 From: Florian Date: Sun, 27 Mar 2022 20:13:55 +0200 Subject: [PATCH 064/163] python3Packages.aspy-refactor-imports: init at 3.0.1 (#165653) Co-authored-by: Sandro --- .../aspy-refactor-imports/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/aspy-refactor-imports/default.nix diff --git a/pkgs/development/python-modules/aspy-refactor-imports/default.nix b/pkgs/development/python-modules/aspy-refactor-imports/default.nix new file mode 100644 index 000000000000..9ec0cf55d42d --- /dev/null +++ b/pkgs/development/python-modules/aspy-refactor-imports/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aspy-refactor-imports"; + version = "3.0.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "asottile"; + repo = "aspy.refactor_imports"; + rev = "v${version}"; + sha256 = "MlCM3zNTQZJ1RWrTQG0AN28RUepWINKCeLENykbu2nw="; + }; + + pythonImportsCheck = [ + "aspy.refactor_imports" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Utilities for refactoring imports in python-like syntax."; + homepage = "https://github.com/asottile/reorder_python_imports"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d5ef6d894d5..46b2200d5a23 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -664,6 +664,8 @@ in { aspell-python = callPackage ../development/python-modules/aspell-python { }; + aspy-refactor-imports = callPackage ../development/python-modules/aspy-refactor-imports { }; + aspy-yaml = callPackage ../development/python-modules/aspy.yaml { }; assertpy = callPackage ../development/python-modules/assertpy { }; From 836171e89a50c9b80c3b342d32c1bc165a211409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20H=C3=BCrlimann?= <645664+p-h@users.noreply.github.com> Date: Sun, 27 Mar 2022 18:16:48 +0000 Subject: [PATCH 065/163] cmusfm: use versiont tags, add compile options (#142135) Co-authored-by: Sandro --- pkgs/applications/audio/cmusfm/default.nix | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index 4cf91c698be7..17495ead355a 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -1,18 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, libnotify, gdk-pixbuf }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, libnotify +, gdk-pixbuf, libnotifySupport ? stdenv.isLinux, debug ? false }: + +stdenv.mkDerivation rec { + pname = "cmusfm"; + version = "0.4.1"; -stdenv.mkDerivation { - version = "2021-05-19"; - pname = "cmusfm-unstable"; src = fetchFromGitHub { owner = "Arkq"; - repo = "cmusfm"; - rev = "a1f9f37c5819ca8a5b48e6185c2ec7ad478b9f1a"; - sha256 = "19akgvh9gl99xvpmzgqv88w2mnnln7k6290dr5rn3h6a1ihvllaw"; + repo = pname; + rev = "v${version}"; + sha256 = "1px2is80jdxchg8cpn5cizg6jvcbzyxl0qzs3bn0k3d10qjvdww5"; }; - # building - configureFlags = [ "--enable-libnotify" ]; + + configureFlags = lib.optional libnotifySupport "--enable-libnotify" + ++ lib.optional debug "--enable-debug"; + nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ curl libnotify gdk-pixbuf ]; + + buildInputs = [ curl gdk-pixbuf ] + ++ lib.optional libnotifySupport libnotify; meta = with lib; { description = "Last.fm and Libre.fm standalone scrobbler for the cmus music player"; From c6a3e3722863888040003970a675ac05bd4fb9d4 Mon Sep 17 00:00:00 2001 From: "florian on nixos (Florian Brandes)" Date: Thu, 24 Mar 2022 17:56:28 +0100 Subject: [PATCH 066/163] python3Packages.reorder-python-imports: init at 3.0.1 Signed-off-by: florian on nixos (Florian Brandes) --- .../reorder-python-imports/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/reorder-python-imports/default.nix diff --git a/pkgs/development/python-modules/reorder-python-imports/default.nix b/pkgs/development/python-modules/reorder-python-imports/default.nix new file mode 100644 index 000000000000..860188eba606 --- /dev/null +++ b/pkgs/development/python-modules/reorder-python-imports/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, aspy-refactor-imports +}: + +buildPythonPackage rec { + pname = "reorder-python-imports"; + version = "3.0.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "asottile"; + repo = "reorder_python_imports"; + rev = "v${version}"; + sha256 = "1bdKM1sUhpZHy03DdoTzpt1iGm1t1nWnuPyTgl3KhCY="; + }; + + propagatedBuildInputs = [ aspy-refactor-imports ]; + + pythonImportsCheck = [ + "reorder_python_imports" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # prints an explanation about PYTHONPATH first + # and therefore fails the assertion + disabledTests = [ + "test_success_messages_are_printed_on_stderr" + ]; + + meta = with lib; { + description = "Tool for automatically reordering python imports"; + homepage = "https://github.com/asottile/reorder_python_imports"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 46b2200d5a23..bbfa4b2771f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8712,6 +8712,8 @@ in { rencode = callPackage ../development/python-modules/rencode { }; + reorder-python-imports = callPackage ../development/python-modules/reorder-python-imports { }; + reolink = callPackage ../development/python-modules/reolink { }; reparser = callPackage ../development/python-modules/reparser { }; From 7fcb4faca25c70b11db3b6ed9d38d926489a0011 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Sun, 27 Mar 2022 20:23:59 +0200 Subject: [PATCH 067/163] python3Packages.ansible-doctor: init at 1.2.1 (#165289) Co-authored-by: Sandro --- .../python-modules/ansible-doctor/default.nix | 69 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/development/python-modules/ansible-doctor/default.nix diff --git a/pkgs/development/python-modules/ansible-doctor/default.nix b/pkgs/development/python-modules/ansible-doctor/default.nix new file mode 100644 index 000000000000..4792712f41e9 --- /dev/null +++ b/pkgs/development/python-modules/ansible-doctor/default.nix @@ -0,0 +1,69 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib + +# pythonPackages +, anyconfig +, appdirs +, colorama +, environs +, jinja2 +, jsonschema +, nested-lookup +, pathspec +, poetry-core +, python-json-logger +, ruamel-yaml +}: + +buildPythonPackage rec { + pname = "ansible-doctor"; + version = "1.2.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "thegeeklab"; + repo = "ansible-doctor"; + rev = "v${version}"; + sha256 = "sha256-2Jaf7asU4c7kw9v9dUYDL4/M2Y/2qhMM3m0jqYiobUI="; + }; + + postInstall = '' + rm $out/lib/python*/site-packages/LICENSE + ''; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'environs = "9.5.0"' 'environs = "*"' \ + --replace 'jsonschema = "4.4.0"' 'jsonschema = "*"' \ + --replace '"ruamel.yaml" = "0.17.21"' '"ruamel.yaml" = "*"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + jinja2 + colorama + python-json-logger + pathspec + environs + jsonschema + appdirs + ruamel-yaml + anyconfig + nested-lookup + ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "ansibledoctor" ]; + + meta = with lib; { + description = "Annotation based documentation for your Ansible roles"; + homepage = "https://github.com/thegeeklab/ansible-doctor"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ tboerger ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 46b2200d5a23..50791665b2fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -522,6 +522,8 @@ in { ansible-core = callPackage ../development/python-modules/ansible/core.nix { }; + ansible-doctor = callPackage ../development/python-modules/ansible-doctor { }; + ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; ansible-later = callPackage ../development/python-modules/ansible-later { }; From eb20eae90fe9bb13ac2ee9bd6b7e4fd636892de1 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Sun, 27 Mar 2022 14:35:14 -0400 Subject: [PATCH 068/163] llvmPackages_rocm: 4.5.2 -> 5.0.2 (#165362) Co-authored-by: Sandro --- pkgs/development/compilers/hip/default.nix | 13 ++-- ...235cb58f988c71b403334cd9482d663841ab.patch | 78 ------------------- .../compiler-rt/compiler-rt-codesign.patch | 33 -------- .../llvm/rocm/compiler-rt/default.nix | 9 +-- .../compilers/llvm/rocm/default.nix | 6 +- .../compilers/llvm/rocm/llvm/default.nix | 4 +- .../libraries/rocm-comgr/default.nix | 4 +- 7 files changed, 18 insertions(+), 129 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/rocm/compiler-rt/68d5235cb58f988c71b403334cd9482d663841ab.patch delete mode 100644 pkgs/development/compilers/llvm/rocm/compiler-rt/compiler-rt-codesign.patch diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 5a7e9dd5a529..2153a30cb160 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -31,13 +31,13 @@ let hip = stdenv.mkDerivation rec { pname = "hip"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "HIP"; rev = "rocm-${version}"; - sha256 = "sha256-AuA5ubRPywXaBBrjdHg5AT8rrVKULKog6Lh8jPaUcXY="; + hash = "sha256-w023vBLJaiFbRdvz9UfZLPasRjk3VqM9zwctCIJ5hGU="; }; # - fix bash paths @@ -68,14 +68,14 @@ let -e 's,`file,`${file}/bin/file,g' \ -e 's,`readelf,`${binutils-unwrapped}/bin/readelf,' \ -e 's, ar , ${binutils-unwrapped}/bin/ar ,g' \ - -i bin/hipcc + -i bin/hipcc.pl sed -e 's,^\($HSA_PATH=\).*$,\1"${rocm-runtime}";,' \ -e 's,^\($HIP_CLANG_PATH=\).*$,\1"${clang}/bin";,' \ -e 's,^\($HIP_PLATFORM=\).*$,\1"amd";,' \ -e 's,$HIP_CLANG_PATH/llc,${llvm}/bin/llc,' \ -e 's, abs_path, Cwd::abs_path,' \ - -i bin/hipconfig + -i bin/hipconfig.pl sed -e 's, abs_path, Cwd::abs_path,' -i bin/hipvars.pm ''; @@ -102,13 +102,13 @@ let in stdenv.mkDerivation rec { pname = "hip"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "hipamd"; rev = "rocm-${version}"; - sha256 = "WvOuQu/EN81Kwcoc3ZtGlhb996edQJ3OWFsmPuqeNXE="; + hash = "sha256-hhTwKG0wDpbIBI8S61AhdNldX+STO8C66xi2EzmJSBs="; }; nativeBuildInputs = [ cmake python3 makeWrapper perl ]; @@ -135,6 +135,7 @@ stdenv.mkDerivation rec { "-DAMD_OPENCL_PATH=${rocm-opencl-runtime.src}" "-DHIP_COMMON_DIR=${hip}" "-DROCCLR_PATH=${rocclr}" + "-DHIP_VERSION_BUILD_ID=0" ]; postInstall = '' diff --git a/pkgs/development/compilers/llvm/rocm/compiler-rt/68d5235cb58f988c71b403334cd9482d663841ab.patch b/pkgs/development/compilers/llvm/rocm/compiler-rt/68d5235cb58f988c71b403334cd9482d663841ab.patch deleted file mode 100644 index 43803164a00f..000000000000 --- a/pkgs/development/compilers/llvm/rocm/compiler-rt/68d5235cb58f988c71b403334cd9482d663841ab.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -@@ -370,15 +370,6 @@ - - #if SANITIZER_GLIBC - // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE -- _(CYGETDEFTHRESH, WRITE, sizeof(int)); -- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); -- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); -- _(CYGETTHRESH, WRITE, sizeof(int)); -- _(CYGETTIMEOUT, WRITE, sizeof(int)); -- _(CYSETDEFTHRESH, NONE, 0); -- _(CYSETDEFTIMEOUT, NONE, 0); -- _(CYSETTHRESH, NONE, 0); -- _(CYSETTIMEOUT, NONE, 0); - _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); - _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); - _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -143,7 +143,6 @@ - # include - #endif - #include --#include - #include - #include - #include -@@ -460,7 +459,6 @@ - - #if SANITIZER_GLIBC - unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); -- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); - #if EV_VERSION > (0x010000) - unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); - #else -@@ -824,15 +822,6 @@ - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; -- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; -- unsigned IOCTL_CYGETMON = CYGETMON; -- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; -- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; -- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; -- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; -- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; -- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; - unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; - unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; - unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -983,7 +983,6 @@ - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - extern unsigned struct_ax25_parms_struct_sz; --extern unsigned struct_cyclades_monitor_sz; - extern unsigned struct_input_keymap_entry_sz; - extern unsigned struct_ipx_config_data_sz; - extern unsigned struct_kbdiacrs_sz; -@@ -1328,15 +1327,6 @@ - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID --extern unsigned IOCTL_CYGETDEFTHRESH; --extern unsigned IOCTL_CYGETDEFTIMEOUT; --extern unsigned IOCTL_CYGETMON; --extern unsigned IOCTL_CYGETTHRESH; --extern unsigned IOCTL_CYGETTIMEOUT; --extern unsigned IOCTL_CYSETDEFTHRESH; --extern unsigned IOCTL_CYSETDEFTIMEOUT; --extern unsigned IOCTL_CYSETTHRESH; --extern unsigned IOCTL_CYSETTIMEOUT; - extern unsigned IOCTL_EQL_EMANCIPATE; - extern unsigned IOCTL_EQL_ENSLAVE; - extern unsigned IOCTL_EQL_GETMASTRCFG; diff --git a/pkgs/development/compilers/llvm/rocm/compiler-rt/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/rocm/compiler-rt/compiler-rt-codesign.patch deleted file mode 100644 index 3cc12b94b200..000000000000 --- a/pkgs/development/compilers/llvm/rocm/compiler-rt/compiler-rt-codesign.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Tue, 19 Sep 2017 13:13:06 -0500 -Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that - needs it - ---- - cmake/Modules/AddCompilerRT.cmake | 8 ------ - test/asan/CMakeLists.txt | 52 --------------------------------------- - test/tsan/CMakeLists.txt | 47 ----------------------------------- - 3 files changed, 107 deletions(-) - -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index bc5fb9ff7..b64eb4246 100644 ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type) - set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") - set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") - endif() -- if(APPLE) -- # Ad-hoc sign the dylibs -- add_custom_command(TARGET ${libname} -- POST_BUILD -- COMMAND codesign --sign - $ -- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} -- ) -- endif() - endif() - install(TARGETS ${libname} - ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR} -2.14.1 - diff --git a/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix b/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix index 575082905fed..dfc21e7fe013 100644 --- a/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix @@ -29,12 +29,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - patches = [ - ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - # https://github.com/llvm/llvm-project/commit/68d5235cb58f988c71b403334cd9482d663841ab.diff but the compiler-rt part of the path is stripped - ./68d5235cb58f988c71b403334cd9482d663841ab.patch - ]; - + prePatch = '' + cd compiler-rt + ''; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index b1297d7d0d1f..18fd44612f10 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }: let - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-XWh81+2yyXQEPO+5SgxHh66fzFG1bVbvnjPfvXDC+fU="; + hash = "sha256-wPzwbeQUFE6RAytrz5lBa6UUPoVL0UeMyY3qa4M6W6M="; }; in rec { clang = wrapCCWith rec { @@ -47,7 +47,7 @@ in rec { compiler-rt = callPackage ./compiler-rt { inherit version llvm; - src = "${src}/compiler-rt"; + inherit src; stdenv = overrideCC stdenv clangNoCompilerRt; }; diff --git a/pkgs/development/compilers/llvm/rocm/llvm/default.nix b/pkgs/development/compilers/llvm/rocm/llvm/default.nix index 003fb4998c36..722ca1a762a8 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm/default.nix @@ -59,7 +59,9 @@ in stdenv.mkDerivation rec { "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ]; - postPatch = lib.optional enableSharedLibraries '' + postPatch = '' + patchShebangs lib/OffloadArch/make_generated_offload_arch_h.sh + '' + lib.optionalString enableSharedLibraries '' substitute '${./outputs.patch}' ./outputs.patch --subst-var lib patch -p1 < ./outputs.patch ''; diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 73075c9669a5..141c1b01d6f6 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - hash = "sha256-enGzu1EOo87/S5oH1eEqPy0AtsBhCcroG3DYemeNgR0="; + hash = "sha256-EIBH7TXelo6mr+/vJ+iT+VLUVoQqWmNsgeN3Nwwr+tM="; }; sourceRoot = "source/lib/comgr"; From 299a75453e6d13165e6333b490429e61ec9c851c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Mar 2022 18:36:51 +0000 Subject: [PATCH 069/163] php74Extensions.mongodb: 1.12.1 -> 1.13.0 --- pkgs/development/php-packages/mongodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 6f28d1af10e3..bb6087631eb1 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -14,8 +14,8 @@ buildPecl { pname = "mongodb"; - version = "1.12.1"; - sha256 = "sha256-kl1+YAXG6Eu0CiUBnBKw7kvaYlxkSXadzn1bAmmD9DM="; + version = "1.13.0"; + sha256 = "sha256-IoZbYdJkyQyeqoXZTy9fV+VkFAyth8jCYB+jP4Dv4Ls="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ From 4fd262b4730c2b213e0e5de37716746261f48b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 20:54:39 +0200 Subject: [PATCH 070/163] python310Packages.google-auth: 2.6.0 -> 2.6.2 --- pkgs/development/python-modules/google-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 203053d53cd7..9eddb0eca981 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.6.0"; + version = "2.6.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rRYPweqPGeMxoWoUp589ZD2BOmlTS6lhHSyA3BBDna0="; + sha256 = "sha256-YNRJ+BQsdC23YPTAvjkSG8jZvoVVVdeEwlLerKHO0/U="; }; postPatch = '' From 93d94357d2b913ccfc0804b223519c230f015333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 20:55:44 +0200 Subject: [PATCH 071/163] python39Packages.google-auth-oauthlib: 0.4.6 -> 0.5.1 --- .../python-modules/google-auth-oauthlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 1d23af5a3d46..6ee0cb065401 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.4.6"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qQoHL2mT8sMnBnv2UnAEY4TNpajssguU6ppofx8jOno="; + sha256 = "sha256-MFlrgk/GgI/ayi8EjkmYzED7SzWZ6upm0o3HCFs2xbg="; }; propagatedBuildInputs = [ From 417ebf32ae04c2314ad296a52b83d5d3aa82541d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 20:57:07 +0200 Subject: [PATCH 072/163] python310Packages.google-cloud-core: 2.2.2 -> 2.2.3 --- pkgs/development/python-modules/google-cloud-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index 84937102ac32..e59e6a5cb5f7 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "2.2.2"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fRm/iGi0ENC99aA0aKPz8tsjPA7oagI/TswreksV9zY="; + sha256 = "sha256-idL3GJvG3HTeEo1CPqUsyHGfCl28zZyoBDP2UEogJVw="; }; propagatedBuildInputs = [ google-api-core ]; From 9507279e1e51045d21b4fde70f34b4358330da15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 20:57:39 +0200 Subject: [PATCH 073/163] python310Packages.googleapis-common-protos: 1.54.0 -> 1.56.0 --- .../python-modules/googleapis-common-protos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 55380e3081a7..66a3fe507858 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.54.0"; + version = "1.56.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pAMdbsbCsbbcPgvn4Qob1y+wsYsH75vntR8sEATOJDc="; + sha256 = "sha256-QAdQB5W8/CadJ58PfSU64Y1twf9dWnNhP/5FIDix7F8="; }; propagatedBuildInputs = [ grpc protobuf ]; From 439dac5726912fd2efabd65b904bfe376fcc2a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 21:00:55 +0200 Subject: [PATCH 074/163] python310Packages.keystoneauth1: 4.4.0 -> 4.5.0 --- pkgs/development/python-modules/keystoneauth1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index cecbc6fd1d26..e4886e08c2d6 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "4.4.0"; + version = "4.5.0"; src = fetchPypi { inherit pname version; - sha256 = "34662a6be67ab29424aabe6f99a8d7eb6b88d293109a07e60fea123ebffb314f"; + sha256 = "sha256-SbNIiWakPusCAOpRG5l+ZAPCXVY6mExjMOgqDr/EVAw="; }; postPatch = '' From 84417bc33689c74ac8e9dd5426b72d2b5aab297d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 21:03:59 +0200 Subject: [PATCH 075/163] python310Packages.openstackdocstheme: 2.3.1 -> 2.4.0 --- .../development/python-modules/openstackdocstheme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix index 797a524e0172..0a04006704c1 100644 --- a/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "openstackdocstheme"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zzWgAozJrYMFyGWzoDLYbeoY+IPlgzmVhnX7lgM6BXs="; + sha256 = "sha256-dFrZTObRDKB8aw1/i6febpttymbY3cPzA3ckNuhVt4c="; }; postPatch = '' From 0a73a2c6508c3ee54d5d46e31febecd64dd8bb80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 21:06:43 +0200 Subject: [PATCH 076/163] python310Packages.python-cinderclient: 8.2.0 -> 8.3.0 --- .../python-modules/python-cinderclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index fe421fa55d38..2f08341a2c4f 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "python-cinderclient"; - version = "8.2.0"; + version = "8.3.0"; src = fetchPypi { inherit pname version; - sha256 = "7b2f08a2d1cc05d2c1f84f02fadb2208678b1acb501acfe2de33720078ec7b9f"; + sha256 = "sha256-4AEDh1Ap3IXLtZEx0AzMhTT2kpVqzeMrWjzFr0wkWAs="; }; propagatedBuildInputs = [ From 88b21dedb35a04874967325f32c21f452b180aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 21:07:21 +0200 Subject: [PATCH 077/163] python310Packages.python-novaclient: 17.6.0 -> 17.7.0 --- pkgs/development/python-modules/python-novaclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index afc8a51988ed..e654c75bfe88 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-novaclient"; - version = "17.6.0"; + version = "17.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yRDCCFMQ2mNfs0NYXxBwcS/w+cs8j3nUTKPWMsTyMPU="; + sha256 = "sha256-Trwn9M4GwVW46ZGkRGO5NYWW5oVs8XHJr43HVo2Gi+0="; }; propagatedBuildInputs = [ From 4ad1abf9c4159cfdb63472aeaa4efc5778fd37de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Mar 2022 19:12:15 +0000 Subject: [PATCH 078/163] python310Packages.pyinfra: 1.7 -> 1.7.2 --- pkgs/development/python-modules/pyinfra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index ce489127946f..fed8628ea2da 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "1.7"; + version = "1.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-r+7ka3WKE6uHP//p1N71hgTGit7Eo3x9INpbKPYbFMI="; + sha256 = "sha256-qA65l0+E5jVdPghjcX2YiVtdhHRxt4ey28xOedgwHaM="; }; propagatedBuildInputs = [ From a83f15d8fb4227318db60162012decaf7a2a1b4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Mar 2022 19:25:15 +0000 Subject: [PATCH 079/163] python310Packages.jupyterlab-lsp: 3.10.0 -> 3.10.1 --- pkgs/development/python-modules/jupyterlab-lsp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/pkgs/development/python-modules/jupyterlab-lsp/default.nix index ad6286f4de4a..276632a327c5 100644 --- a/pkgs/development/python-modules/jupyterlab-lsp/default.nix +++ b/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "jupyterlab-lsp"; - version = "3.10.0"; + version = "3.10.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8/ZGTIwpFuPiYVGZZLF+1Gc8aJcWc3BirtXdahYKwt8="; + sha256 = "sha256-mtbvIsSXK4VIB5cDT8eRRyjrePGFa02rM2Fobk8gyd0="; }; propagatedBuildInputs = [ From d037e72af94319c963d09f793ea5a9a2878c2d7f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 27 Mar 2022 21:25:44 +0200 Subject: [PATCH 080/163] ungoogled-chromium: 99.0.4844.82 -> 99.0.4844.84 --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 6c8b3c552f00..c3ffe5cf116d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "99.0.4844.82", - "sha256": "0p6jqwal0yrvn8iylm2f3n07hkkaf8899iw9i3cvks0d870hpfxq", - "sha256bin64": "0zhhibz727qx2wg2pcazha3q9xwf1bcm1f9hgid7jq2pq7fq3hdr", + "version": "99.0.4844.84", + "sha256": "05bma8lsm5lad58mlfiv8bg0fw5k5mxh0v6g1ik7xp2bsd71iv10", + "sha256bin64": "0sdnsnp7hnpip91hwbz3hiw2727g0a3ydf55ldqv9bgik3vn1wln", "deps": { "gn": { "version": "2022-01-10", @@ -56,8 +56,8 @@ "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" }, "ungoogled-patches": { - "rev": "99.0.4844.82-1", - "sha256": "1zj8834slli7ydslcwid15r7id4iw0d7ns42hkrj24zl9zh3d5q3" + "rev": "99.0.4844.84-1", + "sha256": "1j02zcam09mdw7wg30r1mx27b8bw0s9dvk4qjl6vrhp24rbmscs7" } } } From 8cd61bf98e16d98682f6251e951a7fa9f9f611d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 21:29:24 +0200 Subject: [PATCH 081/163] python39Packages.pyeclib: 1.6.0 -> unstable-2022-03-11 this fixes python 3.9 and 3.10 support --- pkgs/development/python-modules/pyeclib/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyeclib/default.nix b/pkgs/development/python-modules/pyeclib/default.nix index d55fb416a79e..7dd36c8fd6a1 100644 --- a/pkgs/development/python-modules/pyeclib/default.nix +++ b/pkgs/development/python-modules/pyeclib/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, liberasurecode, six }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, liberasurecode, six }: buildPythonPackage rec { pname = "pyeclib"; - version = "1.6.0"; + version = "unstable-2022-03-11"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-gBHjHuia5/uZymkWZgyH4BCEZqmWK9SXowAQIJdOO7E="; + src = fetchFromGitHub { + owner = "openstack"; + repo = "pyeclib"; + rev = "b50040969a03f7566ffcb468336e875d21486113"; + sha256 = "sha256-nYYjocStC0q/MC6pum3J4hlXiu/R5xODwIE97Ho3iEY="; }; postPatch = '' From 5c4c67e55d79a17d0c6eaf85eaf41783069cc191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Mar 2022 21:30:38 +0200 Subject: [PATCH 082/163] python39Packages.python-novaclient: 17.6.0 -> 17.7.0 --- pkgs/development/python-modules/python-novaclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index afc8a51988ed..e654c75bfe88 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-novaclient"; - version = "17.6.0"; + version = "17.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yRDCCFMQ2mNfs0NYXxBwcS/w+cs8j3nUTKPWMsTyMPU="; + sha256 = "sha256-Trwn9M4GwVW46ZGkRGO5NYWW5oVs8XHJr43HVo2Gi+0="; }; propagatedBuildInputs = [ From 07c164d35b10741954fe110510c76efc20b465f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Mar 2022 19:47:34 +0000 Subject: [PATCH 083/163] python310Packages.scikit-fmm: 2022.2.2 -> 2022.3.26 --- pkgs/development/python-modules/scikit-fmm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index 4f823a54580b..34cf4ddaae02 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scikit-fmm"; - version = "2022.2.2"; + version = "2022.3.26"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0Pvm6Sn0OWOwEX7E4OhBwo2hxzQmGzV2Yvytkm14+ls="; + sha256 = "sha256-wxVfltcz3qh5FRS3CXYsYdL3z94x7Y0rjCbKFnNW3o4="; }; propagatedBuildInputs = [ From 3c245b4e49da57dee44ecc3e8164987f1d96c894 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Thu, 24 Mar 2022 21:17:05 +0100 Subject: [PATCH 084/163] spicetify-cli: 2.9.2 -> 2.9.4 --- pkgs/applications/misc/spicetify-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 08a54f49584a..07d7d605d809 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.9.2"; + version = "2.9.4"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r6xm0Gq2QXWQEcYEu1n0y6S4r4odzYP8Srr0U+jZr6U="; + sha256 = "sha256-dHkbjmb9qlMO+pYUmdnoztkrMqPW6GfceAUxgnRmlDA="; }; - vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs="; + vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng="; # used at runtime, but not installed by default postInstall = '' From 91e952f8861e0171abae80a95dab40a54fd8627d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Mar 2022 20:35:01 +0000 Subject: [PATCH 085/163] python39Packages.arviz: 0.11.4 -> 0.12.0 --- pkgs/development/python-modules/arviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 22d545f04f50..82fa11897b04 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -25,13 +25,13 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.11.4"; + version = "0.12.0"; src = fetchFromGitHub { owner = "arviz-devs"; repo = "arviz"; rev = "v${version}"; - sha256 = "0vindadyxhxhrhbalys6kzrda2d4qpqbqbsbwfprp8pxkldgk548"; + sha256 = "sha256-ClARxgfji/CavEy8g5oeYK7pwSZS1yUIZnBiyTbZ/zU="; }; propagatedBuildInputs = [ From 82761fb688373e2ca6f08b1f4e718a4f5859eaba Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 27 Mar 2022 13:39:30 -0700 Subject: [PATCH 086/163] python3Packages.releases: init at 1.6.3 --- .../python-modules/releases/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/releases/default.nix diff --git a/pkgs/development/python-modules/releases/default.nix b/pkgs/development/python-modules/releases/default.nix new file mode 100644 index 000000000000..9c1fc34cae46 --- /dev/null +++ b/pkgs/development/python-modules/releases/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, semantic-version +, sphinx +}: + +buildPythonPackage rec { + pname = "releases"; + version = "1.6.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "bitprophet"; + repo = pname; + rev = version; + hash = "sha256-XX2e6bjBNMun31h0sNJ9ieZE01U+PhA5JYYNOuMgD20="; + }; + + postPatch = '' + substituteInPlace setup.py --replace "semantic_version<2.7" "semantic_version" + ''; + + propagatedBuildInputs = [ semantic-version sphinx ]; + + # Test suite doesn't run. See https://github.com/bitprophet/releases/issues/95. + doCheck = false; + + pythonImportsCheck = [ "releases" ]; + + meta = with lib; { + description = "A Sphinx extension for changelog manipulation"; + homepage = "https://github.com/bitprophet/releases"; + license = licenses.bsd2; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 748ad91c9f5c..697cbe95d1a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8698,6 +8698,8 @@ in { relatorio = callPackage ../development/python-modules/relatorio { }; + releases = callPackage ../development/python-modules/releases { }; + remarshal = callPackage ../development/python-modules/remarshal { }; renault-api = callPackage ../development/python-modules/renault-api { }; From 5e7bced95e9e0114653435528c1cdb8e03d48491 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 27 Mar 2022 13:40:01 -0700 Subject: [PATCH 087/163] python3Packages.invocations: init at 2.6.0 --- .../python-modules/invocations/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/invocations/default.nix diff --git a/pkgs/development/python-modules/invocations/default.nix b/pkgs/development/python-modules/invocations/default.nix new file mode 100644 index 000000000000..78ace76b762e --- /dev/null +++ b/pkgs/development/python-modules/invocations/default.nix @@ -0,0 +1,43 @@ +{ buildPythonPackage +, blessings +, fetchFromGitHub +, invoke +, lib +, releases +, semantic-version +, tabulate +, twine +}: + +buildPythonPackage rec { + pname = "invocations"; + version = "2.6.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "pyinvoke"; + repo = pname; + rev = version; + hash = "sha256-eyOJKVRfn7elyEkERl7hvRTNFmq7O9Pr03lBS6xp0wE="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "semantic_version>=2.4,<2.7" "semantic_version" \ + --replace "tabulate==0.7.5" "tabulate" + ''; + + propagatedBuildInputs = [ blessings invoke releases semantic-version tabulate twine ]; + + # There's an error loading the test suite. See https://github.com/pyinvoke/invocations/issues/29. + doCheck = false; + + pythonImportsCheck = [ "invocations" ]; + + meta = with lib; { + description = "Common/best-practice Invoke tasks and collections"; + homepage = "https://invocations.readthedocs.io/"; + license = licenses.bsd2; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 697cbe95d1a0..ddd21e4a384f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4084,6 +4084,8 @@ in { intreehooks = callPackage ../development/python-modules/intreehooks { }; + invocations = callPackage ../development/python-modules/invocations { }; + invoke = callPackage ../development/python-modules/invoke { }; iodata = callPackage ../development/python-modules/iodata { }; From 68eb7fdd62ac795260ba6d838522750ef5551397 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 26 Mar 2022 23:50:39 -0400 Subject: [PATCH 088/163] s3-credentials: init at 0.10 --- .../python-modules/s3-credentials/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/s3-credentials/default.nix diff --git a/pkgs/development/python-modules/s3-credentials/default.nix b/pkgs/development/python-modules/s3-credentials/default.nix new file mode 100644 index 000000000000..61af119aaaa8 --- /dev/null +++ b/pkgs/development/python-modules/s3-credentials/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, click +, click-default-group +, boto3 +, pytestCheckHook +, hypothesis +, pytest-mock +}: + +buildPythonPackage rec { + pname = "s3-credentials"; + version = "0.10"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "simonw"; + repo = "${pname}"; + rev = "${version}"; + sha256 = "sha256-JgqKmZG3K4JwQ1Bzw2oll/LQ1njA9wFhX0/uYr9XjAU="; + }; + + propagatedBuildInputs = [ + click + click-default-group + boto3 + ]; + + checkInputs = [ + pytestCheckHook + hypothesis + pytest-mock + ]; + + meta = with lib; { + description = "Python CLI utility for creating credentials for accessing S3 buckets"; + homepage = "https://github.com/simonw/s3-credentials"; + license = licenses.asl20; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40672ae4dd5b..198fb2c77341 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9696,6 +9696,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + s3-credentials = with python3Packages; toPythonApplication s3-credentials; + s4cmd = callPackage ../tools/networking/s4cmd { }; s5cmd = callPackage ../tools/networking/s5cmd { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 748ad91c9f5c..dcf5a5983e64 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8944,6 +8944,8 @@ in { s3transfer = callPackage ../development/python-modules/s3transfer { }; + s3-credentials = callPackage ../development/python-modules/s3-credentials { }; + sabyenc3 = callPackage ../development/python-modules/sabyenc3 { }; sabyenc = callPackage ../development/python-modules/sabyenc { }; From ca79392bbca3b8e8155780e80dae0e94b308c1f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Mar 2022 00:10:27 +0200 Subject: [PATCH 089/163] python39Packages.osc-lib: 2.5.0 -> unstable-2022-03-09 this fixes tests for python 3.10 --- .../python-modules/osc-lib/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index 95c5e5d6a328..81ae9df4cbec 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , cliff , oslo-i18n , oslo-utils @@ -13,13 +13,18 @@ buildPythonPackage rec { pname = "osc-lib"; - version = "2.5.0"; + version = "unstable-2022-03-09"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-2PikUPqyoSlOCu+M3JolWhvMW1jhsvYJjjXm2x4T6dE="; + src = fetchFromGitHub { + owner = "openstack"; + repo = "osc-lib"; + rev = "65c73fd5030276e34f3d52c03ddb9d27cd8ec6f5"; + sha256 = "sha256-CLE9lrMMlvVrihe+N4wvIKe8t9IZ1TpHHVdn2dnvAOI="; }; + # fake version to make pbr happy... + PBR_VERSION = "2.5.0"; + nativeBuildInputs = [ pbr ]; From a0968ef3b4b65d4c47a4c91e9464503264445837 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Mar 2022 22:14:35 +0000 Subject: [PATCH 090/163] python310Packages.debugpy: 1.5.1 -> 1.6.0 --- pkgs/development/python-modules/debugpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index dc58d8f7b039..9f6026ce7360 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.5.1"; + version = "1.6.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dPP4stLt5nl9B9afPmH6/hpGKXBsaTpvYZQSHxU6KaY="; + sha256 = "sha256-WfZz2SimOTpG8CWNUic8NSp4Qd2JTXk+7JSUEPhuQ6Q="; }; patches = [ From 6d111cbf6153183e251a9518ba5f424d0e731638 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 15 Mar 2022 10:29:16 +0000 Subject: [PATCH 091/163] Clarify that lld package provides unwrapped lld lld package provides an unwrapped lld. It doesn't always work on NixOS (eg, it doesn't set rpath), and so dosen't always work. What one should be using instead is the `lld` from `llvmPackages.bintools` package. This super counterintutive. One incremental step we can take here is to clarify that the `lld` package is unrwapped -- right now, it looks like 100% legit thing one should be using! --- pkgs/development/compilers/llvm/10/lld/default.nix | 2 +- pkgs/development/compilers/llvm/11/lld/default.nix | 2 +- pkgs/development/compilers/llvm/12/lld/default.nix | 2 +- pkgs/development/compilers/llvm/13/lld/default.nix | 2 +- pkgs/development/compilers/llvm/14/lld/default.nix | 2 +- pkgs/development/compilers/llvm/5/lld/default.nix | 2 +- pkgs/development/compilers/llvm/6/lld/default.nix | 2 +- pkgs/development/compilers/llvm/7/lld/default.nix | 2 +- pkgs/development/compilers/llvm/8/lld/default.nix | 2 +- pkgs/development/compilers/llvm/9/lld/default.nix | 2 +- pkgs/development/compilers/llvm/git/lld/default.nix | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/lld/default.nix b/pkgs/development/compilers/llvm/10/lld/default.nix index 5d590aec35ac..4b7d4eafcbf3 100644 --- a/pkgs/development/compilers/llvm/10/lld/default.nix +++ b/pkgs/development/compilers/llvm/10/lld/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/11/lld/default.nix b/pkgs/development/compilers/llvm/11/lld/default.nix index d344d3d3c117..8a9daf317c24 100644 --- a/pkgs/development/compilers/llvm/11/lld/default.nix +++ b/pkgs/development/compilers/llvm/11/lld/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/12/lld/default.nix b/pkgs/development/compilers/llvm/12/lld/default.nix index f9b0effbff30..cc476259612c 100644 --- a/pkgs/development/compilers/llvm/12/lld/default.nix +++ b/pkgs/development/compilers/llvm/12/lld/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/13/lld/default.nix b/pkgs/development/compilers/llvm/13/lld/default.nix index 2b5e9e965d07..d37a380c6397 100644 --- a/pkgs/development/compilers/llvm/13/lld/default.nix +++ b/pkgs/development/compilers/llvm/13/lld/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/14/lld/default.nix b/pkgs/development/compilers/llvm/14/lld/default.nix index fe655c761129..1ae6d4ea6fce 100644 --- a/pkgs/development/compilers/llvm/14/lld/default.nix +++ b/pkgs/development/compilers/llvm/14/lld/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/5/lld/default.nix b/pkgs/development/compilers/llvm/5/lld/default.nix index 7e74e79a15c7..239cb84c2ceb 100644 --- a/pkgs/development/compilers/llvm/5/lld/default.nix +++ b/pkgs/development/compilers/llvm/5/lld/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/6/lld/default.nix b/pkgs/development/compilers/llvm/6/lld/default.nix index 83b1991f453c..81dd39c39eb8 100644 --- a/pkgs/development/compilers/llvm/6/lld/default.nix +++ b/pkgs/development/compilers/llvm/6/lld/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/7/lld/default.nix b/pkgs/development/compilers/llvm/7/lld/default.nix index 09a0a68e2572..7858599990ca 100644 --- a/pkgs/development/compilers/llvm/7/lld/default.nix +++ b/pkgs/development/compilers/llvm/7/lld/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/8/lld/default.nix b/pkgs/development/compilers/llvm/8/lld/default.nix index 66b59937e5f1..30be084fa814 100644 --- a/pkgs/development/compilers/llvm/8/lld/default.nix +++ b/pkgs/development/compilers/llvm/8/lld/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/9/lld/default.nix b/pkgs/development/compilers/llvm/9/lld/default.nix index d13e6a107dd9..73cfe630bbbb 100644 --- a/pkgs/development/compilers/llvm/9/lld/default.nix +++ b/pkgs/development/compilers/llvm/9/lld/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/git/lld/default.nix b/pkgs/development/compilers/llvm/git/lld/default.nix index fe655c761129..1ae6d4ea6fce 100644 --- a/pkgs/development/compilers/llvm/git/lld/default.nix +++ b/pkgs/development/compilers/llvm/git/lld/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features From d4b233e330f21cc526ac64923d94c6aea0d4400d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Mar 2022 00:23:12 +0200 Subject: [PATCH 092/163] python39Packages.google-cloud-bigquery: disable tests which require network --- .../python-modules/google-cloud-bigquery/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index a7ee6a72913b..86ac3048e0ab 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -70,6 +70,9 @@ buildPythonPackage rec { "test_parameterized_types_round_trip" "test_structs" "test_table_snapshots" + "test__initiate_resumable_upload" + "test__initiate_resumable_upload_mtls" + "test__initiate_resumable_upload_with_retry" ]; pythonImportsCheck = [ From e3d498d19ee7bb185873a626da2a5b3f959effa5 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sun, 27 Mar 2022 02:48:05 -0400 Subject: [PATCH 093/163] pscale: 0.89.0 -> 0.90.0 --- pkgs/development/tools/pscale/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 50517db6ee9b..c375869603f6 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -2,16 +2,23 @@ buildGoModule rec { pname = "pscale"; - version = "0.89.0"; + version = "0.90.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-6iExcck9s5Z6c8QA+F+Fnk5g0WNmifaSQa2KaIS9m8M="; + sha256 = "sha256-uOKx367fFJQvoqakY5PmesOk2l9eYsnECf6AdO2NsuI="; }; - vendorSha256 = "sha256-kNt7tMHubpcrfzAjf++GxV3kEj2g6fHFrP9cY8UPqB8="; + vendorSha256 = "sha256-IUntyI3EeYsf2tesvm0H+bNCtpnNfQV7WURLFvJXMac="; + + ldflags = [ + "-s" "-w" + "-X main.version=v${version}" + "-X main.commit=v${version}" + "-X main.date=unknown" + ]; meta = with lib; { homepage = "https://www.planetscale.com/"; From f4182075ff292f9c737fa2281f60ea4f514ace89 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 28 Mar 2022 00:39:07 +0200 Subject: [PATCH 094/163] Update pkgs/development/python-modules/osc-lib/default.nix --- pkgs/development/python-modules/osc-lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index 81ae9df4cbec..e9a662412b77 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "sha256-CLE9lrMMlvVrihe+N4wvIKe8t9IZ1TpHHVdn2dnvAOI="; }; - # fake version to make pbr happy... + # fake version to make pbr.packaging happy and not reject it... PBR_VERSION = "2.5.0"; nativeBuildInputs = [ From a39b29dd095327add9a8fbd09ce52f6b9526c7ad Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Sun, 27 Mar 2022 23:39:51 +0000 Subject: [PATCH 095/163] git-branchless: 0.3.9 -> 0.3.10 --- .../git-and-tools/git-branchless/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix index 8cedd24be052..19f794e6c916 100644 --- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.3.9"; + version = "0.3.10"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - sha256 = "sha256-SEmIZy8ql1MxcFR6zeif03DVha/SRZHajVwt3QOBBYU="; + sha256 = "sha256-TLqAU1/olSS59Zeb+2m9Jq19EYTO1TnbKPYciHPKO2A="; }; - cargoSha256 = "sha256-mKfPxU1JoN/xLdPdwy3vo1M0qF9ag0T4Ls4dfvHn6Pc="; + cargoSha256 = "sha256-sA4KWGW4bxGUkotTWHUcRqcoaUJsSUCTK8hUkKiRcnY="; nativeBuildInputs = [ pkg-config ]; @@ -39,8 +39,8 @@ rustPlatform.buildRustPackage rec { ]; preCheck = '' - export PATH_TO_GIT=${git}/bin/git - export GIT_EXEC_PATH=$(${git}/bin/git --exec-path) + export TEST_GIT=${git}/bin/git + export TEST_GIT_EXEC_PATH=$(${git}/bin/git --exec-path) ''; # FIXME: these tests deadlock when run in the Nix sandbox checkFlags = [ From 1edfe6d91bd8348cfccacd72e82d1d06ad470117 Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Tue, 22 Mar 2022 05:21:47 -0400 Subject: [PATCH 096/163] cosmopolitan: 0.3 -> unstable-2022-03-22 --- .../libraries/cosmopolitan/default.nix | 64 ++++++++++--------- .../libraries/cosmopolitan/ioctl.patch | 12 ++++ 2 files changed, 45 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/libraries/cosmopolitan/ioctl.patch diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix index 629e5465a044..ca303fdeaea3 100644 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -1,68 +1,70 @@ -{ lib, gcc9Stdenv, fetchFromGitHub, runCommand, cosmopolitan }: +{ lib, stdenv, fetchFromGitHub, runCommand, unzip, cosmopolitan,bintools-unwrapped }: -gcc9Stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "cosmopolitan"; - version = "0.3"; + version = "unstable-2022-03-22"; src = fetchFromGitHub { owner = "jart"; repo = "cosmopolitan"; - rev = version; - sha256 = "sha256-OVdOObO82W6JN63OWKHaERS7y0uvgxt+WLp6Y0LsmJk="; + rev = "5022f9e9207ff2b79ddd6de6d792d3280e12fb3a"; + sha256 = "sha256-UjL4wR5HhuXiQXg6Orcx2fKiVGRPMJk15P779BP1fRA="; }; + patches = [ + ./ioctl.patch # required /dev/tty + ]; + postPatch = '' patchShebangs build/ - rm -r third_party/gcc ''; dontConfigure = true; dontFixup = true; enableParallelBuilding = true; - - preBuild = '' - makeFlagsArray=( - SHELL=/bin/sh - AS=${gcc9Stdenv.cc.targetPrefix}as - CC=${gcc9Stdenv.cc.targetPrefix}gcc - GCC=${gcc9Stdenv.cc.targetPrefix}gcc - CXX=${gcc9Stdenv.cc.targetPrefix}g++ - LD=${gcc9Stdenv.cc.targetPrefix}ld - OBJCOPY=${gcc9Stdenv.cc.targetPrefix}objcopy - "MKDIR=mkdir -p" - ) - ''; + nativeBuildInputs = [ bintools-unwrapped unzip ]; installPhase = '' runHook preInstall - mkdir -p $out/{bin,lib/include} - install o/cosmopolitan.h $out/lib/include + mkdir -p $out/{bin,include,lib} + install o/cosmopolitan.h $out/include install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} $out/lib + cat > $out/bin/cosmoc <hello.c - ${gcc9Stdenv.cc}/bin/gcc -g -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone -o hello.com.dbg hello.c \ + printf '#include "libc/stdio/stdio.h"\nmain() { printf("hello world\\n"); }\n' >hello.c + ${stdenv.cc}/bin/gcc -g -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone -o hello.com.dbg hello.c \ -fuse-ld=bfd -Wl,-T,${cosmopolitan}/lib/ape.lds \ - -include ${cosmopolitan}/lib/{include/cosmopolitan.h,crt.o,ape.o,cosmopolitan.a} - ${gcc9Stdenv.cc.bintools.bintools_bin}/bin/objcopy -S -O binary hello.com.dbg hello.com + -include ${cosmopolitan}/include/cosmopolitan.h \ + -I ${cosmopolitan}/include \ + ${cosmopolitan}/lib/{crt.o,ape.o,cosmopolitan.a} + ${stdenv.cc.bintools.bintools_bin}/bin/objcopy -S -O binary hello.com.dbg hello.com ./hello.com printf "test successful" > $out ''; cosmoc = runCommand "cosmoc-hello" { } '' - printf 'main() { printf("hello world\\n"); }\n' >hello.c + printf '#include "libc/stdio/stdio.h"\nmain() { printf("hello world\\n"); }\n' >hello.c ${cosmopolitan}/bin/cosmoc hello.c ./a.out printf "test successful" > $out diff --git a/pkgs/development/libraries/cosmopolitan/ioctl.patch b/pkgs/development/libraries/cosmopolitan/ioctl.patch new file mode 100644 index 000000000000..e6e7eb4fc7b0 --- /dev/null +++ b/pkgs/development/libraries/cosmopolitan/ioctl.patch @@ -0,0 +1,12 @@ +diff --git a/third_party/python/python.mk b/third_party/python/python.mk +index f18c15060..b17455bca 100644 +--- a/third_party/python/python.mk ++++ b/third_party/python/python.mk +@@ -1818,7 +1818,6 @@ THIRD_PARTY_PYTHON_PYTEST_PYMAINS = \ + third_party/python/Lib/test/test_int_literal.py \ + third_party/python/Lib/test/test_bisect.py \ + third_party/python/Lib/test/test_pyexpat.py \ +- third_party/python/Lib/test/test_ioctl.py \ + third_party/python/Lib/test/test_getopt.py \ + third_party/python/Lib/test/test_sort.py \ + third_party/python/Lib/test/test_slice.py \ From 6e6a3202c4ce57f230b9d68df26c5813c9170e3a Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 27 Mar 2022 22:22:15 +0300 Subject: [PATCH 097/163] all-packages.nix: pythonXPackages point to pythonXXPackages instead of pythonXX.pkgs should help with ofborg not building commits which have `python3Packages` instead of `python39Packages` see https://github.com/NixOS/ofborg/issues/577 dontRecurseIntoAttrs is used to avoid a performance penalty --- pkgs/top-level/all-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d13066e27f35..5b3de46a2086 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14052,6 +14052,11 @@ with pkgs; # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md python2 = python27; python3 = python39; + + # pythonPackages further below, but assigned here because they need to be in sync + python2Packages = dontRecurseIntoAttrs python27Packages; + python3Packages = dontRecurseIntoAttrs python39Packages; + pypy = pypy2; pypy2 = pypy27; pypy3 = pypy38; @@ -14093,10 +14098,6 @@ with pkgs; x11Support = true; }; - # pythonPackages further below, but assigned here because they need to be in sync - python2Packages = python2.pkgs; - python3Packages = python3.pkgs; - pythonInterpreters = callPackage ./../development/interpreters/python { }; inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python3Minimal pypy27 pypy38 pypy37 rustpython; From 08b1f113d9ad681deb392e53ec5742e47d0734fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Mar 2022 00:45:18 +0000 Subject: [PATCH 098/163] python310Packages.types-requests: 2.27.14 -> 2.27.15 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index d6d7f752a7a9..95e263135ecb 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.14"; + version = "2.27.15"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BFee4WT3wmWb5GlQ48L41RoIGtJS7xsB1LEvq6XDgQs="; + sha256 = "sha256-LTcRg8U1II0syP50c9m0nDRMcHfrcDAutwhjj7hghqg="; }; propagatedBuildInputs = [ From 30527ee7e5ebfaf0a82973259ae1791e5e3a8fff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Mar 2022 00:55:12 +0000 Subject: [PATCH 099/163] python310Packages.mypy-boto3-builder: 7.4.1 -> 7.5.3 --- .../development/python-modules/mypy-boto3-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index cabbdaad35e6..c0e0fd56aa10 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.4.1"; + version = "7.5.3"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - hash = "sha256-7sl6S1/bQceVP6i/3KMYqsrOxNBvpBZUKdpOrnlhYNk="; + hash = "sha256-nG4V2xA5nZfprMjiP+QePHelE0ZvryYH+kCfobKpAMQ="; }; nativeBuildInputs = [ From c1a928b30bcc77456ea2db8df464eae865e25e7d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 26 Mar 2022 00:00:49 +0800 Subject: [PATCH 100/163] crystal: remove pointless reference to crystal.lib --- .../compilers/crystal/build-package.nix | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index a44eaeb369b6..1bdc8989cf1d 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -1,4 +1,15 @@ -{ stdenv, lib, crystal, shards, git, pkg-config, which, linkFarm, fetchFromGitHub, installShellFiles }: +{ stdenv +, lib +, crystal +, shards +, git +, pkg-config +, which +, linkFarm +, fetchFromGitHub +, installShellFiles +, removeReferencesTo +}: { # Some projects do not include a lock file, so you can pass one @@ -60,7 +71,13 @@ stdenv.mkDerivation (mkDerivationArgs // { buildInputs = args.buildInputs or [ ] ++ [ crystal ] ++ lib.optional (format != "crystal") shards; - nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkg-config which ]; + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ + git + installShellFiles + removeReferencesTo + pkg-config + which + ]; buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([ "runHook preBuild" @@ -102,6 +119,7 @@ stdenv.mkDerivation (mkDerivationArgs // { installManPage man/*.? fi '') ++ [ + "remove-references-to -t ${lib.getLib crystal} $out/bin/*" "runHook postInstall" ])); From 1724e20fbc851f0dd40827335e042b13f8291e9a Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 27 Mar 2022 18:32:34 -0700 Subject: [PATCH 101/163] Revert "python39Packages.google-auth-oauthlib: 0.4.6 -> 0.5.1" --- .../python-modules/google-auth-oauthlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 6ee0cb065401..1d23af5a3d46 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.5.1"; + version = "0.4.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MFlrgk/GgI/ayi8EjkmYzED7SzWZ6upm0o3HCFs2xbg="; + sha256 = "sha256-qQoHL2mT8sMnBnv2UnAEY4TNpajssguU6ppofx8jOno="; }; propagatedBuildInputs = [ From 4c0dc16f28692de49919551466caf0c0856c6f83 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 28 Mar 2022 04:01:43 +0200 Subject: [PATCH 102/163] ircdog: 0.2.1 -> 0.3.0 https://github.com/ergochat/ircdog/releases/tag/v0.3.0 --- pkgs/applications/networking/irc/ircdog/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/applications/networking/irc/ircdog/default.nix index 5badc69a3a27..87d4b8777c3f 100644 --- a/pkgs/applications/networking/irc/ircdog/default.nix +++ b/pkgs/applications/networking/irc/ircdog/default.nix @@ -5,21 +5,22 @@ buildGoPackage rec { pname = "ircdog"; - version = "0.2.1"; + version = "0.3.0"; - goPackagePath = "github.com/goshuirc/ircdog"; + goPackagePath = "github.com/ergochat/ircdog"; src = fetchFromGitHub { owner = "goshuirc"; repo = pname; rev = "v${version}"; - sha256 = "1ppbznlkv7vajfbimxbyiq5y6pkfhm6ylhl408rwq1bawl28hpkl"; + sha256 = "sha256-x3ihWLgVYu17vG1xQTgIr4TSkeZ467TZBV1fPTPnZgw="; fetchSubmodules = true; }; meta = with lib; { description = "ircdog is a simple wrapper over the raw IRC protocol that can respond to pings, and interprets formatting codes"; - homepage = "https://github.com/goshuirc/ircdog"; + homepage = "https://github.com/ergochat/ircdog"; + changelog = "https://github.com/ergochat/ircdog/releases/tag/v${version}"; license = licenses.isc; maintainers = with maintainers; [ hexa ]; }; From 401a033c6fab4ac564b24d8a466505a72213690f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 27 Mar 2022 18:35:34 +0000 Subject: [PATCH 103/163] deltachat-desktop: fix icon --- .../instant-messengers/deltachat-desktop/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index e4d6f71be7ac..f80d8cab8b11 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -81,6 +81,9 @@ in nodejs-14_x.pkgs.deltachat-desktop.override rec { npm prune --production + install -D $out/lib/node_modules/deltachat-desktop/build/icon.png \ + $out/share/icons/hicolor/scalable/apps/deltachat.png + awk '!/^#/ && NF' build/packageignore_list \ | xargs -I {} sh -c "rm -rf {}" || true @@ -91,10 +94,6 @@ in nodejs-14_x.pkgs.deltachat-desktop.override rec { $out/lib/node_modules/deltachat-desktop/html-dist/fonts done - mkdir -p $out/share/icons/hicolor/scalable/apps - ln -s $out/lib/node_modules/deltachat-desktop/build/icon.png \ - $out/share/icons/hicolor/scalable/apps/deltachat.png - makeWrapper ${electronExec} $out/bin/deltachat \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \ --add-flags $out/lib/node_modules/deltachat-desktop From 97e586356901b2ea7b6df453caf43b98fae355a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 27 Mar 2022 20:14:15 +0000 Subject: [PATCH 104/163] deltachat-desktop: update react-string-replace to 1.0.0 This reduces the closure size by 4.9 MiB. --- .../deltachat-desktop/package.json | 2 +- .../node-packages/node-packages.nix | 833 +++++++++--------- 2 files changed, 415 insertions(+), 420 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json index ec6ffd5a49ed..ca584702765a 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json @@ -25,7 +25,7 @@ "react-dom": "^17.0.2", "react-qr-reader": "^2.2.1", "react-qr-svg": "^2.1.0", - "react-string-replace": "^0.4.4", + "react-string-replace": "^1.0.0", "react-virtualized-auto-sizer": "^1.0.5", "react-window": "^1.8.6", "react-window-infinite-loader": "^1.0.7", diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c191104a39d9..0ab3eda77407 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@alexbosworth/caporal-1.4.0" = { + "@alexbosworth/caporal-1.4.1" = { name = "_at_alexbosworth_slash_caporal"; packageName = "@alexbosworth/caporal"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@alexbosworth/caporal/-/caporal-1.4.0.tgz"; - sha512 = "n/Oq0C+5XkoruoG0DTs5KwSA5rPF7hd4cwoc9atKHE2MP2yDoMCc1mPSaU8VhrsscymXo0cLCySOXn5v96FWxw=="; + url = "https://registry.npmjs.org/@alexbosworth/caporal/-/caporal-1.4.1.tgz"; + sha512 = "oNEyHFcHc66gzmUXDUqzoqEpjcQnsp4REzXMkQNGxMF7MZDxiec3m9IVvzFmXtl0jU48bX/+ay5aZ8G3EVQV3g=="; }; }; "@alexbosworth/cli-table3-0.6.1" = { @@ -76,13 +76,13 @@ let sha512 = "9ls0Zn0qXTmUdt1p9LA1P9Kor9wF1pXtfUTjipCpoYYQ4fEUsuCgQbiymk4oJccpsZ9dAG3vZ1Zt51WabjJTUw=="; }; }; - "@alexbosworth/prettyjson-1.2.1" = { + "@alexbosworth/prettyjson-1.2.2" = { name = "_at_alexbosworth_slash_prettyjson"; packageName = "@alexbosworth/prettyjson"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@alexbosworth/prettyjson/-/prettyjson-1.2.1.tgz"; - sha512 = "b7AoM21tb21f+ZAZfKswhQ5u+ZjjYt6Mywlp1nbXrKEmER/iIco10S4Ply9dSAon4alpHTcP1ixT/kZb7422/Q=="; + url = "https://registry.npmjs.org/@alexbosworth/prettyjson/-/prettyjson-1.2.2.tgz"; + sha512 = "JsqGgC96z8HFceI94ZLAXLxPXw9oMmQh9XpK5tbRSoU6A4JGz1I7ssplLOTfc50Y73bWVoEJs1ja7BcEToMFmQ=="; }; }; "@alexbosworth/saxophone-0.6.2" = { @@ -2344,13 +2344,13 @@ let sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; }; }; - "@blueprintjs/colors-4.0.0" = { + "@blueprintjs/colors-4.0.1" = { name = "_at_blueprintjs_slash_colors"; packageName = "@blueprintjs/colors"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.0.tgz"; - sha512 = "EmX6Sxq+p2Bb5Ol03WPUCQCqPwiMcn+2cRaSQ3BjSleXSZhRZpBQmNRIVeNtgDhe4iqyfxmgZWeZ4UjHGRuW9w=="; + url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.1.tgz"; + sha512 = "w2kMtUzQjHdrmjXpUnCfTq7/pc41S4UnXzOp6+AZtzCR4cVG1r2yBWR4XxaAAecDb94/yIBXooqtMD0B8T1Y2w=="; }; }; "@blueprintjs/core-3.54.0" = { @@ -6520,328 +6520,328 @@ let sha512 = "GdTwDHSaZ6iP5LUdvS/SLUjn3067xn1HcBsLZCh8YOsf22d/YWTBcnFl3buieBP4KiajwHLho4I8HSMDKACBSg=="; }; }; - "@ot-builder/bin-composite-types-1.4.0" = { + "@ot-builder/bin-composite-types-1.5.0" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.4.0.tgz"; - sha512 = "OzEsssOyEKy1setspPKun8E6tlDpFguLQwCAN1iK9HsrJwgK1lqcwA+PDUxwEIcKj6zaSDI9fb53v6WnsSSf5w=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.5.0.tgz"; + sha512 = "0X12BGmy7l91ONXGLfmG3BQerqjdipYgrGhREXL80qcKQfcZL4o+7NHjq/FDlFYpMGLxDq9CkprGEDmgSIL9CA=="; }; }; - "@ot-builder/bin-util-1.4.0" = { + "@ot-builder/bin-util-1.5.0" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.4.0.tgz"; - sha512 = "5OMGopgGimoKoHjag2YtPeAyGp3JzMaclzoh4Npelj1hNLebWfdmcKdE3zcixk5eMK2KTr1aKZMCvbbIPhUHFw=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.5.0.tgz"; + sha512 = "zLBqM5SjP/EmVaZtwqOjK832yzYQTlWqtldOmgAizckiNpayC6P5c49KJpVTLhVh54euhsk9oJUjsi0L9i8A0g=="; }; }; - "@ot-builder/cli-help-shower-1.4.0" = { + "@ot-builder/cli-help-shower-1.5.0" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.4.0.tgz"; - sha512 = "1tPeg1TGW1EvJhseA0J12tfQhz1R+YocU0/9HpdUiw2Ny9f8KnY/Z4jM+6KrNXPBlqJf3U7h5D/Mqaa+8I6ROw=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.5.0.tgz"; + sha512 = "2jMS5aTr+92mt0HsUoLLV+1GBMsk2GC1tx5YFcdDBH7rfExvYR5NKgpO1d7muVdUi8WBh4fn611rb5sjhBtF5Q=="; }; }; - "@ot-builder/cli-proc-1.4.0" = { + "@ot-builder/cli-proc-1.5.0" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.4.0.tgz"; - sha512 = "IiUQNzhV4qWix6cG2gUjyJ0DEiphgOp4sFCNssMy5so1J1635qTYmkodTWgynVKQ31qCiamtS5+WMtNIwjlodg=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.5.0.tgz"; + sha512 = "zU0afR6WqkUcogoX1pLJBsYSlViPJCkQ1zrHjnOLcHRJ5zIPwNXbFUTAhWePMvNF8EAjtILGeX8ZxoE3PtXMTQ=="; }; }; - "@ot-builder/cli-shared-1.4.0" = { + "@ot-builder/cli-shared-1.5.0" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.4.0.tgz"; - sha512 = "PhYzNdTC5rTpwkT0PFmiWHVkJZBHZN82HPAtsEHyL3nPKK3ygxReNo1FYVQ5DfO9PJE1NxYKv9AqrMAjL1IhNQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.5.0.tgz"; + sha512 = "hOYs07mNlg9Z+Rl2wKsDRzb0gYVsnAv6K8O52Q141QBvu5Uyjb6p19zM8pYvOF7VXZTGEhki9WNoM3qVgp5pSA=="; }; }; - "@ot-builder/common-impl-1.4.0" = { + "@ot-builder/common-impl-1.5.0" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.4.0.tgz"; - sha512 = "tK6UV2dEkWi4cj7v0miMVhGuHOhcAOoqNkzWoyNgbqevzvftvX+FR2TxDrRgDJ00928yaSpxs5Luk+nLZetDwA=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.5.0.tgz"; + sha512 = "6linn1dhjDVIiu2cvY0UACSAJClKvLmwrLigg3dzlEjJRvr6jnE/zZ8D401CuL7EMLJPNjciSlf1lQCj5/MU8Q=="; }; }; - "@ot-builder/errors-1.4.0" = { + "@ot-builder/errors-1.5.0" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.4.0.tgz"; - sha512 = "DriKgSnAXxXFynOZHABycRdd42xLc7O45TGusTIo5r9HE8oF24IadBch1MWxQVuJtfakIcjy3lgIYmAjTkxzfw=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.5.0.tgz"; + sha512 = "vARlbSzv3euBX0/Y4orHhbYZOsj7hYjsPU+VXt2LD+do6On1EJ8z6vvXXZxB4B52Rr2jnxzycqk0fNh95IKTeg=="; }; }; - "@ot-builder/io-bin-cff-1.4.0" = { + "@ot-builder/io-bin-cff-1.5.0" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.4.0.tgz"; - sha512 = "4qbs6oCwxdUFJYfnHgoyGRbRmH0if8XfIIbcpqfxaXOdNCI2tE+t49svUNmwwzx/tr3TvGH5Q98fvJghbkBtpg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.5.0.tgz"; + sha512 = "3KWiwRB/8JUkfxE3WqR/xOWQdBDbIS6evdQPBQ/CAJV1qyTtL3Q9KfCHaMPHJcDLbKPP/4lnhKEyi6QsnJU/Tw=="; }; }; - "@ot-builder/io-bin-encoding-1.4.0" = { + "@ot-builder/io-bin-encoding-1.5.0" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.4.0.tgz"; - sha512 = "7RWM4N5/TjIflBJ5i/Gvbis2A9yAnVPdS/MGJTbgfLQkRKaZPajpf3JlIiV7OSnixm89i3wmspHVeadueqDpMQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.5.0.tgz"; + sha512 = "h55cS6agqz++YRMPAi6Zvgd6oWllF9+SjF72whPGekOjRZLNemuTpmWBbXbD3gc1pU8SqSUUSeIcUdny3sqtdg=="; }; }; - "@ot-builder/io-bin-ext-private-1.4.0" = { + "@ot-builder/io-bin-ext-private-1.5.0" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.4.0.tgz"; - sha512 = "amQJaRUMhgun9MzhJQkfkwH+P3RidMePeeBcMCexgMweouCcKMuAvju6rZsysybad3V/BdCwEap3wjiqkPQuWQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.5.0.tgz"; + sha512 = "11K88CL96HiSP0DZYvNd/oULlDbKfD+RYChnl8OJlYDKqxQcFfecIcgKAJmEpmkr11MurRB0AdP2Hg6HBCUFuA=="; }; }; - "@ot-builder/io-bin-font-1.4.0" = { + "@ot-builder/io-bin-font-1.5.0" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.4.0.tgz"; - sha512 = "sJ+rMKLH63H6spdsaSdTgYmFBDDoMy22YCINtOEQRmQgbV9nuiElsJr8LSA6LlXN5joQU3y12D2oA2m044y0Uw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.5.0.tgz"; + sha512 = "UuepwTTj9lbFh92vvyyK346OBVKlG7mXUcafrRijGGCyc1Toe+HONaCU1dcNy9IvwlNjEa6svrQfMFx8fwxMKA=="; }; }; - "@ot-builder/io-bin-glyph-store-1.4.0" = { + "@ot-builder/io-bin-glyph-store-1.5.0" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.4.0.tgz"; - sha512 = "NiQOkjDBQ8SLdX9vVu/9/7/IOowDGEBT/dkM3rzAOGJEj/DxRcWc5uR1z3nE2m/DaGWkTfigV4yk+HO+DQnoog=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.5.0.tgz"; + sha512 = "Xtg0k34yj4nfFlyh/lpBM6O66QYiAW9+/qmn5Rtp9N8hDCGD+2HZ7fTZZdcqgXYZblZvlknzBFKSOLoupcvZNg=="; }; }; - "@ot-builder/io-bin-layout-1.4.0" = { + "@ot-builder/io-bin-layout-1.5.0" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.4.0.tgz"; - sha512 = "rMpXHBYc7rft8HohcZw7OEs1FLphxbQ3UCgltB5PGvBZH7R2nfaYwdzXfXdStHJM0oiI3nx+C7VEl26hAqM6DA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.5.0.tgz"; + sha512 = "bS+e8VkFUX6LyWqD7zGa5FvJbCtIw6Crs2g4DVivn6slhru9JIc5DcNOHp86zwNkwlzg+v+5/3KUoNZoWgxWpw=="; }; }; - "@ot-builder/io-bin-metadata-1.4.0" = { + "@ot-builder/io-bin-metadata-1.5.0" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.4.0.tgz"; - sha512 = "2ygSsCMTvjN5+sd//d+lnqmSwTA04yDYCSnYMQy8k37nJk2xo7VsKnKynUBJPmZ2Km70eT+XaYZyxqqQQw4Mew=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.5.0.tgz"; + sha512 = "0Q0K1UkSqO0wW03UbUuOw79abzNeK6cHjzCE0UX2hZPtH26gEG32xCPYUNCaSxOFPWXSRXPg/kmYIT6/ZmkWLA=="; }; }; - "@ot-builder/io-bin-metric-1.4.0" = { + "@ot-builder/io-bin-metric-1.5.0" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.4.0.tgz"; - sha512 = "ysgatN4dr16nYBFv4mAPbcs6DhbuW/roZtJyVFfil0JtmSa1AJfDbkAxLIA0Uuxay1j7d6ynhK4ojRd4C+rcOA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.5.0.tgz"; + sha512 = "Ezw3MBw4rO6fMrikm1Mc0nOnf3E4FPkHMhUAXN62AFcz6VOKMY34OL+NSoLkJL+HfGTju4KcF3guiNytXrtLeA=="; }; }; - "@ot-builder/io-bin-name-1.4.0" = { + "@ot-builder/io-bin-name-1.5.0" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.4.0.tgz"; - sha512 = "gNLWNlUeIBDybRjT9lwVavbWrswGQ4ixy/SFuAC2D9qIbJeGxrMF9Bb7yid7+g9Z5CV4cPeoxc9s4GRW0viBOw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.5.0.tgz"; + sha512 = "zPhTA5HEwQ0jAovA+ZwPjt3ZNnOaLSQagoLHo6zuETOb+uJSksTExg+G4h6PFHC9U9q55OZ0HidlWOmnmi1xbA=="; }; }; - "@ot-builder/io-bin-sfnt-1.4.0" = { + "@ot-builder/io-bin-sfnt-1.5.0" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.4.0.tgz"; - sha512 = "JsjkrKdMxo93LsNKCaB+ind7tr3kwQz3K/yvLktfteSPKwNkyB1Tl+knwsa3btk/M8v8t3mBazssQz5R2S6+lg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.5.0.tgz"; + sha512 = "/8sANRI3aBKKdOcbnULiS5w5c34d6lb8IufJtYpCuowUuvkDUXF3vlGw7t7CL7mudzdcELpW4ROa1/vNRR+c6Q=="; }; }; - "@ot-builder/io-bin-ttf-1.4.0" = { + "@ot-builder/io-bin-ttf-1.5.0" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.4.0.tgz"; - sha512 = "L57uAa6PkuZ5basqRHgV2YIam6oDM3UaelnTrskeiIdWBHuqutK3a8wFvG71fd3zcqITrrKghHIV6GrfgLWYPA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.5.0.tgz"; + sha512 = "tiyuas19970WkKNFRC4ja9rMD0mgt9arbYbNeQvDjFB9MPsV0+BNgk6fpGr2o8tmYpw73/TZcJfEgIiEICJKtg=="; }; }; - "@ot-builder/io-bin-vtt-private-1.4.0" = { + "@ot-builder/io-bin-vtt-private-1.5.0" = { name = "_at_ot-builder_slash_io-bin-vtt-private"; packageName = "@ot-builder/io-bin-vtt-private"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.4.0.tgz"; - sha512 = "lx37kO2n6pP3na+zwnSiqJ1XecI1sfF7nklclg8uoCROE87WbEmDbBzsgkqXBxHYZ3pVj1ZDydih6NaLXJ9w8w=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.5.0.tgz"; + sha512 = "yz7WLqLI8XZ0KgYowu5ct9rbOS97TQRwudndDDXJZynSFZyUK5wYV9hfqXwKPDQI2QViAWhYBUJDR94zeSe7MA=="; }; }; - "@ot-builder/ot-1.4.0" = { + "@ot-builder/ot-1.5.0" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.4.0.tgz"; - sha512 = "LCJOmacVoVJfeEPb+it3XtYkoz8Q/RBUBgmnHRmovaI0lGLSqK0hOfauaIRap9USS00hT17s7QDPeST+lvlAQA=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.5.0.tgz"; + sha512 = "8nmX1B5D7974LaqH2ieIcZ4TDaAILGvANipOL5e75MMt6jF1O72UUHzO4vJ/llIsZYasqm9+rlv6dkp9CkveZA=="; }; }; - "@ot-builder/ot-encoding-1.4.0" = { + "@ot-builder/ot-encoding-1.5.0" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.4.0.tgz"; - sha512 = "qs8+zx1Ebj2sQyYJjv1BgTKYECNqvA7HZYdVjs2reHm27YwI5uoamQAJ0rQ6+H2xp1pxCI9qRNMAucKkF5Hx3Q=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.5.0.tgz"; + sha512 = "cWVGpb/A3jKPqobIdMUdScq1tUd+ew282P/yLFejIeJvaE4U3zZas6wS9pg4se6uiRsdf8bY5xSjAvnfbJAM1w=="; }; }; - "@ot-builder/ot-ext-private-1.4.0" = { + "@ot-builder/ot-ext-private-1.5.0" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.4.0.tgz"; - sha512 = "L4HihtweRtlBfBOdjBGjUxhqTG/fEGbNgMcsbvrIJIpwglpziAoYosdXxtY5pMYi0TM8ZcWhDtIB2KXTYsy0+g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.5.0.tgz"; + sha512 = "gxbsodaN07XLNtTNLIWhhgHCsXjOs9D7M7c4i40UTv4S80FGzpyJpz2VOW1BJ8SUQjGFP/eeDdSyHWtmrBH21g=="; }; }; - "@ot-builder/ot-glyphs-1.4.0" = { + "@ot-builder/ot-glyphs-1.5.0" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.4.0.tgz"; - sha512 = "4ryJxvvX6v3A1g+aQXgpRlbuVQBSCjukxYMfhnWeLadVPM5Q6VKP0Q1VfZcbJFve/A82ltlGRwhresHy/hXiOw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.5.0.tgz"; + sha512 = "SxqNTishqTKf36tt6XRQkXXLD3fw+7azbf/kSu4A0Pq6MdmRMy5CGs6HDA9KhqaPpmq1UpMk876QPA9vCXoLPw=="; }; }; - "@ot-builder/ot-layout-1.4.0" = { + "@ot-builder/ot-layout-1.5.0" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.4.0.tgz"; - sha512 = "DxLQ8jC/dn29pbCy5vKjHhmsLZ4uOJZjiFkSSoi7N4Di+DILiZfIcRJigbJsnqBF3XRUNpgUQs5HvJl65dMjcA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.5.0.tgz"; + sha512 = "fdmOl/HZi2Jdl0Fh8bx7CCG9s+jXimH+UCez3LPhTXgNNvOaFVqhABPtP+tAepqWi9J0MjBCeWMnFUmGiSa5gw=="; }; }; - "@ot-builder/ot-metadata-1.4.0" = { + "@ot-builder/ot-metadata-1.5.0" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.4.0.tgz"; - sha512 = "g64WKXevoJmlN8QyKL+Ew6DwEPNpdoC2Pn/GCBLoyW8KfEzUg/wUCykZu333X+vKSxqiqssLH/aoUOg6uf8BFA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.5.0.tgz"; + sha512 = "OARTkm/LDERbwo6I0BMdAmA0D6vMP2A0IaQlOWn1PxjNoHOZQY6U+1er1H//xJQZ4aA5BZtRgOoQebjQpYELbg=="; }; }; - "@ot-builder/ot-name-1.4.0" = { + "@ot-builder/ot-name-1.5.0" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.4.0.tgz"; - sha512 = "CGTy3J9P2M03DFcEmR6y4nb3aK6sEaPgXcCR6rXa6gTIxfkVzhpijZzcKUcmzUwh6LYOX3w4RG6Vd9UVOmm+4g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.5.0.tgz"; + sha512 = "b/NSfonC0QqMVNBloOPHeeQIqVAaHaID0oVD/C9jEGKPtp3zpSgS2oycmtZ8JmSqwS2qfJTU9lfzusT6E/LWsw=="; }; }; - "@ot-builder/ot-sfnt-1.4.0" = { + "@ot-builder/ot-sfnt-1.5.0" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.4.0.tgz"; - sha512 = "smgt8TMtB+eMpA4mTzB2NwORcv1/+HhFmys2gr8cYorEvqIgRP15kiC7tVC2in2mKYxIq4+e3Z+MciCCdxTXfQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.5.0.tgz"; + sha512 = "imCGAlN78Yc2HQDVUzNPixj0ERT+PEodi9bp+wINLVYF9G6CgRMTIuSgG0KBK9H8T20sBrorOFfcZFQJuucy4A=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.4.0" = { + "@ot-builder/ot-standard-glyph-namer-1.5.0" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.4.0.tgz"; - sha512 = "dFGkdynJ4sMyPSQkWYJpuNFqAGMXDV4tu0mPevSwrJFudefBmuLIVlOc+rJq19CG+tYq787JJe0CTXIvoq+sNw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.5.0.tgz"; + sha512 = "aZkJBn2kog2eyAcXygzvYte5uH7GCVgO2jM9QeB4bpWoxXYjIF3dy58hsbZ6zKMXMncphOFcnTgxgvct45bglA=="; }; }; - "@ot-builder/ot-vtt-private-1.4.0" = { + "@ot-builder/ot-vtt-private-1.5.0" = { name = "_at_ot-builder_slash_ot-vtt-private"; packageName = "@ot-builder/ot-vtt-private"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.4.0.tgz"; - sha512 = "nVg1Y/y3OzqpVz48oM9Ic6YzUJ8UrrT/5iVZMcQ99m5Zon9hcpp/RrYldOF58XuPO0MtgjLME2g4uFUJWSss7Q=="; + url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.5.0.tgz"; + sha512 = "iMQP2zI56mZJqG98VVAswCe2f2NgApW0BtAKfC/e3VKDJPWbsJHcIHnkcRReaC4FzAmzxqarY1IyeNC94xSNVg=="; }; }; - "@ot-builder/prelude-1.4.0" = { + "@ot-builder/prelude-1.5.0" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.4.0.tgz"; - sha512 = "Q5kqu1DYOeRAcHS15gX1IpoyhR1rffrfKDUcex6nd+GizBPJBdbOtIWpuz7uaOR1zYBCOWuLsyW+h3vKqK0wEw=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.5.0.tgz"; + sha512 = "b3tJ4GTZvK+sFNHlihFaOTxeMOWmSqIDKGOJuV9l6Svn/1moTcO3VWjRuriHmsrA0ZuaSQxTKMf3Na5BYiTnXw=="; }; }; - "@ot-builder/primitive-1.4.0" = { + "@ot-builder/primitive-1.5.0" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.4.0.tgz"; - sha512 = "Op+KrrhVUkFa7FXqTLbtdTYJbIZA4dHFRB7pE7YqEqfjtYv1tcMKGjQIneXi9kO3yG1T6SDdY9V5UTpIs/rfUQ=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.5.0.tgz"; + sha512 = "jJN98wURFXGa8KTfjrIlB54AF2QJw+w9eQuJ812mt8Nmw2Mle+IaYCRAiD8IKWjRWMZcd6bztkOoDbCavqcrUQ=="; }; }; - "@ot-builder/rectify-1.4.0" = { + "@ot-builder/rectify-1.5.0" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.4.0.tgz"; - sha512 = "UMhDyFi00B/6Ols0/WJ8aYdNnHadnSTtc3tN97tjnEs0ZS6Tym6SaL044+ehINJA16kazqHqFJMbwLjA/KrFow=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.5.0.tgz"; + sha512 = "Ivx2VxlMB/Btq4+YLaH4KhPb+eoU4Nsg4UMd5u0BXQ+JjC3HvUbyXDWRMJn3ACDLvvkXSqjEprf7G3BFp58p7g=="; }; }; - "@ot-builder/stat-glyphs-1.4.0" = { + "@ot-builder/stat-glyphs-1.5.0" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.4.0.tgz"; - sha512 = "YgMHUivVuXLd+b2TXLHEQDiCjBnmDwDGTfFiGGbaM/XrCdYMzdHNjbpHWhNx4GODcAplkIQm3j3kwFdM4L1wwA=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.5.0.tgz"; + sha512 = "OMCvsvxsX0dkjWcde3J3sxF1xRbzVm4uyz+G9sgjRXznBLVKtvstTpspFqpTfhUFEcjRU+7AJhWNn4nvXQR/jw=="; }; }; - "@ot-builder/trace-1.4.0" = { + "@ot-builder/trace-1.5.0" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.4.0.tgz"; - sha512 = "fNt9Nf03I7VuLbeziVA5c1pMx9gr8K92Z7UOUnx387eIjeeOLFY98oVSO+XGXFOd+z5lapR9LWhhhaVlIw+YzA=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.5.0.tgz"; + sha512 = "qegG5Oc9gYHWMSnV9qLqYQnQAq79SRHo/apQtnnpD4o7d1SsxDPqR+xspzl3dprPRYSqq8zUKVZ5mxnLNcLPWQ=="; }; }; - "@ot-builder/var-store-1.4.0" = { + "@ot-builder/var-store-1.5.0" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.4.0.tgz"; - sha512 = "IGCQqOeLezgGiohkQdsNJGIkyfV7iZVns83K3i+0tBgSaFOZyNLCjy02eHP6u6Z3a5z0NXjT0yalKNaRLLkGnA=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.5.0.tgz"; + sha512 = "NufILxFqLWcXjhJqG0IgVCDr0ey/e4Q+mX8k0o+SV1/yHdVxug5CrBQnmF7/yIB1Au9FgdZp2eal2Un1gjxQ4A=="; }; }; - "@ot-builder/variance-1.4.0" = { + "@ot-builder/variance-1.5.0" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.4.0.tgz"; - sha512 = "TwlAMp8proF7/y3cWP8Vzxq4cbUUB0TzcS9s2vc4L/IGNdFtuIU7RiSO2A4cHoaBMdJSzCDm5CZ1DQopz/607A=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.5.0.tgz"; + sha512 = "iA8tovocbymAAhA1zRO29vltUlZGfLjYaukyLu3mH8XBgNuxTwb0aUbQ9muDKyWS+E5Q23+KN/PaA8ZwUtlHlA=="; }; }; "@parcel/bundler-default-2.4.0" = { @@ -12370,13 +12370,13 @@ let sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; - "ansi-regex-3.0.0" = { + "ansi-regex-3.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz"; + sha512 = "+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="; }; }; "ansi-regex-4.1.1" = { @@ -14242,13 +14242,13 @@ let sha512 = "fChMDiSfWcW0EUWmiqlyc+VAIXKH0w7BBruL3cVWSwO+5oA5A9juGF4NCBV2/KAHzaKaG0hXKPE49Wh6Lq74ag=="; }; }; - "aws-sdk-2.1100.0" = { + "aws-sdk-2.1101.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1100.0"; + version = "2.1101.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1100.0.tgz"; - sha512 = "StLSQCYFmFPxjoMntIb+8jUZ0vzmq3xkrwG5e/4qU1bSGWCmhhjvz6c+4j38AnIy8MFV1+tV8RArbhLUEV2dGw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1101.0.tgz"; + sha512 = "7lyVb7GXGl8yyu954Qxf6vU6MrcgFlmKyTLBVXJyo3Phn1OB+qOExA55WtSC6gQiQ7e5TeWOn1RUHLg30ywTBA=="; }; }; "aws-sign2-0.6.0" = { @@ -15799,13 +15799,13 @@ let sha512 = "Xzk1FJFHmsc9H8IKFtDUkfAZIT1HW8r6UqajfZBBxWmpA1v7FsPO8xPFtnFzCqcXlPN3yi8dDmlqZCemyB7P8w=="; }; }; - "bittorrent-protocol-3.5.1" = { + "bittorrent-protocol-3.5.2" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.5.1.tgz"; - sha512 = "euVSavQL0jBqRcbsNs5zUP9Ygm+OW5vCDDaatC6vrONtXp+eVe4sO1wA58Gig3IYOdRSBKl53auniWEAJ9quxg=="; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.5.2.tgz"; + sha512 = "IoUKeNg5aIoUfL7iYLM3L6CsuV14iEByyqdT3f2uFK4zlJiQr+kb86ERlrobYBBIj6qW6GJ9eyAU8GhL3IhFrA=="; }; }; "bittorrent-tracker-7.7.0" = { @@ -18077,22 +18077,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.5.50" = { + "cdk8s-1.5.52" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.5.50"; + version = "1.5.52"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.50.tgz"; - sha512 = "8itsVM6ROlxChslw5Utkhf7GdQJ+U3ehsTA9nkApEib8T1FbIfYSj1W7i1Yyx1RVbuxXaMaIhMF94b2wY2sNdg=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.52.tgz"; + sha512 = "xqVD2lUGC3JJC1Zl2YWDop5xcJRl0OT91PAkT7qrWO5Xho4cz3B3NA3Cua4Q7bcLQViL7CeRdH4d9zL9mJmuMw=="; }; }; - "cdk8s-plus-22-1.0.0-beta.155" = { + "cdk8s-plus-22-1.0.0-beta.158" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.155"; + version = "1.0.0-beta.158"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.155.tgz"; - sha512 = "WXHozj1jWTuB4c+Oay6s8ukg1okkcOuj9Dc21Uqmvze3IMkJ6BDKJcltqidtb3xDowzx77Ti5BrvNnjjgPSlEA=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.158.tgz"; + sha512 = "//RAiob+IkkJxMtt2GhLUIchljTjdwkfPSqC+R3scZLtDM1yPlyN1u5qKp/3C6anm2nKtw96zAENpqzfXdZasw=="; }; }; "cdktf-0.9.4" = { @@ -20723,22 +20723,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-10.0.95" = { + "constructs-10.0.97" = { name = "constructs"; packageName = "constructs"; - version = "10.0.95"; + version = "10.0.97"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.0.95.tgz"; - sha512 = "mMay8dY4qOAumJLFacG6eFC1gXx96yPn+uFPPtGMtwZOKyjZ+k6nJ0hZZwm/gKfhUgeoHEOKpk4t2MxbiLsooA=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.0.97.tgz"; + sha512 = "2193Y3iDLY9sYCd89eb4TfjeDN+oD5ocl5d1LRnbGwlmvMe2fWqd9i84ET6K8K/PXBPSTyRQghnpw+Smn8b9vA=="; }; }; - "constructs-3.3.248" = { + "constructs-3.3.250" = { name = "constructs"; packageName = "constructs"; - version = "3.3.248"; + version = "3.3.250"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.248.tgz"; - sha512 = "6W1ZGfZEbPjh28K4htckjGx4aJ5NBmkXp/xWnDSvVwqRSpVBmAucylxVunl0ekwBrhCmw7waDxqeNbXGszLDqg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.250.tgz"; + sha512 = "D1817bciQBs1xFEx1+Yh0ynd4GmrrjNPo93Z3Q8H+bxHBfRN00xSCfgDHttv+dk+6UEA43eYaI4SNYbmfSj2gQ=="; }; }; "consume-http-header-1.0.0" = { @@ -21075,13 +21075,13 @@ let sha1 = "7e3e48bbe6d997b1417ddca2868204b4d3d85715"; }; }; - "convict-6.2.1" = { + "convict-6.2.2" = { name = "convict"; packageName = "convict"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/convict/-/convict-6.2.1.tgz"; - sha512 = "Mn4AJiYkR3TAZH1Xm/RU7gFS/0kM5TBSAQDry8y40Aez0ASY+3boUhv+3QE5XbOXiXM2JjdhkKve3IsBvWCibQ=="; + url = "https://registry.npmjs.org/convict/-/convict-6.2.2.tgz"; + sha512 = "3MsROJiEFN3BAzeFit1t87t7EUFzd44MNd13MLSikV2dsnDl7znwKgtYPPONtnDzxiDW0nBAsxVhSRNrjUrTTg=="; }; }; "cookie-0.0.4" = { @@ -25107,13 +25107,13 @@ let sha1 = "ea80b106a87538774e8a3a4a5afe293de489e0a9"; }; }; - "doipjs-0.15.3" = { + "doipjs-0.15.5" = { name = "doipjs"; packageName = "doipjs"; - version = "0.15.3"; + version = "0.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/doipjs/-/doipjs-0.15.3.tgz"; - sha512 = "USGZwv46WH6iTvlh7QJnndBBqA9iKLoOHOxJ+ap+xYNsopUMq1AB/0+fBgCNYeogTJ+WLcBsqxCR9PunnthhAw=="; + url = "https://registry.npmjs.org/doipjs/-/doipjs-0.15.5.tgz"; + sha512 = "PIZIx+2+LqDtJWUXOMAd0PabT6uojkk5x4k1crUX68nMqDuNKne8v4K2Viytu8F9eBgN1cIUL9gLV8p4oqXI4A=="; }; }; "dom-converter-0.2.0" = { @@ -25917,13 +25917,13 @@ let sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw=="; }; }; - "electron-to-chromium-1.4.93" = { + "electron-to-chromium-1.4.96" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.93"; + version = "1.4.96"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.93.tgz"; - sha512 = "ywq9Pc5Gwwpv7NG767CtoU8xF3aAUQJjH9//Wy3MBCg4w5JSLbJUq2L8IsCdzPMjvSgxuue9WcVaTOyyxCL0aQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.96.tgz"; + sha512 = "DPNjvNGPabv6FcyjzLAN4C0psN/GgD9rSGvMTuv81SeXG/EX3mCz0wiw9N1tUEnfQXYCJi3H8M0oFPRziZh7rw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -27017,6 +27017,15 @@ let sha512 = "/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA=="; }; }; + "eslint-8.12.0" = { + name = "eslint"; + packageName = "eslint"; + version = "8.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz"; + sha512 = "it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q=="; + }; + }; "eslint-config-prettier-6.15.0" = { name = "eslint-config-prettier"; packageName = "eslint-config-prettier"; @@ -30086,13 +30095,13 @@ let sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; }; }; - "form-data-encoder-1.7.1" = { + "form-data-encoder-1.7.2" = { name = "form-data-encoder"; packageName = "form-data-encoder"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.1.tgz"; - sha512 = "EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg=="; + url = "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.2.tgz"; + sha512 = "qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A=="; }; }; "form-urlencoded-4.5.1" = { @@ -33687,13 +33696,13 @@ let sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA=="; }; }; - "html-entities-2.3.2" = { + "html-entities-2.3.3" = { name = "html-entities"; packageName = "html-entities"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz"; - sha512 = "c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ=="; + url = "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz"; + sha512 = "DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA=="; }; }; "html-loader-1.1.0" = { @@ -38359,13 +38368,13 @@ let sha512 = "ZUzuO2JgnxE01tgIdZorsUZj5jiHP8uxeLDU/vsnmnAU2ZbMHFDT1cWacoAKESDnCyFF8VRCuPXHx8e5/SOXig=="; }; }; - "jsii-srcmak-0.1.510" = { + "jsii-srcmak-0.1.512" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.510"; + version = "0.1.512"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.510.tgz"; - sha512 = "ty5U/StsMY/SgFVKC38RoG22qpJEihg/OcH8FbdTuIN/EgYGqtROOtp99jy4vGoEqF0HWqnSjN4yPsIFk5KViA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.512.tgz"; + sha512 = "AA/WSd6ysD6xPrwLvsXOnbgwgN+TlX9ApXBNTsZohQxlKEnyyQAPt945rW9cu/cdNbpc/U/Dnig3CLqDn+PogQ=="; }; }; "json-bigint-1.0.0" = { @@ -38665,13 +38674,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.170" = { + "json2jsii-0.2.172" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.170"; + version = "0.2.172"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.170.tgz"; - sha512 = "ZCU7IyeyS0S8SpDll7ibYinQO0ux0dQghzSkUdgzrZ8S0cf0TeSY02sGPCKh+kFYSFvthuqipMGi3aKtJ7Swjw=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.172.tgz"; + sha512 = "SXqltdQ3byo8XEsClMR5xnV6US5MWu0rBJdAC3NcvFCb0jgzu0V8ljfNJWEJJUKInuQWAsJ788ep5oKbLf3W7g=="; }; }; "json3-3.2.6" = { @@ -49567,22 +49576,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.4.0" = { + "ot-builder-1.5.0" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.4.0.tgz"; - sha512 = "aNXKQr0+ztCBcb0VF7RtNJ2rcUq7jaJWr7PHs47gWVME5O+e+H/pBPh54LFBi9nm17LZGBo/gH+ETiDuMcZj8Q=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.5.0.tgz"; + sha512 = "taCpdbAu+OFogPf5AMdGMt2PnAGER7p4B4EWmIoMh00ZyDcyOVwgbV5V7z64wxo24tAaWXGwLqWOcI2K0SdWhQ=="; }; }; - "otb-ttc-bundle-1.4.0" = { + "otb-ttc-bundle-1.5.0" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.4.0.tgz"; - sha512 = "gZ/8LxA+YTovx/ZcU/iz9vpzpV1PSClDaWLd5ELn2amCLASMy0Icp2CNPateIwl1Z2O2pW9TTCC0Uu/0OsnKgA=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.5.0.tgz"; + sha512 = "wiavReuHttWgXplMV/T86jiT+dYPOZCq1UtsJR11m8ddI2BnDxhNZcg65OlkGU0Iq4tQmyjVG2PdX2sGH319XQ=="; }; }; "ow-0.21.0" = { @@ -50656,13 +50665,13 @@ let sha512 = "yy7UTSmliOT/7Yl+P4hwwW2W7PbCTAMcD0lasaVG+k4/2laj42YWzLm468bLFGDoFPIb29g3BuwBcA3gLopKww=="; }; }; - "parse-torrent-9.1.4" = { + "parse-torrent-9.1.5" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "9.1.4"; + version = "9.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.1.4.tgz"; - sha512 = "NSlG8ewolqfcEWevUUsrpvxzVWYGaKWwPHMcXTAV2qYYo6pPugVOacQXt8uDlEYh23Ituz+A9pAZK5YaXTV8Pg=="; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.1.5.tgz"; + sha512 = "K8FXRwTOaZMI0/xuv0dpng1MVHZRtMJ0jRWBJ3qZWVNTrC1MzWUxm9QwaXDz/2qPhV2XC4UIHI92IGHwseAwaA=="; }; }; "parse-torrent-file-2.1.4" = { @@ -54959,13 +54968,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.232" = { + "pyright-1.1.233" = { name = "pyright"; packageName = "pyright"; - version = "1.1.232"; + version = "1.1.233"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.232.tgz"; - sha512 = "C33CJeenif3Cow+WegUavSgNeCuy/bMhKvZ/UMKnuyVvCNvnSyu+qex+TaRZ+4nbYsZH+9aMDRQrC6YHgHXC6w=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.233.tgz"; + sha512 = "qjyKJd6mfXLwaBls4Ww0CmML+K2gA4NnTelxGktLC3JQv7ioWU7lmiQ1KSr1BnmwuuTfsaJSDN3f+hUf9YPfWg=="; }; }; "q-0.9.7" = { @@ -55967,13 +55976,13 @@ let sha512 = "2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ=="; }; }; - "react-string-replace-0.4.4" = { + "react-string-replace-1.0.0" = { name = "react-string-replace"; packageName = "react-string-replace"; - version = "0.4.4"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-string-replace/-/react-string-replace-0.4.4.tgz"; - sha512 = "FAMkhxmDpCsGTwTZg7p/2v+/GTmxAp73so3fbSvlAcBBX36ujiGRNEaM/1u+jiYQrArhns+7eE92g2pi5E5FUA=="; + url = "https://registry.npmjs.org/react-string-replace/-/react-string-replace-1.0.0.tgz"; + sha512 = "+iLsyE4AeSmnfctgswXOf1PmKRgns6wJ4LVb+8ADMU6mDK3jvBE11QzfMQf7CYtPUUiBCDjZ9ZppzXOIYrzCRg=="; }; }; "react-tabs-3.2.3" = { @@ -59558,13 +59567,13 @@ let sha512 = "lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA=="; }; }; - "selfsigned-2.0.0" = { + "selfsigned-2.0.1" = { name = "selfsigned"; packageName = "selfsigned"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.0.tgz"; - sha512 = "cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ=="; + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz"; + sha512 = "LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ=="; }; }; "semaphore-async-await-1.5.1" = { @@ -62582,13 +62591,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.237" = { + "sscaff-1.2.239" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.237"; + version = "1.2.239"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.237.tgz"; - sha512 = "wKxAHhdrwlrrQb3XXNR9RnUZAGHtK413yYPZnw9E36zEwgM/WRkJUaLz5sbeXXluP+7Vx1UEntBv2d+QCJ6qXg=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.239.tgz"; + sha512 = "labp/0JhozHLJWGAdobeGgabqIosT6oTjRYPVSGQUy+P1L4qTBWLAOBCRURm+4JHLh7fOHXt7gnFLrEg42SDrA=="; }; }; "ssh-config-1.1.6" = { @@ -64553,13 +64562,13 @@ let sha512 = "8z18eX8G/jbTXYzyNIaobrnD7PSN7yU/YkSasMmajrXtw0FGS64XjrKn5v37d36qmU3o1xLeuYnktshRr7uIFw=="; }; }; - "swagger-ui-dist-4.9.0" = { + "swagger-ui-dist-4.9.1" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.9.0"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.9.0.tgz"; - sha512 = "TKoCEfy/I7YfI+ukHwmnknSyUR58ebpdLLv6tJ1FcPYGCmnsgFq7g3gIqrG5zrJiafvI6810xBb6r4r6x17PwA=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.9.1.tgz"; + sha512 = "hYo/kt/wXYd/4WOUm2NLyDa3tR3lCfHbjVa1wSvvSL8AKbYoJsBkc4Va7VJ1uv/JO89xM1736pp1tzJkrVsBxA=="; }; }; "swagger2openapi-7.0.8" = { @@ -70288,15 +70297,6 @@ let sha512 = "GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA=="; }; }; - "vfile-reporter-7.0.3" = { - name = "vfile-reporter"; - packageName = "vfile-reporter"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.3.tgz"; - sha512 = "q+ruTWxFHbow359TDqoNJn5THdwRDeV+XUOtzdT/OESgaGw05CjL68ImlbzRzqS5xL62Y1IaIWb8x+RbaNjayA=="; - }; - }; "vfile-reporter-7.0.4" = { name = "vfile-reporter"; packageName = "vfile-reporter"; @@ -71917,13 +71917,13 @@ let sha512 = "7iZ+u28Ljw5hCnMiq0BCOeSYf0vCFQe/ORY0HgscTiKjQed8WqugpBUggJ2NTnB9fahn1kEnPRX2jf8Px5PhJw=="; }; }; - "webtorrent-1.8.8" = { + "webtorrent-1.8.10" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.8.8"; + version = "1.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.8.tgz"; - sha512 = "M5XUmkfYqmgqLw303Og/nbdfHPWo1D9QqOrFQgcsvILEd0f3Ibsz9ASkojS7noL7YBb4OxYxqiERcotYMGC+sw=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.10.tgz"; + sha512 = "0ywp9VXPMpqemsamWWUjU74vdNpOKUILK+lAfZnOgolybAcYZRJ5gCz0u01BI2NFKHZFWoyDacl3fkbxVb57pw=="; }; }; "webworkify-webpack-2.1.5" = { @@ -74369,10 +74369,10 @@ in "@antfu/ni" = nodeEnv.buildNodePackage { name = "_at_antfu_slash_ni"; packageName = "@antfu/ni"; - version = "0.13.2"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.13.2.tgz"; - sha512 = "iKhPlNUE6fs0g7iRdTJzWFB8XoQb4AbCT46V0mrMsdF1RzyvwnOuzxSjISHQdYzpfirihVG9XpAUy/X540qavg=="; + url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.14.0.tgz"; + sha512 = "AfHEQ+6Kjb+PMdOBR2h6CrDKYgncIZKW5NwkR1BLkCWm4DHBCTfnQJeO3ixtWr0KE9BCnwGoM8xEx6y45p0n4g=="; }; buildInputs = globalBuildInputs; meta = { @@ -74413,7 +74413,7 @@ in sources."color-name-1.1.3" sources."colorette-2.0.16" sources."commander-8.3.0" - sources."convict-6.2.1" + sources."convict-6.2.2" sources."dateformat-4.6.3" sources."duplexify-4.1.2" sources."end-of-stream-1.4.4" @@ -74529,7 +74529,7 @@ in sources."colorette-2.0.16" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" - sources."convict-6.2.1" + sources."convict-6.2.2" sources."core-util-is-1.0.3" sources."crc-32-1.2.1" sources."dateformat-4.6.3" @@ -76096,7 +76096,7 @@ in sources."cli-width-2.2.1" (sources."cliui-4.1.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -76304,7 +76304,7 @@ in sources."inline-process-browser-1.0.0" (sources."inquirer-6.5.2" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."is-fullwidth-code-point-2.0.0" (sources."string-width-2.1.1" // { dependencies = [ @@ -76848,7 +76848,7 @@ in sources."yallist-3.1.1" (sources."yargs-12.0.5" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -77076,7 +77076,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.9.2" @@ -77467,7 +77467,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1100.0" // { + (sources."aws-sdk-2.1101.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -78189,7 +78189,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -79538,7 +79538,7 @@ in sources."vfile-find-up-6.0.0" sources."vfile-location-4.0.1" sources."vfile-message-3.1.2" - (sources."vfile-reporter-7.0.3" // { + (sources."vfile-reporter-7.0.4" // { dependencies = [ sources."ansi-regex-6.0.1" sources."emoji-regex-9.2.2" @@ -79633,7 +79633,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.4" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -80010,7 +80010,7 @@ in dependencies = [ sources."browserslist-4.20.2" sources."caniuse-lite-1.0.30001320" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" sources."escalade-3.1.1" sources."fraction.js-4.2.0" sources."node-releases-2.0.2" @@ -80045,7 +80045,7 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1100.0" // { + (sources."aws-sdk-2.1101.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -80663,13 +80663,13 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.61.2"; + version = "11.61.3"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.61.2.tgz"; - sha512 = "fD9cK+qGSksqZ33jUJwJtYf0t3wP58u7Zmjxs1JVRjjMZ5xoi7u5j/I5wOHkyQOPPWvev3fpQC5j2zkeEvCHoA=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.61.3.tgz"; + sha512 = "+ORg7HujAcHBRnOycZsbkVaNESplxHqYUxbtfZ1jSqNRoIf/mjQhpzTa4L5huBk7C+nFnx/rbfJn+xFIeL7ebA=="; }; dependencies = [ - (sources."@alexbosworth/caporal-1.4.0" // { + (sources."@alexbosworth/caporal-1.4.1" // { dependencies = [ sources."colorette-1.4.0" ]; @@ -80678,7 +80678,7 @@ in sources."@alexbosworth/fiat-1.0.1" sources."@alexbosworth/html2unicode-1.1.5" sources."@alexbosworth/node-fetch-2.6.2" - (sources."@alexbosworth/prettyjson-1.2.1" // { + (sources."@alexbosworth/prettyjson-1.2.2" // { dependencies = [ sources."colors-1.1.2" ]; @@ -80924,7 +80924,7 @@ in sources."imurmurhash-0.1.4" sources."inherits-2.0.4" sources."ini-2.0.0" - (sources."inquirer-8.2.1" // { + (sources."inquirer-8.2.2" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-styles-4.3.0" @@ -83172,7 +83172,7 @@ in sources."agent-base-4.3.0" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."any-observable-0.3.0" (sources."app-path-2.2.0" // { @@ -83752,10 +83752,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.132"; + version = "1.0.134"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.132.tgz"; - sha512 = "DvVwfnWg9FeD5LvBAtlNXGkwuAOwxdrRp27E3t92dnPfX7yUw45NZE6YFqHkffBDcpHDaE2x/Ao9a7c+DB5VGA=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.134.tgz"; + sha512 = "piVuRH84D5xsGeC7uOOGQNBR7JrhrDT+6g5GEM4EOZf1XjxeuH15YfRsI6+ukexwq85kseEoCWltcOvGZefYQQ=="; }; dependencies = [ sources."@jsii/check-node-1.55.1" @@ -83774,8 +83774,8 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-1.5.50" - sources."cdk8s-plus-22-1.0.0-beta.155" + sources."cdk8s-1.5.52" + sources."cdk8s-plus-22-1.0.0-beta.158" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -83788,7 +83788,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.248" + sources."constructs-3.3.250" sources."date-format-4.0.6" sources."debug-4.3.4" sources."decamelize-5.0.1" @@ -83875,14 +83875,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.510" // { + (sources."jsii-srcmak-0.1.512" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.170" + sources."json2jsii-0.2.172" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -83926,7 +83926,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.1" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.237" + sources."sscaff-1.2.239" (sources."streamroller-3.0.6" // { dependencies = [ sources."fs-extra-10.0.1" @@ -84036,7 +84036,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.0.95" + sources."constructs-10.0.97" sources."date-format-4.0.6" sources."debug-4.3.4" sources."decamelize-1.2.0" @@ -84173,7 +84173,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.510" // { + (sources."jsii-srcmak-0.1.512" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -84518,10 +84518,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.21.0"; + version = "0.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.21.0.tgz"; - sha512 = "q/DBgNtqedcBhWA8W+b4JaHSBVTV6yzC3xcWv6jd05OD/ofkDLywfWgL2M5sizYSC6Ex30e241tv7uJ2f0i0BQ=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.21.1.tgz"; + sha512 = "222VMJBKE4ReyznvWjgJv4lZFtCrkEnKfJk4cL20SH+74x95JP2N0ujNtUiggBhaWcxvOiQxRt467NuVI48Fxg=="; }; buildInputs = globalBuildInputs; meta = { @@ -84730,20 +84730,16 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-1.1.0.tgz"; - sha512 = "TWVSA2l2vTFSb+F1FJAPSLOntDALjqpvyNL9vWIwKeRKRCWdUI9klQcYTMlCRCPKbthzuD4xUq6bW3wvuoZUBg=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-1.2.1.tgz"; + sha512 = "wC3hU4P7w9QtGUNng4lb3PFjfZvOwaSCz9V/M7xcnscuyyoA1j0nNB1/GsBNmW7xnhRS4kEfRPeeHwvj/3YYmA=="; }; dependencies = [ sources."isexe-2.0.0" - sources."node-fetch-2.6.7" - sources."tr46-0.0.3" sources."tslib-2.3.1" sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-uri-3.0.3" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" sources."which-2.0.2" ]; buildInputs = globalBuildInputs; @@ -85142,13 +85138,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.231"; + version = "1.1.232"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.231.tgz"; - sha512 = "iCzwTwFFYd7FoSIM2aKNWDOmX+zdSCt0ss9pBX7fu0Me0JCkJllr/AbUP53fRgBSqJsjoifkdGisuYt2fwd5KA=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.232.tgz"; + sha512 = "1ytGBG4gmz/M/6guRKUvTSltXDpoWlcbqq7RsMi3fFEBhYvSQVpy3MkKgxjkJNVbp+YKuJpcuNAhCIjq0+BHAg=="; }; dependencies = [ - sources."pyright-1.1.232" + sources."pyright-1.1.233" ]; buildInputs = globalBuildInputs; meta = { @@ -85397,7 +85393,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -85768,10 +85764,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.9.14"; + version = "1.9.15"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.14.tgz"; - sha512 = "MiyV1Tq5Jpj6P0t3PVb3IFyrfOm93E29Oz90nCfSdMBW+yY0U4H4uE5V9AKO3zhVFhzHRwalYfaFxf/6VCmkgA=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.15.tgz"; + sha512 = "7mvLHnOqiXl0sk6mq78SmdIYL0nouIzejpTDgRlRjUrAXTCqXfpFVqfJg+2xASpcGTR5nH1lYMk/LXRrnFltIw=="; }; dependencies = [ sources."typescript-4.6.3" @@ -86301,7 +86297,7 @@ in sha512 = "jARqwj0uyTfbcsTr3IDoaGI6ZXUV8e8qVjw+LaRBujvjgsiWypJweze5IZy0/sjNEKlptwB7GDjmuphtBzngFA=="; }; dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."axios-0.21.4" sources."chalk-2.4.2" @@ -86940,7 +86936,7 @@ in sources."init-package-json-2.0.5" (sources."inquirer-6.5.2" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" @@ -87483,7 +87479,7 @@ in sources."inherits-2.0.4" (sources."inquirer-3.3.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."strip-ansi-4.0.0" ]; }) @@ -87536,7 +87532,7 @@ in sources."sorted-immutable-list-1.1.0" (sources."string-width-2.1.1" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."strip-ansi-4.0.0" ]; }) @@ -87904,7 +87900,7 @@ in sources."ajv-6.12.6" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-split-1.0.1" sources."ansi-styles-3.2.1" sources."anymatch-2.0.0" @@ -88637,7 +88633,7 @@ in sources."@babel/template-7.16.7" sources."@babel/traverse-7.17.3" sources."@babel/types-7.17.0" - sources."@blueprintjs/colors-4.0.0" + sources."@blueprintjs/colors-4.0.1" sources."@blueprintjs/core-3.54.0" sources."@blueprintjs/icons-3.33.0" sources."@deltachat/message_parser_wasm-0.3.0" @@ -88793,7 +88789,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-14.2.8" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -89031,7 +89027,7 @@ in sources."react-popper-1.3.11" sources."react-qr-reader-2.2.1" sources."react-qr-svg-2.4.0" - sources."react-string-replace-0.4.4" + sources."react-string-replace-1.0.0" sources."react-transition-group-2.9.0" sources."react-virtualized-auto-sizer-1.0.6" sources."react-window-1.8.6" @@ -90215,7 +90211,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -91406,7 +91402,7 @@ in ]; }) sources."openapi-types-7.2.3" - sources."swagger-ui-dist-4.9.0" + sources."swagger-ui-dist-4.9.1" ]; }) (sources."mixin-deep-1.3.2" // { @@ -92632,7 +92628,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -93995,10 +93991,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.11.0"; + version = "8.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.11.0.tgz"; - sha512 = "/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz"; + sha512 = "it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q=="; }; dependencies = [ sources."@eslint/eslintrc-1.2.1" @@ -94888,7 +94884,7 @@ in sources."duplexer3-0.1.4" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -96529,7 +96525,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.969999" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -96766,7 +96762,7 @@ in }) (sources."@oclif/plugin-help-1.2.11" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" @@ -96911,7 +96907,7 @@ in sources."has-to-string-tag-x-1.4.1" (sources."heroku-cli-util-8.0.12" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" @@ -99133,7 +99129,7 @@ in sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" @@ -99446,10 +99442,10 @@ in generator-code = nodeEnv.buildNodePackage { name = "generator-code"; packageName = "generator-code"; - version = "1.6.8"; + version = "1.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.8.tgz"; - sha512 = "0VMjRsX2HVhDboVUJIZ2N6ig7f/KG69V1AlTGIMUcxQzeLtjAFtxSdFQ2Z+hjmsu4Wjl6RjPj6NczIu3eSZ6mQ=="; + url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.9.tgz"; + sha512 = "e+mFv1JS6MyY1Rlez4pUhnRPxxylyDztSbTAJJ57hg4jkuASOZw8LP9b7PQCjrtCsXSSjqFSoqXSkomg3duWIQ=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -99573,7 +99569,7 @@ in sources."spdx-license-ids-3.0.11" (sources."string-width-2.1.1" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."strip-ansi-4.0.0" ]; }) @@ -101195,7 +101191,7 @@ in }) (sources."@oclif/plugin-help-3.2.1" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" @@ -101317,7 +101313,7 @@ in sources."ms-2.0.0" ]; }) - sources."form-data-encoder-1.7.1" + sources."form-data-encoder-1.7.2" (sources."formdata-node-4.3.2" // { dependencies = [ sources."web-streams-polyfill-4.0.0-beta.1" @@ -103008,7 +103004,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.1100.0" + sources."aws-sdk-2.1101.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -103543,10 +103539,10 @@ in insect = nodeEnv.buildNodePackage { name = "insect"; packageName = "insect"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/insect/-/insect-5.6.0.tgz"; - sha512 = "56gjTrj9SMfPkbGANfqtGYeY3G5KmCkpgEYlKkmiDNG+SpQtLT9/53gt/9CbYd5iT9GgP+IvGXwDWplgCz3NnA=="; + url = "https://registry.npmjs.org/insect/-/insect-5.7.0.tgz"; + sha512 = "rm3APOoPrf7J66Bo7bHOn0c/k/STonQ+KSdyLid9NQvSM+LTpeL9X8RnOZ3NRlz01/MgXqQ0CGAGh60kSB9Xlw=="; }; dependencies = [ sources."@jcubic/lily-0.3.0" @@ -103587,7 +103583,6 @@ in sources."nice-try-1.0.5" sources."npm-run-path-2.0.2" sources."once-1.4.0" - sources."os-homedir-1.0.2" sources."p-finally-1.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" @@ -103603,7 +103598,7 @@ in sources."wcwidth-1.0.1" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."xdg-basedir-2.0.0" + sources."xdg-basedir-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -104153,42 +104148,42 @@ in dependencies = [ sources."@iarna/toml-2.2.5" sources."@msgpack/msgpack-2.7.2" - sources."@ot-builder/bin-composite-types-1.4.0" - sources."@ot-builder/bin-util-1.4.0" - sources."@ot-builder/cli-help-shower-1.4.0" - sources."@ot-builder/cli-proc-1.4.0" - sources."@ot-builder/cli-shared-1.4.0" - sources."@ot-builder/common-impl-1.4.0" - sources."@ot-builder/errors-1.4.0" - sources."@ot-builder/io-bin-cff-1.4.0" - sources."@ot-builder/io-bin-encoding-1.4.0" - sources."@ot-builder/io-bin-ext-private-1.4.0" - sources."@ot-builder/io-bin-font-1.4.0" - sources."@ot-builder/io-bin-glyph-store-1.4.0" - sources."@ot-builder/io-bin-layout-1.4.0" - sources."@ot-builder/io-bin-metadata-1.4.0" - sources."@ot-builder/io-bin-metric-1.4.0" - sources."@ot-builder/io-bin-name-1.4.0" - sources."@ot-builder/io-bin-sfnt-1.4.0" - sources."@ot-builder/io-bin-ttf-1.4.0" - sources."@ot-builder/io-bin-vtt-private-1.4.0" - sources."@ot-builder/ot-1.4.0" - sources."@ot-builder/ot-encoding-1.4.0" - sources."@ot-builder/ot-ext-private-1.4.0" - sources."@ot-builder/ot-glyphs-1.4.0" - sources."@ot-builder/ot-layout-1.4.0" - sources."@ot-builder/ot-metadata-1.4.0" - sources."@ot-builder/ot-name-1.4.0" - sources."@ot-builder/ot-sfnt-1.4.0" - sources."@ot-builder/ot-standard-glyph-namer-1.4.0" - sources."@ot-builder/ot-vtt-private-1.4.0" - sources."@ot-builder/prelude-1.4.0" - sources."@ot-builder/primitive-1.4.0" - sources."@ot-builder/rectify-1.4.0" - sources."@ot-builder/stat-glyphs-1.4.0" - sources."@ot-builder/trace-1.4.0" - sources."@ot-builder/var-store-1.4.0" - sources."@ot-builder/variance-1.4.0" + sources."@ot-builder/bin-composite-types-1.5.0" + sources."@ot-builder/bin-util-1.5.0" + sources."@ot-builder/cli-help-shower-1.5.0" + sources."@ot-builder/cli-proc-1.5.0" + sources."@ot-builder/cli-shared-1.5.0" + sources."@ot-builder/common-impl-1.5.0" + sources."@ot-builder/errors-1.5.0" + sources."@ot-builder/io-bin-cff-1.5.0" + sources."@ot-builder/io-bin-encoding-1.5.0" + sources."@ot-builder/io-bin-ext-private-1.5.0" + sources."@ot-builder/io-bin-font-1.5.0" + sources."@ot-builder/io-bin-glyph-store-1.5.0" + sources."@ot-builder/io-bin-layout-1.5.0" + sources."@ot-builder/io-bin-metadata-1.5.0" + sources."@ot-builder/io-bin-metric-1.5.0" + sources."@ot-builder/io-bin-name-1.5.0" + sources."@ot-builder/io-bin-sfnt-1.5.0" + sources."@ot-builder/io-bin-ttf-1.5.0" + sources."@ot-builder/io-bin-vtt-private-1.5.0" + sources."@ot-builder/ot-1.5.0" + sources."@ot-builder/ot-encoding-1.5.0" + sources."@ot-builder/ot-ext-private-1.5.0" + sources."@ot-builder/ot-glyphs-1.5.0" + sources."@ot-builder/ot-layout-1.5.0" + sources."@ot-builder/ot-metadata-1.5.0" + sources."@ot-builder/ot-name-1.5.0" + sources."@ot-builder/ot-sfnt-1.5.0" + sources."@ot-builder/ot-standard-glyph-namer-1.5.0" + sources."@ot-builder/ot-vtt-private-1.5.0" + sources."@ot-builder/prelude-1.5.0" + sources."@ot-builder/primitive-1.5.0" + sources."@ot-builder/rectify-1.5.0" + sources."@ot-builder/stat-glyphs-1.5.0" + sources."@ot-builder/trace-1.5.0" + sources."@ot-builder/var-store-1.5.0" + sources."@ot-builder/variance-1.5.0" sources."@unicode/unicode-14.0.0-1.2.1" sources."@xmldom/xmldom-0.7.5" sources."aglfn-1.0.2" @@ -104250,8 +104245,8 @@ in sources."mimic-fn-2.1.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.4.0" - sources."otb-ttc-bundle-1.4.0" + sources."ot-builder-1.5.0" + sources."otb-ttc-bundle-1.5.0" sources."passerror-1.1.1" sources."patel-0.37.1" sources."patrisika-0.24.0" @@ -104616,7 +104611,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1100.0" // { + (sources."aws-sdk-2.1101.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -105203,7 +105198,7 @@ in }) (sources."strip-ansi-4.0.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" ]; }) sources."strip-json-comments-2.0.1" @@ -107035,7 +107030,7 @@ in sources."destroy-1.0.4" sources."detect-libc-1.0.3" sources."dir-glob-3.0.1" - sources."doipjs-0.15.3" + sources."doipjs-0.15.5" (sources."domexception-2.0.1" // { dependencies = [ sources."webidl-conversions-5.0.0" @@ -107043,7 +107038,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -107664,7 +107659,7 @@ in sources."optionator-0.8.3" (sources."ora-3.0.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."strip-ansi-4.0.0" ]; }) @@ -107757,7 +107752,7 @@ in sources."y18n-3.2.2" (sources."yargs-12.0.4" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."cliui-4.1.0" sources."invert-kv-2.0.0" sources."is-fullwidth-code-point-2.0.0" @@ -107912,7 +107907,7 @@ in sources."optionator-0.8.3" (sources."ora-3.0.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."strip-ansi-4.0.0" ]; }) @@ -110132,7 +110127,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -111623,7 +111618,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."table-3.8.3" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -114053,7 +114048,7 @@ in (sources."inquirer-autosubmit-prompt-0.2.0" // { dependencies = [ sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."cli-cursor-2.1.0" @@ -114378,7 +114373,7 @@ in sources."widest-line-3.1.0" (sources."wrap-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -115206,7 +115201,7 @@ in sources."acorn-walk-6.2.0" sources."ajv-6.12.6" sources."alphanum-sort-1.0.2" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."ansi-to-html-0.6.15" (sources."anymatch-2.0.0" // { @@ -115445,7 +115440,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -116213,7 +116208,7 @@ in sources."domutils-2.8.0" sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" sources."entities-3.0.1" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -116769,7 +116764,7 @@ in sources."ini-1.3.8" (sources."inquirer-5.2.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."is-fullwidth-code-point-2.0.0" @@ -118636,10 +118631,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.232"; + version = "1.1.233"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.232.tgz"; - sha512 = "C33CJeenif3Cow+WegUavSgNeCuy/bMhKvZ/UMKnuyVvCNvnSyu+qex+TaRZ+4nbYsZH+9aMDRQrC6YHgHXC6w=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.233.tgz"; + sha512 = "qjyKJd6mfXLwaBls4Ww0CmML+K2gA4NnTelxGktLC3JQv7ioWU7lmiQ1KSr1BnmwuuTfsaJSDN3f+hUf9YPfWg=="; }; buildInputs = globalBuildInputs; meta = { @@ -118663,7 +118658,7 @@ in sources."@mark.probst/typescript-json-schema-0.32.0" sources."@mark.probst/unicode-properties-1.1.0" sources."acorn-7.4.1" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."array-back-2.0.0" sources."balanced-match-1.0.2" @@ -119173,7 +119168,7 @@ in sources."ansi-colors-3.2.4" sources."ansi-escapes-3.2.0" sources."ansi-html-community-0.0.8" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" sources."aproba-1.2.0" @@ -119559,7 +119554,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -121901,7 +121896,7 @@ in sources."entities-2.2.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.11.0" // { + (sources."eslint-8.12.0" // { dependencies = [ sources."eslint-scope-7.1.1" sources."estraverse-5.3.0" @@ -122514,7 +122509,7 @@ in sources."async-3.2.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1100.0" // { + (sources."aws-sdk-2.1101.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -123580,10 +123575,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.883.0"; + version = "1.884.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.883.0.tgz"; - sha512 = "nDHsgxwiHlvW+dQINqt3zsa+L7zrvxV8ma3lHL977+SowLD1kR9z9i4KJVZKKD0RteYJw9Kfy/2Sb6hEBAObFQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.884.0.tgz"; + sha512 = "lQtXRoi0mgTsrjzTcKNbpec+q4ai8rhls1FOcr2ZBTe7V7mKTGXZ9yk6DY2VXRKyboL8zvV3rIrzm+l85n5yIg=="; }; buildInputs = globalBuildInputs; meta = { @@ -124843,7 +124838,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1100.0" // { + (sources."aws-sdk-2.1101.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -125438,7 +125433,7 @@ in sources."streamsearch-0.1.2" (sources."string-width-2.1.1" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-4.0.0" ]; @@ -125494,7 +125489,7 @@ in sources."tough-cookie-2.3.4" (sources."transliteration-1.6.6" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."cliui-4.1.0" sources."strip-ansi-4.0.0" sources."yargs-12.0.5" @@ -125856,7 +125851,7 @@ in dependencies = [ sources."ajv-6.12.6" sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.6" sources."assert-plus-1.0.0" @@ -126752,7 +126747,7 @@ in sources."string-3.3.3" (sources."string-width-2.1.1" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-4.0.0" ]; @@ -133008,7 +133003,7 @@ in sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."argparse-2.0.1" @@ -133065,7 +133060,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.9.2" @@ -133330,7 +133325,7 @@ in dependencies = [ sources."ajv-6.12.6" sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."array-differ-1.0.0" @@ -133658,7 +133653,7 @@ in ]; }) sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" sources."argparse-1.0.10" @@ -135351,7 +135346,7 @@ in sources."caniuse-lite-1.0.30001320" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.93" + sources."electron-to-chromium-1.4.96" sources."enhanced-resolve-5.9.2" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -135600,7 +135595,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."html-entities-2.3.2" + sources."html-entities-2.3.3" sources."http-deceiver-1.2.7" sources."http-errors-1.8.1" sources."http-parser-js-0.5.6" @@ -135703,7 +135698,7 @@ in sources."safer-buffer-2.1.2" sources."schema-utils-4.0.0" sources."select-hose-2.0.0" - sources."selfsigned-2.0.0" + sources."selfsigned-2.0.1" (sources."send-0.17.2" // { dependencies = [ sources."ms-2.1.3" @@ -135880,7 +135875,7 @@ in ]; }) sources."bittorrent-peerid-1.3.4" - (sources."bittorrent-protocol-3.5.1" // { + (sources."bittorrent-protocol-3.5.2" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -136048,7 +136043,7 @@ in sources."once-1.4.0" sources."open-8.4.0" sources."package-json-versionify-1.0.4" - (sources."parse-torrent-9.1.4" // { + (sources."parse-torrent-9.1.5" // { dependencies = [ sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" @@ -136154,7 +136149,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.8.8" // { + (sources."webtorrent-1.8.10" // { dependencies = [ sources."debug-4.3.4" sources."decompress-response-6.0.0" @@ -136417,7 +136412,7 @@ in sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."aproba-2.0.0" sources."are-we-there-yet-1.1.7" From 15f220b07ced65b6ca8ed862249bf180b5ace9ca Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 16 Mar 2022 17:30:39 +0100 Subject: [PATCH 105/163] ocamlPackages.buildDunePackage: add support for dune 3 --- pkgs/build-support/ocaml/dune.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 18e8784cfab3..f82bac7d199d 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -1,8 +1,11 @@ -{ lib, stdenv, ocaml, findlib, dune_1, dune_2 }: +{ lib, stdenv, ocaml, findlib, dune_1, dune_2, dune_3 }: { pname, version, nativeBuildInputs ? [], enableParallelBuilding ? true, ... }@args: -let Dune = if args.useDune2 or true then dune_2 else dune_1; in +let Dune = + let dune-version = args . duneVersion or (if args.useDune2 or true then "2" else "1"); in + { "1" = dune_1; "2" = dune_2; "3" = dune_3; }."${dune-version}" +; in if (args ? minimumOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion) || (args ? minimalOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimalOCamlVersion) @@ -31,7 +34,7 @@ stdenv.mkDerivation ({ runHook postInstall ''; -} // (builtins.removeAttrs args [ "minimalOCamlVersion" ]) // { +} // (builtins.removeAttrs args [ "minimalOCamlVersion" "duneVersion" ]) // { name = "ocaml${ocaml.version}-${pname}-${version}"; From bb559f92af22bca4f1b58a0fe5b1412fea7e7cca Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 16 Mar 2022 17:30:43 +0100 Subject: [PATCH 106/163] stog: use dune version 3 --- pkgs/applications/misc/stog/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index 91a77d8de6fd..1d6373592fbf 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -10,7 +10,7 @@ else buildDunePackage rec { pname = "stog"; version = "0.20.0"; - useDune2 = true; + duneVersion = "3"; minimalOCamlVersion = "4.12"; src = fetchFromGitLab { domain = "framagit.org"; From ac07d2fa3edf8fb74f34c641b892161a177609df Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 16 Mar 2022 17:30:46 +0100 Subject: [PATCH 107/163] ocamlPackages.ordering: init at 3.0.3 --- pkgs/development/ocaml-modules/ordering/default.nix | 13 +++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ordering/default.nix diff --git a/pkgs/development/ocaml-modules/ordering/default.nix b/pkgs/development/ocaml-modules/ordering/default.nix new file mode 100644 index 000000000000..c3bffc013f95 --- /dev/null +++ b/pkgs/development/ocaml-modules/ordering/default.nix @@ -0,0 +1,13 @@ +{ lib, buildDunePackage, dune_3 }: + +buildDunePackage { + pname = "ordering"; + inherit (dune_3) version src; + duneVersion = "3"; + + dontAddPrefix = true; + + meta = dune_3.meta // { + description = "Element ordering"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3b7fb9c96144..f733e01aedda 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1022,6 +1022,8 @@ let opus = callPackage ../development/ocaml-modules/opus { }; + ordering = callPackage ../development/ocaml-modules/ordering { }; + otfm = callPackage ../development/ocaml-modules/otfm { }; otoml = callPackage ../development/ocaml-modules/otoml { }; From ab97541807bc7126d577cdc75f46e07a5b052e7b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 16 Mar 2022 17:30:49 +0100 Subject: [PATCH 108/163] ocamlPackages.dyn: init at 3.0.3 --- pkgs/development/ocaml-modules/dyn/default.nix | 16 ++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/ocaml-modules/dyn/default.nix diff --git a/pkgs/development/ocaml-modules/dyn/default.nix b/pkgs/development/ocaml-modules/dyn/default.nix new file mode 100644 index 000000000000..81b9e0d745fb --- /dev/null +++ b/pkgs/development/ocaml-modules/dyn/default.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, dune_3, ordering }: + +buildDunePackage { + pname = "dyn"; + inherit (dune_3) version src; + duneVersion = "3"; + + dontAddPrefix = true; + + propagatedBuildInputs = [ ordering ]; + + meta = dune_3.meta // { + description = "Dynamic type"; + }; +} + diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f733e01aedda..c7f2d04bbee0 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -330,6 +330,8 @@ let duration = callPackage ../development/ocaml-modules/duration { }; + dyn = callPackage ../development/ocaml-modules/dyn { }; + earley = callPackage ../development/ocaml-modules/earley { }; earlybird = callPackage ../development/ocaml-modules/earlybird { }; From b19721dc2a8ceb8d1f46260aad0d5a8783a4b499 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 16 Mar 2022 17:30:52 +0100 Subject: [PATCH 109/163] ocamlPackages.stdune: init at 3.0.3 --- .../development/ocaml-modules/stdune/default.nix | 16 ++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/ocaml-modules/stdune/default.nix diff --git a/pkgs/development/ocaml-modules/stdune/default.nix b/pkgs/development/ocaml-modules/stdune/default.nix new file mode 100644 index 000000000000..fd1e4f987b40 --- /dev/null +++ b/pkgs/development/ocaml-modules/stdune/default.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, dune_3, dyn, ordering }: + +buildDunePackage { + pname = "stdune"; + inherit (dune_3) version src; + duneVersion = "3"; + + dontAddPrefix = true; + + propagatedBuildInputs = [ dyn ordering ]; + + meta = dune_3.meta // { + description = "Dune's unstable standard library"; + }; +} + diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c7f2d04bbee0..08641cc5caa1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1313,6 +1313,8 @@ let stdlib-shims = callPackage ../development/ocaml-modules/stdlib-shims { }; + stdune = callPackage ../development/ocaml-modules/stdune { }; + stog = callPackage ../applications/misc/stog { }; stringext = callPackage ../development/ocaml-modules/stringext { }; From 7cc596593c5cae180024b1322f366847ae764bbe Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 16 Mar 2022 17:30:55 +0100 Subject: [PATCH 110/163] =?UTF-8?q?ocamlPackages.dune-private-libs:=202.9.?= =?UTF-8?q?3=20=E2=86=92=203.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.dune-site: 2.9.3 → 3.0.3 ocamlPackages.dune-glob: 2.9.3 → 3.0.3 ocamlPackages.dune-action-plugin: 2.9.3 → 3.0.3 --- .../ocaml-modules/dune-action-plugin/default.nix | 8 ++++---- pkgs/development/ocaml-modules/dune-glob/default.nix | 8 ++++---- .../ocaml-modules/dune-private-libs/default.nix | 10 ++++++---- pkgs/development/ocaml-modules/dune-site/default.nix | 8 ++++---- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix index 65c55da6e3b3..c39239525d18 100644 --- a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix +++ b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix @@ -1,17 +1,17 @@ -{ lib, buildDunePackage, dune_2, dune-glob, dune-private-libs }: +{ lib, buildDunePackage, dune_3, dune-glob, dune-private-libs }: buildDunePackage rec { pname = "dune-action-plugin"; - inherit (dune_2) src version patches; + inherit (dune_3) src version; - useDune2 = true; + duneVersion = "3"; dontAddPrefix = true; propagatedBuildInputs = [ dune-glob dune-private-libs ]; meta = with lib; { - inherit (dune_2.meta) homepage; + inherit (dune_3.meta) homepage; description = "API for writing dynamic Dune actions"; maintainers = [ maintainers.marsam ]; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/dune-glob/default.nix b/pkgs/development/ocaml-modules/dune-glob/default.nix index c7c6f9be4ee0..04b5e7623793 100644 --- a/pkgs/development/ocaml-modules/dune-glob/default.nix +++ b/pkgs/development/ocaml-modules/dune-glob/default.nix @@ -1,17 +1,17 @@ -{ lib, buildDunePackage, dune_2, dune-private-libs }: +{ lib, buildDunePackage, dune_3, dune-private-libs }: buildDunePackage rec { pname = "dune-glob"; - inherit (dune_2) src version patches; + inherit (dune_3) src version; - useDune2 = true; + duneVersion = "3"; dontAddPrefix = true; propagatedBuildInputs = [ dune-private-libs ]; meta = with lib; { - inherit (dune_2.meta) homepage; + inherit (dune_3.meta) homepage; description = "Glob string matching language supported by dune"; maintainers = [ maintainers.marsam ]; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/pkgs/development/ocaml-modules/dune-private-libs/default.nix index 8a635efa3a59..9b45064d1984 100644 --- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -1,16 +1,18 @@ -{ lib, buildDunePackage, dune_2 }: +{ lib, buildDunePackage, dune_3, stdune }: buildDunePackage rec { pname = "dune-private-libs"; - useDune2 = true; + duneVersion = "3"; - inherit (dune_2) src version patches; + inherit (dune_3) src version; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; dontAddPrefix = true; + propagatedBuildInputs = [ stdune ]; + meta = with lib; { description = "Private libraries of Dune"; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/ocaml-modules/dune-site/default.nix b/pkgs/development/ocaml-modules/dune-site/default.nix index 9462393d2697..8f51e182970f 100644 --- a/pkgs/development/ocaml-modules/dune-site/default.nix +++ b/pkgs/development/ocaml-modules/dune-site/default.nix @@ -1,10 +1,10 @@ -{ lib, buildDunePackage, dune_2, dune-private-libs }: +{ lib, buildDunePackage, dune_3, dune-private-libs }: buildDunePackage rec { pname = "dune-site"; - inherit (dune_2) src version patches; + inherit (dune_3) src version; - useDune2 = true; + duneVersion = "3"; dontAddPrefix = true; @@ -12,7 +12,7 @@ buildDunePackage rec { meta = with lib; { description = "A library for embedding location information inside executable and libraries"; - inherit (dune_2.meta) homepage; + inherit (dune_3.meta) homepage; maintainers = with lib.maintainers; [ ]; license = licenses.mit; }; From 87c74b8120980461a9d4ce8f341551ce0fb50728 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 27 Mar 2022 15:07:31 +0200 Subject: [PATCH 111/163] User manual: document duneVersion --- doc/languages-frameworks/ocaml.section.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index e4813d7dd2d4..c6e40eaa20d0 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -38,8 +38,12 @@ Here is a simple package example. - It uses the `fetchFromGitHub` fetcher to get its source. -- `useDune2 = true` ensures that Dune version 2 is used for the - build (this is the default; set to `false` to use Dune version 1). +- `duneVersion = "2"` ensures that Dune version 2 is used for the + build (this is the default; valid values are `"1"`, `"2"`, and `"3"`); + note that there is also a legacy `useDune2` boolean attribute: + set to `false` it corresponds to `duneVersion = "1"`; set to `true` it + corresponds to `duneVersion = "2"`. If both arguments (`duneVersion` and + `useDune2`) are given, the second one (`useDune2`) is silently ignored. - It sets the optional `doCheck` attribute such that tests will be run with `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is @@ -67,7 +71,7 @@ Here is a simple package example. buildDunePackage rec { pname = "angstrom"; version = "0.15.0"; - useDune2 = true; + duneVersion = "2"; minimalOCamlVersion = "4.04"; From 70dc29f9e8c4bce8d541f997cd7b18e583ed6278 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 03:33:08 +0000 Subject: [PATCH 112/163] terraform-providers: update 2022-03-28 --- .../terraform-providers/providers.json | 140 +++++++++--------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 01e08c002539..dfc96d2f6923 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -40,10 +40,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.161.0", - "sha256": "sha256-vQrX9mFZLy16aV6hEA8X9MV995Ew+lJb8PxCvxDGoN0=", - "vendorSha256": "sha256-rIydGW7X0tL+ZwV1wEu3Zz3FZPrNozQI0Qx+Ee9tAik=", - "version": "1.161.0" + "rev": "v1.162.0", + "sha256": "sha256-xqZv15Tst+7o9HhNu6/bW+a4z7FTkra+MfS8jKrfeNs=", + "vendorSha256": "sha256-RbOf/S0rkbhW0s+/YOqu+BQuE0V4aS2x36Xf+hgBkqY=", + "version": "1.162.0" }, "ansible": { "owner": "nbering", @@ -94,10 +94,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.6.0", - "sha256": "sha256-Bq6DrwN4212LeBHb/j60v/fEvZwFseSRB8KZ3hrJYmQ=", - "vendorSha256": "sha256-hbN5apdCiA4eN0uCWlTRAEunO4nFB/VX+gchxp/6BJQ=", - "version": "4.6.0" + "rev": "v4.8.0", + "sha256": "sha256-Ere41qols4lNnoAIZGWQmituukLnPNbv5d8C/e3rQgI=", + "vendorSha256": "sha256-ZXH9YlSii2z1s6Y/TfZVBje0/xQ2DXw3ZpgcBPeQZ2I=", + "version": "4.8.0" }, "azuread": { "owner": "hashicorp", @@ -112,10 +112,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.99.0", - "sha256": "sha256-HXLr22UVciRvW1iaa46sy37ivG41hKqhrQtCXpnl8ss=", + "rev": "v3.0.2", + "sha256": "sha256-T24bfys9OxBnGN4YtJEsJmSUK26a5hMnbgZUANcpg3k=", "vendorSha256": null, - "version": "2.99.0" + "version": "3.0.2" }, "azurestack": { "owner": "hashicorp", @@ -203,10 +203,10 @@ "owner": "cloudfoundry-community", "provider-source-address": "registry.terraform.io/cloudfoundry-community/cloudfoundry", "repo": "terraform-provider-cloudfoundry", - "rev": "v0.15.0", - "sha256": "0kg9aivxlbkqgrwv0j02hfsaky5q4f0bmqihn589dsdk7jds66i7", - "vendorSha256": "19h526ag7p2jkdp0610slbpsz8q3njvj9d4xmsfdsv3r8pz7xzls", - "version": "0.15.0" + "rev": "v0.15.2", + "sha256": "sha256-I4E+UyiaxEa/UK699xys75IMhNccnBcJ8tgJ3XH0NPg=", + "vendorSha256": "sha256-mxsGmI26ZQlj0eagqScF6IeZFX0T6iLqqpgc0ZLpU1E=", + "version": "0.15.2" }, "cloudinit": { "owner": "hashicorp", @@ -392,10 +392,10 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.22.0", - "sha256": "sha256-bSKK72dBxfZCwSq3/vg97Dq1o/121KSM4h14MC87BMo=", + "rev": "v4.23.0", + "sha256": "sha256-N7PFLh7qr8OPB92ePLS1B/KexipKV5LFRWvrxdS8cGk=", "vendorSha256": null, - "version": "4.22.0" + "version": "4.23.0" }, "gitlab": { "owner": "gitlabhq", @@ -574,10 +574,10 @@ "owner": "gavinbunney", "provider-source-address": "registry.terraform.io/gavinbunney/kubectl", "repo": "terraform-provider-kubectl", - "rev": "v1.13.1", - "sha256": "0jm6zri6j3wdgwg8wixfh6w8il3vnqmwlbpa6scbfa8zq71qi1a0", - "vendorSha256": "1ahxhb6ws1mq4x7nbww8di0b19z6669gn18scqipvxcvmsihfx4m", - "version": "1.13.1" + "rev": "v1.14.0", + "sha256": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=", + "vendorSha256": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=", + "version": "1.14.0" }, "kubernetes": { "owner": "hashicorp", @@ -610,10 +610,10 @@ "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.26.1", - "sha256": "sha256-bd0raIIh/VmTlSVYnNd98fpppRKnO46g8FI5OwZPjMg=", - "vendorSha256": "sha256-SCTWvTgJ0QYh2DEbTI9coa3Fp4fBHusytF+JFzAq2XA=", - "version": "1.26.1" + "rev": "v1.26.3", + "sha256": "sha256-BVPlzrsX04XCaypKhqM9uvDrevak+qXe+x4mSo2G3kY=", + "vendorSha256": "sha256-mp1w1JXqrpLl8+pFlrBx/P9ZnGKIu8O/FgR73ff/wpQ=", + "version": "1.26.3" }, "linuxbox": { "owner": "numtide", @@ -701,10 +701,10 @@ "owner": "NaverCloudPlatform", "provider-source-address": "registry.terraform.io/NaverCloudPlatform/ncloud", "repo": "terraform-provider-ncloud", - "rev": "v2.2.5", - "sha256": "0hspr6iv69izg1y8s1sj24kgy562jggn9nwqgprn4zca7vsrl29r", - "vendorSha256": "1hiz0pphl4jxfglxj28rm58ih7c5dabhd2gaig23hcqvczhf1wd2", - "version": "2.2.5" + "rev": "v2.2.6", + "sha256": "sha256-Sw3Z6hi+nm/e+lMQQkk8KIa2AK2+q+0gBUe091GnQq0=", + "vendorSha256": "sha256-ovHg4GcbMzjEi+qJBpdqhR0YUakZCdnpc10SCu8FP8I=", + "version": "2.2.6" }, "netlify": { "owner": "AegirHealth", @@ -719,10 +719,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.41.1", - "sha256": "sha256-fd4S78viG38Y8xCNnX4l4/dQ/x8JA6Ej/kd556jvBOU=", - "vendorSha256": "sha256-Dvm8vmlfV7LH73Y2jNTO106V/fOA7K78jFclbFKZVXA=", - "version": "2.41.1" + "rev": "v2.41.2", + "sha256": "sha256-LCA1K4md1wRRkB7oerUn1MM0TRLcqQBoVpvoxCMGSs8=", + "vendorSha256": "sha256-G/GWIE+XeLiHW0xxyjbIpncAnpBmC/+iZnI8MFmi80k=", + "version": "2.41.2" }, "nomad": { "owner": "hashicorp", @@ -765,19 +765,19 @@ "owner": "nutanix", "provider-source-address": "registry.terraform.io/nutanix/nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.4.0", - "sha256": "sha256-zOGZxDxGMeubZQ3u+7Qoj+gy29Et7yeFNFWpXbLllEY=", + "rev": "v1.4.1", + "sha256": "sha256-NUu5MB2Y7wWDgKXMfKKygNUmpvfkEVF2Z1lBMpktIdc=", "vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=", - "version": "1.4.0" + "version": "1.4.1" }, "oci": { "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.68.0", - "sha256": "sha256-f1Nk5NurQvJuGyGrZQnZIXIpaH1qFAX+oTBNan6rORI=", + "rev": "v4.69.0", + "sha256": "sha256-VwL+i4HtvAJi3R57cjUrg+7rx1LxEUAMwkorCvJ9DcU=", "vendorSha256": null, - "version": "4.68.0" + "version": "4.69.0" }, "okta": { "owner": "okta", @@ -811,10 +811,10 @@ "owner": "OpenNebula", "provider-source-address": "registry.terraform.io/OpenNebula/opennebula", "repo": "terraform-provider-opennebula", - "rev": "v0.4.2", - "sha256": "sha256-h2trcyXJcdWQyonjdDLkJkcawE4AoFYnzLZtKPotMY0=", + "rev": "v0.4.3", + "sha256": "sha256-mnRRMubaz5hin4kG5NK+GMtTPcsIJu6GS8PKDitNszg=", "vendorSha256": "sha256-JTQJH0f8m6yBL8+jk6q02WPuvyre3mHql9Zy9OJW32M=", - "version": "0.4.2" + "version": "0.4.3" }, "openstack": { "owner": "terraform-provider-openstack", @@ -829,10 +829,10 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.28.0", - "sha256": "sha256-D+sIpGNQQ5UUNoesX6zd8BHo5RYfoTb/9x3lvFyoD50=", + "rev": "v1.28.2", + "sha256": "sha256-qp5H37Zf9oPYA2vvWKuEpfUeHIfK1NYE9Uk7dcX9izA=", "vendorSha256": "sha256-FMcPG7EJvU6XNKd2+8+xmjqSI0Ec9Xx/6gZvK9zJ3wg=", - "version": "1.28.0" + "version": "1.28.2" }, "opsgenie": { "owner": "opsgenie", @@ -991,10 +991,10 @@ "owner": "splunk-terraform", "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.10.0", - "sha256": "sha256-ZfNxab95ZDz68fEPfYd+w0E/fS/FPBVIs4kHTBhG858=", - "vendorSha256": "sha256-bX01PcLLpgWFMWxWPaUW8iEHxllqCmIX1/OIicB/h0M=", - "version": "6.10.0" + "rev": "v6.11.0", + "sha256": "sha256-ezd4TzckY5yx/UjwGxH36VX+owI8fBUmxtQFztOsFvs=", + "vendorSha256": "sha256-PVbqS37MBkIrr8CO6LxB0NjWWiTI5NFDipX6GvokrnY=", + "version": "6.11.0" }, "skytap": { "owner": "skytap", @@ -1009,10 +1009,10 @@ "owner": "chanzuckerberg", "provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.28.8", - "sha256": "sha256-v5+qmBqPJk9BTkjmXRn2yiIHlFkFcqoH7RuenM54Eys=", + "rev": "v0.29.0", + "sha256": "sha256-CdJHknGzEKfbxzrtqmevKwiYTs1UoRFRj6/ShQ9mdIc=", "vendorSha256": "sha256-G/UIKuKtolLY7RIQF06wzn/ZYTMihEmJZ1DqVcHFGdg=", - "version": "0.28.8" + "version": "0.29.0" }, "sops": { "owner": "carlpett", @@ -1072,19 +1072,19 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.66.0", - "sha256": "sha256-wbG2O6i0Ai86P+uk9rTsut+DEZcRFJCh93CfIEOfP2A=", + "rev": "v1.66.1", + "sha256": "sha256-kzEU+yDm8O9tBNkf+qy945drnPj8wNR4VfBPO6fcbGE=", "vendorSha256": null, - "version": "1.66.0" + "version": "1.66.1" }, "tfe": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", - "rev": "v0.28.1", - "sha256": "0xvah6qaf6kxgxhgzgh4rqswjda3366i6gqqwaiw4gc3w0ks2i3g", - "vendorSha256": "1qxbsnay75v6ss3fvi00rif10ra1l23b107d0v5cc1il4smqc36g", - "version": "0.28.1" + "rev": "v0.29.0", + "sha256": "sha256-2RksakMtNF0FGdUmJ4BBF6pvO2SrW0BNlQo95GIJSK4=", + "vendorSha256": "sha256-Nh22X4Unt77oWs/jf2PjZcxrz0nkyJrOY55ZbA972v8=", + "version": "0.29.0" }, "thunder": { "owner": "a10networks", @@ -1145,10 +1145,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v3.3.1", - "sha256": "1mxy44dl1wr99v6b0gvzcf9d5nfky0avmx4fq83h9vfnvq7rmrhn", - "vendorSha256": "0x9cyxnaqkfpzx9ml7qqhl98jslpy1v965kd11kgcvqpr9lmc77x", - "version": "3.3.1" + "rev": "v3.4.0", + "sha256": "sha256-guacIY3iXieTiEXJ8mnq6gNWHs1doTNGJ8Su5PTfnaY=", + "vendorSha256": "sha256-JiNYM8P6ExGVVOVBYA2WJSZOpZ0PAyoncENqYRXPo7c=", + "version": "3.4.0" }, "vcd": { "owner": "vmware", @@ -1209,19 +1209,19 @@ "owner": "vultr", "provider-source-address": "registry.terraform.io/vultr/vultr", "repo": "terraform-provider-vultr", - "rev": "v2.9.1", - "sha256": "1w6699ngk6vcjii9skhrzv93p79mn6rmyqbb7fdchrwcvamk3y9a", + "rev": "v2.10.0", + "sha256": "sha256-4WoTMyGKBTYzoqt0Ih+khfsaeJuKox5Sq9ak9xwvvJQ=", "vendorSha256": null, - "version": "2.9.1" + "version": "2.10.0" }, "wavefront": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/wavefront", "repo": "terraform-provider-wavefront", - "rev": "v3.0.1", - "sha256": "sha256-6SQjYaN0yhcHdmM+vGvIDPHKxN34ns3Yz+CMTEo13s0=", + "rev": "v3.0.2", + "sha256": "sha256-HCo6Hw724kQrPOCHoyByThq7L5NIZ/0AHmnQD27RUFA=", "vendorSha256": "sha256-PdSW3tyQUWbBiaM9U3NsqX/j4fMw9ZmjEDdyjxmRfD0=", - "version": "3.0.1" + "version": "3.0.2" }, "yandex": { "owner": "yandex-cloud", From 32ee651ea94214b8c769b1482b2bf44da533cf7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Mar 2022 06:20:25 +0000 Subject: [PATCH 113/163] python310Packages.sabyenc3: 5.1.3 -> 5.1.5 --- pkgs/development/python-modules/sabyenc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sabyenc3/default.nix b/pkgs/development/python-modules/sabyenc3/default.nix index 6c6b39a39da1..2dec98d5ca1a 100644 --- a/pkgs/development/python-modules/sabyenc3/default.nix +++ b/pkgs/development/python-modules/sabyenc3/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "sabyenc3"; - version = "5.1.3"; + version = "5.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-p/7uNtarig1lfPF+dL4OPPdKnfpkveZC8wgwsQy2o2s="; + hash = "sha256-JwCzy3QRCzxT8B0VM5SXIIWlYi08tT8eLj/QKtMYLRE="; }; # Tests are not included in pypi distribution From a107f9de561054afc111dd9ccf993bd8e38f79aa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Mar 2022 08:26:48 +0200 Subject: [PATCH 114/163] ffuf: 1.3.1 -> 1.4.0 --- pkgs/tools/security/ffuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ffuf/default.nix b/pkgs/tools/security/ffuf/default.nix index 076fd78d7136..a24b4a8452a7 100644 --- a/pkgs/tools/security/ffuf/default.nix +++ b/pkgs/tools/security/ffuf/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ffuf"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-NkRf36wFmzqFv13P0DxpzEOGyBGbSXMLjWE7URzRXGY="; + sha256 = "sha256-M+wzS/u40zjUNc+63qzkoM9eJ4ruradeJKhhQTP2jxQ="; }; vendorSha256 = "sha256-szT08rIozAuliOmge5RFX4NeVrJ2pCVyfotrHuvc0UU="; From db55843a2e7e0d08548f4031dc04f17439c18f9a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Mar 2022 08:40:23 +0200 Subject: [PATCH 115/163] python3Packages.mcstatus: 8.0.0 -> 9.0.2 --- .../python-modules/mcstatus/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 5045964ffde7..848bb7d76ebe 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -9,21 +9,20 @@ , pytest-asyncio , pytestCheckHook , pythonOlder -, six }: buildPythonPackage rec { pname = "mcstatus"; - version = "8.0.0"; + version = "9.0.2"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "Dinnerbone"; + owner = "py-mine"; repo = pname; rev = "v${version}"; - sha256 = "sha256-19VO5L5abVGm5zEMt88o67ArLjBCnGO2DxfAD+u1hF4="; + hash = "sha256-+wSBdsTI+vyCLvf+0R6oeWnUc123uLMyjQcp/zUYDOQ="; }; nativeBuildInputs = [ @@ -34,7 +33,6 @@ buildPythonPackage rec { asyncio-dgram click dnspython - six ]; checkInputs = [ @@ -45,19 +43,25 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'asyncio-dgram = "1.2.0"' 'asyncio-dgram = ">=1.2.0"' \ - --replace 'dnspython = "2.1.0"' 'dnspython = "^2.1.0"' \ - --replace 'six = "1.14.0"' 'six = ">=1.14.0"' \ - --replace 'click = "7.1.2"' 'click = ">=7.1.2"' + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace " --cov=mcstatus --cov-append --cov-branch --cov-report=term-missing -vvv --no-cov-on-fail" "" \ + --replace 'asyncio-dgram = "2.1.2"' 'asyncio-dgram = ">=2.1.2"' \ + --replace 'dnspython = "2.2.1"' 'dnspython = ">=2.2.0"' ''; pythonImportsCheck = [ "mcstatus" ]; + disabledTests = [ + # DNS features are limited in the sandbox + "test_query" + "test_query_retry" + ]; + meta = with lib; { description = "Python library for checking the status of Minecraft servers"; - homepage = "https://github.com/Dinnerbone/mcstatus"; + homepage = "https://github.com/py-mine/mcstatus"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 49e412b04614d8a5f1b4c91a166efdfdecd91cbb Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Mon, 28 Mar 2022 03:41:01 -0300 Subject: [PATCH 116/163] rancher: 2.6.0 -> 2.6.4 - rename from rancher-cli to rancher in pkg expression - remove explicit docheck = true; --- pkgs/applications/networking/cluster/rancher/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/rancher/default.nix b/pkgs/applications/networking/cluster/rancher/default.nix index 7c219725d7c9..3ee09b14ce96 100644 --- a/pkgs/applications/networking/cluster/rancher/default.nix +++ b/pkgs/applications/networking/cluster/rancher/default.nix @@ -1,14 +1,14 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - pname = "rancher-cli"; - version = "2.6.0"; + pname = "rancher"; + version = "2.6.4"; src = fetchFromGitHub { owner = "rancher"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-RfhcTo10nkHmKGwmS8WdjBioZhDIGSQ9vPPOv3Wg0Y4="; + sha256 = "sha256-5ceyScsCidJpHGfwhsq7/hDd3CClx29cD5Cdc1PSxTU="; }; ldflags = [ @@ -25,8 +25,6 @@ buildGoModule rec { mv $out/bin/cli $out/bin/rancher ''; - doCheck = true; - doInstallCheck = true; installCheckPhase = '' $out/bin/rancher | grep ${version} > /dev/null From 06327ff6d2198a56abe5e15452919f744e364595 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Mar 2022 08:44:44 +0200 Subject: [PATCH 117/163] python3Packages.elkm1-lib: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/elkm1-lib/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 6e30203ad0f8..6b877a58dd0b 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = version; - hash = "sha256-+rFW7qFpay/ebUz9EEB8nn0kuqVtVmG5ZHOWG2bMPts="; + hash = "sha256-Jr9f+essHB1FkzD6zM0G6jgE9C9lfDJuFIPrKRhVt+g="; }; nativeBuildInputs = [ @@ -36,7 +36,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "elkm1_lib" ]; + pythonImportsCheck = [ + "elkm1_lib" + ]; meta = with lib; { description = "Python module for interacting with ElkM1 alarm/automation panel"; From 478e6f963e3c22ecbd352dae1101569b2d8e5eea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Mar 2022 08:50:38 +0200 Subject: [PATCH 118/163] python3Packages.androidtv: 0.0.65 -> 0.0.66 --- pkgs/development/python-modules/androidtv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 80f726bdc181..2ea8dc5bad5b 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.65"; + version = "0.0.66"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - hash = "sha256-bhXmPplRT9gzeD/GdD2HxN+Z4vvaiaxBwkqSml9SJUs="; + hash = "sha256-gSbckVjM49nVfzpk9sfynJDx15+zQ/KgaI7oxEkXQpo="; }; propagatedBuildInputs = [ From c5914daa9f80bef4669909f5d9879c2869c67dad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Mar 2022 08:56:19 +0200 Subject: [PATCH 119/163] python3Packages.s3-credentials: add pythonImportsCheck --- .../python-modules/s3-credentials/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/s3-credentials/default.nix b/pkgs/development/python-modules/s3-credentials/default.nix index 61af119aaaa8..dd142cd09c79 100644 --- a/pkgs/development/python-modules/s3-credentials/default.nix +++ b/pkgs/development/python-modules/s3-credentials/default.nix @@ -13,13 +13,15 @@ buildPythonPackage rec { pname = "s3-credentials"; version = "0.10"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "simonw"; - repo = "${pname}"; - rev = "${version}"; - sha256 = "sha256-JgqKmZG3K4JwQ1Bzw2oll/LQ1njA9wFhX0/uYr9XjAU="; + repo = pname; + rev = version; + hash = "sha256-JgqKmZG3K4JwQ1Bzw2oll/LQ1njA9wFhX0/uYr9XjAU="; }; propagatedBuildInputs = [ @@ -34,6 +36,10 @@ buildPythonPackage rec { pytest-mock ]; + pythonImportsCheck = [ + "s3_credentials" + ]; + meta = with lib; { description = "Python CLI utility for creating credentials for accessing S3 buckets"; homepage = "https://github.com/simonw/s3-credentials"; From 939ac39ee49de2a2e747c4d5533b1bb8a95b53c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Mar 2022 09:01:42 +0200 Subject: [PATCH 120/163] python3Packages.asyncmy: 0.2.3 -> 0.2.4 --- pkgs/development/python-modules/asyncmy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncmy/default.nix b/pkgs/development/python-modules/asyncmy/default.nix index 4d4eaaacaad7..6b680b75dcef 100644 --- a/pkgs/development/python-modules/asyncmy/default.nix +++ b/pkgs/development/python-modules/asyncmy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asyncmy"; - version = "0.2.3"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "long2ice"; repo = pname; rev = "v${version}"; - sha256 = "ys9RYaosc4noJsWYsVo9+6W7JaG4r6lsz6UH4o08q4A="; + sha256 = "sha256-nuk8Zh82qN60FrH6Jjv7RDDDQsfZ5EmbaQe5EAcB2Tk="; }; nativeBuildInputs = [ From d0b22196f515b0143d8b5bdf312f2e42e312646d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Mar 2022 09:38:14 +0200 Subject: [PATCH 121/163] python3Packages.unicrypto: init at 0.0.2 --- .../python-modules/unicrypto/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/unicrypto/default.nix diff --git a/pkgs/development/python-modules/unicrypto/default.nix b/pkgs/development/python-modules/unicrypto/default.nix new file mode 100644 index 000000000000..53a425b130ff --- /dev/null +++ b/pkgs/development/python-modules/unicrypto/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pycryptodomex +, pythonOlder +}: + +buildPythonPackage rec { + pname = "unicrypto"; + version = "0.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ripcH3XJW5i8+Sc6N5OzMrIfHzbjFbHmEiwRP24rRRo="; + }; + + propagatedBuildInputs = [ + pycryptodomex + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "unicrypto" + ]; + + meta = with lib; { + description = "Unified interface for cryptographic libraries"; + homepage = "https://github.com/skelsec/unicrypto"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9939c75e2bd5..6f7c95c83b86 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10352,6 +10352,8 @@ in { unicorn-emu = pkgs.unicorn; }; + unicrypto = callPackage ../development/python-modules/unicrypto { }; + unidecode = callPackage ../development/python-modules/unidecode { }; unidic-lite = callPackage ../development/python-modules/unidic-lite { }; From b0d31a697f9bd46d43caf58082cda5d5ea5be8ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Mar 2022 09:40:47 +0200 Subject: [PATCH 122/163] python3Packages.unicrypto: 0.0.2 -> 0.0.5 --- pkgs/development/python-modules/unicrypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unicrypto/default.nix b/pkgs/development/python-modules/unicrypto/default.nix index 53a425b130ff..56a57ccaf0ef 100644 --- a/pkgs/development/python-modules/unicrypto/default.nix +++ b/pkgs/development/python-modules/unicrypto/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "unicrypto"; - version = "0.0.2"; + version = "0.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ripcH3XJW5i8+Sc6N5OzMrIfHzbjFbHmEiwRP24rRRo="; + hash = "sha256-aSQPJgSTNGhh5jlpfi/aJF8UZWx98grm2eaxuzassp4="; }; propagatedBuildInputs = [ From be917906e2e78d9af6bce7f8758d09dc4b517c16 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Mar 2022 09:41:06 +0200 Subject: [PATCH 123/163] python3Packages.minikerberos: 0.2.18 -> 0.2.20 --- pkgs/development/python-modules/minikerberos/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix index 4b75006bea46..a6e9fd68c2bd 100644 --- a/pkgs/development/python-modules/minikerberos/default.nix +++ b/pkgs/development/python-modules/minikerberos/default.nix @@ -5,24 +5,26 @@ , fetchPypi , oscrypto , pythonOlder +, unicrypto }: buildPythonPackage rec { pname = "minikerberos"; - version = "0.2.18"; + version = "0.2.20"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5bmuCbX4a69sP9SnHkB4OQrOHmFufUTlchHkgu6iBYk="; + hash = "sha256-eJ+AImP6GIL3AbEj9u7ASLRc1zG/G1KIcABdrwdAIEc="; }; propagatedBuildInputs = [ asn1crypto asysocks oscrypto + unicrypto ]; # no tests are published: https://github.com/skelsec/minikerberos/pull/5 From 27d0d8d64b4aa5b12065ec75061666d60bb9cccd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Mar 2022 08:17:53 +0000 Subject: [PATCH 124/163] python310Packages.ansible-later: 2.0.6 -> 2.0.8 --- pkgs/development/python-modules/ansible-later/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index e671063acce4..573a8d3919be 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "2.0.6"; + version = "2.0.8"; format = "pyproject"; src = fetchFromGitHub { owner = "thegeeklab"; repo = "ansible-later"; rev = "v${version}"; - sha256 = "sha256-vg9ryzl9ZeOGuFLL1yeJ3vGNPdo3ONmCQozY6DK6miY="; + sha256 = "sha256-oPlm9uxyN3hyf4gFv37YWEn/HOkg0QQ1Ya3tjLd53rQ="; }; postInstall = '' From e2cc03a069d834236dff1fb89eb955a26f15a9ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Mar 2022 10:32:35 +0200 Subject: [PATCH 125/163] python3Packages.subarulink: 0.4.3 -> 0.5.0 --- pkgs/development/python-modules/subarulink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index ab514735ec26..72101eaf29d8 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.4.3"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q+a+OFFMAGl8KQi+KZ8h21+Pj0XEqP9ZIJii2PCgD6E="; + hash = "sha256-q+a+OFFMAGl8KQi+KZ8h21+Pj0XEqP9ZIJii2PCgD6E="; }; propagatedBuildInputs = [ From 9c26dceb88f76bf503d474a2593175446f9bcdb4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Mar 2022 11:03:40 +0200 Subject: [PATCH 126/163] python3Packages.ansible-later: set version, enable tests --- .../python-modules/ansible-later/default.nix | 58 +++++++++++-------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index 573a8d3919be..9857c810ddb8 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -1,16 +1,18 @@ -{ buildPythonPackage -, fetchFromGitHub -, lib - -# pythonPackages +{ lib , anyconfig , appdirs +, buildPythonPackage , colorama +, fetchFromGitHub , flake8 , jsonschema , nested-lookup +, pathspec , poetry-core +, pytest-mock , python-json-logger +, pytestCheckHook +, pythonOlder , pyyaml , toolz , unidiff @@ -19,27 +21,18 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "2.0.8"; + version = "2.0.6"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "thegeeklab"; - repo = "ansible-later"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-oPlm9uxyN3hyf4gFv37YWEn/HOkg0QQ1Ya3tjLd53rQ="; + hash = "sha256-vg9ryzl9ZeOGuFLL1yeJ3vGNPdo3ONmCQozY6DK6miY="; }; - postInstall = '' - rm $out/lib/python*/site-packages/LICENSE - ''; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'PyYAML = "6.0"' 'PyYAML = "*"' \ - --replace 'unidiff = "0.7.3"' 'unidiff = "*"' \ - --replace 'jsonschema = "4.4.0"' 'jsonschema = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; @@ -51,6 +44,7 @@ buildPythonPackage rec { flake8 jsonschema nested-lookup + pathspec python-json-logger pyyaml toolz @@ -58,12 +52,30 @@ buildPythonPackage rec { yamllint ]; - # no tests - doCheck = false; - pythonImportsCheck = [ "ansiblelater" ]; + checkInputs = [ + pytest-mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --cov-append --no-cov-on-fail" "" \ + --replace 'PyYAML = "6.0"' 'PyYAML = "*"' \ + --replace 'unidiff = "0.7.3"' 'unidiff = "*"' \ + --replace 'jsonschema = "4.4.0"' 'jsonschema = "*"' + ''; + + postInstall = '' + rm $out/lib/python*/site-packages/LICENSE + ''; + + pythonImportsCheck = [ + "ansiblelater" + ]; meta = with lib; { - description = "Another best practice scanner for Ansible roles and playbooks"; + description = "Best practice scanner for Ansible roles and playbooks"; homepage = "https://github.com/thegeeklab/ansible-later"; license = licenses.mit; maintainers = with maintainers; [ tboerger ]; From 9ee8097b31a2f7aed41b7bc1c15d7f3fbee2bc5f Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 28 Mar 2022 09:06:00 +0000 Subject: [PATCH 127/163] linux: 4.14.273 -> 4.14.274 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index df563eeec5d0..0683e7d6ad4d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.273"; + version = "4.14.274"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0bdwmj6hpy5gb9y50hchgjcjp4z5y7vyk8d8y1ncyrvi18r1pz8v"; + sha256 = "1bbz1w5l7im7dspq6g6iy5vahsxcaa1b2ykrw49m3pw8rf7m6hib"; }; } // (args.argsOverride or {})) From f77a0e19341a9c1b41d0951f30d732de51530221 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 28 Mar 2022 09:06:08 +0000 Subject: [PATCH 128/163] linux: 4.19.236 -> 4.19.237 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 23b14c4435bd..6121fccf15fa 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.236"; + version = "4.19.237"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1h1ipqpcpi5ga1dg78y9gjmd2a7gkc52i0l83xbr13gyranzcbh0"; + sha256 = "1n0c4bmmbj145zsp662a5rxh294fpq4dkillpz16wj6c098z7zxs"; }; } // (args.argsOverride or {})) From 61df0a1d7dd69a973913fe98efccc6bbdbd206a6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 28 Mar 2022 09:06:14 +0000 Subject: [PATCH 129/163] linux: 4.9.308 -> 4.9.309 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index e2f94c8151f0..ad58c3ef6413 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.308"; + version = "4.9.309"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "11rf3zr31ap6rzy3s489c1dqzkfn5cfkm579y4dnssdyzmyams3v"; + sha256 = "05468rk4hlz9ag1zb7shngn5rl42npw7haqbi5mpaa0yksl5asp8"; }; } // (args.argsOverride or {})) From 2abfedc54c38442a6660c3a5569bd53c0ed5aa18 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 28 Mar 2022 09:06:21 +0000 Subject: [PATCH 130/163] linux: 5.10.108 -> 5.10.109 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index d1e35748c7f9..7b5c9cba1444 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.108"; + version = "5.10.109"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1n216rdlmb0x3az4hl224m8c8sddlqwzmqnds4s8z2wiw3bc4v5z"; + sha256 = "1p0k46isy2wzzms801lrnb59f1nb9mhywjj7fnkrwrj9nbn25yqq"; }; } // (args.argsOverride or {})) From 6c6a932a9e28ef618fce839d545b6867d533ed40 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 28 Mar 2022 09:06:28 +0000 Subject: [PATCH 131/163] linux: 5.15.31 -> 5.15.32 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index cf9ead67efb3..dab27c119aa5 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.31"; + version = "5.15.32"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "123b4i5li70spf1y8642y8jwkjjcgcg23x8bj4kxkgnm8x5kh8gn"; + sha256 = "11nz2w6hgwy6va6sxf4ic1s4kv24zbpssgjxsq6n321h4bxcsqql"; }; } // (args.argsOverride or { })) From aa374b7acb3119ec7c83f3d564942549e24c9fc0 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 28 Mar 2022 09:06:35 +0000 Subject: [PATCH 132/163] linux: 5.16.17 -> 5.16.18 --- pkgs/os-specific/linux/kernel/linux-5.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.16.nix b/pkgs/os-specific/linux/kernel/linux-5.16.nix index 03947d5b1f84..4dcb71c4f5cd 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.16.17"; + version = "5.16.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1z7i6z36rs777xiff5x3qjdc02x91n9ibf7rqr003ws7bf84vvnf"; + sha256 = "096f80m2czj8khvil7s037pqdf1s6pklqn5d9419jqkz7v70piry"; }; } // (args.argsOverride or { })) From 2ddb5604db46d2b8e30d49ba5db7c87281afafac Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 28 Mar 2022 09:06:41 +0000 Subject: [PATCH 133/163] linux: 5.17 -> 5.17.1 --- pkgs/os-specific/linux/kernel/linux-5.17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.17.nix b/pkgs/os-specific/linux/kernel/linux-5.17.nix index f05ab1486aba..edd5339e103d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.17.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.17"; + version = "5.17.1"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "sha256-VV/vYd3bWRqD1i3QTiUnkvmvS6nvFGg/ZIQORvogsbE="; + sha256 = "092cx18va108lb27kxx2b00ma3l9g22nmkk81034apx26bacbmbw"; }; } // (args.argsOverride or { })) From 566270be89071fcc732d20b5d907794b1f13b2e5 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 28 Mar 2022 09:06:46 +0000 Subject: [PATCH 134/163] linux: 5.4.187 -> 5.4.188 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index a58d0aa8daed..65c9f6c4b26d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.187"; + version = "5.4.188"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1f57x6dqipj0kdcgii8qydbdsaq0w484g2wwgw1pi1dgyarkv7hq"; + sha256 = "1g7xf2jx1hx580f42yirfgv9v0f9f88wzxxx0wiwx7wcqbyqpg4z"; }; } // (args.argsOverride or {})) From 7d1a55bdfb7feca0fdfe9ea7105b5c340f455999 Mon Sep 17 00:00:00 2001 From: Yaya Date: Mon, 28 Mar 2022 11:11:17 +0200 Subject: [PATCH 135/163] gitlab: 14.8.4 -> 14.9.1 (#165309) --- .../version-management/gitlab/data.json | 16 +- .../gitlab/gitaly/default.nix | 8 +- .../gitlab/gitlab-shell/default.nix | 4 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 22 +- .../gitlab/rubyEnv/Gemfile.lock | 92 +++++--- .../gitlab/rubyEnv/gemset.nix | 202 ++++++++++++++---- 7 files changed, 258 insertions(+), 90 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 73f84f7e9eff..bd524c622d6f 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.8.4", - "repo_hash": "0ra4d324all26crz84iys9xb40ykpiaqj4z2790zaw1s45wakmgj", - "yarn_hash": "106js1j6wii2axh1dxvlfr7mqhvsnsb5qs0danp9c3h1ihd4nz91", + "version": "14.9.1", + "repo_hash": "0jkhvglisaj3h9ls8q8wrxnnp4xp3zggc8vmwg6jqqjsmbpi332h", + "yarn_hash": "1bq1ka0nlb2nkjx70qpwpm8x6crbkfj0c8m39pwwc42j8wn10r9g", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.8.4-ee", + "rev": "v14.9.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.8.4", - "GITLAB_PAGES_VERSION": "1.54.0", - "GITLAB_SHELL_VERSION": "13.23.2", - "GITLAB_WORKHORSE_VERSION": "14.8.4" + "GITALY_SERVER_VERSION": "14.9.1", + "GITLAB_PAGES_VERSION": "1.56.0", + "GITLAB_SHELL_VERSION": "13.24.0", + "GITLAB_WORKHORSE_VERSION": "14.9.1" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 877e0ace9fa2..d8ab7f36b39c 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "14.8.4"; + version = "14.9.1"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -23,10 +23,10 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-3doXqYj1XsOifAr78ds5ioa6gUfw8uyUwn7JzqlMVSE="; + sha256 = "sha256-mk6JZuu6b2r/OqRI4ZUf8AV/ObRKhTIQT9bQE8sH894="; }; - vendorSha256 = "sha256-Qw9/nlo1eB5dPcldXe9doy4QA4DDVUDad3o4kbdNu34="; + vendorSha256 = "sha256-kEjgWA/Task23PScPYrqdDu3vdVR/FJl7OilUug/Bds="; passthru = { inherit rubyEnv; @@ -41,7 +41,7 @@ buildGoModule { postInstall = '' mkdir -p $ruby - cp -rv $src/ruby/{bin,lib,proto,git-hooks} $ruby + cp -rv $src/ruby/{bin,lib,proto} $ruby mv $out/bin/gitaly-git2go $out/bin/gitaly-git2go-${version} ''; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 99ad72a26644..971ef2af955c 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "13.23.2"; + version = "13.24.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-aee+Tn81o1iK1Xm5et6lKUN8//lyGh3NGs96Mwg4nFc="; + sha256 = "sha256-/SH1YNmZr/NuCvyL6tmyTj1C2LUuxldeHwmJHWKPz2M="; }; buildInputs = [ ruby ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 3533bccea987..e16d7f75bf69 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.8.4"; + version = "14.9.1"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-ps/MjNY2woHrfcsNZTurnO2TbasWdS3LiuPUfVD2Ypc="; + vendorSha256 = "sha256-ubuMuO8tDjdVZWehsmsJqUgvmySIBJ15D9GHZFzApFw="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 4ae8b33569f2..fd469fd8bcc7 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -11,6 +11,8 @@ gem 'responders', '~> 3.0' gem 'sprockets', '~> 3.7.0' +gem 'view_component', '~> 2.50.0' + # Default values for AR models gem 'default_value_for', '~> 3.4.0' @@ -153,7 +155,7 @@ gem 'html-pipeline', '~> 2.13.2' gem 'deckar01-task_list', '2.3.1' gem 'gitlab-markup', '~> 1.8.0' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'commonmarker', '~> 0.23.2' +gem 'commonmarker', '~> 0.23.4' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.3.2' @@ -290,7 +292,7 @@ gem 'autoprefixer-rails', '10.2.5.1' gem 'terser', '1.0.2' gem 'addressable', '~> 2.8' -gem 'tanuki_emoji', '~> 0.5' +gem 'tanuki_emoji', '~> 0.6' gem 'gon', '~> 6.4.0' gem 'request_store', '~> 1.5' gem 'base32', '~> 0.3.0' @@ -302,6 +304,9 @@ gem 'rack-attack', '~> 6.3.0' # Sentry integration gem 'sentry-raven', '~> 3.1' +gem 'sentry-ruby', '~> 5.1.1' +gem 'sentry-rails', '~> 5.1.1' +gem 'sentry-sidekiq', '~> 5.1.1' # PostgreSQL query parsing # @@ -374,7 +379,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 6.6.0', require: false + gem 'gitlab-styles', '~> 7.0.0', require: false gem 'haml_lint', '~> 0.36.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -393,14 +398,16 @@ group :development, :test do gem 'parallel', '~> 1.19', require: false gem 'test_file_finder', '~> 0.1.3' + + gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 2.8.0', require: false + gem 'gitlab-dangerfiles', '~> 2.11.0', require: false end group :development, :test, :coverage do - gem 'simplecov', '~> 0.18.5', require: false + gem 'simplecov', '~> 0.21', require: false gem 'simplecov-lcov', '~> 0.8.0', require: false gem 'simplecov-cobertura', '~> 1.3.1', require: false gem 'undercover', '~> 0.4.4', require: false @@ -418,6 +425,7 @@ group :test do gem 'fuubar', '~> 2.2.0' gem 'rspec-retry', '~> 0.6.1' gem 'rspec_profiling', '~> 0.0.6' + gem 'rspec-benchmark', '~> 0.6.0' gem 'rspec-parameterized', require: false gem 'capybara', '~> 3.35.3' @@ -473,7 +481,7 @@ gem 'ssh_data', '~> 1.2' gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.8.0.pre.rc1' +gem 'gitaly', '~> 14.9.0.pre.rc4' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' @@ -534,4 +542,4 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'ipynbdiff', '0.3.8' +gem 'ipynbdiff', '0.4.4' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index a7f75fb0e269..da4987d35dcd 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -132,8 +132,11 @@ GEM bcrypt (3.1.16) benchmark (0.1.1) benchmark-ips (2.3.0) + benchmark-malloc (0.2.0) benchmark-memory (0.1.2) memory_profiler (~> 0.9) + benchmark-perf (0.6.0) + benchmark-trend (0.4.0) better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) @@ -192,7 +195,7 @@ GEM open4 (~> 1.3) coderay (1.1.3) colored2 (3.1.2) - commonmarker (0.23.2) + commonmarker (0.23.4) concurrent-ruby (1.1.9) connection_pool (2.2.5) contracts (0.11.0) @@ -214,7 +217,7 @@ GEM css_parser (1.7.0) addressable daemons (1.3.1) - danger (8.4.2) + danger (8.4.5) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -231,6 +234,7 @@ GEM danger gitlab (~> 4.2, >= 4.2.0) database_cleaner (1.7.0) + dead_end (3.1.1) deckar01-task_list (2.3.1) html-pipeline declarative (0.0.20) @@ -240,13 +244,15 @@ GEM activerecord (>= 3.2.0, < 7.0) deprecation_toolkit (1.5.1) activesupport (>= 4.2) - derailed_benchmarks (1.8.1) + derailed_benchmarks (2.1.1) benchmark-ips (~> 2) + dead_end get_process_mem (~> 0) heapy (~> 0) - memory_profiler (~> 0) - mini_histogram (>= 0.2.1) + memory_profiler (>= 0, < 2) + mini_histogram (>= 0.3.0) rack (>= 1) + rack-test rake (> 10, < 14) ruby-statistics (>= 2.1) thor (>= 0.19, < 2) @@ -268,7 +274,7 @@ GEM diffy (3.3.0) discordrb-webhooks (3.4.2) rest-client (>= 2.0.0) - docile (1.3.2) + docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) doorkeeper (5.5.0.rc2) @@ -365,7 +371,7 @@ GEM fast_blank (1.0.0) fast_gettext (2.1.0) ffaker (2.10.0) - ffi (1.15.3) + ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -428,7 +434,7 @@ GEM ruby-progressbar (~> 1.4) fuzzyurl (0.9.0) gemoji (3.0.1) - get_process_mem (0.2.5) + get_process_mem (0.2.7) ffi (~> 1.0) gettext (3.3.6) locale (>= 2.0.5) @@ -442,7 +448,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.8.0.pre.rc1) + gitaly (14.9.0.pre.rc4) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -450,8 +456,8 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (2.8.0) - danger (>= 8.3.1) + gitlab-dangerfiles (2.11.0) + danger (>= 8.4.5) danger-gitlab (>= 8.0.0) gitlab-experiment (0.7.0) activesupport (>= 3.0) @@ -488,7 +494,7 @@ GEM openid_connect (~> 1.2) gitlab-sidekiq-fetcher (0.8.0) sidekiq (~> 6.1) - gitlab-styles (6.6.0) + gitlab-styles (7.0.0) rubocop (~> 0.91, >= 0.91.1) rubocop-gitlab-security (~> 0.1.1) rubocop-graphql (~> 0.10) @@ -632,7 +638,7 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.9.1) + i18n (1.10.0) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) @@ -641,9 +647,9 @@ GEM invisible_captcha (1.1.0) rails (>= 4.2) ipaddress (0.8.3) - ipynbdiff (0.3.8) - diffy (= 3.3.0) - json (= 2.5.1) + ipynbdiff (0.4.4) + diffy (~> 3.3) + json (~> 2.5, >= 2.5.1) jaeger-client (1.1.0) opentracing (~> 0.3) thrift @@ -1052,6 +1058,11 @@ GEM rspec-core (~> 3.10.0) rspec-expectations (~> 3.10.0) rspec-mocks (~> 3.10.0) + rspec-benchmark (0.6.0) + benchmark-malloc (~> 0.2) + benchmark-perf (~> 0.6) + benchmark-trend (~> 0.4) + rspec (>= 3.0) rspec-core (3.10.1) rspec-support (~> 3.10.0) rspec-expectations (3.10.1) @@ -1097,7 +1108,7 @@ GEM parser (>= 2.7.1.5) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-graphql (0.10.3) + rubocop-graphql (0.13.0) rubocop (>= 0.87, < 2) rubocop-performance (1.9.2) rubocop (>= 0.90.0, < 2.0) @@ -1118,7 +1129,7 @@ GEM ruby-saml (1.13.0) nokogiri (>= 1.10.5) rexml - ruby-statistics (2.1.2) + ruby-statistics (3.0.0) ruby2_keywords (0.0.4) ruby_parser (3.15.0) sexp_processor (~> 4.9) @@ -1156,8 +1167,19 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) + sentry-rails (5.1.1) + railties (>= 5.0) + sentry-ruby-core (~> 5.1.1) sentry-raven (3.1.2) faraday (>= 1.0) + sentry-ruby (5.1.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + sentry-ruby-core (= 5.1.1) + sentry-ruby-core (5.1.1) + concurrent-ruby + sentry-sidekiq (5.1.1) + sentry-ruby-core (~> 5.1.1) + sidekiq (>= 3.0) set (1.0.1) settingslogic (2.0.9) sexp_processor (4.15.1) @@ -1171,19 +1193,22 @@ GEM sidekiq-cron (1.2.0) fugit (~> 1.1) sidekiq (>= 4.2.1) + sigdump (0.2.4) signet (0.14.0) addressable (~> 2.3) faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_po_parser (1.1.2) - simplecov (0.18.5) + simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-cobertura (1.3.1) simplecov (~> 0.8) simplecov-html (0.12.3) simplecov-lcov (0.8.0) + simplecov_json_formatter (0.1.4) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.4) snowplow-tracker (0.6.1) @@ -1242,7 +1267,7 @@ GEM sys-filesystem (1.4.3) ffi (~> 1.1) sysexits (1.2.0) - tanuki_emoji (0.5.0) + tanuki_emoji (0.6.0) temple (0.8.2) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) @@ -1256,7 +1281,7 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.1.0) + thor (1.2.1) thrift (0.14.0) tilt (2.0.10) timecop (0.9.1) @@ -1330,6 +1355,9 @@ GEM activerecord (>= 3.0) activesupport (>= 3.0) version_sorter (2.2.4) + view_component (2.50.0) + activesupport (>= 5.0.0, < 8.0) + method_source (~> 1.0) vmstat (2.3.0) warden (1.2.8) rack (>= 2.0.6) @@ -1408,7 +1436,7 @@ DEPENDENCIES capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) - commonmarker (~> 0.23.2) + commonmarker (~> 0.23.4) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 3.0) @@ -1456,10 +1484,10 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.8.0.pre.rc1) + gitaly (~> 14.9.0.pre.rc4) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 2.8.0) + gitlab-dangerfiles (~> 2.11.0) gitlab-experiment (~> 0.7.0) gitlab-fog-azure-rm (~> 1.2.0) gitlab-labkit (~> 0.22.0) @@ -1470,7 +1498,7 @@ DEPENDENCIES gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.9.0) gitlab-sidekiq-fetcher (= 0.8.0) - gitlab-styles (~> 6.6.0) + gitlab-styles (~> 7.0.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.4.0) @@ -1500,7 +1528,7 @@ DEPENDENCIES icalendar invisible_captcha (~> 1.1.0) ipaddress (~> 0.8.3) - ipynbdiff (= 0.3.8) + ipynbdiff (= 0.4.4) jira-ruby (~> 2.1.4) js_regex (~> 3.7) json (~> 2.5.1) @@ -1588,6 +1616,7 @@ DEPENDENCIES rexml (~> 3.2.5) rouge (~> 3.27.0) rqrcode-rails3 (~> 0.1.7) + rspec-benchmark (~> 0.6.0) rspec-parameterized rspec-rails (~> 5.0.1) rspec-retry (~> 0.6.1) @@ -1606,13 +1635,17 @@ DEPENDENCIES sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) selenium-webdriver (~> 3.142) + sentry-rails (~> 5.1.1) sentry-raven (~> 3.1) + sentry-ruby (~> 5.1.1) + sentry-sidekiq (~> 5.1.1) settingslogic (~> 2.0.9) shoulda-matchers (~> 4.0.1) sidekiq (~> 6.4) sidekiq-cron (~> 1.2) + sigdump (~> 0.2.4) simple_po_parser (~> 1.1.2) - simplecov (~> 0.18.5) + simplecov (~> 0.21) simplecov-cobertura (~> 1.3.1) simplecov-lcov (~> 0.8.0) slack-messenger (~> 2.3.4) @@ -1627,7 +1660,7 @@ DEPENDENCIES stackprof (~> 0.2.15) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) - tanuki_emoji (~> 0.5) + tanuki_emoji (~> 0.6) terser (= 1.0.2) test-prof (~> 1.0.7) test_file_finder (~> 0.1.3) @@ -1644,6 +1677,7 @@ DEPENDENCIES valid_email (~> 0.1) validates_hostname (~> 1.0.11) version_sorter (~> 2.2.4) + view_component (~> 2.50.0) vmstat (~> 2.3.0) warning (~> 1.2.0) webauthn (~> 2.3) @@ -1653,4 +1687,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.1) BUNDLED WITH - 2.3.6 + 2.3.9 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 0a2d8394e007..5fc9a183a8b9 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -499,6 +499,16 @@ }; version = "2.3.0"; }; + benchmark-malloc = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0svyac8alxbmip6b9rp34wq5lcimdaapjkaqdw1385i66l28ziip"; + type = "gem"; + }; + version = "0.2.0"; + }; benchmark-memory = { dependencies = ["memory_profiler"]; groups = ["default"]; @@ -510,6 +520,26 @@ }; version = "0.1.2"; }; + benchmark-perf = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08cngwnwk2h6cdxx3dyckxcg7d0yi3pm83c26kfzkq1xkyah2azy"; + type = "gem"; + }; + version = "0.6.0"; + }; + benchmark-trend = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10axhj80jan0b7c77hm0aj2yxv0dh9clfy4pppxvxfj3yjlh4nny"; + type = "gem"; + }; + version = "0.4.0"; + }; better_errors = { dependencies = ["coderay" "erubi" "rack"]; groups = ["development"]; @@ -784,10 +814,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sshs8mvjgk73sfz3bi9apq0p99kfj7n9bg1cyldl4yyy2z05prs"; + sha256 = "1kn7x7smqsk0x2iq17dbbaay0qimmgza8wbdlrs66dvn0l2wpncm"; type = "gem"; }; - version = "0.23.2"; + version = "0.23.4"; }; concurrent-ruby = { groups = ["default" "development" "test"]; @@ -921,10 +951,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07mxkgksgilfipd97rgfhx7c421j1fx7rk6lf0k18bkccyg1r8vn"; + sha256 = "1bmbqxscz0whc3kf5622ffp83k96h0vx71bhb5rzi3zzmg6b4vkl"; type = "gem"; }; - version = "8.4.2"; + version = "8.4.5"; }; danger-gitlab = { dependencies = ["danger" "gitlab"]; @@ -947,6 +977,16 @@ }; version = "1.7.0"; }; + dead_end = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nrg9cwy21iwzl1djp1hamy24q3pfhvvrjqi9q0bwj81gizxy48h"; + type = "gem"; + }; + version = "3.1.1"; + }; deckar01-task_list = { dependencies = ["html-pipeline"]; groups = ["default"]; @@ -1011,15 +1051,15 @@ version = "1.5.1"; }; derailed_benchmarks = { - dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rake" "ruby-statistics" "thor"]; + dependencies = ["benchmark-ips" "dead_end" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rack-test" "rake" "ruby-statistics" "thor"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05nryqr18w61dyk9amajh7chn07zxardxnywayyis72kmd8f9q29"; + sha256 = "1cxaqvfhm8xpv3hvpwn7y4g5315zzf5gsdffdkm1bisjviwvmc15"; type = "gem"; }; - version = "1.8.1"; + version = "2.1.1"; }; device_detector = { groups = ["default"]; @@ -1095,14 +1135,14 @@ version = "3.4.2"; }; docile = { - groups = ["default" "development" "test"]; + groups = ["coverage" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; + sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.0"; }; domain_name = { dependencies = ["unf"]; @@ -1594,10 +1634,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; type = "gem"; }; - version = "1.15.3"; + version = "1.15.5"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -1817,14 +1857,14 @@ }; get_process_mem = { dependencies = ["ffi"]; - groups = ["default" "puma" "unicorn"]; + groups = ["default" "puma" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q7pivp9z9pdxc2ha32q7x9zgqy8m9jf87g6n5mvi5l6knxya8sh"; + sha256 = "1fkyyyxjcx4iigm8vhraa629k2lxa1npsv4015y82snx84v3rzaa"; type = "gem"; }; - version = "0.2.5"; + version = "0.2.7"; }; gettext = { dependencies = ["locale" "text"]; @@ -1876,10 +1916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dl80qvyl1jbcc1iabpja3pnsrfag92h25c2r3vqn3bd0x9q4iwc"; + sha256 = "13yq0ln40iy0wjapdg5phkqgr2bbdfk3xccyr1828yxpgkd44716"; type = "gem"; }; - version = "14.8.0.pre.rc1"; + version = "14.9.0.pre.rc4"; }; github-markup = { groups = ["default"]; @@ -1919,10 +1959,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xd7sgl5iwxq2mvx7ql1wpciqrnj2z1ycjxm5ddrdi4kcl9f94z4"; + sha256 = "1in56r2mdi6ghwx4nxvfihb2sg73xhnpw0w42wc5f57wwy6m1s24"; type = "gem"; }; - version = "2.8.0"; + version = "2.11.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2036,10 +2076,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xs7v0sj3j4d5yflfn8n5azh5qwxsrc432q7v4nckg9irwqj99js"; + sha256 = "10fmvx2vx2v0mbwv5d4wcpc2iyp5y8lwxn9hjpzkk5bvxkk4c493"; type = "gem"; }; - version = "6.6.0"; + version = "7.0.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2520,10 +2560,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8"; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; type = "gem"; }; - version = "1.9.1"; + version = "1.10.0"; }; i18n_data = { groups = ["default"]; @@ -2583,10 +2623,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0raj4xwp2dz1xrzcpqqdp5ygfpjdy7jx28ziqg9f73hf850j90d1"; + sha256 = "0cgrr3pc0y11gas6k2js33qghj7rpdh99vavda712wbq3hz42jx2"; type = "gem"; }; - version = "0.3.8"; + version = "0.4.4"; }; jaeger-client = { dependencies = ["opentracing" "thrift"]; @@ -4468,6 +4508,17 @@ }; version = "3.10.0"; }; + rspec-benchmark = { + dependencies = ["benchmark-malloc" "benchmark-perf" "benchmark-trend" "rspec"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kyn7p409n75ikb7z9v3dbzjyyinkwi88f66alj9lnf2gssss50h"; + type = "gem"; + }; + version = "0.6.0"; + }; rspec-core = { dependencies = ["rspec-support"]; groups = ["default" "development" "test"]; @@ -4605,10 +4656,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hvm17hm7xjqcfn70c7h3rrz2y2mrazqmkp5ains08j0zd39x7rh"; + sha256 = "18md69dkz0s5xm93c4psmvy4c0nx3a7yi61vfjn46cw6yk54fm7b"; type = "gem"; }; - version = "0.10.3"; + version = "0.13.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -4697,14 +4748,14 @@ version = "1.13.0"; }; ruby-statistics = { - groups = ["default"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmd9dk1fcmii38apwn3py00qfqxd5yzylafm49n24plzwv913nh"; + sha256 = "10fwxwhby6n1q1k61bic2s0mddlfwb9x7a7306vir4s60cvh20v1"; type = "gem"; }; - version = "2.1.2"; + version = "3.0.0"; }; ruby2_keywords = { groups = ["danger" "default" "development" "test"]; @@ -4896,6 +4947,17 @@ }; version = "3.142.7"; }; + sentry-rails = { + dependencies = ["railties" "sentry-ruby-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zv5db0wrvs4gjgrqz7fzpihgil1p9b8hm4bmf25ihyxfskz0vlh"; + type = "gem"; + }; + version = "5.1.1"; + }; sentry-raven = { dependencies = ["faraday"]; groups = ["default"]; @@ -4907,6 +4969,39 @@ }; version = "3.1.2"; }; + sentry-ruby = { + dependencies = ["concurrent-ruby" "sentry-ruby-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09f1zkc99m1z89qf40bd2ik4fdkchm5h5rb77bz2zhn1f8xmcjaf"; + type = "gem"; + }; + version = "5.1.1"; + }; + sentry-ruby-core = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "012xra6f9b9y00wvnd2vks5kw3wrjaz3flm692j8sd3qxs8xhbhm"; + type = "gem"; + }; + version = "5.1.1"; + }; + sentry-sidekiq = { + dependencies = ["sentry-ruby-core" "sidekiq"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1byig501hvjyc3y0x5x0w3h0k3c6lw9j10f3kxx7z8zvfy2n3hz4"; + type = "gem"; + }; + version = "5.1.1"; + }; set = { groups = ["default"]; platforms = []; @@ -4980,6 +5075,16 @@ }; version = "1.2.0"; }; + sigdump = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mqf06iw7rymv54y7rgbmfi6ppddgjjmxzi3hrw658n1amp1gwhb"; + type = "gem"; + }; + version = "0.2.4"; + }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; groups = ["default"]; @@ -5002,15 +5107,15 @@ version = "1.1.2"; }; simplecov = { - dependencies = ["docile" "simplecov-html"]; - groups = ["development" "test"]; + dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; + groups = ["coverage" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ycx5q699ycbjhp28sjbkrd62vwxlrb7fh4v2m7sjsp2qhi6cf6r"; + sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; type = "gem"; }; - version = "0.18.5"; + version = "0.21.2"; }; simplecov-cobertura = { dependencies = ["simplecov"]; @@ -5043,6 +5148,16 @@ }; version = "0.8.0"; }; + simplecov_json_formatter = { + groups = ["coverage" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; + type = "gem"; + }; + version = "0.1.4"; + }; sixarm_ruby_unaccent = { groups = ["default"]; platforms = []; @@ -5290,10 +5405,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qw0qa3xz4h3izwl5qsvmg5vvfsfjhmv4mdxaw1v1w1qgp7j7gws"; + sha256 = "0an1311bpyhd9kzak1qpd4jks336i47gbvx3zdrnn1rdxppimsac"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; temple = { groups = ["default" "development" "test"]; @@ -5374,10 +5489,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; thrift = { groups = ["default"]; @@ -5736,6 +5851,17 @@ }; version = "2.2.4"; }; + view_component = { + dependencies = ["activesupport" "method_source"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1syhbmnrqklahqaaac13jx6rwpc6z210f53apwglngp2xdibxkf1"; + type = "gem"; + }; + version = "2.50.0"; + }; vmstat = { groups = ["default"]; platforms = []; From bb18719b6d305b8395b6d4def57b1a8d452794e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Mar 2022 09:14:01 +0000 Subject: [PATCH 136/163] python310Packages.habanero: 1.0.0 -> 1.2.0 --- pkgs/development/python-modules/habanero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index 9dc3193957f6..3a2d085e5bc0 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "habanero"; - version = "1.0.0"; + version = "1.2.0"; # Install from Pypi is failing because of a missing file (Changelog.rst) src = fetchFromGitHub { owner = "sckott"; repo = pname; rev = "v${version}"; - sha256 = "0lhbd5c4sypcd65nh4cgxddsqrxwg89nn1qiii6m5l4fzsvblggv"; + sha256 = "sha256-jxaO8nCR5jhXCPjhjVLKaGeQp9JF3ECQ1+j3TOJKawg="; }; propagatedBuildInputs = [ requests tqdm ]; From 881e60eb98bac9ccb92f2c9d7ee05aff9afc0f37 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 28 Mar 2022 11:38:38 +0200 Subject: [PATCH 137/163] linuxPackages.rtl8821ce: fix build for kernel >= 5.17 --- pkgs/os-specific/linux/rtl8821ce/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 62743c226889..039d4b3fb7bb 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, kernel, bc }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, kernel +, bc +}: stdenv.mkDerivation rec { pname = "rtl8821ce"; @@ -11,6 +17,12 @@ stdenv.mkDerivation rec { sha256 = "18ma8a8h1l90dss0k6al7q6plwr57jc9g67p22g9917k1jfbhm97"; }; + # Fixes the build on kernel >= 5.17. Can be removed once https://github.com/tomaspinho/rtl8821ce/pull/267 is merged + patches = [(fetchpatch { + url = "https://github.com/tomaspinho/rtl8821ce/commit/7b9e55df64b10fed785f22df9f36ed4a30b59d0e.patch"; + sha256 = "sha256-mpAWOG1aXsklGuDbrRB9Vd36mgeCdctKQaWuuoqEEp0="; + })]; + hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; @@ -35,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tomaspinho/rtl8821ce"; license = licenses.gpl2Only; platforms = platforms.linux; - broken = stdenv.isAarch64 || kernel.kernelAtLeast "5.17"; + broken = stdenv.isAarch64; maintainers = with maintainers; [ hhm ivar ]; }; } From b83c8aff1e21a071ce8a623dbdc76ac148156c08 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 28 Mar 2022 10:01:46 +0100 Subject: [PATCH 138/163] rar: fix build on darwin See https://github.com/NixOS/nixpkgs/pull/163924. --- pkgs/tools/archivers/rar/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/tools/archivers/rar/default.nix index a359beb21adf..87b768d8cb48 100644 --- a/pkgs/tools/archivers/rar/default.nix +++ b/pkgs/tools/archivers/rar/default.nix @@ -30,9 +30,10 @@ stdenv.mkDerivation rec { dontBuild = true; - buildInputs = [ stdenv.cc.cc.lib ]; + buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ]; - nativeBuildInputs = [ autoPatchelfHook installShellFiles ]; + nativeBuildInputs = [ installShellFiles ] + ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; installPhase = '' runHook preInstall From be3b235cd19e0be790087a6e3f972a847ad44aed Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 28 Mar 2022 10:27:08 +0100 Subject: [PATCH 139/163] rar: 6.0.2 -> 6.11 Also add support for aarch64-darwin. --- pkgs/tools/archivers/rar/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/tools/archivers/rar/default.nix index 87b768d8cb48..6f47992b512c 100644 --- a/pkgs/tools/archivers/rar/default.nix +++ b/pkgs/tools/archivers/rar/default.nix @@ -1,19 +1,24 @@ { lib, stdenv, fetchurl, autoPatchelfHook, installShellFiles }: let - version = "6.0.2"; + version = "6.11"; + downloadVersion = lib.replaceStrings [ "." ] [ "" ] version; srcUrl = { i686-linux = { - url = "https://www.rarlab.com/rar/rarlinux-${version}.tar.gz"; - sha256 = "sha256-5iqk7eoo+hgltgscquob+wofzhuqz0m/8jf7bxdf9qa="; + url = "https://www.rarlab.com/rar/rarlinux-x32-${downloadVersion}.tar.gz"; + sha256 = "sha256-7mpKkOEspGskt9yfSDrdK7CieJ0AectJKTi8TxLnbtk="; }; x86_64-linux = { - url = "https://www.rarlab.com/rar/rarlinux-x64-${version}.tar.gz"; - sha256 = "sha256-WAvrUGCgfwI51Mo/RYSSF0OLPPrTegUCuDEsnBeR9uQ="; + url = "https://www.rarlab.com/rar/rarlinux-x64-${downloadVersion}.tar.gz"; + sha256 = "sha256-pb3QdLqdxIf3ybLfPao3MdilTHYjCB1BujYsTQuEMtE="; + }; + aarch64-darwin = { + url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz"; + sha256 = "sha256-q2fC4w2/tJ+GaD3ETPP+V3SAApdlLDgr3eE2YcERQXA="; }; x86_64-darwin = { - url = "https://www.rarlab.com/rar/rarosx-${version}.tar.gz"; - sha256 = "sha256-baZ71vYXIGs25f7PJ0ujoGUrsWZRmFLhvDI0KoVktsg="; + url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz"; + sha256 = "sha256-yHWxAscqnLKrG9Clsaiy6wSbyVz4gpvN6AjyirCmIKQ="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); manSrc = fetchurl { From 3ae9e59e41776520c05836501223671d3586839d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Mar 2022 10:18:22 +0200 Subject: [PATCH 140/163] python39Packages.editorconfig: workaround removal of git:// --- .../python-modules/editorconfig/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 520167c100f1..32e446d71a3b 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -4,6 +4,14 @@ , cmake }: +let + tests = fetchFromGitHub { + owner = "editorconfig"; + repo = "editorconfig-core-test"; + rev = "e407c1592df0f8e91664835324dea85146f20189"; + sha256 = "sha256-9WSEkMJOewPqJjB6f7J6Ir0L+U712hkaN+GszjnGw7c="; + }; +in buildPythonPackage rec { pname = "editorconfig"; version = "0.12.3"; @@ -12,10 +20,16 @@ buildPythonPackage rec { owner = "editorconfig"; repo = "editorconfig-core-py"; rev = "v${version}"; - sha256 = "sha256-KwfGWc2mYhUP6SN4vhIO0eX0dasBRC2LSeLEOA/NqG8="; - fetchSubmodules = true; + sha256 = "sha256-ZwoTMgk18+BpPNtXKQUMXGcl2Lp+1RQVyPHgk6gHWh8="; + # workaround until https://github.com/editorconfig/editorconfig-core-py/pull/40 is merged + # fetchSubmodules = true; }; + postUnpack = '' + cp -r ${tests}/* source/tests + chmod +w -R source/tests + ''; + nativeBuildInputs = [ cmake ]; From 7963f78ba7c52a85e0db3f3a7748f5f68da4eb49 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Mar 2022 11:59:43 +0200 Subject: [PATCH 141/163] python3Packages.habanero: add pythonImportsCheck --- .../python-modules/habanero/default.nix | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index 3a2d085e5bc0..0352ec41139d 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -1,26 +1,31 @@ -{ buildPythonPackage, lib, fetchFromGitHub -, requests, tqdm -, nose, vcrpy +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, tqdm +, nose +, vcrpy , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "habanero"; version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # Install from Pypi is failing because of a missing file (Changelog.rst) src = fetchFromGitHub { owner = "sckott"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jxaO8nCR5jhXCPjhjVLKaGeQp9JF3ECQ1+j3TOJKawg="; + hash = "sha256-jxaO8nCR5jhXCPjhjVLKaGeQp9JF3ECQ1+j3TOJKawg="; }; - propagatedBuildInputs = [ requests tqdm ]; - - # almost the entirety of the test suite makes network calls - pytestFlagsArray = [ - "test/test-filters.py" + propagatedBuildInputs = [ + requests + tqdm ]; checkInputs = [ @@ -28,10 +33,19 @@ buildPythonPackage rec { vcrpy ]; - meta = { + pythonImportsCheck = [ + "habanero" + ]; + + # almost the entirety of the test suite makes network calls + pytestFlagsArray = [ + "test/test-filters.py" + ]; + + meta = with lib; { description = "Python interface to Library Genesis"; - homepage = "https://habanero.readthedocs.io/en/latest/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.nico202 ]; + homepage = "https://habanero.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ nico202 ]; }; } From bea3dc3a4cbdf9e1275604d58a2fa534455152e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Mar 2022 12:18:17 +0200 Subject: [PATCH 142/163] nixui: replace git://github.com with https:// --- pkgs/tools/package-management/nixui/default.nix | 2 +- pkgs/tools/package-management/nixui/node-packages.nix | 4 ++-- pkgs/tools/package-management/nixui/pkg.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix index 061e5a56f4a9..47518a3ead01 100644 --- a/pkgs/tools/package-management/nixui/default.nix +++ b/pkgs/tools/package-management/nixui/default.nix @@ -10,7 +10,7 @@ let nixui = (import ./nixui.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; - })."nixui-git://github.com/matejc/nixui.git#0.2.1"; + })."nixui-git+https://github.com/matejc/nixui.git#0.2.1"; script = writeScript "nixui" '' #! ${stdenv.shell} export PATH="${nix}/bin:\$PATH" diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix index 0b6857cf716a..89362dbec092 100644 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -70,12 +70,12 @@ let }; in { - "nixui-git://github.com/matejc/nixui.git#0.2.1" = nodeEnv.buildNodePackage { + "nixui-git+https://github.com/matejc/nixui.git#0.2.1" = nodeEnv.buildNodePackage { name = "nixui"; packageName = "nixui"; version = "0.2.1"; src = fetchgit { - url = "git://github.com/matejc/nixui.git"; + url = "https://github.com/matejc/nixui.git"; rev = "845a5f4a33f1d0c509c727c130d0792a5b450a38"; sha256 = "2a2b1dcd9201e306242688c6c86f520ac47ef5de841ae0d7ea6ae8ff2889c3ab"; }; diff --git a/pkgs/tools/package-management/nixui/pkg.json b/pkgs/tools/package-management/nixui/pkg.json index 551df4f1b1c9..39aceb5b0e1f 100644 --- a/pkgs/tools/package-management/nixui/pkg.json +++ b/pkgs/tools/package-management/nixui/pkg.json @@ -1,3 +1,3 @@ [ - { "nixui": "git://github.com/matejc/nixui.git#0.2.1" } + { "nixui": "git+https://github.com/matejc/nixui.git#0.2.1" } ] From 17c8525e51ac96ef83369a1071d573098cd8e45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Mar 2022 12:23:02 +0200 Subject: [PATCH 143/163] onlykey: replace git://github.com with https:// --- pkgs/tools/security/onlykey/default.nix | 2 +- pkgs/tools/security/onlykey/node-packages.nix | 4 ++-- pkgs/tools/security/onlykey/package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/onlykey/default.nix b/pkgs/tools/security/onlykey/default.nix index 312f580c0239..d924e7ccc3a4 100644 --- a/pkgs/tools/security/onlykey/default.nix +++ b/pkgs/tools/security/onlykey/default.nix @@ -20,7 +20,7 @@ let elem; # this must be updated anytime this package is updated. - onlykeyPkg = "onlykey-git://github.com/trustcrypto/OnlyKey-App.git#v${version}"; + onlykeyPkg = "onlykey-git+https://github.com/trustcrypto/OnlyKey-App.git#v${version}"; # define a shortcut to get to onlykey. onlykey = self."${onlykeyPkg}"; diff --git a/pkgs/tools/security/onlykey/node-packages.nix b/pkgs/tools/security/onlykey/node-packages.nix index d6713a0f42a8..d5e3cd84fed6 100644 --- a/pkgs/tools/security/onlykey/node-packages.nix +++ b/pkgs/tools/security/onlykey/node-packages.nix @@ -6316,12 +6316,12 @@ let }; in { - "onlykey-git://github.com/trustcrypto/OnlyKey-App.git#v5.3.3" = nodeEnv.buildNodePackage { + "onlykey-git+https://github.com/trustcrypto/OnlyKey-App.git#v5.3.3" = nodeEnv.buildNodePackage { name = "OnlyKey"; packageName = "OnlyKey"; version = "5.3.3"; src = fetchgit { - url = "git://github.com/trustcrypto/OnlyKey-App.git"; + url = "https://github.com/trustcrypto/OnlyKey-App.git"; rev = "0bd08ef5828d9493cd4c5f4909e9a4fc4c59a494"; sha256 = "d2386369fd9d9b7d5ea5d389434848c33fa34e26d713d439e8e2f2e447237bb0"; }; diff --git a/pkgs/tools/security/onlykey/package.json b/pkgs/tools/security/onlykey/package.json index d9a1a72c4297..06fa903f6a55 100644 --- a/pkgs/tools/security/onlykey/package.json +++ b/pkgs/tools/security/onlykey/package.json @@ -1,3 +1,3 @@ [ - {"onlykey": "git://github.com/trustcrypto/OnlyKey-App.git#v5.3.3"} + {"onlykey": "git+https://github.com/trustcrypto/OnlyKey-App.git#v5.3.3"} ] From 21120194ee6db25b41359ed0eb0eca0e5da855d7 Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Fri, 25 Mar 2022 11:22:24 +0100 Subject: [PATCH 144/163] luarocks-packages: replace git://github.com with https:// --- maintainers/scripts/luarocks-packages.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index d69546cdf07e..bdda8020a3da 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -81,6 +81,6 @@ rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, readline,,,,,, say,https://github.com/Olivine-Labs/say.git,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, -std.normalize,git://github.com/lua-stdlib/normalize.git,,,,, +std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, stdlib,,,,41.2.2,,vyp vstruct,https://github.com/ToxicFrog/vstruct.git,,,,, From 97f06b5e0b3906e6f0141d85dcd5ab3aa2a55816 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 28 Mar 2022 12:01:38 +0200 Subject: [PATCH 145/163] byzan: switch to working source Co-authored-by: Jan Tojnar --- pkgs/applications/video/byzanz/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 07322d89fabe..2919cb10ca3f 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "byzanz"; src = fetchgit { - url = "https://github.com/GNOME/byzanz"; + url = "https://gitlab.gnome.org/Archive/byzanz"; rev = "1875a7f6a3903b83f6b1d666965800f47db9286a"; sha256 = "0a72fw2mxl8vdcdnzy0bwis4jk28pd7nc8qgr4vhyw5pd48dynvh"; }; From cd4a0b8875a03fdbfb2a5f0bc343083ac930777d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Mar 2022 12:24:38 +0200 Subject: [PATCH 146/163] python3Packages.pyskyqhub: 0.1.6 -> 0.1.7 --- pkgs/development/python-modules/pyskyqhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyskyqhub/default.nix b/pkgs/development/python-modules/pyskyqhub/default.nix index 1620db33e444..ef6576e68c15 100644 --- a/pkgs/development/python-modules/pyskyqhub/default.nix +++ b/pkgs/development/python-modules/pyskyqhub/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyskyqhub"; - version = "0.1.6"; + version = "0.1.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_hub"; rev = version; - sha256 = "sha256-Qc7mb51KKGLNWjeiJKAsFO/RNLefv0sRHWwXodMBi/k="; + sha256 = "sha256-BMdNduWq8B3BlqwjANJ4wcwF8bs09apXEdBBmfTZ3mM="; }; propagatedBuildInputs = [ From 7be87f3dabfeeb0f8bcacb9b4a5a6040362dc30d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Mar 2022 12:24:51 +0200 Subject: [PATCH 147/163] python3Packages.pyskyqhub: 0.1.7 -> 0.1.8 --- pkgs/development/python-modules/pyskyqhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyskyqhub/default.nix b/pkgs/development/python-modules/pyskyqhub/default.nix index ef6576e68c15..b0d1f8010fbb 100644 --- a/pkgs/development/python-modules/pyskyqhub/default.nix +++ b/pkgs/development/python-modules/pyskyqhub/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyskyqhub"; - version = "0.1.7"; + version = "0.1.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_hub"; rev = version; - sha256 = "sha256-BMdNduWq8B3BlqwjANJ4wcwF8bs09apXEdBBmfTZ3mM="; + sha256 = "sha256-1KNgF3d5w+aNKNkOZVkdD3VVLz/F8NyQ5MxO1UaWrFk="; }; propagatedBuildInputs = [ From b3de8509511fecc7276f6b5b393d823ea329cc87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Mar 2022 13:09:38 +0200 Subject: [PATCH 148/163] python39Packages.swift: 2.29.0 -> 2.29.1 --- pkgs/development/python-modules/swift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix index b61e998c3c9f..e06e7917be18 100644 --- a/pkgs/development/python-modules/swift/default.nix +++ b/pkgs/development/python-modules/swift/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "swift"; - version = "2.29.0"; + version = "2.29.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sGHARvi1PAFajz82GAegDVpy6A98QEyMfrDHZjNtDGQ="; + sha256 = "sha256-PoTob/Qz/XxEv/A271RQWT11rIIJBejVGjpAT14iKUg="; }; postPatch = '' From 51631359fa1d9a6f229aaac9e0af7beec7742389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Mar 2022 13:11:50 +0200 Subject: [PATCH 149/163] yq-go: 4.23.1 -> 4.24.2 --- pkgs/development/tools/yq-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 4a37a4ac91fd..9f31ce6f9434 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "4.23.1"; + version = "4.24.2"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-vYitX3Gvffo/MbSYAJv5HV74IcYZK7hIEd1xRQf/COU="; + sha256 = "sha256-KuaIGIDXdL0d+Wxy2O78XTSBo+2oIrcizfd2jyXghXc="; }; vendorSha256 = "sha256-R40zU0jOc/eIFVDsWG3+4o51iro7Sd7jwtyH/fpWVZs="; From ed6c2f9d8489c17fecb4011f57280372e70be26c Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Thu, 25 Nov 2021 18:45:36 +0100 Subject: [PATCH 150/163] argocd-autopilot: init at 0.3.0 Signed-off-by: Mark Sagi-Kazar --- .../cluster/argocd-autopilot/default.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/applications/networking/cluster/argocd-autopilot/default.nix diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix new file mode 100644 index 000000000000..674db790f223 --- /dev/null +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "argocd-autopilot"; + version = "0.3.0"; + commit = "c8d17bef976649e4dc2428c14c39e30a0f846552"; + + src = fetchFromGitHub { + owner = "argoproj-labs"; + repo = "argocd-autopilot"; + rev = "v${version}"; + sha256 = "sha256-tggE1T+oD/dJS9tD9xOExjhy+T1GDd0vwTerD3P2KvA="; + }; + + vendorSha256 = "sha256-v8UMSObE6w+ULzueEK0UFeebLqoamy/788SQLBmJZ8U="; + + proxyVendor = true; + + ldflags = + let package_url = "github.com/argoproj-labs/argocd-autopilot/pkg/store"; in + [ + "-s" + "-w" + "-X ${package_url}.binaryName=${pname}" + "-X ${package_url}.version=${src.rev}" + "-X ${package_url}.buildDate=unknown" + "-X ${package_url}.gitCommit=${commit}" + "-X ${package_url}.installationManifestURL=github.com/argoproj-labs/argocd-autopilot/manifests/base?ref=${src.rev}" + "-X ${package_url}.installationManifestsNamespacedURL=github.com/argoproj-labs/argocd-autopilot/manifests/insecure?ref=${src.rev}" + ]; + + subPackages = [ "cmd" ]; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/argocd-autopilot version | grep ${src.rev} > /dev/null + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 "$GOPATH/bin/cmd" -T $out/bin/argocd-autopilot + + runHook postInstall + ''; + + meta = with lib; { + description = "ArgoCD Autopilot"; + downloadPage = "https://github.com/argoproj-labs/argocd-autopilot"; + homepage = "https://argocd-autopilot.readthedocs.io/en/stable/"; + license = licenses.asl20; + maintainers = with maintainers; [ sagikazarmark bryanasdev000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 575ca2a4c020..d368c34c1f51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24557,6 +24557,8 @@ with pkgs; argocd = callPackage ../applications/networking/cluster/argocd { }; + argocd-autopilot = callPackage ../applications/networking/cluster/argocd-autopilot { }; + argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { }; ario = callPackage ../applications/audio/ario { }; From 8aa41aeaea77d1ad943abbbbaf0252b1a4cee81c Mon Sep 17 00:00:00 2001 From: 5aaee9 Date: Mon, 28 Mar 2022 11:27:12 +0000 Subject: [PATCH 151/163] teleport: fix exec srv command not found (#165588) --- .../0001-fix-add-nix-path-to-exec-env.patch | 28 +++++++++++++++++++ pkgs/servers/teleport/default.nix | 1 + 2 files changed, 29 insertions(+) create mode 100644 pkgs/servers/teleport/0001-fix-add-nix-path-to-exec-env.patch diff --git a/pkgs/servers/teleport/0001-fix-add-nix-path-to-exec-env.patch b/pkgs/servers/teleport/0001-fix-add-nix-path-to-exec-env.patch new file mode 100644 index 000000000000..27242b218328 --- /dev/null +++ b/pkgs/servers/teleport/0001-fix-add-nix-path-to-exec-env.patch @@ -0,0 +1,28 @@ +From e3651ca79c0edb66c04e0d3381f3b0b6f76d37d2 Mon Sep 17 00:00:00 2001 +From: 5aaee9 +Date: Thu, 24 Mar 2022 17:34:38 +0800 +Subject: [PATCH] fix: add nix path to exec env + +--- + lib/srv/exec.go | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/srv/exec.go b/lib/srv/exec.go +index 253fbafef..815a2e1e0 100644 +--- a/lib/srv/exec.go ++++ b/lib/srv/exec.go +@@ -41,9 +41,9 @@ import ( + ) + + const ( +- defaultPath = "/bin:/usr/bin:/usr/local/bin:/sbin" ++ defaultPath = "/bin:/usr/bin:/usr/local/bin:/sbin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/run/wrappers/bin" + defaultEnvPath = "PATH=" + defaultPath +- defaultRootPath = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ++ defaultRootPath = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/etc/profiles/per-user/root/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/run/wrappers/bin" + defaultEnvRootPath = "PATH=" + defaultRootPath + defaultTerm = "xterm" + defaultLoginDefsPath = "/etc/login.defs" +-- +2.32.0 (Apple Git-132) + diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index ac57cc51339f..9f1348fff19f 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -60,6 +60,7 @@ buildGoModule rec { ./tsh.patch # https://github.com/NixOS/nixpkgs/issues/132652 ./test.patch + ./0001-fix-add-nix-path-to-exec-env.patch ]; # Reduce closure size for client machines From de0f59ea3782a272b7b76620cfb73d172786aa99 Mon Sep 17 00:00:00 2001 From: David Costa Date: Mon, 28 Mar 2022 14:03:00 +0200 Subject: [PATCH 152/163] kaf: init at 0.1.44 (#164175) --- pkgs/development/tools/kaf/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/kaf/default.nix diff --git a/pkgs/development/tools/kaf/default.nix b/pkgs/development/tools/kaf/default.nix new file mode 100644 index 000000000000..feb76c2a0b25 --- /dev/null +++ b/pkgs/development/tools/kaf/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kaf"; + version = "0.1.44"; + + src = fetchFromGitHub { + owner = "birdayz"; + repo = "kaf"; + rev = "v${version}"; + sha256 = "sha256-gKg/iESUXS6l3v5ovdvvrfpvaUzahPtqh0/DH5OpXoY="; + }; + + vendorSha256 = "sha256-5WzREsQdcp9lelKUEXw+nHeemHBDsKrvRcG9v+qln/E="; + + # Many tests require a running Kafka instance + doCheck = false; + + meta = with lib; { + description = "Modern CLI for Apache Kafka, written in Go"; + homepage = "https://github.com/birdayz/kaf"; + license = licenses.asl20; + maintainers = with maintainers; [ zarelit ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99c2b210132f..fe0d557fb08c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34940,6 +34940,8 @@ with pkgs; sentencepiece = callPackage ../development/libraries/sentencepiece {}; + kaf = callPackage ../development/tools/kaf { }; + kcli = callPackage ../development/tools/kcli { }; pxlib = callPackage ../development/libraries/pxlib {}; From 9c37bef37c6f9238de20911a8793d3629581f852 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Mar 2022 12:04:54 +0000 Subject: [PATCH 153/163] oh-my-zsh: 2022-03-26 -> 2022-03-28 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 7949b5463fc7..82f231405a90 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2022-03-26"; + version = "2022-03-28"; pname = "oh-my-zsh"; - rev = "dbadfa0810c0be346b98c02cc802c33fa43bee11"; + rev = "3f214329d631b3ae39d6b283262c77819a0078de"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "GXg3GmJp0rSIaZKf3+YDbghpGEnvhf8TRiDQSLvO/ZM="; + sha256 = "rmSS8RnTbraA8yoU70/Mwx7wZ+uGuxkw4MO4BeuLulM="; }; installPhase = '' From c8a5b5aa89a2f8fa8bbe44f51a0e92c13d0e5d35 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Sun, 27 Mar 2022 08:42:01 -0400 Subject: [PATCH 154/163] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6ef572dd5a37..04f7add8cacc 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4079,12 +4079,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-03-27"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "168c17fa9373fe5e4927fe59acf448e2c531132a"; - sha256 = "1ad6wx8wi7mc28vbkl1zz72z7yy6x6mk9rfnkxdhwpwddmqpg6v0"; + rev = "8f8c1ae889ffe666423a89271933272ebffec3ef"; + sha256 = "10fgkrr9wn6jj35qa42c353k4rnys9a2wrckjk0kwrx6kvx7m6l6"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4275,8 +4275,8 @@ final: prev: src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "f9b0f96f61a4aa136f9fd6a04e60829f50eda9b0"; - sha256 = "0p28x0xsahr9z1a4zgnjlxrdb7wv8p82gh0gc9rbfprym230k9lg"; + rev = "2b19e2ad758f078b607408b15bdaf39f3beafac6"; + sha256 = "0xn78z74wldjq7p5xzlbv4562b6i5nha3lj0bc2hv6w9n3m7q494"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4935,8 +4935,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "97691940d1c9cdaef2ca73c4fae50987fdcadc6c"; - sha256 = "13cz5hjp7w1fmjw35n41gw3yyizs9y3jnbz228j6n8zz3awdin9g"; + rev = "b995eebe84df88092a41cbfd591bfc1565f70d8e"; + sha256 = "1738mssq22n1njrpi004apgfv00fxn7yx00r3175qn57bjw9bks9"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -11724,12 +11724,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-03-27"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c2cb0ced676fd41ce7f6e33a3f09122cb738436b"; - sha256 = "00vzqcw2gygq6rgwjy4dl2m1p6pdkwqpj3j1gbzjg4g6av4q8py1"; + rev = "4eccec4e9fc46a52ba832ac2f8ab749ea33d6790"; + sha256 = "07mydwxqhk9l0ciqpczd51x4s58asmqa3f0bznw7cdvp9qa6a6sn"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; From 996863b07e7c40ab9cb6a0ef664aa49fd0093f47 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Sun, 27 Mar 2022 08:42:29 -0400 Subject: [PATCH 155/163] vimPlugins.coc-tailwindcss: init at 2020-08-19 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 04f7add8cacc..0e68f869eedb 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -963,6 +963,18 @@ final: prev: meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; }; + coc-tailwindcss = buildVimPluginFrom2Nix { + pname = "coc-tailwindcss"; + version = "2020-08-19"; + src = fetchFromGitHub { + owner = "iamcco"; + repo = "coc-tailwindcss"; + rev = "5f41aa1feb36e39b95ccd83be6a37ee8c475f9fb"; + sha256 = "189abl36aj862m5nz8jjdgdfc4s6xbag030hi9m13yd6fbg99f85"; + }; + meta.homepage = "https://github.com/iamcco/coc-tailwindcss/"; + }; + coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; version = "2022-03-26"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c778e8c572c8..046f14a91809 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -261,6 +261,7 @@ hsitz/VimOrganizer https://git.sr.ht/~whynothugo/lsp_lines.nvim hura/vim-asymptote iamcco/coc-spell-checker +iamcco/coc-tailwindcss iamcco/markdown-preview.nvim ianks/vim-tsx idanarye/vim-merginal From 85f2d57a48fc16bf7811a6c64c9ef5b145884020 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Sun, 27 Mar 2022 08:45:31 -0400 Subject: [PATCH 156/163] vimPlugins.coc-svelte: init at 2022-03-14 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 0e68f869eedb..49b24d8b635c 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -963,6 +963,18 @@ final: prev: meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; }; + coc-svelte = buildVimPluginFrom2Nix { + pname = "coc-svelte"; + version = "2022-03-14"; + src = fetchFromGitHub { + owner = "coc-extensions"; + repo = "coc-svelte"; + rev = "7dda98527c0831e287ae8cd1c85cfc958c949d4a"; + sha256 = "0ci35dph7zz53hiw65xp79g6i8h5yk1zlcbinljfcdn5635wsjbn"; + }; + meta.homepage = "https://github.com/coc-extensions/coc-svelte/"; + }; + coc-tailwindcss = buildVimPluginFrom2Nix { pname = "coc-tailwindcss"; version = "2020-08-19"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 046f14a91809..8f400a4373b0 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -91,6 +91,7 @@ ckarnell/antonys-macro-repeater clojure-vim/vim-jack-in cloudhead/neovim-fuzzy CoatiSoftware/vim-sourcetrail +coc-extensions/coc-svelte cocopon/iceberg.vim codota/tabnine-vim cohama/lexima.vim From 8c496e61930d1e83282d919da3a86ce4cff3091b Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Sun, 27 Mar 2022 08:46:12 -0400 Subject: [PATCH 157/163] vimPlugins.vim-svelte: init at 2022-02-17 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 49b24d8b635c..2df68756b66a 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -10964,6 +10964,18 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-surround/"; }; + vim-svelte = buildVimPluginFrom2Nix { + pname = "vim-svelte"; + version = "2022-02-17"; + src = fetchFromGitHub { + owner = "evanleck"; + repo = "vim-svelte"; + rev = "1080030d6a1bc6582389c133a07552ba0a442410"; + sha256 = "0kwx0rkb6879v5c3jyavzh1hklxl2q1qwnm28x1p32kdcwqkccjp"; + }; + meta.homepage = "https://github.com/evanleck/vim-svelte/"; + }; + vim-swap = buildVimPluginFrom2Nix { pname = "vim-swap"; version = "2021-08-08"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 8f400a4373b0..dae9ab2aa1de 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -159,6 +159,7 @@ ervandew/supertab esneider/YUNOcommit.vim euclidianAce/BetterLua.vim euclio/vim-markdown-composer +evanleck/vim-svelte f-person/git-blame.nvim f3fora/cmp-spell famiu/bufdelete.nvim From d999e481028779e10c1556e208604056015f8026 Mon Sep 17 00:00:00 2001 From: ckie Date: Sun, 27 Mar 2022 14:18:29 +0300 Subject: [PATCH 158/163] logiops: init at 0.2.3 Pretty easy to package. Opened issue with upstream to get rid of the one patch needed: https://github.com/PixlOne/logiops/issues/307 --- pkgs/misc/drivers/logiops/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/misc/drivers/logiops/default.nix diff --git a/pkgs/misc/drivers/logiops/default.nix b/pkgs/misc/drivers/logiops/default.nix new file mode 100644 index 000000000000..71283a406214 --- /dev/null +++ b/pkgs/misc/drivers/logiops/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, udev, libevdev, libconfig }: + +stdenv.mkDerivation rec { + pname = "logiops"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "pixlone"; + repo = "logiops"; + rev = "v${version}"; + sha256 = "sha256-1v728hbIM2ODtB+r6SYzItczRJCsbuTvhYD2OUM1+/E="; + }; + + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ udev libevdev libconfig ]; + + meta = with lib; { + description = "Unofficial userspace driver for HID++ Logitech devices"; + homepage = "https://github.com/PixlOne/logiops"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ckie ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 705900fdbd0e..3cb2d6ff47d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24002,7 +24002,9 @@ with pkgs; lmodern = callPackage ../data/fonts/lmodern { }; - logitech-udev-rules = callPackage ../os-specific/linux/logitech-udev-rules {}; + logiops = callPackage ../misc/drivers/logiops { }; + + logitech-udev-rules = callPackage ../os-specific/linux/logitech-udev-rules { }; # lohit-fonts.assamese lohit-fonts.bengali lohit-fonts.devanagari lohit-fonts.gujarati lohit-fonts.gurmukhi # lohit-fonts.kannada lohit-fonts.malayalam lohit-fonts.marathi lohit-fonts.nepali lohit-fonts.odia From adf885ca00c87beded0c4697b5818710d5cd485f Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 14 Mar 2022 22:25:07 +0100 Subject: [PATCH 159/163] gummy: init at 0.1 --- pkgs/tools/misc/gummy/default.nix | 66 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/tools/misc/gummy/default.nix diff --git a/pkgs/tools/misc/gummy/default.nix b/pkgs/tools/misc/gummy/default.nix new file mode 100644 index 000000000000..f7950650f7fc --- /dev/null +++ b/pkgs/tools/misc/gummy/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, testVersion +, gummy +, cmake +, libX11 +, libXext +, sdbus-cpp +, udev +, coreutils +}: + +stdenv.mkDerivation rec { + pname = "gummy"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "fushko"; + repo = "gummy"; + rev = version; + sha256 = "sha256-CbZFuvFMmbFVX8k3duhhsg0fd9kVmhsj0VeFYil9YiE="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + libX11 + libXext + sdbus-cpp + udev + ]; + + cmakeFlags = [ + "-DUDEV_DIR=${placeholder "out"}/lib/udev" + ]; + + # Fixes the "gummy start" command, without this it cannot find the binary. + # Setting this through cmake does not seem to work. + postPatch = '' + substituteInPlace src/gummy/gummy.cpp \ + --replace "CMAKE_INSTALL_DAEMON_PATH" "\"${placeholder "out"}/libexec/gummyd\"" + ''; + + preFixup = '' + substituteInPlace $out/lib/udev/99-gummy.rules \ + --replace "/bin/chmod" "${coreutils}/bin/chmod" + + ln -s $out/libexec/gummyd $out/bin/gummyd + ''; + + passthru.tests.version = testVersion { package = gummy; }; + + meta = with lib; { + homepage = "https://github.com/Fushko/gummy"; + description = "Brightness and temperature manager for X11"; + longDescription = '' + CLI screen manager for X11 that allows automatic and manual brightness/temperature adjustments, + via backlight (currently only for embedded displays) and gamma. Multiple monitors are supported. + ''; + license = licenses.gpl3Only; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d966b8d9cb58..d163a01f30c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33283,6 +33283,8 @@ with pkgs; gummi = callPackage ../applications/misc/gummi { }; + gummy = callPackage ../tools/misc/gummy { }; + gxemul = callPackage ../applications/emulators/gxemul { }; hatari = callPackage ../applications/emulators/hatari { }; From e85e545dbda8bdf09b32e69545ace49b7bc63c23 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 14 Mar 2022 21:51:32 +0800 Subject: [PATCH 160/163] powerdns: 4.3.1 -> 4.6.1 --- nixos/tests/powerdns.nix | 1 + pkgs/servers/dns/powerdns/default.nix | 49 +++++++++++++-------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/nixos/tests/powerdns.nix b/nixos/tests/powerdns.nix index d025934ad2b3..70060bad87b6 100644 --- a/nixos/tests/powerdns.nix +++ b/nixos/tests/powerdns.nix @@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { services.powerdns.extraConfig = '' launch=gmysql gmysql-user=pdns + zone-cache-refresh-interval=0 ''; services.mysql = { diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index cc7bb3317fd4..4f1913e322a6 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -1,44 +1,41 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, nixosTests +{ lib, stdenv, fetchurl, pkg-config, nixosTests , boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd -, mysql57, postgresql, lua, openldap, geoip, curl, unixODBC +, mariadb-connector-c, postgresql, lua, openldap, geoip, curl, unixODBC, lmdb, tinycdb }: stdenv.mkDerivation rec { pname = "powerdns"; - version = "4.3.1"; + version = "4.6.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "0if27znz528sir52y9i4gcfhdsym7yxiwjgffy9lpscf1426q56m"; + sha256 = "sha256-eRKxSIfWKEUYX3zktH21gOqnuLiX3LHJVV3+D6xe+uM="; }; - patches = [ - (fetchpatch { # remove for >= 4.4.0 - name = "gcc-10_undefined-reference.diff"; - url = "https://github.com/PowerDNS/pdns/commit/05c9dd77b28.diff"; - sha256 = "1m9szbi02h9kcabgw3kb8k9qrb54d34z0qzizrlfiw3hxs6c2zql"; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ - boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip - libyamlcpp libsodium curl unixODBC openssl systemd + boost mariadb-connector-c postgresql lua openldap sqlite protobuf geoip + libyamlcpp libsodium curl unixODBC openssl systemd lmdb tinycdb + ]; + + configureFlags = [ + "--disable-silent-rules" + "--enable-dns-over-tls" + "--enable-unit-tests" + "--enable-reproducible" + "--enable-tools" + "--enable-ixfrdist" + "--enable-systemd" + "--with-libsodium" + "--with-sqlite3" + "--with-libcrypto=${openssl.dev}" ]; # nix destroy with-modules arguments, when using configureFlags preConfigure = '' - configureFlagsArray=( - "--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua2 pipe random remote" - --with-sqlite3 - --with-libcrypto=${openssl.dev} - --with-libsodium - --enable-tools - --disable-dependency-tracking - --disable-silent-rules - --enable-reproducible - --enable-unit-tests - --enable-systemd + configureFlagsArray+=( + "--with-modules=" + "--with-dynmodules=bind geoip gmysql godbc gpgsql gsqlite3 ldap lmdb lua2 pipe remote tinydns" ) ''; @@ -55,6 +52,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; broken = stdenv.isDarwin; license = licenses.gpl2; - maintainers = with maintainers; [ mic92 disassembler ]; + maintainers = with maintainers; [ mic92 disassembler nickcao ]; }; } From fc49bc19edd8e9eaea703c795395c2f78354ba80 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 15 Mar 2022 11:13:23 +0800 Subject: [PATCH 161/163] powerdns: redact configure flags from version output to reduce closure size --- pkgs/servers/dns/powerdns/default.nix | 2 ++ pkgs/servers/dns/powerdns/version.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/servers/dns/powerdns/version.patch diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 4f1913e322a6..ff057b48bd54 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; sha256 = "sha256-eRKxSIfWKEUYX3zktH21gOqnuLiX3LHJVV3+D6xe+uM="; }; + # redact configure flags from version output to reduce closure size + patches = [ ./version.patch ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/servers/dns/powerdns/version.patch b/pkgs/servers/dns/powerdns/version.patch new file mode 100644 index 000000000000..185d07028833 --- /dev/null +++ b/pkgs/servers/dns/powerdns/version.patch @@ -0,0 +1,13 @@ +diff --git a/pdns/version.cc b/pdns/version.cc +index d8f5d40..1368481 100644 +--- a/pdns/version.cc ++++ b/pdns/version.cc +@@ -155,7 +155,7 @@ void showBuildConfiguration() + #ifdef PDNS_CONFIG_ARGS + #define double_escape(s) #s + #define escape_quotes(s) double_escape(s) +- g_log< Date: Mon, 28 Mar 2022 16:38:33 +0200 Subject: [PATCH 162/163] melt: init at 0.2.0 (#164439) Co-authored-by: Sandro --- pkgs/tools/security/melt/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/melt/default.nix diff --git a/pkgs/tools/security/melt/default.nix b/pkgs/tools/security/melt/default.nix new file mode 100644 index 000000000000..846b70b87538 --- /dev/null +++ b/pkgs/tools/security/melt/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "melt"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "charmbracelet"; + repo = "melt"; + rev = "v${version}"; + sha256 = "sha256-HambmUodAwgi1/r/Nj7P7gXNK5pyBO3omMZ9ZvSK7cc=4"; + }; + + vendorSha256 = "sha256-1f3QBbWaTiplEp/4ihds1PwrEnoq/81TzlT46TufGFs="; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + meta = with lib; { + description = "Backup and restore Ed25519 SSH keys with seed words"; + homepage = "https://github.com/charmbracelet/melt"; + changelog = "https://github.com/charmbracelet/melt/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ penguwin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9a64b34b55e..c80d94ca2508 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8113,6 +8113,8 @@ with pkgs; mscgen = callPackage ../tools/graphics/mscgen { }; + melt = callPackage ../tools/security/melt { }; + metabigor = callPackage ../tools/security/metabigor { }; metasploit = callPackage ../tools/security/metasploit { }; From b133ad055b129b7b7e8e66f883b6120f41f8b584 Mon Sep 17 00:00:00 2001 From: maxice8 <30738253+maxice8@users.noreply.github.com> Date: Mon, 28 Mar 2022 11:44:02 -0300 Subject: [PATCH 163/163] ydotool: minor fixes (#166050) Co-authored-by: Sandro --- pkgs/tools/wayland/ydotool/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/wayland/ydotool/default.nix b/pkgs/tools/wayland/ydotool/default.nix index 8d55233638ec..15bc49987331 100644 --- a/pkgs/tools/wayland/ydotool/default.nix +++ b/pkgs/tools/wayland/ydotool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, scdoc }: +{ lib, stdenv, fetchFromGitHub, cmake, scdoc, util-linux }: stdenv.mkDerivation rec { pname = "ydotool"; @@ -11,13 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-maXXGCqB8dkGO8956hsKSwM4HQdYn6z1jBFENQ9sKcA="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ - scdoc - ]; + nativeBuildInputs = [ cmake scdoc ]; + + postInstall = '' + substituteInPlace ${placeholder "out"}/lib/systemd/user/ydotool.service \ + --replace /usr/bin/kill "${util-linux}/bin/kill" + ''; meta = with lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/ReimuNotMoe/ydotool"; description = "Generic Linux command-line automation tool"; license = licenses.agpl3Plus; maintainers = with maintainers; [ willibutz kraem ];