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.

Sign up for GitHub

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

Jump to bottom

Build manual with Meson #11224

Merged
merged 1 commit into from
Oct 9, 2024
Merged

Build manual with Meson #11224

merged 1 commit into from
Oct 9, 2024

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Jul 31, 2024 •
edited
Loading

Motivation

Meson for:

  • doc/manual
  • scripts
  • misc

Context

#2503

Depends on #11073
Depends on #11302
Depends on #11662

Priorities and Process

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

@github-actions github-actions bot added documentation new-cli Relating to the "nix" command contributor-experience Developer experience for Nix contributors with-tests Issues related to testing. PRs with tests have some priority repl The Read Eval Print Loop, "nix repl" command and debugger labels Jul 31, 2024
@L-as
Copy link
Member

L-as commented Jul 31, 2024 •
edited
Loading

What does this change compared to the other PRs? Wish GitHub supported dependencies in PRs natively.

@Ericson2314
Copy link
Member Author

@L-as Edited the description to be precise about it.

@tomberek tomberek mentioned this pull request Aug 4, 2024
Merged
13 tasks
roberth
roberth reviewed Aug 13, 2024
View reviewed changes
doc/manual/generate-deps.py Show resolved Hide resolved
doc/manual/generate-deps.py Show resolved Hide resolved
doc/manual/json-to-tree.py Outdated Show resolved Hide resolved
doc/manual/package.nix Outdated Show resolved Hide resolved
doc/manual/package.nix Outdated
jq
];

