From 07dd4a91f572762c99172903334b2e884c8f7a53 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 4 May 2021 15:38:20 +0200
Subject: [PATCH] top-level/release-haskell.nix: use top-level git-annex
 attribute

This saves us from the annoyances of the gitAndTools attribute set which
doesn't have recurseForDerivations and is thus ignored by
packagePlatforms.
---
 pkgs/top-level/release-haskell.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 2d99c41ca6e..cce010642d3 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -67,9 +67,7 @@ let
   };
 
   # hydra jobs for `pkgs` of which we import a subset of
-  pkgsPlatforms = packagePlatforms pkgs // {
-    gitAndTools = packagePlatforms pkgs.gitAndTools;
-  };
+  pkgsPlatforms = packagePlatforms pkgs;
 
   # names of packages in an attribute set that are maintained
   maintainedPkgNames = set: builtins.attrNames
@@ -110,6 +108,7 @@ let
       fffuu
       futhark
       ghcid
+      git-annex
       git-brunch
       gitit
       glirc
@@ -186,7 +185,6 @@ let
       zsh-git-prompt
       ;
 
-    gitAndTools.git-annex = pkgsPlatforms.gitAndTools.git-annex;
     elmPackages.elm = pkgsPlatforms.elmPackages.elm;
   } // versionedCompilerJobs {
     # Packages which should be checked on more than the