Skip to content

libssh2: propagate openssl#236082

Merged
SuperSandro2000 merged 2 commits intoNixOS:stagingfrom
vcunat:p/libssh2-openssl
Jun 6, 2023
Merged

libssh2: propagate openssl#236082
SuperSandro2000 merged 2 commits intoNixOS:stagingfrom
vcunat:p/libssh2-openssl

Conversation

@vcunat
Copy link
Copy Markdown
Member

@vcunat vcunat commented Jun 5, 2023

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.

vcunat added 2 commits June 5, 2023 14:32
I think think this started with the update in 268a7ba.
@vcunat
Copy link
Copy Markdown
Member Author

vcunat commented Jun 5, 2023

Here's an example breakage that hasn't been fixed before this PR:
https://hydra.nixos.org/build/222802512/nixlog/3/tail

@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Jun 5, 2023
@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: 5001+ This PR causes many rebuilds on Darwin and must 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 Jun 5, 2023
Copy link
Copy Markdown
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

 ▶ cat result-dev/lib/pkgconfig/libssh2.pc
###########################################################################
# libssh2 installation details
###########################################################################

prefix=/nix/store/l4jh5c7bcyinkzb6dvizy9xhqznikcmw-libssh2-1.11.0
exec_prefix=${prefix}
libdir=/nix/store/l4jh5c7bcyinkzb6dvizy9xhqznikcmw-libssh2-1.11.0/lib
includedir=/nix/store/kbilbx2fcyfjlwx2l19xyrky1pvmr027-libssh2-1.11.0-dev/include

Name: libssh2
URL: https://www.libssh2.org/
Description: Library for SSH-based communication
Version: 1.11.0
Requires.private: libssl libcrypto zlib
Libs: -L${libdir} -lssh2  -lssl -lcrypto
Libs.private:  -lssl -lcrypto
Cflags: -I${includedir}

@SuperSandro2000 SuperSandro2000 merged commit ad8015e into NixOS:staging Jun 6, 2023
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jun 6, 2023

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

Please cherry-pick the changes locally.

git fetch origin staging-23.05
git worktree add -d .worktree/backport-236082-to-staging-23.05 origin/staging-23.05
cd .worktree/backport-236082-to-staging-23.05
git checkout -b backport-236082-to-staging-23.05
ancref=$(git merge-base 203f3a647117ba98838d5dfc439bda39ee3d7fb5 89ce4d8cac2502f60d5d82a8189a1feae250538c)
git cherry-pick -x $ancref..89ce4d8cac2502f60d5d82a8189a1feae250538c

vcunat added a commit that referenced this pull request Jun 6, 2023
I think think this started with the update in b9b5920.

(cherry picked from commit d6c138d from PR #236082)
@vcunat vcunat deleted the p/libssh2-openssl branch June 6, 2023 12:17
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: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 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