From 67327ada9b39b906d1c712102ab36e23f83d5e8c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 11 Aug 2024 15:55:04 +0200 Subject: [PATCH] lib/licenses: remove libssh2 equivalent to bsd3 --- lib/licenses.nix | 5 ----- pkgs/by-name/fr/freefilesync/package.nix | 2 +- pkgs/development/libraries/libssh2/default.nix | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 9f7297303074..c79617be2166 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -821,11 +821,6 @@ lib.mapAttrs mkLicense ({ fullName = "PNG Reference Library version 2"; }; - libssh2 = { - fullName = "libssh2 License"; - url = "https://www.libssh2.org/license.html"; - }; - libtiff = { spdxId = "libtiff"; fullName = "libtiff License"; diff --git a/pkgs/by-name/fr/freefilesync/package.nix b/pkgs/by-name/fr/freefilesync/package.nix index 300752f6e467..27f345ce4c2e 100644 --- a/pkgs/by-name/fr/freefilesync/package.nix +++ b/pkgs/by-name/fr/freefilesync/package.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Open Source File Synchronization & Backup Software"; homepage = "https://freefilesync.org"; - license = [ licenses.gpl3Only licenses.openssl licenses.curl licenses.libssh2 ]; + license = [ licenses.gpl3Only licenses.openssl licenses.curl licenses.bsd3 ]; maintainers = with maintainers; [ wegank ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index ad7dc331b018..e548b011f66d 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "Client-side C library implementing the SSH2 protocol"; homepage = "https://www.libssh2.org"; platforms = platforms.all; - license = with licenses; [ bsd3 libssh2 ]; + license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ SuperSandro2000 ]; }; }