Skip to content

Commit

Permalink
Reapply "gss: re-enable tests"
Browse files Browse the repository at this point in the history
Two in-flight PRs (#327128 and #328673) both solved the same problem in
a different way. This merges the best of both PRs and re-enables tests.

This reverts commit e850cbb.

The original commit was accidentally merged to master instead of
staging.
  • Loading branch information
Elliot Cameron authored and alyssais committed Aug 17, 2024
1 parent 4c38d8a commit 9b9d704
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions pkgs/development/libraries/gss/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 bug-gss@gnu.org with Message-ID: <87cyngavtt.fsf@alyssa.is>.
postPatch = ''
rm tests/krb5context.c
'';
Expand All @@ -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 bug-gss@gnu.org with Message-ID: <87cyngavtt.fsf@alyssa.is>.
doCheck = !withShishi;

# Fixup .la files
postInstall = lib.optionalString withShishi ''
sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la
Expand Down

0 comments on commit 9b9d704

Please sign in to comment.