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 1/2] 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 769994a5cdfd..9e03187e957a 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 6293b6dafce7..79468281c7d5 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 { }; From 34ec699ea0f55c36247a426cd102942f232ca8c5 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:46:47 +0100 Subject: [PATCH 2/2] graalvmCEPackages.python-installable-svm-java*: fix by libxcrypt-legacy https://hydra.nixos.org/build/213259071 --- .../compilers/graalvm/community-edition/buildGraalvmProduct.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index 6037435d3aec..a9eb04cdb3c9 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -6,6 +6,7 @@ , perl , unzip , zlib +, libxcrypt-legacy # extra params , product , javaVersion @@ -46,6 +47,7 @@ stdenv.mkDerivation ({ buildInputs = [ stdenv.cc.cc.lib # libstdc++.so.6 zlib + libxcrypt-legacy # libcrypt.so.1 (default is .2 now) ] ++ extraBuildInputs; unpackPhase = ''