diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-03 21:54:40 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-03 21:54:40 +0200 |
| commit | 92124ed660c033aa3caa467876f7bc1c6f514d77 (patch) | |
| tree | eaaac3b33ba341b7068ac11e536d56bb647c6480 /pkgs/data/misc | |
| parent | ac46ffbcfce03ad9b35c261301c008e9cf2bdb9b (diff) | |
| parent | 3420bd63b9bbd4eb4e544b898a072c6fbbc9cfa9 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/cldr-emoji-annotation/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/misc/unicode-character-database/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/misc/unicode-emoji/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/misc/unihan-database/default.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/data/misc/cldr-emoji-annotation/default.nix b/pkgs/data/misc/cldr-emoji-annotation/default.nix index 4279cf8aec48f..289f6d663406c 100644 --- a/pkgs/data/misc/cldr-emoji-annotation/default.nix +++ b/pkgs/data/misc/cldr-emoji-annotation/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Emoji annotation files in CLDR"; homepage = "https://www.unicode.org/"; - license = licenses.free; # https://www.unicode.org/license.html + license = licenses.unicode-dfs-2016; platforms = platforms.all; }; } diff --git a/pkgs/data/misc/unicode-character-database/default.nix b/pkgs/data/misc/unicode-character-database/default.nix index 1eda25fbe2b1a..e52f21713ed82 100644 --- a/pkgs/data/misc/unicode-character-database/default.nix +++ b/pkgs/data/misc/unicode-character-database/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unicode Character Database"; homepage = "https://www.unicode.org/"; - license = licenses.free; # https://www.unicode.org/license.html + license = licenses.unicode-dfs-2016; platforms = platforms.all; }; } diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/data/misc/unicode-emoji/default.nix index 05472b26d88c3..b7705d7ee5b48 100644 --- a/pkgs/data/misc/unicode-emoji/default.nix +++ b/pkgs/data/misc/unicode-emoji/default.nix @@ -53,7 +53,7 @@ symlinkJoin rec { meta = with stdenv.lib; { description = "Unicode Emoji Data Files"; homepage = "https://home.unicode.org/emoji/"; - license = licenses.free; # https://www.unicode.org/license.html + license = licenses.unicode-dfs-2016; platforms = platforms.all; }; } diff --git a/pkgs/data/misc/unihan-database/default.nix b/pkgs/data/misc/unihan-database/default.nix index 77da77242a928..d5d62403cc3d9 100644 --- a/pkgs/data/misc/unihan-database/default.nix +++ b/pkgs/data/misc/unihan-database/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unicode Han Database"; homepage = "https://www.unicode.org/"; - license = licenses.free; # https://www.unicode.org/license.html + license = licenses.unicode-dfs-2016; platforms = platforms.all; }; } |