From aad2acfab7c210d8f14c299f3768c76c4bfc7b87 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:11:06 +0200 Subject: [PATCH 01/21] bsd-finger: add license --- pkgs/tools/networking/bsd-finger/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index 25f795d52c2..d011665a492 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out/man/man1 $out/bin ''; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.bsdOriginal; }; } From 19148bd2f19c5273506c4b5171c768d8ad0bd285 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:12:55 +0200 Subject: [PATCH 02/21] carddav-util: add license --- pkgs/tools/networking/carddav-util/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix index 86a13ba90e6..7cc89bebf47 100644 --- a/pkgs/tools/networking/carddav-util/default.nix +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -31,9 +31,10 @@ stdenv.mkDerivation rec { --prefix PATH : "$prefix/bin:$PATH" ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/ljanyst/carddav-util; description = "A CardDAV import/export utility"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.isc; }; } From 5d42f2b37fb68cd0805b0bff31f22d3e2f2f7306 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:14:40 +0200 Subject: [PATCH 03/21] cksfv: add license --- pkgs/tools/networking/cksfv/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix index c14770fb32b..3098b091dc6 100644 --- a/pkgs/tools/networking/cksfv/default.nix +++ b/pkgs/tools/networking/cksfv/default.nix @@ -2,15 +2,16 @@ stdenv.mkDerivation rec { name = "cksfv-1.3.14"; - + src = fetchurl { url = "http://zakalwe.fi/~shd/foss/cksfv/files/${name}.tar.bz2"; sha256 = "0lnz0z57phl6s52hjvlryn96xrlph9b0h89ahhv027sa79pj8g4g"; }; - meta = { + meta = with stdenv.lib; { homepage = http://zakalwe.fi/~shd/foss/cksfv/; description = "A tool for verifying files against a SFV checksum file"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.gpl2; }; } From 4dcdb693af38d6c091fea6bb5e06148c13de7728 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:15:57 +0200 Subject: [PATCH 04/21] dhcpd: add license --- pkgs/tools/networking/dhcpcd/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 1fe29b8b96f..a03d2a12393 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -34,10 +34,11 @@ stdenv.mkDerivation rec { find $out -type f -print0 | xargs --null sed -i 's|${stdenv.shellPackage}|${runtimeShellPackage}|' ''; - meta = { + meta = with stdenv.lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; homepage = https://roy.marples.name/projects/dhcpcd; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ eelco fpletz ]; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ eelco fpletz ]; }; } From 0f6134f8ad54b6171771a57398f3ee87445c4c16 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:20:19 +0200 Subject: [PATCH 05/21] dhcpdump: add license, update homepage --- pkgs/tools/networking/dhcpdump/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix index af4b03ab700..8ed9d1d1d70 100644 --- a/pkgs/tools/networking/dhcpdump/default.nix +++ b/pkgs/tools/networking/dhcpdump/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { cp dhcpdump $out/bin ''; - meta = { + meta = with stdenv.lib; { description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses"; - homepage = https://packages.ubuntu.com/ru/lucid/dhcpdump; - platforms = stdenv.lib.platforms.linux; + homepage = http://www.mavetju.org/unix/dhcpdump-man.php; + platforms = platforms.linux; + license = licenses.bsd2; }; } From 6d859b3b1e4dfa9abe43c995f889a9741c68ec0f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:22:10 +0200 Subject: [PATCH 06/21] driftnet: add license --- pkgs/tools/networking/driftnet/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix index 5b39ca46460..bf0a43ce515 100644 --- a/pkgs/tools/networking/driftnet/default.nix +++ b/pkgs/tools/networking/driftnet/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/deiv/driftnet; maintainers = with maintainers; [ offline ]; platforms = platforms.linux; + license = licenses.gpl2; }; } From 28bac355998729b180248bdcd5856087c7764a7f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:23:27 +0200 Subject: [PATCH 07/21] fdm: add license --- pkgs/tools/networking/fdm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index 3984922abe2..54e20539066 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { platforms = with platforms; linux; homepage = https://github.com/nicm/fdm; downloadPage = https://github.com/nicm/fdm/releases; + license = licenses.isc; }; } From 460c0145e7fc313349a0912802ef606bb6e811b4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:26:36 +0200 Subject: [PATCH 08/21] gvpe: add license + homepage --- pkgs/tools/networking/gvpe/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 07676cb1871..bcc68a2a19f 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -24,9 +24,11 @@ stdenv.mkDerivation rec { sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C ''; - meta = { + meta = with stdenv.lib; { description = "A protected multinode virtual network"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = with stdenv.lib.platforms; linux ++ freebsd; + homepage = http://software.schmorp.de/pkg/gvpe.html; + maintainers = [ maintainers.raskin ]; + platforms = with platforms; linux ++ freebsd; + license = licenses.gpl2; }; } From bb27094df1b67c6fa7c6dcb4a3dc40b146f7dbb7 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:28:59 +0200 Subject: [PATCH 09/21] libreswan: add license --- pkgs/tools/networking/libreswan/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index fd2461f5171..9a0b8c9ebf5 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -76,10 +76,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = https://libreswan.org; description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.freebsd; - maintainers = [ stdenv.lib.maintainers.afranchuk ]; + platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd; + license = licenses.gpl2; + maintainers = [ maintainers.afranchuk ]; }; } From a8bc08c6332eb7f9a02c86f35cb9e9a1a796d157 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:31:33 +0200 Subject: [PATCH 10/21] miniupnpc: add license --- pkgs/tools/networking/miniupnpc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 902055e0d79..b4c2a6ea397 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -19,10 +19,11 @@ let makeFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; - meta = { + meta = with stdenv.lib; { homepage = http://miniupnp.free.fr/; description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; - platforms = with stdenv.lib.platforms; linux ++ freebsd ++ darwin; + platforms = with platforms; linux ++ freebsd ++ darwin; + license = licenses.bsd3; }; }; in { From cdf332f254427568cc26de1f51ef1b31c0a1f6e8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:32:49 +0200 Subject: [PATCH 11/21] miniupnpd: add license --- pkgs/tools/networking/miniupnpd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 07112d1497a..f794a4e27c7 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://miniupnp.free.fr/; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = platforms.linux; + license = licenses.bsd3; }; } From 4d24db6e0c568c0988c968a1bba1d8a4e9fae31b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:34:25 +0200 Subject: [PATCH 12/21] ncftp: add license --- pkgs/tools/networking/ncftp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index 0a0eadbfcba..90ac44aa375 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { homepage = https://www.ncftp.com/ncftp/; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; + license = licenses.clArtistic; }; } From 3f1849e29cb37facafac5690143130a57f1d2a9b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:40:21 +0200 Subject: [PATCH 13/21] philter: add license + homepage --- pkgs/tools/networking/philter/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index f8f37e05a72..5dff64e27c5 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -18,8 +18,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mail sorter for Maildirs"; + homepage = http://philter.sourceforge.net; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + license = licenses.gpl2; }; passthru = { From d2b062760dc390ee02a2a311e762fef0a88d6885 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:41:18 +0200 Subject: [PATCH 14/21] polygraph: add license --- pkgs/tools/networking/polygraph/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix index c05e44fb1c0..0b679bc60b5 100644 --- a/pkgs/tools/networking/polygraph/default.nix +++ b/pkgs/tools/networking/polygraph/default.nix @@ -9,11 +9,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ openssl zlib ncurses ]; - + meta = with stdenv.lib; { homepage = http://www.web-polygraph.org; description = "Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries"; platforms = platforms.linux; + license = licenses.asl20; maintainers = [ maintainers.lethalman ]; }; } From 44d84db9409de4215d53fd7912b7eb6d9c1b9a40 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:43:07 +0200 Subject: [PATCH 15/21] polysh: add license --- pkgs/tools/networking/polysh/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix index b94ec8e429f..2a70218f287 100644 --- a/pkgs/tools/networking/polysh/default.nix +++ b/pkgs/tools/networking/polysh/default.nix @@ -11,14 +11,15 @@ buildPythonApplication rec { sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4"; }; - meta = { + meta = with stdenv.lib; { description = "A tool to aggregate several remote shells into one"; longDescription = '' Polysh is a tool to aggregate several remote shells into one. It is used to launch an interactive remote shell on many machines at once. ''; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + maintainers = [ maintainers.astsmtl ]; homepage = http://guichaz.free.fr/polysh/; + license = licenses.gpl2; }; } From 50a7adf43a13b8db0e1e1b1b4b8e103b789819cc Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:44:15 +0200 Subject: [PATCH 16/21] pptpd: add license --- pkgs/tools/networking/pptpd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/tools/networking/pptpd/default.nix index d5464b97a33..4c29cd949ee 100644 --- a/pkgs/tools/networking/pptpd/default.nix +++ b/pkgs/tools/networking/pptpd/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "The PPTP Server for Linux"; platforms = platforms.linux; maintainers = with maintainers; [ obadz ]; + license = licenses.gpl2; }; } From ff633d166ff7380a4b1a84284ccbcfc6f31cb39a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:45:28 +0200 Subject: [PATCH 17/21] quicktun: add license --- pkgs/tools/networking/quicktun/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index ceee8cca1aa..3d7dc68e357 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = http://wiki.ucis.nl/QuickTun; maintainers = [ maintainers.fpletz ]; platforms = platforms.unix; + license = licenses.bsd2; }; } From 9e94e8ae4aef44f53cfc188e79c67e2096b69578 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:48:02 +0200 Subject: [PATCH 18/21] rp-pppoe: add license --- pkgs/tools/networking/rp-pppoe/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index b2584a4f497..2beb8aec389 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -21,9 +21,10 @@ stdenv.mkDerivation rec { sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)@' ''; - meta = { + meta = with stdenv.lib; { description = "Roaring Penguin Point-to-Point over Ethernet tool"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; homepage = https://www.roaringpenguin.com/products/pppoe; + license = licenses.gpl2Plus; }; } From 6e9477385476b83a9e4fe3435bb3b02e12d56ccf Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:49:56 +0200 Subject: [PATCH 19/21] vde2: add license --- pkgs/tools/networking/vde2/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 39674d22aa1..ac87a5c10e9 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -20,9 +20,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { homepage = http://vde.sourceforge.net/; description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } From fc080c22f80a612c2a9ca59b640925ddba59b753 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:52:21 +0200 Subject: [PATCH 20/21] vlan: add license --- pkgs/tools/networking/vlan/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix index 41ece0537ab..1684da45ccc 100644 --- a/pkgs/tools/networking/vlan/default.nix +++ b/pkgs/tools/networking/vlan/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { cp vconfig.8 $out/share/man/man8/ ''; - meta = { + meta = with stdenv.lib; { description = "User mode programs to enable VLANs on Ethernet devices"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2Plus; }; } From 4e8871e7b4fdb3b3afc77df8bab7dc35595f4262 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 10 Sep 2018 21:55:44 +0200 Subject: [PATCH 21/21] webalizer: update meta data --- pkgs/tools/networking/webalizer/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index 67a95f32b61..e9b9452c756 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace ./configure \ - --replace "--static" "" + --replace "--static" "" ''; - buildInputs = [zlib libpng gd geoip db]; + buildInputs = [zlib libpng gd geoip db]; configureFlags = [ "--enable-dns" @@ -23,7 +23,10 @@ stdenv.mkDerivation { "--enable-shared" ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Web server log file analysis program"; + homepage = http://www.webalizer.org; + platforms = platforms.unix; + license = licenses.gpl2; }; }