pyrox.dev
Merge pull request #256917 from aaronjheng/mysql
mysql80: use finalAttrs
authored by Mario Rodas and committed by GitHub d02c3c45 4b1e7138
+8
-9
pkgs/servers/sql/mysql/8.0.x.nix
+8
-9
pkgs/servers/sql/mysql/8.0.x.nix
···
1
1
{ lib, stdenv, fetchurl, bison, cmake, pkg-config
2
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
3
+
, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests
4
4
}:
5
5
6
-
let
7
-
self = stdenv.mkDerivation rec {
6
+
stdenv.mkDerivation (finalAttrs: {
8
7
pname = "mysql";
9
8
version = "8.0.34";
10
9
11
10
src = fetchurl {
12
-
url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz";
11
+
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
13
12
hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0=";
14
13
};
15
14
···
63
62
'';
64
63
65
64
passthru = {
66
-
client = self;
67
-
connector-c = self;
68
-
server = self;
69
-
mysqlVersion = "8.0";
65
+
client = finalAttrs.finalPackage;
66
+
connector-c = finalAttrs.finalPackage;
67
+
server = finalAttrs.finalPackage;
68
+
mysqlVersion = lib.versions.majorMinor finalAttrs.version;
70
69
tests = nixosTests.mysql.mysql80;
71
70
};
72
71
···
77
76
maintainers = with maintainers; [ orivej ];
78
77
platforms = platforms.unix;
79
78
};
80
-
}; in self
79
+
})