Merge commit 'aee3f2ec9ef6ddea6115097946bc237a5b6ad8d9' into haskell-updates

maintainers/scripts/haskell/test-configurations.nix

@@ -65,7 +65,7 @@ let
   inherit (pkgs) lib;
 
   # see usage explanation for the input format `files` allows
-  files' = builtins.map builtins.baseNameOf (if !builtins.isList files then [ files ] else files);
+  files' = map baseNameOf (if !builtins.isList files then [ files ] else files);
 
   packageSetsWithVersionedHead =
     pkgs.haskell.packages
@@ -99,7 +99,7 @@ let
       # match the major and minor version of the GHC the config is intended for, if any
       configVersion = lib.concatStrings (builtins.match "ghc-([0-9]+).([0-9]+).x" configName);
       # return all package sets under haskell.packages matching the version components
-      setsForVersion = builtins.map (name: packageSetsWithVersionedHead.${name}) (
+      setsForVersion = map (name: packageSetsWithVersionedHead.${name}) (
         builtins.filter (
           setName:
           lib.hasPrefix "ghc${configVersion}" setName && (skipBinaryGHCs -> !(lib.hasInfix "Binary" setName))
@@ -120,7 +120,7 @@ let
 
   # attribute set that has all the attributes of haskellPackages set to null
   availableHaskellPackages = builtins.listToAttrs (
-    builtins.map (attr: lib.nameValuePair attr null) (builtins.attrNames pkgs.haskellPackages)
+    map (attr: lib.nameValuePair attr null) (builtins.attrNames pkgs.haskellPackages)
   );
 
   # evaluate a configuration and only return the attributes changed by it,
@@ -155,7 +155,7 @@ let
             sets = setsForFile fileName;
             attrs = overriddenAttrs fileName;
           in
-          lib.concatMap (set: builtins.map (attr: set.${attr}) attrs) sets
+          lib.concatMap (set: map (attr: set.${attr}) attrs) sets
         ) files'
       );
 in