nativeBuildInputs = finalAttrs.passthru.baseNativeBuildInputs ++ [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thought: This could be factored out into mkMesonDerivation, or one of its layers, or maybe it should be called mkNixMesonDerivation or something because it's getting a bit specific.

src/libcmd/repl.cc Outdated Show resolved Hide resolved
src/nix/meson.build Outdated
Comment on lines 252 to 258
subdir('scripts')
subdir('misc')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like these dependencies to be inverted if possible. I don't think the CLI build should be the final do-it-all derivation, because it means that changing these configs requires a CLI rebuild, making those files unnecessarily slow to iterate on.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's make a separate issue for this

src/nix/self-exe.cc Outdated Show resolved Hide resolved
src/nix/self-exe.hh Outdated Show resolved Hide resolved
tests/functional/meson.build Outdated Show resolved Hide resolved
@dpulls dpulls
Copy link

dpulls bot commented Aug 14, 2024

🎉 All dependencies have been resolved !

@Ericson2314 Ericson2314 force-pushed the meson-misc branch 2 times, most recently from 7688ec6 to 535f68a Compare August 19, 2024 15:20
@Ericson2314 Ericson2314 changed the title Meson misc Build manual with Meson Aug 19, 2024
@dpulls dpulls
Copy link

dpulls bot commented Aug 27, 2024

🎉 All dependencies have been resolved !

@Ericson2314 Ericson2314 mentioned this pull request Aug 28, 2024
Open
@Ericson2314
Copy link
Member Author

Added the commit that @haenoe contributed, thanks!

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/2024-09-18-nix-team-meeting-minutes-179/52361/1

@Ericson2314
Copy link
Member Author

Oh lovely, I don't think I got that eval error locally with Nix 2.18.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/2024-10-02-nix-team-meeting-minutes-183/53815/1

@Ericson2314 Ericson2314 marked this pull request as ready for review October 3, 2024 18:43
Mic92
Mic92 reviewed Oct 7, 2024
View reviewed changes
src/nix/eval.cc Outdated
// TODO abstract mkdir perms for Windows
createDir(path.string(), 0777);
// N.B. this is idempotent
fs::create_directory(path.string());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this supposed to be there still?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is a fine change change, but the other one is not.

Mic92
Mic92 reviewed Oct 7, 2024
View reviewed changes
doc/manual/substitute.py Outdated Show resolved Hide resolved
Mic92
Mic92 reviewed Oct 7, 2024
View reviewed changes
doc/manual/substitute.py Outdated Show resolved Hide resolved
Mic92
Mic92 reviewed Oct 7, 2024
View reviewed changes
doc/manual/substitute.py Outdated Show resolved Hide resolved
Mic92
Mic92 reviewed Oct 7, 2024
View reviewed changes
doc/manual/substitute.py Outdated Show resolved Hide resolved
Mic92
Mic92 reviewed Oct 7, 2024
View reviewed changes
doc/manual/substitute.py Outdated Show resolved Hide resolved
Mic92
Mic92 reviewed Oct 7, 2024
View reviewed changes
doc/manual/substitute.py Outdated Show resolved Hide resolved
Mic92
Mic92 reviewed Oct 7, 2024
View reviewed changes
doc/manual/substitute.py Outdated Show resolved Hide resolved
@tomberek
Copy link
Contributor

tomberek commented Oct 7, 2024 •
edited by Ericson2314
Loading

Next steps:

  • squash and clean up history
  • fixes and reviews above
  • remove wip (eg eval.cc?)
  • test the devShell build on Darwin

Mic92
Mic92 reviewed Oct 7, 2024
View reviewed changes
doc/manual/meson.build Outdated Show resolved Hide resolved
Ericson2314
Ericson2314 commented Oct 7, 2024
View reviewed changes
src/nix/eval.cc Outdated Show resolved Hide resolved
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/2024-10-07-nix-team-meeting-minutes-184/54046/1

Ericson2314 added a commit to obsidiansystems/nix that referenced this pull request Oct 9, 2024
@Ericson2314 @roberth
Reword next release release note a bit
2462a4d 
This is unrelated to this PR, but requested in NixOS#11224 (comment)

Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
Ericson2314 added a commit to obsidiansystems/nix that referenced this pull request Oct 9, 2024
@Ericson2314 @roberth
Remove dead code in the Meson build system
1e67dfb 
Identified in NixOS#11224 (comment)

Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
Ericson2314 added a commit to obsidiansystems/nix that referenced this pull request Oct 9, 2024
@Ericson2314 @roberth
Reword next release release note a bit
f7db612 
This is unrelated to this PR, but requested in NixOS#11224 (comment)

Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
Ericson2314 added a commit to obsidiansystems/nix that referenced this pull request Oct 9, 2024
@Ericson2314 @roberth
Remove dead code in the Meson build system
6594573 
Identified in NixOS#11224 (comment)

Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
@Ericson2314 Ericson2314 mentioned this pull request Oct 9, 2024
Merged
@dpulls dpulls
Copy link

dpulls bot commented Oct 9, 2024

🎉 All dependencies have been resolved !

@Ericson2314 @Qyriad
@roberth @Mic92 @tomberek
Build the manual with Meson
08b59aa 
Co-Authored-By: Qyriad <qyriad@qyriad.me>
Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
Co-Authored-By: eldritch horrors <pennae@lix.systems>
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
Co-authored-by: Tom Bereknyei <tomberek@gmail.com>
roberth
roberth approved these changes Oct 9, 2024
View reviewed changes
Copy link
Member

@roberth roberth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

@roberth roberth merged commit d4b9977 into master Oct 9, 2024
20 checks passed
@roberth roberth deleted the meson-misc branch October 9, 2024 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@L-as L-as L-as left review comments

@roberth roberth roberth approved these changes

@fricklerhandwerk fricklerhandwerk Awaiting requested review from fricklerhandwerk fricklerhandwerk is a code owner

@edolstra edolstra Awaiting requested review from edolstra edolstra is a code owner

Assignees
No one assigned
Labels
contributor-experience Developer experience for Nix contributors documentation new-cli Relating to the "nix" command repl The Read Eval Print Loop, "nix repl" command and debugger with-tests Issues related to testing. PRs with tests have some priority
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Ericson2314 @L-as @nixos-discourse @tomberek @Mic92 @roberth