From f9262fba9c1d55a5058f912f9f25891aa66fd39e Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 29 Mar 2023 14:39:14 +0900 Subject: [PATCH] haskellPackages: filter out Darwin jobs from mergeable job in release-haskell.nix --- pkgs/top-level/release-haskell.nix | 65 +++++++++++++++++------------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 4e86000093b4..030739893bb5 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -557,34 +557,43 @@ let ''; maintainers = lib.teams.haskell.members; }; - constituents = accumulateDerivations [ - # haskell specific tests - jobs.tests.haskell - # important top-level packages - jobs.cabal-install - jobs.cabal2nix - jobs.cachix - jobs.darcs - jobs.haskell-language-server - jobs.hledger - jobs.hledger-ui - jobs.hpack - jobs.niv - jobs.pandoc - jobs.stack - jobs.stylish-haskell - # important haskell (library) packages - jobs.haskellPackages.cabal-plan - jobs.haskellPackages.distribution-nixpkgs - jobs.haskellPackages.hackage-db - jobs.haskellPackages.xmonad - jobs.haskellPackages.xmonad-contrib - # haskell packages maintained by @peti - # imported from the old hydra jobset - jobs.haskellPackages.hopenssl - jobs.haskellPackages.hsemail - jobs.haskellPackages.hsyslog - ]; + constituents = + let + # Filter out all Darwin derivations. We don't want flakey Darwin + # derivations and flakey Hydra Darwin builders to block the + # mergeable job from successfully building. + filterInLinux = + lib.filter (drv: drv.system == "x86_64-linux" || drv.system == "aarch64-linux"); + in + filterInLinux + (accumulateDerivations [ + # haskell specific tests + jobs.tests.haskell + # important top-level packages + jobs.cabal-install + jobs.cabal2nix + jobs.cachix + jobs.darcs + jobs.haskell-language-server + jobs.hledger + jobs.hledger-ui + jobs.hpack + jobs.niv + jobs.pandoc + jobs.stack + jobs.stylish-haskell + # important haskell (library) packages + jobs.haskellPackages.cabal-plan + jobs.haskellPackages.distribution-nixpkgs + jobs.haskellPackages.hackage-db + jobs.haskellPackages.xmonad + jobs.haskellPackages.xmonad-contrib + # haskell packages maintained by @peti + # imported from the old hydra jobset + jobs.haskellPackages.hopenssl + jobs.haskellPackages.hsemail + jobs.haskellPackages.hsyslog + ]); }; maintained = pkgs.releaseTools.aggregate { name = "maintained-haskell-packages";