Skip to content

[staging-next] More misc fixes#250193

Merged
K900 merged 3 commits intoNixOS:staging-nextfrom
K900:more-fixes
Aug 19, 2023
Merged

[staging-next] More misc fixes#250193
K900 merged 3 commits intoNixOS:staging-nextfrom
K900:more-fixes

Conversation

@K900
Copy link
Copy Markdown
Contributor

@K900 K900 commented Aug 19, 2023

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Aug 19, 2023
@ofborg ofborg bot requested a review from veprbl August 19, 2023 14:52
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Aug 19, 2023
@K900 K900 marked this pull request as ready for review August 19, 2023 15:30
Copy link
Copy Markdown
Contributor

@tjni tjni left a comment

Choose a reason for hiding this comment

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

Thank you for your hard work.

Comment on lines +77 to +81
# Tries to access ninja.__version__ which our stub doesn't have.
# FIXME: remove for next cycle
disabledTests = [
"test_get_ninja_programs_cmake_module"
];
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I am sorry about this one! I didn't realize it affected staging-next, and you are right that it will be fixed for next cycle.

@K900 K900 merged commit 604294d into NixOS:staging-next Aug 19, 2023
@K900 K900 deleted the more-fixes branch July 27, 2025 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants