Skip to content

[staging-next] Some staging fixes#282536

Merged
vcunat merged 2 commits intoNixOS:staging-nextfrom
K900:some-staging-fixes
Jan 22, 2024
Merged

[staging-next] Some staging fixes#282536
vcunat merged 2 commits intoNixOS:staging-nextfrom
K900:some-staging-fixes

Conversation

@K900
Copy link
Contributor

@K900 K900 commented Jan 21, 2024

Description of changes

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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 the 6.topic: python Python is a high-level, general-purpose programming language. label Jan 21, 2024
@K900 K900 mentioned this pull request Jan 21, 2024
13 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 21, 2024
K900 added 2 commits January 21, 2024 14:25
It actually builds and seems to be preferred upstream anyway:
FFmpeg/FFmpeg@da72aca
Fixes the pkgs/by-name check
@K900 K900 force-pushed the some-staging-fixes branch from 2312668 to 099029f Compare January 21, 2024 11:26
@github-actions github-actions bot removed the 6.topic: python Python is a high-level, general-purpose programming language. label Jan 21, 2024
@Atemu
Copy link
Member

Atemu commented Jan 21, 2024

Have you verified that ffmpeg_{4,5}-full still build using this flag?

@K900
Copy link
Contributor Author

K900 commented Jan 21, 2024

Yes.

@vcunat vcunat merged commit e49eb9b into NixOS:staging-next Jan 22, 2024
vcunat added a commit that referenced this pull request Jan 22, 2024
@vcunat
Copy link
Member

vcunat commented Jan 22, 2024

Have you really? Adjusted in 78b0905

@K900
Copy link
Contributor Author

K900 commented Jan 22, 2024

I thought I did :(

@K900 K900 deleted the some-staging-fixes branch July 27, 2025 10:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants