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

Remove the old make-based build system #11804

Merged
merged 4 commits into from
Nov 6, 2024
Merged

Remove the old make-based build system #11804

merged 4 commits into from
Nov 6, 2024

Conversation

Ericson2314
Copy link
Member

Motivation

Closes #2503

Context

depends on #11803

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 with-tests Issues related to testing. PRs with tests have some priority store Issues and pull requests concerning the Nix store fetching Networking with the outside (non-Nix) world, input locking c api Nix as a C library with a stable interface labels Nov 4, 2024
@Ericson2314 Ericson2314 marked this pull request as draft November 4, 2024 22:03
@Ericson2314
Copy link
Member Author

Spooky VM failures?

@cole-h

This comment was marked as resolved.

Sign in to view
@Ericson2314
Copy link
Member Author

@cole-h I thought the documentation is updated by now, but if it is not do let me know. I am happy to fix that first before merging this.

@cole-h
Copy link
Member

cole-h commented Nov 4, 2024

Is is indeed updated, thanks for making me double check :)

@dpulls dpulls
Copy link

dpulls bot commented Nov 6, 2024

🎉 All dependencies have been resolved !

@edolstra
Copy link
Member

edolstra commented Nov 6, 2024 •
edited by Mic92
Loading

@Ericson2314 Ericson2314 marked this pull request as ready for review November 6, 2024 20:25
@Ericson2314 Ericson2314 enabled auto-merge November 6, 2024 21:11
@Ericson2314 Ericson2314 merged commit 619eeb6 into NixOS:master Nov 6, 2024
9 of 10 checks passed
@Ericson2314 Ericson2314 deleted the remove-old-make branch November 6, 2024 21:41
@Ericson2314 Ericson2314 mentioned this pull request Nov 6, 2024
Draft
roberth
roberth reviewed Nov 6, 2024
View reviewed changes
flake.nix
@@ -220,15 +218,15 @@
# for which we don't apply the full build matrix such as cross or static.
inherit (nixpkgsFor.${system}.native)
changelog-d;
default = self.packages.${system}.nix-ng;
# TODO probably should be `nix-cli`
Copy link
Member

Choose a reason for hiding this comment

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

or perhaps a tested nix-cli, like nix-everything but without the libs or manual?

We should probably also add a nix attribute with some suggestions of what to pick instead.

@roberth roberth mentioned this pull request Nov 6, 2024
Closed
@edolstra
Copy link
Member

edolstra commented Nov 7, 2024

Ouch, isn't this premature? I think we decided we want at least one release where the new build system is fully functional while the old one is still available. I really wanted to do a 2.25 release in the next couple of days without having to deal with potential build system fallout.

edolstra added a commit to DeterminateSystems/nix-src that referenced this pull request Nov 7, 2024
@edolstra
Revert "Merge pull request NixOS#11804 from obsidiansystems/remove-ol…
67d231c 
…d-make"

This reverts commit 619eeb6, reversing
changes made to 1af94bf.
@Mic92
Copy link
Member

Mic92 commented Nov 7, 2024 •
edited
Loading

Ouch, isn't this premature? I think we decided we want at least one release where the new build system is fully functional while the old one is still available. I really wanted to do a 2.25 release in the next couple of days without having to deal with potential build system fallout.

Ok. I wasn't aware, that this decision was made. We did the merge yesterday in the Nix meeting when @Ericson2314, @tomberek and @roberth was around.

@Ericson2314
Copy link
Member Author

@edolstra My understanding was that we wouldn't block the release on this being done, not that we would hold this on waiting for the release.

Are you fine releasing the commit just before this landed? Or are there some other things you want to land first?

@Mic92
Copy link
Member

Mic92 commented Nov 7, 2024

Otherwise, I don't think it's a big loss to do a revert, release it and revert the revert. Than have @roberth push his meson nix changes to nixpkgs and we have some time to test nixVersions.nix.

Mic92 added a commit that referenced this pull request Nov 8, 2024
@Mic92
Merge pull request #11826 from DeterminateSystems/revert-11804
aeffdef 
Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"
@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-11-06-nix-team-meeting-minutes-192/55847/1

@goyalyashpal
Copy link

goyalyashpal commented Nov 17, 2024 •
edited by roberth
Loading

Otherwise, I don't think it's a big loss to do a revert, release it and revert the revert

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roberth roberth roberth left review comments

@Mic92 Mic92 Mic92 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
c api Nix as a C library with a stable interface documentation fetching Networking with the outside (non-Nix) world, input locking new-cli Relating to the "nix" command store Issues and pull requests concerning the Nix store 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.

Rewrite build system in Meson
8 participants
@Ericson2314 @cole-h @edolstra @Mic92 @nixos-discourse @goyalyashpal @NobbZ @roberth