From 58654866ceab5d3161a4afcd037e425085dab652 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 12:12:54 +0200 Subject: [PATCH 1/7] libssh2: add license --- pkgs/development/libraries/libssh2/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index a6802a7f518..b050dede8c6 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -13,10 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib ] ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; - meta = { + meta = with stdenv.lib; { description = "A client-side C library implementing the SSH2 protocol"; homepage = https://www.libssh2.org; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.bsd3; maintainers = [ ]; }; } From cc6e59e5d16d14281f0a9ccb8a9ef9073c71795a Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 14:24:40 +0200 Subject: [PATCH 2/7] libqalculate: add license meta --- pkgs/development/libraries/libqalculate/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 377d9fe50be..2c25d418119 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { description = "An advanced calculator library"; homepage = http://qalculate.github.io; maintainers = with maintainers; [ gebner ]; + license = licenses.gpl2Plus; platforms = platforms.all; }; } From e2f10b5a74ec45b20b52928f6197abf3d8c0b0c3 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 14:26:30 +0200 Subject: [PATCH 3/7] libtiger: add license meta --- pkgs/development/libraries/libtiger/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index bd0084dbaaf..7a72fa2b7a3 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { homepage = https://code.google.com/archive/p/libtiger/; description = "A rendering library for Kate streams using Pango and Cairo"; platforms = lib.platforms.unix; + license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ matthewbauer ]; }; } From a174f3ea97bc50bbb103054002e004f74b4007e8 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 14:27:14 +0200 Subject: [PATCH 4/7] libtxc_dxtn: add license meta --- pkgs/development/libraries/libtxc_dxtn/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index 21e3a15449c..b0be3cb3c12 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libGLU_combined ]; - meta = { + meta = with stdenv.lib; { homepage = http://dri.freedesktop.org/wiki/S3TC; repositories.git = git://people.freedesktop.org/~mareko/libtxc_dxtn; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; }; } From 55c736cd78440ec7b8b7810eff3b7e2e0e81531f Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 14:28:08 +0200 Subject: [PATCH 5/7] libui: add license meta --- pkgs/development/libraries/libui/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index b1e6938a149..9eb2fe04fe6 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -49,9 +49,10 @@ in install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/andlabs/libui; description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports."; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; }; } From 0cda784a79ca48fe64f2b90241e32eb737130e39 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 14:30:10 +0200 Subject: [PATCH 6/7] libusb: add license and other metadata --- pkgs/development/libraries/libusb/default.nix | 12 ++++++++++-- pkgs/development/libraries/libusb1/default.nix | 13 +++++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index 4704a1e5c33..adf354c45f2 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb/default.nix @@ -16,7 +16,15 @@ stdenv.mkDerivation { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + homepage = "https://libusb.info/"; + repositories.git = "https://github.com/libusb/libusb-compat-0.1"; + description = "cross-platform user-mode USB device library"; + longDescription = '' + libusb is a cross-platform user-mode library that provides access to USB devices. + The current API is of 1.0 version (libusb-1.0 API), this library is a wrapper exposing the legacy API. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 7ec714f0223..ac5c38a34f1 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -21,10 +21,15 @@ stdenv.mkDerivation rec { sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; - meta = { - homepage = http://www.libusb.info; - description = "User-space USB library"; - platforms = stdenv.lib.platforms.all; + meta = with stdenv.lib; { + homepage = "https://libusb.info/"; + repositories.git = "https://github.com/libusb/libusb"; + description = "cross-platform user-mode USB device library"; + longDescription = '' + libusb is a cross-platform user-mode library that provides access to USB devices. + ''; + platforms = platforms.all; + license = licenses.lgpl21Plus; maintainers = [ ]; }; } From cb4e4dca01d7abe7e6593b65304b0b7b88a7d5e3 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 14:30:46 +0200 Subject: [PATCH 7/7] libwacom: add license and website metadata --- pkgs/development/libraries/libwacom/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index cc3f19ab7d3..67563e41d01 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - homepage = https://sourceforge.net/projects/linuxwacom/; + homepage = https://linuxwacom.github.io/; description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; + license = licenses.mit; }; }