licenses: wip redo

adds a bunch of new attributes to the licenses.nix that can eventually be used to enforce copyleft, commercial usage, etc. in software licenses.
NixOS · Aug 7, 2018 · 4368f3e · 4368f3e
1 parent c853291
commit 4368f3e
Show file tree

Hide file tree

Showing 16 changed files with 359 additions and 60 deletions.
diff --git a/lib/licenses.nix b/lib/licenses.nix
diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.flashtool.net/;
     description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra";
-    license = stdenv.lib.licenses.unfreeRedistributableFirmware;
+    license = stdenv.lib.licenses.unfreeRedistributable;
     platforms = [ "i686-linux" ];
     hydraPlatforms = stdenv.lib.platforms.none;
     broken = true;

diff --git a/pkgs/misc/uboot/rock64.nix b/pkgs/misc/uboot/rock64.nix
@@ -32,6 +32,6 @@ in buildUBoot rec {
     maintainers = [ maintainers.lopsided98 ];
     platforms = ["aarch64-linux"];
     # Because of the TPL blob
-    license = licenses.unfreeRedistributableFirmware;
+    license = licenses.unfreeRedistributable;
   };
 }
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Binary firmware collection packaged by kernel.org";
     homepage = http://packages.debian.org/sid/firmware-linux-nonfree;
-    license = licenses.unfreeRedistributableFirmware;
+    license = licenses.unfreeRedistributable;
     platforms = platforms.linux;
     maintainers = with maintainers; [ fpletz ];
     priority = 6; # give precedence to kernel firmware

diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Firmware for Intel 2200BG cards";
     homepage = http://ipw2200.sourceforge.net/firmware.php;
-    license = stdenv.lib.licenses.unfreeRedistributableFirmware;
+    license = stdenv.lib.licenses.unfreeRedistributable;
     maintainers = with maintainers; [ sternenseemann ];
     platforms = with platforms; linux;
   };

diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "DVB firmware from OpenELEC";
     homepage = https://github.com/OpenELEC/dvb-firmware;
-    license = licenses.unfreeRedistributableFirmware;
+    license = licenses.unfreeRedistributable;
     platforms = platforms.linux;
     priority = 7;
   };

diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3 and Zero W";
     homepage = https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/;
-    license = licenses.unfreeRedistributableFirmware;
+    license = licenses.unfreeRedistributable;
     platforms = platforms.linux;
     maintainers = with maintainers; [ lopsided98 ];
   };

diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -19,7 +19,10 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Firmware for the Raspberry Pi board";
     homepage = https://github.com/raspberrypi/firmware;
-    license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom
+
+    # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom
+    license = licenses.unfreeRedistributable;
+
     platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
     maintainers = with maintainers; [ dezgeg viric tavyc ];
   };

diff --git a/pkgs/os-specific/linux/firmware/rt5677/default.nix b/pkgs/os-specific/linux/firmware/rt5677/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Firmware for Realtek rt5677 device";
-    license = licenses.unfreeRedistributableFirmware;
+    license = licenses.unfreeRedistributable;
     maintainers = [ maintainers.zohl ];
     platforms = platforms.linux;
   };

diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Firmware for Realtek RTL8188SU/RTL8191SU/RTL8192SU";
     homepage = https://github.com/chunkeey/rtl8192su;
-    license = licenses.unfreeRedistributableFirmware;
+    license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ mic92 ];
     platforms = with platforms; linux;
   };

diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Firmware for RealTek 8723bs";
     homepage = https://github.com/hadess/rtl8723bs;
-    license = licenses.unfreeRedistributableFirmware;
+    license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ elitak ];
     platforms = with platforms; linux;
   };

diff --git a/pkgs/os-specific/linux/firmware/rtlwifi_new-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtlwifi_new-firmware/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Firmware for the newest Realtek rtlwifi codes";
     inherit (src.meta) homepage;
-    license = licenses.unfreeRedistributableFirmware;
+    license = licenses.unfreeRedistributable;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ tvorog ];
   };

diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "AMD Processor microcode patch";
     homepage = http://www.amd64.org/support/microcode.html;
-    license = licenses.unfreeRedistributableFirmware;
+    license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ wkennington ];
     platforms = platforms.linux;
   };

diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://www.intel.com/;
     description = "Microcode for Intel processors";
-    license = licenses.unfreeRedistributableFirmware;
+    license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ wkennington ];
     platforms = platforms.linux;
   };

diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
        The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which
     '';
     downloadPage = https://packages.debian.org/sid/debianutils;
-    license = with stdenv.lib.licenses; [ gpl2Plus publicDomain smail ];
+    license = with stdenv.lib.licenses; [ gpl2Plus publicDomain ];
     maintainers = [];
     platforms = stdenv.lib.platforms.all;
   };

diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    license = licenses.unfreeRedistributableFirmware;
+    license = licenses.unfreeRedistributable;
     description = "Secure boot enabled boot loader for ODROID-XU{3,4}";
     maintainers = with maintainers; [ abbradar ];
   };