lol

Merge pull request #185614 from AndersonTorres/bmake

bmake: 20220208 -> 20220726

authored by

Anderson Torres and committed by
GitHub
901978e1 dd3c0089

+12 -8
+12 -8
pkgs/development/tools/build-managers/bmake/default.nix
··· 8 8 , pkgsMusl # for passthru.tests 9 9 }: 10 10 11 - stdenv.mkDerivation rec { 11 + stdenv.mkDerivation (finalAttrs: { 12 12 pname = "bmake"; 13 - version = "20220208"; 13 + version = "20220726"; 14 14 15 15 src = fetchurl { 16 - url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; 17 - hash = "sha256-ewDB4UYrLh5Upk2ND88n/HfursPxOSDv+NlST/BZ1to="; 16 + url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; 17 + hash = "sha256-G/N3B4lyJyHcp7C/+K/EqVINog8CGbt7xSNQrwEz8KA="; 18 18 }; 19 19 20 20 # Make tests work with musl ··· 60 60 ]; 61 61 62 62 # Disabled tests: 63 + # opt-chdir: ofborg complains about it somehow 64 + # opt-keep-going-indirect: not yet known 63 65 # varmod-localtime: musl doesn't support TZDIR and this test relies on impure, 64 66 # implicit paths 65 - # opt-chdir: ofborg complains about it somehow 66 - BROKEN_TESTS = "varmod-localtime opt-chdir"; 67 + BROKEN_TESTS = builtins.concatStringsSep " " [ 68 + "opt-chdir" 69 + "opt-keep-going-indirect" 70 + "varmod-localtime" 71 + ]; 67 72 68 73 buildPhase = '' 69 74 runHook preBuild ··· 105 110 license = licenses.bsd3; 106 111 maintainers = with maintainers; [ thoughtpolice AndersonTorres ]; 107 112 platforms = platforms.unix; 108 - broken = with stdenv; isAarch64 && !isDarwin; # ofborg complains 109 113 }; 110 114 111 115 passthru.tests.bmakeMusl = pkgsMusl.bmake; 112 - } 116 + }) 113 117 # TODO: report the quirks and patches to bmake devteam (especially the Musl one)