From 9b766dd41b9b49cb0c1b1f3317fc2273f1f8f3a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 25 Mar 2023 10:44:21 +0100 Subject: [PATCH] libxcrypt: add -legacy variant --- pkgs/development/libraries/libxcrypt/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index 769994a5cdf..9e03187e957 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, perl, nixosTests }: +{ lib, stdenv, fetchurl, perl +# Update the enabled crypt scheme ids in passthru when the enabled hashes change +, enableHashes ? "strong" +, nixosTests +}: stdenv.mkDerivation rec { pname = "libxcrypt"; @@ -15,8 +19,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - # Update the enabled crypt scheme ids in passthru when the enabled hashes change - "--enable-hashes=strong" + "--enable-hashes=${enableHashes}" "--enable-obsolete-api=glibc" "--disable-failure-tokens" ] ++ lib.optionals (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.libc == "bionic") [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6293b6dafce..79468281c7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22242,6 +22242,7 @@ with pkgs; fetchurl = stdenv.fetchurlBoot; }; }; + libxcrypt-legacy = libxcrypt.override { enableHashes = "all"; }; libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { };