From 96dc7a1c54d6762e6413f18316dba051e788db7b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 2 Sep 2018 20:11:20 +0200 Subject: [PATCH 01/20] ilixi: update homepage --- pkgs/development/libraries/ilixi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix index 99f6df9c5f0..bb6e23937c0 100644 --- a/pkgs/development/libraries/ilixi/default.nix +++ b/pkgs/development/libraries/ilixi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight C++ GUI toolkit for embedded Linux systems"; - homepage = http://ilixi.org/; + homepage = https://github.com/ilixi/ilixi; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; From e8c6b0f763cfd769a30ea8be584ff170a47b7721 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 2 Sep 2018 20:13:36 +0200 Subject: [PATCH 02/20] iso-codes: update homepage + add license --- pkgs/development/libraries/iso-codes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index d78c59e9c25..80154f504d4 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { buildInputs = [ gettext python3 ]; meta = with stdenv.lib; { - homepage = http://pkg-isocodes.alioth.debian.org/; + homepage = https://salsa.debian.org/iso-codes-team/iso-codes; description = "Various ISO codes packaged as XML files"; - maintainers = [ ]; + license = licenses.lgpl21; platforms = platforms.all; }; } From 964b1224318f252c3f7bbc621d5bd4a4b461d4ca Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 2 Sep 2018 20:18:15 +0200 Subject: [PATCH 03/20] liblas: update homepage --- pkgs/development/libraries/libLAS/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index de796307de1..7bd2a1ec573 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset"; - homepage = https://www.liblas.org; + homepage = https://liblas.org; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.michelk ]; From 564f722495531c0944d37ea990c6ead54cfea3b4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 2 Sep 2018 20:20:55 +0200 Subject: [PATCH 04/20] libmowgli: add license + update homepage --- pkgs/development/libraries/libmowgli/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix index b23701837fa..512add5616a 100644 --- a/pkgs/development/libraries/libmowgli/default.nix +++ b/pkgs/development/libraries/libmowgli/default.nix @@ -3,15 +3,16 @@ stdenv.mkDerivation rec { name = "libmowgli-${version}"; version = "2.1.3"; - + src = fetchurl { url = "https://github.com/atheme/libmowgli-2/archive/v${version}.tar.gz"; sha256 = "0xx4vndmwz40pxa5gikl8z8cskpdl9a30i2i5fjncqzlp4pspymp"; }; - - meta = { + + meta = with stdenv.lib; { description = "A development framework for C providing high performance and highly flexible algorithms"; - homepage = http://www.atheme.org/projects/mowgli.shtml; - platforms = stdenv.lib.platforms.unix; + homepage = https://github.com/atheme/libmowgli-2; + license = licenses.isc; + platforms = platforms.unix; }; } From b9c53e32ca6198ef7e192296dbdb418d63e84c15 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 2 Sep 2018 20:27:28 +0200 Subject: [PATCH 05/20] libtar: update homepage --- pkgs/development/libraries/libtar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index 8123bf7ba84..481e7ad83cc 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library for manipulating POSIX tar files"; - homepage = http://www.feep.net/libtar/; + homepage = http://repo.or.cz/libtar; license = licenses.bsd3; platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; From c7f081a9219c28bc194b03d98bf192c32500bffd Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 2 Sep 2018 20:28:24 +0200 Subject: [PATCH 06/20] libwebsockets: update homepage --- pkgs/development/libraries/libwebsockets/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 1147c9606ad..9cd0aabcf09 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -21,9 +21,8 @@ stdenv.mkDerivation rec { use minimal CPU and memory resources, and provide fast throughput in both directions. ''; - homepage = https://libwebsockets.org/trac/libwebsockets; + homepage = https://libwebsockets.org; license = stdenv.lib.licenses.lgpl21; - maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } From e7f853acf36c983fb5821d18de5242ee31066d18 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 2 Sep 2018 20:33:12 +0200 Subject: [PATCH 07/20] openslp: update homepage --- pkgs/development/libraries/openslp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix index 3e178d92013..537b67c5a3c 100644 --- a/pkgs/development/libraries/openslp/default.nix +++ b/pkgs/development/libraries/openslp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = http://openslp.org/; + homepage = http://www.openslp.org/; description = "An open-source implementation of the IETF Service Location Protocol"; maintainers = with maintainers; [ ttuegel ]; license = licenses.bsd3; From b6c721f6e958b05def71295134e4080cd182b50d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 2 Sep 2018 20:44:46 +0200 Subject: [PATCH 08/20] pokersource: update homepage --- pkgs/development/libraries/poker-eval/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/poker-eval/default.nix b/pkgs/development/libraries/poker-eval/default.nix index f6e7ed56adc..51cc72ffd40 100644 --- a/pkgs/development/libraries/poker-eval/default.nix +++ b/pkgs/development/libraries/poker-eval/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://pokersource.org/poker-eval/; + homepage = http://pokersource.sourceforge.net; description = "Poker hand evaluator"; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.mtreskin]; From 58d03b427fce172208759e15043517dd28c17467 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 2 Sep 2018 20:49:41 +0200 Subject: [PATCH 09/20] soqt,soxt: update homepage --- pkgs/development/libraries/soqt/default.nix | 2 +- pkgs/development/libraries/soxt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index fdad4e21b0b..9769596621b 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = { - homepage = http://www.coin3d.org/; + homepage = https://bitbucket.org/Coin3D/coin/wiki/Home; license = stdenv.lib.licenses.gpl2Plus; description = "Glue between Coin high-level 3D visualization library and Qt"; diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix index 13f037960b0..c219d5bfb36 100644 --- a/pkgs/development/libraries/soxt/default.nix +++ b/pkgs/development/libraries/soxt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ coin3d motif xlibsWrapper libGLU_combined ]; meta = with stdenv.lib; { - homepage = http://www.coin3d.org/; + homepage = https://bitbucket.org/Coin3D/coin/wiki/Home; license = licenses.bsd3; description = "A GUI binding for using Open Inventor with Xt/Motif"; maintainers = with maintainers; [ tmplt ]; From 4a901e44db2393a34b76b40aeef6a2315086d6dc Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 2 Sep 2018 20:53:01 +0200 Subject: [PATCH 10/20] tcllib: update homepage --- pkgs/development/libraries/tcllib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index 6ffbe5dc60c..24b1d477b8a 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ tcl ]; meta = { - homepage = http://tcl.activestate.com/software/tcllib/; + homepage = https://sourceforge.net/projects/tcllib/; description = "Tcl-only library of standard routines for Tcl"; license = stdenv.lib.licenses.tcltk; platforms = stdenv.lib.platforms.unix; From 93a09d47065238be8f0a62b2768a455f8c09f7c2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 2 Sep 2018 20:54:39 +0200 Subject: [PATCH 11/20] vrpn: update homepage --- pkgs/development/libraries/vrpn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index ddeecce21c6..0ae5ba147cb 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { set of physical devices (tracker, etc.) used in a virtual-reality (VR) system. ''; - homepage = http://www.vrpn.org/; + homepage = https://github.com/vrpn/vrpn; license = licenses.boost; # see https://github.com/vrpn/vrpn/wiki/License platforms = platforms.linux; maintainers = with maintainers; [ ludo ]; From d9649ea38b87572843da3c1cb57db677e6812a49 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 2 Sep 2018 20:55:47 +0200 Subject: [PATCH 12/20] splint: update homepage --- pkgs/development/tools/analysis/splint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix index 2d6129dd376..57a83e54d70 100644 --- a/pkgs/development/tools/analysis/splint/default.nix +++ b/pkgs/development/tools/analysis/splint/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://splint.org/; + homepage = http://www.splint.org/; description = "Annotation-assisted lightweight static analyzer for C"; longDescription = '' From c6878ad519556924f6f90756f03cab11404aa5a5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 2 Sep 2018 21:00:38 +0200 Subject: [PATCH 13/20] dfu-util: update homepage --- pkgs/development/tools/misc/dfu-util/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index d0a68caace6..2657e570106 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { phones. With dfu-util you are able to download firmware to your device or upload firmware from it. ''; - homepage = http://dfu-util.gnumonks.org/; + homepage = http://dfu-util.sourceforge.net; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.fpletz ]; From 7422953eb0619d34a0ad38e76926dfe05c40ff03 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 3 Sep 2018 21:52:21 +0200 Subject: [PATCH 14/20] lsof: add license + update homepage lib/licenses: add purdue style BSD license --- lib/licenses.nix | 5 +++++ pkgs/development/tools/misc/lsof/default.nix | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index c442d74c857..6f0e4217c19 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -546,6 +546,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Public Domain"; }; + purdueBsd = { + fullName = " Purdue BSD-Style License"; # also know as lsof license + url = https://enterprise.dejacode.com/licenses/public/purdue-bsd; + }; + qpl = spdx { spdxId = "QPL-1.0"; fullName = "Q Public License 1.0"; diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 28c2660ac3d..0a5a3c48781 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -51,15 +51,16 @@ stdenv.mkDerivation rec { cp lsof $out/bin ''; - meta = { - homepage = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/; + meta = with stdenv.lib; { + homepage = https://people.freebsd.org/~abe/; description = "A tool to list open files"; longDescription = '' List open files. Can show what process has opened some file, socket (IPv6/IPv4/UNIX local), or partition (by opening a file from it). ''; - maintainers = [ stdenv.lib.maintainers.dezgeg ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.unix; + license = licenses.purdueBsd; }; } From 2fefff2fba8594dbaedff2350e677df06c4c7d69 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 3 Sep 2018 22:00:56 +0200 Subject: [PATCH 15/20] gnugo: fix homepage --- pkgs/games/gnugo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix index 6b053d9d53c..133a00b67bb 100644 --- a/pkgs/games/gnugo/default.nix +++ b/pkgs/games/gnugo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU Go - A computer go player"; - homepage = http://http://www.gnu.org/software/gnugo/; + homepage = http://www.gnu.org/software/gnugo/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; }; From 6600a405c22819f882f09e0ad2ba8667ce4421d8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 3 Sep 2018 22:06:28 +0200 Subject: [PATCH 16/20] rogue: add license --- pkgs/games/rogue/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index bb93fafa3b5..c8af2331b08 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -17,10 +17,11 @@ stdenv.mkDerivation { # Fix build for recent ncurses versions NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; - meta = { + meta = with stdenv.lib; { homepage = http://rogue.rogueforge.net/rogue-5-4/; description = "The final version of the original Rogue game developed for the UNIX operating system"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = platforms.all; + license = licenses.bsd3; + maintainers = [ maintainers.eelco ]; }; } From ee8b87a3596c4011e0be33ff9acd3d0c06cc27eb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 3 Sep 2018 22:08:22 +0200 Subject: [PATCH 17/20] urbanterror: update homepage --- pkgs/games/urbanterror/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index afff5a5c9eb..8ceff15b93d 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { tactical shooter; somewhat realism based, but the motto is "fun over realism". This results in a very unique, enjoyable and addictive game. ''; - homepage = http://www.urbanterror.net; + homepage = http://www.urbanterror.info; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl fpletz ]; platforms = platforms.linux; From 34831e0537f8f0edb3460c3a1650a23339419234 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 3 Sep 2018 22:11:48 +0200 Subject: [PATCH 18/20] talkfilters: update homepage --- pkgs/misc/talkfilters/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix index 4b3158b7a3d..8154e417e06 100644 --- a/pkgs/misc/talkfilters/default.nix +++ b/pkgs/misc/talkfilters/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Converts English text into text that mimics a stereotyped or humorous dialect"; - homepage = "http://http://www.hyperrealm.com/${pname}"; + homepage = http://www.hyperrealm.com/talkfilters/talkfilters.html; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ikervagyok ]; platforms = with stdenv.lib.platforms; unix; From be7730621577722d6dd9718d69627b6c1f222da3 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 3 Sep 2018 22:14:32 +0200 Subject: [PATCH 19/20] i2c-tools: update homepage --- pkgs/os-specific/linux/i2c-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix index eacac156c97..3f90b91f10d 100644 --- a/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of I2C tools for Linux"; - homepage = http://www.lm-sensors.org/wiki/I2CTools; + homepage = https://i2c.wiki.kernel.org/index.php/I2C_Tools; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; From 91b570203be39ad54760b5cb43f45e4ba794d5bc Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 3 Sep 2018 22:35:09 +0200 Subject: [PATCH 20/20] pmount: update homepage --- pkgs/os-specific/linux/pmount/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index f0f706157ed..cd0e277b2c6 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 1 out of 1 tests with "Error: could not open fstab-type file: No such file or directory" meta = { - homepage = http://pmount.alioth.debian.org/; + homepage = https://bazaar.launchpad.net/~fourmond/pmount/main/files; description = "Mount removable devices as normal user"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux;