pkgs/top-level/config.nix: add various packageOverrides

oxij · oxij · commit 1d1ebf5a58a1 · 2019-03-09T13:21:22.000Z
Hm, Haskell's one is actually an overlay.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -13384,12 +13384,12 @@ in
   # the latest Maint version
   perl528Packages = recurseIntoAttrs (callPackage ./perl-packages.nix {
     perl = perl528;
-    overrides = (config.perlPackageOverrides or (p: {})) pkgs;
+    overrides = config.perlPackageOverrides pkgs;
   });
   # the latest Devel version
   perldevelPackages = recurseIntoAttrs (callPackage ./perl-packages.nix {
     perl = perldevel;
-    overrides = (config.perlPackageOverrides or (p: {})) pkgs;
+    overrides = config.perlPackageOverrides pkgs;
   });
 
   perlPackages = perl528Packages;
@@ -13437,7 +13437,7 @@ in
   };
 
   rPackages = dontRecurseIntoAttrs (callPackage ../development/r-modules {
-    overrides = (config.rPackageOverrides or (p: {})) pkgs;
+    overrides = config.rPackageOverrides pkgs;
   });
 
   ### SERVERS
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
@@ -26,6 +26,11 @@ let
     '';
   });
 
+  mkOverrides = args: mkMassRebuild ({
+    type = types.functionTo (types.attrsOf (types.uniq types.unspecified));
+    default = super: {};
+  } // args);
+
   options = {
 
     /* Internal stuff */
@@ -106,7 +111,27 @@ let
       description = "A list of blacklisted licenses.";
     };
 
-    # TODO: packageOverrides, needs functionTo removed in 4ff1ab5a56f1280d2de319ad4eb4b2796e07ed35
+    /* Overlays */
+
+    # It feels to me like if overlays really belong here.
+
+    packageOverrides = mkOverrides {
+      description = "Poor man's global overlay.";
+    };
+
+    haskellPackageOverrides = mkMassRebuild {
+      type = types.uniq types.unspecified;
+      default = self: super: {};
+      description = "Haskell's overlay.";
+    };
+
+    perlPackageOverrides = mkOverrides {
+      description = "Poor man's perl overlay.";
+    };
+
+    rPackageOverrides = mkOverrides {
+      description = "Poor man's R overlay.";
+    };
 
     # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426
     # for why this defaults to false, but I (@copumpkin) want to default it to true soon.
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
@@ -111,8 +111,7 @@ let
   # attributes to refer to the original attributes (e.g. "foo =
   # ... pkgs.foo ...").
   configOverrides = self: super:
-    lib.optionalAttrs allowCustomOverrides
-      ((config.packageOverrides or (super: {})) super);
+    lib.optionalAttrs allowCustomOverrides (config.packageOverrides super);
 
   # Convenience attributes for instantitating package sets. Each of
   # these will instantiate a new version of allPackages. Currently the
