From 1fd4a81e1b21a0eb80f051be4415a383dd10ea06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 18 Sep 2024 19:37:50 -0700 Subject: [PATCH 1/2] libssh: 0.10.6 -> 0.11.1 Changelog: https://www.libssh.org/2024/08/08/libssh-0-11-0-release/ https://www.libssh.org/2024/08/30/libssh-0-11-1-release/ --- pkgs/development/libraries/libssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 15f8fab50889..be94c99aa389 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "libssh"; - version = "0.10.6"; + version = "0.11.1"; src = fetchurl { url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/libssh-${version}.tar.xz"; - hash = "sha256-GGHUmPW28XQbarxz5ghHhJHtz5ydS2Yw7vbnRZbencE="; + hash = "sha256-FLfcxy6R4IFRxYuYGntXCrJmP2MOfSg3ZF1anGEsG3k="; }; # Do not split 'dev' output until lib/cmake/libssh/libssh-config.cmake From 0b3382016aede0ef95359478eb11b5c8d85423b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 18 Sep 2024 19:55:19 -0700 Subject: [PATCH 2/2] libssh: split outputs --- pkgs/development/libraries/libssh/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index be94c99aa389..ad6a4322bc1a 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -22,11 +22,7 @@ stdenv.mkDerivation rec { hash = "sha256-FLfcxy6R4IFRxYuYGntXCrJmP2MOfSg3ZF1anGEsG3k="; }; - # 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 - #outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" ]; postPatch = '' # Fix headers to use libsodium instead of NaCl @@ -37,13 +33,15 @@ stdenv.mkDerivation rec { # included in `buildInputs` such as libX11. cmakeFlags = [ "-DWITH_EXAMPLES=OFF" ]; - # single output, otherwise cmake and .pc files point to the wrong directory - # outputs = [ "out" "dev" ]; - buildInputs = [ zlib openssl libsodium ]; nativeBuildInputs = [ cmake pkg-config ]; + postFixup = '' + substituteInPlace $dev/lib/cmake/libssh/libssh-config.cmake \ + --replace-fail "set(_IMPORT_PREFIX \"$out\")" "set(_IMPORT_PREFIX \"$dev\")" + ''; + passthru.tests = { inherit ffmpeg sshping wireshark; };