cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #264284 from aaronjheng/mysql-shell-innovation

Browse source 
mysql-shell-innovation: 8.1.1 -> 8.2.0
This commit is contained in:
Mario Rodas 2023-10-30 21:37:50 -05:00 committed by GitHub
commit 2e6507ecf3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/tools/mysql-shell/innovation.nix
View file

@ -5,7 +5,6 @@
, fetchurl , fetchurl
, git , git
, cctools , cctools
, developer_cmds
, DarwinTools , DarwinTools
, makeWrapper , makeWrapper
, CoreServices , CoreServices
@ -36,8 +35,8 @@
let let
pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];
mysqlShellVersion = "8.1.1"; mysqlShellVersion = "8.2.0";
mysqlServerVersion = "8.1.0"; mysqlServerVersion = "8.2.0";
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mysql-shell-innovation"; pname = "mysql-shell-innovation";
@ -46,11 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
srcs = [ srcs = [
(fetchurl { (fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
hash = "sha256-PdAXqUBzSqkHlqTGXhJeZxL2S7u+M4jTZGneqoe1mes="; hash = "sha256-itPj8cWuIVS+Y4rPVW6JgfcC0FKsxZV+d23xciwhGXk=";
}) })
(fetchurl { (fetchurl {
url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
hash = "sha256-X7A2h9PWgQgNg7h64oD+Th/KsqP3UGpJ2etaP2B0VuY="; hash = "sha256-kuRo+3vcDtc9aOgAuxJTy0e6E85iOFfCx/ZHtrNg08k=";
}) })
]; ];
@ -69,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ]
++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]
++ lib.optionals stdenv.isDarwin [ cctools developer_cmds DarwinTools ]; ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ];
buildInputs = [ buildInputs = [
boost boost

2
pkgs/top-level/all-packages.nix
View file

@ -1093,7 +1093,7 @@ with pkgs;
}; };
mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix {
inherit (darwin) cctools developer_cmds DarwinTools; inherit (darwin) cctools DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;
antlr = antlr4_10; antlr = antlr4_10;
boost = boost177; # Configure checks for specific version. boost = boost177; # Configure checks for specific version.