From d730df7a438e8c8d692bea6e2dfa227aaa408ecb Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 14 Jun 2016 15:28:38 +0200 Subject: pkgs/gitit: Make sure hydraPlatforms are set Within mapTestOn, meta.hydraPlatforms attribute has precedence over meta.platforms. The original gitit derivation has hydraPlatforms set to an empty list and it's aliased to meta.platforms. Unfortunately that alias doesn't work with overrideCabal, because we'd need to override the attributes passed to the callPackage'd function (the mentioned alias is done during function attrset unpacking). This fixes building gitit within the generic channel as well as including it in the pkgs.* Hydra jobs. Signed-off-by: aszlig Cc: @Profpatsch --- pkgs/openlab/gitit/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/openlab') diff --git a/pkgs/openlab/gitit/default.nix b/pkgs/openlab/gitit/default.nix index 159d2a2f..9edb81c1 100644 --- a/pkgs/openlab/gitit/default.nix +++ b/pkgs/openlab/gitit/default.nix @@ -2,7 +2,7 @@ let hp = haskellPackages.override { overrides = (self: super: { - gitit = (hlib.overrideCabal super.gitit (drv: { + gitit = (hlib.overrideCabal super.gitit (drv: rec { src = fetchFromGitHub { owner = "openlab-aux"; repo = "gitit"; @@ -10,6 +10,7 @@ let hp = haskellPackages.override { sha256 = "0qhkbvm4ixav4nln3m9845w9m3gzfq5xh4nxp2c9qj4w9p79if7z"; }; platforms = [ "x86_64-linux" ]; + hydraPlatforms = platforms; })); filestore = (hlib.overrideCabal super.filestore (drv: { patches = [ ./filestore.patch ]; -- cgit 1.4.1