diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2015-05-30 15:14:10 +0200 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2015-05-30 15:19:05 +0200 |
commit | 1d30557516d6287aaf49249ba70214bd794cc41d (patch) | |
tree | 869cb0c74a1e3e2462311e68520ed89bb154f570 /pkgs | |
parent | dbfaf1c27cf00aba797ecc2f2f2e2c8c82997166 (diff) |
Fixed meta.license: s/licence/license
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/data/fonts/symbola/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libpfm/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/tools/toluapp/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/scrolls/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/screensavers/rss-glx/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/openvswitch/default.nix | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix index d70fe3ca3f8be..390bf9f523a49 100644 --- a/pkgs/data/fonts/symbola/default.nix +++ b/pkgs/data/fonts/symbola/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; - # In lieu of a licence: + # In lieu of a license: # Fonts in this site are offered free for any use; # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed. license = stdenv.lib.licenses.free; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index cbb314a7bb7d9..c08ff2651944f 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; - meta = { + meta = with stdenv.lib; { description = "Helper library to program the performance monitoring events"; longDescription = '' This package provides a library, called libpfm4 which is used to @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { events such as those provided by the Performance Monitoring Unit (PMU) of modern processors. ''; - licence = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.pierron ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + maintainers = [ maintainers.pierron ]; + platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index 5edc57e2f819b..73a8b64ed22aa 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installPhase = ''scons install''; meta = { - licence = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index 899c851c667d6..da4a34cfec8c4 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" ]; - licence = stdenv.lib.licenses.unfree; + license = stdenv.lib.licenses.unfree; }; src = fetchurl { diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 48d88ed40ce6e..56d176a710cd5 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { This package currently contains all of the screensavers from the original collection, plus a few others. ''; - licence = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 67cbbd138261b..0e5dbeebf9211 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { --replace "self.cert_dir" "root_prefix + self.cert_dir" ''; - meta = { + meta = with stdenv.lib; { platforms = platforms.linux; description = "A multilayer virtual switch"; longDescription = @@ -60,6 +60,6 @@ in stdenv.mkDerivation rec { to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. ''; homepage = "http://openvswitch.org/"; - licence = "Apache 2.0"; + license = licenses.asl20; }; } |