Skip to content

mariadb: fix musl, make Numa optional; pmdk: remove #214981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ajs124 merged 2 commits into from
Feb 8, 2023
Merged

mariadb: fix musl, make Numa optional; pmdk: remove #214981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffeb843
pmdk: removed
superherointj Feb 6, 2023
8e8822c
mariadb: remove pmdk; make Numa optional
superherointj Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions pkgs/development/libraries/pmdk/default.nix
View file
Open in desktop

This file was deleted.

16 changes: 9 additions & 7 deletions pkgs/servers/sql/mariadb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,17 @@ let
# Server components
, bzip2, lz4, lzo, snappy, xz, zlib, zstd
, cracklib, judy, libevent, libxml2
, linux-pam, numactl, pmdk
, linux-pam, numactl
, fmt_8
, withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq
, withStorageRocks ? true
, withEmbedded ? false
, withNuma ? false
}:

let
isCross = stdenv.buildPlatform != stdenv.hostPlatform;

libExt = stdenv.hostPlatform.extensions.sharedLibrary;

mytopEnv = buildPackages.perl.withPackages (p: with p; [ DBDmysql DBI TermReadKey ]);
Expand Down Expand Up @@ -99,7 +103,7 @@ let
] ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "10.6") [
# workaround for https://jira.mariadb.org/browse/MDEV-29925
"-Dhave_C__Wl___as_needed="
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
] ++ lib.optionals isCross [
# revisit this if nixpkgs supports any architecture whose stack grows upwards
"-DSTACK_DIRECTION=-1"
"-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
Expand Down Expand Up @@ -169,16 +173,14 @@ let
buildInputs = common.buildInputs ++ [
bzip2 lz4 lzo snappy xz zstd
cracklib judy libevent libxml2
] ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl
] ++ lib.optional withNuma numactl
++ lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ]
++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.dev
++ lib.optional (!stdenv.hostPlatform.isDarwin) mytopEnv
++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ]
++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ];

propagatedBuildInputs = lib.optionals withEmbedded
(lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.lib
++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl);
(lib.optional withNuma numactl);
Copy link
Member

@SuperSandro2000 SuperSandro2000 Feb 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The conditions could have been combined here IIUTC

Copy link
Contributor Author

@superherointj superherointj Feb 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, and I actually think this can be removed because it is deprecated:
https://dev.mysql.com/doc/refman/5.7/en/source-configuration-options.html#option_cmake_with_embedded_server

NUMA still makes sense though.


postPatch = ''
substituteInPlace scripts/galera_new_cluster.sh \
Expand All @@ -197,7 +199,7 @@ let
"-DWITHOUT_EXAMPLE=1"
"-DWITHOUT_FEDERATED=1"
"-DWITHOUT_TOKUDB=1"
] ++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [
] ++ lib.optionals withNuma [
"-DWITH_NUMA=ON"
] ++ lib.optionals (!withStorageMroonga) [
"-DWITHOUT_MROONGA=1"
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,7 @@ mapAliases ({
pleroma-otp = pleroma; # Added 2021-07-10
plexpy = throw "'plexpy' has been renamed to/replaced by 'tautulli'"; # Converted to throw 2022-02-22
pltScheme = racket; # just to be sure
pmdk = throw "'pmdk' is discontinued, no further support or maintenance is planned by upstream"; # Added 2023-02-06
pmtools = throw "'pmtools' has been renamed to/replaced by 'acpica-tools'"; # Converted to throw 2022-02-22
pocketsphinx = throw "pocketsphinx has been removed: unmaintained"; # Added 2022-04-24
polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17753,8 +17753,6 @@ with pkgs;
openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};

pmdk = callPackage ../development/libraries/pmdk { };

jdepend = callPackage ../development/tools/analysis/jdepend {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
Expand Down