From 1d4f3fa371d507d7906bd868a3d959ee9a16d7fb Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 4 Mar 2018 03:18:28 +0000 Subject: [PATCH 1/2] stdenv: check-meta: fix fallout from #36119 --- pkgs/stdenv/generic/check-meta.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 93d0f4cc980..a1878dc0136 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -144,7 +144,7 @@ let homepage = either (listOf str) str; downloadPage = str; license = either (listOf lib.types.attrs) (either lib.types.attrs str); - maintainers = listOf str; + maintainers = listOf (attrsOf str); priority = int; platforms = listOf str; hydraPlatforms = listOf str; From 610b5b80451a78dd25a52ad5bcf63d86222ba044 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 4 Mar 2018 03:09:35 +0000 Subject: [PATCH 2/2] rename lib/maintainers-list.nix into maintainers/maintainer-list.nix Many commits unrelated to `lib` touch that file, this will make `git log ./lib` much saner. This is what I meant in https://github.com/NixOS/nixpkgs/pull/36119#issuecomment-370184101. --- lib/default.nix | 2 +- lib/maintainers-list.nix => maintainers/maintainer-list.nix | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename lib/maintainers-list.nix => maintainers/maintainer-list.nix (100%) diff --git a/lib/default.nix b/lib/default.nix index 4c36f3b0d79..7bd02106f7b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -21,7 +21,7 @@ let # packaging customisation = callLibs ./customisation.nix; - maintainers = import ./maintainers-list.nix; + maintainers = import ../maintainers/maintainer-list.nix; meta = callLibs ./meta.nix; sources = callLibs ./sources.nix; versions = callLibs ./versions.nix; diff --git a/lib/maintainers-list.nix b/maintainers/maintainer-list.nix similarity index 100% rename from lib/maintainers-list.nix rename to maintainers/maintainer-list.nix