From ffeb843237e38dcf16c7a3caacc5a0e5d90320ca Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 6 Feb 2023 14:15:14 -0300 Subject: [PATCH 1/2] pmdk: removed No further support or maintenance planned by upstream. https://pmem.io/blog/2022/11/update-on-pmdk-and-our-long-term-support-strategy/ Alpine also removed pmdk package: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/43663 --- pkgs/development/libraries/pmdk/default.nix | 42 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 pkgs/development/libraries/pmdk/default.nix diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix deleted file mode 100644 index 1f02bfa0dab3..000000000000 --- a/pkgs/development/libraries/pmdk/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, autoconf, libndctl, pkg-config, gnum4, pandoc -}: - -stdenv.mkDerivation rec { - pname = "pmdk"; - version = "1.11.1"; - - src = fetchFromGitHub { - owner = "pmem"; - repo = "pmdk"; - rev = "refs/tags/${version}"; - hash = "sha256-8bnyLtgkKfgIjJkfY/ZS1I9aCYcrz0nrdY7m/TUVWAk="; - }; - - nativeBuildInputs = [ autoconf pkg-config gnum4 pandoc ]; - buildInputs = [ libndctl ]; - enableParallelBuilding = true; - - outputs = [ "out" "lib" "dev" "man" ]; - - patchPhase = "patchShebangs utils"; - - NIX_CFLAGS_COMPILE = "-Wno-error"; - - installPhase = '' - make install prefix=$out - - mkdir -p $lib $dev $man/share - mv $out/share/man $man/share/man - mv $out/include $dev/include - mv $out/lib $lib/lib - ''; - - meta = with lib; { - description = "Persistent Memory Development Kit"; - homepage = "https://github.com/pmem/pmdk"; - license = licenses.lgpl21; - maintainers = with maintainers; [ thoughtpolice ]; - platforms = [ "x86_64-linux" ]; # aarch64 is experimental - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ee372900ad78..6b487197435a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 047f7ece1c2d..59960ff93562 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 }; From 8e8822c87271307ad42825b72b04c580c1f16e01 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 6 Feb 2023 14:17:05 -0300 Subject: [PATCH 2/2] mariadb: remove pmdk; make Numa optional --- pkgs/servers/sql/mariadb/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 9eacea78a37e..67abd89d1f9d 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -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 ]); @@ -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}" @@ -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); postPatch = '' substituteInPlace scripts/galera_new_cluster.sh \ @@ -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"