Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-09-13 12:01:47 +00:00 committed by GitHub
commit 9e81e3af7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions

View File

@ -0,0 +1,10 @@
{ libssh2, fetchurl }:
libssh2.overrideAttrs (attrs: rec {
version = "1.10.0";
src = fetchurl {
url = with attrs; "${meta.homepage}/download/${pname}-${version}.tar.gz";
sha256 = "sha256-LWTpDz3tOUuR06LndMogOkF59prr7gMAPlpvpiHkHVE=";
};
patches = [];
})

View File

@ -17526,6 +17526,8 @@ with pkgs;
libssh = callPackage ../development/libraries/libssh { };
libssh2 = callPackage ../development/libraries/libssh2 { };
#FIXME: temporary attribute
libssh2_1_10 = callPackage ../development/libraries/libssh2/1_10.nix { };
libstartup_notification = callPackage ../development/libraries/startup-notification { };