colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the "proprietary" license

Browse Source 
We already had "unfree".
This commit is contained in:
Eelco Dolstra 2013-04-12 14:37:50 +02:00
parent 4a429f5276
commit 4adad458e7
10 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/linuxsampler/default.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
have questions on the subject, that are not yet covered by the
FAQ, please contact us.
'';
license = licenses.proprietary;
license = licenses.unfree;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
};

2
pkgs/applications/networking/instant-messengers/hipchat/default.nix
View File

@ -57,7 +57,7 @@ in stdenv.mkDerivation {
meta = {
description = "HipChat Desktop Client";
homepage = http://www.hipchat.com;
license = stdenv.lib.licenses.proprietary;
license = stdenv.lib.licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

2
pkgs/development/libraries/libspotify/default.nix
View File

@ -56,6 +56,6 @@ if stdenv.system != "x86_64-linux" then throw ''
maintainers = [ stdenv.lib.maintainers.shlevy ];
license = stdenv.lib.licenses.proprietary;
license = stdenv.lib.licenses.unfree;
};
}

4
pkgs/development/tools/neoload/default.nix
View File

@ -80,12 +80,12 @@ in stdenv.mkDerivation rec {
'';
meta = {
description = "load testing software for Web applications to realistically simulate user activity and analyze server behavior.";
description = "load testing software for Web applications to realistically simulate user activity and analyze server behavior";
homepage = https://www.neotys.com/product/overview-neoload.html;
# https://www.neotys.com/documents/legal/eula/neoload/eula_en.html
license = stdenv.lib.licenses.proprietary;
license = stdenv.lib.licenses.unfree;
maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
platforms = [ "i686-linux" "x86_64-linux" ];

2
pkgs/games/oilrush/default.nix
View File

@ -67,7 +67,7 @@ stdenv.mkDerivation {
of Tower Defense.
'';
homepage = http://oilrush-game.com/;
license = [ "proprietary" ];
license = "unfree";
#maintainers = with stdenv.lib.maintainers; [ astsmtl ];
#platforms = with stdenv.lib.platforms; linux;
};

5
pkgs/lib/licenses.nix
View File

@ -177,11 +177,6 @@
url = http://docs.python.org/license.html;
};
proprietary = {
shortName = "Proprietary";
fullName = "Proprietary (non redistributable) license";
};
tcltk = {
shortName = "Tcl/Tk";
fullName = "Tcl/Tk license";

2
pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = {
description = "Firmware for cards supported by the b43 kernel module";
homepage = http://wireless.kernel.org/en/users/Drivers/b43;
license = stdenv.lib.licenses.proprietary;
license = stdenv.lib.licenses.unfree;
maintainers = [ stdenv.lib.maintainers.shlevy ];
};
}

2
pkgs/servers/sql/oracle-xe/default.nix
View File

@ -78,6 +78,6 @@ stdenv.mkDerivation rec {
meta = {
description = "Oracle Database Express Edition";
homepage = "http://www.oracle.com/technetwork/products/express-edition/";
license = licenses.proprietary;
license = licenses.unfree;
};
}

2
pkgs/stdenv/generic/default.nix
View File

@ -49,7 +49,7 @@ let
# Add a utility function to produce derivations that use this
# stdenv and its shell.
mkDerivation = attrs:
if !allowUnfree && (let l = attrs.meta.license or ""; in l == "unfree" || l == "unfree-redistributable" || l == lib.licenses.proprietary) then
if !allowUnfree && (let l = attrs.meta.license or ""; in l == "unfree" || l == "unfree-redistributable") then
throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate"
else
lib.addPassthru (derivation (

5
pkgs/tools/security/fprot/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "f-prot-${version}";
@ -33,8 +34,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://www.f-prot.com;
description = "a popular proprietary antivirus, Linux workstation edition.";
license = licenses.proprietary;
description = "A popular proprietary antivirus program";
license = licenses.unfree;
maintainers = [ maintainers.phreedom ];
platforms = platforms.linux;
};