From 72eba819ce212a9b0c531a8c07dea41256e5f8a9 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 13 Sep 2021 08:51:59 +0200 Subject: [PATCH 1/5] php74: 7.4.21 -> 7.4.23 (cherry picked from commit 3fbb55710d31b27c8fa5897e4e7714ea54ce06e5) --- pkgs/development/interpreters/php/7.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index e5c339e502d..9797d98629f 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.4.21"; - sha256 = "0al2697d5hwq0f39rgncl1pwfxzzpc0afmr0fjvw5qjpww163v1n"; + version = "7.4.23"; + sha256 = "d1e094fe6e4f832e0a64be9c69464ba5d593fb216f914efa8bbb084e0a7a5727"; }); in base.withExtensions ({ all, ... }: with all; ([ From f5fb1a308042c3805a3fba7d4082506e92adae79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 13 Sep 2021 13:50:35 +0200 Subject: [PATCH 2/5] rPackages.RMySQL: fix package (cherry picked from commit a286dc9ef2fcc0748796c460f4a3ca169801b160) --- pkgs/development/r-modules/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f16a6d0bb4a..b239c32a890 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -783,7 +783,9 @@ let }); RMySQL = old.RMySQL.overrideDerivation (attrs: { - MYSQL_DIR="${pkgs.libmysqlclient}"; + MYSQL_DIR = "${pkgs.libmysqlclient}"; + PKGCONFIG_CFLAGS = "-I${pkgs.libmysqlclient.dev}/include/mysql"; + NIX_CFLAGS_LINK = "-L${pkgs.libmysqlclient}/lib/mysql -lmysqlclient"; preConfigure = '' patchShebangs configure ''; From 85cdc98680a6ba15446b4d807e8ca24a124ac7b5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 13 Sep 2021 10:49:16 +0200 Subject: [PATCH 3/5] php80: 8.0.8 -> 8.0.10 ChangeLog: https://www.php.net/ChangeLog-8.php#8.0.10 (cherry picked from commit ab8017a2dd84af08ebfb4b9e43964013b3351f65) --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 00cc1191961..538c1e66f11 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "8.0.8"; - sha256 = "0vyi9hhy7yl4l589dniwb3gq29sp3giq7ni4nca3x54q3bbpgg8l"; + version = "8.0.10"; + sha256 = "sha256-yUVHJxQQkAhFsITsK8s0Zq82PuypLLJL1hHcvcJvFYc="; }); in base.withExtensions ({ all, ... }: with all; ([ From 9a984970b6ca6e054417cff5c8b1a883d1787c4a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 13 Sep 2021 14:16:50 +0200 Subject: [PATCH 4/5] element-web: 1.8.2 -> 1.8.4 ChangeLog: https://github.com/vector-im/element-web/releases/tag/v1.8.4 (cherry picked from commit 55d25c13bda5daa4f83f6c1965e4a263a3a84d74) --- .../networking/instant-messengers/element/element-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index fdea75c78af..a46bc6ea5c5 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.8.2"; + version = "1.8.4"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-SgVxYPmdgFn6Nll1a6b1Sn2H5I0Vkjorn3gA9d5FamQ="; + sha256 = "sha256-V4ekSs6FmSCpUFlAipTyrde4z+ErQCb9zzktbX8YtC8="; }; installPhase = '' From f3510c5ee3ba0bfdce5f8a24780a8d8268cf4253 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 13 Sep 2021 14:17:13 +0200 Subject: [PATCH 5/5] element-desktop: 1.8.2 -> 1.8.4 ChangeLog: https://github.com/vector-im/element-desktop/releases/tag/v1.8.4 (cherry picked from commit c81983ec9f228b9b1405f492429a33cb3976201b) --- .../instant-messengers/element/element-desktop-package.json | 2 +- .../networking/instant-messengers/element/element-desktop.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 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 5251b07d8d9..340e8e22f64 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": "lib/electron-main.js", - "version": "1.8.2", + "version": "1.8.4", "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 47e1c1021af..07bf3c8b0f0 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.8.2"; + version = "1.8.4"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-6DPMfx3LF45YWn2do02zDMLYZGBgBrOMJx3XBAO0ZyM="; + sha256 = "sha256-MmrO9Ref/qpW7ssjw8IAb7dYZHMRBfdfH2whsZJq/14="; }; in mkYarnPackage rec { name = "element-desktop-${version}";