Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

samurai: init at 1.0 #77140

Merged
merged 1 commit into from Feb 13, 2020
Merged

samurai: init at 1.0 #77140

merged 1 commit into from Feb 13, 2020

Conversation

@dtzWill
Copy link
Contributor

@dtzWill dtzWill commented Jan 6, 2020

Motivation for this change

samurai is a ninja-compatible build tool written in C99 with a focus on
simplicity, speed, and portability.

Will need some plumbing work to be used automagically in nixpkgs like we
do with ninja (setup-hook to start), but still nice to have packaged for
anyone interested in using now that 1.0 has been released.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@dtzWill
Copy link
Contributor Author

@dtzWill dtzWill commented Jan 6, 2020

Notes in case folks are interested/find it useful:


Possible issues preventing replacing ninja w/samu (regardless of whether that's desired, not here to tackle that):

  • Our ninja setup-hook tries to use to query tool which samurai doesn't currently support, as part of detecting if 'test' is a valid target.
  • meson tries to use compdb tool, which samu(rai) doesn't support and seems unlikely it will in the near future (see michaelforney/samurai#19 and michaelforney/samurai#25 ).

When used with meson, may want to disable terminal escapes (color diagnostics), see README.

@dtzWill dtzWill force-pushed the dtzWill:feature/samurai branch from 517048e to 80f043b Jan 6, 2020
@dtzWill
Copy link
Contributor Author

@dtzWill dtzWill commented Jan 6, 2020

(added homepage to meta, whoops)

@nh2
nh2 approved these changes Jan 12, 2020
@dtzWill
Copy link
Contributor Author

@dtzWill dtzWill commented Feb 13, 2020

With some patches in recent git, compdb is added! Leaving for a separate PR, but if anyone is interested I've put together needed bits to use samu for build instead of ninja (various motivations, but especially interesting for much reduced dep tree (notably no python needed-- which for nixpkgs might be useful for slimmer bootstrapping):

Anyway, for the curious/interested: https://github.com/dtzWill/nixpkgs/tree/experimental/samurai-setup-hook .

@dtzWill dtzWill merged commit 18d9cc2 into NixOS:master Feb 13, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
samurai on aarch64-linux Success
Details
samurai on x86_64-darwin Success
Details
samurai on x86_64-linux Success
Details
@dtzWill dtzWill deleted the dtzWill:feature/samurai branch Feb 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.