diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-13 12:21:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-13 12:21:31 +0200 |
| commit | 17ae1617dc9b3363e9ab986f2934d85efffbc6b3 (patch) | |
| tree | 6e84d3e38be48edef4a42ba7bbbffddf82b338d2 /pkgs/lib | |
| parent | 96dd66bf25195bb8036bf041a3d372898e660067 (diff) | |
| parent | a3fce096afcada408425f2798ebe1dfa13ac80e7 (diff) | |
| download | nixlib-17ae1617dc9b3363e9ab986f2934d85efffbc6b3.tar nixlib-17ae1617dc9b3363e9ab986f2934d85efffbc6b3.tar.gz nixlib-17ae1617dc9b3363e9ab986f2934d85efffbc6b3.tar.bz2 nixlib-17ae1617dc9b3363e9ab986f2934d85efffbc6b3.tar.lz nixlib-17ae1617dc9b3363e9ab986f2934d85efffbc6b3.tar.xz nixlib-17ae1617dc9b3363e9ab986f2934d85efffbc6b3.tar.zst nixlib-17ae1617dc9b3363e9ab986f2934d85efffbc6b3.zip | |
Merge branch 'master' into x-updates
Conflicts (systemd version is split on x-updates): pkgs/os-specific/linux/systemd/default.nix
Diffstat (limited to 'pkgs/lib')
| -rw-r--r-- | pkgs/lib/licenses.nix | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index 634a20e720a9..583cece32220 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -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"; |