diff options
author | Jack Cummings <jack@mudshark.org> | 2012-10-16 20:26:38 -0700 |
---|---|---|
committer | David Guibert <david.guibert@gmail.com> | 2012-11-15 07:41:11 +0100 |
commit | 2dd60084f88cf50ce6ae5721b71732b7f66210f5 (patch) | |
tree | 24c1878d88a6d785dd70e231e132dab42b072ae7 | |
parent | 3dbb87ec8ea3a9db9bb1fb0266826b88ae1d9ed9 (diff) | |
download | nixlib-2dd60084f88cf50ce6ae5721b71732b7f66210f5.tar nixlib-2dd60084f88cf50ce6ae5721b71732b7f66210f5.tar.gz nixlib-2dd60084f88cf50ce6ae5721b71732b7f66210f5.tar.bz2 nixlib-2dd60084f88cf50ce6ae5721b71732b7f66210f5.tar.lz nixlib-2dd60084f88cf50ce6ae5721b71732b7f66210f5.tar.xz nixlib-2dd60084f88cf50ce6ae5721b71732b7f66210f5.tar.zst nixlib-2dd60084f88cf50ce6ae5721b71732b7f66210f5.zip |
- updates from the license discussion in https://github.com/NixOS/nixpkgs/pull/145
-rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 14 | ||||
-rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 13 |
2 files changed, 2 insertions, 25 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 16fe040e7be0..cc07709559c2 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -33,18 +33,8 @@ stdenv.mkDerivation { description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; longDescription = '' - This kernel module is a porting layer for ZFS to work inside the linux kernel. - - LICENSE NOTE: the Linux kernel is licensed under the GNU General Public - License which is incompatible with ZFS which is licensed under the Sun CDDL. - While both the GPL and CDDL are open source licenses their terms are such that - it is impossible to simultaneously satisfy both licenses. This means that a - single derived work of the Linux kernel and ZFS cannot be legally distributed. - - The ZFS code can be modified to build as a CDDL licensed kernel module - which is not distributed as part of the Linux kernel. This makes a Native ZFS - on Linux implementation possible if you are willing to download and build it - yourself. + This kernel module is a porting layer for ZFS to work inside the linux + kernel. ''; homepage = http://zfsonlinux.org/; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 145b2f3eb02a..8aec9d853f22 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -31,23 +31,10 @@ stdenv.mkDerivation { meta = { description = "ZFS Filesystem Linux Kernel module"; longDescription = '' - ZFS is a filesystem that combines a logical volume manager with a Copy-On-Write filesystem with data integrity detection and repair, snapshotting, cloning, block devices, deduplication, and more. - - LICENSE NOTE: the Linux kernel is licensed under the GNU General Public - License which is incompatible with ZFS which is licensed under the Sun CDDL. - While both the GPL and CDDL are open source licenses their terms are such that - it is impossible to simultaneously satisfy both licenses. This means that a - single derived work of the Linux kernel and ZFS cannot be legally distributed. - - The ZFS code can be modified to build as a CDDL licensed kernel module - which is not distributed as part of the Linux kernel. This makes a Native ZFS - on Linux implementation possible if you are willing to download and build it - yourself. ''; - homepage = http://zfsonlinux.org/; license = stdenv.lib.licenses.cddl; maintainers = with stdenv.lib.maintainers; [ jcumming ]; |