movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

bmake: 20230723 -> 20230909

Browse source
This commit is contained in:
Anderson Torres 2023-09-17 00:43:03 -03:00
parent 8a75a8f4cf
commit db00521fb5
5 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

0
pkgs/by-name/bm/bmake/bootstrap-fix.patch → pkgs/by-name/bm/bmake/001-bootstrap-fix.diff
View file

0
pkgs/by-name/bm/bmake/dont-test-while-installing.diff → pkgs/by-name/bm/bmake/002-dont-test-while-installing.diff
View file

0
pkgs/by-name/bm/bmake/fix-unexport-env-test.patch → pkgs/by-name/bm/bmake/003-fix-unexport-env-test.diff
View file

0
pkgs/by-name/bm/bmake/unconditional-ksh-test.patch → pkgs/by-name/bm/bmake/004-unconditional-ksh-test.diff
View file

26
pkgs/by-name/bm/bmake/package.nix
View file

@ -4,28 +4,29 @@
, fetchpatch , fetchpatch
, getopt , getopt
, ksh , ksh
, bc
, tzdata , tzdata
, pkgsMusl # for passthru.tests , pkgsMusl # for passthru.tests
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "bmake"; pname = "bmake";
version = "20230723"; version = "20230909";
src = fetchurl { src = fetchurl {
url = "http://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; url = "http://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz";
hash = "sha256-xCoNlRuiP3ZlMxMJ+74h7cARNqI8uUFoULQxW+X7WQQ="; hash = "sha256-Hl5sdlQN/oEEQmzX/T9xXMZAT5A5ySA0RwErjy9re4Y=";
}; };
patches = [ patches = [
# make bootstrap script aware of the prefix in /nix/store # make bootstrap script aware of the prefix in /nix/store
./bootstrap-fix.patch ./001-bootstrap-fix.diff
# preserve PATH from build env in unit tests
./fix-unexport-env-test.patch
# Always enable ksh test since it checks in a impure location /bin/ksh
./unconditional-ksh-test.patch
# decouple tests from build phase # decouple tests from build phase
./dont-test-while-installing.diff ./002-dont-test-while-installing.diff
# preserve PATH from build env in unit tests
./003-fix-unexport-env-test.diff
# Always enable ksh test since it checks in a impure location /bin/ksh
./004-unconditional-ksh-test.diff
]; ];
# Make tests work with musl # Make tests work with musl
@ -68,18 +69,22 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true; doCheck = true;
nativeCheckInputs = [ nativeCheckInputs = [
bc
tzdata tzdata
] ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [ ] ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [
ksh ksh
]; ];
# Disabled tests: # Disabled tests:
# directive-export{,-gmake}: another failure related to TZ variables
# opt-chdir: ofborg complains about it somehow # opt-chdir: ofborg complains about it somehow
# opt-keep-going-indirect: not yet known # opt-keep-going-indirect: not yet known
# varmod-localtime: musl doesn't support TZDIR and this test relies on impure, # varmod-localtime: musl doesn't support TZDIR and this test relies on impure,
# implicit paths # implicit paths
env.BROKEN_TESTS = builtins.concatStringsSep " " [ env.BROKEN_TESTS = builtins.concatStringsSep " " [
"opt-chdir" "directive-export"
"directive-export-gmake"
"opt-chdir" # works on my machine -- AndersonTorres
"opt-keep-going-indirect" "opt-keep-going-indirect"
"varmod-localtime" "varmod-localtime"
]; ];
@ -92,6 +97,8 @@ stdenv.mkDerivation (finalAttrs: {
runHook postCheck runHook postCheck
''; '';
strictDeps = true;
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
passthru.tests.bmakeMusl = pkgsMusl.bmake; passthru.tests.bmakeMusl = pkgsMusl.bmake;
@ -100,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "http://www.crufty.net/help/sjg/bmake.html"; homepage = "http://www.crufty.net/help/sjg/bmake.html";
description = "Portable version of NetBSD 'make'"; description = "Portable version of NetBSD 'make'";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
mainProgram = "bmake";
maintainers = with lib.maintainers; [ thoughtpolice AndersonTorres ]; maintainers = with lib.maintainers; [ thoughtpolice AndersonTorres ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
broken = stdenv.isAarch64; # failure on gnulib-tests broken = stdenv.isAarch64; # failure on gnulib-tests