diff options
author | (cdep)illabout <cdep.illabout@gmail.com> | 2021-07-18 15:00:58 +0900 |
---|---|---|
committer | (cdep)illabout <cdep.illabout@gmail.com> | 2021-07-24 14:23:50 +0900 |
commit | f78a3ef8355de25c380d1ed3c073f178f3940d0d (patch) | |
tree | 39b4c0b3274935d8d03e794508029245489f4a3e /pkgs | |
parent | 05b69d83daafb043d8fd193b61af3f9290174146 (diff) | |
download | nixpkgs-f78a3ef8355de25c380d1ed3c073f178f3940d0d.tar nixpkgs-f78a3ef8355de25c380d1ed3c073f178f3940d0d.tar.gz nixpkgs-f78a3ef8355de25c380d1ed3c073f178f3940d0d.tar.bz2 nixpkgs-f78a3ef8355de25c380d1ed3c073f178f3940d0d.tar.lz nixpkgs-f78a3ef8355de25c380d1ed3c073f178f3940d0d.tar.xz nixpkgs-f78a3ef8355de25c380d1ed3c073f178f3940d0d.tar.zst nixpkgs-f78a3ef8355de25c380d1ed3c073f178f3940d0d.zip |
release-haskell: move location of muslGHCs so that musl always comes before static
This is just a small reorganization.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/top-level/release-haskell.nix | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 1dc728b2da2..2c1d9ec37b5 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 - ]; - }; } ]; |