From c8b20e1c4168642f9fc92fb8d7fa465eb7a18c5c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 16 Jan 2023 19:17:36 +0100 Subject: [PATCH] apk-tools: don't pin to openssl_1_1 --- pkgs/tools/package-management/apk-tools/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index 12411437969b6..c923b5a05824f 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -31,7 +31,10 @@ stdenv.mkDerivation rec { "PKGCONFIGDIR=$(out)/lib/pkgconfig" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=unused-result" + "-Wno-error=deprecated-declarations" + ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8a6ab5623c8e..25e46a05eec8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2542,7 +2542,6 @@ with pkgs; apk-tools = callPackage ../tools/package-management/apk-tools { lua = lua5_3; - openssl = openssl_1_1; }; apkid = callPackage ../development/tools/apkid { };