From 09bdc30afb90a0304ba48bff8c8dfdba9d6bdc67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:10:37 +0100 Subject: [PATCH 1/8] Fabric: add license --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebbcccd6f3d..23f7e05fa22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2442,6 +2442,11 @@ in { doCheck = (!isPyPy); # https://github.com/fabric/fabric/issues/11891 propagatedBuildInputs = with self; [ paramiko pycrypto ]; buildInputs = with self; [ fudge_9 nose ]; + meta = { + description = "Pythonic remote execution"; + homepage = https://www.fabfile.org/; + license = licenses.bsd2; + }; }; faulthandler = if ! isPy3k From 7f991de7453f6200c9db2b892cd8afd1d831078b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:13:06 +0100 Subject: [PATCH 2/8] SDL_image: add license --- pkgs/development/libraries/SDL_image/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 56701e80b1f..961a0a7f5aa 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = "http://www.libsdl.org/projects/SDL_image/"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; + license = licenses.zlib; }; } From 1afba8790bfa7c19405fb6a8400b6cacfd5ec551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:13:58 +0100 Subject: [PATCH 3/8] SDL_mixer: add license --- pkgs/development/libraries/SDL_mixer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index d328d80d389..887319062be 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = http://www.libsdl.org/projects/SDL_mixer/; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; + license = licenses.zlib; }; } From e180e018fea272359017ca98f4f36f98935d7f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:18:16 +0100 Subject: [PATCH 4/8] Xaw3d: add license, move build tools nativeBuildInputs --- pkgs/development/libraries/Xaw3d/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 0a71186cd4c..0a7f02f17e5 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}: +{ stdenv, fetchurl +, imake, gccmakedep, bison, flex, pkgconfig +, xlibsWrapper, libXmu, libXpm, libXp }: stdenv.mkDerivation { name = "Xaw3d-1.6.3"; @@ -6,12 +8,13 @@ stdenv.mkDerivation { url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2; sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [imake gccmakedep libXpm libXp bison flex]; - propagatedBuildInputs = [xlibsWrapper libXmu]; + nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ]; + buildInputs = [ libXpm libXp ]; + propagatedBuildInputs = [ xlibsWrapper libXmu ]; - meta = { + meta = with stdenv.lib; { description = "3D widget set based on the Athena Widget set"; platforms = stdenv.lib.platforms.unix; + license = licenses.mit; }; } From d59447c444eeb963305b5274664a2eb8ab584ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:21:30 +0100 Subject: [PATCH 5/8] 915resolution: add license --- pkgs/os-specific/linux/915resolution/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix index 9591d4ef4cc..ce21887f19f 100644 --- a/pkgs/os-specific/linux/915resolution/default.nix +++ b/pkgs/os-specific/linux/915resolution/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "915resolution-0.5.3"; - + src = fetchurl { url = "http://915resolution.mango-lang.org/${name}.tar.gz"; sha256 = "0hmmy4kkz3x6yigz6hk99416ybznd67dpjaxap50nhay9f1snk5n"; @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { homepage = http://915resolution.mango-lang.org/; description = "A tool to modify Intel 800/900 video BIOS"; platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.publicDomain; }; } From af3e44722d9d2c6a1bb5bc6a04b8fd2bbe7651b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:25:22 +0100 Subject: [PATCH 6/8] _9pfs: add license + homepage --- pkgs/tools/filesystems/9pfs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index 37ec4105472..2e34c9dd485 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -22,9 +22,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - #homepage = https://github.com/spewspew/9pfs; # the account apparently doesn't exist + homepage = https://github.com/mischief/9pfs; description = "FUSE-based client of the 9P network filesystem protocol"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; + license = with lib.licenses; [ lpl-102 bsd2 ]; }; } From f120ee3c5dc5eaf8483fc1738c188afadc2906a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:29:28 +0100 Subject: [PATCH 7/8] aacskeys: add license --- pkgs/development/libraries/aacskeys/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aacskeys/default.nix b/pkgs/development/libraries/aacskeys/default.nix index b90db614e4a..9e28bfd4fe2 100644 --- a/pkgs/development/libraries/aacskeys/default.nix +++ b/pkgs/development/libraries/aacskeys/default.nix @@ -38,9 +38,10 @@ stdenv.mkDerivation { install -Dm444 ProcessingDeviceKeysSimple.txt $out/share/${baseName} ''; - meta = { + meta = with stdenv.lib; { homepage = http://forum.doom9.org/showthread.php?t=123311; description = "A library and program to retrieve decryption keys for HD discs"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.publicDomain; }; } From 229a2332f6d0dcdbff0c494b32051bf9deed33f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:33:45 +0100 Subject: [PATCH 8/8] aefs: add license --- pkgs/tools/filesystems/aefs/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix index d081f08ffc7..9ea4d092548 100644 --- a/pkgs/tools/filesystems/aefs/default.nix +++ b/pkgs/tools/filesystems/aefs/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, fuse }: - + stdenv.mkDerivation rec { name = "aefs-0.4pre259-8843b7c"; - + src = fetchurl { url = "http://tarballs.nixos.org/${name}.tar.bz2"; sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq"; @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { buildInputs = [ fuse ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.st.ewi.tudelft.nl/~dolstra/aefs/; description = "A cryptographic filesystem implemented in userspace using FUSE"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = platforms.linux; + maintainers = [ maintainers.eelco ]; + license = licenses.gpl2; }; }