Skip to content

Commit bf7cc8f

Browse files
Merge pull request #576 from NixOS/libxcrypt
cabal2nix: resolve crypt library to libxcrypt
2 parents 244235a + ea90aab commit bf7cc8f

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ libNixName "cairo-gobject" = return "cairo"
3636
libNixName "cairo-pdf" = return "cairo"
3737
libNixName "cairo-ps" = return "cairo"
3838
libNixName "cairo-svg" = return "cairo"
39-
libNixName "crypt" = [] -- provided by glibc
39+
libNixName "crypt" = return "libxcrypt" -- starting with NixOS 22.11, glibc's libcrypt will no longer be built
4040
libNixName "crypto" = return "openssl"
4141
libNixName "curses" = return "ncurses"
4242
libNixName "dbusmenu-glib-0.4" = return "libdbusmenu"

cabal2nix/test/golden-test-cases/crypt-sha512.nix.golden

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{ mkDerivation, attoparsec, base, bytestring, cryptohash-sha512
2-
, lib, quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck
2+
, lib, libxcrypt, quickcheck-instances, tasty, tasty-hunit
3+
, tasty-quickcheck
34
}:
45
mkDerivation {
56
pname = "crypt-sha512";
@@ -12,6 +13,7 @@ mkDerivation {
1213
base bytestring quickcheck-instances tasty tasty-hunit
1314
tasty-quickcheck
1415
];
16+
testSystemDepends = [ libxcrypt ];
1517
homepage = "https://github.com/phadej/crypt-sha512";
1618
description = "Pure Haskell implelementation for GNU SHA512 crypt algorithm";
1719
license = lib.licenses.bsd3;

0 commit comments

Comments
 (0)