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

nixVersions.nix_2_26: init at 2.26.1 #375856

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

nixVersions.nix_2_26: init at 2.26.1 #375856

wants to merge 9 commits into from

Conversation

roberth
Copy link
Member

@roberth roberth commented Jan 22, 2025

This is the first Nixpkgs build of Nix that uses meson and uses the componentized build.

Related

Future versions may use a similar method of packaging (copying files mostly as-is), or we could "make it our own" here in Nixpkgs and support multiple versions using conditionals, etc.
This initial version probably leaves one or two things to be desired, but let's get the ball rolling first.

TODO

  • 2.26.1

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Context:


Add a 👍 reaction to pull requests you find important.

@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/nix-2-26-released/59211/2

nativeBuildInputs = [ nix ] would have no effect before this change.

The pkg-config test on the dev output probably didn't work before, so
I've removed it for now.
@roberth roberth marked this pull request as draft January 24, 2025 19:46
@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/nix-2-26-released/59211/11

};

# TODO Hack until https://github.com/NixOS/nixpkgs/issues/45462 is fixed.
boost =
Copy link
Member

Choose a reason for hiding this comment

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

Just a heads up. We didn't use to have this override in nixpkgs. Question is if we want this now?

Copy link
Member

Choose a reason for hiding this comment

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

Afaik this would only save us downloading icu.

}).overrideAttrs
(old: {
# Need to remove `--with-*` to use `--with-libraries=...`
buildPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.buildPhase;
Copy link
Member

Choose a reason for hiding this comment

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

boost seems to not have python enabled by default. So we can drop the overrideAttrs here and in the nix repository.

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 seems that @Ericson2314 was working around something.
I don't know the intricacies of this.

Copy link
Member Author

Choose a reason for hiding this comment

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

I've switched it to the default boost package for now.

let
cpp = fileset.fileFilter (file: file.hasExt "cc" || file.hasExt "h");
in
fileset.unions [
Copy link
Member

Choose a reason for hiding this comment

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

I don't think filesets are allows in nixpkgs at the moment because of that nix bug.

Copy link
Member

Choose a reason for hiding this comment

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

This is the tracking issue: #369694

Copy link
Member Author

@roberth roberth Jan 28, 2025

Choose a reason for hiding this comment

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

The filesets are intentionally dead code to keep the files similar to upstream.

So we're not affected by the bug, but we may remove these filesets anyway. I'm neither convinced to remove them nor keep them.

@roberth roberth changed the title nixVersions.nix_2_26: init at 2.26.0 nixVersions.nix_2_26: init at 2.26.1 Jan 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants