Skip to content

Comments

libssh: revert "dev" output split#234788

Merged
vcunat merged 1 commit intoNixOS:staging-nextfrom
trofi:libssh-no-dev
May 29, 2023
Merged

libssh: revert "dev" output split#234788
vcunat merged 1 commit intoNixOS:staging-nextfrom
trofi:libssh-no-dev

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented May 29, 2023 •
edited
Loading

Do not split 'dev' output until lib/cmake/libssh/libssh-config.cmake is fixed to point INTERFACE_INCLUDE_DIRECTORIES to .dev output. Otherwise it breaks plasma5Packages.kio-extras:
https://hydra.nixos.org/build/221540008/nixlog/3/tail

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.05 Release Notes (or backporting 22.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.

@trofi
libssh: revert "dev" output split
853461b 
Do not split 'dev' output until lib/cmake/libssh/libssh-config.cmake
is fixed to point INTERFACE_INCLUDE_DIRECTORIES to .dev output.
Otherwise it breaks `plasma5Packages.kio-extras`:
   https://hydra.nixos.org/build/221540008/nixlog/3/tail
@trofi
Copy link
Contributor Author

trofi commented May 29, 2023

The rebuild count should not be too bad:

$ ./maintainers/scripts/rebuild-amount.sh HEAD^
Estimating rebuild amount by counting changed Hydra jobs (parallel=unset).
   3124 x86_64-darwin
   6472 x86_64-linux

@trofi trofi mentioned this pull request May 29, 2023
Merged
12 tasks
@vcunat
Copy link
Member

vcunat commented May 29, 2023

OK; 184K of du-reported size is not such a big deal.

@vcunat vcunat merged commit 9799bd4 into NixOS:staging-next May 29, 2023
@ofborg ofborg bot requested a review from svanderburg May 29, 2023 12:30
@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 May 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@svanderburg svanderburg Awaiting requested review from svanderburg

Assignees

No one assigned

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@trofi @vcunat