diff options
| -rw-r--r-- | pkgs/development/python-modules/pyopencl/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/misc/emulators/dosbox/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/inputmethods/interception-tools/caps2esc.nix | 8 |
5 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 362cef42b783..9d5661f4d589 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -30,10 +30,10 @@ buildPythonPackage rec { # gcc: error: pygpu_language_opencl.cpp: No such file or directory doCheck = false; - meta = { + meta = with stdenv.lib; { description = "Python wrapper for OpenCL"; homepage = https://github.com/pyopencl/pyopencl; - license = stdenv.lib.licenses.mit; - maintainer = stdenv.lib.maintainers.fridh; + license = licenses.mit; + maintainers = [ maintainers.fridh ]; }; } diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index ed15ab6c56e2..48696f6b3008 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "A DOS emulator"; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; - licenses = licenses.gpl2; + license = licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index e932f5163750..8d6aa033d898 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -125,7 +125,7 @@ let Copy-On-Write filesystem with data integrity detection and repair, snapshotting, cloning, block devices, deduplication, and more. ''; - home = http://zfsonlinux.org/; + homepage = http://zfsonlinux.org/; license = licenses.cddl; platforms = platforms.linux; maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index be98b1fce325..03a85633ed61 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -136,7 +136,7 @@ let description = str; longDescription = str; branch = str; - homepage = str; + homepage = either (listOf str) str; downloadPage = str; license = either (listOf lib.types.attrs) (either lib.types.attrs str); maintainers = listOf str; @@ -158,6 +158,7 @@ let downloadURLRegexp = str; isFcitxEngine = bool; isIbusEngine = bool; + isGutenprint = bool; }; checkMetaAttr = k: v: diff --git a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix index b31a24b0c837..994e9da3e430 100644 --- a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix +++ b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation { buildInputs = [ cmake ]; - meta = { + meta = with stdenv.lib; { homepage = "https://gitlab.com/interception/linux/plugins/caps2esc"; description = "Transforming the most useless key ever into the most useful one"; - license = stdenv.lib.licenses.mit; - maintainers = stdenv.lib.maintainers.vyp; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = [ maintainers.vyp ]; + platforms = platforms.linux; }; } |