Unverified Commit 2e6507ec authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

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

mysql-shell-innovation: 8.1.1 -> 8.2.0
parents 1122fb51 919951b1

pkgs/development/tools/mysql-shell/innovation.nix

+5 −6
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
, fetchurl

, git

, cctools

, developer_cmds

, DarwinTools

, makeWrapper

, CoreServices
@@ -36,8 +35,8 @@ 
let

  pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ];



  mysqlShellVersion = "8.1.1";

  mysqlServerVersion = "8.1.0";

  mysqlShellVersion = "8.2.0";

  mysqlServerVersion = "8.2.0";

in

stdenv.mkDerivation (finalAttrs: {

  pname = "mysql-shell-innovation";
@@ -46,11 +45,11 @@ stdenv.mkDerivation (finalAttrs: { 
  srcs = [

    (fetchurl {

      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 {

      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 ]

    ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]

    ++ lib.optionals stdenv.isDarwin [ cctools developer_cmds DarwinTools ];

    ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ];



  buildInputs = [

    boost

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -1093,7 +1093,7 @@ with pkgs; 
  };















  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;















    antlr = antlr4_10;















    boost = boost177; # Configure checks for specific version.