From 13834caa45e021b7fbc5b3448f54cd2892f5e235 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 3 Oct 2021 00:26:08 +0000 Subject: [PATCH 1/6] electron_12: 12.1.2 -> 12.2.1 https://github.com/electron/electron/releases/tag/v12.2.0 https://github.com/electron/electron/releases/tag/v12.2.1 (cherry picked from commit 8ce19c9399370cb9c173af1b15bf970004946258) --- 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 8ad743197890..3fbff5aab47b 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -105,13 +105,13 @@ rec { headers = "1zkdgpjrh1dc9j8qyrrrh49v24960yhvwi2c530qbpf2azgqj71b"; }; - electron_12 = mkElectron "12.1.2" { - x86_64-linux = "e0ed1e223e956213f4f835573dd9c84aac3588c1d12ca67f81399534611a873d"; - x86_64-darwin = "6a0efef7cee47d5f7cff7edfe2f3eaa134368f9ac8741742dfcb49f59da51e59"; - i686-linux = "90c60083261bf86410f30d2588204276943cc7cbfe7751192723fdde6a67da72"; - armv7l-linux = "cdff93b3ee2ab175c45d1afa33c7dde38030abe54fe285804a0eb3f983f67bdd"; - aarch64-linux = "fe1351253cc8e9f6828de90957b40fab1cad31d38e88ef085c98a1b72d9cd14b"; - aarch64-darwin = "4b2a2b9986938f332894946b22fc6cac357f69aaa72afe61b6ca6084d48dce67"; - headers = "019rf1r9mk0hzhbl5fq48zr0l4y943biv2xwnpdhr5bm1wqpvz6l"; + electron_12 = mkElectron "12.2.1" { + armv7l-linux = "7cad4f432655e3ac8b4b2f792648015f820f52abe4f2f489302de6d5a170d62a"; + aarch64-linux = "53f4397bf88f026f1a73919b6d1c74eb15b908283f93935801b76647530acd08"; + x86_64-linux = "a3e736c286f326eced0080f29a56b546c308716f4ce0d4f144adc37b530990ef"; + i686-linux = "be333c8fffb8adbf96b19b33f87e1cbe6ff8a36ecd0a5c48fa8352fed8850510"; + x86_64-darwin = "9a8e4fe8069e164fb2a87736bc9f9a1546a5c4060c499a92a7f9a95bd3c5c19d"; + aarch64-darwin = "e9844eeb0e2a26ba60a8eb1540f0d1c52069806c885842a33b45b4fd2b2bb187"; + headers = "1m1hcdb96rcxcdg812cn2m68bh1s1h6qyy39lmvkjvhbpyzd02pr"; }; } From 75415b03c09c3d5546ebc40c743d4c6b23e6363b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 6 Oct 2021 13:15:56 +0200 Subject: [PATCH 2/6] grafana: 7.5.10 -> 7.5.11, fix CVE-2021-39226 ChangeLog: https://github.com/grafana/grafana/releases/tag/v7.5.11 Follow-up on 21.05 for #140718 --- pkgs/servers/monitoring/grafana/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 1151015bdfd2..61eaa6d1a93c 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "grafana"; - version = "7.5.10"; + version = "7.5.11"; - excludedPackages = [ "release_publisher" ]; + excludedPackages = "\\(release_publisher\\|macaron\\)"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-e+Nkw9TLQoJfJUSXEGvqqWJMcwjNoN0JoB/zfIPHxYw="; + sha256 = "sha256-iwZeTzcXHbc3w7V53h14JAlGEJEW0mJqVtJ/2mj2DLo="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-xwbd5Qu+btRSqowXCVhmceOGiXiSHeBamJi0Tx79zsc="; + sha256 = "sha256-MkTQztSNLelybJo71tXwjBtqCB1CZlQB4DP8SjHFfV0="; }; - vendorSha256 = "sha256-FdotpFi1ee92mCX59bBuqzCyjIq6yujWixReYxmKbS8="; + vendorSha256 = "sha256-Y+qMmGwZk0NKPvO9VqRDOg8RcSoAgiXRZU/St8BnVgA="; # grafana-aws-sdk is specified with two versions which causes a problem later: # go: inconsistent vendoring in /build/source: From b68a066466e05ed606ef29f79d2a5f5130f9e2fc Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 8 Oct 2021 23:07:40 +0200 Subject: [PATCH 3/6] chromium: 94.0.4606.71 -> 94.0.4606.81 https://chromereleases.googleblog.com/2021/10/stable-channel-update-for-desktop.html This update includes 4 security fixes. CVEs: CVE-2021-37977 CVE-2021-37978 CVE-2021-37979 CVE-2021-37980 (cherry picked from commit d406bca7461e94cb3c9544e7ccfb3c3bba6df1d2) --- .../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 3bbe0443c018..531f50a3e329 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "94.0.4606.71", - "sha256": "0nywwcdjda1b1swfslks8i28qq6jx9gyw50bhl8c2plcc0pbmfya", - "sha256bin64": "1ffa9hqs7ibch0by574l01lwhi5a1mhcyy1qrlr81ssq4pyygrq4", + "version": "94.0.4606.81", + "sha256": "16755mfqxxmvslm9ix060safrnml91ckj5p85960jj5g5hmslwbh", + "sha256bin64": "1d3z5np6b6jax7afak7f0yh76kmmdggdjlrzwyhy8hgrv7c7rsdz", "deps": { "gn": { "version": "2021-08-11", From 5c5ca64a8350c1f516fb338a57256098815863fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Aug 2021 04:00:28 +0000 Subject: [PATCH 4/6] fetchmail: 6.4.20 -> 6.4.21 (cherry picked from commit 1d8b058fa08dbdd21d9e61d06996694285569175) --- pkgs/applications/misc/fetchmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 18ed79c99d64..44bcbd782175 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, openssl }: let - version = "6.4.20"; + version = "6.4.21"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "0xk171sbxcwjh1ibpipryw5sv4sy7jjfvhn5n373j04g5sp428f8"; + sha256 = "sha256-akWcHK/XodqlzRNxQNpgwYyEtWmc2OckmnnDM0LJnR0="; }; buildInputs = [ openssl ]; From 7b1bdbff582a43c8c0d954f2f88355a4697b1646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 Aug 2021 10:48:12 +0200 Subject: [PATCH 5/6] fetchmail: cleanup (cherry picked from commit cb2d6f5b4aa45cab7ff4c403e51b25f83234ddcb) --- pkgs/applications/misc/fetchmail/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 44bcbd782175..4baa3a094261 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, openssl }: -let - version = "6.4.21"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "fetchmail"; - inherit version; + version = "6.4.21"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; @@ -16,7 +13,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-ssl=${openssl.dev}" ]; - meta = { + meta = with lib; { homepage = "https://www.fetchmail.info/"; description = "A full-featured remote-mail retrieval and forwarding utility"; longDescription = '' @@ -27,9 +24,8 @@ stdenv.mkDerivation { all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC. ''; - - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.peti ]; - license = lib.licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.peti ]; + license = licenses.gpl2Plus; }; } From 7e52686fc84f109d275faf7f662882089b98cd9d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 9 Oct 2021 17:32:23 +0200 Subject: [PATCH 6/6] fetchmail: 6.4.21 -> 6.4.22 Fixes CVE-2021-39272. (cherry picked from commit 34c98d248ea162a5d7aa8e78a623e20cc3b700cf) --- pkgs/applications/misc/fetchmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 4baa3a094261..db807ffe1cf3 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.4.21"; + version = "6.4.22"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-akWcHK/XodqlzRNxQNpgwYyEtWmc2OckmnnDM0LJnR0="; + sha256 = "sha256-zGgYvVlDVgIWn6KS1tFj1Wshx/UxEoKUcKOs6r5hLIQ="; }; buildInputs = [ openssl ];