forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Two in-flight PRs (NixOS#327128 and NixOS#328673) both solved the same problem in a different way. This merges the best of both PRs and re-enables tests.
- Loading branch information
Elliot Cameron
committed
Aug 17, 2024
1 parent
dd1eee1
commit 7a34959
Showing
1 changed file
with
3 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec { | |
url = "mirror://gnu/gss/gss-${version}.tar.gz"; | ||
hash = "sha256-7M6r3vTK4/znIYsuy4PrQifbpEtTthuMKy6IrgJBnHM="; | ||
}; | ||
# This test crashes now. Most likely triggered by expiration on 20240711. | ||
|
||
# krb5context test uses certificates that expired on 2024-07-11. | ||
# Reported to [email protected] with Message-ID: <[email protected]>. | ||
postPatch = '' | ||
rm tests/krb5context.c | ||
''; | ||
|
@@ -29,10 +31,6 @@ stdenv.mkDerivation rec { | |
"--${if withShishi then "enable" else "disable"}-kerberos5" | ||
]; | ||
|
||
# krb5context test uses certificates that expired on 2024-07-11. | ||
# Reported to [email protected] with Message-ID: <[email protected]>. | ||
doCheck = !withShishi; | ||
|
||
# Fixup .la files | ||
postInstall = lib.optionalString withShishi '' | ||
sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la | ||
|