Tidy package set definitions

default.nix

@@ -43,17 +43,13 @@ let
   nixpkgsSrc = haskellNix.sources.nixpkgs-2003;
   pkgs = import nixpkgsSrc haskellNix.nixpkgsArgs;
 
-  armv7l-musl-pkgs = import nixpkgsSrc (haskellNix.nixpkgsArgs // {
-    crossSystem = pkgs.lib.systems.platforms.armv7l-hf-multiplatform // { config = "armv7l-unknown-linux-musleabihf"; };
-  });
-
   platforms = {
     #i386-musl = buildCabal { pkgs = pkgs.pkgsCross.musl32; };
     amd64 = buildCabal { pkgs = pkgs; };
     amd64-musl = buildCabal { pkgs = pkgs.pkgsCross.musl64; };
-    aarch64 = buildCabal { pkgs = pkgs.pkgsCross.aarch64-multiplatform-musl; };
+    aarch64 = buildCabal { pkgs = pkgs.pkgsCross.aarch64-multiplatform.pkgsMusl; };
     armv7l = buildCabal { pkgs = pkgs.pkgsCross.armv7l-hf-multiplatform; };
-    armv7l-musl = buildCabal { pkgs = armv7l-musl-pkgs; };
+    armv7l-musl = buildCabal { pkgs = pkgs.pkgsCross.armv7l-hf-multiplatform.pkgsMusl; };
     #win64 = buildCabal { pkgs = pkgs.pkgsCross.mingwW64; };
   };
 in platforms