public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-09-13 18:03:02 +00:00 committed by GitHub
commit fa10ff02d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View File

@ -2,7 +2,7 @@
"name": "element-desktop", "name": "element-desktop",
"productName": "Element", "productName": "Element",
"main": "lib/electron-main.js", "main": "lib/electron-main.js",
"version": "1.8.2", "version": "1.8.4",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "Element", "author": "Element",
"repository": { "repository": {

4
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@ -8,12 +8,12 @@
let let
executableName = "element-desktop"; executableName = "element-desktop";
version = "1.8.2"; version = "1.8.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vector-im"; owner = "vector-im";
repo = "element-desktop"; repo = "element-desktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-6DPMfx3LF45YWn2do02zDMLYZGBgBrOMJx3XBAO0ZyM="; sha256 = "sha256-MmrO9Ref/qpW7ssjw8IAb7dYZHMRBfdfH2whsZJq/14=";
}; };
in mkYarnPackage rec { in mkYarnPackage rec {
name = "element-desktop-${version}"; name = "element-desktop-${version}";

4
pkgs/applications/networking/instant-messengers/element/element-web.nix
View File

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "element-web"; pname = "element-web";
version = "1.8.2"; version = "1.8.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; 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 = '' installPhase = ''

4
pkgs/development/interpreters/php/7.4.nix
View File

@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args; generic = (import ./generic.nix) _args;
base = callPackage generic (_args // { base = callPackage generic (_args // {
version = "7.4.21"; version = "7.4.23";
sha256 = "0al2697d5hwq0f39rgncl1pwfxzzpc0afmr0fjvw5qjpww163v1n"; sha256 = "d1e094fe6e4f832e0a64be9c69464ba5d593fb216f914efa8bbb084e0a7a5727";
}); });
in base.withExtensions ({ all, ... }: with all; ([ in base.withExtensions ({ all, ... }: with all; ([

4
pkgs/development/interpreters/php/8.0.nix
View File

@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args; generic = (import ./generic.nix) _args;
base = callPackage generic (_args // { base = callPackage generic (_args // {
version = "8.0.8"; version = "8.0.10";
sha256 = "0vyi9hhy7yl4l589dniwb3gq29sp3giq7ni4nca3x54q3bbpgg8l"; sha256 = "sha256-yUVHJxQQkAhFsITsK8s0Zq82PuypLLJL1hHcvcJvFYc=";
}); });
in base.withExtensions ({ all, ... }: with all; ([ in base.withExtensions ({ all, ... }: with all; ([

2
pkgs/development/r-modules/default.nix
View File

@ -784,6 +784,8 @@ let
RMySQL = old.RMySQL.overrideDerivation (attrs: { 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 = '' preConfigure = ''
patchShebangs configure patchShebangs configure
''; '';