Commit Graph

50 Commits

Author SHA1 Message Date
Alex James
bb9fb0a2eb bmake: enable __structuredAttrs 2026-05-23 21:57:42 -07:00
Alex James
39d6b81582 bmake: restore missing bsd.*.mk symlinks on Darwin
bmake's installPhase was updated in #462500 to manually install the
binaries and share Makefiles for bmake as the boot-strap script invokes
bmake (breaking cross builds). This caused the darwin.locale build to
regress as bmake could no longer find bsd.prog.mk [1]. The install-sh
script (which is invoked by the install-mk target used by the boot-strap
script) creates bsd.-prefixed symlinks to the Makefiles under share on
BSD systems, including Darwin. Update bmake's installPhase to invoke
install-mk to ensure that the symlinks are created. install-mk does not
invoke bmake so this should not break cross builds.

[1]: 2bdd0b49a2/locale/BSDmakefile (L9)
2026-05-23 18:47:58 -07:00
Alyssa Ross
14b995ab3a bmake: fix cross (#462500) 2026-05-18 08:07:17 +00:00
Ben Siraphob
8a93a5d60f bmake: fix cross 2026-05-17 13:50:33 -07:00
Ben Siraphob
869d641281 treewide: replace stdenv.is* with stdenv.hostPlatform.is* 2026-05-10 10:06:35 -07:00
R. Ryantm
379274810a bmake: 20251111 -> 20260313 2026-03-19 00:34:44 +00:00
Sergei Trofimovich
f6a56a06a0 bmake: 20250804 -> 20251111 2025-11-20 06:44:01 +00:00
Sizhe Zhao
9871080d5f bmake: remove dependency on ksh 2025-10-21 01:15:08 +08:00
Vladimír Čunát
98c1b23f3d bmake: avoid a bad test on darwin
https://hydra.nixos.org/build/309555861/nixlog/2/tail
Feel free to do deeper investigation and/or better fix.
2025-10-15 13:48:34 +02:00
Philip Taron
a738819830 bmake: cmd-interrupt test tries to SIGINT itself, is flaky as a result (take 2, staging edition) (#439594) 2025-09-02 09:31:23 -07:00
Philip Taron
56551e3e23 bmake: cmd-interrupt test tries to SIGINT make itself, is flaky as a result
It's not core to the way that `bmake` is used in Nixpkgs; let's turn it off.

(cherry picked from commit 000aa76a6b)
2025-09-02 08:08:14 -07:00
Will Fancher
2bf51dab01 Revert "bmake: interrupt test fails on x86_64-linux some of the time" 2025-09-02 01:11:20 -04:00
Philip Taron
000aa76a6b bmake: cmd-interrupt test tries to SIGINT make itself, is flaky as a result
It's not core to the way that `bmake` is used in Nixpkgs; let's turn it off.
2025-09-01 17:21:46 -07:00
nixpkgs-ci[bot]
9f455ea141 Merge master into staging-next 2025-09-01 16:25:26 +00:00
Philip Taron
269f0be9ee bmake: interrupt-compat test fails on x86_64-linux building for i686-linux 2025-08-30 06:23:07 -07:00
Sergei Trofimovich
679ab9415d bmake: 20250707 -> 20250804 2025-08-20 22:11:17 +01:00
R. Ryantm
2ff9e8c46a bmake: 20250528 -> 20250707 2025-07-30 14:17:16 +02:00
Wolfgang Walther
fc45a5f2c9 ci/eval: don't evaluate variants
This removes pkgsx86_64Darwin from the top-level attributes when
generating attrpaths for evaluation on Linux. Needed for attrpaths
generation to succeed without silently catching eval errors.

Variants are still available during actual Eval for references from
other packages, just not during attrpath generation. To remove it from
Eval as well, issues around pkgsLLVM will have to be fixed first.
2025-07-24 15:31:07 +02:00
Wolfgang Walther
5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
R. Ryantm
73415c7a34 bmake: 20250308 -> 20250528 2025-06-12 21:29:38 +00:00
Silvan Mosberger
e52d633a63 Merge remote-tracking branch 'upstream/staging-next' into staging 2025-04-02 18:30:54 +02:00
Silvan Mosberger
374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
R. Ryantm
2f84b49fed bmake: 20250125 -> 20250308 2025-03-18 19:42:55 +00:00
K900
d8f046d61e bmake: 20241124 -> 20250125 (#378361) 2025-02-09 09:27:56 +03:00
Anderson Torres
40cbb24d1b bmake: remove AndersonTorres from maintainers
Because it goes onto Staging - already bad enough - and it goes over
Staging because it causes mass rebuilds of Darwin - too bad.
2025-02-02 21:13:29 -03:00
R. Ryantm
9edef67678 bmake: 20241124 -> 20250125 2025-01-31 22:15:02 +00:00
R. Ryantm
2bf06b7559 bmake: 20240921 -> 20241124 2024-12-28 02:31:34 +00:00
Weijia Wang
dc742cb2e6 Revert "bmake: 20240921 -> 20241124" 2024-12-20 17:36:34 +01:00
R. Ryantm
62601ddfc3 bmake: 20240921 -> 20241124 2024-12-06 08:25:18 +00:00
Vladimír Čunát
3576b958e4 Reapply "bmake: 20240808 -> 20240921" (PR #349649)
This reverts commit 65f28f123e.
Update moved to staging due to causing rebuilds on staging-next.
2024-10-21 15:58:56 +02:00
Vladimír Čunát
65f28f123e Revert "bmake: 20240808 -> 20240921"
This reverts commit bf21377621.

This wasn't a big rebuild on nixpkgs master, but now on staging-next
it would rebuild *-darwin stdenv, which would be too expensive
at this point.
2024-10-21 15:17:10 +02:00
R. Ryantm
bf21377621 bmake: 20240808 -> 20240921 2024-10-18 22:33:39 +00:00
Anderson Torres
83e26d0f96 bmake: 20240722 -> 20240808 2024-09-12 22:16:21 -03:00
Anderson Torres
7a9f947b29 bmake: use nix*Log in setup hook 2024-09-12 22:16:21 -03:00
Wolfgang Walther
f96e20895f bmake: support structuredAttrs in setup hook
Tested libfsm with and without __structuredAttrs.
2024-08-24 12:23:36 +02:00
R. Ryantm
ebcee2adb7 bmake: 20240711 -> 20240722 2024-08-05 12:51:16 +00:00
R. Ryantm
f9decceab1 bmake: 20240625 -> 20240711 2024-07-15 01:03:17 +00:00
R. Ryantm
a59a1eea8a bmake: 20240520 -> 20240625 2024-06-28 20:14:11 +00:00
Anderson Torres
894ea3e439 [wip] bmake: reenable test opt-chdir 2024-06-10 11:27:53 -03:00
Anderson Torres
074c45769c bmake: 20240301 -> 20240520
- The first patch is now unneeded
- The second one needs an update
- Now Musl is working 100%... strange...
2024-06-10 11:27:53 -03:00
Sigmanificient
cc8120d3ff pkgs/by-name: remove unuseed fetchpatch arguments 2024-05-24 02:49:58 +02:00
R. Ryantm
24670914cd bmake: 20240212 -> 20240301 2024-03-03 03:15:22 +00:00
R. Ryantm
90497714cc bmake: 20240108 -> 20240212 2024-02-19 06:22:31 +00:00
R. Ryantm
a1c58f2a97 bmake: 20231210 -> 20240108 2024-01-23 16:26:15 +00:00
Anderson Torres
e52bf52270 bmake: 20231124 -> 20231210 2023-12-31 21:40:24 -03:00
Anderson Torres
78d92bbe8e bmake: 20230909 -> 20231124 2023-12-31 21:40:24 -03:00
Adam Joseph
c7e0f6b905 treewide: s_targetPlatform_hostPlatform_ in non-compiler packages
stdenv.targetPlatform really shouldn't be used by software that
doesn't generate or manipulate binaries.  I reviewed all uses of
targetPlatform outside of pkgs/development/compilers and pkgs/stdenv
and replaced those which weren't involved in something which fits
these criteria.
2023-11-17 08:07:34 +00:00
Anderson Torres
ae8fff7469 bmake: more accurate metainfo about brokenness 2023-09-22 01:38:23 -03:00
Anderson Torres
db00521fb5 bmake: 20230723 -> 20230909 2023-09-22 01:38:23 -03:00
Anderson Torres
8a75a8f4cf bmake: move to by-name 2023-09-22 01:38:23 -03:00