Skip to content

nixVersions.nix_2_26: Update and improve packaging#383508

Merged
Mic92 merged 13 commits intoNixOS:masterfrom
roberth:nix-2.26-packaging
Mar 11, 2025
Merged

nixVersions.nix_2_26: Update and improve packaging#383508
Mic92 merged 13 commits intoNixOS:masterfrom
roberth:nix-2.26-packaging

Conversation

@roberth
Copy link
Member

@roberth roberth commented Feb 19, 2025 •
edited
Loading

Motivated primarily by

Changes

  • applies upstream improvements to the packaging expressions
  • implement the multi-output attribute interface (WIP, no tests yet)
    • remove uncontrolled package attributes in the process
      • of dubious utility
      • presence would depend on the output
      • unclear public interface

To do?

  • Improve meta attributes
  • Maybe not propagate the CLI?
  • Rewrite as normal multi-output derivation

For follow-up

  • Move makeOutputs to lib

Context

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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Feb 20, 2025
roberth added a commit to roberth/nix that referenced this pull request Feb 20, 2025
@roberth
packaging: A few small improvements
a59d09e 
These are some small improvements gathered while working on
Nixpkgs packaging, NixOS/nixpkgs#383508.
They're low hanging fruit, while the Nixpkgs packaging is
still in flux (e.g. filesets aren't appreciated, nor is the
everything.nix multi-derivation package)

This makes the files more readily transferable.
@roberth roberth mentioned this pull request Feb 20, 2025
Draft
@nyabinary nyabinary mentioned this pull request Feb 26, 2025
Closed
13 tasks
@roberth roberth force-pushed the nix-2.26-packaging branch from ed9298b to 659549c Compare March 1, 2025 16:41
@github-actions github-actions bot added the 6.topic: teams Relating to team creation, updates, other management actions label Mar 1, 2025
@roberth roberth force-pushed the nix-2.26-packaging branch from 659549c to 047f29a Compare March 1, 2025 16:45
@roberth roberth marked this pull request as ready for review March 1, 2025 16:47
@roberth roberth mentioned this pull request Mar 1, 2025
Merged
14 tasks
@roberth roberth requested review from Artturin and lovesegfault March 3, 2025 14:26
roberth
roberth commented Mar 3, 2025
View reviewed changes
maintainers/team-list.nix Outdated
Comment on lines 804 to 808
Copy link
Member Author

@roberth roberth Mar 3, 2025

Choose a reason for hiding this comment

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

I assume @grahamc and @nbp are ok, as this team list was very out of date.

@edolstra I assumed you're ok to delegate this. Happy to re-add you if you like.

@Ericson2314 @Mic92 Ok to add you?

@lovesegfault @Artturin You've helped with updates in the recent make-based
/ monolithic past. Would you like to continue to do so for the new packaging?

@Enzime
Copy link
Member

Enzime commented Mar 7, 2025

Are you planning to bump nixVersions.latest to 2.26 in this PR?

@Mic92
Copy link
Member

Mic92 commented Mar 7, 2025

Are you planning to bump nixVersions.latest to 2.26 in this PR?

fine by me. @roberth any objections?

Mic92
Mic92 reviewed Mar 7, 2025
View reviewed changes
pkgs/tools/package-management/nix/2_26/packaging/components.nix Outdated
Copy link
Member

@Mic92 Mic92 Mar 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Is this function also affected by the regression fix for fileset? Since this is the nix expression we might break the upgrade path for certain users from old nix versions.

Copy link
Member Author

@roberth roberth Mar 7, 2025

Choose a reason for hiding this comment

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

This line is vendored and not used. I'll make that more explicit.

@roberth
Copy link
Member Author

roberth commented Mar 7, 2025

Are you planning to bump nixVersions.latest to 2.26 in this PR?

fine by me. @roberth any objections?

That might delay the PR a bit. I'd prefer to do it immediately after

@roberth roberth force-pushed the nix-2.26-packaging branch from 2785c5e to 160b62d Compare March 7, 2025 15:11
@github-actions github-actions bot removed the 6.topic: teams Relating to team creation, updates, other management actions label Mar 7, 2025
@roberth roberth force-pushed the nix-2.26-packaging branch from 160b62d to efee6c5 Compare March 7, 2025 15:15
@Aleksanaa Aleksanaa requested a review from Mic92 March 10, 2025 09:25
@Aleksanaa Aleksanaa added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 10, 2025
@Mic92
Copy link
Member

Mic92 commented Mar 11, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 383508

aarch64-darwin

✅ 4 packages built:
  • nixVersions.nix_2_26
  • nixVersions.nix_2_26.dev
  • nixVersions.nix_2_26.doc
  • nixVersions.nix_2_26.man

@Mic92 Mic92 force-pushed the nix-2.26-packaging branch from efee6c5 to 277b0d4 Compare March 11, 2025 11:34
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 11, 2025
@Mic92 Mic92 force-pushed the nix-2.26-packaging branch from 277b0d4 to 2be4c2c Compare March 11, 2025 11:41
@Mic92 Mic92 merged commit 56ff4ea into NixOS:master Mar 11, 2025
26 of 27 checks passed
@Mic92
Copy link
Member

Mic92 commented Mar 11, 2025 •
edited by roberth
Loading

@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Mar 16, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-383508-to-release-24.11 origin/release-24.11
cd .worktree/backport-383508-to-release-24.11
git switch --create backport-383508-to-release-24.11
git cherry-pick -x ab7ba5b36bf65249f69a848f2c9039dd4b1880a5 7402e825371fb1100fc6d18e2d1b6247bcb1fcfd 0812c9a321003c924868051d2b2e1934e8880f3f 2850cb73660db33ec3774fac4332b84a794cd3c8 965a81e391c91b6b242828752ed66bb4f99a2d0d 677054fccb27b4ce1462395e805db76d03a71137 54c0d44805ee9f84a1cfb412fa43cd97f4c7928e 375ef884db98a8147896f2e623155b5dd8a72422 56515d0f7783cd0dbd5e4a4919bd925da4a7cbf5 7be664a75c5ba2f03102965afa3890081456cd51 e4d9c996fb3b7598cbc302ee3c8517a0c315b7ec 8f38b56e2000e18717fb69101c2c9c3c61fea0ec 2be4c2c054af250afdcf1edc415ff5a593473695

@Ericson2314 Ericson2314 mentioned this pull request Mar 16, 2025
Merged
13 tasks
@nixos-discourse
Copy link

nixos-discourse commented Mar 24, 2025

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

https://discourse.nixos.org/t/2025-03-24-nix-team-meeting-minutes-221/62113/1

@emilylange emilylange mentioned this pull request Apr 2, 2025
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mic92 Mic92 Mic92 approved these changes

@tomberek tomberek Awaiting requested review from tomberek

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

@edolstra edolstra Awaiting requested review from edolstra

@fricklerhandwerk fricklerhandwerk Awaiting requested review from fricklerhandwerk

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

@Artturin Artturin Awaiting requested review from Artturin

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@roberth @Enzime @Mic92 @nixos-discourse @Ericson2314 @Aleksanaa