Fix languages searcher to include all metadata

Author: thomasjm

codedown.nix

@@ -40,6 +40,8 @@ let
     (pkgsMaster.callPackage ./languages/rust {})
   ];
 
+  lib = pkgsStable.lib;
+
 in
 
 rec {
@@ -72,16 +74,18 @@ rec {
 
   languages = languagesFn false;
   languagesSearcher = common.searcher' {
-    packages = languagesFn true;
-    packageMustBeDerivation = false;
+    packages = let
+      filterOverrideKeys = lib.filterAttrs (k: _: !(lib.hasPrefix "override") k);
+    in
+      filterOverrideKeys (lib.mapAttrs (n: v: v.build {}) (languagesFn true));
   };
   languagesIcons = common.searcherIcons' {
     packages = languagesFn true;
     packageMustBeDerivation = false;
   };
 
-  settingsSchemas = pkgsStable.lib.mapAttrs (attr: value:
-    common.safeEval (pkgsStable.lib.attrByPath ["meta" "settingsSchema"] [] value)
+  settingsSchemas = lib.mapAttrs (attr: value:
+    common.safeEval (lib.attrByPath ["meta" "settingsSchema"] [] value)
   ) languages;
 
   mkCodeDownEnvironment = callPackage ./codedown/mkCodeDownEnvironment.nix {

languages/bash/default.nix

@@ -80,8 +80,6 @@ lib.listToAttrs (map (x:
               };
             };
           };
-
-        inherit meta;
       };
     }
 ) (lib.filter (x: lib.hasAttr x pkgs) baseCandidates))

languages/clojure/default.nix

@@ -96,8 +96,6 @@ listToAttrs (map (x:
             };
           };
         };
-
-      inherit meta;
     };
   }
 

languages/coq/default.nix

@@ -100,8 +100,6 @@ lib.listToAttrs (map (x:
             };
           };
         };
-
-      inherit meta;
     };
   }
 ) (lib.filter (x: lib.hasAttr x pkgs) baseCandidates))

languages/cpp/default.nix

@@ -114,8 +114,6 @@ if cling == null then {} else
               };
             };
           };
-
-        inherit meta;
       };
     }
   ) baseCandidates)

languages/go/default.nix

@@ -88,8 +88,6 @@ listToAttrs (map (x:
             };
           };
         };
-
-      inherit meta;
     };
   }
 

languages/haskell/default.nix

@@ -120,8 +120,6 @@ listToAttrs (mapAttrsToList (compilerName: snapshot:
             };
           };
         };
-
-      inherit meta;
     };
   }
 ) (lib.filterAttrs (k: _: !(hasPrefix "override") k) compilers))

languages/julia/default.nix

@@ -157,7 +157,5 @@ mapAttrs (attr: value:
             };
           };
         };
-
-    inherit meta;
   }
 ) baseCandidates

languages/octave/default.nix

@@ -107,8 +107,6 @@ listToAttrs (map (x:
             };
           };
         };
-
-      inherit meta;
     };
   }
 ) (filter (x: hasAttr x pkgs) baseCandidates))

languages/postgres/default.nix

@@ -63,7 +63,5 @@ in
           };
         };
       };
-
-    inherit meta;
   };
 }

languages/python/default.nix

@@ -226,8 +226,6 @@ lib.listToAttrs (map (x:
               };
             };
           };
-
-        inherit meta;
       };
     }
 ) (lib.filter (x: lib.hasAttr x pkgs) baseCandidates))

languages/r/default.nix

@@ -101,7 +101,5 @@ listToAttrs [{
             };
           };
         };
-
-    inherit meta;
   };
 }]

languages/ruby/default.nix

@@ -110,8 +110,6 @@ listToAttrs (map (x:
             };
           };
         };
-
-      inherit meta;
     };
   }
 

languages/rust/default.nix

@@ -141,8 +141,6 @@ listToAttrs (map (x:
           };
         };
       };
-
-      inherit meta;
     };
   }
 ) (filter (x: hasAttr x pkgs) baseCandidates))