@@ -20,15 +20,13 @@ pkgs.lib.optionalAttrs (!pkgs.hostPlatform.isDarwin) {
2020 type -p hare
2121 '' ;
2222 # Test good HAREPATH value
23- # TODO: When the nixpkgs input is updated, change hare-ev to hare-png, so
24- # that the inclusion of propagatedBuildInputs third-party libraries is also tested.
2523 language-hare-2 =
2624 let
2725 shell = devshell . mkShell {
2826 imports = [ ../../extra/language/hare.nix ] ;
2927 devshell . name = "devshell-2" ;
3028 language . hare = {
31- thirdPartyLibs = [ pkgs . hareThirdParty . hare-compress ] ;
29+ thirdPartyLibs = [ pkgs . hareThirdParty . hare-png ] ;
3230 vendoredLibs = [ "./vendor/lib" ] ;
3331 } ;
3432 } ;
@@ -49,10 +47,14 @@ pkgs.lib.optionalAttrs (!pkgs.hostPlatform.isDarwin) {
4947 # Check for the stdlib being included in HAREPATH
5048 [[ "$HAREPATH" =~ "src/hare/stdlib" ]] || die 'HAREPATH lacks `stdlib`'
5149
52- # Check for hare-ev being included in HAREPATH
50+ # Check for hare-compress being included in HAREPATH (propagatedBuildInputs of hare-png)
5351 [[ "$HAREPATH" =~ /nix/store/[a-z0-9]{32}-hare-compress-.*/src/hare/third-party ]] \
5452 || die 'HAREPATH lacks `hare-compress`'
5553
54+ # Check for hare-png being included in HAREPATH
55+ [[ "$HAREPATH" =~ /nix/store/[a-z0-9]{32}-hare-png-.*/src/hare/third-party ]] \
56+ || die 'HAREPATH lacks `hare-png`'
57+
5658 # Check for ./vendor/lib being included in HAREPATH
5759 [[ "$HAREPATH" =~ $PWD/vendor/lib ]] || die "HAREPATH lacks \`$PWD/vendor/lib\`"
5860 '' ;
0 commit comments