Merge pull request #256917 from aaronjheng/mysql

mysql80: use finalAttrs

authored by Mario Rodas and committed by GitHub d02c3c45 4b1e7138

+8 -9
+8 -9
pkgs/servers/sql/mysql/8.0.x.nix
··· 1 { lib, stdenv, fetchurl, bison, cmake, pkg-config 2 , boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd, libfido2 3 - , numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests 4 }: 5 6 - let 7 - self = stdenv.mkDerivation rec { 8 pname = "mysql"; 9 version = "8.0.34"; 10 11 src = fetchurl { 12 - url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; 13 hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0="; 14 }; 15 ··· 63 ''; 64 65 passthru = { 66 - client = self; 67 - connector-c = self; 68 - server = self; 69 - mysqlVersion = "8.0"; 70 tests = nixosTests.mysql.mysql80; 71 }; 72 ··· 77 maintainers = with maintainers; [ orivej ]; 78 platforms = platforms.unix; 79 }; 80 - }; in self
··· 1 { lib, stdenv, fetchurl, bison, cmake, pkg-config 2 , boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd, libfido2 3 + , numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests 4 }: 5 6 + stdenv.mkDerivation (finalAttrs: { 7 pname = "mysql"; 8 version = "8.0.34"; 9 10 src = fetchurl { 11 + url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; 12 hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0="; 13 }; 14 ··· 62 ''; 63 64 passthru = { 65 + client = finalAttrs.finalPackage; 66 + connector-c = finalAttrs.finalPackage; 67 + server = finalAttrs.finalPackage; 68 + mysqlVersion = lib.versions.majorMinor finalAttrs.version; 69 tests = nixosTests.mysql.mysql80; 70 }; 71 ··· 76 maintainers = with maintainers; [ orivej ]; 77 platforms = platforms.unix; 78 }; 79 + })