From f78a3ef8355de25c380d1ed3c073f178f3940d0d Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 18 Jul 2021 15:00:58 +0900 Subject: release-haskell: move location of muslGHCs so that musl always comes before static This is just a small reorganization. --- pkgs/top-level/release-haskell.nix | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 1dc728b2da28..2c1d9ec37b56 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -294,6 +294,23 @@ let (name: jobs.haskellPackages."${name}") (maintainedPkgNames pkgs.haskellPackages)); }; + + muslGHCs = pkgs.releaseTools.aggregate { + name = "haskell-pkgsMusl-ghcs"; + meta = { + description = "GHCs built with musl"; + maintainers = with lib.maintainers; [ + nh2 + ]; + }; + constituents = accumulateDerivations [ + jobs.pkgsMusl.haskell.compiler.ghc8102Binary + jobs.pkgsMusl.haskell.compiler.ghc884 + jobs.pkgsMusl.haskell.compiler.ghc8104 + jobs.pkgsMusl.haskell.compiler.ghc901 + ]; + }; + staticHaskellPackages = pkgs.releaseTools.aggregate { name = "static-haskell-packages"; meta = { @@ -313,21 +330,6 @@ let jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.aarch64-linux ]; }; - muslGHCs = pkgs.releaseTools.aggregate { - name = "haskell-pkgsMusl-ghcs"; - meta = { - description = "GHCs built with musl"; - maintainers = with lib.maintainers; [ - nh2 - ]; - }; - constituents = accumulateDerivations [ - jobs.pkgsMusl.haskell.compiler.ghc8102Binary - jobs.pkgsMusl.haskell.compiler.ghc884 - jobs.pkgsMusl.haskell.compiler.ghc8104 - jobs.pkgsMusl.haskell.compiler.ghc901 - ]; - }; } ]; -- cgit 1.4.1