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

Clean up packaging a bit #11799

Merged
merged 1 commit into from
Jan 22, 2025
Merged

Conversation

Ericson2314
Copy link
Member

Motivation

  • Multiple choices of stdenv are handled more consistently, especially for the dev shells which were previously not done correctly.

  • Some stray nix code was moving into the packaging directory

Context

Priorities and Process

Add 👍 to pull requests you find important.

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

@Ericson2314 Ericson2314 requested a review from edolstra as a code owner November 4, 2024 16:56
@Ericson2314 Ericson2314 force-pushed the flake-nixpkgs-cleanup branch 2 times, most recently from f2cc4a6 to f29e37e Compare November 4, 2024 20:54
@Ericson2314 Ericson2314 marked this pull request as draft November 6, 2024 04:25
@Ericson2314 Ericson2314 force-pushed the flake-nixpkgs-cleanup branch 3 times, most recently from 43b5e29 to 47fc38c Compare January 15, 2025 22:23
@Ericson2314 Ericson2314 marked this pull request as ready for review January 15, 2025 22:24
@Ericson2314 Ericson2314 self-assigned this Jan 15, 2025
@Ericson2314 Ericson2314 requested a review from roberth January 15, 2025 22:24
@Ericson2314 Ericson2314 force-pushed the flake-nixpkgs-cleanup branch from 47fc38c to d7765db Compare January 15, 2025 22:25
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.

Looks alright. Seems to be an improvement.
Did you test all the attributes?

@Ericson2314 Ericson2314 force-pushed the flake-nixpkgs-cleanup branch from d7765db to d574e02 Compare January 15, 2025 22:44
@Ericson2314
Copy link
Member Author

@Mergifyio rebase

Copy link
Contributor

mergify bot commented Jan 17, 2025

rebase

❌ Unable to rebase: user Ericson2314 is unknown.

Please make sure Ericson2314 has logged in Mergify dashboard.

- Multiple choices of stdenv are handled more consistently, especially for the dev
  shells which were previously not done correctly.

- Some stray nix code was moving into the `packaging` directory
@Ericson2314 Ericson2314 force-pushed the flake-nixpkgs-cleanup branch from d574e02 to 69fde53 Compare January 17, 2025 20:09
@Ericson2314
Copy link
Member Author

OK now that master is fixed, think the rebase should do the trick

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.

Looks alright. Will give Hydra a kick so that we can confirm.

@roberth roberth merged commit f168a6e into NixOS:master Jan 22, 2025
12 checks passed
@roberth
Copy link
Member

roberth commented Jan 22, 2025

Oh, I don't have permission to start nix:master evals anymore?
I guess I'll check hydra tomorrow

@Ericson2314 Ericson2314 deleted the flake-nixpkgs-cleanup branch January 22, 2025 21:53
roberth added a commit that referenced this pull request Jan 24, 2025
Reflect the shorter attribute name, changed in
f168a6e
#11799
roberth added a commit that referenced this pull request Jan 24, 2025
aidenfoxivey pushed a commit to aidenfoxivey/nix that referenced this pull request Feb 2, 2025
Reflect the shorter attribute name, changed in
f168a6e
NixOS#11799
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants