From 62dedf12419163dc2dd31b90a55c4fecbdc04310 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 5 Jan 2022 00:45:33 +0300 Subject: [PATCH 01/18] gajim: fix tests `test` directory actually also contains various libraries and broken tests. Test failure happens when `test/lib/gajim_mocks.py` is attempted to run as a test. Upstream only runs no_gui tests: https://dev.gajim.org/gajim/ci/-/blob/e0f58cfc780c808b54b0170bc494c6e10a68c0a5/.gajim-ci.yml#L18 We now explicitly run only tests from `no_gui` and `unit`. (cherry picked from commit c138c66dcbd6cc986c44e3be0a1c8e47d0fe5573) --- .../networking/instant-messengers/gajim/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 2b6cb9969e82..8b5156708af9 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -59,7 +59,8 @@ python3.pkgs.buildPythonApplication rec { checkPhase = '' xvfb-run dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - ${python3.interpreter} setup.py test + ${python3.interpreter} -m unittest discover -s test/unit -v + ${python3.interpreter} -m unittest discover -s test/no_gui -v ''; # necessary for wrapGAppsHook From 5d09db8827e4f6439ad647e77218f299747f058b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 5 Jan 2022 00:48:51 +0300 Subject: [PATCH 02/18] gajim: add plugin installer Workaround upstream issue https://dev.gajim.org/gajim/gajim/-/issues/10719. (cherry picked from commit 7e041d344690f638da46a6dfc7edf780ae222af7) --- .../instant-messengers/gajim/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 8b5156708af9..05a8b9969575 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, gettext, wrapGAppsHook +{ lib, fetchurl, fetchFromGitLab, gettext, wrapGAppsHook # Native dependencies , python3, gtk3, gobject-introspection, gnome @@ -41,6 +41,21 @@ python3.pkgs.buildPythonApplication rec { gettext wrapGAppsHook ]; + # Workaround for https://dev.gajim.org/gajim/gajim/-/issues/10719. + # We don't use plugin release URL because it's updated in place. + plugins = fetchFromGitLab { + domain = "dev.gajim.org"; + owner = "gajim"; + repo = "gajim-plugins"; + rev = "fea522e4360cec6ceacbf1df92644ab3343d4b99"; + sha256 = "sha256-CmwEiLsdldoOfgHfWL/5hf/dp0HEDNAIlc5N0Np20KE="; + }; + + postPatch = '' + mkdir -p gajim/data/plugins + cp -r $plugins/plugin_installer gajim/data/plugins + ''; + dontWrapGApps = true; preFixup = '' From 45c2f7389d32242ec5e0d7022fe3bd64d1e786c2 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Tue, 4 Jan 2022 20:19:45 -0500 Subject: [PATCH 03/18] python3Packages.scikit-learn: fix compatibility with openblas 0.3.18 Different versions of openblas can yield slightly different results, which can cause scikit-learn tests to fail. Issue was fixed in https://github.com/scikit-learn/scikit-learn/issues/21340 Closes #153202. --- pkgs/development/python-modules/scikit-learn/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index e7ac79b42837..f06a0959c648 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -34,6 +34,12 @@ buildPythonPackage rec { url = "https://github.com/scikit-learn/scikit-learn/commit/e7ef22c3ba2334cb3b476e95d7c083cf6b48ce56.patch"; sha256 = "174554k1pbf92bj7wgq0xjj16bkib32ailyhwavdxaknh4bd9nmv"; }) + # This patch fixes numerical issue with openblas 0.3.18. It was merged in scikit-learn v1.0.2. + # See details in https://github.com/scikit-learn/scikit-learn/issues/21340 + ( fetchpatch { + url = "https://github.com/scikit-learn/scikit-learn/commit/657454c0e5a73071ec6681a0774fdaa4269adda7.patch"; + sha256 = "1lv71ashr9wcgxqvqazrdpnm1l6cazcsj2sf6n9ybadpghrqp8yf"; + }) ]; buildInputs = [ From b297cbd19233b86365ca28a24c0c1156e9d6cee5 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 4 Jan 2022 22:24:33 +0000 Subject: [PATCH 04/18] electron_13: 13.6.3 -> 13.6.6 https://github.com/electron/electron/releases/tag/v13.6.4 https://github.com/electron/electron/releases/tag/v13.6.5 https://github.com/electron/electron/releases/tag/v13.6.6 (cherry picked from commit aeb6554ea12519e95439fa926ee9a8da10c7892b) --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index a09bd4a99d3e..6d660d17d52f 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -115,14 +115,14 @@ rec { headers = "1idam1xirxqxqg4g7n33kdx2skk0r351m00g59a8yx9z82g06ah9"; }; - electron_13 = mkElectron "13.6.3" { - armv7l-linux = "a293a9684e16a427a9f68d101814575a4b1dd232dc3fca47552f906019a6cadc"; - aarch64-linux = "1599d259832c806b98751a68fb93112711963d259024f0e36f12f064995b3251"; - x86_64-linux = "7607422a4ba80cda4bd7fefb2fbe2f4e0b9a73db92e1e82dc01012a85b5d0d2b"; - i686-linux = "db9261c05ed57af2fcd4a84b89d299c76948b9d57ce0dba38e3240eb43935257"; - x86_64-darwin = "6bf09794d6f020bbaaf806a7758da125137b3c96646f4503eb81b9541e50e02f"; - aarch64-darwin = "374ddf0581794b31eee900828172f9218193c032c0e46bffcfac6aec95c22f1a"; - headers = "0v1n8izy83qq3ljs6191a7mzr6nnda5ib9ava1cjddkshl8pampq"; + electron_13 = mkElectron "13.6.6" { + armv7l-linux = "4d8a8bde1c993bfc20afb2b23e55101ad2048f5ddd89ab86043f510470aeba8d"; + aarch64-linux = "6d1480f80d43cdebd9f74cb62b64c9d16bee29b68b863faf7c50fcb91f63985c"; + x86_64-linux = "62b9ba2fea4f0f54fd54bce8a532d14132302a66ec99173764f44234fa76925e"; + i686-linux = "b83860318b2e591b150dc9578ea749f66ab9a18aafbe69dadb622b9ca131e695"; + x86_64-darwin = "a59b7270f86286e4ee217552b8729621f4b282360ad15391886d5686008b6933"; + aarch64-darwin = "1f445d2f02d1054a760bdaafb755677a35c495e64385e2d2a5547b6750a82dfa"; + headers = "0qdlw17jxhhcamr8g2ybbs2jkijzdq82qgc3knr4kdxb425q898r"; }; electron_14 = mkElectron "14.2.3" { From 059bf5a0b1a05b0956c3fe8694b3ea811ad3fe88 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 4 Jan 2022 22:26:09 +0000 Subject: [PATCH 05/18] electron_16: 16.0.5 -> 16.0.6 https://github.com/electron/electron/releases/tag/v16.0.6 (cherry picked from commit 24ba4098a8a0883d11cb87243bb53f64280fdaf3) --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 6d660d17d52f..eeca6ccfbb46 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -145,13 +145,13 @@ rec { headers = "1xnbzskvf8p5a07bha41qqnw1hb68f019qrda3z2jn96m3qnj46r"; }; - electron_16 = mkElectron "16.0.5" { - armv7l-linux = "16381d22f6f3c7990435598fc50addf8addde2fa749ab23672733ec90b8d53ef"; - aarch64-linux = "6274bdf2a3894ce9ddb70800df497a034893e1be5e2d07763e339550009d53b6"; - x86_64-linux = "2830a9f8fc5e7fa4f70997e11d55b250e90db511b29da22699e1fe23b153128c"; - i686-linux = "363e2588f57f3d31e506e759f723768b543baf248dfb518d06747ffa0a8d8ab1"; - x86_64-darwin = "0bb7f2c506d8c3e9ef7ec4049baf87a3365cbf80c569f6eb98ddc1a2ddb653e6"; - aarch64-darwin = "de4eac412a942a0b238792a38c0c80691d1a7ef2eba850c15619c0db9da89f1a"; - headers = "1pdi86sq60z9bqd81fvgl14c3bk21wk9mwkqyn653yq4zk0mqpi5"; + electron_16 = mkElectron "16.0.6" { + armv7l-linux = "f15d665cbf487538f5448a318519e16e3c07a5f7b55895541df1c067c9cfcb55"; + aarch64-linux = "92037b0886a9404c7f9027e7597df552b2c0011ded100537f4287e4e925db6dc"; + x86_64-linux = "0017aba47756b962b9571ccd9dcf6297af0f603b879e26f49bab8728bb64567d"; + i686-linux = "11ae3628d27d12612a8742b72b0dc4521c9b2cd303619046c6f6a36282f43c72"; + x86_64-darwin = "250489ca6b1bec91f4d59766c1d4f65407f016765395517a6dfd5625e93d646f"; + aarch64-darwin = "a4416627a3055308259689fd156a7d4fd704983420a20e8939409b08195af204"; + headers = "00iq8v3nm42f9fphwd50vdng51bd291rk33zcavpidiw29hrqi9m"; }; } From df702a2585eed498e0486cbfe96b8a78a157e28f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Lucr=C3=A8ce=20C=C3=A9leste?= Date: Tue, 23 Nov 2021 22:58:21 -0500 Subject: [PATCH 06/18] jenkins: 2.303.1 -> 2.303.3 (cherry picked from commit 3c5996d1e6cebd3d15d0639994cce177459747a7) --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index a7d9aeda000b..0b113a6fe8ca 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.303.1"; + version = "2.303.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0rf06axz1hxssg942w2g66avak30jy6rfdwxynhriqv3vrf17bja"; + sha256 = "8a6ae7367755b3f31a050faa945f7a3991abdb43d941c7294cac890c1e2779d8"; }; nativeBuildInputs = [ makeWrapper ]; From 59fc3fd57fb868ff948860eee8127f33b87d10fa Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 4 Jan 2022 12:30:40 +0100 Subject: [PATCH 07/18] llvmPackages_{12,13,git}.compiler-rt: remove new runtimes in useLLVM LLVM 12 added the memory profiling runtime and LLVM 13 the ORC runtime. Both need a libc in order to build (or at least headers not present in clang's resource root), so we'll disable them for any sort of baremetal-ish build. memprof likely doesn't work in a baremetal situation at all, orc is unknown. Whether both would compile with musl is to be checked. (cherry picked from commit b591a98be43218e8ef5b71148f807c62d0b8bbe7) --- pkgs/development/compilers/llvm/12/compiler-rt/default.nix | 1 + pkgs/development/compilers/llvm/13/compiler-rt/default.nix | 2 ++ pkgs/development/compilers/llvm/git/compiler-rt/default.nix | 2 ++ 3 files changed, 5 insertions(+) diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index 13c611ca8cc6..4b2907ed3078 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index e30db5fcd954..10b89b91b96f 100644 --- a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" + "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index 5874a91e03c8..019148039d17 100644 --- a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" + "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" From 321f37a913d3094a2da7c502167230243574966f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 30 Nov 2021 22:17:24 +0100 Subject: [PATCH 08/18] chromiumDev: 98.0.4710.4 -> 98.0.4736.0 (cherry picked from commit cb91e61c5680e499e70fe535b4f18569b8f81908) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 2eaa9a6a23b9..22bebdfd48b2 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "98.0.4710.4", - "sha256": "0ay4bn9963k7bbv31wfc1iy2z6n6jjk1h2mn7m7893i81raisk8m", - "sha256bin64": "0n4kb6iiv9aih7yzrnr9m7znqb2p37grlj8by6gpjfikx3fxf5gg", + "version": "98.0.4736.0", + "sha256": "1bakzvzx0604k20p16lxmbl0s8za6fy4akng35c1kzf350jznq7n", + "sha256bin64": "09adpl6b43fzlms081c1bs3vrlwrm3kq0mfcqff4q33i0wb5wl25", "deps": { "gn": { - "version": "2021-11-16", + "version": "2021-11-24", "url": "https://gn.googlesource.com/gn", - "rev": "4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e", - "sha256": "0jwjfbxlbqxlz7wm46vyrxn3pgwyyd03as6gy5mcvvk9aialqh9f" + "rev": "b79031308cc878488202beb99883ec1f2efd9a6d", + "sha256": "1fdn48y0nvs2qm67qvp1i75d9278ddi5v3bpxgjf28zrh9yragwd" } } }, From 637bda368bdae24ce9d866ca5fc1a393ec16f9b5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 7 Dec 2021 20:44:52 +0100 Subject: [PATCH 09/18] chromiumBeta: 97.0.4692.20 -> 97.0.4692.36 (cherry picked from commit bab515f768757770c50c6304de237db7d516288b) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 22bebdfd48b2..870582a2b576 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "97.0.4692.20", - "sha256": "1njgfz3kz1pyyaaskqc47ldy2gzc3c9a8mjib81nalzrqbmd3372", - "sha256bin64": "0nsaf46a9pl8cxw5v2zsfp2ynja4m55qi1m4mhwhmyr50138655f", + "version": "97.0.4692.36", + "sha256": "0p0f19svnymql8skx6alb6zy4fmc5115dc2avs8h2mca1q8n5r0s", + "sha256bin64": "08p0rwn4jglrzma1vf4jnyqaffnk0c8xwc7jkgfpkasm43d72zim", "deps": { "gn": { "version": "2021-11-03", From 1c04820980b7ab21064c60287e64175c2ab90c4a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 8 Dec 2021 19:30:16 +0100 Subject: [PATCH 10/18] chromiumDev: 98.0.4736.0 -> 98.0.4750.0 (cherry picked from commit 426f6957978ff049dcda866c219cab00eb7831fb) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 870582a2b576..dd95748c99d1 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "98.0.4736.0", - "sha256": "1bakzvzx0604k20p16lxmbl0s8za6fy4akng35c1kzf350jznq7n", - "sha256bin64": "09adpl6b43fzlms081c1bs3vrlwrm3kq0mfcqff4q33i0wb5wl25", + "version": "98.0.4750.0", + "sha256": "0qygnmb1wlbarni2pdfs1xl50ggvf0211c6mj7341wwsbd0bpkgr", + "sha256bin64": "1psbh5xwlgr4ain4s9vk7d0kdbbd14v29f95ai5i4d2d3cpj2319", "deps": { "gn": { - "version": "2021-11-24", + "version": "2021-12-03", "url": "https://gn.googlesource.com/gn", - "rev": "b79031308cc878488202beb99883ec1f2efd9a6d", - "sha256": "1fdn48y0nvs2qm67qvp1i75d9278ddi5v3bpxgjf28zrh9yragwd" + "rev": "e0afadf7a743d5b14737bd454df45d5f1caf0d23", + "sha256": "00pxhfikscghgm79zckh9j00jgjmdy6hixkpfq5vmgc0xpxif78v" } } }, From 04626d1b202225d6fb0dbd690b3cc637bd6c1b91 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 10 Dec 2021 22:18:46 +0100 Subject: [PATCH 11/18] chromiumBeta: 97.0.4692.36 -> 97.0.4692.45 (cherry picked from commit c80eda54d53d4e3360b88e4d9deea8f6e402f0f3) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index dd95748c99d1..7f1be9b303f8 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "97.0.4692.36", - "sha256": "0p0f19svnymql8skx6alb6zy4fmc5115dc2avs8h2mca1q8n5r0s", - "sha256bin64": "08p0rwn4jglrzma1vf4jnyqaffnk0c8xwc7jkgfpkasm43d72zim", + "version": "97.0.4692.45", + "sha256": "1x55hys3340inrwwp4lzw5vq3vrg56288m746d4p2ligvsy19byp", + "sha256bin64": "1jyhq27fb4pzbxlg0ssfz66hza9g8cbsqyx70ydkjqs9sf4yqqcw", "deps": { "gn": { "version": "2021-11-03", From d9a01284dd4a4e6a991b10b8959ddeacf28c8d9d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 16 Dec 2021 23:04:22 +0100 Subject: [PATCH 12/18] chromiumBeta: 97.0.4692.45 -> 97.0.4692.56 (cherry picked from commit afb8f63d90a9520b929bd9a6db8cc80b131e246c) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 7f1be9b303f8..248352015a36 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "97.0.4692.45", - "sha256": "1x55hys3340inrwwp4lzw5vq3vrg56288m746d4p2ligvsy19byp", - "sha256bin64": "1jyhq27fb4pzbxlg0ssfz66hza9g8cbsqyx70ydkjqs9sf4yqqcw", + "version": "97.0.4692.56", + "sha256": "19i572z02hp7n7j7k5i38jr60jfli5jk5qnydfzxavwx9vjqjwgf", + "sha256bin64": "1im2dq2p5cdy6hj6n2lvn2nzwb5mgy57hyskhwhfm1fz5xzjzc3g", "deps": { "gn": { "version": "2021-11-03", From e37bf7d818a700cb6139d45896092b7df91d08d2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 17 Dec 2021 19:54:42 +0100 Subject: [PATCH 13/18] chromiumDev: 98.0.4750.0 -> 98.0.4758.9 (cherry picked from commit c169d1d5f3218e246c93e02c9229710a81008532) --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 248352015a36..1ca7fcff31b7 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "98.0.4750.0", - "sha256": "0qygnmb1wlbarni2pdfs1xl50ggvf0211c6mj7341wwsbd0bpkgr", - "sha256bin64": "1psbh5xwlgr4ain4s9vk7d0kdbbd14v29f95ai5i4d2d3cpj2319", + "version": "98.0.4758.9", + "sha256": "1sq6v2hdhpk12w37sz7jf5vwkn72ydcqzcxysf7hs2flcfgscydj", + "sha256bin64": "1jfj08jpxji2q890zbvpvmgf5bjqgvigkr1hg8ch8vaaybs5wr04", "deps": { "gn": { - "version": "2021-12-03", + "version": "2021-12-07", "url": "https://gn.googlesource.com/gn", - "rev": "e0afadf7a743d5b14737bd454df45d5f1caf0d23", - "sha256": "00pxhfikscghgm79zckh9j00jgjmdy6hixkpfq5vmgc0xpxif78v" + "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", + "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" } } }, From 2e15415fede3883a4bfcf35ca832fc53f525f686 Mon Sep 17 00:00:00 2001 From: Brian McGee Date: Thu, 23 Dec 2021 16:43:01 +0000 Subject: [PATCH 14/18] google-chrome: add pre and post install hooks This makes it easier to override the derivation (cherry picked from commit 234c7cf4310ac897bcc2d1faca7e696fa7016f07) --- .../networking/browsers/google-chrome/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 03bdb84f4384..fe6ef5c059de 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -104,6 +104,8 @@ in stdenv.mkDerivation { binpath = makeBinPath deps; installPhase = '' + runHook preInstall + case ${channel} in beta) appname=chrome-beta dist=beta ;; dev) appname=chrome-unstable dist=unstable ;; @@ -154,6 +156,8 @@ in stdenv.mkDerivation { patchelf --set-rpath $rpath $elf patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf done + + runHook postInstall ''; meta = { From 61482189d35ba7949e30cd23019b87c93c40d42e Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Thu, 30 Dec 2021 23:23:45 +0300 Subject: [PATCH 15/18] chromedriver: add support for aarch64-darwin (cherry picked from commit 6e0a2c1c5422706447a34f71c48f6c37f0a6542d) --- pkgs/applications/networking/browsers/chromium/update.py | 3 ++- .../networking/browsers/chromium/upstream-info.json | 3 ++- pkgs/development/tools/selenium/chromedriver/default.nix | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index f13bda6f5075..3ea5dea50cd6 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -68,7 +68,8 @@ def get_matching_chromedriver(version): return { 'version': chromedriver_version, 'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')), - 'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac64')) + 'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac64')), + 'sha256_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac64_m1')) } diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 1ca7fcff31b7..d132b2b75455 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -14,7 +14,8 @@ "chromedriver": { "version": "96.0.4664.45", "sha256_linux": "15wybxlh38sw7f2bzalf9ivfp8262cpcvhq08nw9d2cj3j39f13m", - "sha256_darwin": "0r3b8wgbd8xjb09f4vc402gp77y2aqjk9hpqvvr6xgdr7nqym20f" + "sha256_darwin": "0r3b8wgbd8xjb09f4vc402gp77y2aqjk9hpqvvr6xgdr7nqym20f", + "sha256_darwin_aarch64": "1yynw8ngs2655blnf1s6r9flbxlwgaybdvgl6r6h7ppl974dl7rm" } }, "beta": { diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 4df279f73133..c47cddea5867 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -17,6 +17,11 @@ let system = "mac64"; sha256 = upstream-info.sha256_darwin; }; + + aarch64-darwin = { + system = "mac64_m1"; + sha256 = upstream-info.sha256_darwin_aarch64; + }; }; spec = allSpecs.${stdenv.hostPlatform.system} From ed2999df91a0ef46839294cde0d19b1ced0902a7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 31 Dec 2021 11:46:14 +0100 Subject: [PATCH 16/18] chromiumBeta: 97.0.4692.56 -> 97.0.4692.71 (cherry picked from commit 7f3d3af98d61749f0e2f87c60947cc84b077e006) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d132b2b75455..e373fac57915 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "97.0.4692.56", - "sha256": "19i572z02hp7n7j7k5i38jr60jfli5jk5qnydfzxavwx9vjqjwgf", - "sha256bin64": "1im2dq2p5cdy6hj6n2lvn2nzwb5mgy57hyskhwhfm1fz5xzjzc3g", + "version": "97.0.4692.71", + "sha256": "0z7ximvm4a78kxyp4j0i2jzklxazpw6jcqi9jkaf8bvq9ga8kqca", + "sha256bin64": "18wr4pgzfcvvdpvvxhpd4as2qnyggq9f8z90ikdz8yj8i71l5wnc", "deps": { "gn": { "version": "2021-11-03", From ab4d4f144e9c6896c06dba64131366dd12470ac7 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Wed, 5 Jan 2022 09:30:25 -0800 Subject: [PATCH 17/18] onlykey: set the group correctly in the udev rule (cherry picked from commit d59dc2d5edce007ed779aaff00195dd664ad7a68) --- nixos/modules/hardware/onlykey/onlykey.udev | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/hardware/onlykey/onlykey.udev b/nixos/modules/hardware/onlykey/onlykey.udev index 61e3ee4e8828..9c8873aafc9e 100644 --- a/nixos/modules/hardware/onlykey/onlykey.udev +++ b/nixos/modules/hardware/onlykey/onlykey.udev @@ -14,5 +14,5 @@ KERNEL=="ttyACM*", ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="60fc", MODE:="066 # ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", ENV{ID_MM_DEVICE_IGNORE}="1" ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789A]?", ENV{MTP_NO_PROBE}="1" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", GROUP+="plugdev" -KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", GROUP+="plugdev" +SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789ABCD]?", GROUP="plugdev" +KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789B]?", GROUP="plugdev" From 1f1351befae9c6bed988fa4a80d9b7df903bd633 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 4 Jan 2022 23:56:18 +0100 Subject: [PATCH 18/18] chromium: 96.0.4664.110 -> 97.0.4692.71 https://chromereleases.googleblog.com/2022/01/stable-channel-update-for-desktop.html This update includes 37 security fixes. CVEs: CVE-2022-0096 CVE-2022-0097 CVE-2022-0098 CVE-2022-0099 CVE-2022-0100 CVE-2022-0101 CVE-2022-0102 CVE-2022-0103 CVE-2022-0104 CVE-2022-0105 CVE-2022-0106 CVE-2022-0107 CVE-2022-0108 CVE-2022-0109 CVE-2022-0110 CVE-2022-0111 CVE-2022-0112 CVE-2022-0113 CVE-2022-0114 CVE-2022-0115 CVE-2022-0116 CVE-2022-0117 CVE-2022-0118 CVE-2022-0120 (cherry picked from commit 43a33f1f01c8d28df0a79343566218ea0ef98943) --- .../browsers/chromium/upstream-info.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index e373fac57915..0d7b0f826c27 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,21 +1,21 @@ { "stable": { - "version": "96.0.4664.110", - "sha256": "1s3ilq0ik36qgqp7l88gfd1yx97zscn8yr2kprsrjfp9q8lrva9n", - "sha256bin64": "17cyj1jx47fz6y26f196xhlngrw5gnjgcvapvgkgswlwd7y67jcb", + "version": "97.0.4692.71", + "sha256": "0z7ximvm4a78kxyp4j0i2jzklxazpw6jcqi9jkaf8bvq9ga8kqca", + "sha256bin64": "1z1d50i5pvqaw6hjdxwasbznzgqwrnd1z8jmy2x05b6i49vd7r9j", "deps": { "gn": { - "version": "2021-09-24", + "version": "2021-11-03", "url": "https://gn.googlesource.com/gn", - "rev": "0153d369bbccc908f4da4993b1ba82728055926a", - "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" + "rev": "90294ccdcf9334ed25a76ac9b67689468e506342", + "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa" } }, "chromedriver": { - "version": "96.0.4664.45", - "sha256_linux": "15wybxlh38sw7f2bzalf9ivfp8262cpcvhq08nw9d2cj3j39f13m", - "sha256_darwin": "0r3b8wgbd8xjb09f4vc402gp77y2aqjk9hpqvvr6xgdr7nqym20f", - "sha256_darwin_aarch64": "1yynw8ngs2655blnf1s6r9flbxlwgaybdvgl6r6h7ppl974dl7rm" + "version": "97.0.4692.36", + "sha256_linux": "11x28m31bsfq1flqrsa5mawss39kznia2ig5ams5qkm2v5p3y39d", + "sha256_darwin": "1ysnfvj0795yc3g8sbz7g9mhc5j0sxm2r3ad2fh13sarnhn6wrs4", + "sha256_darwin_aarch64": "09m1qpk6901gqs4c7isgryffhb92szfzbxfybxhn2g5i4wrns6j7" } }, "beta": {