From 00bce88813d670f64be5d64d718b7bc5a5700e43 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Feb 2021 09:03:40 +0000 Subject: [PATCH 01/56] minio: 2020-08-08T04-50-06Z -> 2021-02-14T04-01-33Z Fixes CVE-2021-21287 --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 4a14dca660b3..b542bc694047 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio"; - version = "2020-08-08T04-50-06Z"; + version = "2021-02-14T04-01-33Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "0l5yd3k154h3q9sc5psv80n9wpnhpj5sb3r9v9gsqcam46ljwpna"; + sha256 = "sha256-Su3BkVZJ4c5T829/1TNQi7b0fZhpG/Ly80ynt5Po+Qs="; }; - vendorSha256 = "1xxhvgawkj2lq39cxgl4l5v41m6nsask79n2cxfpcgb00fqq147x"; + vendorSha256 = "sha256-r0QtgpIfDYu2kSy6/wSAExc3Uwd62sDEi1UZ8XzTBoU="; doCheck = false; From c1a510905de7e923dd51b5549f5fdfa3ae1a4f82 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 6 Mar 2021 19:48:03 +0100 Subject: [PATCH 02/56] botan2: 2.17.2 -> 2.17.3 Fixes CVE-2021-24115. (cherry picked from commit 9a18802edfb9db4d826ec967d7301c6c7460dad9) --- pkgs/development/libraries/botan/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix index 2346153e2a15..cb40e535b0c3 100644 --- a/pkgs/development/libraries/botan/2.0.nix +++ b/pkgs/development/libraries/botan/2.0.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix (args // { baseVersion = "2.17"; - revision = "2"; - sha256 = "0v0yiq0qxcrsn5b34j6bz8i6pds8dih2ds90ylmy1msm5gz7vqpb"; + revision = "3"; + sha256 = "121vn1aryk36cpks70kk4c4cfic5g0qs82bf92xap9258ijkn4kr"; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; From 8ba878784da079bd4f37f8e51554b17d07f39f5d Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 16 Jan 2021 22:35:51 +0100 Subject: [PATCH 03/56] git-big-picture: 0.10.1 -> 1.0.0 (fixes CVE-2021-3028) Also propagates move of repository from https://github.com/esc/git-big-picture to https://github.com/git-big-picture/git-big-picture . Upstream change log at https://github.com/git-big-picture/git-big-picture#changelog Updated `stdenv.lib` -> `lib`, and removed unecessary `stdenv`. (cherry picked from commit b706315dfc326382dbd414e1e34df0fcbd22fd6a) --- .../git-and-tools/git-big-picture/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index cd35c98a9696..5f84d4235734 100644 --- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -1,30 +1,34 @@ -{ fetchFromGitHub, python2Packages, stdenv, git, graphviz }: +{ fetchFromGitHub, python3Packages, lib, git, graphviz }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "git-big-picture"; - version = "0.10.1"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "esc"; + owner = "git-big-picture"; repo = pname; rev = "v${version}"; - sha256 = "0b0zdq7d7k7f6p3wwc799347fraphbr20rxd1ysnc4xi1cj4wpmi"; + sha256 = "14yf71iwgk78nw8w0bpijsnnl4vg3bvxsw3vvypxmbrc1nh0bdha"; }; buildInputs = [ git graphviz ]; - checkInputs = [ git ]; + # NOTE: Tests are disabled due to unpackaged test dependency "Scruf". + # When bumping to 1.1.0, please re-enable and use: + #checkInputs = [ cram git pytest ]; + #checkPhase = "pytest test.py"; + doCheck = false; postFixup = '' wrapProgram $out/bin/git-big-picture \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs } + --prefix PATH ":" ${ lib.makeBinPath buildInputs } ''; meta = { description = "Tool for visualization of Git repositories"; - homepage = "https://github.com/esc/git-big-picture"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nthorne ]; + homepage = "https://github.com/git-big-picture/git-big-picture"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nthorne ]; }; } From 08693a7c7993403e206453353dd7e7bd7ea056e0 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 20 Jan 2021 20:00:28 +0100 Subject: [PATCH 04/56] git-big-picture: 1.0.0 -> 1.1.1 - Migrate from fetchFromGitHub to fetchPypi to ease SHA256 handling - Drop tests (while not included with PyPI releases) - Install a man page (as shipped by upstream) - Move buildInputs to runtime only Co-Authored-By: Silvan Mosberger (cherry picked from commit 201b24adc5ca8d8bd6c4a078ea7d78a14263b3d2) --- .../git-and-tools/git-big-picture/default.nix | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index 5f84d4235734..35aada8b870f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -1,27 +1,20 @@ -{ fetchFromGitHub, python3Packages, lib, git, graphviz }: +{ python3Packages, lib, git, graphviz }: python3Packages.buildPythonApplication rec { pname = "git-big-picture"; - version = "1.0.0"; + version = "1.1.1"; + format = "wheel"; - src = fetchFromGitHub { - owner = "git-big-picture"; - repo = pname; - rev = "v${version}"; - sha256 = "14yf71iwgk78nw8w0bpijsnnl4vg3bvxsw3vvypxmbrc1nh0bdha"; + src = python3Packages.fetchPypi { + inherit format version; + pname = "git_big_picture"; # underscores needed for working download URL + python = "py3"; # i.e. no Python 2.7 + sha256 = "a20a480057ced1585c4c38497d27a5012f12dd29697313f0bb8fa6ddbb5c17d8"; }; - buildInputs = [ git graphviz ]; - - # NOTE: Tests are disabled due to unpackaged test dependency "Scruf". - # When bumping to 1.1.0, please re-enable and use: - #checkInputs = [ cram git pytest ]; - #checkPhase = "pytest test.py"; - doCheck = false; - postFixup = '' wrapProgram $out/bin/git-big-picture \ - --prefix PATH ":" ${ lib.makeBinPath buildInputs } + --prefix PATH ":" ${ lib.makeBinPath [ git graphviz ] } ''; meta = { From 56ddf336ac9802f6238f76308ac32c5b54e5748a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 14 Mar 2021 13:34:45 +0100 Subject: [PATCH 05/56] ungoogled-chromium: 89.0.4389.82 -> 89.0.4389.90 (cherry picked from commit bb52ac0cb0b03df4d83ea4fb99efc3ea7e148b0b) Backport of #116309. --- .../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 8caa446b0464..78d70cc7ab47 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "89.0.4389.82", - "sha256": "0yg33d6zldz3j1jghhdci63fn46i10dkz3nb95jdrbv8gd018jfz", - "sha256bin64": "1sqzzillq38qyh85449ncz8bni93mjxb6r4z8y5h8k2w3j38jc0q", + "version": "89.0.4389.90", + "sha256": "16i7bgk2jbcqs2p28nk5mlf0k6wah594pcsfm8b154nxbyf0iihi", + "sha256bin64": "1hgpx7isp9krarj7jpbhs97ym4i9j9a1srywv9pdfzbhw6cid2pk", "deps": { "gn": { "version": "2021-01-07", @@ -55,8 +55,8 @@ "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d" }, "ungoogled-patches": { - "rev": "89.0.4389.82-1", - "sha256": "183w22q6mpmw7s1l65dzvc5i422vl7qax6q4xpgr3krcx4y00878" + "rev": "89.0.4389.90-1", + "sha256": "0pr756d1b4wc67d61b21yszi7mx1hsjy14i44j0kvcwm05pgnf79" } } } From 16308b591f8a850b5618ef4d547f752d5146db5b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 15 Mar 2021 18:14:49 -0400 Subject: [PATCH 06/56] lhapdf.pdf_sets: update (cherry picked from commit 95e1233bc1afacf4a99d0baa52dd2db5a03bec50) --- .../libraries/physics/lhapdf/pdf_sets.nix | 404 ++++++++++++++---- 1 file changed, 319 insertions(+), 85 deletions(-) diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix index 2309e6671f85..80b162b35ed1 100644 --- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix +++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix @@ -6,7 +6,7 @@ let inherit name; src = fetchurl { - url = "http://lhapdfsets.web.cern.ch/lhapdfsets/current/${name}.tar.gz"; + url = "https://lhapdfsets.web.cern.ch/lhapdfsets/current/${name}.tar.gz"; inherit sha256; }; @@ -189,6 +189,134 @@ in "CT14qed_inc_proton" = "0gv0rlr6l62gidqp02ifn75d1ribvbihgpaqc92fww73zwilr7l0"; "CT14qed_neutron" = "0ck1vmqk17i7rq42hra79cz2rm8ngxv4da6dvz62l6m2nrga3l2k"; "CT14qed_proton" = "1gijxkq5gpsljijblzd13kgr7xjjvnjv18v02jivylf73igsakd7"; + "CT18ANLO" = "16lbhgkbiym3njiffxdcm3hf7kkm33hyj2w1hwgb3mvxx2sja31c"; + "CT18ANLO_as_0110" = "08hwxc99l645a9craimgawwynxcs5cmapgxgk0fy9ihvjvqs6jg2"; + "CT18ANLO_as_0111" = "02ff3s127svdjzawbhzry04rcsw5waggmf3iwpqndzxhqpm0py8a"; + "CT18ANLO_as_0112" = "063g7sqii0gf2rdjg9k9x95kzwg62w8lfq9cgyv3bnkpapnbqhia"; + "CT18ANLO_as_0113" = "01zh34dg4cc8955ipg2i0k6s13h77jg8yaa4v2f4aw0020js9dn2"; + "CT18ANLO_as_0114" = "061lvglsg4889q6qya83f7ngyzi2ibar1c9w6xyl462x5i4frx2x"; + "CT18ANLO_as_0115" = "0a35axfjxywy4yh8pk4w4f57rfljvd593bx7a8wnix0cifnngg4j"; + "CT18ANLO_as_0116" = "1cm3m3m6l93qlr9fxbc0d21gq3x0wn09qi8cxbx7lj0yqhjf2zh8"; + "CT18ANLO_as_0117" = "1nrzrlp7i42z7pv550ggga0fk356i9rqbj60mdxvlw3xl6v4kkf4"; + "CT18ANLO_as_0118" = "19p7x6q9flsz1s82scakgnsfsrjf8ym6ix3gp195fjgfdkannh9i"; + "CT18ANLO_as_0119" = "1jz27f39dpg0g46p834vgvaajxspyqwd8f7zlpv44lfb43va6dgy"; + "CT18ANLO_as_0120" = "0rp9hrvs44d8pbagmc3vipnh5d9amam3prkm2k7spvxahr6dp8dp"; + "CT18ANLO_as_0121" = "15abhrjmmhyka9dxjmwz7103i0bpa605yhy6kisgzf7km5ca14h9"; + "CT18ANLO_as_0122" = "15mxybppydzsxx308hqljahnmrw0islw2zl45kjlhxjxsmaai2nc"; + "CT18ANLO_as_0123" = "19zlyapm5cp1hwvfqcjm3v6mgwdaa6f5d0mvnh68c05sn39xjhz2"; + "CT18ANLO_as_0124" = "1fwzcs50bj6d6cjkvi4qj44mwrwxhjh25lxmk2q82wdmddgpaz0c"; + "CT18ANNLO" = "1kbsbvvkkchhwwjdrj4d91lbykid4dcy4ghanpdd9x0nfm5b4sgk"; + "CT18ANNLO_as_0110" = "1a60p22r292hjjcrdkgis6d81hgihnjzyzlbcqrvx9bkbq447kjq"; + "CT18ANNLO_as_0111" = "1gyl4h92xs4s64dm7cwrfqk2zrs1cbzp76dqckf7z44k4pm460m9"; + "CT18ANNLO_as_0112" = "1bsn5q12bgkhyl1d6wkq32m3l7i0wqxpnjxh790xcd3ympbfx16h"; + "CT18ANNLO_as_0113" = "1dri54s71ygnd1pdnmvr9vqbyfllwzr9x39zg01rpj02zy7kidb0"; + "CT18ANNLO_as_0114" = "0f731ryn1031053zv40mak9m7mxmn6dvnhn6ik6kyag9d3az6lvx"; + "CT18ANNLO_as_0115" = "107569wrkjic6xjp574i6r6n8wj2x9cx4h7dqh77wxl8g4aajkh6"; + "CT18ANNLO_as_0116" = "0r951p0a4pan71lkhf701ysw6kyq1wvf15rbjdjr4j7khjfaykcp"; + "CT18ANNLO_as_0117" = "0xsgzga5bya0ng6i7nvk33nrf792vzbd1rs174cix4v406g99xm8"; + "CT18ANNLO_as_0118" = "049534355lxhppw2l85i677ysb2gwzccs0b5afm719sh06rv6jkn"; + "CT18ANNLO_as_0119" = "034kd7pg103ldc3nmgsylv0ffl8v0sp9jkf9073ny11s7b3pb5wa"; + "CT18ANNLO_as_0120" = "1ph23xpirkahpr9x1k2qm9pp3a1hc3i15bhc6xprpc29k53m4wsi"; + "CT18ANNLO_as_0121" = "12qrg3jb1kar46b8lai56lb7wxjr950dzaixfncxvy38hrny6mxh"; + "CT18ANNLO_as_0122" = "1wmkl2rlhkwzxi1yln0m9i6lvpbqkp3bxdnyzz7hp3hy1sa5f60s"; + "CT18ANNLO_as_0123" = "1caz4rfmcmabfdw5b8xg2307bs1bjclgdcxq2k6gf73z3pqbjs8w"; + "CT18ANNLO_as_0124" = "0mx8h8vdhlklgvysmhllkzga3g65zkmzpz7bmyvaqmvbvr6x5q0w"; + "CT18NLO" = "04y2p6vz484l3yv6381pfavqs3xh78h3jn6bg7ncp5vywwqp44n9"; + "CT18NLO_as_0110" = "0ncaacfw8dh45vaf84kkj93hwxgwz744qqd6llpy73zdilnl62a8"; + "CT18NLO_as_0111" = "1cib3ggy0wajvvw908wr4bfymcw62iy5abwdadhq69crcg01619r"; + "CT18NLO_as_0112" = "1x242x4y0vykfypm02g02qxpwmsq2p45bxqrqgfy29qagxz6j66d"; + "CT18NLO_as_0113" = "0fkis7l0s1lb2k7qyfwnn5axbpiv9yky4j5qc8g3fa068czijmhi"; + "CT18NLO_as_0114" = "1r6ih2gqiwm7z24iw9xgn2n35659v5nwl2d02f07j1k3d33j175n"; + "CT18NLO_as_0115" = "0z4vm73l16mpjf3wcrv5q659f2mwkx85wpmnq8j1fnk0vhms59dx"; + "CT18NLO_as_0116" = "0g4lxxc9g09alpsff9wr7w0jgi26h3klx8rk6nb71j9yzrwv12vv"; + "CT18NLO_as_0117" = "0hmn5vkgi5981q0s5lyp9mq9jjrzhgr1f9w8np3i2nwcgn1awis5"; + "CT18NLO_as_0118" = "1z6is1f3064wq56lfxrmqckk3yi6wsl42s2xigx87p8zqg3r4nkz"; + "CT18NLO_as_0119" = "0p3r7w5v3pq2dgaq96r3khx1wwjq6i33l0bbf63dxs88gk5cx1s4"; + "CT18NLO_as_0120" = "1h0rcra68yypf1yqwlzql385ks1agxc9njdpyx60j3yg3whk4h63"; + "CT18NLO_as_0121" = "1by1iiy7qby73m8s3qmnrf0dyca3k4z00fclbrm651f79nz8scz7"; + "CT18NLO_as_0122" = "1r8h2cw874dh1mj4r545wp9msr1358qw1lzznwvgkmgwjclndjg4"; + "CT18NLO_as_0123" = "1d8c3bk6bvy3azbv9yqi45cwkcmjbxxw7qaxn6xnc5jfcf6wbsp1"; + "CT18NLO_as_0124" = "1haqxq1jbcz9qbhnw4pxsvlr37908fkdlzyn7c1csrlr8a51s3z4"; + "CT18NNLO" = "1shkah5ma0hp101aklkz2p8n9y4i4sv6zwa5ifzyj3bgz1020l5f"; + "CT18NNLO_as_0110" = "1smilnmhw8zjd0hl03v7wflbbia5qxqfmvyikbgwc29g212xbq71"; + "CT18NNLO_as_0111" = "0mj77vshb9fmlvc1pp3m701nl574p0k013lg0l25r4nhvlfiiriz"; + "CT18NNLO_as_0112" = "0a87crw7dygf9q28v95h9j02yq5f9rr5fdrxvqj5ggw839nazgmk"; + "CT18NNLO_as_0113" = "011269haxlh2grq60qbmwrilgnkz6hlacd8x56iizl6ify7hcs2c"; + "CT18NNLO_as_0114" = "0im03f2vr9pfd223skadmcfrypxlpka4pqizjcbqq75fddhljivq"; + "CT18NNLO_as_0115" = "0pppdh2vq86iiar18c5wi2qbm6viv0hpyfah8pn1p6bcg1k99srs"; + "CT18NNLO_as_0116" = "17wsn6jxp25klk3x3yfa5abxjjdl5j9vdwxqb51zg6ic3a7is764"; + "CT18NNLO_as_0117" = "0nkdmqyqzzg19m98mqm9n2dcaiy4i97zrxmy7x1c3rxc0n7igkzh"; + "CT18NNLO_as_0118" = "0v931kw5dzqq95940mxmkj1r6a75w525j99yf47pyf55vg22ybkb"; + "CT18NNLO_as_0119" = "1z4kg4na0m2vrflnizxhjdxa9rdzp66mq66bxcjlvqiraf4ygkd4"; + "CT18NNLO_as_0120" = "07bz7q5h0rfxf5989sarchsv2mcn4093b6x5094725p74sw41sq5"; + "CT18NNLO_as_0121" = "0slw6m1scnajlfhxswd05if782k32gcyx9zz50gaiwqimrz188fa"; + "CT18NNLO_as_0122" = "1jrzxq7mqhkfj96whqfr3ny2g1kggc047cvzb7ladlirmi05injg"; + "CT18NNLO_as_0123" = "1zdmvp9pxjjs96yw05l5s0c0ym1hyj7d3an5siy3i20lvyxcgyz7"; + "CT18NNLO_as_0124" = "1lb88y4c68n669c2g2q2zwjp92d9hgbxgpl0b7dxny9a7zdmw0mx"; + "CT18XNLO" = "1k0cli4j0z5hj24pk9f78flhlvsdfya51hgh90jv4myniapk616l"; + "CT18XNLO_as_0110" = "0yahahfmzzwzxiqanm7029z05f3nx9cs2yjdvyvhazvicsq3ibid"; + "CT18XNLO_as_0111" = "1n0q8d0j8smq2z6n9l091r2q8v319zcf896nk2m0s7n9g9a0vcjq"; + "CT18XNLO_as_0112" = "1wj968g1vb58gz6vslzfmihvqg5f9f2cqgq8inlgdhai1y8vk1lz"; + "CT18XNLO_as_0113" = "1gi939mxv99q2r1m8a6d4ky5nrp24xv16xw6d9h7ly27jrw8kzm5"; + "CT18XNLO_as_0114" = "06gf4m01yr89xklch6ack012in2i1bifyzvp793x9w8m56dx12ms"; + "CT18XNLO_as_0115" = "1g4705l0qb0immd4la2vrj9v4kw7r7i1wz1vn4knbqjwig5kcfws"; + "CT18XNLO_as_0116" = "0vaxwg3ixf4x92vssh8gqrszbfa5zgzbsd5p81j14nlksshrs6bf"; + "CT18XNLO_as_0117" = "10qg2yr63csg4nd62a8h0s1z08cmgbkwvcsh0wp7zkzpw70r7x78"; + "CT18XNLO_as_0118" = "0kxhg2pn7ki4nxcs5jhxvx4fs6c414mq0d0qm3vldv0hsayqsbnd"; + "CT18XNLO_as_0119" = "1xd4ib2fqzhg9c6z2zyc8h3il4msm7rv9kkaaapll4h0gpjdda6x"; + "CT18XNLO_as_0120" = "0jyb8gs0avvlhiwwvrv09p47vs3jim3y315hg7wcy31xab90b91i"; + "CT18XNLO_as_0121" = "1afizsl9phvvdjbyrifx3ii10gpxl51rvx311imz30l51i3fzl7v"; + "CT18XNLO_as_0122" = "0wkpicsv9357lh96vjnrxzddaaaiaagyfph2jcyp97mjhixx2hlg"; + "CT18XNLO_as_0123" = "0hr9m422shvp5yzjdd7lqansim7qcx3iv1p017fp1a4ihj661sra"; + "CT18XNLO_as_0124" = "03zf75f6gx41g3fxrdc6sqkfcyzz03izchwfvabwfxr06yq94jxc"; + "CT18XNNLO" = "0j7bwzkhax4cm3wnbhqdv48j4wha9zdd7v77ihlgcvcmk79rx1fa"; + "CT18XNNLO_as_0110" = "1vwaz00jwpyd1nafpfw0mw309v10zqxcsygdjsdd9mn5p1j6z3hv"; + "CT18XNNLO_as_0111" = "0g6w519dc13mzgb2wpyy7chnl5wkl0ndrdiw7nymad0csg20yss2"; + "CT18XNNLO_as_0112" = "06wlzpx9b83gblg4rvqv22k60pvjikqs5m5gp2kvrwmc2wxp73d2"; + "CT18XNNLO_as_0113" = "0ybm5v0dprid7vvsnsihkd3vn5gqsqsmib63sh3xl45i58h1szzz"; + "CT18XNNLO_as_0114" = "0hpznnkarzjmf5447jp9za1w52lqpysprnf14v31mda9k7a6kdkn"; + "CT18XNNLO_as_0115" = "0lj637cwm726hqilrnfa064apdsqdav142dy3scz2gxzpzqpya7c"; + "CT18XNNLO_as_0116" = "0m1zh15f975g628npifyqmlj578lpdlc67sdrxgdg97jfvxrq7s2"; + "CT18XNNLO_as_0117" = "1r5kwl333ipq3g78cmn7h5yxk2gl3rfszm1ijzyf8hrjqz9m2p35"; + "CT18XNNLO_as_0118" = "070jcd7y5w0h65ssk359w4kf2j7164pgdkg78mjwifi2garrlv0s"; + "CT18XNNLO_as_0119" = "12nzzjyllr4vs422dxdccjy0qffg9gy8p2wa828cr3a26wjlipfr"; + "CT18XNNLO_as_0120" = "1b9k3wd212nrhhncckj6fml58jzjagiskgmc6h248mcc8mcc2gyz"; + "CT18XNNLO_as_0121" = "1wkgmkw5djzxc5g4iyr4h2cz08jv1clmp8x8xcidg5532zclavmd"; + "CT18XNNLO_as_0122" = "1w7jhlk432qni1kn1big44yk16bxghbzrjb1g1rdxpibzy2jdkw3"; + "CT18XNNLO_as_0123" = "15hqb1c4jx41119h2ahx6zacbigs9xw92jw7c4xsww9dkzr1qsr5"; + "CT18XNNLO_as_0124" = "0fx7am4dv4d09hdk0yxvxzbdlhzc03y3q2x1hfx9wk07kcxw1mj5"; + "CT18ZNLO" = "0iv8laks2ymn5fygk6k9lxm3s7fld5g292n9bfkhn3nmcfxczi03"; + "CT18ZNLO_as_0110" = "0q90c9nx0b3fbqq317qr0j13cc9m3zcgpk3pcn8s2sd6aaksa66i"; + "CT18ZNLO_as_0111" = "0wnxj323k29xvcrrf68mfyhflfnblvvnx63p070l5x52qqbfjl7y"; + "CT18ZNLO_as_0112" = "03qjvv004g99lbi022l9bvr82gvv6gzk651r8x5hwwyr0mar4j0v"; + "CT18ZNLO_as_0113" = "0hw6w7x3bnx2fy03jj5yvbjjab9mj0fzca8bc46phjsmx3nqxq5k"; + "CT18ZNLO_as_0114" = "0gnhqhxcsaslcldhyh69lxdx1misjz5qiwry57n31j6mqjrggqbi"; + "CT18ZNLO_as_0115" = "1dn32bwarggnfq2s9drmdjikcrn0nm0mqih4f5wxr3zbmq70xw4q"; + "CT18ZNLO_as_0116" = "17q8ysl7ar1n7wym55k8vzrx963rip9l9b0kxw2bqkha5ipwmnv3"; + "CT18ZNLO_as_0117" = "1afaqy8afzib6fmyy7ysnfk8w5f92893nvh4fn1sx9ink7i2zqal"; + "CT18ZNLO_as_0118" = "0sbhjzjsjd8m6sgz66vky3w7ymhwpss0dr2p603dxgm84fig1kzx"; + "CT18ZNLO_as_0119" = "0fxplpy2l1fdh5p4csdlabg36xgbpdg8pcdfcnws2cfj3g0941as"; + "CT18ZNLO_as_0120" = "05dk8bvwkn5y5j4rk18an25rg1f1am9vlddal84rbp8m15qnms65"; + "CT18ZNLO_as_0121" = "0ymql1wjxng5i887lx2q6p8gryw29zs0d2hzkfxl4f0zzn2wlwpi"; + "CT18ZNLO_as_0122" = "0gnl23n4ljlry340pwwfs0xs22bl2qp2b8p3f73gpp9xn42nwz1g"; + "CT18ZNLO_as_0123" = "1wfx59iadvn85raa1bq81ipxpjbxli58hs8wpzm1vz10ilifn9d5"; + "CT18ZNLO_as_0124" = "0jm0gnp8g1drz6a10wrdxkj2s8gws80ias1ixdnr5fdmnghf1wl7"; + "CT18ZNNLO" = "0zsqrpab6vgcinsxjq3rqdadig5flxzk61wc1aa9rwnkbpm1paa5"; + "CT18ZNNLO_as_0110" = "09ypj0yydkiw82bq3ymsp19i4iz82fm2z2xfplb3iasa86y377in"; + "CT18ZNNLO_as_0111" = "00h0zd5indm57xhn467qffpx7aadzb73vyfazq09pl5vdqq9fn8x"; + "CT18ZNNLO_as_0112" = "19vlb1bvp7r9jnknd2dvblggim1xqf4yjqyf5h04r90b89pyzxn8"; + "CT18ZNNLO_as_0113" = "0h8i68dligavf051dpil2bqvlxm19156v1951n340pcncaxxi5d1"; + "CT18ZNNLO_as_0114" = "1n2drxdd6f36njq0lcfm7s6cyignqdqvirh03ixvvar2pgj02yay"; + "CT18ZNNLO_as_0115" = "0cv633f5gg6hcyhwfh22h5n4irnk1pxsk7949wiax7qkl84mcm1j"; + "CT18ZNNLO_as_0116" = "17z25cky2ysrcplsxblrzka667npnnp42k6n8jsm73pagscsj91n"; + "CT18ZNNLO_as_0117" = "1yrbrzbg5r2pvwhbnvfwcp9d9rvfmqqxwph0rd0sdfix9agwy2yd"; + "CT18ZNNLO_as_0118" = "019lbvb8pjfbwz8hz8h2xw76nf1ly9mgnbz6pzi3v9msk0qbmlp1"; + "CT18ZNNLO_as_0119" = "1x08wg3y3fqa8ah6m0c6x2fckjjyylkhnmry6vg93rp3n7qlvynw"; + "CT18ZNNLO_as_0120" = "0m9mfr8553yrysbcksx17nz1gm1vi2zvs5bp8d3v82phsv5alhf5"; + "CT18ZNNLO_as_0121" = "0snzl818ag926n0i67hdwkjclfvykx546vfnvsx7n2z5pabakd1j"; + "CT18ZNNLO_as_0122" = "10i7dk1bllyk6f3l92kbiqdib8l2zvqf91g9c20k12sim6n6x2g5"; + "CT18ZNNLO_as_0123" = "0v2h2fjkdsnyssb6ralw32c23l0nmdxbg3sx38vxh2y2s2nycz5h"; + "CT18ZNNLO_as_0124" = "0w29hn728p8yip40mr27kqmv5wndfkq6nx0vnl53x41pwczkhkdl"; "EPPS16nlo_CT14nlo_Ag108" = "1p7gckhv44h04rvknd6fdizy9c1jqfwic7ppf0ra14ic8wp1g7wg"; "EPPS16nlo_CT14nlo_Al27" = "0hxyakfgknmixxndfj14i44afp5gcfz9afjvjdaj702sv42a7qa8"; "EPPS16nlo_CT14nlo_Au197" = "1g272110y3a1fr6raxdfhagn68i0lcnwbdhiiqg4j6wb6v4m3p6i"; @@ -290,12 +418,20 @@ in "HERAPDF20_NNLO_ALPHAS_130" = "1g2q3438bivd20i685jmx565cq108yv72vhxmpmhysh4qwvwpqqw"; "HERAPDF20_NNLO_EIG" = "12zn49jx7qjr8apgpbhknzll4vwlz3x9y1ai908ix2h86pgap2ml"; "HERAPDF20_NNLO_VAR" = "152h21khvkhxwx87c5lqwzpakmahcpj1ixw6kgl0wrrwjknvfgxn"; + "JAM19FF_kaon_nlo" = "05mcahzr0k5w0hqfbn902lmkwxlkbf8wrk6akpqnfsyqpbmhja5k"; + "JAM19FF_pion_nlo" = "06krcf0c9jbbpwf1rk1xd5z7rz904ji984xz05kv9p1j1vgk0ha0"; + "JAM19PDF_proton_nlo" = "1zrcijik60rci6km5d8pn8ivww8w3v8pb1m5dshqjs51lhf56ayp"; + "JAM20-SIDIS_FF_hadron_nlo" = "11g4syy0r46m1wvzq0pb84s4kk2aihjmhx16mr8gzv5b11520a6d"; + "JAM20-SIDIS_FF_kaon_nlo" = "1b2rz6k0g6ck3m28vdqjnnfc025ql5alhjmgn1l84cflf4fvkkgp"; + "JAM20-SIDIS_FF_pion_nlo" = "15l98gmzsqxw615802si94dmj8ihsz6n1mraxkkwjl86hm8nalzi"; + "JAM20-SIDIS_PDF_proton_nlo" = "07xwp9as0nscm4whl5x9bry1p54yl5qmj2r3hqh6vjsz6mxksdjp"; "JR14NLO08FF" = "16azkqxf1yw1j32ay6j01gf8n9n7qm56jh4yzgjag0zdhm01lbip"; "JR14NLO08VF" = "1ilw38pp4vy8c8v1glfi4ixca73wjkdg3di1wh9p8xqrifdb096p"; "JR14NNLO08FF" = "1w0pywmjb4xi7bsvv1mdd4q2adf1g7khspfbkphmlh8zipx29nxx"; "JR14NNLO08VF" = "0kzszj1r141fcg9vbf53480224nxcc5wfk9zmpmzbmrxzi0w127r"; "JR14NNLO20FF" = "0wc3qib90dpd1wgiymrn5lzwhqmh58ji2s92vpj2v9v4spws7pdq"; "JR14NNLO20VF" = "18l4ipn80gmh9kdw7a1k49fwgbl7b1frgc0hsa04vbwnv6hm73hn"; + "LUXlep-NNPDF31_nlo_as_0118_luxqed" = "09ch6mjfn6rjsd31jfb59j92ngqiy0x19qamyxh0jwk0sbyr1dpw"; "LUXqed17_plus_PDF4LHC15_nnlo_100" = "18y3pa6gjmcv2s21si9a5dvbq6xxqphbqz5qiy39c62g2zf8512c"; "LUXqed17_plus_PDF4LHC15_nnlo_30" = "1bnwlxr8p4xmr36zd2flhqssil6w7jh50k46j0mxfnd8jgxgwn6n"; "LUXqed_plus_PDF4LHC15_nnlo_100" = "08jzl4wcsrr9agycq1r5kd5bqxsx4b637nxk34s82vs7vwpq7qib"; @@ -344,11 +480,23 @@ in "MMHT2014nnlo_mcrange_nf3" = "0zskxladqr40v6wqafbl1pl04vq43babqf437c4xxg4sz9435l3l"; "MMHT2014nnlo_mcrange_nf4" = "0sny8r9zap8gnjh9id1klr59d9hs0bb40pf8hpy8q5pg6052vx3q"; "MMHT2014nnlo_mcrange_nf5" = "1l340c1x4fz647bhybrvbb6z00mla81b78jfqpnwd4vwfxnqmq9y"; + "MMHT2015qed_nlo" = "130fmxnaashvwwaaiz5b787ldz8l78ar5h2h038xvisdjkxvdqni"; + "MMHT2015qed_nlo_elastic" = "1whplgg2s55wjii1hd32hzd5wsqbgvjjbnfw4fzjmnx4vwn63n2j"; + "MMHT2015qed_nlo_inelastic" = "1b24flby6n9q2cg4haldmjs8ql35lhlw0bgynwja1v2n0fbf550y"; + "MMHT2015qed_nnlo" = "1ypqiz0yz6hnxfml7ym83k4qqvqsbl39abbr38galns8xzzpi03m"; + "MMHT2015qed_nnlo_elastic" = "17in1cz5j7mm9qjk8i27fif6x276lcqmccl7kfz8a5yn73xxzja4"; + "MMHT2015qed_nnlo_inelastic" = "1ngk4p7w8l8b8sfg6hlm8ypxz97i1iwzlrc48szy7bi99kn8rmy1"; "MRST2004qed" = "1kdrzk2arvs36lnpkbc94w06hx3nh8nixh2qjhb271c2blwgahzh"; "MRST2004qed_neutron" = "12vna0ic6gh313k22b44b0k9kd939v7zjl2hj65k1075j23mq425"; "MRST2004qed_proton" = "10z0cr8pnr0lfxxi916naiz381a2cqn461jblfzvvddwqmqbllbc"; "MRST2007lomod" = "13ar6hzw9al20zlm8lg0hvwmgrmv0dbam820gm36rj8p7i33qlr6"; "MRSTMCal" = "0kbyp4rypw8jm28zfpvf0grvfvxmsrp3grwsmfxpa2c38x6la3rq"; + "MSHT20lo_as130" = "0ivjvqabk9jnrlrczjlqywmijx5ql8wy579j77qkl1vhv7sqccm1"; + "MSHT20nlo_as118" = "1qwbwcq8p4hrprz4ib18mp5142b0lbyyzc1bf5a4iq5jjvi5qm93"; + "MSHT20nlo_as120" = "10y1a6iryahrafzdqskypjrnad6xxq08gm72pa9yc61xdy6andc6"; + "MSHT20nlo_as_smallrange" = "1rygvj33g84whl24kgpqa47g11c48l93jlnpzqq8f5zr1ijqcq7i"; + "MSHT20nnlo_as118" = "1yz0003ixjg97974648qba5d37vb4fhzzmq4k9xh4c37pnc3kgyn"; + "MSHT20nnlo_as_smallrange" = "1bv7cbdynp6dm5c9v7r32gqy1lch4428apw426pr0d7xpm0abnxv"; "MSTW2008CPdeutnlo68cl" = "1x2y7hl8ckplx175bp3wi04xafm44dd7vzfgnmvvai1x0072xi51"; "MSTW2008CPdeutnnlo68cl" = "1szsdqjkmny30mpw4pdzi97vj7i55agxm285dvnkzp06ycgp1ld3"; "MSTW2008lo68cl" = "0j12mv286r4ds9v7piqh4n44yjnc51hm74lqa4vv5xznxhibng7l"; @@ -360,16 +508,16 @@ in "MSTW2008lo90cl_nf4" = "1bdjl58gslhw539650qwi7vbvsr22hpxpca17rkbqz9szh0ljhym"; "MSTW2008lo90cl_nf4as5" = "1crsm7dfcs0fn1i2ng18wy23z2ap01xr2rsnafqlra0q135m6hfp"; "MSTW2008nlo68cl" = "0pdvb5nshjjw7ddmdmj1v88m3jlk3vwfnab0pf2kf8hfx10hbv4q"; - "MSTW2008nlo68cl_asmz+68cl" = "1zbvbpfy30612ygr9rz7ickdrbdsg0gd6p8xs7ylzj5h06sckq84"; - "MSTW2008nlo68cl_asmz+68clhalf" = "174spwhpl6cvj8bw8wns0jiznnsjrv3i7cvd4x9vi0fa5z4sb5d3"; + "MSTW2008nlo68cl_asmz+68cl" = "0gwmxs0f7raxvmpn12zavzqsrp3x0a82y1vq2kf9p9fq17in55yn"; + "MSTW2008nlo68cl_asmz+68clhalf" = "1rmda4zpm6cs9kyxkhwpz38iv6g259156bmka4dc4zyfg1lcw85d"; "MSTW2008nlo68cl_asmz-68cl" = "15mmdnd3wwlrs5pwwhfa9f88vjpgza8vwxwxpyadxsmhx9jk79hy"; "MSTW2008nlo68cl_asmz-68clhalf" = "0dd7llc6ip6myy2yvf16riqs334f20l8wkmkksq53xngmz9qf263"; "MSTW2008nlo68cl_nf3" = "1j82imyylvnf3x39x1mb19hhp2nbcq2lk82hf7sj72c557l3qpjk"; "MSTW2008nlo68cl_nf4" = "08f008by768c8v3cmrsbgxpglqdj58nwwf22dmk2mbf2jq449s0n"; "MSTW2008nlo68cl_nf4as5" = "0hrqmmnp20vpj6dpz3bvm531i0pvl06als8irqz91cknv6zsvxf9"; "MSTW2008nlo90cl" = "1d3p4cialrngci9kn7225zcmyrr547dskzi74dfgdhbqc0256a2r"; - "MSTW2008nlo90cl_asmz+90cl" = "1g4gwmriyl71xd2k49jc391vfr02dic0q73lc2wphm1y8qmbphdd"; - "MSTW2008nlo90cl_asmz+90clhalf" = "0743kimz3ljlb921pacw2lii104j0yfvv073wddz89r877np6mi5"; + "MSTW2008nlo90cl_asmz+90cl" = "19cd358yqklc8bxv0mg69cq3sf6zah7di0q9ilfqbiddmw1flw3p"; + "MSTW2008nlo90cl_asmz+90clhalf" = "0ngn8f149agvmc54nrxjxqa0rifbd8a1hbcgpa443l75bmd9sqcp"; "MSTW2008nlo90cl_asmz-90cl" = "0fnqj7ywnp9nz5733ggjwmhxpy15zs2xgxjz7ixmql5mmaz3sxb6"; "MSTW2008nlo90cl_asmz-90clhalf" = "1jrp9q8li7a4bwhgh7q9h9zc0sdhck957zn14q9ca9kjsflyb9f5"; "MSTW2008nlo90cl_nf3" = "02ihabrcgp474wkq4w2fshpiqdznjaxyg5vawv52yj6hxifyy5a9"; @@ -383,16 +531,16 @@ in "MSTW2008nlo_mcrange_fixasmz_nf3" = "0zwnicbmmqbak5sw92njpmvxpjnnhwl1ggvlj8q39hn5w5kdy1kq"; "MSTW2008nlo_mcrange_nf3" = "01mlzqwk30glr95g7n2y3yvvy7s6mkbdb5cqwl1m7k8d6m18n49g"; "MSTW2008nnlo68cl" = "0y6lv1wkhydfnlakjrrrjapxaapa0bcbmfx0w9c4psgy156kv1fv"; - "MSTW2008nnlo68cl_asmz+68cl" = "0ik5c4vcv1ki5cnvnyk381lw36bsqp8mjkzh8ghqjz6z8fr2hb97"; - "MSTW2008nnlo68cl_asmz+68clhalf" = "1d8c0rr3lscin28622f82s79xgbam4qhqkpvvjgynhyn0wy46b4j"; + "MSTW2008nnlo68cl_asmz+68cl" = "0fhkbkshrc29kz0fc9vi2dqsg6irjm4sfw4sp0s4wkj766wg19nz"; + "MSTW2008nnlo68cl_asmz+68clhalf" = "1z0fplsv1fij4fgrz7npr34hcmc2qkf7g398bq1smvb6b2qy5jb8"; "MSTW2008nnlo68cl_asmz-68cl" = "1qhjhdzpy67665ccwv0n3g7jlyb2vfk60cphjr0jb1adgv9fxa7q"; "MSTW2008nnlo68cl_asmz-68clhalf" = "0rlsis3r7l32jdiq2yhx1mz7q6qlzlsrarljvrmxf0g0g2d8nr4c"; "MSTW2008nnlo68cl_nf3" = "07nrz7afd1mcsqc3lqv9vk2phs1nfxdl63qh1bc0g7nznxwmmn97"; "MSTW2008nnlo68cl_nf4" = "1kd62hzk2p3q56kj79bs101arp55ajlyhwwa3vq3yp37i3ynz9ds"; "MSTW2008nnlo68cl_nf4as5" = "0x19rq5k9c97vzskqppf4k0fjahwiw2c1nb6iy5c2fq8mj1pz2gj"; "MSTW2008nnlo90cl" = "13xqlfys37b8chinah2yqmzd0clzli06p7vjk30ha22wgwm02dq3"; - "MSTW2008nnlo90cl_asmz+90cl" = "03p1af5962smr5794322gj3s4f0fvnvmfizsabch03ivyaqpr1nq"; - "MSTW2008nnlo90cl_asmz+90clhalf" = "0v99vr5kkgkscqvs8b3ahnvg5yl9rfzgf7hams1j12vjg2b9kd4z"; + "MSTW2008nnlo90cl_asmz+90cl" = "0pd6imc3hvq7vgyv1db9y8rvpgz4ffwqv6rqzp27c7ipxg0wjyz0"; + "MSTW2008nnlo90cl_asmz+90clhalf" = "1xn52ppixjg22ybd8ggf0azb3zg5zyilqjss033g0k9crq4a6y2v"; "MSTW2008nnlo90cl_asmz-90cl" = "10wxgh52zs0fp0bwd0b6csnz9x6mvp45gvjhk0y1dhgfwbcvw9y9"; "MSTW2008nnlo90cl_asmz-90clhalf" = "1kmvp1yfgsx4jhsjc4drg82cq4xs6as4grwrymfkrqnvhcg86vap"; "MSTW2008nnlo90cl_nf3" = "0vw0cmszwp49fsskacccl921za88cl5cfy0sqckgxzs4hx21x43n"; @@ -628,96 +776,129 @@ in "NNPDF30_nnlo_as_0121_nf_6" = "1kln7zjgl0hwl621wnhhsih0m8f9ir2i8ligfg2s0qp8s3787lrg"; "NNPDF30_nnlo_nf_4_pdfas" = "0s460v9712ahz09fhzhlnsnkl9arsy3l82g1z6xjz4la8fwkr9wq"; "NNPDF30_nnlo_nf_5_pdfas" = "1vjfm9j39m4389b0r51axlbzdbkpk2vbs3vks3yqcr3hr09g9myk"; - "NNPDF31_lo_as_0118" = "1n3n3irw0lb1vmcr9qxgcd6xj8prdz6xbrrfbx1815avqs1pyb94"; - "NNPDF31_lo_as_0130" = "1amkzj0jcx35zrcwl067zf3sz7h2kanj8q49661ayl8yw2c1ncib"; - "NNPDF31_lo_pch_as_0118" = "02f294h655vn85vqx32hipnmfifal28pn6f18an821jrb72plnzp"; - "NNPDF31_lo_pch_as_0130" = "0qmjfr147zx9hp3znjxd44rx3hz2zwyvs5lbbbd0y0y1argc25dx"; - "NNPDF31_nlo_as_0116" = "0px6id1q66pdn47ja09shn0cbwxzw6sj4r3qfzz30w3srr93i4jd"; - "NNPDF31_nlo_as_0118" = "17avv0qpn7k7lg26rxmcpcrv127w30d20n286vd523b9x6qknkds"; - "NNPDF31_nlo_as_0118_1000" = "1ms69qgi3mhrwi3jxapykfsiqwq3cfpx38jwmsv4pq2g2hhawvfq"; - "NNPDF31_nlo_as_0118_C1p6" = "10y6fb4fmsv7mvsj7zrv6g7x80yxglaq2d0ir4hsn3vs3yqq7r0d"; - "NNPDF31_nlo_as_0118_hessian" = "1jlqbq9wb97l9jhm2r4mkvnhb3vfp0bdhz6lhxnd0a9ipsgmc1wi"; - "NNPDF31_nlo_as_0118_luxqed" = "0zsyp7g93d1z7fpdd5a43i8wd9jfriw2pkligdy78xxlv9zngbkl"; - "NNPDF31_nlo_as_0118_mc" = "0iqk4fq0g4v0khymzab6cxhly7ybxw6f010b5x6ybgw2vzizvmq4"; - "NNPDF31_nlo_as_0118_nf_4" = "0swfqsn68n60r4n3m5szzds8a5pz6p1ad2kkvwawhkgmp2ww0yf7"; - "NNPDF31_nlo_as_0118_nf_6" = "1b44sygil9ngxmdn0273nvh3pzry2k03mkdibf3kfxn5s0ymkl4h"; - "NNPDF31_nlo_as_0120" = "0114g1y2h090137wnhjmycrd67nb8s2gg9byx0j7hm1vy7sajj1j"; - "NNPDF31_nlo_hessian_pdfas" = "0hhm5k3i9ls6fsncfn5cxsx6b1fhb1x581d2cz2balabvby9kf8h"; - "NNPDF31_nlo_pch_as_0116" = "1q037ai33p0p9s9x5vr0p2v3jy0ghrg9djkyimy1lw00cmkj28xc"; - "NNPDF31_nlo_pch_as_0118" = "1sym62b0n1rln2fybpppl8sz555wb6cymr20djrwvs45wdkmbbyz"; - "NNPDF31_nlo_pch_as_0118_1000" = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; - "NNPDF31_nlo_pch_as_0118_hessian" = "0fqkq9jq6l6mfl73ykkn9f6w52wpfys4vqh97ngkm331qkm9y6z8"; - "NNPDF31_nlo_pch_as_0118_mc" = "1q5ihiwzm9vm5v8k47b691cccv0ikvzqahi2vxigqdvhnlq8nrq5"; - "NNPDF31_nlo_pch_as_0118_nf_3" = "040kfq43a1hb5z4inhw1pzqhk62yr0sf1kq32jv1wkbc1524j5gf"; - "NNPDF31_nlo_pch_as_0118_nf_4" = "18vj61dv179ypq3l8wgvc5m0ksc1i6mm3r1jj45bk0dxszlrsrv6"; - "NNPDF31_nlo_pch_as_0118_nf_6" = "02zmby2c6adp1q0kcjx4f3qvabn5qif82q942xnxflgpnpk9qafq"; - "NNPDF31_nlo_pch_as_0120" = "0kgslc183vaxj1fxcwfabs6ah4lx787gi98q02nci010w2zmx7zm"; - "NNPDF31_nlo_pch_hessian_pdfas" = "1bmja7lqdwakqfhf7q72snyjg3qg84xdkwjwmz6lvy75r1810dhl"; - "NNPDF31_nlo_pch_pdfas" = "027prs00nc8laqpjvz20ij5ipzcp291szdpz02aiinf2a5sy2f0j"; - "NNPDF31_nlo_pdfas" = "0d8krd9akg486k8gp1kj4qn4zwy4pjd4j3xz2527a8hkiv99v8bi"; - "NNPDF31_nnlo_as_0108" = "16hhkvmk2cpmqx7jgkh7ckdzas9c6v23l04z7mlnvvc4682n5zvz"; - "NNPDF31_nnlo_as_0110" = "1hznzg01dvpa77nxr11dmqdhwbrj310hhw1h088bz5svfh15ga2r"; - "NNPDF31_nnlo_as_0112" = "0cdjiiniwikkda593sv1lk1wywdxgzfqg5fvhczgwq588xmac2wa"; - "NNPDF31_nnlo_as_0114" = "1q6phbv3w4dsyw0jasbpzid8r39mr8icw4av85dyim4n1ncqag9a"; - "NNPDF31_nnlo_as_0116" = "1fz1h7vd910vm8li56j0w1b5jqalym0zkqv8msr01zyq6dwr1hfj"; - "NNPDF31_nnlo_as_0117" = "181xc88i392rbfwqg1p7imkh71ilbcxdibi1mh0zk4kmnx6sskfp"; - "NNPDF31_nnlo_as_0118" = "1p4idzrg8i67h8anzanizas7a1hkxbhrw7ch6x6d1swbigw40ajf"; - "NNPDF31_nnlo_as_0118_1000" = "1bcjsxnp205v9ipf0j57pfnzl7kd89ds3w0gnjdsq8q86s0c5k23"; - "NNPDF31_nnlo_as_0118_CMSW1" = "0ibgi8jbick51fh3pdnc7zrjsdpjyc3gg2hnm0jmxw3hck7rp2x2"; - "NNPDF31_nnlo_as_0118_CMSW2" = "1h49ygmp58zs0ml1lza6clykhylw4bgvsi6nadwmc2bqs4hqqp8a"; - "NNPDF31_nnlo_as_0118_CMSW3" = "0z4djd7nrkqd55dvswr85l4sphjbrgsh5bslgypbf2axizlscdyc"; - "NNPDF31_nnlo_as_0118_CMSW4" = "13wkx8a4zkivk832f0ng6zq4m9ahka2lm3l6230yicl2fwb9znsx"; - "NNPDF31_nnlo_as_0118_collider" = "00fgz6m8qbhgmvkli8pyh1gsazajqz8cqbad117z1ijvidhdkxs0"; - "NNPDF31_nnlo_as_0118_hessian" = "0rzfcmwadff2p7qk19dj2skd4dpv9z59jmnv51c44yis07fmsjbb"; - "NNPDF31_nnlo_as_0118_luxqed" = "0smmsn2b2lxwzpr4wr5wg4rg8kjy3lz0xhjdwlimv5gmf24dswds"; - "NNPDF31_nnlo_as_0118_mc" = "1nmwb3v0aiqjhhlzlrf9qkydgfhk6lp48ydbvy4w5fnhs4rqas4j"; - "NNPDF31_nnlo_as_0118_mc_138" = "1bv63m9lxxy3mrbmkjbn3jjansghlphxwmqywkcynk6z42krpgdn"; - "NNPDF31_nnlo_as_0118_mc_164" = "1dkj741r29lh1011c8v2d8ax41a9pxvj8ksvz12y18ipf5p0jrnb"; + "NNPDF31_lo_as_0118" = "1jq8ad68kym717qinwdldvrjnry9sfsfq7lvfv6ipm1sdzixqm96"; + "NNPDF31_lo_as_0130" = "1lg49cbg43yrpb7fgqfk0d55m28rrw781mks3zn9m24fv0hiyzqp"; + "NNPDF31_lo_pch_as_0118" = "0xm3fyvrm77hd2layrfwc74vncc470gvf7hx8nzd2sw3ai1g9h7x"; + "NNPDF31_lo_pch_as_0130" = "18fip94c0ywzj543qq154z2wnllbn8jw61nx6l8v9wmg2sdzi6zi"; + "NNPDF31_nlo_as_0116" = "0i6bpa2wf52vsc6x5nlsmncal1ghqpsyz7pya2a2zg0k7z6dfcsp"; + "NNPDF31_nlo_as_0118" = "0vwbgaxs5gj5cnyncmc7m3650pd6bplwdga3fnyy1vrrh3mpsngh"; + "NNPDF31_nlo_as_0118_1000" = "0ql0phs563ck7bx7cm5x242icfb2jrlsxhsv80m0hxyr3fhyc06h"; + "NNPDF31_nlo_as_0118_C1p6" = "0nn6krh6vk8rxiwhpnn3nbxian8hw8d1vq31ywh9560hbi3vpcrl"; + "NNPDF31_nlo_as_0118_hessian" = "10v2ayms2mhm9zi7k0fw9rshawc7njdlbjs8rfg5hiqn1adss4w3"; + "NNPDF31_nlo_as_0118_luxqed" = "19fdqxfmx8kzcgq13dk4k1nhkgqpnm5xgahp13hwz1i2vcp6xq87"; + "NNPDF31_nlo_as_0118_mc" = "1yw21cs6p85ij8lm9k0cvlm651a3x9f73f23ysxjgh1r5kqnhz9y"; + "NNPDF31_nlo_as_0118_nf_4" = "0qywlyd34yqb2r8ch9wjimyfi1jr3rdhxliwrmns0558hbd47a3z"; + "NNPDF31_nlo_as_0118_nf_6" = "1pb22z2s0ir130dk5pkxwyid37i6mf8jpr7k7nlfi45gl9zy5ldd"; + "NNPDF31_nlo_as_0120" = "1b5wsab66karm1ay5vxpjw21g2ywhnzqnlahxnvnaf80izha35hl"; + "NNPDF31_nlo_hessian_pdfas" = "0sxka18qp99gjj9abml2ba4877zavijmjfzg6m0qczx9m8v9m3xg"; + "NNPDF31_nlo_pch_as_0116" = "1wqpq2qj5czvcj754nd6c7rrss8skjx58vp2gj2bc5n95jv1qazn"; + "NNPDF31_nlo_pch_as_0118" = "113xpp3xvpfpivlj6p7av4czfbfnh6bk2kd4d2635ddvy0clqkpf"; + "NNPDF31_nlo_pch_as_0118_1000" = "1sbjqkwq7iy7fnk3r9ga1rzadzy8x3ld933vcih87is09bzg5rfl"; + "NNPDF31_nlo_pch_as_0118_hessian" = "0xmz2hc3n8alhf210axv3amf7klhbyl1dd1z2yyx6c3pcvcrf80m"; + "NNPDF31_nlo_pch_as_0118_mc" = "1w1jifp5f7ypf5xqdw1mkx1d6shknryhqzk8rk8naf37bms68mfn"; + "NNPDF31_nlo_pch_as_0118_nf_3" = "0m7rq7k8x6bsakkw3kmcicq04c39flrw1axv72dqaf9xci9w3pii"; + "NNPDF31_nlo_pch_as_0118_nf_4" = "0k77chw866shjkc0ml6kb4az75sdcvdd897r8d56jl72d2lkxp3m"; + "NNPDF31_nlo_pch_as_0118_nf_6" = "0bdc60dxj7jmqacbbaxp2m9qzg82r6pgn7h9pi2k15d07qm6fc4d"; + "NNPDF31_nlo_pch_as_0120" = "15s1b5w52c3q1nfzckdxmdwrnxw08pprmphc1p33am9v7cwwq2jk"; + "NNPDF31_nlo_pch_hessian_pdfas" = "0qdswml17bg68y67yw2zbwwp233nxpd1qpc23rqjwyzk2r7qk9bg"; + "NNPDF31_nlo_pch_pdfas" = "196pcdwsi5p9g88g1c8958qkdj6qmzvl7rsg3j8zll6274m42s4c"; + "NNPDF31_nlo_pdfas" = "1as7bkp56pwpn2vinxdnhzlnvnxx5ng0mlpmwzz5n7gsinyaz1x9"; + "NNPDF31_nnlo_as_0108" = "03kg0i43wxf794c4xhvismks6c7nw9hq9ihn58sz628lqcjmsccq"; + "NNPDF31_nnlo_as_0110" = "04a5gf6nyd58h9sad8zv46vmb074dx7j19r23lbc9w1di23sk104"; + "NNPDF31_nnlo_as_0112" = "1xkjjm49nlm72f4l3ynrm4g2ayzask22saaf6p1p61lx0jv1hjyd"; + "NNPDF31_nnlo_as_0114" = "1j4q47qscyw52swmnn0a3lr0avfsjvy20ca50xfhjsvla6wd9lpg"; + "NNPDF31_nnlo_as_0116" = "1k2d4jzg5jfs6f2mscpvalmh7i5fypx98lnb5wjycprlwd3nr3i9"; + "NNPDF31_nnlo_as_0117" = "0b6d1xlq4qwjalvrc7ppavw44w5zf0fn3rbsvh3k4qy9r19wk5fb"; + "NNPDF31_nnlo_as_0118" = "1bw2ksmxdfbwdcimc0ld87hanbqy514sridrcarqwgqh9yv5n0qp"; + "NNPDF31_nnlo_as_0118_1000" = "026d0xygh046y10jxsfc91hr4qxgark12m393r0afip69dzdsrx0"; + "NNPDF31_nnlo_as_0118_CMSW1" = "0vqjyziilfzi0gz3a2rv0i6hk3ri3krc2zcdjwfa61z1mg5syi4a"; + "NNPDF31_nnlo_as_0118_CMSW1_hessian_100" = "1jc8k64pj1mfcw8v9qq9v8m222d09bgfkla7viqzzzbdhy5f6yy1"; + "NNPDF31_nnlo_as_0118_CMSW2" = "14acp7w3sx5v4ly5wa32vpsk8xw2rh8g5gl7x3f72c0s5jcs4n81"; + "NNPDF31_nnlo_as_0118_CMSW2_hessian_100" = "0ykaw8x0i6k8vlbms2inm9zm860apsi5mf4wkxha416v4chrpd04"; + "NNPDF31_nnlo_as_0118_CMSW3" = "1snkandx6apar3sp0c182n770rxn2s64pc07h5k18627cnvpzing"; + "NNPDF31_nnlo_as_0118_CMSW3_hessian_100" = "03n59yvpgciipkv3k0yr0ab3myhx263n90ah3q3h8hdszkf80ri1"; + "NNPDF31_nnlo_as_0118_CMSW4" = "1zpnvawdj20izx0mx9a3xz0d0an6i65axbzg5z7fkiq0p09rfx70"; + "NNPDF31_nnlo_as_0118_CMSW4_hessian_100" = "1qczy2935iq2h4mfq0mv53v2vlfsyvhkff36c5dkdlkrzfkvpl8x"; + "NNPDF31_nnlo_as_0118_collider" = "1y2axnkjwx7yg301mj1yx1x937j7mhsnbbdpip94pl3vm5hz10dk"; + "NNPDF31_nnlo_as_0118_hessian" = "0jvzl1bs0mh9c7ypkdgw0s06qn9jkww1d124lc7aq48w1g4n0zyy"; + "NNPDF31_nnlo_as_0118_luxqed" = "10fwxncr1y7hnja5nxywldpkzrijxz5ayldqjc21jamyhyj3qsh7"; + "NNPDF31_nnlo_as_0118_mc" = "0sg939j6xn7d5g46547np3123srgz44h9clh29ybl5cnmccv23cl"; + "NNPDF31_nnlo_as_0118_mc_138" = "1kbxhjzrr4802kcpi7m2g2dx4ywvs9rqjispjwbjc60rqkqispyv"; + "NNPDF31_nnlo_as_0118_mc_164" = "0i9yxnbps63nz6ala4jk6qmpxlg6p46w6jja8qn73hp0n69w2acz"; "NNPDF31_nnlo_as_0118_mc_hessian_pdfas" = "1b9ijn595qfq32yz9rlnn2br7lssbk8ka39ripfcfyf33v9sv460"; - "NNPDF31_nnlo_as_0118_nf_4" = "11dl3c2anh2v140vn6v4mx9lj65844svsd0f84wng0sngrn6dli9"; - "NNPDF31_nnlo_as_0118_nf_6" = "0s102m1gf8r30g7zy4c91imn26ksj4q600711rgmw2ada1xn87f8"; - "NNPDF31_nnlo_as_0118_noLHC" = "1ypim2zfa2i3r1hcw0j6w9abmxx67g1rhdacsajfp479s68kmi3c"; - "NNPDF31_nnlo_as_0118_noZpt" = "1dx3hlcf8c1a40iyccw84v6f2h5jfyw1pp3n01q2rls9i5b12r15"; - "NNPDF31_nnlo_as_0118_nojets" = "05rkknl44j0pm7kb1l6ihy6rlvwxrkram4sn9zm0za1pv0r9dr6k"; - "NNPDF31_nnlo_as_0118_notop" = "16prpxwn081v63a0pkgjvcizvn33ng5cafv6664yp44j7vbpwi4n"; - "NNPDF31_nnlo_as_0118_proton" = "0xjfambqz14vvg506kj8mqkb37q1bq7m3wgh089fjzq0acrmh9kl"; - "NNPDF31_nnlo_as_0118_wEMC" = "0hkpr14cxgz2r47bfh7k706l22pl6nlhbdqxd7wmrlyrk19vgar3"; - "NNPDF31_nnlo_as_0119" = "13ys6fkvna2i0ifzw2dz3g4jn1zsacslffylrkmj6zxmkc0qganp"; - "NNPDF31_nnlo_as_0120" = "19gszb3kxgwdskabdsk183bdn9b0zyphkk8v1r8s372fg52c8jgg"; - "NNPDF31_nnlo_as_0122" = "1mg40xkp5sb7mpwz420b1mv8cqxldi9rsddnmgdhc5pal5wpgaf6"; - "NNPDF31_nnlo_as_0124" = "1lag0smkh7pjbl449wipn3rq59yi48313xrma531i9ldh68a4ssg"; - "NNPDF31_nnlo_hessian_pdfas" = "0yirp5jhns652a4f2jvhxhvd4y117z3mc5vcd2vsvqyjijx6q0gi"; - "NNPDF31_nnlo_pch_as_0116" = "144bgqmxci7ibwp84kg8a6mw3mwmsilq2ay14y48vsx1ydp56w5q"; - "NNPDF31_nnlo_pch_as_0118" = "1vkpr9js1xwr0g6fz66j2a22b3k5003adf34x0nb6pjm2nxh0njf"; - "NNPDF31_nnlo_pch_as_0118_1000" = "1kwc21p2s383973k5jqciqjpmp4xlvj59zsxjs9nvsywzp9k7vaq"; - "NNPDF31_nnlo_pch_as_0118_hessian" = "18pjqnjkz6jgia5jb4a59s9568yf3b7cp6iqb6fk3xmqlwx5vdd9"; - "NNPDF31_nnlo_pch_as_0118_mc" = "0wyccq58w705ayy5r9fcfnybb9rw43nl46rrnfysi65myqgcfjnc"; - "NNPDF31_nnlo_pch_as_0118_mc_138" = "1rzbff1dmdybkgc5ky7qqcvm5g7npiq4nwjjsq714zajlm0r4y1f"; - "NNPDF31_nnlo_pch_as_0118_mc_164" = "0ymnwm3n45jsxz6dl8ys0p7zswf6w21q3m016lsrcrmyy756c6a5"; - "NNPDF31_nnlo_pch_as_0118_nf_3" = "1hhz6h8mcj6n8309sw5b3w6dinm54hgbxc7c07xjzkb9xmliqwa6"; - "NNPDF31_nnlo_pch_as_0118_nf_4" = "0jldm9dlcngdqcy05y8kjszm8g6s3dvamkz8wh70d260ifh2jb23"; - "NNPDF31_nnlo_pch_as_0118_nf_6" = "0kpnhryf8g0s2ykvbwxiiczycrknbrfsnbs08h1zg0cpq8whljqd"; - "NNPDF31_nnlo_pch_as_0120" = "0bgr66vrjm749pzif53yqq15023yva03x32wkn5gynq083gfdw37"; - "NNPDF31_nnlo_pch_hessian_pdfas" = "1004frva4k0s59naxys505fjc83wkz1andzz5gll6v5flfscfch0"; - "NNPDF31_nnlo_pch_pdfas" = "1p26cb6h1czrdlzk166668900ilzr7r93dmksvc3pqafq2mi80jb"; - "NNPDF31_nnlo_pdfas" = "0d2cv8y23w30cgxs5090ygb614fwrdj0vwh6pjshqv9403maykr8"; + "NNPDF31_nnlo_as_0118_nf_4" = "0l796ns5xm0biyl0jra5z6y7vddv52v48wlbdywsq54082scfpl0"; + "NNPDF31_nnlo_as_0118_nf_4_mc_hessian" = "1bw0x75pah1kp387s8m0rv2qc54k5pbncbv507d5278hhfsn68qa"; + "NNPDF31_nnlo_as_0118_nf_6" = "0dbxxk0p001sk6sb9nf5ipzi39w65vf4c4g8cbhll7p4fqi8f8dy"; + "NNPDF31_nnlo_as_0118_noLHC" = "18y9mnp1gmvdbikgfdybw8wz2w5x60wk8lya13g7z6nhbfs08qa4"; + "NNPDF31_nnlo_as_0118_noZpt" = "1jwhkz8b1x6a2qi62jvprcp1rmcq5aq7s31qhw0skcpx8r6r6gnb"; + "NNPDF31_nnlo_as_0118_nojets" = "1bg714agc25p7zw2yydvl340sns7fhszpbphzap6fc0jsg511zh5"; + "NNPDF31_nnlo_as_0118_notop" = "1v675r4qk0wz1hg000fw79nmf1zjqi2ghvgjgs7hyzzbh5g4l3ds"; + "NNPDF31_nnlo_as_0118_proton" = "0ipsp8kk59fb3w9d1y4pq85f4fl6789rypjfbpp44gcy8hzshbm7"; + "NNPDF31_nnlo_as_0118_wEMC" = "0savd87jahlac4ag3qfamhnpa7mpnm00j104f3ci17gdax1sds50"; + "NNPDF31_nnlo_as_0119" = "1s7ildlffbh6cpmzlmafxzbbrlgggfqxsv4qic99yvgqvdgqar8w"; + "NNPDF31_nnlo_as_0120" = "1z6lqcq1dgvqnpwlfymlf9yhcaqc2p8ny7wv4xs57639dsp5xarb"; + "NNPDF31_nnlo_as_0122" = "0482r1hip6c4kpq24xzi8nw8awky0669k4plgpgv0av12l4bh9c9"; + "NNPDF31_nnlo_as_0124" = "0cf3djgs4gayzwy8p0qvynripz3hxd3866m8ldlhxnjmcsgcps11"; + "NNPDF31_nnlo_hessian_pdfas" = "1m5wdnj7hvg2a51w1qmhm934glhjf9db0x5nry5blp90y5x0v185"; + "NNPDF31_nnlo_pch_as_0116" = "1i8yzqywg4hcf53vcp25fg8llybis3pz6xbp5ajpyjvrvsgii1pc"; + "NNPDF31_nnlo_pch_as_0118" = "01rsx0ss67772b20dnnw463328pgbd57d8zcj3lqymlb4a6fq8f7"; + "NNPDF31_nnlo_pch_as_0118_1000" = "187xkvp7y1wssgpb21r1w4yxn6m1280jac9nmiavrma06jfd57c1"; + "NNPDF31_nnlo_pch_as_0118_hessian" = "0fs5d450hc15hqs6xv9nxfsnhwszmg9ybjypgwa9kn4s4kkaz1wl"; + "NNPDF31_nnlo_pch_as_0118_mc" = "06vgb01l1yigln7cn9y3lslg35grwvydpd8g04xn4pj4pj2vjrs0"; + "NNPDF31_nnlo_pch_as_0118_mc_138" = "0za3v1mg8gb631039kg5mkr9zhn390dkyim9p663srpk85j7h5g5"; + "NNPDF31_nnlo_pch_as_0118_mc_164" = "1xc02sbmhyjr4gjwim4p0gg90zh26zdmnz89395pxzbq2navcraz"; + "NNPDF31_nnlo_pch_as_0118_nf_3" = "14xb6m1wqc5f7xjiklwnshn7ljrlg6kmbzr2rib44pgbj6pnl2xn"; + "NNPDF31_nnlo_pch_as_0118_nf_4" = "1sg823n82j9ijqx4ldysh0g53pjzn4sysvag837ywfyns4p5qy9k"; + "NNPDF31_nnlo_pch_as_0118_nf_6" = "14ls2yd1n2pqvdvq18qmhizms3a8pwqvksdkvwn0m1379lkss106"; + "NNPDF31_nnlo_pch_as_0120" = "09zc56cmpj9iw0qp2bm9a8d86r0mdagg1vrpf2xqza4fr841r5km"; + "NNPDF31_nnlo_pch_hessian_pdfas" = "08baysni2lhbpr1scx7h0zf64gyncj2ahcv4y86142gl4zqrafvp"; + "NNPDF31_nnlo_pch_pdfas" = "09mw3gr7dz0vwdnralaplvlz2c464lmdizf673xsb0wlm12pqf6g"; + "NNPDF31_nnlo_pdfas" = "0l92q3xhdk5nrnhkmrirxnvplj531rdpnblnacd759cl4hgxcs2q"; "NNPDFpol10_100" = "0r5qfa8cyanalphgjdsh57s3viqv9i10v51p1pyamj1f90gb9pr8"; "NNPDFpol11_100" = "0nny1lpw37jcillpfxjx82hq7wlzp4yksxialmc2ivr192qqdda8"; - "PDF4LHC15_nlo_30" = "05n0i1mr7v7ssvxvdmv9fn621rinl08frz71apjj7wfdm7s7bk72"; - "PDF4LHC15_nlo_30_pdfas" = "0xi4xydx0x4ina0wmqv9jf4978xhd8x0l91dwfxh5vy39r5x4lm4"; "PDF4LHC15_nlo_100" = "0m9d4zy7608iryqy1ypgkr1d3yhw2wv1nrrc70zrfih7x0fp7lz7"; "PDF4LHC15_nlo_100_pdfas" = "05wyqyh9y32sxflq69igcnnsl0ifnkyw3vnnnjn6kscl8h8hs7lp"; + "PDF4LHC15_nlo_30" = "05n0i1mr7v7ssvxvdmv9fn621rinl08frz71apjj7wfdm7s7bk72"; + "PDF4LHC15_nlo_30_pdfas" = "0xi4xydx0x4ina0wmqv9jf4978xhd8x0l91dwfxh5vy39r5x4lm4"; "PDF4LHC15_nlo_asvar" = "14hdgj5g8ia7y6hi40zbh925dacrk7hd6cli6lkhlqzxl755nbs3"; "PDF4LHC15_nlo_mc" = "09p7y0z04r6wdkf8gi3yj85qk5hmp0mmhab8c7a7lly4731fyf42"; "PDF4LHC15_nlo_mc_pdfas" = "0sds9rkvbjkk7pardwq959qqbrvgwswxmsqcfppky2p0qmdsjs0s"; "PDF4LHC15_nlo_nf4_30" = "1ysy6dqlacg4bwb2f16p1aza5gwm9qnhmc0g0mhsdw4d2i4ml5yg"; - "PDF4LHC15_nnlo_30" = "10cm4wa0mk34rnvsr5q8g9w7fs9cblsryms2nl370wdvcrhzsxph"; - "PDF4LHC15_nnlo_30_pdfas" = "13xln0y8l0qcj9951glj4f1kqfaagj8gwkxzlvdkgjnj1scdy6yj"; "PDF4LHC15_nnlo_100" = "1gcq3qrf39dhq2pmpjrj3z0i0ycrk76mjdwmgfvzdxysp530ax54"; "PDF4LHC15_nnlo_100_pdfas" = "16r8far43ymsd64a4bbqlj56qvbjmcyxbawv4lkfxysjvbydxj4w"; + "PDF4LHC15_nnlo_30" = "10cm4wa0mk34rnvsr5q8g9w7fs9cblsryms2nl370wdvcrhzsxph"; + "PDF4LHC15_nnlo_30_pdfas" = "13xln0y8l0qcj9951glj4f1kqfaagj8gwkxzlvdkgjnj1scdy6yj"; "PDF4LHC15_nnlo_asvar" = "03fh1jcbmvla7n2jj3zq4ibwvq66h0rniply7h93d94zawcgsy4v"; "PDF4LHC15_nnlo_mc" = "0c6nfkv3x1p5iw514knjvqcs1dcaryf74qqg1za8x234yr5ndi3p"; "PDF4LHC15_nnlo_mc_pdfas" = "0l8hlcz69cdii7mpgargi9nsx7iy746nad5pnn7pvycrc40marij"; + "TUJU19_nlo_119_50" = "1q1dhsxz1kq75rpzv6gg6p6bzvvv0d44pc4y3wsiy9g14aff85vq"; + "TUJU19_nlo_12_6" = "006j6y4xbjss9apzagjcc3r1z6s61a1hzafhcyriiffqhn8bg50k"; + "TUJU19_nlo_131_54" = "0ymf35alyar6fwagmdny2zz2aag576f38kail7gh2lvqpmjmv6np"; + "TUJU19_nlo_197_79" = "0rq57sjcwljz8fz2m5bz0hm1670jp080zawmavmagmzvmyxbpnpj"; + "TUJU19_nlo_1_1" = "0fp4syfjgl0y58hrr3g515j96yp7ncbrnzj1h7i5h3fphxzayhcz"; + "TUJU19_nlo_208_82" = "16g5fjpa1r6pml6jnmzikwafdc0vgj8j3b0ivjz0bsqxms66msg9"; + "TUJU19_nlo_27_13" = "1ffipy7g22mjbhy7wpjipfka84k4iw52bni4gw2a6aan5qljlcii"; + "TUJU19_nlo_2_1" = "1l17drwy3vv8s7g9fdivxs2z6m88h7fpamnr5y0y6nbkh6bja2s6"; + "TUJU19_nlo_3_2" = "1qm010yjnj9amj2j89v6s5s42q18q8b6md35c9mbv88ibqbsdnvn"; + "TUJU19_nlo_40_20" = "0xylrincss1ijkfxnk7hl72c1rzpzm14hcarddh9pd57z7i1gv4c"; + "TUJU19_nlo_4_2" = "0adqxh47pnhgmq9r89wcqaldfrqll5gpjzqncqd5ba8301i3d98m"; + "TUJU19_nlo_56_26" = "04q8c3gkbxib5fz20f7rwn33sqapcmsj6fwwihi6ca8n1rl6hw6h"; + "TUJU19_nlo_64_29" = "1yyl70v8s16s2v630wamyfk8lwdw53cbp5hipgwdw1sfs33pj1mj"; + "TUJU19_nlo_7_3" = "17qfnf8bv6c5q6xkl68c6n1gxp81gang5w71gvn9m5d6pn2wiicj"; + "TUJU19_nnlo_119_50" = "186fja2z84csh6zsp0lpy5mch5swmwaf7mvq8kf073jxlrkrws42"; + "TUJU19_nnlo_12_6" = "0k5q6a8jidhmnjgll1l71dxx85lzd7w4v9bsmi42qladkd71vblv"; + "TUJU19_nnlo_131_54" = "0inwqb1v390xkjzhc7gy4hng07jzbbhpq99f4zpkzx115xs57l74"; + "TUJU19_nnlo_197_79" = "09c9b1kqzw28rqgxfxq2mvwna8yb6f2y90332f05jpvfk3mmr7n2"; + "TUJU19_nnlo_1_1" = "0qmvcbsyi333b9dd42xjdq62a7dfa3hvfcbk48fg4m179mzhp588"; + "TUJU19_nnlo_208_82" = "1xpwnl342g8ahhp3lm7p2xhzlx5qzhjvz6g1w1nqrd818w3994zn"; + "TUJU19_nnlo_27_13" = "18fsbp1nh4zx2wgg9r7ian0mvhvf4y8ssqv33vqvn0vwk7gqw7jf"; + "TUJU19_nnlo_2_1" = "1p0b74w1a9906lqbxbc8dkk5bcdhnbqc82lnhsr4qfi8sxih2l9i"; + "TUJU19_nnlo_3_2" = "132w4cv8r7958sad6jakfppsywifwzzacsfyn81qvv76xzc2hm3w"; + "TUJU19_nnlo_40_20" = "0fkbwxh0smj1icjfn58fsfh52ny35pmqjs7cs3qnw6dk5p95qx6k"; + "TUJU19_nnlo_4_2" = "12vm0dl8ylz38zzi6rsyy24h3yg30nq6l464nl5fr6jdkvkbz2f0"; + "TUJU19_nnlo_56_26" = "1kqc6v6qq6wl3nls31gn5nrzwfl9kshm2bbak771c3xvjsgvjpdy"; + "TUJU19_nnlo_64_29" = "166k8swsysr7x5rgivi6k04q4p8njb2ny7xj7xjqhkgxrznc8jzq"; + "TUJU19_nnlo_7_3" = "0q9vswr0s3k15abghx3cccf1ays0601n1438pwqgd5xz8981ngm5"; "abkm09_3_nlo" = "0h268l7j1zkxm2nacari10f86lpha511xhgrg0q9r8hc47sw2vxs"; "abkm09_3_nnlo" = "1gzhvblckskscql53pfxp79qclhhhhm45sqjhc9jrm1bp3x52w8i"; "abkm09_4_nlo" = "0yq3gy0qgnk5dh0hh3ldrf5bqzx5wpkhw509nvz5arlh0bfwhyg4"; @@ -736,6 +917,7 @@ in "abm12lhc_4_nnlo" = "1hciv1z9b5fiz7swv21gr0rshijj9yj2n8x4l54v9g0jyd061jaz"; "abm12lhc_5_nnlo" = "00xxkrhbfkxhg33mkpwwk5nsdp4nmi0zmllx5z5ygxl24rinsq9j"; "cteq6" = "0lp110wldhliad354v29f0rhdzf5qrs1ibklj0cmzp2rcbp8zrix"; + "cteq61" = "14hbc855b3wsjk7ypg86md46cjm1bj7n4hins9nr8kgzs69i6vss"; "cteq66" = "09i69ac3gkrai5jmazjyjvi5sl8k2vm48m90ijn6pl24p31qf68y"; "cteq6l1" = "1b5m7g7wawk72h76l9yr3gx3n67jggna1004lwffvj43gffwkjap"; "nCTEQ15FullNuc_108_54" = "107klcpsr9d4dwavcqqs3849k90mdb3bdjam3pd79cmsy7ncr2hf"; @@ -830,4 +1012,56 @@ in "nCTEQ15np_7_3" = "0ndqi05g88b769p1chfc6maz6wvs33rx45r4k8f68n79yy6kvrh1"; "nCTEQ15np_84_42" = "0v968jw1m9ky1mh82w1bjidvg7r7cx23bnpv0vr4c1kqz0n5hb5s"; "nCTEQ15np_9_4" = "0akxbyrs4y8gmnjiwma8z8ryrzmaw6dj148iq7ihsllwar3hp3p0"; + "nNNPDF10_nlo_as_0118_Ag108" = "1xqhzgvkicxd9wy4lnhqw6brsksxqsq429r6bb0ghn1ll5ln4qzx"; + "nNNPDF10_nlo_as_0118_Al27" = "0z836h7a5abbwq988zdvvf8yhr92krzzmys6lkkgkcffdf2pc0zq"; + "nNNPDF10_nlo_as_0118_Au197" = "1f6vn6n0zz8wml8zn7n2n6wj5y41yanw9b9av51m5kiq4n1r9lrk"; + "nNNPDF10_nlo_as_0118_Be9" = "1jy2cix4gkx648dypdqfj7xi8gdlflh20xlasmwl78av5j7s7rs5"; + "nNNPDF10_nlo_as_0118_C12" = "1c6fvp82cs3464akqf0skrqpcvyp75yqp39zxafzgbqd4wc3pv9f"; + "nNNPDF10_nlo_as_0118_Ca40" = "0r903a01085yhfagnljvjaqfn190r3q0ggvx87kh54xsbv1wkvbl"; + "nNNPDF10_nlo_as_0118_Cu64" = "1vq8a6drcp606fkx8mml2qq37if59cakmcq73y4n7c7swp6q51r3"; + "nNNPDF10_nlo_as_0118_D2" = "07kjzhyh6n6723h2fylgwm7w7ljxz4m6fs9bgwjxp987i00msrra"; + "nNNPDF10_nlo_as_0118_Fe56" = "1smkjmymykhlp0vvlpsp6p6p44pw5aa705sw9lcyxmg8ccy9kmpj"; + "nNNPDF10_nlo_as_0118_He4" = "0mdxsh41m0vzcdq4axvz81m9ra0p6dff88k09gjb4adx9vv52mjc"; + "nNNPDF10_nlo_as_0118_Li6" = "1hrryxhhg9xxg817brrd39k5wz6iq1fv6z8sdabrpxn0nwr1bj7r"; + "nNNPDF10_nlo_as_0118_N1" = "01h7g4w3nc09jyi7g8j5yx2yzqair3ysbx9rx244k1rjx6jppian"; + "nNNPDF10_nlo_as_0118_N14" = "1ny3znivkkl7xhdw8pxkdadwc957236rh60wviiyw4cdqjb6a3iq"; + "nNNPDF10_nlo_as_0118_Pb208" = "066w59xm6lkwrm3glssc6n3qyvv38mx47mkx39p8z9r2spb8igks"; + "nNNPDF10_nlo_as_0118_Sn119" = "1mqx7wj095v0799wxbvfxvb6bl1qh5wdkf14a8gqsj0f5qjnpmyw"; + "nNNPDF10_nlo_as_0118_Xe131" = "0mz9fgxfyx1asi2vxs1xfwn8z51z08naiq1ycl77f4yp6wim6s54"; + "nNNPDF10_nnlo_as_0118_Ag108" = "08vy16fskrvc62y3h0hsikmi6q86njwfm2msmajxbd7vzcv5wkkn"; + "nNNPDF10_nnlo_as_0118_Al27" = "0vm95lawgsncsx10ypy99746sz34y6shblkj9pgn6si2cy8gpcwp"; + "nNNPDF10_nnlo_as_0118_Au197" = "0b3ld033f2hwjaqp5p5pzmmzfid8hl416a1q8fc0zmd2lfiamsac"; + "nNNPDF10_nnlo_as_0118_Be9" = "10skffir8hqfv2wj01ghc14lfs516kmh59q3v48nw3a724kxr93a"; + "nNNPDF10_nnlo_as_0118_C12" = "12rrpcq9bvwcncj1hk28wkym5zzdjkf0d0pdj1nx9asm6vpbjsdv"; + "nNNPDF10_nnlo_as_0118_Ca40" = "0k914fnqsv45f16s6zmdwbnbnhj5lxnrk9pbnnaap4vk7vx7101j"; + "nNNPDF10_nnlo_as_0118_Cu64" = "137n1nsq75g0n4hmbqfl1gihngfrz0rqd2gwj24m5byhbylwlg83"; + "nNNPDF10_nnlo_as_0118_D2" = "0xa17gjjh0mphg1h711vb6p2pjln0lqy7401lamnib2z7p7mss0m"; + "nNNPDF10_nnlo_as_0118_Fe56" = "0h0qwbckdcppqgbhfy3kyy9p4nryh3p45sjmlxhm94mlznipjwrd"; + "nNNPDF10_nnlo_as_0118_He4" = "022h44i8k2ybvm9lkgc4lkcv4z7r0xzlrq2bxyqkfmpp5fpp7gkw"; + "nNNPDF10_nnlo_as_0118_Li6" = "11bci8mnv57a583ayrpvvnz4lsxz43z23iqgqjc3b3rychgiz57a"; + "nNNPDF10_nnlo_as_0118_N1" = "174gscxa2acqpgf2mks5xpim1jcpb0vg76pggxazm376vyyjk883"; + "nNNPDF10_nnlo_as_0118_N14" = "1g2gwnbfzlfa094px1rnjgk8py8qzwq7bi68n7p49bqjj88km3av"; + "nNNPDF10_nnlo_as_0118_Pb208" = "0bdi3z36ckf788v3ld3ngvchyxzsxcfl9fj7rzs2lwkg80rclgd9"; + "nNNPDF10_nnlo_as_0118_Sn119" = "0k7lnr1ils38sqybipmf13n582wb0cf9rr288ibrbmx15rkk5c3w"; + "nNNPDF10_nnlo_as_0118_Xe131" = "17k1afk6j53nl83ixyy6nyds3wy5agacdyn62bwp7ykfs8x97s4n"; + "nNNPDF20_nlo_as_0118_Ag108" = "1fb2h6752vn0v66h12dhhk2izxjs4b10mdqx17djrvpkzl97hf8d"; + "nNNPDF20_nlo_as_0118_Al27" = "1lfkg84hf0chgk0qzp45ch23pzjixkzxxh3x7xphcmnpri4cgl3r"; + "nNNPDF20_nlo_as_0118_Au197" = "08ll61b96iggm1qnr9q2qdzyxasxn9mlshnxz7kzigfsnqqnkfbw"; + "nNNPDF20_nlo_as_0118_Be9" = "1g4vlr9p6i6n87bx6w2i5d4qkhymldkyxj1i2qnl8v467vhsz6la"; + "nNNPDF20_nlo_as_0118_C12" = "15366p04rh31nnd6zxcmcs9ki5fwzn8d8cvzms45apnw928k6pqn"; + "nNNPDF20_nlo_as_0118_Ca40" = "1abxkr4r5psi6n8rrsbf97gwwkh1dg9jqfd46hn2725r22c6k8l4"; + "nNNPDF20_nlo_as_0118_Cu64" = "1nkkiwx22b649pmyfykn2ggdq99y985mnkv3fnkm8i43scwbswvb"; + "nNNPDF20_nlo_as_0118_D2" = "0gvf9qqgr4ixm9cf2654xyvkc624k5ijqwdds61frljlhd49yqm1"; + "nNNPDF20_nlo_as_0118_Fe56" = "1ci132hc8mpsj0zjr9fichnkapagjs6q9pqli0yzgnnv6l2aih3a"; + "nNNPDF20_nlo_as_0118_He4" = "1phq7m6lbx87s4whs2xygigq7fz1qhzj3nd9anx5r67w7q99rcad"; + "nNNPDF20_nlo_as_0118_Li6" = "0pwdqrmivpm0j7hrg6h2qqshpna2vjlslxnz0sd100kc3lfq7xab"; + "nNNPDF20_nlo_as_0118_N1" = "09y7pd3nnys49w25gb4524x5xkahillvaypjgncbn8n5x1a11nsr"; + "nNNPDF20_nlo_as_0118_N14" = "0nb3kcmhbyncp9frs27ww550mjl3f7yiahyyrm3aik93ycpm16n7"; + "nNNPDF20_nlo_as_0118_O16" = "12kfhldvg8gqxjaian14dng6qqc6nikydwcj5jz2i2d1da3dyhgg"; + "nNNPDF20_nlo_as_0118_Pb208" = "1rwb7vca0y1aj38mz8m3wg07q9hq66qd5j3y6hs9bh0jz6hkifzh"; + "nNNPDF20_nlo_as_0118_Sn119" = "1dan86ckd5padipp4x12x8msfg5p97b8hwxm78gfyf88kq725m6z"; + "nNNPDF20_nlo_as_0118_W184" = "1g0br4gdrb2vzwmqhgj5778a6vl0lykc4ymylibxlqbqrhf8j89b"; + "nNNPDF20_nlo_as_0118_Xe131" = "1a62qi3qy5kli9q80p2w80mj5v3ps2g6p40zxlgm65q5mphkx1qi"; + "xFitterPI_NLO_EIG" = "1v6mfhmcrmdvica0wlc2ilfca1srxc7vjyli113wjvpd7wfpnvj5"; + "xFitterPI_NLO_VAR" = "09mlsww89hhm2s96rlkqbkfwwf9qkblw7n3nnrgas6l1kn2hxq1i"; } From faf316fd5a1642e5eae70d500f06384a28bfdd6c Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sun, 14 Mar 2021 18:20:34 +0100 Subject: [PATCH 07/56] imagemagick: 7.0.10-61 -> 7.0.11-3 (cherry picked from commit 7d7ccbd1de42a0ffbd0db57496a8157e8823e309) --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 607d1fc51dfb..52d83f6b5a7a 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.10-61"; - sha256 = "sha256-c/90N5H9iz5JYmn7/ynHgSOAmO5NTtkxajChZvjfMP8="; + version = "7.0.11-3"; + sha256 = "sha256-y937OxAHNTbWa96oQmTpp/ivxtPVL16hr4SvzZWugQo="; patches = []; }; in From 9c34c8620db2bcaf591d562b1d784f610c248de8 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sun, 14 Mar 2021 18:21:12 +0100 Subject: [PATCH 08/56] imagemagick: add erictapen as maintainer (cherry picked from commit e22e25f5aa4a0209cc09428ee1299da46c5fbcca) --- pkgs/applications/graphics/ImageMagick/7.0.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 52d83f6b5a7a..c9891e1d74c4 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation { homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ erictapen ]; license = licenses.asl20; }; } From 52abed1c7ce95bd02a53ca4dd06d34ab5e826f84 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 12 Mar 2021 05:01:58 +0000 Subject: [PATCH 09/56] wireshark: 3.4.3 -> 3.4.4 https://www.wireshark.org/docs/relnotes/wireshark-3.4.4.html (cherry picked from commit ce6f2a2d1211eb95d84384aa5a612ff03fc077c7) --- .../networking/sniffers/wireshark/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index f0d12f3fb9af..ce7aa53f5edb 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares +{ stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib -, libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper +, libssh, nghttp2, zlib, cmake, makeWrapper , withQt ? true, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.4.3"; + version = "3.4.4"; variant = if withQt then "qt" else "cli"; pcap = libpcap.override { withBluez = stdenv.isLinux; }; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0ar6pxzrcpxdriz437d6ziwlhb8k5wlvrkalp3hgqwzwy1vwqrzl"; + sha256 = "0aad3m8nh4i75dgjs68217135bzqmhmlgjklmpjh1ihmjwgd373j"; }; cmakeFlags = [ @@ -34,13 +34,11 @@ in stdenv.mkDerivation { # Avoid referencing -dev paths because of debug assertions. NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; - nativeBuildInputs = [ - bison cmake flex pkgconfig - ] ++ optional withQt qt5.wrapQtAppsHook; + nativeBuildInputs = [ bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook; buildInputs = [ - gettext pcre perl pcap lua5 libssh nghttp2 openssl libgcrypt - libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper + gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt + libgpgerror gnutls geoip c-ares python3 glib zlib ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] @@ -99,7 +97,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://www.wireshark.org/"; description = "Powerful network protocol analyzer"; - license = licenses.gpl2; + license = licenses.gpl2Plus; longDescription = '' Wireshark (formerly known as "Ethereal") is a powerful network From 7b21af75eb5add6e14f7d8f96416e7a216021b99 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 6 Mar 2021 19:58:04 +0100 Subject: [PATCH 10/56] smarty3: 3.1.36 -> 3.1.39 Fixes CVE-2021-26119 and CVE-2021-26120. https://github.com/smarty-php/smarty/blob/v3.1.39/CHANGELOG.md (cherry picked from commit 9c512f7a7651f55b3081418d138deef246a90ee7) --- pkgs/development/libraries/smarty3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix index d5708cb6b1e8..23804e82b2e0 100644 --- a/pkgs/development/libraries/smarty3/default.nix +++ b/pkgs/development/libraries/smarty3/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { pname = "smarty3"; - version = "3.1.36"; + version = "3.1.39"; src = fetchFromGitHub { owner = "smarty-php"; repo = "smarty"; rev = "v${version}"; - sha256 = "0jljzw1xl2kjwf9cylp1ddnjhz7wbm499s03r479891max1m2mlf"; + sha256 = "0n5hmnw66gxqikp6frgfd9ywsvr2azyg5nl7ix89digqlzcljkbg"; }; installPhase = '' From d5684ec0cd5da8205ee03c96f0146e19c0636f78 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 6 Mar 2021 19:48:03 +0100 Subject: [PATCH 11/56] botan2: 2.17.2 -> 2.17.3 Fixes CVE-2021-24115. (cherry picked from commit 9a18802edfb9db4d826ec967d7301c6c7460dad9) --- pkgs/development/libraries/botan/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix index 2346153e2a15..cb40e535b0c3 100644 --- a/pkgs/development/libraries/botan/2.0.nix +++ b/pkgs/development/libraries/botan/2.0.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix (args // { baseVersion = "2.17"; - revision = "2"; - sha256 = "0v0yiq0qxcrsn5b34j6bz8i6pds8dih2ds90ylmy1msm5gz7vqpb"; + revision = "3"; + sha256 = "121vn1aryk36cpks70kk4c4cfic5g0qs82bf92xap9258ijkn4kr"; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; From 6557a3c1fe8ed87cc97c7c95668324847043dbdc Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sat, 6 Mar 2021 16:51:58 -0800 Subject: [PATCH 12/56] nomachine-client: 7.0.211 -> 7.2.3 (cherry picked from commit b3c90695a9a23b893f22903c5b9c22f5ba9af3a8) --- pkgs/tools/admin/nomachine-client/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index b6bc44dae3e8..8905571f66ca 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,10 +1,10 @@ { stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "7.0"; - versionMinor = "211"; - versionBuild_x86_64 = "4"; - versionBuild_i686 = "4"; + versionMajor = "7.2"; + versionMinor = "3"; + versionBuild_x86_64 = "8"; + versionBuild_i686 = "8"; in stdenv.mkDerivation rec { pname = "nomachine-client"; @@ -14,12 +14,12 @@ in if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; - sha256 = "06habqsl5gp13sym519r3qp188qwqqfw8p48wcs4zj3kcri6fjz0"; + sha256 = "1x60vmngq4927qvy6ljmyvwlz5lapilld3495w3y3jdllwd3dxp4"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; - sha256 = "1y4lr95mwilwr7gqsxqvygq4w3dcp4cjh8m06wdi3avwdzrjkgj9"; + sha256 = "0dx921g6w3gk0x4p771qqxbbi16vl11hmdzzwhfczrq90pgzrhks"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; From 172040d1281b1e813cc1cdfb5a8152101bd3341f Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 10 Feb 2021 07:10:40 +0000 Subject: [PATCH 13/56] electron_9: 9.4.1 -> 9.4.3 https://github.com/electron/electron/releases/tag/v9.4.2 https://github.com/electron/electron/releases/tag/v9.4.3 (cherry picked from commit 389a07a250aae9d791275ae797eeef8b1d5dfb7f) --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 8b5a98d987f7..ba2e7b9dfaea 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -70,13 +70,13 @@ rec { aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5"; }; - electron_9 = mkElectron "9.4.1" { - x86_64-linux = "36c6c33e2702f591c34a7e6ebd7d0828d554a4ce2eafb319a0cd16ffd4cc4b28"; - x86_64-darwin = "3e2f87d899be684eab226c572c566e89c05114059c9add1a33d2be63100b18fd"; - i686-linux = "be5f8d18f11ad7c0655faec4040a8af6239f29f1155210024a01826a30b0dbbe"; - armv7l-linux = "b710a0e3b80ef265760d49c9210f78a6410007521b0ed73c8b868b05d22a0a60"; - aarch64-linux = "e2fc73309780fc0e9b5abebcb8256b2bc389672f0bcc261269da5891a3df66dc"; - headers = "0sabqcjd6gcc6khyhiz3rk30p1y4bxsajy4rs9866bqyafq86j6q"; + electron_9 = mkElectron "9.4.3" { + x86_64-linux = "7744ec8af6512e569d600d7fd8e9105d3ca5ac7b6f54390dd553edbd7816289f"; + x86_64-darwin = "68c67a32f149618d629eb4a8a8044b98dc6ceedc16d46ff20782fcccad72fc44"; + i686-linux = "904955ee8365b95439fb4643844ac868b59525ed230a76c8e0395c0aa5719813"; + armv7l-linux = "5cfb3ae97a75d33d4b102d75944610dd56a566ee98186a030eb5bdbbd3d76323"; + aarch64-linux = "8afa647e4b5b1e290d5d852c7420e82916ba740e3e5576599076dc139cd1d556"; + headers = "0712160j1yvl9fmj2vm9lznkwnmji1hjzyicb4vis52lbrwx820l"; }; electron_10 = mkElectron "10.3.0" { From b93f2e85b5d2ca0b6715b63f14b28a7fbd570385 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 10 Feb 2021 07:08:06 +0000 Subject: [PATCH 14/56] electron_10: 10.3.0 -> 10.3.2 https://github.com/electron/electron/releases/tag/v10.3.1 https://github.com/electron/electron/releases/tag/v10.3.2 (cherry picked from commit 60bbbec01c3ece5ce7b9a10eeda5ef7ce64376d0) --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index ba2e7b9dfaea..7bb30379b9c0 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -79,13 +79,13 @@ rec { headers = "0712160j1yvl9fmj2vm9lznkwnmji1hjzyicb4vis52lbrwx820l"; }; - electron_10 = mkElectron "10.3.0" { - x86_64-linux = "1a4afb659400c7acca0734df1b981b867e5dfdd15d4d3b73fd276d87b682f089"; - x86_64-darwin = "9c5cca484b28dc5cca89a7f1c77e65b3a04251f4eee740265c358efae351cb94"; - i686-linux = "fcb298bca0ab229e92b92c418d3e352885ff4291f735a35c7822b3ca17ae8a86"; - armv7l-linux = "48accf0fbef1f2d1a81e12c2e66b9280f871029b16947d0bebe036cf1fb71b1c"; - aarch64-linux = "2c99b4ec87ba657c33efb3a7e907e3f3e315e87347954231cb8bae393c1c96fd"; - headers = "1k97pfzxqrgw4y76js2chq13avgp9czin9q9mlh1zdf13bih96hj"; + electron_10 = mkElectron "10.3.2" { + x86_64-linux = "e28748c813ddc69c611a47961d68ae2dc3761f547c509d9ce2c56c2c6eadc9a2"; + x86_64-darwin = "3120ae3eab94d9102003f6fa2dc833a0629295c7ec0e154b35f61116d55a4954"; + i686-linux = "13f42ad6ea0fa41553b8f50323d0baaa29272220a2e81ca5293ad4439cda1d79"; + armv7l-linux = "0e571f63697b8985782175af07bdd7069886195d9ccd7fc5c04578b4144ea922"; + aarch64-linux = "173551fa6cd3ca1fb52fab3bd3e7f0ffd3e4758e78a5174e6d636a45a282ab8f"; + headers = "00x71b18prc55pv3sykbzpmkxf8yjzf2cdnlqif993jab8fbwmqn"; }; electron_11 = mkElectron "11.2.1" { From f9f142fc0a33f1ceca4067ffab59f30f486950d1 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 10 Feb 2021 07:07:16 +0000 Subject: [PATCH 15/56] electron_11: 11.2.1 -> 11.2.3 https://github.com/electron/electron/releases/tag/v11.2.2 https://github.com/electron/electron/releases/tag/v11.2.3 (cherry picked from commit 7518755a8842568264b1489c3e03959158137009) --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 7bb30379b9c0..7a3bdcb070ee 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -88,12 +88,12 @@ rec { headers = "00x71b18prc55pv3sykbzpmkxf8yjzf2cdnlqif993jab8fbwmqn"; }; - electron_11 = mkElectron "11.2.1" { - x86_64-linux = "607d9d58c9a3b5c36461acc6bbe473bc604eee42a55c2c617ac46d095cf98abb"; - x86_64-darwin = "39d95668a3ea04bdc652ff9e2889c7a88f638534420e8e256679cbf4b7658a65"; - i686-linux = "59f226133d01fb6acf86fe98907964f79dcf2902054e5c4c9c4ff84a3ea88f4a"; - armv7l-linux = "85051d8eacf04aeec3dd74e46e7888d01bd4e6caf7ec2001122a1f3e11db44ee"; - aarch64-linux = "8aa9be5d6c139386390bad64f78b95756206a40fe4982fc9f199b67a7d06bec5"; - headers = "12sy8zzb0z654b85c5l1j8762nhwmkim1pbz1y3qzgbzvpbd5arq"; + electron_11 = mkElectron "11.2.3" { + x86_64-linux = "9249901fd7b85a7f952abe0df2ce83a566df612ef3ee15cce488cb1d751bc94d"; + x86_64-darwin = "e0b2784b25fd4a5ee4041d508d59bbb8386039c7ea7e9cea3e547c672f052b60"; + i686-linux = "78b2dd2d7b5e891e695cd31c28ac5fa1e99967ff538b944aa9d1ec224e82a964"; + armv7l-linux = "06178cd44792c7dceb72286460948cb7f575acba4e46cf72c154f243e93eaf65"; + aarch64-linux = "e23f2572a6a66779aff5d7cf25149fd343b0eef420fbfa3e8c3742284ce6e613"; + headers = "1yjc7zl7l5n3l2s2x3lbic2lc527alcd4mnwih7pjl5dhvdgmbm9"; }; } From bcc972d5085067b7b1093ffcd38503cf56582975 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 25 Feb 2021 05:50:50 +0000 Subject: [PATCH 16/56] electron_11: 11.2.3 -> 11.3.0 https://github.com/electron/electron/releases/tag/v11.3.0 (cherry picked from commit dace81466f833452d7c8cc5b3797c3e9db2ab0a8) --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 7a3bdcb070ee..274d81c7633c 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -88,12 +88,12 @@ rec { headers = "00x71b18prc55pv3sykbzpmkxf8yjzf2cdnlqif993jab8fbwmqn"; }; - electron_11 = mkElectron "11.2.3" { - x86_64-linux = "9249901fd7b85a7f952abe0df2ce83a566df612ef3ee15cce488cb1d751bc94d"; - x86_64-darwin = "e0b2784b25fd4a5ee4041d508d59bbb8386039c7ea7e9cea3e547c672f052b60"; - i686-linux = "78b2dd2d7b5e891e695cd31c28ac5fa1e99967ff538b944aa9d1ec224e82a964"; - armv7l-linux = "06178cd44792c7dceb72286460948cb7f575acba4e46cf72c154f243e93eaf65"; - aarch64-linux = "e23f2572a6a66779aff5d7cf25149fd343b0eef420fbfa3e8c3742284ce6e613"; - headers = "1yjc7zl7l5n3l2s2x3lbic2lc527alcd4mnwih7pjl5dhvdgmbm9"; + electron_11 = mkElectron "11.3.0" { + x86_64-linux = "136794f9ecc1c6ea38fe9b85682e8fcc8c4afd559f5cd6b4059339b017279917"; + x86_64-darwin = "7569db1d2e470b0db512735f27f99498f631da3cd86374345139f18df88789fe"; + i686-linux = "48ab133cab380c564529ea605d4521404b9bd07d80dad6346e1756a0952081cd"; + armv7l-linux = "5774c2995c6dcf911ece00a94ace0f37d55132da91b1fd242c69e047872ef137"; + aarch64-linux = "fad31c6fba7aba54db19a2aaedb03b514c51dd58bf301afab5265126833feb15"; + headers = "123g3dgsb4vp8w1bm4apbp973ppzx4i4y35lhhmqjbp51jhrm9f0"; }; } From 2f0d0014b82c28c1a3ba238026092fb9e3fdb0a1 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 25 Feb 2021 05:52:44 +0000 Subject: [PATCH 17/56] electron_10: 10.3.2 -> 10.4.0 https://github.com/electron/electron/releases/tag/v10.4.0 (cherry picked from commit ee819cab23fea5090b74429efb3e44457639cd5b) --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 274d81c7633c..46064fbc69ff 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -79,13 +79,13 @@ rec { headers = "0712160j1yvl9fmj2vm9lznkwnmji1hjzyicb4vis52lbrwx820l"; }; - electron_10 = mkElectron "10.3.2" { - x86_64-linux = "e28748c813ddc69c611a47961d68ae2dc3761f547c509d9ce2c56c2c6eadc9a2"; - x86_64-darwin = "3120ae3eab94d9102003f6fa2dc833a0629295c7ec0e154b35f61116d55a4954"; - i686-linux = "13f42ad6ea0fa41553b8f50323d0baaa29272220a2e81ca5293ad4439cda1d79"; - armv7l-linux = "0e571f63697b8985782175af07bdd7069886195d9ccd7fc5c04578b4144ea922"; - aarch64-linux = "173551fa6cd3ca1fb52fab3bd3e7f0ffd3e4758e78a5174e6d636a45a282ab8f"; - headers = "00x71b18prc55pv3sykbzpmkxf8yjzf2cdnlqif993jab8fbwmqn"; + electron_10 = mkElectron "10.4.0" { + x86_64-linux = "6246481577bc0bfa719e0efb3144e8d7ca53e3f20defce7b5e1be4d9feb0becb"; + x86_64-darwin = "bc9e201643db3dae803db934fa4e180d13b707de6be1c3348ca5ed2c21d30bf4"; + i686-linux = "aa6a9042097b964230b519c158e369a249a668cc6c7654b30ddd02ced4bad9d1"; + armv7l-linux = "7e99a9c6aeedd7cc0b25260ac4630730629f363a09b72bd024b42837ab9777bd"; + aarch64-linux = "ef671fe3cbb7c84e277d885ed157552602bc88d326dc95b322953c6b193f59a1"; + headers = "1vsvna2zr7qxnk2qsdjzgkv5v2svrllbsjj08qrilly7nbksk9fg"; }; electron_11 = mkElectron "11.3.0" { From 4d797d370911e67b4f2b4264979a635d6e233ee3 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 4 Mar 2021 19:48:12 +0000 Subject: [PATCH 18/56] electron_9: 9.4.3 -> 9.4.4 https://github.com/electron/electron/releases/tag/v9.4.4 (cherry picked from commit 03f27fd63bcb16e5d01e6a574c57dac434a571bf) --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 46064fbc69ff..dcaf165cc4fa 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -70,13 +70,13 @@ rec { aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5"; }; - electron_9 = mkElectron "9.4.3" { - x86_64-linux = "7744ec8af6512e569d600d7fd8e9105d3ca5ac7b6f54390dd553edbd7816289f"; - x86_64-darwin = "68c67a32f149618d629eb4a8a8044b98dc6ceedc16d46ff20782fcccad72fc44"; - i686-linux = "904955ee8365b95439fb4643844ac868b59525ed230a76c8e0395c0aa5719813"; - armv7l-linux = "5cfb3ae97a75d33d4b102d75944610dd56a566ee98186a030eb5bdbbd3d76323"; - aarch64-linux = "8afa647e4b5b1e290d5d852c7420e82916ba740e3e5576599076dc139cd1d556"; - headers = "0712160j1yvl9fmj2vm9lznkwnmji1hjzyicb4vis52lbrwx820l"; + electron_9 = mkElectron "9.4.4" { + x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; + x86_64-darwin = "f41c0bf874ddbba00c3d6989d07f74155a236e2d5a3eaf3d1d19ef8d3eb2256c"; + i686-linux = "40e37f8f908a81c9fac1073fe22309cd6df2d68e685f83274c6d2f0959004187"; + armv7l-linux = "2dfe3e21d30526688cc3d3215d06dfddca597a2cb62ff0c9d0d5f33d3e464a33"; + aarch64-linux = "f1145e9a1feb5f2955e5f5565962423ac3c52ffe45ccc3b96c6ca485fa35bf27"; + headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885"; }; electron_10 = mkElectron "10.4.0" { From 5bb5d61154bb9de283c7b94254d17b2ded1088be Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Thu, 18 Feb 2021 09:51:21 +0100 Subject: [PATCH 19/56] libetpan: Fix CVE-2020-15953 This commit patches the vulnerable libetpan release 1.9.4 with its upstream patches against the CVE-2020-15953. Merging this will close #113463. (cherry picked from commit 2b344e02ad2cdb4696c3c56d01f4638b08e9fe97) --- .../libraries/libetpan/default.nix | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix index 9050320773af..57021e63899a 100644 --- a/pkgs/development/libraries/libetpan/default.nix +++ b/pkgs/development/libraries/libetpan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , autoconf , automake , libtool @@ -18,6 +18,28 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool autoconf automake ]; + patches = [ + # The following two patches are fixing CVE-2020-15953, as reported in the + # issue tracker: https://github.com/dinhvh/libetpan/issues/386 + # They might be removed for the next version bump. + + # CVE-2020-15953: Detect extra data after STARTTLS response and exit + # https://github.com/dinhvh/libetpan/pull/387 + (fetchpatch { + name = "cve-2020-15953-imap.patch"; + url = "https://github.com/dinhvh/libetpan/commit/1002a0121a8f5a9aee25357769807f2c519fa50b.patch"; + sha256 = "1h9ds2z4jii40a0i3z6hsnzx1ldmd2jqidsxp2y2ksyp1ijcgabn"; + }) + + # CVE-2020-15953: Detect extra data after STARTTLS responses in SMTP and POP3 and exit + # https://github.com/dinhvh/libetpan/pull/388 + (fetchpatch { + name = "cve-2020-15953-pop3-smtp.patch"; + url = "https://github.com/dinhvh/libetpan/commit/298460a2adaabd2f28f417a0f106cb3b68d27df9.patch"; + sha256 = "0lq829djar7nb3fai3vdzirmks3w2lfagzqc809lx2lln6y213a0"; + }) + ]; + buildInputs = [ openssl ]; configureScript = "./autogen.sh"; From 1cbb784b829481d1c1b03496488ba2e77e39f4d6 Mon Sep 17 00:00:00 2001 From: Max Hausch Date: Mon, 26 Oct 2020 23:18:17 +0100 Subject: [PATCH 20/56] ndpi: 2.8 -> 3.4 (cherry picked from commit 00527506a5c0b2aea18e113980c68fd0a34ae21c) --- pkgs/development/libraries/ndpi/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index c10b396fe0b1..43da97c2edd8 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap }: +{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap +, pkg-config }: -let version = "2.8"; in +let version = "3.4"; in stdenv.mkDerivation { pname = "ndpi"; @@ -10,13 +11,16 @@ stdenv.mkDerivation { owner = "ntop"; repo = "nDPI"; rev = version; - sha256 = "0lc4vga89pm954vf92g9fa6xwsjkb13jd6wrcc35zy5j04nf9rzf"; + sha256 = "0xjh9gv0mq0213bjfs5ahrh6m7l7g99jjg8104c0pw54hz0p5pq1"; }; configureScript = "./autogen.sh"; nativeBuildInputs = [which autoconf automake libtool]; - buildInputs = [libpcap]; + buildInputs = [ + libpcap + pkg-config + ]; meta = with stdenv.lib; { description = "A library for deep-packet inspection"; From 12d9950bf47e0ac20d4d04e189448ee075242117 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 15 Mar 2021 18:04:00 +0000 Subject: [PATCH 21/56] element: 1.7.22 -> 1.7.23 https://github.com/vector-im/element-web/releases/tag/v1.7.23 (cherry picked from commit 56da9300a3962bcabaf791a91b3536f0606a9d0c) --- .../instant-messengers/element/element-desktop-package.json | 2 +- .../networking/instant-messengers/element/element-desktop.nix | 4 ++-- .../networking/instant-messengers/element/element-web.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index caf80c2460fe..19c499b3199d 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.22", + "version": "1.7.23", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index ad358833077c..d2bc35102413 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.22"; + version = "1.7.23"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "152ggkkk997pg3xdcdzn3samv3vsb6qifgkyl82bnwchy8y3611d"; + sha256 = "0vvjbh81h6sg6dbm9d6ffav0dim9sadvs67jcm702677qgigkc53"; }; electron = electron_9; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index f734f0f8bf18..8b60136d419f 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.22"; + version = "1.7.23"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "1aaa986h38kkrnyhb1y65d73idsxmkmi201511az9zlz9210ih59"; + sha256 = "10n899gc3qcjy2cskk0whwz60pnvh500x1b57kn22l9bhkg9xkvp"; }; installPhase = '' From 01897afb96063f5e2d6ee6f76ff843c413e7b271 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 18 Mar 2021 18:56:39 +1000 Subject: [PATCH 22/56] youtube-dl: 2021.03.03 -> 2021.03.14 https://github.com/ytdl-org/youtube-dl/releases/tag/2021.03.14 (cherry picked from commit f7393191e740d7ab695c5ffeac4766b7dc66cfee) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index c2c78d7f4b06..24864cb1095b 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.03.03"; + version = "2021.03.14"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "11z2v8mdii0bl13850mc6hgz80d0kgzb4hdxyikc3wa4jqfwrq7f"; + sha256 = "1bh74f9q6dv17ah5x8zcxw03dq6jbh959xd39kw374cf9ifrgnd3"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 61b5ab68c4994dcf7f52892ab06f924e3c37a4d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 17 Mar 2021 06:33:33 +0100 Subject: [PATCH 23/56] Merge #116040: firefox-bin: 86.0 -> 86.0.1 (cherry picked from commit e3597057e72fe32f2438b9d64b38c22fa54071a5) I re-tested it a bit on 20.09; I think it should be fine. --- .../browsers/firefox-bin/release_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 07a2caca85d6..5a71b9d7071e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "86.0"; + version = "86.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ach/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ach/firefox-86.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "96cf6afb631f36dd18f0d109bfc31abbff5960e7972b59e4fa51ac0c2c81f9ed"; + sha256 = "b9006b2c0251ae2264a60be3763dcf9610f3a8569f2a05f266e59c8232400e8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/af/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/af/firefox-86.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "38d4588b8498917717ea58419a35751c6c3ae987372ee6a37590a7630eb68c35"; + sha256 = "7f4268d613acee2e003fe8042dc2e969bd0f6f14b906b35ce6b8c727fbb13d76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/an/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/an/firefox-86.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "942c9cf4dc6f5baa6c5225a15a2856bd72c7366bcb6224b8ba5a1428cfd974f6"; + sha256 = "8a892626b4f34413423f4da61d7e0099e215bc9e597092bbd625445e27998d17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ar/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ar/firefox-86.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a616e3dfac2bcae832bc6538692a9d811604aadb71079641f77f9b3db105fabd"; + sha256 = "c837e97ca8b46de448fbc9fd2120ffbb735474ade8a6f64f7ded8dbdfc4c7406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ast/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ast/firefox-86.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0e026de4affddbdf9e5915818c02acb018b214cd005c5122593e86e821919016"; + sha256 = "8c3b990b899d70c46827ac5a7f32faf9cf44bfba195283bf47d277ccc8da8cbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/az/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/az/firefox-86.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "761e129a070f017b28ce51c1f96fa95be8d98e687b44e9e97d95d18db85ad9aa"; + sha256 = "8fa2a9e6cb6c70fd92b43e2ae145956337f87dd21b468ac375a90a7d18551bce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/be/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/be/firefox-86.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "9e80115c8a78ab5ff3eec38e31c1ec29decba3660ebc95cb909aedf3db4390ab"; + sha256 = "dddbf1e9eb8ecc928b534ef5fd77cb52edd0c67f68a522bbc377d5943cfaaa90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bg/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/bg/firefox-86.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "b5149b21a8ae9b08ee3abfa2fdb894582e620464af36037c43c2cd0b6667c174"; + sha256 = "c4eac8234b58f40b40ec5be3fc37817f768d35804f2f923b9d0effa5cf906782"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bn/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/bn/firefox-86.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "0b5ed8e2859e54ce7d64ac8b0626c69229209cfadf14e8d55225272f702a6f8f"; + sha256 = "41efed647c468ad3da21090e11a4bb861d26106471e0543c3709016d1ca2bd06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/br/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/br/firefox-86.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "7fb1cdb85510bb8e41f2ce5e856a0ef93c83c430bbe64079a2e3c362bd557ab0"; + sha256 = "53076688c25034f02b3c30455fbdbea0287bfdd8d5100c0f5edb77ad32955f36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/bs/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/bs/firefox-86.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "2259ddd7f35d5a8d8830a429f0dec92da5ee101d5c42ff5d9f8ff003f76e5b8a"; + sha256 = "304d9fa41a95f6abf61c16f765ec4651a159af0cabb09b1ce76f805d27746dc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ca-valencia/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ca-valencia/firefox-86.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "5214a48525eabc0ae4cda08e70ceba59b0e9fd51976d578f512b02fefbf48b8c"; + sha256 = "e845d6cbff2cd88b9e1f7526e8aa9eac4aa53c116301ba861e1beb04f9deb4e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ca/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ca/firefox-86.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "250f4bf5659a04dfb20a651899a92bccd9d24c2e9d3186bb17acc4f452b0b648"; + sha256 = "5159eb68a571fb035c4621cbeae9d7a88d40172876a00b3ab6512a8701f43f59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cak/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/cak/firefox-86.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "959c3cf7aace0b80adc6ae2bedc578b74de66adf261de7b67654e0c57e6ee2f5"; + sha256 = "efab62e54fa41a65d5989078ee594dc2c2e8c355bd656828321cc342cc167def"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cs/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/cs/firefox-86.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "aaed7891e891ba8926ed5904a798e6201cbc355ba11c341546f779e0f2815abc"; + sha256 = "1cc3e58c1c2790bd13346b752b2209bc8db08a9470960e06857913a70a7826dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/cy/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/cy/firefox-86.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "064c2419e8fd43e350e055d7bcd4ae1689c4f7667b51996be9037bc4d1c529a3"; + sha256 = "230d79e979cdc350164fe37ea4ba84183db935ba973efab1ab14b56f0a12344f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/da/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/da/firefox-86.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "484f1bdd24689a7a7dd7a8b4556b2f32aeb50509aa3f9d645e151dbfaab9e71b"; + sha256 = "04d50be5260cafde33729aca15cd9731f6fb1550da2db86719e6d672639607fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/de/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/de/firefox-86.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "12670011be25e5420a5721e23d1e37592e4d1ca9a2efac85db02545398454e65"; + sha256 = "a4b5c447cb34b91ac5053153e73520d9f5fc8b06a390f5694cda6bc2131efe12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/dsb/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/dsb/firefox-86.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2851664d7d9dd90f8e444e13b5c9f20bd6271b6e77ae857db1e3aa55429b8b83"; + sha256 = "eea691c668126056cb1e4137cf4f6e8d40fe46f79a00c73ccd59723cfb63e404"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/el/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/el/firefox-86.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ec24c6634f20da95f820623c32d92f492f2b939280a49e327a1f465b0046632f"; + sha256 = "d6774ba0cdc0e89091cb57bc1669927f58ed9811617cfbd358567e2a85f977d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-CA/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/en-CA/firefox-86.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "6c5a19ac4ac5f174569483ee5c1f053e692efc189edfca7e78f9428f05454338"; + sha256 = "8cb49ea8e3db760de1f3d97f1583f4219c3039d09632f5ef186311145aa2c3c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-GB/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/en-GB/firefox-86.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "919d6e6c731d53ade97bbb330cd2e425f70565c330233a86ffe9295ff3692001"; + sha256 = "2ee2ead0c7765e9e5744dff5d7bdfe2ac890cb6859362426bf8244e393f1bb5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/en-US/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/en-US/firefox-86.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "c643dd519fe8b0b6d2d2241b5c241aa1b43ece397f49268865b4d1888c19173e"; + sha256 = "d419da5168312f5d023481668fb4767a27799f02248b4ea90fef98a54ab73b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/eo/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/eo/firefox-86.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "d20b007ba86bdfdd7aa4bdaae08b283107a4464d88a4a9fc34bd4c95781f48d3"; + sha256 = "0b73a3695f0291c3afdc1635976e6129f94d72d9a9a422ebd3a0cfbbb9343697"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-AR/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-AR/firefox-86.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3d4ed05801d31a92c072384e660d7b874be835edd3b6b37741b71bec32a0fa6f"; + sha256 = "4fe2c2428ce205054d16ee33f432dd865e4d919b63f7c2f0a458bd5b80c9c0b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-CL/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-CL/firefox-86.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "8ec51d79baefe2808024c33105fd4c1a8e4f5061b72530a4c01bc8a23d6b6cd5"; + sha256 = "f5d1850c5c10051b04a445001a2991e52a3c1b93002b3534030e85ee0a3c6b5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-ES/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-ES/firefox-86.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "38781952508f86d9b4aa7a0c4fae927494e207970e54ba1070943008283c2e23"; + sha256 = "b99f0532bdc3ab04c421442cf0ea4c24db19a87104ad7d2eff51acb0a383b154"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/es-MX/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-MX/firefox-86.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "29817ccf3aad1e38f195f18ab628bca8f9bc4dcd931919cdd9d5d22c6461ce87"; + sha256 = "56bc322d4c7c160fe1bf095039b5b6e31fcfa234bd5d66ba0995f22af49f5bae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/et/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/et/firefox-86.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d4ddde9103e9355a91186e0343315f99bf0eb53b2502abb80b8fcb1056ea82e2"; + sha256 = "962dcd00ed62c5ca6ef86ede3e965e699f403435de9ce933457dac940141c293"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/eu/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/eu/firefox-86.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "85744b3d7e3bcd5de92ca4ec5a0ade8421689dda5a3c53e361656f3de3178a91"; + sha256 = "2ba0643490d449ad39b07e98713f8693ecc16b368cc459a9ea89a35a1ed74978"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fa/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fa/firefox-86.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "60e6ebb40f1e11a61ad63d2543acd7d83cef58c0fd4dc22f1c553749a36e3fb8"; + sha256 = "11566ef20d466b2930841f4fce2f92960ceeb1771b82449c274f6a4fcfb85e0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ff/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ff/firefox-86.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "878d7155fe73ff6585e8566399416361a39080cb54afd61448e1bd0e191046a0"; + sha256 = "110cbb0d3662bbc73273535abd2846091bb16dda3c221a60a2f7023ef756f764"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fi/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fi/firefox-86.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d02f24944f5bbd57273e05aa4fe701b375ad8d8905d0070ec9396a55d104203d"; + sha256 = "decb87ed765911a9564e15dd97fc7e35164b0af1ab84167dcd598689c8972d30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fr/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fr/firefox-86.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ac6497f8a4bfa4e37798840bf4dc9b84463bf095074d2ba3c931e89a402a3fc8"; + sha256 = "31fa08ae30af62b65b39c16718ee6c6f132cb157a92fc149a3d36870016abde1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/fy-NL/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fy-NL/firefox-86.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "456ff8a1bed8769cd9fc05b29ed23edd29c48514dda4e73ac8e8663593cc3b4b"; + sha256 = "f75d128c1c6a1b3171132f20f42aca2b798180e1d58f20e264d4defa0e4508d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ga-IE/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ga-IE/firefox-86.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "b0778c1217f9ee6e631c62ef024991212cb679a43394e07401a5f61ca2b88459"; + sha256 = "9902efeb4b30b0935be5dec5a7f85c4ec659b8d8f236e012b2d1187a52f3b667"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gd/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gd/firefox-86.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "37eba79d0db2bf84faa2d89efa0c5b9b34f7fc732636f4b436a3e118792ba610"; + sha256 = "42c779be313524a365dd59013f5486e79b0378d0dc4fe805b5a6769d44ac98d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gl/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gl/firefox-86.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ef06e70653f712c4ab594a00c4d571ba098db740ff508cf78e08e859123096dc"; + sha256 = "cc5d2239946d4b01e31b6da4604a75862f501cc529aecd7962956d4af4dcc970"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gn/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gn/firefox-86.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "c7bbe33c8f839b24ee6928d74d5b0cff18918ab5f2a55e4b3bc1319049b19e4b"; + sha256 = "4a94e0f10f9002721ac57e622da7ab43cd1788683288564e87f667069fdac427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/gu-IN/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gu-IN/firefox-86.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "71ceee81509cb6d505b836dd494eb9dba73857aa2c976ec1aab2fa57a50f1519"; + sha256 = "f81a85e1bea666d339774e0cadd316fccf52752c11a0b5a53a82ac22d6d8dabf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/he/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/he/firefox-86.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "cca354d947d83c616035fdd64019b50d1bb86c3d01e05090eae2d07953ae566b"; + sha256 = "347130466e2f42d06707d56e486b4f262874e50c36b69e2badcb7287ff73376b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hi-IN/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hi-IN/firefox-86.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "a151d3a3d85f0cf96837f51b2a0df9a0a9652148dbcb53733025e15686451669"; + sha256 = "9600a709b7e4b2bb8f0c57cde08627aff892341cd68edda563cb4d0366ca13f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hr/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hr/firefox-86.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "00e3301bef430e243c6516d5c94e0b5fe6e27ca58fd0192955423956395fb2d4"; + sha256 = "bea906c0745f77fc99a830594a2eef1ce609b03596a93cefaaf49044edd483c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hsb/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hsb/firefox-86.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "34c2666668499c8034e732565b244fc5b0cc7b0f544296be1e86942aa62b9167"; + sha256 = "56bf66c8f38567771b57e9f6008b0e86845cd71873b8ee4aa2c056e2c47d3f9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hu/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hu/firefox-86.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d33f5467d9be5a2c6317a10fbd5285c4db7ed4191ceddc317d4ec923bd6ef7df"; + sha256 = "e7da1098e56e1ad7e1baa3b6075defc6169e28306846c77c8f26c424c748f565"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/hy-AM/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hy-AM/firefox-86.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a008343614e5fa43d8ce90ac5f2afc0bec98419d28efc191b836ce835b6f48a1"; + sha256 = "ce3660bf256ed1cccb9c73d0c895907c68104f7f1cc28e7163363a060a747036"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ia/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ia/firefox-86.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "9140874f06ed6e135ae70fa40600b4e1e570b6dc6901191658870916f73d1c17"; + sha256 = "b6ebccd0e4c84d71e7da95ae99d6fa2e1a95fe94d6ed200fbf23ea7ff22aff70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/id/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/id/firefox-86.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "c1dea9043a7f06708498acfda90a7b166b1f7bf839bf86dc2fbb90cf7a00269f"; + sha256 = "7d6844743e6a3e56a29f9d5ee599850bdef09f449de70f14e03664c02bebb31a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/is/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/is/firefox-86.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "50a804f9b7dd594b8c449ce6dd137b5f2bce41ab29baa35f6a14977a5c7af486"; + sha256 = "28bc14cf54090b9f52ae8fcbc7703f201407520e72f5aa6cd0b9f953d4db1777"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/it/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/it/firefox-86.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "3ea5e01722a7a03a5dc498977410fd2cde90352b026489669bcb7ebaa571ffdf"; + sha256 = "1d1a9a7108ebcc0cb796dadbdd9ddf0d8943e5d21c6d56588f33c583e7517b8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ja/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ja/firefox-86.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "efac929a1ace0484b5bce056bbd3d3ff4f26f897d4b1739f128d1dfd91c3c375"; + sha256 = "64342a2674eba04cda7f38e7382b7b2fa93efa1b5c555f0a01e6c59314913f31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ka/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ka/firefox-86.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "95261b88327b5b20739d8adb2a99bb0de5d1311099e2d3fc0999405fbc918ae6"; + sha256 = "38fd38b9a257ba42928e72fed0c3047e000d2a603d37eba1d879ac1d3a87c371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kab/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/kab/firefox-86.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f7b4f440f27ab9141b24f2673e4b850193744d1fc03451c2134a6890b4884f37"; + sha256 = "24570eeeaf5129ce8891320efe6a77203a3eb213285c71c9f2312da1c1d15303"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kk/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/kk/firefox-86.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "652aeb8d66ffb884983a043ff1d2ba10ff3a03aafe8cd55217a8f6a8068a3e59"; + sha256 = "cbc294b8e6988e2e010d08608fd1a822f05cf54bb3b3d6772eea13f1a17ee491"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/km/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/km/firefox-86.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "39deb82ca935780959e4a0f71d85cee3b90c6228237a508b239ad2a1f5a35a07"; + sha256 = "ba9acd0c686ea2ef2d6d8af279c6cd75852021d16aa9e6d8a0bb429de605d8fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/kn/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/kn/firefox-86.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "886370871c27c6637a74e4d8ced9ef2a9ec5062a8aae45fad5fea1dc358e38f4"; + sha256 = "bba2d328021359961fc0bdf7f5676fe47d72476b4bdb54cd41b09506f49ef0c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ko/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ko/firefox-86.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "9acea882760a961e228344c2cac9dfdb8d40c6c4c874744a4f2fffc356f6499c"; + sha256 = "983f9e165840452aae854b780a480c215f3e030801ff8184424d53b541e1c8b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lij/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/lij/firefox-86.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "fd76e82cda32813d43d80ae4acaed5610882162d68e98b4ae47dd1ddc8487d82"; + sha256 = "d57f27ef2a5ab4d8032cb823fa9cb6fc566baced92517dca8ed61560641af96d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lt/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/lt/firefox-86.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "afcc203f0d080560364277e7cca0f4080c74011dfc0fe07c751124e341e5b729"; + sha256 = "1866f926855aed60846004450b34fb341faddc992cfc603ad2b689019e888c8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/lv/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/lv/firefox-86.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1b8a5cc4941d669f12593dc078d6658751609bd094a3704e9a9949341413ba9d"; + sha256 = "ac79432c516df059b15737c1bb492a3eec6dcd5261a2ebe17698720ae7085cae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/mk/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/mk/firefox-86.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "72d374b828e3316f119d592bde6ebfe91ac4907d63cde43f6391d4be81119bc4"; + sha256 = "5d9eefd2926d1554d1feb4526c460506315a805c7e149ca4f87e0ebcb24b3d12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/mr/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/mr/firefox-86.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "17a2dec82a1d89fe74e71f924a21bb175cdb89d801ba50e5f0f0b4625fdabc1d"; + sha256 = "a5095a4eeea48bea9c52b843023756a9912a979aa8441aa2160785287bdefd1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ms/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ms/firefox-86.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9af2d0b5f81d573c8fed4ff54446b2f3a77080ccec5138b1d0e707fb1c37e164"; + sha256 = "47b1bc88d7a5f3d0feddbdb0d9e30a5cd9e420b85f3fb360bd6429a4ca1e4bc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/my/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/my/firefox-86.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "3a2815eed7a1288991c769045614cc50ec3fed2810ff143652092cd32aef5e1b"; + sha256 = "420e4b3ef4b31bd850374fdd4098e41d455d02ab2bbf52b5c575d28ea6350afe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nb-NO/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/nb-NO/firefox-86.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "a8255d1dffb5dcba012a15d5b0f62b9e6e4e60720ae6dc139c23f77aaf6ea99e"; + sha256 = "6f6656a5370de01fc90eeeab8088d69d71c2e55cd9793b285f0bb88b61d44131"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ne-NP/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ne-NP/firefox-86.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "e1c563748ae230a44939d27d7fa246e63ad49d242df236082af2eb0c38af8046"; + sha256 = "e7ac9e8e6914624349fd4cbb230faa96eed54502ec8019cdf2032606654e4464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nl/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/nl/firefox-86.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "56ab4fedc5c3a71b91693d33eb70f79ba3f0095dda66eae44e3e15f885491d5c"; + sha256 = "a425e62f533d9e360ec2690946cd9ec5fa4f7da9ce6891558fb50a1bf3be6adc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/nn-NO/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/nn-NO/firefox-86.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "216e2d4434c66fd4361114467ed5e4635342ed53b74eae287d1d69ba63ac85d6"; + sha256 = "69c939c97646fcd628fe3facd0643c2d43790d7997b902a921190b6269dbf88e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/oc/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/oc/firefox-86.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "0f6822824131d1709c09de64643a9f6e3b03e30741d079f66229efdfb5096e21"; + sha256 = "6a4c2ace18b9e00ee25a4600e115af847d305e60d89335203209d5a519ce89fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pa-IN/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pa-IN/firefox-86.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9a15f3ea177314500e72ef123ed9dc36bfb9e10b92e5ab20cdaa6e7e1fa3367f"; + sha256 = "d81d8fda4acd4ccad2cae15a47123cecdd91afa66f93cd635ea13ed6af074fa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pl/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pl/firefox-86.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "18d19ed1597d3862d08d6daf52dd1bfb8f21c005f7cc44ce4d2e8177b4509aee"; + sha256 = "cb4b300ff0e8e8b0d874dce5349202b8b29e5a4ff79ab6044df74a53f5c72dc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pt-BR/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pt-BR/firefox-86.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "287c3c117532b23e45d726d4541ee726056139e976bf43210f35b529834c3884"; + sha256 = "654cc5d0a0e35823733e6c9d440c43e4483233a4423c6c9bcaf91cb8fcbeb5ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/pt-PT/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pt-PT/firefox-86.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "26915b7725a325db052cbc165454c34f19e7a1346aa400b1306234707bccdf9b"; + sha256 = "a944bf18dc7490ce80779af4cce82c20521b48ddb691ed5504d70075116af0d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/rm/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/rm/firefox-86.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "4d5c14e2607efc653f5cae75290332229286b5ee606da635871dc04e20495fc3"; + sha256 = "674921eeca942cc77b08e8c33a273d327357d90df7be91140e468517a59a7cbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ro/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ro/firefox-86.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a41bab63866e22712861a825aae272e3468470783f92c23117e1c116b9d66771"; + sha256 = "8cbc8f6246455b6deae4a8e619f065ba218b59e711747033b08adffbed8498d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ru/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ru/firefox-86.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "edec67a8079f55c5f22b6928bf1d55a2e1d31aff931c9e41e503ff1b7acf2ecf"; + sha256 = "6d2f6c1d4d8503ee78769c69c97a3cbefa6544a8a1ffb662f10460b6d78fa209"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/si/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/si/firefox-86.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "0357b913e6528214f30ff5ffd4a0f1c0e26bf079d3afdc166a82ee24e8c099ad"; + sha256 = "af33afea872e8e2b8825a01d5fcbc40a5b7674813b60735855b5fd0b886c57ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sk/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sk/firefox-86.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "5a38f953d93cf4cb8b4e2dbb0206fc0a9fa3262c55d91fa4cfc3a8605098403e"; + sha256 = "7ecd39362865c864d6a5412bed20f8946019e3cb845923ce2ee30112d8e6444b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sl/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sl/firefox-86.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "0c2c41f6d7c3f72e56cb84c921207a606f959993ec6a3cc5619bbb894ce6ef8a"; + sha256 = "93c000e695b37f389356d4f3c48c55de6839688826c507e0cf76fee105409dfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/son/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/son/firefox-86.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "cfdedeaacf244b3bc63343f76ed817a165a15b2a727f04327581cd373e76ac86"; + sha256 = "25df54b6e83be77fa22622905d17667a5db613eca263582daffea9c0079031cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sq/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sq/firefox-86.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "daac917a1e105b7871a0361db364558251b931898e08c36515c64269c760d6b4"; + sha256 = "6c8eb230a6de1b5056e530bd76ef0d6f6f35ee29a9d814440c6c2a32460b2de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sr/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sr/firefox-86.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c1993cabde0e7df92e45101bd62cd14a86d023763c48c18a7e00018dcfea282f"; + sha256 = "a7b82f4383608dae512dd528068d9b4b2d4ca194f118098b328fd1b817bed14c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/sv-SE/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sv-SE/firefox-86.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "eb04be61ab3d029437f57dedbf1b66d0bfc6c0a9b29e41fe4fb7aec7b5ab47b0"; + sha256 = "dd856d068f32271ad024649c945ea4665faabf81a4057a8c7efe4f1cce302eb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ta/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ta/firefox-86.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "fbd105183afb74dc7887dfe5cc0e518e96cb8bf79c53fc502d154bbaededacd7"; + sha256 = "9cb7ec3e3150a3594ae1a460b70d81ce1ddb9fe42696710a0e7eb1baf7c5aa17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/te/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/te/firefox-86.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "e049b79ce8a81749caa83d6b42ae710414fe08ae2f28a2c1af7c7d47f83b24e0"; + sha256 = "a3960a97ab3a7a28fe8c218457fe36a5f72827d602ebced3ff74d02f9941100a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/th/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/th/firefox-86.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2b3ca062e1e53d5fca726e5c5a9eb7a3a639e4f6e7f5b455bf33e305eda475cc"; + sha256 = "c342893afcc7b68ba09c8875a55bec4ef2a8c5af40c0ae96a13a662eb0d73115"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/tl/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/tl/firefox-86.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "0fce4ea1fc379ab87c0f565c12f8ee16205108048d7fe89d7850802653247c16"; + sha256 = "3b0de00b254c2d984bbece1d3ca3acaffdc316a44d7270f4cff4c35425310913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/tr/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/tr/firefox-86.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "e0a1c0a5d31225fb6af2b5b2c4d7386dc10d9c5c56081c1282615cc8d5da51ba"; + sha256 = "db36a0260fe69a99d3c834e526a6bdd305334490dd3e644dbd8a48606487209e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/trs/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/trs/firefox-86.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "129d9b5d54cc807664a27fba1fd4f003430bdccf0385cbb53ea77517ce30879f"; + sha256 = "94bc2723028e39d161bb7e95a27e9ce935671c80646674aecc871205a6c602ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/uk/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/uk/firefox-86.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "d50f3c3f21af6c805bc8c86f886af9f1be2b2d5cb5ad061a000633fa9b7e2641"; + sha256 = "7ad9a53018e54fcdb860cacc5fad9eb34a08e879ab69d47af21eb31f3d6c2803"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/ur/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ur/firefox-86.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "ac9240e7896f695f48526ad275d887ddef7eb98aa3dd94800a1b4da081110876"; + sha256 = "6d333e34bb8a332efbff91b9f7d69092b69e377c324693b765eb48b49a7ba108"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/uz/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/uz/firefox-86.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "94bd2d3f2f95e32381f6b945f4b1149f355dffcc27ec829fd0849ec4895a6da7"; + sha256 = "5d111ce8b55637ab03c94fef0ed2e5737bbeee4f80a1ca4ff1847c2e9133c31d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/vi/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/vi/firefox-86.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "e7c8034074e6d1f8f6987321e24dffdbe8acfa11d6784b8c8d033e690a5ed145"; + sha256 = "7fafefae0afc2142a01d7304cfeda60ce1f6302c29abe2d906391dcafea0f25a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/xh/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/xh/firefox-86.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "b8f0f3ee8aeeec6fdac5ee15cf688735809994c71cbe4f01b238a3cc1386006a"; + sha256 = "0d177c264ec9b357be2e616fb02958b4c9d7c6baf292f3c76bbeae84fd2202bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/zh-CN/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/zh-CN/firefox-86.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "47b4f3411306839882f5755b3eb2038f9c7bfd1c2ae72927db54c4816c97217d"; + sha256 = "2203d75b4a62bfe3cbb51c02665420700ea00686b7b9d4002b9a9a6ddca13f36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-x86_64/zh-TW/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/zh-TW/firefox-86.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "5fb11410c30a813fd0db58c928fb07c488405776308eacf64b238daa0fbffbc1"; + sha256 = "7d19a8791c79c0bd9fa03ea568f896221cf6432c826f4a59f99ec78139966817"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ach/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ach/firefox-86.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "06d2dbe0f799d22e98b715528b54566b167a22db4d16d3ad60d84a6e6a8b9e5e"; + sha256 = "caa9485d62e682e5b06e39528857975d1c862ef23e62c9f4147c5db4027c867f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/af/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/af/firefox-86.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "536fdd221aa5f872cc8028f39fcfa7b9eecfe09a215da3d50fbfa9e256a1394d"; + sha256 = "ea114ce9ca7f2c4e5675d25224ffaf7805ec9361097ff47649bd4371937032f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/an/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/an/firefox-86.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ba6eff6a355361862fc78879264965f5f1c0adebefe934d1b6d51994023d3bc4"; + sha256 = "c022590875868195664c4920a3da7bec6bf9942a233190176827d603529a74f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ar/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ar/firefox-86.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "0b465097dcfd4f2a50eba984b0bb30fedceb1a409e2a98f22c45709cdd1117ae"; + sha256 = "66ac4afbde7ed45e1d0239e3364c62f788ac26c8bd652b5c571a9f965ae632ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ast/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ast/firefox-86.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "614241f31f38a71782faf76f0a31cd81d2520523ff85d8a5dfee32a77e48829b"; + sha256 = "3962d9728bc8a0fde06ab64d6da1f40328938db7689db7b402919191c5286f3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/az/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/az/firefox-86.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "4fd682f83c0eee3031c6e452d1c7cde3e54d0e52bb8316b0e2224360665d4fc4"; + sha256 = "84e786225936123aec5c0f2bb27df9dafcd1ceb2e50e8235749dbc081adfd4eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/be/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/be/firefox-86.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "c15417c21f42212337bd921c869b05124a720c6d8730e4a16d30ddd9c10aca97"; + sha256 = "0cfac785cbb8f0c179788dca2a54484473cdfd5e0618894665bbc70d4c2e36f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bg/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/bg/firefox-86.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "fda51760d2dfa07d559673605120a34706f8a6546dc4e673dab55b71cbc501ec"; + sha256 = "8c99908f307fa77fe6e92e58d26ea295471e6421181218fd0ca022c767e1f5f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bn/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/bn/firefox-86.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "f61419c6dd7b20cbdc48cb0faf51cc831fa90f37a721a162bf32753d85a40aff"; + sha256 = "28b303305691ea7f8228580135acde6c17d745719a96e82c60b8d6738fdf2bde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/br/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/br/firefox-86.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "7d60c5f6be2270e9b40612dfb1072ab5d29bd02d070f463f1df915f8d13873d3"; + sha256 = "83a76a0e7dad03453178dbb3a792aab03500359b623851b9a6ec9a4c1e0af084"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/bs/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/bs/firefox-86.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "4707568c61df2d2050e3f1c18d3a2dee1c5bcfd091f32bd615f2e75ed06949fc"; + sha256 = "0700c7d655136ac51134a6da9def1747a27d84ee21b523dfcc6f30042f9b8632"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ca-valencia/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ca-valencia/firefox-86.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "fe52cf8f5f531143ef28e728753610b442443de53f34a4a8d6318d5124a10caf"; + sha256 = "d7738e186c6bd3f4a35c53bc6cf39876ad7774a45bbb3a44529c322f48a490b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ca/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ca/firefox-86.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "8e6baa8ac94878448f65598042d47b9789352fba55d4e4f91cbe319f9676780e"; + sha256 = "ca63b150369c02a048ddbfaaa2f2faeb2729fb46086937c97a93d684975e2837"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cak/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/cak/firefox-86.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "006a887bfaea07c40ee0f67ebccb1aa538f56e28f625cf2b085242c26ebe7bf0"; + sha256 = "2a8a8ebe18dce87a021c71e87e2815b227b03e3251d141f044c083d7a4c942dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cs/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/cs/firefox-86.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "27f1c5634e101d3681885a8d2d572b73f8c9db2215e4836a6cd71fbcd0a5b8dc"; + sha256 = "5e60175642fa8260c4125b90412564fbd49b8f91ca204c30dc687108273184db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/cy/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/cy/firefox-86.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "9e56e8f88baae2a4c99ae12041ed9c766dedc99b7ffd75bffbba92a7c19d98b9"; + sha256 = "ee6e49cc30f01f5604cdb317801ced10c24809ed64f6505f44b6a33cb359641a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/da/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/da/firefox-86.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "eb317f12d74ac8b636c87dfe9c1cb0ce267a15ffeedb79956e1c15e971d1b7e4"; + sha256 = "8c447626d889aa067bd758a56e4dce720f01192e283c7e01997c6f85f0265f89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/de/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/de/firefox-86.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "8a736a3a9c257f2b4509e3ec2f74259f655369159981cfedf8468de9cb1fb22a"; + sha256 = "12d52ecbf5c4b9313c3e9cb61a353f812319142c6b20594f7fbee01a339d98ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/dsb/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/dsb/firefox-86.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "a8fbd4dd6d1172f67744e9283efb6cb644421cb07e3568cae0d3c68c479d653b"; + sha256 = "5064e20ca27adaf48d5c4041c12db3738c95b9143f667ddbc28230ef9387b28e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/el/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/el/firefox-86.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "59baec30ea1d8e30982f52279003b6e1be0148c02f38fdf283325c53ad900ee5"; + sha256 = "a625d2caf3be1a5039a90c3515d1598b5acb87a4e4df4e0ea22f0a63b0405ae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-CA/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/en-CA/firefox-86.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a4e0ea60acf339a61c19272170d2efdb4f519325bf2f71bcbf82af70ca304af0"; + sha256 = "cc1c18c8d4d53495fc4236c95b353bbe40c3de16ded002b2bb991a824fc67210"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-GB/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/en-GB/firefox-86.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "6c82da02a7560977faad1ca3d4c3973d08583fc0ce75e1de6e5aee2c9d372b38"; + sha256 = "c76f7607b28bfee12eebf2aae7590fea71ed2a4f3bb0ce3903f0331187640122"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/en-US/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/en-US/firefox-86.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "eeec3b446c30c65d4af72d04d58c6d5ddb04c13e871a5351921a737f7e1cf234"; + sha256 = "fe6bb788d3c5264943ae5a287cee691f6aea8b3502f11e386f6d723a08dc545f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/eo/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/eo/firefox-86.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "4cbb1144cadfd901082829f8e67e311c51df96ecd08aa2082772421d6445f2fa"; + sha256 = "39af3debe06726ddd02a4914bfecda2d023d9445e7c735e8974ad73f45955298"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-AR/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-AR/firefox-86.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c875473caefc7e18a4f7a0a3e7d44ce659a2271fc1b21d435a70c921092b8af4"; + sha256 = "2d66f2f28958157da1dfda56827f5330f6d7b9fb192899b2ad60ecd6d18e9505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-CL/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-CL/firefox-86.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "d1bf9c2a1df028b5d6eca5b41c975afc6378701c6f33d888b46511da5ce5e498"; + sha256 = "cb69afb6ac3b47721176934047ec9ab3b1127b7d36da7b9ae9af9aec72bb8289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-ES/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-ES/firefox-86.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "5ee1967bc61259869441f61061fec2f24ee3a4179c64b245768387e94acafdce"; + sha256 = "3c0ae2ce17078ef568ac71d5cf8ceb0769fdb8298ce17c58468cf57ab7a95af8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/es-MX/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-MX/firefox-86.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6b4669581f26a18fbd0bda8d605b9d22b3aa98eb193ea81f7ebce1db4d39a263"; + sha256 = "cd07a75c8c96ac8d31cb988d9d394e5e2eb9bb6cfd6df33d6e60d38a6406a4a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/et/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/et/firefox-86.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "0c41ec2c1df4cbd295d349a7b6ad7a7e974662319d4a1d458e9f6bd31c4830c0"; + sha256 = "cced1ea2d54c9d305b61ff1d1025aaa5f23bfe86fca3b0e915f2dcde1384d042"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/eu/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/eu/firefox-86.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "e7bb380e013f5cf35edba5b698a5e3fafd7af63593c663e0029e2754f6854b4f"; + sha256 = "9105eebe6f606292b82eda26eb68b399dd13e1756f1ca88395f0b7714089ea4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fa/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fa/firefox-86.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "d2601f3b84b31d9852a3f2ec35ae8b43f8640da18976f5f4c8a77cf7ad360a22"; + sha256 = "9956fc5949d1e111265dfcd71373d8ada4cb2f554b9ffa2dbda0c430296ece56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ff/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ff/firefox-86.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "a13ee0463fc23cff51f88072d527a6b758fd313276cc7e5f3c8a0c4c8d5f5404"; + sha256 = "02a6a2f711db26b74094744e9f198ddc05a1188fef0fa330949e9e5056c7ffba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fi/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fi/firefox-86.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "76a153c9e398eb259c69b30d15782b7d7a9ebd156283f1034c20182cd72e13f7"; + sha256 = "368c2a59f1446d61a7a27892ddaaa5f933cbbcb9e3f238db5f9e9cb77873e37c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fr/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fr/firefox-86.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "6f5d6e07251f75d6355f52558f2734d2788bb87e1e53ccfb800e03173094f765"; + sha256 = "d543125a0e0402245064dc763eafcb3b00237c217a929b04f44db6755319ae2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/fy-NL/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fy-NL/firefox-86.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "785a30a785e55158c7251e623683350ed4840bb4b6f002d34cdee82d91b33d10"; + sha256 = "ad28252c39eac70b9ce15631c65dfe520950d36212a547587978c635bf835187"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ga-IE/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ga-IE/firefox-86.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "f32f8a0e5f0b5fd2a1dd147b32880605186a4b9435e39a53fc87f42eb8706979"; + sha256 = "a16c0117757cadacc408f95a81e38b7f7e9489a4b6ceef30b8a65796fa6a2ca2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gd/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gd/firefox-86.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2893dd13353b3504a00e02f65f0b2a0a72dd43771148d45cca271aa752a0c520"; + sha256 = "83b61f8e5801607f7b71fe2fa5fd7aede2cd56e4b46b25057935afb23f28ba01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gl/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gl/firefox-86.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "b5bcf0eff53f6bda0e394be3e483c3f314d962a919473492a7d1005b6976b861"; + sha256 = "a603031b44679e8e9dfa14c2094690c786b4ded18d736bb16d683e978346fefe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gn/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gn/firefox-86.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "c979d766174b2e4df72de6a375084b509e879f11a13c1972c97b5ba0accb67d7"; + sha256 = "5146bded3c264c6a77a9e4e9a1c5523e63858eed5077e8ded56d52b94fafa7fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/gu-IN/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gu-IN/firefox-86.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "0e053f93d56a8fd9c07bfef4e93f1f338f951f519be669f5ff18157ca4216025"; + sha256 = "d177f05815889cd026879d6ddb3c03d3c62bb3b2787ca68a97902671977400e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/he/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/he/firefox-86.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "05435889024f622f69d82a0007c19b50b1842f2cfa558748b39859a94a7addaf"; + sha256 = "c3534b56a9fb43e959c8c6055f6af0c1ce9e512bee8786fa4a1028ba0813cd73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hi-IN/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hi-IN/firefox-86.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "7fb87408064c024305295c38938c42b34a0c627b177cacb00ed9e79a0ff974c8"; + sha256 = "a4885b1515cee1352bd534de17742af432502169d8cf2f34426950a5482647cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hr/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hr/firefox-86.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "924141a867793aa4fb3d2b87b75c1d60cc39bb3a3591eaaf6ee3381fcf28fcc6"; + sha256 = "1d9d49b4360efa296ec8b6750aaf8e09a24d749e3694d30dca446480b350a733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hsb/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hsb/firefox-86.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7ce0f09c144462f9c94dc6805165543d12afbf0e44e327dae4554fecf272601e"; + sha256 = "65b890ced9ffc672d92d8fe998ff4f5deb485f22ec4d1525525fac81ed30c2e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hu/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hu/firefox-86.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "8997e6d5620e0f565939cd8f127c4e86da0c46828c66fab7333073c3cbb8054e"; + sha256 = "90e32c53ad910ecce1558c99f10514775b72efc207451e9c61127051c92fe450"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/hy-AM/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hy-AM/firefox-86.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "aeff6c4b8c7d164b63bf22808ea234236f893e6da2b3d9142f95d89e9ec7178e"; + sha256 = "02c1dc969487809e432f4053b39b996ffcf51c81c7827146d3cd7a25ff050abf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ia/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ia/firefox-86.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "0590e0469ac2e562325d786dcb68e2ca2111aa8ae1ff3717ef8db2259e6ec149"; + sha256 = "81d027c3facbe67258151046d9aa53a7d832d1a120aa671532524c87b79efe80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/id/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/id/firefox-86.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "ef8dc62e52df3e6b1d37aea5f9b9a214a26e51ef9fd378f56ac8b2245de54613"; + sha256 = "7a54acb6b8f14cac3d2a7e21fba5990dbaab9d4efef8d2a55642ff120905cbd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/is/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/is/firefox-86.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "aeabfd51aa160ba259850b7fac88829f81bcc0dd8ccc9168c7add07ce0d4efc3"; + sha256 = "c1611ebeceaf431883e5dd61b15aef2954007feaea3cc7503573216ba4cbcb0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/it/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/it/firefox-86.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "c6069c0a86344af00150be03cb0f2c26984b713ad386352f5a10b39b79b13cac"; + sha256 = "76042e19b820c69b1d7d39f3be87069142a4fb6c0327b8f67f78b87821454cc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ja/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ja/firefox-86.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9be7b40e66723583b17657ea805919955dda703957ba21d541baa22390a1befe"; + sha256 = "6e2d8fe15275935a02e3f07ebf14b61f657a35cdff262d50e3a0f10e3ff587be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ka/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ka/firefox-86.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "2e8a57b44b3bec627793f46df84f7f25ab0aedd0f8b1f08202c75cc58d7e14c1"; + sha256 = "93f59b3150795ee6a1d5cd446cd0147f5ccee359939fcecae63a262f28eea0ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kab/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/kab/firefox-86.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "5777a6b5eb3055ab2c93f98bc597343f13bff7d0a846809d24c97e9ba1a0ca7d"; + sha256 = "d71c30914f32b0f5f25c1492e94d0a397997f946f1ff58c85997d9c6c55ddd4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kk/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/kk/firefox-86.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "84a8fbf2a859d81aae2aae6bc95f12a8e2982cff77090072a01d28daccbf21f9"; + sha256 = "9c3b1b80d46c75526c5c9b53229e74aa7cb7219a3110218ecbd099e1d05037ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/km/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/km/firefox-86.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "55982f15b467ddea6203fbcf98081496d0e313d3cd281f807d2bb75b4e79077e"; + sha256 = "95b59cdaa6caeb5cfbcfc673faed614650dbd44458c79684ca7f2ee4ef678e4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/kn/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/kn/firefox-86.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "18aedab4f324448da412ddebd1da9b01be51edcd5052c9455672a763ae1f673b"; + sha256 = "31d79f5609140fb213e19b60d638811ef576bb3db8be533aa92a02ffd22d4df5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ko/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ko/firefox-86.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "5baa361fb97a76d12bfbf5b87c092cbe8079d34dd08842dae9def133383f587a"; + sha256 = "f05215e9004a651b239475bf02de19709fb2ceacd99f0da22ba4ae91dfd899f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lij/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/lij/firefox-86.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "35bf3aeba596135231b1ddff2e2550ab2a3e0c5bc796d7b628c5f78ac46ce40f"; + sha256 = "309ce372ace38efc2cd907df32d18fad97e8fe66728c52efcbc36a36e91163f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lt/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/lt/firefox-86.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "eedf7ba2cf4634ab18c2f2926266845a29c9bce8ba747554d413b276445b9eb1"; + sha256 = "1426fae07194ec4dde7fd797631cbb561726af5b1c255b72c13a96b54034a440"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/lv/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/lv/firefox-86.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "a1c5f04c16f6d50a0797e466d6a8836de40219567f04928cda7f64d967d8afa7"; + sha256 = "48be4205b0d9ba8de2545a73950a4c2836db3d046707ae5db7e2cba0dadaa3a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/mk/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/mk/firefox-86.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "8de29502640b51ac9f586ae7713903612911cf01cd7aecb6d74175a816cce6a3"; + sha256 = "6cc5019e2d41510a67cec8850451fa16e868da753dceb8a38a0cec893814f07a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/mr/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/mr/firefox-86.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "f4cb4ddcac3b5ede422e54c69c05902506be788b45a79cfee6e21a0b7b8c3ca5"; + sha256 = "ba73c1ceac1ad36912f6367a23bcdc4455627d16f2bb589cde4abb5304b06d67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ms/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ms/firefox-86.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "aa09b472e21b453f6875e25dc7922ca062934527a306f3b338cd32636076c021"; + sha256 = "09935a83eb75eb9f89847d9b279c5728c524bef37d063969ec3e44346ef74c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/my/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/my/firefox-86.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4a4ad99aac0614aa25fd77c4c740c49f509db2333c37f797018362b15f38d1d4"; + sha256 = "55b7adcbe1bb47dc49e1d51d99fa3b3a9aa3028a56fe2c53848ec9591503360a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nb-NO/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/nb-NO/firefox-86.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "45814c2d731cd8435a92c31e9311c333d4357dc38e9196fbc24358289004df8b"; + sha256 = "87e7f1d1ecb402f9484e40078a3460b18aa41d88f0bedf61edeb937474ab3e69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ne-NP/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ne-NP/firefox-86.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "008ecc3d7bf7932a320b6ec12404a5259032930539a65e60f8aa2f98f9018524"; + sha256 = "0c5e84344df03c41ab835c3af847772d13fe48d3395fc2aeef020eab04f76baa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nl/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/nl/firefox-86.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "0202adc844602502b48d078a665b1e9012c65172deda406ac9db972e05456fc7"; + sha256 = "75f54fc189ee6f43277066a2600bd340375fa5820e64dc340a3ac93a1f0a6ea0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/nn-NO/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/nn-NO/firefox-86.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "28f34c957628178a112ad6a7c16d9dd20e58bc3a9068fb1e59ef5e656ac8f02f"; + sha256 = "e1dd0adfc33ac73890d849c685d3072a8bfbe6ad3b5ad0bcfa0a04c9ec817c1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/oc/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/oc/firefox-86.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "4645cc6de115ff73444dfa4165a82b3ba1b0adbe3c4eff6fd854c9ec594a7bbb"; + sha256 = "2eea8f40976373fa98d7d32c016dbf0e05fb8f53f3c0f038a087220ea91999a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pa-IN/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pa-IN/firefox-86.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "3fbe8e5c7b4fb420a6a6c62475bd01fead342d7431578b96f391a829cf184be4"; + sha256 = "03c1dface09201be51bd8df92a420b67ce885a712231754dec5e42a4e5cb8cd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pl/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pl/firefox-86.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "6850d14c02c152fb6252b08a111ff6bccbaee6a6ff76a99c018b497a8a014ab0"; + sha256 = "1d4fad5713d1b6606551aa9b9527c4919e548fc9fb50b921404609dd7a43c76f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pt-BR/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pt-BR/firefox-86.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a0aac09a39302df30a48c54e64ae422166eb781ef349dbc58927e077310fae5f"; + sha256 = "53defe8219ee88152a542e24526a3bb9d75e0117e606a3e976d798f441acd64e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/pt-PT/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pt-PT/firefox-86.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e577444bd6ef376b0277cc2181bf50bc1ac3e377bed171f30616f536fa2d516b"; + sha256 = "d91483eca2e1972ce6a0ac97b0393a9cf28a36eb1e923cd863d37b8fc66f4edd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/rm/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/rm/firefox-86.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "2a4f5f35caa3ec5b9f20c1160dd038ce3d689593650771c3e63246cc53b23cfe"; + sha256 = "926234371843aae60cc81886ab7ebaca7bceb6f705ab9d2560ddf996e46f6aa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ro/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ro/firefox-86.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c68f195f10bcd7d19aa76084450419008068ee5d30c34acc02d7621ea250211a"; + sha256 = "9c63bcf8b603b65f355460d0de6827e363ec0797bddb9d446e116b641a5f430e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ru/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ru/firefox-86.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e6e7dcc74dac1c331d3202a141df71dbe2e5a398e2b97c9da1358707823d76b4"; + sha256 = "f4cb8e70dd3c0b2bb97b28c6f85654786f65daf6705559a3dba87a5aa4f0ae18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/si/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/si/firefox-86.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "1bf321805bd46e0214568921b89eaf5ea4d394e43fb1d475ee61c7de8439d997"; + sha256 = "b305cfa2be37591ae0bf49de8da37ffa3a5c69b242196073d84124dd02dd094e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sk/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sk/firefox-86.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "221667dd6eead982d13e911e0ee9d6fb0e6288d689c59c7adc403e8eeab6fd4f"; + sha256 = "23772e40241f955d20a1579f283c6d648e180ae7da21ef0a914156733f89e6a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sl/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sl/firefox-86.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5df6f40394d0c2561c5103cb0600d3566b2bf42dca4d6a3194bee725577f1dad"; + sha256 = "7213f902b853bbce4594db2f5555e437a82adaeb506a9d1421ff9015d29a9659"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/son/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/son/firefox-86.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "8ce2f3d67ea7e1889fce2f534e90320403350b27bd63e97263a9c14544d7f212"; + sha256 = "7b45520bd7305b28803bd4e2f22d41216707754ef46cf6981f0c299b03efeedc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sq/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sq/firefox-86.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "a4f403eefa8da37d7308bda7a10cf62dbe9ff74f848e9e3603d9b787c1629b05"; + sha256 = "11b0b971a705d483f3dd7fab066d034f0a30dd95e16bb7d7aece44d8ccabf450"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sr/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sr/firefox-86.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "7f3d5fb8cb77c2405403f9899257d41f4e9fcdb45a1af945e337228d7648f79d"; + sha256 = "07369958e98d1959be2e52b33145ed1075dd85220de38fcaf617d207217a0066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/sv-SE/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sv-SE/firefox-86.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "261886fc3f3c9c40123a6b6ae0040fffb281d90cbc34506f85bcd73cb94276f2"; + sha256 = "7671a24d1b81b26c34a21cedea05b6c132963045d3cbc28ee264f9c56302cefd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ta/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ta/firefox-86.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "3df7b4c5eb395b123d8c9a67d58e2eda268bd931394e38941545cded144b97e7"; + sha256 = "bf605ceac99dfc2ed058ada9bb9fbd7ae56fdea3453d7dea23ca13dc284391bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/te/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/te/firefox-86.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "b27fe9f6d6e4920e5714a74f439900238900e164cce584f1a1548a02105caa10"; + sha256 = "8aea95f2069a59cbb575f386a7e90d04ecd0f4c4139aefc6dcba54b9b56e7aac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/th/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/th/firefox-86.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "e4eadb2885d09a082c40e27eb41e5a8f721ddd45ef79ed0ccba02f18d7fc3d6a"; + sha256 = "4985ee399155bd0854c9b9068fa747f396855b1251610c3261fc5c7da5e5894c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/tl/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/tl/firefox-86.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "392368f316cf89668e2ff9a42e0b170b55bfc610c84b0a605866914a39273fce"; + sha256 = "d328338029e0282ca5e3c7e0bcff73faddfbb4bdcb47a2978622c80e2dd8d0b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/tr/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/tr/firefox-86.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "e9c7f55b656860dc6d2b28fcca66dbc6e7290d2f418da238ca06ccfe68fdd579"; + sha256 = "a438f5504b0fb62173a8a739645e7f269647e33316a35a96c5dce71d9d87bb0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/trs/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/trs/firefox-86.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "9cd24da9a1dbc0665b589ea8d1f5e5a3546a8b7babbd0f9f2f27641d5c81eeaf"; + sha256 = "41c90f6a5de249fc5b0dcec21d5d2684b5d3be2767d6073529101f31bec569a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/uk/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/uk/firefox-86.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "0bbd4c03dd422901bf2ff1a6e000ec4c6ed798bfa66ade8db03551f5509efc40"; + sha256 = "06419fe5e671a6476500a8ecfe736237adbafdb39148d56d514fc7f07ff09e87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/ur/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ur/firefox-86.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "c0f807c2c7365f281d921fd347a173ce2538fce79b1e74beedf928f392422236"; + sha256 = "f5c1729584fc7843da5febf2411196d4615d4d5b490dc9a0f7b0709496b61ad0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/uz/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/uz/firefox-86.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "f561501fdf1a0edf9f58289fe608b9d47c00ef666c7f980972f0f3112470ad27"; + sha256 = "a1a898dae70288fac86c0ff36b92731e7b3400652b5bef485db73cd8ed933e8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/vi/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/vi/firefox-86.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "12ce7eae83ef3100039871e82784ba7a63742ef8f132c48ceccac22641074c1e"; + sha256 = "7c12e8fe3b30ae8b8bb106a3ce866b23dcdcdb7924ca41e8c9b3d541e0300963"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/xh/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/xh/firefox-86.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "9def9420b6e6e252839268167e978cc357add46e54e77a0f5bf8e03a2183a855"; + sha256 = "97f40f99c9d0204db12d1da1e58088dac2fcd02be6f4fd5c477d20f0149d1f56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/zh-CN/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/zh-CN/firefox-86.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "03cea12f34a9eb22e730d6b28f294bc2a1578e9c357a15bcf189ab1fb925e337"; + sha256 = "309e7670632171133fef52c1426a1f42fb4e14c4d99a8f9543439b21105425f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0/linux-i686/zh-TW/firefox-86.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/zh-TW/firefox-86.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "cf5e5cdf7230bf231f63750b3747b625d64026194c29b36c3d00ff9851960745"; + sha256 = "5993ffa86327a42ea91aa884e90bdb8626d4108a8299acb2f80623e8aaf3ed3e"; } ]; } From 8d2a5a2edafad7bb89b3504957d65fdfd9bce682 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Mar 2021 11:12:30 -0400 Subject: [PATCH 24/56] linux: 5.4.105 -> 5.4.106 (cherry picked from commit d401f1ed14062bd230abc8b96cac29f3955d6c83) --- 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 94049e2c12e5..4f9dd4dff37e 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 stdenv.lib; buildLinux (args // rec { - version = "5.4.105"; + version = "5.4.106"; # 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 = "1dmq1zkr4idbbvh7wln5hn5sl4d0mcfm1af5bvsmsa44c78lqki4"; + sha256 = "1ny8b69ngydh0iw53jwlmqlgv31wjhkybkgnqi5kv0n174n3p1yc"; }; } // (args.argsOverride or {})) From 78aaee88bc365e2ccae81bc4de55eca38f34c8b8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Mar 2021 11:11:53 -0400 Subject: [PATCH 25/56] linux: 4.19.180 -> 4.19.181 (cherry picked from commit 176eaa21b40ce1217f8a95320b6fcd8040cc88eb) --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 04bbc3fe2636..620e7c30ae3d 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 stdenv.lib; buildLinux (args // rec { - version = "4.14.225"; + version = "4.14.226"; # 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 = "09kik0jbfpijb4kylayphr8r2qxx4rlgsnmq300wzcjhxw5yxy3c"; + sha256 = "09llp8jl5xgxxzj0f2sfx32annwyz82k1zmgd26zy90lz0d09p3s"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index e3290d8c3ace..7361e671c6e2 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 stdenv.lib; buildLinux (args // rec { - version = "4.19.180"; + version = "4.19.181"; # 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 = "0pxvnyhbcmbbkdrqsrf5hhaz36x9l07s0xmzrmc4ipcdhdy5va0x"; + sha256 = "1kd967azsq6w41ch8iwpv0i4yjkpijzn5avcipi1141dx4ryw62j"; }; } // (args.argsOverride or {})) From 896c5cc3ad18b46565f2881b77bb509aeb3f134e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Mar 2021 11:12:01 -0400 Subject: [PATCH 26/56] linux: 4.4.261 -> 4.4.262 (cherry picked from commit 52e4fd9bbbc753cd7edcac1002f50724db455d91) --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index b221caa31a4d..faaeb78a65ef 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.261"; + version = "4.4.262"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0d9j4j72n8fl3s93qm82cydwk8lvwhvl2357rcsai2vsk5l0k1mc"; + sha256 = "0yz9qi4i46ndshxmb99kvv7lk6cbb09y7bzagq7sgvqaj4lwaw6j"; }; } // (args.argsOverride or {})) From f6cb6fd27a68178c7e85c1920ac216378727f114 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Mar 2021 11:12:08 -0400 Subject: [PATCH 27/56] linux: 4.9.261 -> 4.9.262 (cherry picked from commit 6dc3abd325bdd51a0b3c1912c3e2a3864dfb08ee) --- 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 60d47923f193..00373da125ad 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.261"; + version = "4.9.262"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0r5822mj2gk9s8rbc8bazg34y8bwr7svn3nbgcq57y2qch8nych4"; + sha256 = "1zq77x9zf1wbk8n17rnblm5lfwlkin1xnxb3sxirwb9njm07cbmj"; }; } // (args.argsOverride or {})) From b657c165833a034056f81a0942ada258f7224338 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Mar 2021 11:12:15 -0400 Subject: [PATCH 28/56] linux: 5.10.23 -> 5.10.24 (cherry picked from commit 76d908f1483534f014bd45adbebbbb81cf910a20) --- 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 8e668ed335a9..06228c6539eb 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 stdenv.lib; buildLinux (args // rec { - version = "5.10.23"; + version = "5.10.24"; # 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 = "0snvkrs95wbx611kcnap59whfiz6h6mzsnbwswk5py3gxh1irqpn"; + sha256 = "0gvnplip90gvlzw9rm0cg66z54cfa82gk23icf5xdickb17d1p66"; }; } // (args.argsOverride or {})) From 5cf4aa4749b641497a3667396392ab585ff17d2c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Mar 2021 11:12:48 -0400 Subject: [PATCH 29/56] linux/hardened/patches/4.14: 4.14.225-hardened1 -> 4.14.226-hardened1 (cherry picked from commit 06a97102829a0e98230e5f7efe40968f346dec8a) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index cba1e5ebd17f..c666b1195aa5 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.225-hardened1.patch", - "sha256": "1khdxny8jzvvhax10xq5kpbnhwrhfs7cxhi9f3rg4fa6c139pjbl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.225-hardened1/linux-hardened-4.14.225-hardened1.patch" + "name": "linux-hardened-4.14.226-hardened1.patch", + "sha256": "12h42fsr1sc2zgr1cb2ais0aivg4hpg9x4gc762r7cd4l40fyyg9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.226-hardened1/linux-hardened-4.14.226-hardened1.patch" }, "4.19": { "extra": "-hardened1", From adc2a64172941575adc909c4eb27813a6ae5d827 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Mar 2021 11:12:49 -0400 Subject: [PATCH 30/56] linux/hardened/patches/4.19: 4.19.180-hardened1 -> 4.19.181-hardened1 (cherry picked from commit 89de81439d55359888816bac5bd73da8d4a1e471) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c666b1195aa5..aa15ebec51a5 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.180-hardened1.patch", - "sha256": "1wh01fwghgpbwkmndw5kkjbmav5iwmpk7g208jplhz6q6ymxfdbj", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.180-hardened1/linux-hardened-4.19.180-hardened1.patch" + "name": "linux-hardened-4.19.181-hardened1.patch", + "sha256": "13j15nwmnzl1s17403icrpx9cdpfpzb5y1pnl6zaj5wsnjda7k5d", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.181-hardened1/linux-hardened-4.19.181-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 92f396e031df66fd434387726125b1d9cc0992d8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Mar 2021 11:12:51 -0400 Subject: [PATCH 31/56] linux/hardened/patches/5.10: 5.10.23-hardened1 -> 5.10.24-hardened1 (cherry picked from commit d013e2e97bb2dc31d0a154daaea3d0242df68fff) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index aa15ebec51a5..542d05ff1510 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.23-hardened1.patch", - "sha256": "16mll5ayg7j0zdxciqa9m17zxv6kdm7vn1kp6bsl89nc301fxssc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.23-hardened1/linux-hardened-5.10.23-hardened1.patch" + "name": "linux-hardened-5.10.24-hardened1.patch", + "sha256": "0d2kwz01kgh43li6b76b7dhnx37hchzx99rk4h6jdz364272lh1p", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.24-hardened1/linux-hardened-5.10.24-hardened1.patch" }, "5.4": { "extra": "-hardened1", From e7a5afb1b46f1eaa3f5d8c6aa150c06f53a1f707 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Mar 2021 11:12:54 -0400 Subject: [PATCH 32/56] linux/hardened/patches/5.4: 5.4.105-hardened1 -> 5.4.106-hardened1 (cherry picked from commit fcab19deb78fbb5ea24e19b133cf34358176396a) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 542d05ff1510..cca7d2279869 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,8 +19,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.105-hardened1.patch", - "sha256": "1djp2cpsb6kgbz2xvix1p0hd7001qw5bnqigf4gz205pianbpakc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.105-hardened1/linux-hardened-5.4.105-hardened1.patch" + "name": "linux-hardened-5.4.106-hardened1.patch", + "sha256": "1hg18p1n26am6y2i459jrpnkq06rv0f5hds1znnm7jw4f61k395f", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.106-hardened1/linux-hardened-5.4.106-hardened1.patch" } } From 58c971e49e0d1f3402d2f64cab54d37461b7993e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 17 Mar 2021 18:17:31 +0000 Subject: [PATCH 33/56] maintainers: Add "Obsidian Systems Maintenance" This would be a "company maintainer" so the work can be shared between employees without hard-coding who those employees are. (cherry picked from commit d10acb2d69360cf502743301a2770c9012f72ff1) --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c49c3fc6e35f..a880e6c3fefd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6227,6 +6227,12 @@ githubId = 3359345; name = "obadz"; }; + obsidian-systems-maintainence = { + name = "Obsidian Systems Maintenance"; + email = "maintainer@obsidian.systems"; + github = "obsidian-systems-maintenance"; + githubId = 80847921; + }; ocharles = { email = "ollie@ocharles.org.uk"; github = "ocharles"; From 5b046348c2e926682021cef26724659d224c06d2 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 9 Mar 2021 13:04:03 -0500 Subject: [PATCH 34/56] tests.cuda.cuda-sample_*: Init at supported CUDA toolkit versions Since CUDA is unfree, we won't actually use this when testing Nixpkgs officially. But I want to include this as they are useful for users of Nixpkgs trying to set up / debug a CUDA environment. (cherry picked from commit 23f815f12c6cd3850f0df3723372e7fe9aea804b) --- pkgs/test/cuda/cuda-samples/default.nix | 52 +++++++++++++++++++++++++ pkgs/test/cuda/cuda-samples/generic.nix | 51 ++++++++++++++++++++++++ pkgs/test/cuda/default.nix | 16 ++++++++ pkgs/test/default.nix | 2 + 4 files changed, 121 insertions(+) create mode 100644 pkgs/test/cuda/cuda-samples/default.nix create mode 100644 pkgs/test/cuda/cuda-samples/generic.nix create mode 100644 pkgs/test/cuda/default.nix diff --git a/pkgs/test/cuda/cuda-samples/default.nix b/pkgs/test/cuda/cuda-samples/default.nix new file mode 100644 index 000000000000..46d4d531690d --- /dev/null +++ b/pkgs/test/cuda/cuda-samples/default.nix @@ -0,0 +1,52 @@ +{ callPackage +, cudatoolkit_9_2 +, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2 +, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +}: + +rec { + cuda-samples_cudatoolkit_9_2 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_9_2; + sha256 = "1ydankhyigcg99h0rqnmz1z4vc0sl6p9s1s0hbdxh5l1sx9141j6"; + }; + + cuda-samples_cudatoolkit_9 = cuda-samples_cudatoolkit_9_2; + + ## + + cuda-samples_cudatoolkit_10_0 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_10_0; + sha256 = "1zvh4xsdyc59m87brpcmssxsjlp9dkynh4asnkcmc3g94f53l0jw"; + }; + + cuda-samples_cudatoolkit_10_1 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_10_1; + sha256 = "1s8ka0hznrni36ajhzf2gqpdrl8kd8fi047qijxks5l2abc093qd"; + }; + + cuda-samples_cudatoolkit_10_2 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_10_2; + sha256 = "01p1innzgh9siacpld6nsqimj8jkg93rk4gj8q4crn62pa5vhd94"; + }; + + cuda-samples_cudatoolkit_10 = cuda-samples_cudatoolkit_10_2; + + ## + + cuda-samples_cudatoolkit_11_0 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_0; + sha256 = "1n3vjc8c7zdig2xgl5fppavrphqzhdiv9m9nk6smh4f99fwi0705"; + }; + + cuda-samples_cudatoolkit_11_1 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_1; + sha256 = "1kjixk50i8y1bkiwbdn5lkv342crvkmbvy1xl5j3lsa1ica21kwh"; + }; + + cuda-samples_cudatoolkit_11_2 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_2; + sha256 = "1p1qjvfbm28l933mmnln02rqrf0cy9kbpsyb488d1haiqzvrazl1"; + }; + + cuda-samples_cudatoolkit_11 = cuda-samples_cudatoolkit_11_2; +} diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix new file mode 100644 index 000000000000..a104f88ad4b2 --- /dev/null +++ b/pkgs/test/cuda/cuda-samples/generic.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetchFromGitHub +, pkg-config, addOpenGLRunpath +, sha256, cudatoolkit +}: + +let + pname = "cuda-samples"; + version = lib.versions.majorMinor cudatoolkit.version; +in + +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = pname; + rev = "v${version}"; + inherit sha256; + }; + + nativeBuildInputs = [ pkg-config addOpenGLRunpath ]; + + buildInputs = [ cudatoolkit ]; + + enableParallelBuilding = true; + + preConfigure = '' + export CUDA_PATH=${cudatoolkit} + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin bin/${stdenv.hostPlatform.parsed.cpu.name}/${stdenv.hostPlatform.parsed.kernel.name}/release/* + + runHook postInstall + ''; + + postFixup = '' + for exe in $out/bin/*; do + addOpenGLRunpath $exe + done + ''; + + meta = { + description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit"; + # CUDA itself is proprietary, but these sample apps are not. + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ obsidian-systems-maintainence ]; + }; +} diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix new file mode 100644 index 000000000000..a3b0f8a66d1b --- /dev/null +++ b/pkgs/test/cuda/default.nix @@ -0,0 +1,16 @@ +{ callPackage }: + +rec { + cuda-samplesPackages = callPackage ./cuda-samples { }; + inherit (cuda-samplesPackages) + cuda-samples_cudatoolkit_9 + cuda-samples_cudatoolkit_9_2 + cuda-samples_cudatoolkit_10 + cuda-samples_cudatoolkit_10_0 + cuda-samples_cudatoolkit_10_1 + cuda-samples_cudatoolkit_10_2 + cuda-samples_cudatoolkit_11 + cuda-samples_cudatoolkit_11_0 + cuda-samples_cudatoolkit_11_1 + cuda-samples_cudatoolkit_11_2; +} diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index c248eebaec39..a8c265a22a35 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -39,5 +39,7 @@ with pkgs; patch-shebangs = callPackage ./patch-shebangs {}; + cuda = callPackage ./cuda { }; + writers = callPackage ../build-support/writers/test.nix {}; } From b26f816668abbb61e817a41b4662fde0e578f9fc Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 12 Mar 2021 15:06:09 -0500 Subject: [PATCH 35/56] tests.cude.cuda-library-samples.{cublas,cusolver}: init at master Well, strictly speaking, master + https://github.com/NVIDIA/CUDALibrarySamples/pull/29 (cherry picked from commit c1ced05ec4330c4241cfd2e32c071470feeb9e8f) --- .../cuda/cuda-library-samples/default.nix | 35 +++++++++++++ .../cuda/cuda-library-samples/generic.nix | 51 +++++++++++++++++++ pkgs/test/cuda/default.nix | 10 ++++ 3 files changed, 96 insertions(+) create mode 100644 pkgs/test/cuda/cuda-library-samples/default.nix create mode 100644 pkgs/test/cuda/cuda-library-samples/generic.nix diff --git a/pkgs/test/cuda/cuda-library-samples/default.nix b/pkgs/test/cuda/cuda-library-samples/default.nix new file mode 100644 index 000000000000..501828c9a1fa --- /dev/null +++ b/pkgs/test/cuda/cuda-library-samples/default.nix @@ -0,0 +1,35 @@ +{ callPackage +, cudatoolkit_10_1, cudatoolkit_10_2 +, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +}: + +rec { + + cuda-library-samples_cudatoolkit_10_1 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_10_1; + }; + + cuda-library-samples_cudatoolkit_10_2 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_10_2; + }; + + cuda-library-samples_cudatoolkit_10 = + cuda-library-samples_cudatoolkit_10_2; + + ## + + cuda-library-samples_cudatoolkit_11_0 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_0; + }; + + cuda-library-samples_cudatoolkit_11_1 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_1; + }; + + cuda-library-samples_cudatoolkit_11_2 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_2; + }; + + cuda-library-samples_cudatoolkit_11 = + cuda-library-samples_cudatoolkit_11_2; +} diff --git a/pkgs/test/cuda/cuda-library-samples/generic.nix b/pkgs/test/cuda/cuda-library-samples/generic.nix new file mode 100644 index 000000000000..75d4541d9866 --- /dev/null +++ b/pkgs/test/cuda/cuda-library-samples/generic.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetchFromGitHub +, cmake, addOpenGLRunpath +, cudatoolkit +}: + +let + rev = "5aab680905d853bce0dbad4c488e4f7e9f7b2302"; + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "CUDALibrarySamples"; + inherit rev; + sha256 = "0gwgbkq05ygrfgg5hk07lmap7n7ampxv0ha1axrv8qb748ph81xs"; + }; + commonAttrs = { + version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version; + nativeBuildInputs = [ cmake addOpenGLRunpath ]; + buildInputs = [ cudatoolkit ]; + enableParallelBuilding = true; + postFixup = '' + for exe in $out/bin/*; do + addOpenGLRunpath $exe + done + ''; + meta = { + description = "examples of using libraries using CUDA"; + longDescription = '' + CUDA Library Samples contains examples demonstrating the use of + features in the math and image processing libraries cuBLAS, cuTENSOR, + cuSPARSE, cuSOLVER, cuFFT, cuRAND, NPP and nvJPEG. + ''; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ obsidian-systems-maintainence ]; + }; + }; +in + +{ + cublas = stdenv.mkDerivation (commonAttrs // { + pname = "cuda-library-samples-cublas"; + + src = "${src}/cuBLASLt"; + }); + + cusolver = stdenv.mkDerivation (commonAttrs // { + pname = "cuda-library-samples-cusolver"; + + src = "${src}/cuSOLVER"; + + sourceRoot = "cuSOLVER/gesv"; + }); +} diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix index a3b0f8a66d1b..9e7eaf8036a7 100644 --- a/pkgs/test/cuda/default.nix +++ b/pkgs/test/cuda/default.nix @@ -13,4 +13,14 @@ rec { cuda-samples_cudatoolkit_11_0 cuda-samples_cudatoolkit_11_1 cuda-samples_cudatoolkit_11_2; + + cuda-library-samplesPackages = callPackage ./cuda-library-samples { }; + inherit (cuda-library-samplesPackages) + cuda-library-samples_cudatoolkit_10 + cuda-library-samples_cudatoolkit_10_1 + cuda-library-samples_cudatoolkit_10_2 + cuda-library-samples_cudatoolkit_11 + cuda-library-samples_cudatoolkit_11_0 + cuda-library-samples_cudatoolkit_11_1 + cuda-library-samples_cudatoolkit_11_2; } From 1ee2861a41ec36cceb80bf0eb09466880c53eee4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 3 Mar 2021 23:53:43 +0000 Subject: [PATCH 36/56] cudatensor: Init at 1.2.2 (cherry picked from commit 05efe64c1bcee8af8d0ae20ca0e3aef164fc8c88) --- .../science/math/cutensor/default.nix | 37 ++++++++++ .../science/math/cutensor/generic.nix | 69 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 12 ++++ 3 files changed, 118 insertions(+) create mode 100644 pkgs/development/libraries/science/math/cutensor/default.nix create mode 100644 pkgs/development/libraries/science/math/cutensor/generic.nix diff --git a/pkgs/development/libraries/science/math/cutensor/default.nix b/pkgs/development/libraries/science/math/cutensor/default.nix new file mode 100644 index 000000000000..1b5895b02bb3 --- /dev/null +++ b/pkgs/development/libraries/science/math/cutensor/default.nix @@ -0,0 +1,37 @@ +{ callPackage +, cudatoolkit_10_1, cudatoolkit_10_2 +, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +}: + +rec { + cutensor_cudatoolkit_10_1 = callPackage ./generic.nix rec { + version = "1.2.2.5"; + libPath = "lib/10.1"; + cudatoolkit = cudatoolkit_10_1; + # 1.2.2 is compatible with CUDA 11.0, 11.1, and 11.2: + # ephemeral doc at https://developer.nvidia.com/cutensor/downloads + sha256 = "1dl9bd71frhac9cb8lvnh71zfsnqxbxbfhndvva2zf6nh0my4klm"; + }; + + cutensor_cudatoolkit_10_2 = cutensor_cudatoolkit_10_1.override { + libPath = "lib/10.2"; + cudatoolkit = cudatoolkit_10_2; + }; + + cutensor_cudatoolkit_10 = cutensor_cudatoolkit_10_2; + + cutensor_cudatoolkit_11_0 = cutensor_cudatoolkit_10_2.override { + libPath = "lib/11"; + cudatoolkit = cudatoolkit_11_0; + }; + + cutensor_cudatoolkit_11_1 = cutensor_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_1; + }; + + cutensor_cudatoolkit_11_2 = cutensor_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_2; + }; + + cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_2; +} diff --git a/pkgs/development/libraries/science/math/cutensor/generic.nix b/pkgs/development/libraries/science/math/cutensor/generic.nix new file mode 100644 index 000000000000..31b7dbdb8dee --- /dev/null +++ b/pkgs/development/libraries/science/math/cutensor/generic.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, libPath +, cudatoolkit +, fetchurl +, autoPatchelfHook +, addOpenGLRunpath + +, version +, sha256 +}: + +let + mostOfVersion = builtins.concatStringsSep "." + (lib.take 3 (lib.versions.splitVersion version)); +in + +stdenv.mkDerivation { + pname = "cudatoolkit-${cudatoolkit.majorVersion}-cutensor"; + inherit version; + + src = fetchurl { + url = "https://developer.download.nvidia.com/compute/cutensor/${mostOfVersion}/local_installers/libcutensor-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}-${version}.tar.gz"; + inherit sha256; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + autoPatchelfHook + addOpenGLRunpath + ]; + + buildInputs = [ + stdenv.cc.cc.lib + ]; + + propagatedBuildInputs = [ + cudatoolkit + ]; + + # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + installPhase = '' + mkdir -p "$out" "$dev" + mv include "$dev" + mv ${libPath} "$out/lib" + + function finalRPathFixups { + for lib in $out/lib/lib*.so; do + addOpenGLRunpath $lib + done + } + postFixupHooks+=(finalRPathFixups) + ''; + + passthru = { + inherit cudatoolkit; + majorVersion = lib.versions.major version; + }; + + meta = with lib; { + description = "cuTENSOR: A High-Performance CUDA Library For Tensor Primitives"; + homepage = "https://developer.nvidia.com/cutensor"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ obsidian-systems-maintainence ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25d2366cd155..c44155d6cabd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2970,6 +2970,18 @@ in cudnn = cudnn_cudatoolkit_10; + cutensorPackages = callPackages ../development/libraries/science/math/cutensor { }; + inherit (cutensorPackages) + cutensor_cudatoolkit_10 + cutensor_cudatoolkit_10_1 + cutensor_cudatoolkit_10_2 + cutensor_cudatoolkit_11 + cutensor_cudatoolkit_11_0 + cutensor_cudatoolkit_11_1 + cutensor_cudatoolkit_11_2; + + cutensor = cutensor_cudatoolkit_10; + curlFull = curl.override { idnSupport = true; ldapSupport = true; From 6ef3e88b8d71f42e187f8b4f1b6d7c6980b73b34 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 12 Mar 2021 15:06:09 -0500 Subject: [PATCH 37/56] tests.cude.cuda-library-samples.cutensor: init at same version as others (cherry picked from commit a680b02816260761e6ed609bdfc6fecb250e5784) --- .../cuda/cuda-library-samples/default.nix | 7 +++++++ .../cuda/cuda-library-samples/generic.nix | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/pkgs/test/cuda/cuda-library-samples/default.nix b/pkgs/test/cuda/cuda-library-samples/default.nix index 501828c9a1fa..91095fbd3ac4 100644 --- a/pkgs/test/cuda/cuda-library-samples/default.nix +++ b/pkgs/test/cuda/cuda-library-samples/default.nix @@ -1,16 +1,20 @@ { callPackage , cudatoolkit_10_1, cudatoolkit_10_2 , cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +, cutensor_cudatoolkit_10_1, cutensor_cudatoolkit_10_2 +, cutensor_cudatoolkit_11_0, cutensor_cudatoolkit_11_1, cutensor_cudatoolkit_11_2 }: rec { cuda-library-samples_cudatoolkit_10_1 = callPackage ./generic.nix { cudatoolkit = cudatoolkit_10_1; + cutensor_cudatoolkit = cutensor_cudatoolkit_10_1; }; cuda-library-samples_cudatoolkit_10_2 = callPackage ./generic.nix { cudatoolkit = cudatoolkit_10_2; + cutensor_cudatoolkit = cutensor_cudatoolkit_10_2; }; cuda-library-samples_cudatoolkit_10 = @@ -20,14 +24,17 @@ rec { cuda-library-samples_cudatoolkit_11_0 = callPackage ./generic.nix { cudatoolkit = cudatoolkit_11_0; + cutensor_cudatoolkit = cutensor_cudatoolkit_11_0; }; cuda-library-samples_cudatoolkit_11_1 = callPackage ./generic.nix { cudatoolkit = cudatoolkit_11_1; + cutensor_cudatoolkit = cutensor_cudatoolkit_11_1; }; cuda-library-samples_cudatoolkit_11_2 = callPackage ./generic.nix { cudatoolkit = cudatoolkit_11_2; + cutensor_cudatoolkit = cutensor_cudatoolkit_11_2; }; cuda-library-samples_cudatoolkit_11 = diff --git a/pkgs/test/cuda/cuda-library-samples/generic.nix b/pkgs/test/cuda/cuda-library-samples/generic.nix index 75d4541d9866..999e2abd0412 100644 --- a/pkgs/test/cuda/cuda-library-samples/generic.nix +++ b/pkgs/test/cuda/cuda-library-samples/generic.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub , cmake, addOpenGLRunpath , cudatoolkit +, cutensor_cudatoolkit }: let @@ -48,4 +49,22 @@ in sourceRoot = "cuSOLVER/gesv"; }); + + cutensor = stdenv.mkDerivation (commonAttrs // { + pname = "cuda-library-samples-cutensor"; + + src = "${src}/cuTENSOR"; + + cmakeFlags = [ + "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${builtins.placeholder "out"}/bin" + ]; + + # CUTENSOR_ROOT is double escaped + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "\''${CUTENSOR_ROOT}/include" "${cutensor_cudatoolkit.dev}/include" + ''; + + CUTENSOR_ROOT = cutensor_cudatoolkit; + }); } From 54f7ccfb63cac9d093ce53420377cc1a7e6bff21 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 15 Mar 2021 23:09:15 +0000 Subject: [PATCH 38/56] python37Packages.cupy: Add cutensor optional dep (cherry picked from commit 13b5995f06ec0ff5efeefd7ca6667d2acf5fb254) --- pkgs/development/python-modules/cupy/default.nix | 3 ++- pkgs/top-level/python-packages.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 2bbd20a16d72..6f71c010a8f8 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage , fetchPypi, isPy3k, linuxPackages , fastrlock, numpy, six, wheel, pytest, mock, setuptools -, cudatoolkit, cudnn, nccl +, cudatoolkit, cudnn, cutensor, nccl }: buildPythonPackage rec { @@ -25,6 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cudatoolkit cudnn + cutensor linuxPackages.nvidia_x11 nccl fastrlock diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c153d6adcf01..0e02424f01d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1364,6 +1364,7 @@ in { cudatoolkit = pkgs.cudatoolkit_10_0; cudnn = pkgs.cudnn_cudatoolkit_10_0; nccl = pkgs.nccl_cudatoolkit_10; + cutensor = pkgs.cutensor_cudatoolkit_10; }; curio = callPackage ../development/python-modules/curio { }; From a3b3c488e8eb8e0a97f9155b0eb51dd74c1d2251 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 17 Mar 2021 18:44:46 -0400 Subject: [PATCH 39/56] maintainers-list: obsidian-systems-maintenance Fix mispelling. That word always breaks me... (cherry picked from commit 66447439a012a3fa8a576367e2ec9bf7f1db75df) --- maintainers/maintainer-list.nix | 2 +- pkgs/development/libraries/science/math/cutensor/generic.nix | 2 +- pkgs/test/cuda/cuda-library-samples/generic.nix | 2 +- pkgs/test/cuda/cuda-samples/generic.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a880e6c3fefd..14889bdd4ec1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6227,7 +6227,7 @@ githubId = 3359345; name = "obadz"; }; - obsidian-systems-maintainence = { + obsidian-systems-maintenance = { name = "Obsidian Systems Maintenance"; email = "maintainer@obsidian.systems"; github = "obsidian-systems-maintenance"; diff --git a/pkgs/development/libraries/science/math/cutensor/generic.nix b/pkgs/development/libraries/science/math/cutensor/generic.nix index 31b7dbdb8dee..0b2bd31b2c30 100644 --- a/pkgs/development/libraries/science/math/cutensor/generic.nix +++ b/pkgs/development/libraries/science/math/cutensor/generic.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation { homepage = "https://developer.nvidia.com/cutensor"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ obsidian-systems-maintainence ]; + maintainers = with maintainers; [ obsidian-systems-maintenance ]; }; } diff --git a/pkgs/test/cuda/cuda-library-samples/generic.nix b/pkgs/test/cuda/cuda-library-samples/generic.nix index 999e2abd0412..f1ce243bfa6a 100644 --- a/pkgs/test/cuda/cuda-library-samples/generic.nix +++ b/pkgs/test/cuda/cuda-library-samples/generic.nix @@ -30,7 +30,7 @@ let cuSPARSE, cuSOLVER, cuFFT, cuRAND, NPP and nvJPEG. ''; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ obsidian-systems-maintainence ]; + maintainers = with lib.maintainers; [ obsidian-systems-maintenance ]; }; }; in diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix index a104f88ad4b2..2e3dcc8891f4 100644 --- a/pkgs/test/cuda/cuda-samples/generic.nix +++ b/pkgs/test/cuda/cuda-samples/generic.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation { description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit"; # CUDA itself is proprietary, but these sample apps are not. license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ obsidian-systems-maintainence ]; + maintainers = with lib.maintainers; [ obsidian-systems-maintenance ]; }; } From 4cbbe3b0c04d341fed8878e6164352b536695dce Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 18 Mar 2021 17:58:45 -0400 Subject: [PATCH 40/56] {,cudnn_}cudatoolkit_11_{1,2}: Port over from master This fixes eval. Sorry I broke it! --- .../compilers/cudatoolkit/default.nix | 14 +++++++++++++ .../libraries/science/math/cudnn/default.nix | 20 ++++++++++++++++++- pkgs/top-level/all-packages.nix | 8 ++++++-- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index cd4af47a21e3..421dc7dfdd64 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -146,5 +146,19 @@ in rec { gcc = gcc9; }; + cudatoolkit_11_1 = common { + version = "11.1.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.1.1/local_installers/cuda_11.1.1_455.32.00_linux.run"; + sha256 = "13yxv2fgvdnqqbwh1zb80x4xhyfkbajfkwyfpdg9493010kngbiy"; + gcc = gcc9; + }; + + cudatoolkit_11_2 = common { + version = "11.2.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.2.1/local_installers/cuda_11.2.1_460.32.03_linux.run"; + sha256 = "sha256-HamMuJfMX1inRFpKZspPaSaGdwbLOvWKZpzc2Nw9F8g="; + gcc = gcc9; + }; + cudatoolkit_11 = cudatoolkit_11_0; } diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 9495366eaaa8..8ad6197e8dca 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,9 @@ -{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0 }: +{ callPackage +, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8 +, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2 +, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2 +, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +}: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -88,5 +93,18 @@ in rec { sha256 = "0ib3v3bgcdxarqapkxngw1nwl0c2a7zz392ns7w9ipcficl4cbv7"; }; + cudnn_cudatoolkit_11_1 = generic rec { + version = "8.1.0"; + cudatoolkit = cudatoolkit_11_0; + # 8.1.0 is compatible with CUDA 11.0, 11.1, and 11.2: + # https://docs.nvidia.com/deeplearning/cudnn/support-matrix/index.html#cudnn-cuda-hardware-versions + srcName = "cudnn-11.2-linux-x64-v8.1.0.77.tgz"; + sha256 = "sha256-2+gvrwcdkbqbzwBIAUatM/RiSC3+5WyvRHnBuNq+Pss="; + }; + + cudnn_cudatoolkit_11_2 = cudnn_cudatoolkit_11_1.override { + cudatoolkit = cudatoolkit_11_2; + }; + cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_0; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c44155d6cabd..a4691f5f648e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2947,7 +2947,9 @@ in cudatoolkit_10_1 cudatoolkit_10_2 cudatoolkit_11 - cudatoolkit_11_0; + cudatoolkit_11_0 + cudatoolkit_11_1 + cudatoolkit_11_2; cudatoolkit = cudatoolkit_10; @@ -2966,7 +2968,9 @@ in cudnn_cudatoolkit_10_1 cudnn_cudatoolkit_10_2 cudnn_cudatoolkit_11 - cudnn_cudatoolkit_11_0; + cudnn_cudatoolkit_11_0 + cudnn_cudatoolkit_11_1 + cudnn_cudatoolkit_11_2; cudnn = cudnn_cudatoolkit_10; From 8ad6a65b14a90b10ba486bd303f19de1919aa602 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 6 Dec 2020 21:19:50 +0100 Subject: [PATCH 41/56] firefox: drop maintainership After the recent wrapper and plugin purge outbreak where as the only active listed maintainer of the package I didn't even get a chance to comment (e.g. via comment or review request) I do not want to continue maintaining this package anymore. (cherry picked from commit dc6971ccf97c260c8c33ced0456a505cd63f2a13) --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 6d7a56b418e7..8ade23c50a28 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -16,7 +16,7 @@ rec { meta = { description = "A web browser built from Firefox source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ eelco andir ]; + maintainers = with lib.maintainers; [ eelco ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". @@ -42,7 +42,7 @@ rec { meta = { description = "A web browser built from Firefox Extended Support Release source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ eelco andir ]; + maintainers = with lib.maintainers; [ eelco ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". From f138622354f87364c5dfc33345e5e66f1b5d8feb Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sun, 14 Mar 2021 22:38:37 +0100 Subject: [PATCH 42/56] zoom-us: unset Qt env variables to fix dialog boxes Zoom wouldn't show the "Participants" dialog box when used in a plasma environment; precisely, the dialog box failed to show its content. The problem doesn't exist in other environments like Gnome or Xfce. Experiments have shown that clearing the environment variable `QML2_IMPORT_PATH` before calling Zoom fixes the issue. I suspect the reason to be as follows: While the zoom build recipe is called with `libsForQt5xx.callPackage`, putting `qttools.dev` in zoom's `PATH` is the only connection to nixpkgs' Qt ecosystem. Zoom brings its own Qt libraries. Hence it seems to be a good idea to shield zoom from access to nixpkgs' Qt files to avoid problems from version mismatch or similar troubles. So the commit at hand expands zoom's wrapper script to clear the Qt-related enviornemt variables `QML2_IMPORT_PATH` and `QT_PLUGIN_PATH`. Original issue report, with some discussion: https://github.com/NixOS/nixpkgs/issues/107495#issuecomment-764538071 (cherry picked from commit b747aa0f9fd6363975e90a82210275a12bfbb696) --- .../networking/instant-messengers/zoom-us/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 6454f71aca08..30514c159d38 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -24,7 +24,6 @@ , pciutils , procps , utillinux -, qttools , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -101,9 +100,13 @@ in stdenv.mkDerivation { rm $out/bin/zoom # Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect # everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm: + # Also clear Qt environment variables to prevent + # zoom from tripping over "foreign" Qt ressources. makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \ --run "cd $out/opt/zoom" \ - --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]} \ + --unset QML2_IMPORT_PATH \ + --unset QT_PLUGIN_PATH \ + --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps utillinux ]} \ --prefix LD_LIBRARY_PATH ":" ${libs} # Backwards compatiblity: we used to call it zoom-us From cfa926538906823a5d9d0027a13e503f8e6428e4 Mon Sep 17 00:00:00 2001 From: Ron B Date: Mon, 8 Feb 2021 13:35:45 +0200 Subject: [PATCH 43/56] zoom-us: 5.5.6981.0202 -> 5.5.7011.0206 (cherry picked from commit a21a3bd84885c20f7736be84698595cc572c1454) --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 30514c159d38..37e3a6d92eb4 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -30,11 +30,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let - version = "5.5.6981.0202"; + version = "5.5.7011.0206"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "05alb81cn1vbpva5rcfwh58sjbg4f2pils4vcdgw6dvi4pbvs694"; + sha256 = "00ahly3kjjznn73vcxgm5wj2pxgw6wdk6vzgd8svfmnl5kqq6c02"; }; }; dontUnpack = true; From 80e3fe7a92b28ab144edf4eb54a3817432b1c929 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 4 Mar 2021 11:40:46 +0000 Subject: [PATCH 44/56] =?UTF-8?q?zoom-us:=205.5.7011.0206=20=E2=86=92=205.?= =?UTF-8?q?5.7938.0228?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 132d954d355f2224d294a8a12b15065bce7c060f) --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 37e3a6d92eb4..6df5ff9f973a 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -30,11 +30,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let - version = "5.5.7011.0206"; + version = "5.5.7938.0228"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "00ahly3kjjznn73vcxgm5wj2pxgw6wdk6vzgd8svfmnl5kqq6c02"; + sha256 = "KM8o2tgIn0lecOM4gKdTOdk/zsohlFqtNX+ca/S6FGY="; }; }; dontUnpack = true; From b3d2a8c1b7911c818af85145ecd387f876c12579 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 19 Mar 2021 11:26:01 +0100 Subject: [PATCH 45/56] grafana: 7.4.3 -> 7.4.5 This fixes a few CVEs around authentication bypass with Grafana. Details are available in the [annoucement]. CVE-2021-27962, CVE-2021-28146, CVE-2021-28147, CVE-2021-28148 [annoucement]: https://grafana.com/blog/2021/03/18/grafana-6.7.6-7.3.10-and-7.4.5-released-with-important-security-fixes-for-grafana-enterprise/ (cherry picked from commit 9a3f2457f128cbbcbddb9053822988fdd247e416) --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index dc7ca728f2ce..9bf10165e007 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.4.3"; + version = "7.4.5"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-FPQa6q1ks9Lpod5sI29YBnGZvVRU12hTiw6GR85/mEs="; + sha256 = "10pnwd4d19ry7w2x46acc3j8gjn73b45fzc579gz1hc8hx2b3s0s"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-idbG+K9NVnNhEB0f7DfP7iaEnHMf59ieQtYnmT6CvVM="; + sha256 = "1x9jx3ww37cn6r6cn6gqlavmllxydks23vm8w4934bv8zppj1zwz"; }; - vendorSha256 = "sha256-LL+EkDZbbaNo/fPMGlPsB8jgBYHoe6SdkBbQoW5y4EU="; + vendorSha256 = "0ig0f9pa3l0nj2fs8yz8h42y1j07xi9imk7kzmla6vav6s889grc"; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ From ffc73733839905c8bc9aec4ede8845e2224b528a Mon Sep 17 00:00:00 2001 From: Sebastien Braun Date: Fri, 30 Oct 2020 13:54:16 +0100 Subject: [PATCH 46/56] gsoap: 2.8.53 -> 2.8.108 Fixes CVE-2019-7659 (cherry picked from commit 14368df9f6ee8e76f0ff5103a231082076c788d0) --- pkgs/development/libraries/gsoap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index fd9e327c1bc9..2614c50cca78 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "gsoap"; - version = "${majorVersion}.53"; + version = "${majorVersion}.108"; src = fetchurl { url = "mirror://sourceforge/project/gsoap2/gsoap-${majorVersion}/gsoap_${version}.zip"; - sha256 = "0n35dh32gidi65c36cwjd91304pwiabfblvd64kg21djpjl06qcr"; + sha256 = "0x58bwlclk7frv03kg8bp0pm7zl784samvbzskrnr7dl5v866nvl"; }; buildInputs = [ openssl zlib ]; From b3614c5f6f07722ab1ed9f119912a356c94a4ebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Fri, 19 Mar 2021 01:01:34 +0100 Subject: [PATCH 47/56] gitlab: 13.6.7 -> 13.8.6 --- .../version-management/gitlab/data.json | 14 +- .../version-management/gitlab/default.nix | 1 + .../version-management/gitlab/gitaly/Gemfile | 2 +- .../gitlab/gitaly/Gemfile.lock | 30 +- .../gitlab/gitaly/default.nix | 28 +- .../gitlab/gitaly/gemset.nix | 50 +- .../gitlab/gitlab-shell/default.nix | 8 +- .../gitlab/gitlab-workhorse/default.nix | 10 +- .../gitlab/remove-hardcoded-locations.patch | 124 +++-- .../version-management/gitlab/rubyEnv/Gemfile | 70 +-- .../gitlab/rubyEnv/Gemfile.lock | 390 ++++++------- .../gitlab/rubyEnv/gemset.nix | 524 ++++++++++-------- .../version-management/gitlab/update.py | 44 +- .../version-management/gitlab/yarnPkgs.nix | 288 +++++----- .../ruby-modules/gem-config/default.nix | 20 +- 15 files changed, 890 insertions(+), 713 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index ce4cea281244..b3a5d25c930f 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.6.7", - "repo_hash": "1ykgr3wvg9fhyn7ry0v9lfm1g4yhdq2y9rl74xx9j4zc31763pv8", + "version": "13.8.6", + "repo_hash": "0izzvr4bw86nbrqkf44gkcf63ham10cw4vp5yk0ylgm7w0kimv8v", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.6.7-ee", + "rev": "v13.8.6-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.6.7", - "GITLAB_PAGES_VERSION": "1.30.2", - "GITLAB_SHELL_VERSION": "13.13.1", - "GITLAB_WORKHORSE_VERSION": "8.54.2" + "GITALY_SERVER_VERSION": "13.8.6", + "GITLAB_PAGES_VERSION": "1.34.0", + "GITLAB_SHELL_VERSION": "13.15.1", + "GITLAB_WORKHORSE_VERSION": "8.59.2" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index ee6c8201fa3f..b9c352a4eac4 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -137,6 +137,7 @@ stdenv.mkDerivation { sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb + mv config/puma.rb.example config/puma.rb # Always require lib-files and application.rb through their store # path, not their relative state directory path. This gets rid of # warnings and means we don't have to link back to lib from the diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 0a7fcd7c260d..1a9f3ea8fd6b 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.0.3.3' +gem 'activesupport', '~> 6.0.3.4' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 4f17ed67f539..acfc05c8747b 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.0.3.3) - actionview (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionpack (6.0.3.4) + actionview (= 6.0.3.4) + activesupport (= 6.0.3.4) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.3.3) - activesupport (= 6.0.3.3) + actionview (6.0.3.4) + activesupport (= 6.0.3.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.0.3.3) + activesupport (6.0.3.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -86,7 +86,7 @@ GEM json (2.3.1) licensee (8.9.2) rugged (~> 0.24) - loofah (2.7.0) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -96,12 +96,13 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2020.0512) mini_mime (1.0.2) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) minitest (5.14.2) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) nokogumbo (1.5.0) nokogiri opentracing (0.5.0) @@ -117,6 +118,7 @@ GEM pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) + racc (1.5.2) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -134,7 +136,7 @@ GEM redis (4.1.3) regexp_parser (1.8.1) rexml (3.2.4) - rouge (3.24.0) + rouge (3.26.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -177,7 +179,7 @@ GEM thread_safe (0.3.6) thrift (0.11.0.0) timecop (0.9.1) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) unicode-display_width (1.7.0) unparser (0.4.7) @@ -188,13 +190,13 @@ GEM equalizer (~> 0.0.9) parser (>= 2.6.5) procto (~> 0.0.2) - zeitwerk (2.4.0) + zeitwerk (2.4.2) PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.0.3.3) + activesupport (~> 6.0.3.4) factory_bot faraday (~> 1.0) github-linguist (~> 7.12) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 25a35ff72e89..db2ac513b211 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,9 +1,21 @@ -{ stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby -, bundlerEnv, pkgconfig +{ lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby +, bundlerEnv, pkg-config # libgit2 + dependencies , libgit2, openssl, zlib, pcre, http-parser }: let + # libgit2 was updated to 1.1.0 in nixpkgs, but gitlab doesn't support that yet. + # See https://github.com/NixOS/nixpkgs/pull/106909 + libgit = libgit2.overrideAttrs (attrs: rec { + version = "1.0.0"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "06cwrw93ycpfb5kisnsa5nsy95pm11dbh0vvdjg1jn25h9q5d3vc"; + }; + }); + rubyEnv = bundlerEnv rec { name = "gitaly-env"; inherit ruby; @@ -21,25 +33,25 @@ let }; }; in buildGoModule rec { - version = "13.6.7"; + version = "13.8.6"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1d6vl3p2p825cdyvq8965kvmpqnsahz6f19s7q2ssahmcqxzxw6z"; + sha256 = "sha256-6ocP4SMafvLI2jfvcB8jk1AemAI/TiBQ1iaVxK7I54A="; }; - vendorSha256 = "15mx5g2wa93sajbdwh58wcspg0n51d1ciwb7f15d0nm5hspz3w9r"; + vendorSha256 = "sha256-oVw6vXI3CyOn4l02PkYx3HVpZfzQPi3yBuf9tRvoWoM="; passthru = { inherit rubyEnv; }; buildFlags = [ "-tags=static,system_libgit2" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ]; doCheck = false; postInstall = '' @@ -49,7 +61,7 @@ in buildGoModule rec { outputs = [ "out" "ruby" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://gitlab.com/gitlab-org/gitaly"; description = "A Git RPC service for handling all the git calls made by GitLab"; platforms = platforms.linux; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 710d69c38d71..9159b62c8df7 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -13,10 +13,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p873nqwmpsvmkb5n86d70wndx1qhy15pc9mbcd1mc8sj174578b"; + sha256 = "0fbjpnh5hrihc9l35q9why6ip0hcdj42axzbp6b4j1xcy1v1bicj"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08pvmjddlw01q5r9zdfgddwp4csndpf5i2w47677z5r36jznz36q"; + sha256 = "0gdz31cq08nrqq6bxqim2qcbzv0fr34z6ycl73dmawpafj33wdkj"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dmkqbvndbz011a1byg6f990936vfadbnwjwjw9vjzr4kd8bxk96"; + sha256 = "1axidc4mikgi4yxs0ynw2c54jyrs5lxprxmzv6m3aayi9rg6rk5j"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -360,10 +360,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq"; + sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -414,12 +414,14 @@ version = "1.0.2"; }; mini_portile2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitest = { groups = ["default" "development" "test"]; @@ -452,15 +454,15 @@ version = "2.1.1"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.1"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -538,6 +540,16 @@ }; version = "0.12.2"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rack = { groups = ["default"]; platforms = []; @@ -645,10 +657,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1igl00gk0vaq4xxk44m7yflqdzsblgxlzcxj8saz96bmx7mg7392"; + sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; type = "gem"; }; - version = "3.24.0"; + version = "3.26.0"; }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; @@ -819,10 +831,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.9"; }; unicode-display_width = { groups = ["default" "development" "test"]; @@ -850,9 +862,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k"; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.2"; }; } diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 38206a55d458..dcd24bab3cf6 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchFromGitLab, buildGoModule, ruby }: +{ lib, fetchFromGitLab, buildGoModule, ruby }: buildGoModule rec { pname = "gitlab-shell"; - version = "13.13.1"; + version = "13.15.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1dxqb0nbk0zsfi2yv8i0qxm360lglbhi3z3ps2axsf5xwqwawps4"; + sha256 = "sha256-wDZLcCBbWjG6wIcEj02eqwWVfAYy1TuAo/xvJB8tt+0="; }; buildInputs = [ ruby ]; @@ -22,7 +22,7 @@ buildGoModule rec { ''; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "SSH access and repository management app for GitLab"; homepage = "http://www.gitlab.com/"; platforms = platforms.linux; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 4abeb3ddbb5e..05be0e16818d 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitLab, git, buildGoModule }: +{ lib, fetchFromGitLab, git, buildGoModule }: buildGoModule rec { pname = "gitlab-workhorse"; - version = "8.54.2"; + version = "8.59.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1rg1l2d95p9zgd52d96s18l5xidds2l3gz4hyb5hjyxf59027m22"; + sha256 = "sha256-hMcE7dlUw34DyUO0v5JxwvvEh/HC2emrIKc1K1U4bPE="; }; - vendorSha256 = "0wi6vj9phwh0bsdk2lrgq807nb90iivlm0bkdjkim06jq068mizj"; + vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5"; buildInputs = [ git ]; buildFlagsArray = "-ldflags=-X main.Version=${version}"; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.gitlab.com/"; platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin talyz ]; diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index fcb954e38843..83e3d7fe1414 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -1,8 +1,8 @@ diff --git a/config/environments/production.rb b/config/environments/production.rb -index c5cbfcf64c..4d01f6fab8 100644 +index d9b3ee354b0..1eb0507488b 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb -@@ -70,10 +70,10 @@ Rails.application.configure do +@@ -69,10 +69,10 @@ config.action_mailer.delivery_method = :sendmail # Defaults to: @@ -11,17 +11,17 @@ index c5cbfcf64c..4d01f6fab8 100644 - # # arguments: '-i -t' - # # } + config.action_mailer.sendmail_settings = { -+ location: '/usr/sbin/sendmail', ++ location: '/run/wrappers/bin/sendmail', + arguments: '-i -t' + } config.action_mailer.perform_deliveries = true config.action_mailer.raise_delivery_errors = true diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example -index bd696a7f2c..44e3863736 100644 +index 92e7501d49d..4ee5a1127df 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example -@@ -590,7 +590,7 @@ production: &base +@@ -1168,7 +1168,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: @@ -31,10 +31,10 @@ index bd696a7f2c..44e3863736 100644 ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb -index 0bea8a4f4b..290248547b 100644 +index bbed08f5044..2906e5c44af 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb -@@ -177,7 +177,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab['user'] +@@ -183,7 +183,7 @@ Settings.gitlab['user_home'] ||= begin Etc.getpwnam(Settings.gitlab['user']).dir rescue ArgumentError # no user configured @@ -43,7 +43,7 @@ index 0bea8a4f4b..290248547b 100644 end Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? -@@ -507,7 +507,7 @@ Settings.backup['upload']['storage_class'] ||= nil +@@ -751,7 +751,7 @@ # Git # Settings['git'] ||= Settingslogic.new({}) @@ -52,37 +52,94 @@ index 0bea8a4f4b..290248547b 100644 # Important: keep the satellites.path setting until GitLab 9.0 at # least. This setting is fed to 'rm -rf' in +diff --git a/config/puma.rb.example b/config/puma.rb.example +index 9fc354a8fe8..2352ca9b58c 100644 +--- a/config/puma.rb.example ++++ b/config/puma.rb.example +@@ -5,12 +5,8 @@ + # The default is "config.ru". + # + rackup 'config.ru' +-pidfile '/home/git/gitlab/tmp/pids/puma.pid' +-state_path '/home/git/gitlab/tmp/pids/puma.state' +- +-stdout_redirect '/home/git/gitlab/log/puma.stdout.log', +- '/home/git/gitlab/log/puma.stderr.log', +- true ++pidfile ENV['PUMA_PATH'] + '/tmp/pids/puma.pid' ++state_path ENV['PUMA_PATH'] + '/tmp/pids/puma.state' + + # Configure "min" to be the minimum number of threads to use to answer + # requests and "max" the maximum. +@@ -31,12 +27,12 @@ queue_requests false + + # Bind the server to "url". "tcp://", "unix://" and "ssl://" are the only + # accepted protocols. +-bind 'unix:///home/git/gitlab/tmp/sockets/gitlab.socket' ++bind "unix://#{ENV['PUMA_PATH']}/tmp/sockets/gitlab.socket" + + workers 3 + +-require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events" +-require_relative "/home/git/gitlab/lib/gitlab/cluster/puma_worker_killer_initializer" ++require_relative ENV['GITLAB_PATH'] + "lib/gitlab/cluster/lifecycle_events" ++require_relative ENV['GITLAB_PATH'] + "lib/gitlab/cluster/puma_worker_killer_initializer" + + on_restart do + # Signal application hooks that we're about to restart +@@ -80,7 +76,7 @@ if defined?(nakayoshi_fork) + end + + # Use json formatter +-require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter" ++require_relative ENV['GITLAB_PATH'] + "lib/gitlab/puma_logging/json_formatter" + + json_formatter = Gitlab::PumaLogging::JSONFormatter.new + log_formatter do |str| diff --git a/lib/api/api.rb b/lib/api/api.rb -index e953f3d2ec..3a8d9f076b 100644 +index ada0da28749..8a3f5824008 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb -@@ -2,7 +2,7 @@ module API - class API < Grape::API +@@ -4,7 +4,7 @@ module API + class API < ::API::Base include APIGuard - LOG_FILENAME = Rails.root.join("log", "api_json.log") + LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log") - NO_SLASH_URL_PART_REGEX = %r{[^/]+} - PROJECT_ENDPOINT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze + NO_SLASH_URL_PART_REGEX = %r{[^/]+}.freeze + NAMESPACE_OR_PROJECT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze +diff --git a/lib/gitlab/authorized_keys.rb b/lib/gitlab/authorized_keys.rb +index 50cd15b7a10..3ac89e5b8e9 100644 +--- a/lib/gitlab/authorized_keys.rb ++++ b/lib/gitlab/authorized_keys.rb +@@ -157,7 +157,7 @@ def command(id) + raise KeyError, "Invalid ID: #{id.inspect}" + end + +- "#{File.join(Gitlab.config.gitlab_shell.path, 'bin', 'gitlab-shell')} #{id}" ++ "#{File.join('/run/current-system/sw/bin', 'gitlab-shell')} #{id}" + end + + def strip(key) diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb -index a42e312b5d..ccaab9229e 100644 +index 89a4e36a232..ae379ffb27a 100644 --- a/lib/gitlab/logger.rb +++ b/lib/gitlab/logger.rb -@@ -26,7 +26,7 @@ module Gitlab +@@ -37,7 +37,7 @@ def self.build end def self.full_log_path - Rails.root.join("log", file_name) -+ File.join(ENV["GITLAB_LOG_PATH"], file_name) ++ File.join(ENV["GITLAB_LOG_PATH"], file_name) end def self.cache_key diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb -index 7d7400bdab..cb25211d44 100644 +index e0e7084e27e..19fab855b90 100644 --- a/lib/gitlab/uploads_transfer.rb +++ b/lib/gitlab/uploads_transfer.rb -@@ -1,7 +1,7 @@ +@@ -3,7 +3,7 @@ module Gitlab class UploadsTransfer < ProjectTransfer def root_dir @@ -92,10 +149,10 @@ index 7d7400bdab..cb25211d44 100644 end end diff --git a/lib/system_check/app/log_writable_check.rb b/lib/system_check/app/log_writable_check.rb -index 3e0c436d6e..28cefc5514 100644 +index 2c108f0c18d..3a16ff52d01 100644 --- a/lib/system_check/app/log_writable_check.rb +++ b/lib/system_check/app/log_writable_check.rb -@@ -21,7 +21,7 @@ module SystemCheck +@@ -23,7 +23,7 @@ def show_error private def log_path @@ -105,10 +162,10 @@ index 3e0c436d6e..28cefc5514 100644 end end diff --git a/lib/system_check/app/uploads_directory_exists_check.rb b/lib/system_check/app/uploads_directory_exists_check.rb -index 7026d0ba07..c56e1f7ed9 100644 +index 54dff63ab61..882da702f29 100644 --- a/lib/system_check/app/uploads_directory_exists_check.rb +++ b/lib/system_check/app/uploads_directory_exists_check.rb -@@ -4,12 +4,13 @@ module SystemCheck +@@ -6,12 +6,13 @@ class UploadsDirectoryExistsCheck < SystemCheck::BaseCheck set_name 'Uploads directory exists?' def check? @@ -120,15 +177,15 @@ index 7026d0ba07..c56e1f7ed9 100644 + uploads_dir = ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads') try_fixing_it( - "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads" -+ "sudo -u #{gitlab_user} mkdir #{uploads_dir}" ++ "sudo -u #{gitlab_user} mkdir #{uploads_dir}" ) for_more_information( - see_installation_guide_section 'GitLab' + see_installation_guide_section('GitLab') diff --git a/lib/system_check/app/uploads_path_permission_check.rb b/lib/system_check/app/uploads_path_permission_check.rb -index 7df6c06025..bb447c16b2 100644 +index 2e1cc687c43..ca69d63bcf6 100644 --- a/lib/system_check/app/uploads_path_permission_check.rb +++ b/lib/system_check/app/uploads_path_permission_check.rb -@@ -25,7 +25,7 @@ module SystemCheck +@@ -27,7 +27,7 @@ def show_error private def rails_uploads_path @@ -138,10 +195,10 @@ index 7df6c06025..bb447c16b2 100644 def uploads_fullpath diff --git a/lib/system_check/app/uploads_path_tmp_permission_check.rb b/lib/system_check/app/uploads_path_tmp_permission_check.rb -index b276a81eac..070e3ebd81 100644 +index 567c7540777..29906b1c132 100644 --- a/lib/system_check/app/uploads_path_tmp_permission_check.rb +++ b/lib/system_check/app/uploads_path_tmp_permission_check.rb -@@ -33,7 +33,7 @@ module SystemCheck +@@ -35,7 +35,7 @@ def upload_path_tmp end def uploads_fullpath @@ -150,14 +207,3 @@ index b276a81eac..070e3ebd81 100644 end end end ---- a/lib/gitlab/authorized_keys.rb -+++ b/lib/gitlab/authorized_keys.rb -@@ -157,7 +157,7 @@ - raise KeyError, "Invalid ID: #{id.inspect}" - end - -- "#{File.join(Gitlab.config.gitlab_shell.path, 'bin', 'gitlab-shell')} #{id}" -+ "#{File.join('/run/current-system/sw/bin', 'gitlab-shell')} #{id}" - end - - def strip(key) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index d60fefe29dca..23b58d721f3b 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -4,9 +4,6 @@ gem 'rails', '~> 6.0.3.1' gem 'bootsnap', '~> 1.4.6' -# Improves copy-on-write performance for MRI -gem 'nakayoshi_fork', '~> 0.0.4' - # Responders respond_to and respond_with gem 'responders', '~> 3.0' @@ -19,10 +16,10 @@ gem 'default_value_for', '~> 3.3.0' gem 'pg', '~> 1.1' gem 'rugged', '~> 0.28' -gem 'grape-path-helpers', '~> 1.5' +gem 'grape-path-helpers', '~> 1.6.1' gem 'faraday', '~> 1.0' -gem 'marginalia', '~> 1.9.0' +gem 'marginalia', '~> 1.10.0' # Authentication libraries gem 'devise', '~> 4.7.2' @@ -57,7 +54,7 @@ gem 'gssapi', group: :kerberos # Spam and anti-bot protection gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'akismet', '~> 3.0' -gem 'invisible_captcha', '~> 0.12.1' +gem 'invisible_captcha', '~> 1.1.0' # Two-factor authentication gem 'devise-two-factor', '~> 3.1.0' @@ -66,7 +63,7 @@ gem 'attr_encrypted', '~> 3.1.0' gem 'u2f', '~> 0.2.1' # GitLab Pages -gem 'validates_hostname', '~> 1.0.10' +gem 'validates_hostname', '~> 1.0.11' gem 'rubyzip', '~> 2.0.0', require: 'zip' # GitLab Pages letsencrypt support gem 'acme-client', '~> 2.0', '>= 2.0.6' @@ -81,12 +78,10 @@ gem 'gpgme', '~> 2.0.19' # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' -gem 'net-ldap' +gem 'net-ldap', '~> 0.16.3' # API -# Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged -# Remove config/initializers/grape_patch.rb -gem 'grape', '= 1.4.0' +gem 'grape', '~> 1.5.1' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' @@ -115,11 +110,11 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.10.1' # for backups -gem 'fog-aws', '~> 3.5' +gem 'fog-aws', '~> 3.8' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' -gem 'fog-google', '~> 1.11' +gem 'fog-google', '~> 1.12' gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' @@ -145,11 +140,11 @@ gem 'aws-sdk-s3', '~> 1' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # Markdown and HTML processing -gem 'html-pipeline', '~> 2.12' +gem 'html-pipeline', '~> 2.13.2' gem 'deckar01-task_list', '2.3.1' gem 'gitlab-markup', '~> 1.7.1' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'commonmarker', '~> 0.20' +gem 'commonmarker', '~> 0.21' gem 'kramdown', '~> 2.3.0' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.1.2' @@ -159,10 +154,11 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' -gem 'rouge', '~> 3.25.0' +gem 'asciidoctor-kroki', '~> 0.2.2', require: false +gem 'rouge', '~> 3.26.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.10.9' +gem 'nokogiri', '~> 1.11.1' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -183,15 +179,15 @@ group :unicorn do end group :puma do - gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false - gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false + gem 'puma', '~> 5.1.1', require: false + gem 'puma_worker_killer', '~> 0.3.1', require: false end # State machine -gem 'state_machines-activerecord', '~> 0.6.0' +gem 'state_machines-activerecord', '~> 0.8.0' # Issue tags -gem 'acts-as-taggable-on', '~> 6.0' +gem 'acts-as-taggable-on', '~> 7.0' # Background jobs gem 'sidekiq', '~> 5.2.7' @@ -209,7 +205,7 @@ gem 'httparty', '~> 0.16.4' gem 'rainbow', '~> 3.0' # Progress bar -gem 'ruby-progressbar' +gem 'ruby-progressbar', '~> 1.10' # GitLab settings gem 'settingslogic', '~> 2.0.9' @@ -241,7 +237,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false gem 'hipchat', '~> 1.5.0' # Jira integration -gem 'jira-ruby', '~> 2.0.0' +gem 'jira-ruby', '~> 2.1.4' gem 'atlassian-jwt', '~> 0.2.0' # Flowdock integration @@ -254,7 +250,7 @@ gem 'slack-messenger', '~> 2.3.4' gem 'hangouts-chat', '~> 0.0.5' # Asana integration -gem 'asana', '0.10.2' +gem 'asana', '~> 0.10.3' # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' @@ -291,7 +287,6 @@ gem 'sassc-rails', '~> 2.1.0' gem 'terser', '1.0.2' gem 'addressable', '~> 2.7' -gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.2' gem 'request_store', '~> 1.5' @@ -306,12 +301,15 @@ gem 'rack-attack', '~> 6.3.0' gem 'sentry-raven', '~> 3.0' # PostgreSQL query parsing -gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query' +gem 'pg_query', '~> 1.3.0' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '0.13.1' +gem 'gitlab-labkit', '0.14.0' +# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 +# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 +gem 'thrift', '>= 0.14.0' # I18n gem 'ruby_parser', '~> 3.15', require: false @@ -331,6 +329,7 @@ gem 'snowplow-tracker', '~> 0.6.1' # Metrics group :metrics do gem 'method_source', '~> 1.0', require: false + gem 'webrick', '~> 1.6.1', require: false # Prometheus gem 'prometheus-client-mmap', '~> 0.12.0' @@ -351,15 +350,17 @@ group :development do end group :development, :test do + gem 'deprecation_toolkit', '~> 1.5.1', require: false gem 'bullet', '~> 6.1.0' - gem 'pry-byebug', '~> 3.9.0', platform: :mri + gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext'] gem 'pry-rails', '~> 0.3.9' + gem 'pry-remote' gem 'awesome_print', require: false gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 5.1.0' - gem 'rspec-rails', '~> 4.0.0' + gem 'factory_bot_rails', '~> 6.1.0' + gem 'rspec-rails', '~> 4.0.1' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0' @@ -370,7 +371,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 5.1.0', require: false + gem 'gitlab-styles', '~> 6.0.0', require: false gem 'scss_lint', '~> 0.59.0', require: false gem 'haml_lint', '~> 0.36.0', require: false @@ -408,7 +409,7 @@ group :test do gem 'rspec_profiling', '~> 0.0.6' gem 'rspec-parameterized', require: false - gem 'capybara', '~> 3.33.0' + gem 'capybara', '~> 3.34.0' gem 'capybara-screenshot', '~> 1.0.22' gem 'selenium-webdriver', '~> 3.142' @@ -428,7 +429,7 @@ end gem 'octokit', '~> 4.15' # https://gitlab.com/gitlab-org/gitlab/issues/207207 -gem 'gitlab-mail_room', '~> 0.0.7', require: 'mail_room' +gem 'gitlab-mail_room', '~> 0.0.8', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' @@ -464,7 +465,7 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 13.5.0-rc2' +gem 'gitaly', '~> 13.8.0.pre.rc2' gem 'grpc', '~> 1.30.2' @@ -477,6 +478,7 @@ gem 'flipper', '~> 0.17.1' gem 'flipper-active_record', '~> 0.17.1' gem 'flipper-active_support_cache_store', '~> 0.17.1' gem 'unleash', '~> 0.1.5' +gem 'gitlab-experiment', '~> 0.4.5' # Structured logging gem 'lograge', '~> 0.5' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 64179847dd8c..26a757a76831 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -5,66 +5,66 @@ GEM abstract_type (0.0.7) acme-client (2.0.6) faraday (>= 0.17, < 2.0.0) - actioncable (6.0.3.3) - actionpack (= 6.0.3.3) + actioncable (6.0.3.4) + actionpack (= 6.0.3.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.3) - actionpack (= 6.0.3.3) - activejob (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionmailbox (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) mail (>= 2.7.1) - actionmailer (6.0.3.3) - actionpack (= 6.0.3.3) - actionview (= 6.0.3.3) - activejob (= 6.0.3.3) + actionmailer (6.0.3.4) + actionpack (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.3) - actionview (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionpack (6.0.3.4) + actionview (= 6.0.3.4) + activesupport (= 6.0.3.4) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.3) - actionpack (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + actiontext (6.0.3.4) + actionpack (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) nokogiri (>= 1.8.5) - actionview (6.0.3.3) - activesupport (= 6.0.3.3) + actionview (6.0.3.4) + activesupport (= 6.0.3.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.3) - activesupport (= 6.0.3.3) + activejob (6.0.3.4) + activesupport (= 6.0.3.4) globalid (>= 0.3.6) - activemodel (6.0.3.3) - activesupport (= 6.0.3.3) - activerecord (6.0.3.3) - activemodel (= 6.0.3.3) - activesupport (= 6.0.3.3) + activemodel (6.0.3.4) + activesupport (= 6.0.3.4) + activerecord (6.0.3.4) + activemodel (= 6.0.3.4) + activesupport (= 6.0.3.4) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.0.3.3) - actionpack (= 6.0.3.3) - activejob (= 6.0.3.3) - activerecord (= 6.0.3.3) + activestorage (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) marcel (~> 0.3.1) - activesupport (6.0.3.3) + activesupport (6.0.3.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - acts-as-taggable-on (6.5.0) - activerecord (>= 5.0, < 6.1) + acts-as-taggable-on (7.0.0) + activerecord (>= 5.0, < 6.2) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) @@ -76,7 +76,7 @@ GEM apollo_upload_server (2.0.2) graphql (>= 1.8) rails (>= 4.2) - asana (0.10.2) + asana (0.10.3) faraday (~> 1.0) faraday_middleware (~> 1.0) faraday_middleware-multi_json (~> 0.0) @@ -84,6 +84,8 @@ GEM asciidoctor (2.0.10) asciidoctor-include-ext (0.3.1) asciidoctor (>= 1.5.6, < 3.0.0) + asciidoctor-kroki (0.2.2) + asciidoctor (~> 2.0) asciidoctor-plantuml (0.0.12) asciidoctor (>= 1.5.6, < 3.0.0) ast (2.4.1) @@ -113,13 +115,14 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.2.1) aws-eventstream (~> 1, >= 1.0.2) - azure-storage-blob (2.0.0) + azure-storage-blob (2.0.1) azure-storage-common (~> 2.0) - nokogiri (~> 1.10.4) - azure-storage-common (2.0.1) + nokogiri (~> 1.11.0.rc2) + azure-storage-common (2.0.2) faraday (~> 1.0) faraday_middleware (~> 1.0.0.rc1) - nokogiri (~> 1.10.4) + net-http-persistent (~> 4.0) + nokogiri (~> 1.11.0.rc2) babosa (1.0.2) base32 (0.3.2) batch-loader (1.4.0) @@ -149,7 +152,7 @@ GEM bundler (>= 1.2.0, < 3) thor (~> 0.18) byebug (11.1.3) - capybara (3.33.0) + capybara (3.34.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -177,7 +180,7 @@ GEM open4 (~> 1.3) coderay (1.1.3) colored2 (3.1.2) - commonmarker (0.20.1) + commonmarker (0.21.0) ruby-enum (~> 0.5) concord (0.1.5) adamantium (~> 0.2.0) @@ -220,21 +223,22 @@ GEM debugger-ruby_core_source (1.3.8) deckar01-task_list (2.3.1) html-pipeline - declarative (0.0.10) + declarative (0.0.20) declarative-option (0.1.0) default_value_for (3.3.0) activerecord (>= 3.2.0, < 6.1) - derailed_benchmarks (1.7.0) + deprecation_toolkit (1.5.1) + activesupport (>= 4.2) + derailed_benchmarks (1.8.1) benchmark-ips (~> 2) get_process_mem (~> 0) heapy (~> 0) memory_profiler (~> 0) - mini_histogram (~> 0) + mini_histogram (>= 0.2.1) rack (>= 1) rake (> 10, < 14) ruby-statistics (>= 2.1) thor (>= 0.19, < 2) - unicode_plot (>= 0.0.4, < 1.0.0) device_detector (1.0.0) devise (4.7.3) bcrypt (~> 3.0) @@ -248,7 +252,7 @@ GEM devise (~> 4.0) railties (< 6.1) rotp (~> 2.0) - diff-lcs (1.3) + diff-lcs (1.4.4) diff_match_patch (0.1.0) diffy (3.3.0) discordrb-webhooks-blackst0ne (3.3.0) @@ -261,21 +265,19 @@ GEM doorkeeper-openid_connect (1.7.4) doorkeeper (>= 5.2, < 5.5) json-jwt (>= 1.11.0) - dry-configurable (0.11.5) + dry-configurable (0.12.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.4, >= 0.4.7) - dry-equalizer (~> 0.2) + dry-core (~> 0.5, >= 0.5.0) dry-container (0.7.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) - dry-core (0.4.9) + dry-core (0.5.0) concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-logic (1.0.6) + dry-logic (1.1.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.2) - dry-equalizer (~> 0.2) + dry-core (~> 0.5, >= 0.5) dry-types (1.4.0) concurrent-ruby (~> 1.0) dry-container (~> 0.3) @@ -305,7 +307,6 @@ GEM launchy (~> 2.1) mail (~> 2.7) encryptor (3.0.0) - enumerable-statistics (2.0.1) equalizer (0.0.11) erubi (1.9.0) escape_utils (1.2.1) @@ -317,11 +318,11 @@ GEM expression_parser (0.9.0) extended-markdown-filter (0.6.0) html-pipeline (~> 2.0) - factory_bot (5.1.0) - activesupport (>= 4.2.0) - factory_bot_rails (5.1.0) - factory_bot (~> 5.1.0) - railties (>= 4.2.0) + factory_bot (6.1.0) + activesupport (>= 5.0.0) + factory_bot_rails (6.1.0) + factory_bot (~> 6.1.0) + railties (>= 5.0.0) faraday (1.0.1) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.7) @@ -359,7 +360,7 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.5.2) + fog-aws (3.8.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -369,11 +370,11 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types - fog-google (1.11.0) + fog-google (1.12.0) fog-core (<= 2.1.0) fog-json (~> 1.2) fog-xml (~> 0.1.0) - google-api-client (>= 0.32, < 0.34) + google-api-client (>= 0.44.2, < 0.51) google-cloud-env (~> 1.2) fog-json (1.2.0) fog-core @@ -392,8 +393,6 @@ GEM fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) - font-awesome-rails (4.7.0.5) - railties (>= 3.2, < 6.1) formatador (0.2.5) fugit (1.2.1) et-orbi (~> 1.1, >= 1.1.8) @@ -418,11 +417,14 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (13.5.0.pre.rc2) + gitaly (13.8.0.pre.rc2) grpc (~> 1.0) github-markup (1.7.0) gitlab-chronic (0.10.5) numerizer (~> 0.2) + gitlab-experiment (0.4.5) + activesupport (>= 3.0) + scientist (~> 1.5, >= 1.5.0) gitlab-fog-azure-rm (1.0.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) @@ -430,30 +432,29 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.13.1) - actionpack (>= 5.0.0, < 6.1.0) - activesupport (>= 5.0.0, < 6.1.0) + gitlab-labkit (0.14.0) + actionpack (>= 5.0.0, < 7.0.0) + activesupport (>= 5.0.0, < 7.0.0) + gitlab-pg_query (~> 1.3) grpc (~> 1.19) jaeger-client (~> 1.1) opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) - gitlab-mail_room (0.0.7) + gitlab-mail_room (0.0.8) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) - gitlab-pg_query (1.3.0) - gitlab-puma (4.3.5.gitlab.3) - nio4r (~> 2.0) - gitlab-puma_worker_killer (0.1.1.gitlab.1) - get_process_mem (~> 0.2) - gitlab-puma (>= 2.7, < 5) + gitlab-pg_query (1.3.1) + gitlab-pry-byebug (3.9.0) + byebug (~> 11.0) + pry (~> 0.13.0) gitlab-sidekiq-fetcher (0.5.2) sidekiq (~> 5) - gitlab-styles (5.1.0) - rubocop (~> 0.89.1) - rubocop-gitlab-security (~> 0.1.0) - rubocop-performance (~> 1.8.1) - rubocop-rails (~> 2.8) + gitlab-styles (6.0.0) + rubocop (~> 0.91.1) + rubocop-gitlab-security (~> 0.1.1) + rubocop-performance (~> 1.9.2) + rubocop-rails (~> 2.9) rubocop-rspec (~> 1.44) gitlab_chronic_duration (0.10.6.2) numerizer (~> 0.2) @@ -468,20 +469,21 @@ GEM actionpack (>= 3.0) multi_json request_store (>= 1.0) - google-api-client (0.33.2) + google-api-client (0.50.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) + rexml signet (~> 0.12) google-cloud-env (1.4.0) faraday (>= 0.17.3, < 2.0) google-protobuf (3.12.4) googleapis-common-protos-types (1.0.5) google-protobuf (~> 3.11) - googleauth (0.12.0) + googleauth (0.14.0) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -490,7 +492,7 @@ GEM signet (~> 0.14) gpgme (2.0.20) mini_portile2 (~> 2.3) - grape (1.4.0) + grape (1.5.1) activesupport builder dry-types (>= 1.1) @@ -500,10 +502,11 @@ GEM grape-entity (0.7.1) activesupport (>= 4.0) multi_json (>= 1.3.2) - grape-path-helpers (1.5.0) + grape-path-helpers (1.6.1) activesupport grape (~> 1.3) rake (> 12) + ruby2_keywords (~> 0.0.2) grape_logging (1.8.3) grape rack @@ -566,11 +569,12 @@ GEM hashie (>= 3.0) health_check (3.0.0) railties (>= 5.0) - heapy (0.1.4) + heapy (0.2.0) + thor hipchat (1.5.2) httparty mimemagic - html-pipeline (2.12.2) + html-pipeline (2.13.2) activesupport (>= 2) nokogiri (>= 1.4) html2text (0.2.0) @@ -591,18 +595,18 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.8.5) + i18n (1.8.7) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) ice_nine (0.11.2) - invisible_captcha (0.12.1) - rails (>= 3.2.0) + invisible_captcha (1.1.0) + rails (>= 4.2) ipaddress (0.8.3) jaeger-client (1.1.0) opentracing (~> 0.3) thrift - jira-ruby (2.0.0) + jira-ruby (2.1.4) activesupport atlassian-jwt multipart-post @@ -679,7 +683,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.7.0) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -688,10 +692,10 @@ GEM mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - marginalia (1.9.0) + marginalia (1.10.0) actionpack (>= 2.3) activerecord (>= 2.3) - memoist (0.16.0) + memoist (0.16.2) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) memory_profiler (0.9.14) @@ -700,10 +704,10 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2020.0512) mimemagic (0.3.5) - mini_histogram (0.1.3) + mini_histogram (0.3.1) mini_magick (4.10.1) mini_mime (1.0.2) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) minitest (5.11.3) ms_rest (0.7.6) concurrent-ruby (~> 1.0) @@ -723,17 +727,19 @@ GEM ruby2_keywords (~> 0.0.1) mustermann-grape (1.0.1) mustermann (>= 1.0.0) - nakayoshi_fork (0.0.4) nap (1.1.0) nenv (0.3.0) - net-ldap (0.16.2) + net-http-persistent (4.0.0) + connection_pool (~> 2.2) + net-ldap (0.16.3) net-ntp (2.1.3) net-ssh (6.0.0) netrc (0.11.0) nio4r (2.5.4) no_proxy_fix (0.1.2) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) notiffany (0.1.3) @@ -832,14 +838,15 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - os (1.0.0) - parallel (1.19.2) - parser (2.7.2.0) + os (1.1.1) + parallel (1.20.1) + parser (3.0.0.0) ast (~> 2.4.1) parslet (1.8.2) peek (1.1.0) railties (>= 4.0.0) pg (1.2.3) + pg_query (1.3.0) png_quantizator (0.2.1) po_to_json (1.0.1) json (>= 1.6.0) @@ -859,14 +866,20 @@ GEM pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.9.0) - byebug (~> 11.0) - pry (~> 0.13.0) pry-rails (0.3.9) pry (>= 0.10.4) + pry-remote (0.1.8) + pry (~> 0.9) + slop (~> 3.0) public_suffix (4.0.6) + puma (5.1.1) + nio4r (~> 2.0) + puma_worker_killer (0.3.1) + get_process_mem (~> 0.2) + puma (>= 2.7) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) + racc (1.5.2) rack (2.2.3) rack-accept (0.4.5) rack (>= 0.4) @@ -887,20 +900,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.2) - rails (6.0.3.3) - actioncable (= 6.0.3.3) - actionmailbox (= 6.0.3.3) - actionmailer (= 6.0.3.3) - actionpack (= 6.0.3.3) - actiontext (= 6.0.3.3) - actionview (= 6.0.3.3) - activejob (= 6.0.3.3) - activemodel (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + rails (6.0.3.4) + actioncable (= 6.0.3.4) + actionmailbox (= 6.0.3.4) + actionmailer (= 6.0.3.4) + actionpack (= 6.0.3.4) + actiontext (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) + activemodel (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) bundler (>= 1.3.0) - railties (= 6.0.3.3) + railties (= 6.0.3.4) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -914,15 +927,15 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.0.3.3) - actionpack (= 6.0.3.3) - activesupport (= 6.0.3.3) + railties (6.0.3.4) + actionpack (= 6.0.3.4) + activesupport (= 6.0.3.4) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) raindrops (0.19.1) - rake (13.0.1) + rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -977,30 +990,30 @@ GEM rexml (3.2.4) rinku (2.0.0) rotp (2.1.2) - rouge (3.25.0) + rouge (3.26.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.0) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) + rspec-support (~> 3.10.0) rspec-parameterized (0.4.2) binding_ninja (>= 0.2.3) parser proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (4.0.0) + rspec-rails (4.0.1) actionpack (>= 4.2) activesupport (>= 4.2) railties (>= 4.2) @@ -1010,7 +1023,7 @@ GEM rspec-support (~> 3.9) rspec-retry (0.6.1) rspec-core (> 3.3) - rspec-support (3.9.2) + rspec-support (3.10.0) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) rspec_profiling (0.0.6) @@ -1018,35 +1031,35 @@ GEM pg rails sqlite3 - rubocop (0.89.1) + rubocop (0.91.1) parallel (~> 1.10) parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.7) rexml - rubocop-ast (>= 0.3.0, < 1.0) + rubocop-ast (>= 0.4.0, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) rubocop-ast (0.8.0) parser (>= 2.7.1.5) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-performance (1.8.1) - rubocop (>= 0.87.0) + rubocop-performance (1.9.2) + rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.8.1) + rubocop-rails (2.9.1) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.87.0) + rubocop (>= 0.90.0, < 2.0) rubocop-rspec (1.44.1) rubocop (~> 0.87) rubocop-ast (>= 0.7.1) - ruby-enum (0.7.2) + ruby-enum (0.8.0) i18n ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-prof (1.3.1) - ruby-progressbar (1.10.1) + ruby-progressbar (1.11.0) ruby-saml (1.7.2) nokogiri (>= 1.5.10) ruby-statistics (2.1.2) @@ -1081,6 +1094,7 @@ GEM sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) + scientist (1.5.0) scss_lint (0.59.0) sass (~> 3.5, >= 3.5.5) securecompare (1.0.0) @@ -1119,6 +1133,7 @@ GEM simplecov-html (0.12.2) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.4) + slop (3.6.0) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) spring (2.1.1) @@ -1135,12 +1150,12 @@ GEM sshkey (2.0.0) stackprof (0.2.15) state_machines (0.5.0) - state_machines-activemodel (0.7.1) - activemodel (>= 4.1) + state_machines-activemodel (0.8.0) + activemodel (>= 5.1) state_machines (>= 0.5.0) - state_machines-activerecord (0.6.0) - activerecord (>= 4.1) - state_machines-activemodel (>= 0.5.0) + state_machines-activerecord (0.8.0) + activerecord (>= 5.1) + state_machines-activemodel (>= 0.8.0) swd (1.1.2) activesupport (>= 3) attr_required (>= 0.0.5) @@ -1161,7 +1176,7 @@ GEM rack (>= 1, < 3) thor (0.20.3) thread_safe (0.3.6) - thrift (0.13.0) + thrift (0.14.0) tilt (2.0.10) timecop (0.9.1) timeliness (0.3.10) @@ -1177,7 +1192,7 @@ GEM truncato (0.7.11) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) - tzinfo (1.2.8) + tzinfo (1.2.9) thread_safe (~> 0.1) u2f (0.2.1) uber (0.1.0) @@ -1185,8 +1200,6 @@ GEM unf_ext unf_ext (0.0.7.7) unicode-display_width (1.7.0) - unicode_plot (0.0.4) - enumerable-statistics (>= 2.0.1) unicode_utils (1.4.0) unicorn (5.5.5) kgio (~> 2.6) @@ -1215,7 +1228,7 @@ GEM validate_url (1.0.8) activemodel (>= 3.0.0) public_suffix - validates_hostname (1.0.10) + validates_hostname (1.0.11) activerecord (>= 3.0) activesupport (>= 3.0) version_sorter (2.2.4) @@ -1239,6 +1252,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.6.1) websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -1251,7 +1265,7 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yajl-ruby (1.4.1) - zeitwerk (2.4.1) + zeitwerk (2.4.2) PLATFORMS ruby @@ -1260,13 +1274,14 @@ DEPENDENCIES RedCloth (~> 4.3.2) acme-client (~> 2.0, >= 2.0.6) activerecord-explain-analyze (~> 0.1) - acts-as-taggable-on (~> 6.0) + acts-as-taggable-on (~> 7.0) addressable (~> 2.7) akismet (~> 3.0) apollo_upload_server (~> 2.0.2) - asana (= 0.10.2) + asana (~> 0.10.3) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) + asciidoctor-kroki (~> 0.2.2) asciidoctor-plantuml (~> 0.0.12) atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.1.0) @@ -1288,11 +1303,11 @@ DEPENDENCIES browser (~> 4.2) bullet (~> 6.1.0) bundler-audit (~> 0.6.1) - capybara (~> 3.33.0) + capybara (~> 3.34.0) capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) - commonmarker (~> 0.20) + commonmarker (~> 0.21) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 3.0) @@ -1302,6 +1317,7 @@ DEPENDENCIES database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.1) default_value_for (~> 3.3.0) + deprecation_toolkit (~> 1.5.1) derailed_benchmarks device_detector devise (~> 4.7.2) @@ -1319,7 +1335,7 @@ DEPENDENCIES email_spec (~> 2.2.0) erubi (~> 1.9.0) escape_utils (~> 1.1) - factory_bot_rails (~> 5.1.0) + factory_bot_rails (~> 6.1.0) faraday (~> 1.0) faraday_middleware-aws-sigv4 (~> 0.3.0) fast_blank @@ -1329,42 +1345,40 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.17.1) flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.5) + fog-aws (~> 3.8) fog-core (= 2.1.0) - fog-google (~> 1.11) + fog-google (~> 1.12) fog-local (~> 0.6) fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) - font-awesome-rails (~> 4.7) fugit (~> 1.2.1) fuubar (~> 2.2.0) gemojione (~> 3.3) gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 13.5.0.pre.rc2) + gitaly (~> 13.8.0.pre.rc2) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) + gitlab-experiment (~> 0.4.5) gitlab-fog-azure-rm (~> 1.0) - gitlab-labkit (= 0.13.1) + gitlab-labkit (= 0.14.0) gitlab-license (~> 1.0) - gitlab-mail_room (~> 0.0.7) + gitlab-mail_room (~> 0.0.8) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) - gitlab-pg_query (~> 1.3) - gitlab-puma (~> 4.3.3.gitlab.2) - gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) + gitlab-pry-byebug gitlab-sidekiq-fetcher (= 0.5.2) - gitlab-styles (~> 5.1.0) + gitlab-styles (~> 6.0.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.33) google-protobuf (~> 3.12) gpgme (~> 2.0.19) - grape (= 1.4.0) + grape (~> 1.5.1) grape-entity (~> 0.7.1) - grape-path-helpers (~> 1.5) + grape-path-helpers (~> 1.6.1) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) graphlient (~> 0.4.0) @@ -1380,13 +1394,13 @@ DEPENDENCIES hashie-forbidden_attributes health_check (~> 3.0) hipchat (~> 1.5.0) - html-pipeline (~> 2.12) + html-pipeline (~> 2.13.2) html2text httparty (~> 0.16.4) icalendar - invisible_captcha (~> 0.12.1) + invisible_captcha (~> 1.1.0) ipaddress (~> 0.8.3) - jira-ruby (~> 2.0.0) + jira-ruby (~> 2.1.4) js_regex (~> 3.4) json (~> 2.3.0) json-schema (~> 2.8.0) @@ -1404,18 +1418,17 @@ DEPENDENCIES loofah (~> 2.2) lru_redux mail (= 2.7.1) - marginalia (~> 1.9.0) + marginalia (~> 1.10.0) memory_profiler (~> 0.9) method_source (~> 1.0) mimemagic (~> 0.3.2) mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) - nakayoshi_fork (~> 0.0.4) - net-ldap + net-ldap (~> 0.16.3) net-ntp net-ssh (~> 6.0) - nokogiri (~> 1.10.9) + nokogiri (~> 1.11.1) oauth2 (~> 1.4) octokit (~> 4.15) oj (~> 3.10.6) @@ -1441,11 +1454,14 @@ DEPENDENCIES parallel (~> 1.19) peek (~> 1.1) pg (~> 1.1) + pg_query (~> 1.3.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.12.0) - pry-byebug (~> 3.9.0) pry-rails (~> 0.3.9) + pry-remote + puma (~> 5.1.1) + puma_worker_killer (~> 0.3.1) rack (~> 2.2.3) rack-attack (~> 6.3.0) rack-cors (~> 1.0.6) @@ -1468,16 +1484,16 @@ DEPENDENCIES request_store (~> 1.5) responders (~> 3.0) retriable (~> 3.1.2) - rouge (~> 3.25.0) + rouge (~> 3.26.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized - rspec-rails (~> 4.0.0) + rspec-rails (~> 4.0.1) rspec-retry (~> 0.6.1) rspec_junit_formatter rspec_profiling (~> 0.0.6) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 1.3.0) - ruby-progressbar + ruby-progressbar (~> 1.10) ruby_parser (~> 3.15) rubyzip (~> 2.0.0) rugged (~> 0.28) @@ -1501,11 +1517,12 @@ DEPENDENCIES sprockets (~> 3.7.0) sshkey (~> 2.0) stackprof (~> 0.2.15) - state_machines-activerecord (~> 0.6.0) + state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.1.6) terser (= 1.0.2) test-prof (~> 0.12.0) thin (~> 1.7.0) + thrift (>= 0.14.0) timecop (~> 0.9.1) toml-rb (~> 1.0.0) truncato (~> 0.7.11) @@ -1515,11 +1532,12 @@ DEPENDENCIES unicorn-worker-killer (~> 0.4.4) unleash (~> 0.1.5) valid_email (~> 0.1) - validates_hostname (~> 1.0.10) + validates_hostname (~> 1.0.11) version_sorter (~> 2.2.4) vmstat (~> 2.3.0) webauthn (~> 2.3) webmock (~> 3.9.1) + webrick (~> 1.6.1) wikicloth (= 0.8.1) yajl-ruby (~> 1.4.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 1a54cd120680..d13ca2986359 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -26,10 +26,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpmxbprsqclna9xpa6b7sspjb89p6jqfxalasa9f984hx77dx27"; + sha256 = "0y3aa0965cdsqamxk8ac6brcvijl1zv4pvqils6xy3pbcrv0ljid"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0smcxpn3glnmid3v2pk04sb3bdifbw7ad1c7fq6wfijkrpih8jiw"; + sha256 = "10vb9s4frq22h5j6gyw2598k1jc29lg2czm95hf284l3mi4qly6a"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -48,10 +48,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1spq0dbfn0qkqg9sq0rsjn360b4j36zly8hawaivkrwr3rsvyz75"; + sha256 = "1ykn5qkwdlcv5aa1gjhhmrxpjccwa7df6n4amvkmvxv5lggyma52"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -59,10 +59,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p873nqwmpsvmkb5n86d70wndx1qhy15pc9mbcd1mc8sj174578b"; + sha256 = "0fbjpnh5hrihc9l35q9why6ip0hcdj42axzbp6b4j1xcy1v1bicj"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -70,10 +70,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05ysfz9dwnncdx0g452by7jdr35yryz6lmcrbb4r5wgjm57b4n25"; + sha256 = "0r0j0m76ynjspmvj5qbzl06kl9i920v269iz62y62009xydv6rqz"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -81,10 +81,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08pvmjddlw01q5r9zdfgddwp4csndpf5i2w47677z5r36jznz36q"; + sha256 = "0gdz31cq08nrqq6bxqim2qcbzv0fr34z6ycl73dmawpafj33wdkj"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -92,10 +92,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w54ckvc229iaax879hkhyc93j7z8p0v7acp6mk3h8xjfvmwy5jp"; + sha256 = "0d0p8gjplrgym38dmchyzhv7lrrxngz0yrxl6xyvwxfxm1hgdk2k"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activemodel = { dependencies = ["activesupport"]; @@ -103,10 +103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "166jlx6kbby01vr37srh081a9fykgsz873yg5i9gl2ar3vw9gs56"; + sha256 = "00jj8namy5niq7grl5lrsr4y351rxpj1b69k1i9gvb1hnpghl099"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y2a4ss6ld6yrhpcbcb3kjn5gj6zk9qklp2aq5rl1awl8vbdbdb7"; + sha256 = "06qvvp73z8kq9sd2mhw6p9124q5pfkswjga2fidz4c73zbr79r3g"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -136,10 +136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nvfjkq979m1h4mk1ys7m4irwpswn4l9arb9yi06ffqpi1lpfl31"; + sha256 = "0q734331wb7cfsh4jahj3lphpxvglzb17yvibwss1ml4g01xxm52"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -147,10 +147,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dmkqbvndbz011a1byg6f990936vfadbnwjwjw9vjzr4kd8bxk96"; + sha256 = "1axidc4mikgi4yxs0ynw2c54jyrs5lxprxmzv6m3aayi9rg6rk5j"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -158,10 +158,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nvhd986xa6llyjnhikq4h1nrcf5b9r9s11if25qsj8358inrpga"; + sha256 = "09m7lvm6id8mm8y9qycjr54l9gyqfb43x6yjz23cggisjg0px1fv"; type = "gem"; }; - version = "6.5.0"; + version = "7.0.0"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -232,10 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c8n8i3jb2q09l6rgcw0lb4sq85jzz6vywqlrd0ivq989zh3sq2l"; + sha256 = "14cs2k802hlvlmn0nwnx4k3g44944x0a8dsj3k14mjnbvcw1fkxh"; type = "gem"; }; - version = "0.10.2"; + version = "0.10.3"; }; asciidoctor = { groups = ["default"]; @@ -258,6 +258,17 @@ }; version = "0.3.1"; }; + asciidoctor-kroki = { + dependencies = ["asciidoctor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10yc07x2z9f122wnncf34s91vlfcd4wy8y9wshxc7j2m4a2jlzm5"; + type = "gem"; + }; + version = "0.2.2"; + }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; groups = ["default"]; @@ -412,21 +423,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qpvjyaq8478hw4cxcf8lr303wn8g9mhrfmvihyzn3zn9hll4zvd"; + sha256 = "01psx005lkrfk3zm816z76fa2pv4hd8jk7hxrjyy4hbvgcqi6rfy"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.1"; }; azure-storage-common = { - dependencies = ["faraday" "faraday_middleware" "nokogiri"]; + dependencies = ["faraday" "faraday_middleware" "net-http-persistent" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nhjw77r65xrkdn2h6cd76mglgx676hyr58igyfb9f7zbgvjp69s"; + sha256 = "0h5bwswc5768hblcxsschjz3y0lf9kvz3k7qqwypdhy8sr1lfxg8"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; babosa = { groups = ["default"]; @@ -624,10 +635,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ji9kyb01dpnjbvpyb0c481cpnisd6wx6div6rywi9fihk66627w"; + sha256 = "1i1bm7r8n67cafd9p3ck7vdmng921b41n9znvlfaz7cy8a3gsrgm"; type = "gem"; }; - version = "3.33.0"; + version = "3.34.0"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; @@ -762,10 +773,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19zd9na1g2d0zzbqhmfj8rjfzcxj34vja3i52gvv859i8fifa461"; + sha256 = "0vwpkmwfr8lx8b6cfvwh56f1ygyf2da5ah37mxbdr9mxmfwig5fr"; type = "gem"; }; - version = "0.20.1"; + version = "0.21.0"; }; concord = { dependencies = ["adamantium" "equalizer"]; @@ -955,10 +966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j"; + sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0"; type = "gem"; }; - version = "0.0.10"; + version = "0.0.20"; }; declarative-option = { groups = ["default"]; @@ -981,16 +992,27 @@ }; version = "3.3.0"; }; - derailed_benchmarks = { - dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rake" "ruby-statistics" "thor" "unicode_plot"]; - groups = ["default"]; + deprecation_toolkit = { + dependencies = ["activesupport"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03lrvzvdjy6wyrnb3nw7nqn9jbhn6lncach58pj6m4l76b2n6jpr"; + sha256 = "1fh4d98irhph3ri7c2rrvvmmjd4z14702r8baq9flh5f34dap8d8"; type = "gem"; }; - version = "1.7.0"; + version = "1.5.1"; + }; + derailed_benchmarks = { + dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rake" "ruby-statistics" "thor"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05nryqr18w61dyk9amajh7chn07zxardxnywayyis72kmd8f9q29"; + type = "gem"; + }; + version = "1.8.1"; }; device_detector = { groups = ["default"]; @@ -1029,10 +1051,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz"; type = "gem"; }; - version = "1.3"; + version = "1.4.4"; }; diff_match_patch = { groups = ["default"]; @@ -1109,15 +1131,15 @@ version = "1.7.4"; }; dry-configurable = { - dependencies = ["concurrent-ruby" "dry-core" "dry-equalizer"]; + dependencies = ["concurrent-ruby" "dry-core"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "033x4gvynfm33pchmpd5iw9n4c9q46j8vbwbcdmvb8b2r0gpzfdn"; + sha256 = "0rvwvxrvcygvgfc3xjrihvdvnr0dh2144s8x80zfgfnz0jd5gac7"; type = "gem"; }; - version = "0.11.5"; + version = "0.12.0"; }; dry-container = { dependencies = ["concurrent-ruby" "dry-configurable"]; @@ -1136,10 +1158,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k9ff2sr4ymiwzg4mchzv66mn6rdsgjlinm6s4x5x91yhd0h4vpk"; + sha256 = "14s45hxcqpp2mbvwlwzn018i8qhcjzgkirigdrv31jd741rpgy9s"; type = "gem"; }; - version = "0.4.9"; + version = "0.5.0"; }; dry-equalizer = { groups = ["default"]; @@ -1162,15 +1184,15 @@ version = "0.2.0"; }; dry-logic = { - dependencies = ["concurrent-ruby" "dry-core" "dry-equalizer"]; + dependencies = ["concurrent-ruby" "dry-core"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cqvylwv71sm9zrb0lpxmghn20zxnjswxwyhaj8y2wfniffyjgkc"; + sha256 = "17dnc3g9y2nj42rdx2bdvsvvms10vgw4qzjb2iw2gln9hj8b797c"; type = "gem"; }; - version = "1.0.6"; + version = "1.1.0"; }; dry-types = { dependencies = ["concurrent-ruby" "dry-container" "dry-core" "dry-equalizer" "dry-inflector" "dry-logic"]; @@ -1289,16 +1311,6 @@ }; version = "3.0.0"; }; - enumerable-statistics = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ac2f5g4m58l6bmap1ak6vgqykz2hy9n3c8r6dmlr2xjybdryc1f"; - type = "gem"; - }; - version = "2.0.1"; - }; equalizer = { groups = ["default" "development" "test"]; platforms = []; @@ -1397,10 +1409,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04mvwcdh1056r79vq969vlncrcy53fkhw0iixpqvp8gnx5ajbsv6"; + sha256 = "11ij9s4hasy963qjqbrrf0m8lm9m9pxkh2vf4wrnafa6gw6r9qk8"; type = "gem"; }; - version = "5.1.0"; + version = "6.1.0"; }; factory_bot_rails = { dependencies = ["factory_bot" "railties"]; @@ -1408,10 +1420,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02q7lwfdilwahza2jz0p0kc2rragv617q9r2yy72syv6lfy923sx"; + sha256 = "0hfxkq6rarg0b8xfzqg200xyj176sn1xplqqqcrz5drhkqp30m14"; type = "gem"; }; - version = "5.1.0"; + version = "6.1.0"; }; faraday = { dependencies = ["multipart-post"]; @@ -1590,10 +1602,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "086kyvdhf1k8nk7f4gmybjc3k0m88f9pw99frddcy1w96pj5kyg4"; + sha256 = "1q7n8r03akjbdz3r2bgsl6wcjvdlf0k508z8bsd9zgs43qg14vc9"; type = "gem"; }; - version = "3.5.2"; + version = "3.8.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1612,10 +1624,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h9apmm2pyb157pbnrqk37wfs2d9f35navsgzs3kclrxhyl2qm5f"; + sha256 = "1cl6rprichdn1i40c2ndri1c53cfb0x2xk58l9arwip9ivkasln4"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -1672,17 +1684,6 @@ }; version = "0.1.3"; }; - font-awesome-rails = { - dependencies = ["railties"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a32q69rdsdw9zhmf2cflvvnikg20amidhn40sv2afw2qk91fcrz"; - type = "gem"; - }; - version = "4.7.0.5"; - }; formatador = { groups = ["default"]; platforms = []; @@ -1797,10 +1798,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1l0c1yjnhr451jj845h2vd9s00grjiyj2w9r1b9y3bscsyzs0m"; + sha256 = "0kns9lw8gdxm61vyvf3jin448zrl2h3qdx2ggilzxig28hdi0vha"; type = "gem"; }; - version = "13.5.0.pre.rc2"; + version = "13.8.0.pre.rc2"; }; github-markup = { groups = ["default"]; @@ -1823,6 +1824,17 @@ }; version = "0.10.5"; }; + gitlab-experiment = { + dependencies = ["activesupport" "scientist"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v8ygrc2c98rz72za59g313n1mmr18jdbzr965lkp2zv2rw7cs9n"; + type = "gem"; + }; + version = "0.4.5"; + }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; groups = ["default"]; @@ -1835,15 +1847,15 @@ version = "1.0.0"; }; gitlab-labkit = { - dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"]; + dependencies = ["actionpack" "activesupport" "gitlab-pg_query" "grpc" "jaeger-client" "opentracing" "redis"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cnrpqswicawhpvd4dh4jcma9d4haznc4gyl37ssvj1jkfhc4w40"; + sha256 = "0l4sbvlk6qc0x8372rp1gc2ihmx3vp0afrm5cy55xhflq16y7sl1"; type = "gem"; }; - version = "0.13.1"; + version = "0.14.0"; }; gitlab-license = { groups = ["default"]; @@ -1860,10 +1872,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14785l38sqrgf06y45ayhj3nhfqdar8vrsxna764vdsw01dngmin"; + sha256 = "05j8rpsbl2l5q4xnfh2cnws9axy1a19asg8nlw6jngba94raw5ir"; type = "gem"; }; - version = "0.0.7"; + version = "0.0.8"; }; gitlab-markup = { groups = ["default"]; @@ -1890,32 +1902,25 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xvzs8gy6vbddzf9kin92lqb99vzwljikfgqvxbxqm7hzl16dilq"; + sha256 = "1rybirjyclavp641qdx27483xx0zpmc577wdzfgdnjd7753bya7g"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; - gitlab-puma = { - dependencies = ["nio4r"]; - groups = ["puma"]; - platforms = []; + gitlab-pry-byebug = { + dependencies = ["byebug" "pry"]; + groups = ["development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05hazn3cq079zynj0viagly6bgh4x7pb2vqki9rgf2k39ljwrmld"; + sha256 = "0sp33vzzw8b7q9d8kb4pw8cl5fzlbffdpwz125x1g3kdiwz8xp3j"; type = "gem"; }; - version = "4.3.5.gitlab.3"; - }; - gitlab-puma_worker_killer = { - dependencies = ["get_process_mem" "gitlab-puma"]; - groups = ["puma"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0iagbqh4djbxfd18srvfg9qcxn845ibs3kf0q1sd57k27lxj0har"; - type = "gem"; - }; - version = "0.1.1.gitlab.1"; + version = "3.9.0"; }; gitlab-sidekiq-fetcher = { dependencies = ["sidekiq"]; @@ -1934,10 +1939,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l24vgcmvval1apqk99c3ifcwlg1fh60vf02ggnc20f65dka81p3"; + sha256 = "17d238cy031gnjmrk6wl3qyk5kqhqjxrb68813n4y9ia817xmwyp"; type = "gem"; }; - version = "5.1.0"; + version = "6.0.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -1984,15 +1989,15 @@ version = "6.2.0"; }; google-api-client = { - dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"]; + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13y6xara8w211y88pxa8bcbg6y40vkidqk854zl7z4csmgfnplxq"; + sha256 = "05ynbapd26wppcqa81kw6kb8a39mzp0fql1rwmk3lgr95ybmxr1s"; type = "gem"; }; - version = "0.33.2"; + version = "0.50.0"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -2032,10 +2037,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rsk471ld98pxhvzig3lnw9i13454c9nschvzxvq6vjqnn9ip0yh"; + sha256 = "0cm60nbmwzf83fzy06f3iyn5a6sw91siw8x9bdvpwwmjsmivana6"; type = "gem"; }; - version = "0.12.0"; + version = "0.14.0"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -2054,10 +2059,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03ylzpn9mng9kwk472xbsfnqcbnm0qcjjlscp17hijvpvafd8a09"; + sha256 = "0lizcma35sygkd3q7zjv13mrr905ncn80f1ym6n305s75kc0pk9n"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.1"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -2071,15 +2076,15 @@ version = "0.7.1"; }; grape-path-helpers = { - dependencies = ["activesupport" "grape" "rake"]; + dependencies = ["activesupport" "grape" "rake" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "131s6a0xa0fj7w5d6xb2p2z3404w6rxbc33v7fcg50jrjgqphrjz"; + sha256 = "1xdp7b5fnvm89szy8ghpl6wm125iq7f0qnhibj5bxqrvg3xyhc2m"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.1"; }; grape_logging = { dependencies = ["grape" "rack"]; @@ -2296,14 +2301,15 @@ version = "3.0.0"; }; heapy = { - groups = ["default"]; + dependencies = ["thor"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r9f38fpgjgaxskkwvsliijj6vfmgsff9pnranvvvzkdl67hk1hw"; + sha256 = "1sl56ma851i82g3ax08igbn48igriiy152xzx30wgzv1bn21w53l"; type = "gem"; }; - version = "0.1.4"; + version = "0.2.0"; }; hipchat = { dependencies = ["httparty" "mimemagic"]; @@ -2322,10 +2328,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19hc7njr029pzqljpfhzhdi0p2rgn8ihn3bdnai2apy6nj1g1sg2"; + sha256 = "00xqmlny1b4ixff8sk0rkl4wcgwqc6v93qv8l3rn8d1dppvq7pm1"; type = "gem"; }; - version = "2.12.2"; + version = "2.13.2"; }; html2text = { dependencies = ["nokogiri"]; @@ -2428,10 +2434,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.7"; }; i18n_data = { groups = ["default"]; @@ -2469,10 +2475,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15510dh1vh7l2xs2a4956nhxpnf10168r62i497nmcbyqpp1df88"; + sha256 = "1lmlx3g4z894vwsgbpxhpmkn63n74mynklbwy07l7ccak552jw1n"; type = "gem"; }; - version = "0.12.1"; + version = "1.1.0"; }; ipaddress = { groups = ["default"]; @@ -2501,10 +2507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bfqb5qkgbcjrspspa2lha2is0anjnby20x9gp7bfjr5j5j9my32"; + sha256 = "17nv98nz3jp7q5hbnniscavqh4xv53mnda1vxyg3ncn8raaw0rs2"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.4"; }; jmespath = { groups = ["default"]; @@ -2791,10 +2797,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq"; + sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; lru_redux = { groups = ["default"]; @@ -2844,20 +2850,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n870r50z859dkcjz6dqvbvm895rpzw047basvbbfv9gi22rlxlv"; + sha256 = "1003hf828anbd3pxwzs9ir9sclh64mgj971n4a7ilgj9xs8r0a38"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; memoist = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; + sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; type = "gem"; }; - version = "0.16.0"; + version = "0.16.2"; }; memoizable = { dependencies = ["thread_safe"]; @@ -2926,14 +2932,14 @@ version = "0.3.5"; }; mini_histogram = { - groups = ["default"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "127vmd85kwi85qjbb1431bi4j5gdy0pp6wrq1f88ja1pf3mlb50y"; + sha256 = "156xs8k7fqqcbk1fbf0ndz6gfw380fb2jrycfvhb06269r84n4ba"; type = "gem"; }; - version = "0.1.3"; + version = "0.3.1"; }; mini_magick = { groups = ["default"]; @@ -2960,10 +2966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitest = { groups = ["development" "test"]; @@ -3069,16 +3075,6 @@ }; version = "1.0.1"; }; - nakayoshi_fork = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mj5czi7rxxmfq4v9qjz74lcqypvnjxhxqfs71zhb2rsfa97a6jg"; - type = "gem"; - }; - version = "0.0.4"; - }; nap = { groups = ["default" "development"]; platforms = []; @@ -3099,15 +3095,26 @@ }; version = "0.3.0"; }; + net-http-persistent = { + dependencies = ["connection_pool"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sbdvkn7mzl883iykz74hgp14qj041gldf2vdk9g3gyqc843l2vr"; + type = "gem"; + }; + version = "4.0.0"; + }; net-ldap = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg"; + sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv"; type = "gem"; }; - version = "0.16.2"; + version = "0.16.3"; }; net-ntp = { groups = ["default"]; @@ -3160,15 +3167,15 @@ version = "0.1.2"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.1"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -3562,20 +3569,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk"; + sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.1"; }; parallel = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l"; + sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; type = "gem"; }; - version = "1.19.2"; + version = "1.20.1"; }; parser = { dependencies = ["ast"]; @@ -3583,10 +3590,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"; + sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml"; type = "gem"; }; - version = "2.7.2.0"; + version = "3.0.0.0"; }; parslet = { groups = ["default" "development" "test"]; @@ -3619,6 +3626,16 @@ }; version = "1.2.3"; }; + pg_query = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i9l3y502ddm2lq3ajhxhqq17vs9hgxkxm443yw221ccibcfh6qf"; + type = "gem"; + }; + version = "1.3.0"; + }; png_quantizator = { groups = ["development" "test"]; platforms = []; @@ -3708,21 +3725,6 @@ }; version = "0.13.1"; }; - pry-byebug = { - dependencies = ["byebug" "pry"]; - groups = ["development" "test"]; - platforms = [{ - engine = "maglev"; - } { - engine = "ruby"; - }]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "096y5vmzpyy4x9h4ky4cs4y7d19vdq9vbwwrqafbh5gagzwhifiv"; - type = "gem"; - }; - version = "3.9.0"; - }; pry-rails = { dependencies = ["pry"]; groups = ["development" "test"]; @@ -3734,6 +3736,17 @@ }; version = "0.3.9"; }; + pry-remote = { + dependencies = ["pry" "slop"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10g1wrkcy5v5qyg9fpw1cag6g5rlcl1i66kn00r7kwqkzrdhd7nm"; + type = "gem"; + }; + version = "0.1.8"; + }; public_suffix = { groups = ["default" "development" "test"]; platforms = []; @@ -3744,6 +3757,28 @@ }; version = "4.0.6"; }; + puma = { + dependencies = ["nio4r"]; + groups = ["puma"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13640p5fk19705ygp8j6p07lccag3d80bx8bmjgpd5zsxxsdc50b"; + type = "gem"; + }; + version = "5.1.1"; + }; + puma_worker_killer = { + dependencies = ["get_process_mem" "puma"]; + groups = ["puma"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jk1bhmx5px8y1ip4ky80cq5cwdaybdg4y55shd2vsdmjv938mcw"; + type = "gem"; + }; + version = "0.3.1"; + }; pyu-ruby-sasl = { groups = ["default"]; platforms = []; @@ -3764,6 +3799,16 @@ }; version = "1.1.6"; }; + racc = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rack = { groups = ["default" "development" "kerberos" "test"]; platforms = []; @@ -3867,10 +3912,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qqsiwsb13sxkvxj54aybjhbxqi45fyiykaz5isc1y9frm2yyw64"; + sha256 = "0vs4kfgp5pr5032nnhdapq60ga6karann06ilq1yjx8qck87cfxg"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -3922,10 +3967,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05b79r0ms8jrs91zml1190qfxmnmks90g0sd820ks9msyr8xdp7j"; + sha256 = "0x28620cvfja8r06lk6f90pw5lvijz9qi4bjsa4z1d1rkr3v4r3w"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; rainbow = { groups = ["default" "development" "test"]; @@ -3952,10 +3997,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; type = "gem"; }; - version = "13.0.1"; + version = "13.0.3"; }; rb-fsevent = { groups = ["default" "development" "test"]; @@ -4250,10 +4295,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn"; + sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; type = "gem"; }; - version = "3.25.0"; + version = "3.26.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4283,10 +4328,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h"; + sha256 = "1dwai7jnwmdmd7ajbi2q0k0lx1dh88knv5wl7c34wjmf94yv8w5q"; type = "gem"; }; - version = "3.9.0"; + version = "3.10.0"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -4294,10 +4339,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzc1wdjb1qnbimjl8i1q1r1z5hdv2lmcw7ysz7jawj4d1cvpqvd"; + sha256 = "0n2rdv8f26yw8c6asymc0mgddyr5d2b5n6mfvpd3n6lnpf1jdyv2"; type = "gem"; }; - version = "3.9.1"; + version = "3.10.0"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -4305,10 +4350,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fjbwvq7qaz6h3sh1bs9q2qiy4zwcrc8f7xwv82dx2bc09dmqzhd"; + sha256 = "0j37dvnvfbjwj8dqx27yfvz0frl7f2jc1abqg99h0ppriz9za6dc"; type = "gem"; }; - version = "3.9.1"; + version = "3.10.0"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -4316,10 +4361,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; + sha256 = "1pz89y1522i6f8wzrg72ykmch3318ih87nlpl0y1ghsrs5hqymw3"; type = "gem"; }; - version = "3.9.1"; + version = "3.10.0"; }; rspec-parameterized = { dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"]; @@ -4338,10 +4383,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01cyd449g4lsgrlck7nn3ynn8c8vwfhjb913y05wil56y77wsfkl"; + sha256 = "0lzik01ziaskgpdpy8knffpw0fsy9151f5lfigyhb89wq4q45hfs"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -4359,10 +4404,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zwpyq1na23pvgacpxs2v9nwfbjbw6x3arca5j3l1xagigqmzhc3"; + sha256 = "0j0n28i6zci5j7gg370bdy87dy43hlwx6dw428d9kamf5a0i2klz"; type = "gem"; }; - version = "3.9.2"; + version = "3.10.0"; }; rspec_junit_formatter = { dependencies = ["rspec-core"]; @@ -4392,10 +4437,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yh71v5d7aw6jz7505d2sv0n0ldf3wh0ly3lphdanjl0n8b42y9h"; + sha256 = "19nmdwz6mc5ah0xqlj1j58ylcp9zsckb1xm7p1z51abnqhcq5c06"; type = "gem"; }; - version = "0.89.1"; + version = "0.91.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -4425,10 +4470,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13v66wi5l56bvp97nlmyxscq8ipkzfha1g7nlhcrbikvmrm3h5kf"; + sha256 = "01aahh54r9mwhdj7v2s6kmkdm1k1n1z27dlknlbgm281ny1aswrk"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.2"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -4436,10 +4481,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14g703lv0cbqw504cdjsv0yydrsnm61rwg0n0mql4zl5hw1n7lfh"; + sha256 = "0h656la1g644g54g3gidz45p6v8i1156nw6bi66cfx7078y1339d"; type = "gem"; }; - version = "2.8.1"; + version = "2.9.1"; }; rubocop-rspec = { dependencies = ["rubocop" "rubocop-ast"]; @@ -4458,10 +4503,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; + sha256 = "0d3dyx2z41zd6va9dwn3q8caf710vzdaf57xspc0y17aqmnprwnw"; type = "gem"; }; - version = "0.7.2"; + version = "0.8.0"; }; ruby-fogbugz = { dependencies = ["crack"]; @@ -4489,10 +4534,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0"; }; ruby-saml = { dependencies = ["nokogiri"]; @@ -4663,6 +4708,16 @@ }; version = "0.8.2"; }; + scientist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09565ppvd851zxpspn5d5q28wqkfjyfxhvda9w80i16p3y937155"; + type = "gem"; + }; + version = "1.5.0"; + }; scss_lint = { dependencies = ["sass"]; groups = ["development" "test"]; @@ -4853,6 +4908,16 @@ }; version = "2.3.4"; }; + slop = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; + type = "gem"; + }; + version = "3.6.0"; + }; snowplow-tracker = { dependencies = ["contracts"]; groups = ["default"]; @@ -4953,10 +5018,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05c2dw3115zj3pmyyqh2iypc7afj8ibhrghisg0d61z7gzmir1rd"; + sha256 = "0b4dffzlj38adin6gm0ky72r5c507qdb1jprnm7h9gnlj2qxlcp9"; type = "gem"; }; - version = "0.7.1"; + version = "0.8.0"; }; state_machines-activerecord = { dependencies = ["activerecord" "state_machines-activemodel"]; @@ -4964,10 +5029,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12g7yqy11fpfiprzc86pwa9jjky1h3haxj37kg47467fgg43p511"; + sha256 = "1dmaf4f4cg3gamzgga3gamp0kv9lvianqzr9103dw0xbp00vfbq7"; type = "gem"; }; - version = "0.6.0"; + version = "0.8.0"; }; swd = { dependencies = ["activesupport" "attr_required" "httpclient"]; @@ -5089,10 +5154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08076cmdx0g51yrkd7dlxlr45nflink3jhdiq7006ljc2pc3212q"; + sha256 = "1v4q8wlc4kr952r24q9x60cvimn27g34h0j23imwqkrjcbngsj5n"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.0"; }; tilt = { groups = ["default" "development" "test"]; @@ -5194,10 +5259,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skr6ih9cr3pwp8l84f0z7fy3q9kiq8hw0sg3zqw0hpbbyj05743"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.8"; + version = "1.2.9"; }; u2f = { groups = ["default"]; @@ -5250,17 +5315,6 @@ }; version = "1.7.0"; }; - unicode_plot = { - dependencies = ["enumerable-statistics"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09cv90pi414ns1knbi0zjbn59071qjgym974jpsgj7yjh70dpj0g"; - type = "gem"; - }; - version = "0.0.4"; - }; unicode_utils = { groups = ["default"]; platforms = []; @@ -5374,10 +5428,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "066hkh3ihzhrp5a9knjgqqfi5dyv4z5hfrpdj4fpgxjkvkfaxivy"; + sha256 = "1hxqza44pvk6x6vb91cvllhw71hqziby06dk1s94rh9f6khbl1nm"; type = "gem"; }; - version = "1.0.10"; + version = "1.0.11"; }; version_sorter = { groups = ["default"]; @@ -5443,6 +5497,16 @@ }; version = "3.9.1"; }; + webrick = { + groups = ["metrics"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z6nv626lzfl7wx407l5x5688layh9qd82k97hrm6pwgj6miwk8b"; + type = "gem"; + }; + version = "1.6.1"; + }; websocket-driver = { dependencies = ["websocket-extensions"]; groups = ["default" "test"]; @@ -5521,9 +5585,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12n0hiawqayzchi0yga5n19hi63b2snd49fv3n23n2i4pp05jzrp"; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; type = "gem"; }; - version = "2.4.1"; + version = "2.4.2"; }; } diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 0f215370e184..f662bd3097f9 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix +#! nix-shell -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log yarn2nix import click import click_log @@ -83,10 +83,10 @@ def _get_data_json(): return json.load(f) -def _call_update_source_version(pkg, version): - """calls update-source-version from nixpkgs root dir""" +def _call_nix_update(pkg, version): + """calls nix-update from nixpkgs root dir""" nixpkgs_path = pathlib.Path(__file__).parent / '../../../../' - return subprocess.check_output(['update-source-version', pkg, version], cwd=nixpkgs_path) + return subprocess.check_output(['nix-update', pkg, '--version', version], cwd=nixpkgs_path) @click_log.simple_verbosity_option(logger) @@ -168,20 +168,10 @@ def update_gitaly(): with open(gitaly_dir / fn, 'w') as f: f.write(repo.get_file(f"ruby/{fn}", f"v{gitaly_server_version}")) - for fn in ['go.mod', 'go.sum']: - with open(gitaly_dir / fn, 'w') as f: - f.write(repo.get_file(fn, f"v{gitaly_server_version}")) - subprocess.check_output(['bundle', 'lock'], cwd=gitaly_dir) subprocess.check_output(['bundix'], cwd=gitaly_dir) - os.environ['GOROOT'] = "" - subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitaly_dir) - - for fn in ['go.mod', 'go.sum']: - os.unlink(gitaly_dir / fn) - - _call_update_source_version('gitaly', gitaly_server_version) + _call_nix_update('gitaly', gitaly_server_version) @cli.command('update-gitlab-shell') @@ -189,42 +179,22 @@ def update_gitlab_shell(): """Update gitlab-shell""" data = _get_data_json() gitlab_shell_version = data['passthru']['GITLAB_SHELL_VERSION'] - _call_update_source_version('gitlab-shell', gitlab_shell_version) + _call_nix_update('gitlab-shell', gitlab_shell_version) repo = GitLabRepo(repo='gitlab-shell') gitlab_shell_dir = pathlib.Path(__file__).parent / 'gitlab-shell' - for fn in ['go.mod', 'go.sum']: - with open(gitlab_shell_dir / fn, 'w') as f: - f.write(repo.get_file(fn, f"v{gitlab_shell_version}")) - - os.environ['GOROOT'] = "" - subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitlab_shell_dir) - - for fn in ['go.mod', 'go.sum']: - os.unlink(gitlab_shell_dir / fn) - @cli.command('update-gitlab-workhorse') def update_gitlab_workhorse(): """Update gitlab-workhorse""" data = _get_data_json() gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION'] - _call_update_source_version('gitlab-workhorse', gitlab_workhorse_version) + _call_nix_update('gitlab-workhorse', gitlab_workhorse_version) repo = GitLabRepo('gitlab-org', 'gitlab-workhorse') gitlab_workhorse_dir = pathlib.Path(__file__).parent / 'gitlab-workhorse' - for fn in ['go.mod', 'go.sum']: - with open(gitlab_workhorse_dir / fn, 'w') as f: - f.write(repo.get_file(fn, f"v{gitlab_workhorse_version}")) - - os.environ['GOROOT'] = "" - subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitlab_workhorse_dir) - - for fn in ['go.mod', 'go.sum']: - os.unlink(gitlab_workhorse_dir / fn) - @cli.command('update-all') @click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') @click.pass_context diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index ca504fc231e9..a9e255417daa 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -778,27 +778,43 @@ }; } { - name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz"; + name = "_gitlab_eslint_plugin___eslint_plugin_6.0.0.tgz"; path = fetchurl { - name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-5.0.0.tgz"; - sha1 = "502eb2bccb55d65d6310ce9ef2da76035b6fc319"; + name = "_gitlab_eslint_plugin___eslint_plugin_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-6.0.0.tgz"; + sha1 = "deb18f63808af1cb1cc117a92558f07edb1e2256"; }; } { - name = "_gitlab_svgs___svgs_1.175.0.tgz"; + name = "_gitlab_favicon_overlay___favicon_overlay_2.0.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.175.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.175.0.tgz"; - sha1 = "734f341784af1cd1d62d160a17bcdfb61ff7b04d"; + name = "_gitlab_favicon_overlay___favicon_overlay_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/favicon-overlay/-/favicon-overlay-2.0.0.tgz"; + sha1 = "2f32d0b6a4d5b8ac44e2927083d9ab478a78c984"; }; } { - name = "_gitlab_ui___ui_23.9.0.tgz"; + name = "_gitlab_svgs___svgs_1.178.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_23.9.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-23.9.0.tgz"; - sha1 = "e21966130b41e624dbe4505911a79afb731c2d6b"; + name = "_gitlab_svgs___svgs_1.178.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.178.0.tgz"; + sha1 = "069edb8abb4c7137d48f527592476655f066538b"; + }; + } + { + name = "_gitlab_tributejs___tributejs_1.0.0.tgz"; + path = fetchurl { + name = "_gitlab_tributejs___tributejs_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz"; + sha1 = "672befa222aeffc83e7d799b0500a7a4418e59b8"; + }; + } + { + name = "_gitlab_ui___ui_25.11.3.tgz"; + path = fetchurl { + name = "_gitlab_ui___ui_25.11.3.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-25.11.3.tgz"; + sha1 = "54719d1276f417e66904f9f951671633f1647006"; }; } { @@ -962,19 +978,19 @@ }; } { - name = "_rails_actioncable___actioncable_6.0.3_3.tgz"; + name = "_rails_actioncable___actioncable_6.1.0.tgz"; path = fetchurl { - name = "_rails_actioncable___actioncable_6.0.3_3.tgz"; - url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3-3.tgz"; - sha1 = "fb1a46d3d353512764d5fa3cea2f492391601b7a"; + name = "_rails_actioncable___actioncable_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.1.0.tgz"; + sha1 = "f336f25450b1bc43b99bc60557a70b6e6bb1d3d2"; }; } { - name = "_rails_ujs___ujs_6.0.3_2.tgz"; + name = "_rails_ujs___ujs_6.1.0.tgz"; path = fetchurl { - name = "_rails_ujs___ujs_6.0.3_2.tgz"; - url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.3-2.tgz"; - sha1 = "e14c1f29086858215ce7ccd9ad6d8888c458b4a3"; + name = "_rails_ujs___ujs_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.0.tgz"; + sha1 = "9a48df6511cb2b472c9f596c1f37dc0af022e751"; }; } { @@ -1026,19 +1042,19 @@ }; } { - name = "_toast_ui_editor___editor_2.5.0.tgz"; + name = "_toast_ui_editor___editor_2.5.1.tgz"; path = fetchurl { - name = "_toast_ui_editor___editor_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.0.tgz"; - sha1 = "02779b119eaa6dd7601249d75ca031e0b98400f1"; + name = "_toast_ui_editor___editor_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.1.tgz"; + sha1 = "42671c52ca4b97c84f684d09c2966711b36f41a7"; }; } { - name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz"; + name = "_toast_ui_vue_editor___vue_editor_2.5.1.tgz"; path = fetchurl { - name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.0.tgz"; - sha1 = "8094136588b0f726241b5f89d0754a7169f2ffee"; + name = "_toast_ui_vue_editor___vue_editor_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.1.tgz"; + sha1 = "0a221d74d5305c8ca20cb11d9eb8ff9206455cfc"; }; } { @@ -1170,11 +1186,11 @@ }; } { - name = "_types_json_schema___json_schema_7.0.4.tgz"; + name = "_types_json_schema___json_schema_7.0.6.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz"; - sha1 = "38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"; + name = "_types_json_schema___json_schema_7.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz"; + sha1 = "f4c7ec43e81b319a9815115031709f26987891f0"; }; } { @@ -1306,11 +1322,11 @@ }; } { - name = "_vue_test_utils___test_utils_1.0.0_beta.30.tgz"; + name = "_vue_test_utils___test_utils_1.1.2.tgz"; path = fetchurl { - name = "_vue_test_utils___test_utils_1.0.0_beta.30.tgz"; - url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.30.tgz"; - sha1 = "d5f26d1e2411fdb7fa7fdedb61b4b4ea4194c49d"; + name = "_vue_test_utils___test_utils_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.1.2.tgz"; + sha1 = "fdb487448dceefeaf3d01d465f7c836a3d666dbc"; }; } { @@ -1530,11 +1546,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz"; - sha1 = "294adb71b57398b0680015f0a38c563ee1db5384"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; }; } { @@ -1602,19 +1618,19 @@ }; } { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; path = fetchurl { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; - sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; }; } { - name = "ajv___ajv_6.12.5.tgz"; + name = "ajv___ajv_6.12.6.tgz"; path = fetchurl { - name = "ajv___ajv_6.12.5.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz"; - sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da"; + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; }; } { @@ -4394,11 +4410,11 @@ }; } { - name = "dompurify___dompurify_2.2.2.tgz"; + name = "dompurify___dompurify_2.2.6.tgz"; path = fetchurl { - name = "dompurify___dompurify_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.2.tgz"; - sha1 = "cb8c2b1a2f3c8a0b565127504ae4eedec176a972"; + name = "dompurify___dompurify_2.2.6.tgz"; + url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.6.tgz"; + sha1 = "54945dc5c0b45ce5ae228705777e8e59d7b2edc4"; }; } { @@ -4866,11 +4882,11 @@ }; } { - name = "eslint_plugin_vue___eslint_plugin_vue_6.2.2.tgz"; + name = "eslint_plugin_vue___eslint_plugin_vue_7.4.1.tgz"; path = fetchurl { - name = "eslint_plugin_vue___eslint_plugin_vue_6.2.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz"; - sha1 = "27fecd9a3a24789b0f111ecdd540a9e56198e0fe"; + name = "eslint_plugin_vue___eslint_plugin_vue_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz"; + sha1 = "2526ef0c010c218824a89423dbe6ddbe76f04fd6"; }; } { @@ -4906,11 +4922,11 @@ }; } { - name = "eslint_utils___eslint_utils_2.0.0.tgz"; + name = "eslint_utils___eslint_utils_2.1.0.tgz"; path = fetchurl { - name = "eslint_utils___eslint_utils_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz"; - sha1 = "7be1cc70f27a72a76cd14aa698bcabed6890e1cd"; + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; }; } { @@ -4930,11 +4946,11 @@ }; } { - name = "espree___espree_6.1.2.tgz"; + name = "espree___espree_6.2.1.tgz"; path = fetchurl { - name = "espree___espree_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz"; - sha1 = "6c272650932b4f91c3714e5e7b5f5e2ecf47262d"; + name = "espree___espree_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz"; + sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a"; }; } { @@ -5217,6 +5233,14 @@ sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; } + { + name = "fast_mersenne_twister___fast_mersenne_twister_1.0.2.tgz"; + path = fetchurl { + name = "fast_mersenne_twister___fast_mersenne_twister_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/fast-mersenne-twister/-/fast-mersenne-twister-1.0.2.tgz"; + sha1 = "5ead7caf3ace592a5789d11767732bd81cbaaa56"; + }; + } { name = "fault___fault_1.0.2.tgz"; path = fetchurl { @@ -7433,6 +7457,14 @@ sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c"; }; } + { + name = "jest_raw_loader___jest_raw_loader_1.0.1.tgz"; + path = fetchurl { + name = "jest_raw_loader___jest_raw_loader_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/jest-raw-loader/-/jest-raw-loader-1.0.1.tgz"; + sha1 = "ce9f56d54650f157c4a7d16d224ba5d613bcd626"; + }; + } { name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; path = fetchurl { @@ -7858,11 +7890,11 @@ }; } { - name = "katex___katex_0.10.0.tgz"; + name = "katex___katex_0.10.2.tgz"; path = fetchurl { - name = "katex___katex_0.10.0.tgz"; - url = "https://registry.yarnpkg.com/katex/-/katex-0.10.0.tgz"; - sha1 = "da562e5d0d5cc3aa602e27af8a9b8710bfbce765"; + name = "katex___katex_0.10.2.tgz"; + url = "https://registry.yarnpkg.com/katex/-/katex-0.10.2.tgz"; + sha1 = "39973edbb65eda5b6f9e7f41648781e557dd4932"; }; } { @@ -8065,6 +8097,14 @@ sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; }; } + { + name = "loader_utils___loader_utils_2.0.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz"; + sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0"; + }; + } { name = "locate_path___locate_path_2.0.0.tgz"; path = fetchurl { @@ -8577,6 +8617,14 @@ sha1 = "5d47f709c4c9fc3c216b6d46127280f40b39d790"; }; } + { + name = "mathjax___mathjax_3.1.2.tgz"; + path = fetchurl { + name = "mathjax___mathjax_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/mathjax/-/mathjax-3.1.2.tgz"; + sha1 = "95c0d45ce2330ef7b6a815cebe7d61ecc26bbabd"; + }; + } { name = "mathml_tag_names___mathml_tag_names_2.1.1.tgz"; path = fetchurl { @@ -8705,14 +8753,6 @@ sha1 = "0f1914cda53d4ea5377380e5ce07a38bef2ea7e8"; }; } - { - name = "mersenne_twister___mersenne_twister_1.1.0.tgz"; - path = fetchurl { - name = "mersenne_twister___mersenne_twister_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz"; - sha1 = "f916618ee43d7179efcf641bec4531eb9670978a"; - }; - } { name = "methods___methods_1.1.2.tgz"; path = fetchurl { @@ -8938,11 +8978,11 @@ }; } { - name = "mock_apollo_client___mock_apollo_client_0.4.0.tgz"; + name = "mock_apollo_client___mock_apollo_client_0.5.0.tgz"; path = fetchurl { - name = "mock_apollo_client___mock_apollo_client_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-0.4.0.tgz"; - sha1 = "556a6090b1816dbf07e51093b652aca84aee979e"; + name = "mock_apollo_client___mock_apollo_client_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-0.5.0.tgz"; + sha1 = "8f0d6a1ba0d349ebde87a1dcd85c7fd353076922"; }; } { @@ -10249,14 +10289,6 @@ sha1 = "a3b4160516007075d29127262f3a0063d19896e9"; }; } - { - name = "prettier___prettier_1.18.2.tgz"; - path = fetchurl { - name = "prettier___prettier_1.18.2.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz"; - sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"; - }; - } { name = "prettier___prettier_2.0.5.tgz"; path = fetchurl { @@ -10265,6 +10297,22 @@ sha1 = "d6d56282455243f2f92cc1716692c08aa31522d4"; }; } + { + name = "prettier___prettier_2.2.1.tgz"; + path = fetchurl { + name = "prettier___prettier_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz"; + sha1 = "795a1a78dd52f073da0cd42b21f9c91381923ff5"; + }; + } + { + name = "prettier___prettier_1.18.2.tgz"; + path = fetchurl { + name = "prettier___prettier_1.18.2.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz"; + sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"; + }; + } { name = "pretty_format___pretty_format_25.5.0.tgz"; path = fetchurl { @@ -11322,11 +11370,11 @@ }; } { - name = "schema_utils___schema_utils_2.6.4.tgz"; + name = "schema_utils___schema_utils_2.7.1.tgz"; path = fetchurl { - name = "schema_utils___schema_utils_2.6.4.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz"; - sha1 = "a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"; + name = "schema_utils___schema_utils_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz"; + sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"; }; } { @@ -12186,11 +12234,11 @@ }; } { - name = "style_loader___style_loader_1.1.3.tgz"; + name = "style_loader___style_loader_1.3.0.tgz"; path = fetchurl { - name = "style_loader___style_loader_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz"; - sha1 = "9e826e69c683c4d9bf9db924f85e9abb30d5e200"; + name = "style_loader___style_loader_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz"; + sha1 = "828b4a3b3b7e7aa5847ce7bae9e874512114249e"; }; } { @@ -12282,11 +12330,11 @@ }; } { - name = "swagger_ui_dist___swagger_ui_dist_3.32.4.tgz"; + name = "swagger_ui_dist___swagger_ui_dist_3.43.0.tgz"; path = fetchurl { - name = "swagger_ui_dist___swagger_ui_dist_3.32.4.tgz"; - url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.32.4.tgz"; - sha1 = "6fa920a99e38eaaf129580ac158cf730494a2190"; + name = "swagger_ui_dist___swagger_ui_dist_3.43.0.tgz"; + url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.43.0.tgz"; + sha1 = "b064a2cec1d27776f9a124bc70423cfa0bbc0d3f"; }; } { @@ -12657,14 +12705,6 @@ sha1 = "03273586def1595ae08fedb38d7733cee91d2479"; }; } - { - name = "tributejs___tributejs_5.1.3.tgz"; - path = fetchurl { - name = "tributejs___tributejs_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/tributejs/-/tributejs-5.1.3.tgz"; - sha1 = "980600fc72865be5868893078b4bfde721129eae"; - }; - } { name = "trim_newlines___trim_newlines_1.0.0.tgz"; path = fetchurl { @@ -13434,11 +13474,11 @@ }; } { - name = "vue_eslint_parser___vue_eslint_parser_7.0.0.tgz"; + name = "vue_eslint_parser___vue_eslint_parser_7.3.0.tgz"; path = fetchurl { - name = "vue_eslint_parser___vue_eslint_parser_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz"; - sha1 = "a4ed2669f87179dedd06afdd8736acbb3a3864d6"; + name = "vue_eslint_parser___vue_eslint_parser_7.3.0.tgz"; + url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz"; + sha1 = "894085839d99d81296fa081d19643733f23d7559"; }; } { @@ -13466,19 +13506,19 @@ }; } { - name = "vue_loader___vue_loader_15.9.3.tgz"; + name = "vue_loader___vue_loader_15.9.6.tgz"; path = fetchurl { - name = "vue_loader___vue_loader_15.9.3.tgz"; - url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.3.tgz"; - sha1 = "0de35d9e555d3ed53969516cac5ce25531299dda"; + name = "vue_loader___vue_loader_15.9.6.tgz"; + url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.6.tgz"; + sha1 = "f4bb9ae20c3a8370af3ecf09b8126d38ffdb6b8b"; }; } { - name = "vue_router___vue_router_3.4.5.tgz"; + name = "vue_router___vue_router_3.4.9.tgz"; path = fetchurl { - name = "vue_router___vue_router_3.4.5.tgz"; - url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.5.tgz"; - sha1 = "d396ec037b35931bdd1e9b7edd86f9788dc15175"; + name = "vue_router___vue_router_3.4.9.tgz"; + url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.9.tgz"; + sha1 = "c016f42030ae2932f14e4748b39a1d9a0e250e66"; }; } { @@ -13538,11 +13578,11 @@ }; } { - name = "vuex___vuex_3.5.1.tgz"; + name = "vuex___vuex_3.6.0.tgz"; path = fetchurl { - name = "vuex___vuex_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/vuex/-/vuex-3.5.1.tgz"; - sha1 = "f1b8dcea649bc25254cf4f4358081dbf5da18b3d"; + name = "vuex___vuex_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/vuex/-/vuex-3.6.0.tgz"; + sha1 = "95efa56a58f7607c135b053350833a09e01aa813"; }; } { diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 04370a46b908..9a1e4fd51677 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -201,13 +201,23 @@ in gitlab-markup = attrs: { meta.priority = 1; }; - gitlab-pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.0") { + gitlab-pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.1") { dontBuild = false; postPatch = '' - sed -i 's;"https://gitlab.com.*";"${fetchurl { - url = "https://gitlab.com/gitlab-org/libpg_query/-/archive/gitlab-10-1.0.3/libpg_query-gitlab-10-1.0.3.tar.gz"; - sha256 = "1519x4v6wrk189mjg4hlfah0f7hjy3syg8kk8b6g644gdspzs26j"; - }}";' ext/pg_query/extconf.rb + sed -i "s;'https://codeload.github.com.*';'${fetchurl { + url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/10-1.0.3"; + sha256 = "0jfij8apzxsdabl70j42xgd5f3ka1gdcrk764nccp66164gpcchk"; + }}';" ext/pg_query/extconf.rb + ''; + }; + + pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.0") { + dontBuild = false; + postPatch = '' + sed -i "s;'https://codeload.github.com.*';'${fetchurl { + url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/10-1.0.4"; + sha256 = "0f0kshhai0pnkqj0w4kgz3fssnvwidllc31n1fysxjjzdqlr1k48"; + }}';" ext/pg_query/extconf.rb ''; }; From 66f4dc4fd1b47e9e06d0f1bd78faffa51f0cc59c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 9 Jan 2021 04:20:00 +0000 Subject: [PATCH 48/56] defaultGemConfig: fix zlib flags for nokogiri >= 1.11 This is similar to commit abe3a1867df7484aba541a7a3a988aa11eb8d11d on master, but only applies the changes to nokogiri >= 1.11 to prevent a mass-rebuild. --- pkgs/development/ruby-modules/gem-config/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 9a1e4fd51677..d9ece64caedd 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -402,7 +402,12 @@ in nokogiri = attrs: { buildFlags = [ "--use-system-libraries" + ] ++ lib.optionals (lib.versionAtLeast attrs.version "1.11") [ + "--with-zlib-lib=${zlib.out}/lib" + "--with-zlib-include=${zlib.dev}/include" + ] ++ lib.optionals (lib.versionOlder attrs.version "1.11") [ "--with-zlib-dir=${zlib.dev}" + ] ++ [ "--with-xml2-lib=${libxml2.out}/lib" "--with-xml2-include=${libxml2.dev}/include/libxml2" "--with-xslt-lib=${libxslt.out}/lib" From a710a2726dd8884a9fcc261a50b89f77ade5569d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 30 Jan 2021 14:41:31 +1000 Subject: [PATCH 49/56] .github/workflows/labels.yml: label PRs (cherry picked from commit cce9a296bd8856190e8bee8218809c09ca1d49c0) --- .github/labeler.yml | 149 +++++++++++++++++++++++++++++++++++ .github/workflows/labels.yml | 14 ++++ 2 files changed, 163 insertions(+) create mode 100644 .github/labeler.yml create mode 100644 .github/workflows/labels.yml diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 000000000000..7bb2552cf7ac --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,149 @@ +"6.topic: agda": + - doc/languages-frameworks/agda.section.md + - nixos/tests/agda.nix + - pkgs/build-support/agda/**/* + - pkgs/development/libraries/agda/**/* + - pkgs/top-level/agda-packages.nix + +"6.topic: emacs": + - nixos/modules/services/editors/emacs.nix + - nixos/modules/services/editors/emacs.xml + - nixos/tests/emacs-daemon.nix + - pkgs/applications/editors/emacs-modes/**/* + - pkgs/applications/editors/emacs/**/* + - pkgs/build-support/emacs/**/* + - pkgs/top-level/emacs-packages.nix + +"6.topic: erlang": + - doc/languages-frameworks/beam.xml + - pkgs/development/beam-modules/**/* + - pkgs/development/interpreters/elixir/**/* + - pkgs/development/interpreters/erlang/**/* + - pkgs/development/tools/build-managers/rebar/**/* + - pkgs/development/tools/build-managers/rebar3/**/* + - pkgs/development/tools/erlang/**/* + - pkgs/development/tools/elixir/**/* + - pkgs/top-level/beam-packages.nix + +"6.topic: fetch": + - pkgs/build-support/fetch/**/* + +"6.topic: GNOME": + - pkgs/desktops/gnome-3/**/* + - nixos/modules/services/x11/desktop-managers/gnome3.nix + - nixos/tests/gnome3.nix + - nixos/tests/gnome3-xorg.nix + - nixos/modules/services/desktops/gnome3/**/* + - doc/languages-frameworks/gnome.xml + +"6.topic: golang": + - pkgs/development/compilers/go/**/* + - pkgs/development/go-modules/**/* + - doc/languages-frameworks/go.xml + +"6.topic: haskell": + - pkgs/development/compilers/ghc/**/* + - pkgs/development/tools/haskell/**/* + - pkgs/development/haskell-modules/**/* + - pkgs/top-level/haskell-packages.nix + - doc/languages-frameworks/haskell.md + +"6.topic: kernel": + - pkgs/build-support/linux/kernel/**/* + +"6.topic: lua": + - pkgs/development/lua-modules/**/* + - pkgs/top-level/lua-packages.nix + - pkgs/development/interpreters/lua-5/**/* + - pkgs/development/interpreters/luajit/**/* + +"6.topic: nixos": + - nixos/**/* + +"6.topic: ocaml": + - doc/languages-frameworks/ocaml.section.md + - pkgs/top-level/ocaml-packages.nix + - pkgs/development/ocaml-modules/**/* + - pkgs/development/compilers/ocaml/**/* + - pkgs/development/tools/ocaml/**/* + - pkgs/development/compilers/reason/**/* + +"6.topic: pantheon": + - pkgs/desktops/pantheon/**/* + - nixos/tests/pantheon.nix + - nixos/modules/services/x11/desktop-managers/pantheon.nix + - nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix + - nixos/modules/services/desktops/pantheon/**/* + +"6.topic: policy discussion": + - .github/**/* + +"6.topic: printing": + - pkgs/misc/cups/**/* + - nixos/modules/services/printing/cupsd.nix + +"6.topic: python": + - pkgs/top-level/python-packages.nix + - pkgs/development/interpreters/python/**/* + - pkgs/development/python-modules/**/* + - doc/languages-frameworks/python.md + +"6.topic: qt/kde": + - pkgs/applications/kde/**/* + - pkgs/desktops/plasma-5/**/* + - pkgs/development/libraries/kde-frameworks/**/* + - pkgs/development/libraries/qt-5/**/* + - doc/languages-frameworks/qt.xml + - nixos/modules/services/x11/desktop-managers/plasma5.nix + - nixos/tests/plasma5.nix + +"6.topic: ruby": + - pkgs/development/interpreters/ruby/**/* + - pkgs/development/ruby-modules/**/* + - doc/languages-frameworks/ruby.xml + +"6.topic: rust": + - pkgs/development/compilers/rust/**/* + - pkgs/build-support/rust/**/* + - doc/languages-frameworks/rust.md + +"6.topic: stdenv": + - pkgs/stdenv/**/* + +"6.topic: steam": + - pkgs/games/steam/**/* + +"6.topic: systemd": + - pkgs/os-specific/linux/systemd/**/* + - nixos/modules/system/boot/systemd/**/* + +"6.topic: TeX": + - pkgs/tools/typesetting/tex/**/* + - doc/languages-frameworks/texlive.xml + +"6.topic: vim": + - pkgs/applications/editors/vim/**/* + - pkgs/misc/vim-plugins/**/* + - doc/languages-frameworks/vim.md + +"6.topic: xfce": + - pkgs/desktops/xfce/**/* + - pkgs/destkops/xfce4-14/**/* + - nixos/doc/manual/configuration/xfce.xml + - nixos/modules/services/x11/desktop-managers/xfce4-14.nix + - nixos/modules/services/x11/desktop-managers/xfce.nix + - nixos/tests/xfce.nix + - nixos/tests/xfce4-14.nix + +"6.topic: cinnamon": + - pkgs/desktops/cinnamon/**/* + +"8.has: changelog": + - doc/manual/release-notes/**/* + +"8.has: documentation": + - doc/**/* + - nixos/doc/**/* + +"8.has: module (update)": + - nixos/modules/**/* diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml new file mode 100644 index 000000000000..1139807753db --- /dev/null +++ b/.github/workflows/labels.yml @@ -0,0 +1,14 @@ +name: "Label PR" + +on: + pull_request_target: + +jobs: + labels: + runs-on: ubuntu-latest + if: github.repository_owner == 'NixOS' + steps: + - uses: actions/labeler@v3 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + sync-labels: true From 9b8530e3721fc008bacac61b6c50a29712ee2f2f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 19 Feb 2021 17:09:19 +1000 Subject: [PATCH 50/56] .github/labeler.yml: update paths and sort (cherry picked from commit 13e762e940885436a750cff0975fdea045442c9c) --- .github/labeler.yml | 77 ++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 7bb2552cf7ac..0db6fd7832bc 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -5,6 +5,9 @@ - pkgs/development/libraries/agda/**/* - pkgs/top-level/agda-packages.nix +"6.topic: cinnamon": + - pkgs/desktops/cinnamon/**/* + "6.topic: emacs": - nixos/modules/services/editors/emacs.nix - nixos/modules/services/editors/emacs.xml @@ -15,97 +18,97 @@ - pkgs/top-level/emacs-packages.nix "6.topic: erlang": - - doc/languages-frameworks/beam.xml + - doc/languages-frameworks/beam.section.md - pkgs/development/beam-modules/**/* - pkgs/development/interpreters/elixir/**/* - pkgs/development/interpreters/erlang/**/* - pkgs/development/tools/build-managers/rebar/**/* - pkgs/development/tools/build-managers/rebar3/**/* - pkgs/development/tools/erlang/**/* - - pkgs/development/tools/elixir/**/* - pkgs/top-level/beam-packages.nix "6.topic: fetch": - - pkgs/build-support/fetch/**/* + - pkgs/build-support/fetch*/**/* "6.topic: GNOME": - - pkgs/desktops/gnome-3/**/* - - nixos/modules/services/x11/desktop-managers/gnome3.nix - - nixos/tests/gnome3.nix - - nixos/tests/gnome3-xorg.nix + - doc/languages-frameworks/gnome.section.md - nixos/modules/services/desktops/gnome3/**/* - - doc/languages-frameworks/gnome.xml + - nixos/modules/services/x11/desktop-managers/gnome3.nix + - nixos/tests/gnome3-xorg.nix + - nixos/tests/gnome3.nix + - pkgs/desktops/gnome-3/**/* "6.topic: golang": + - doc/languages-frameworks/go.section.md - pkgs/development/compilers/go/**/* - pkgs/development/go-modules/**/* - - doc/languages-frameworks/go.xml + - pkgs/development/go-packages/**/* "6.topic: haskell": + - doc/languages-frameworks/haskell.section.md - pkgs/development/compilers/ghc/**/* - - pkgs/development/tools/haskell/**/* - pkgs/development/haskell-modules/**/* + - pkgs/development/tools/haskell/**/* - pkgs/top-level/haskell-packages.nix - - doc/languages-frameworks/haskell.md "6.topic: kernel": - - pkgs/build-support/linux/kernel/**/* + - pkgs/build-support/kernel/**/* "6.topic: lua": - - pkgs/development/lua-modules/**/* - - pkgs/top-level/lua-packages.nix - pkgs/development/interpreters/lua-5/**/* - pkgs/development/interpreters/luajit/**/* + - pkgs/development/lua-modules/**/* + - pkgs/top-level/lua-packages.nix "6.topic: nixos": - nixos/**/* "6.topic: ocaml": - doc/languages-frameworks/ocaml.section.md - - pkgs/top-level/ocaml-packages.nix - - pkgs/development/ocaml-modules/**/* - pkgs/development/compilers/ocaml/**/* - - pkgs/development/tools/ocaml/**/* - pkgs/development/compilers/reason/**/* + - pkgs/development/ocaml-modules/**/* + - pkgs/development/tools/ocaml/**/* + - pkgs/top-level/ocaml-packages.nix "6.topic: pantheon": - - pkgs/desktops/pantheon/**/* - - nixos/tests/pantheon.nix + - nixos/modules/services/desktops/pantheon/**/* - nixos/modules/services/x11/desktop-managers/pantheon.nix - nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix - - nixos/modules/services/desktops/pantheon/**/* + - nixos/tests/pantheon.nix + - pkgs/desktops/pantheon/**/* "6.topic: policy discussion": - .github/**/* "6.topic: printing": - - pkgs/misc/cups/**/* - nixos/modules/services/printing/cupsd.nix + - pkgs/misc/cups/**/* "6.topic: python": - - pkgs/top-level/python-packages.nix + - doc/languages-frameworks/python.section.md - pkgs/development/interpreters/python/**/* - pkgs/development/python-modules/**/* - - doc/languages-frameworks/python.md + - pkgs/top-level/python-packages.nix "6.topic: qt/kde": + - doc/languages-frameworks/qt.section.md + - nixos/modules/services/x11/desktop-managers/plasma5.nix + - nixos/tests/plasma5.nix - pkgs/applications/kde/**/* - pkgs/desktops/plasma-5/**/* - pkgs/development/libraries/kde-frameworks/**/* - pkgs/development/libraries/qt-5/**/* - - doc/languages-frameworks/qt.xml - - nixos/modules/services/x11/desktop-managers/plasma5.nix - - nixos/tests/plasma5.nix "6.topic: ruby": + - doc/languages-frameworks/ruby.section.md - pkgs/development/interpreters/ruby/**/* - pkgs/development/ruby-modules/**/* - - doc/languages-frameworks/ruby.xml "6.topic: rust": - - pkgs/development/compilers/rust/**/* + - doc/languages-frameworks/rust.section.md - pkgs/build-support/rust/**/* - - doc/languages-frameworks/rust.md + - pkgs/development/compilers/rust/**/* "6.topic: stdenv": - pkgs/stdenv/**/* @@ -115,31 +118,25 @@ "6.topic: systemd": - pkgs/os-specific/linux/systemd/**/* - - nixos/modules/system/boot/systemd/**/* + - nixos/modules/system/boot/systemd*/**/* "6.topic: TeX": + - doc/languages-frameworks/texlive.section.md - pkgs/tools/typesetting/tex/**/* - - doc/languages-frameworks/texlive.xml "6.topic: vim": + - doc/languages-frameworks/vim.section.md - pkgs/applications/editors/vim/**/* - pkgs/misc/vim-plugins/**/* - - doc/languages-frameworks/vim.md "6.topic: xfce": - - pkgs/desktops/xfce/**/* - - pkgs/destkops/xfce4-14/**/* - nixos/doc/manual/configuration/xfce.xml - - nixos/modules/services/x11/desktop-managers/xfce4-14.nix - nixos/modules/services/x11/desktop-managers/xfce.nix - nixos/tests/xfce.nix - - nixos/tests/xfce4-14.nix - -"6.topic: cinnamon": - - pkgs/desktops/cinnamon/**/* + - pkgs/desktops/xfce/**/* "8.has: changelog": - - doc/manual/release-notes/**/* + - nixos/doc/manual/release-notes/**/* "8.has: documentation": - doc/**/* From 4636ea62a90094cdc5f36aceb77ff00468a370a5 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sun, 21 Mar 2021 12:24:55 +0100 Subject: [PATCH 51/56] imagemagick: 7.0.11.3 -> 7.0.11-4 Changelog: https://github.com/ImageMagick/ImageMagick/blob/7.0.11-4/ChangeLog (cherry picked from commit 2a85dbda12cd9b3f9c035198002ab517894ff24e) --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index c9891e1d74c4..7b17ed744990 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.11-3"; - sha256 = "sha256-y937OxAHNTbWa96oQmTpp/ivxtPVL16hr4SvzZWugQo="; + version = "7.0.11-4"; + sha256 = "sha256-Dwlt3EdDoRkJKm1gepDC+0QdKEkMVsacZQ7khnxmWto="; patches = []; }; in From 6109ba4f3077e2988780452ab16cfcf627691396 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 20 Feb 2021 23:03:44 +0000 Subject: [PATCH 52/56] ipfs_0_8: Init On stable we just add new versions, rather than making potentially breaking bumps. (cherry picked from commit 1173ecf67374d140d19be1485818d85daba9979e) --- pkgs/applications/networking/ipfs/0.8.nix | 45 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/ipfs/0.8.nix diff --git a/pkgs/applications/networking/ipfs/0.8.nix b/pkgs/applications/networking/ipfs/0.8.nix new file mode 100644 index 000000000000..1b648108e787 --- /dev/null +++ b/pkgs/applications/networking/ipfs/0.8.nix @@ -0,0 +1,45 @@ +{ lib, buildGoModule, fetchurl, nixosTests }: + +buildGoModule rec { + pname = "ipfs"; + version = "0.8.0"; + rev = "v${version}"; + + # go-ipfs makes changes to it's source tarball that don't match the git source. + src = fetchurl { + url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; + sha256 = "sha256-uK3+Ekr5AM6mmGmjFSj1Rotm5pbH657BYUlP9B39WEw="; + }; + + # tarball contains multiple files/directories + postUnpack = '' + mkdir ipfs-src + shopt -s extglob + mv !(ipfs-src) ipfs-src || true + cd ipfs-src + ''; + + sourceRoot = "."; + + subPackages = [ "cmd/ipfs" ]; + + passthru.tests.ipfs = nixosTests.ipfs; + + vendorSha256 = null; + + postInstall = '' + install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service + install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket + install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket + substituteInPlace $out/etc/systemd/system/ipfs.service \ + --replace /usr/bin/ipfs $out/bin/ipfs + ''; + + meta = with lib; { + description = "A global, versioned, peer-to-peer filesystem"; + homepage = "https://ipfs.io/"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4691f5f648e..712dbbfd442e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4584,11 +4584,12 @@ in iperf = iperf3; ipfs = ipfs_0_6; - ipfs_latest = ipfs_0_7; + ipfs_latest = ipfs_0_8; ipfs_0_6 = callPackage ../applications/networking/ipfs/0.6.nix { buildGoModule = buildGo114Module; }; ipfs_0_7 = callPackage ../applications/networking/ipfs/0.7.nix { }; + ipfs_0_8 = callPackage ../applications/networking/ipfs/0.8.nix { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { From ebeac25aa1b8e2f1ec8d2b0618d2df4fceb71462 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 23 Feb 2021 13:51:59 +0000 Subject: [PATCH 53/56] _1password-gui: 0.9.13 -> 0.9.14-4 (cherry picked from commit 5462627ebd2513ae6580ad441cb499a1d03d13bd) --- pkgs/applications/misc/1password-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index e09d8aea44b0..530073d3fb15 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.13"; + version = "0.9.14-4"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - hash = "sha256-VdbdmpLiQGVFH3q6baE2yuuKz11Tn0gMpkGDI9KI3HQ="; + hash = "sha256-ZEpHeBeP2LpjABWD1eQxUORUKsRWvZ8WYa5IxSRLeXc="; }; nativeBuildInputs = [ makeWrapper ]; From 1944fe4f18b74d0c33e4786087b7a9628595c8a7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Mar 2021 03:28:17 +0000 Subject: [PATCH 54/56] _1password-gui: 0.9.14-4 -> 0.9.26 (cherry picked from commit 09e66ad4c28d8d12366850c1e881e33e5cc21ebc) --- pkgs/applications/misc/1password-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 530073d3fb15..8b21d82d202d 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.14-4"; + version = "0.9.26"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - hash = "sha256-ZEpHeBeP2LpjABWD1eQxUORUKsRWvZ8WYa5IxSRLeXc="; + hash = "sha256-LvHvWUS2iEm9m+v+kk7wf+P9xZkOyuoLk4xM4+P2vF8="; }; nativeBuildInputs = [ makeWrapper ]; From be731b9d09865b3c3ec3a0dc9ffe780ba56805d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Mar 2021 05:37:16 +0000 Subject: [PATCH 55/56] _1password-gui: 0.9.26 -> 8.0.27 (cherry picked from commit efd3c20d7bd0cc9fa40a9c081a20fc0aab9abfa6) --- pkgs/applications/misc/1password-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 8b21d82d202d..6be072ec013c 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.26"; + version = "8.0.27"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - hash = "sha256-LvHvWUS2iEm9m+v+kk7wf+P9xZkOyuoLk4xM4+P2vF8="; + hash = "sha256-qzZXs7ak4052Igq+YWuzgDqJ7143q5qw5P3b3eN3NkU="; }; nativeBuildInputs = [ makeWrapper ]; From 99f9ffa31f96e23c44caf630bead250eecbcb231 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 17 Mar 2021 21:40:02 +0000 Subject: [PATCH 56/56] _1password-gui: 8.0.27 -> 8.0.28 (cherry picked from commit a12f4b172f35d9e6d8b180de6bd38a7a9c147557) --- pkgs/applications/misc/1password-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 6be072ec013c..22e120d2e844 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "8.0.27"; + version = "8.0.28"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - hash = "sha256-qzZXs7ak4052Igq+YWuzgDqJ7143q5qw5P3b3eN3NkU="; + hash = "sha256-okLeyok/5rihGXaQaUR06dGkpuqqW02qJ6q6VVLtZsE="; }; nativeBuildInputs = [ makeWrapper ];