bmake: 20230723 -> 20230909

+16 -8
pkgs/by-name/bm/bmake/bootstrap-fix.patch pkgs/by-name/bm/bmake/001-bootstrap-fix.diff
pkgs/by-name/bm/bmake/dont-test-while-installing.diff pkgs/by-name/bm/bmake/002-dont-test-while-installing.diff
pkgs/by-name/bm/bmake/fix-unexport-env-test.patch pkgs/by-name/bm/bmake/003-fix-unexport-env-test.diff
+16 -8
pkgs/by-name/bm/bmake/package.nix
··· 4 4 , fetchpatch 5 5 , getopt 6 6 , ksh 7 + , bc 7 8 , tzdata 8 9 , pkgsMusl # for passthru.tests 9 10 }: 10 11 11 12 stdenv.mkDerivation (finalAttrs: { 12 13 pname = "bmake"; 13 - version = "20230723"; 14 + version = "20230909"; 14 15 15 16 src = fetchurl { 16 17 url = "http://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; 17 - hash = "sha256-xCoNlRuiP3ZlMxMJ+74h7cARNqI8uUFoULQxW+X7WQQ="; 18 + hash = "sha256-Hl5sdlQN/oEEQmzX/T9xXMZAT5A5ySA0RwErjy9re4Y="; 18 19 }; 19 20 20 21 patches = [ 21 22 # make bootstrap script aware of the prefix in /nix/store 22 - ./bootstrap-fix.patch 23 + ./001-bootstrap-fix.diff 24 + # decouple tests from build phase 25 + ./002-dont-test-while-installing.diff 23 26 # preserve PATH from build env in unit tests 24 - ./fix-unexport-env-test.patch 27 + ./003-fix-unexport-env-test.diff 25 28 # Always enable ksh test since it checks in a impure location /bin/ksh 26 - ./unconditional-ksh-test.patch 27 - # decouple tests from build phase 28 - ./dont-test-while-installing.diff 29 + ./004-unconditional-ksh-test.diff 29 30 ]; 30 31 31 32 # Make tests work with musl ··· 68 69 doCheck = true; 69 70 70 71 nativeCheckInputs = [ 72 + bc 71 73 tzdata 72 74 ] ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [ 73 75 ksh 74 76 ]; 75 77 76 78 # Disabled tests: 79 + # directive-export{,-gmake}: another failure related to TZ variables 77 80 # opt-chdir: ofborg complains about it somehow 78 81 # opt-keep-going-indirect: not yet known 79 82 # varmod-localtime: musl doesn't support TZDIR and this test relies on impure, 80 83 # implicit paths 81 84 env.BROKEN_TESTS = builtins.concatStringsSep " " [ 82 - "opt-chdir" 85 + "directive-export" 86 + "directive-export-gmake" 87 + "opt-chdir" # works on my machine -- AndersonTorres 83 88 "opt-keep-going-indirect" 84 89 "varmod-localtime" 85 90 ]; ··· 92 97 runHook postCheck 93 98 ''; 94 99 100 + strictDeps = true; 101 + 95 102 setupHook = ./setup-hook.sh; 96 103 97 104 passthru.tests.bmakeMusl = pkgsMusl.bmake; ··· 100 107 homepage = "http://www.crufty.net/help/sjg/bmake.html"; 101 108 description = "Portable version of NetBSD 'make'"; 102 109 license = lib.licenses.bsd3; 110 + mainProgram = "bmake"; 103 111 maintainers = with lib.maintainers; [ thoughtpolice AndersonTorres ]; 104 112 platforms = lib.platforms.unix; 105 113 broken = stdenv.isAarch64; # failure on gnulib-tests
pkgs/by-name/bm/bmake/unconditional-ksh-test.patch pkgs/by-name/bm/bmake/004-unconditional-ksh-test.diff