treewide: remove deprecations after 24.11 branch-off (#358735)

Author: emilazy

doc/languages-frameworks/chicken.section.md

@@ -60,13 +60,13 @@ all the other eggs:
 
 ```nix
 let
-  myChickenPackages = pkgs.chickenPackages.overrideScope' (self: super: {
+  myChickenPackages = pkgs.chickenPackages.overrideScope (self: super: {
       # The chicken package itself can be overridden to effect the whole ecosystem.
       # chicken = super.chicken.overrideAttrs {
       #   src = ...
       # };
 
-      chickenEggs = super.chickenEggs.overrideScope' (eggself: eggsuper: {
+      chickenEggs = super.chickenEggs.overrideScope (eggself: eggsuper: {
         srfi-180 = eggsuper.srfi-180.overrideAttrs {
           # path to a local copy of srfi-180
           src = <...>;

lib/customisation.nix

@@ -543,10 +543,6 @@ rec {
           newScope = scope: newScope (self // scope);
           callPackage = self.newScope {};
           overrideScope = g: makeScope newScope (extends g f);
-          # Remove after 24.11 is released.
-          overrideScope' = g: warnIf (isInOldestRelease 2311)
-            "`overrideScope'` (from `lib.makeScope`) has been renamed to `overrideScope`."
-            (makeScope newScope (extends g f));
           packages = f;
         };
     in self;

pkgs/build-support/singularity-tools/default.nix

@@ -22,38 +22,6 @@ let
   defaultSingularity = singularity;
 in
 lib.makeExtensible (final: {
-  # TODO(@ShamrockLee): Remove after Nixpkgs 24.11 branch-off.
-  shellScript =
-    lib.warn
-      "`singularity-tools.shellScript` is deprecated. Use `writeScript`, `writeShellScripts` or `writers.writeBash` instead."
-      (
-        name: text:
-        writeScript name ''
-          #!${runtimeShell}
-          set -e
-          ${text}
-        ''
-      );
-
-  # TODO(@ShamrockLee): Remove after Nixpkgs 24.11 branch-off.
-  mkLayer =
-    lib.warn
-      "`singularity-tools.mkLayer` is deprecated, as it is no longer used to implement `singularity-tools.buildImages`."
-      (
-        {
-          name,
-          contents ? [ ],
-          # May be "apptainer" instead of "singularity"
-          projectName ? (singularity.projectName or "singularity"),
-        }:
-        runCommand "${projectName}-layer-${name}" { inherit contents; } ''
-          mkdir $out
-          for f in $contents ; do
-            cp -ra $f $out/
-          done
-        ''
-      );
-
   buildImage =
     {
       name,

pkgs/by-name/ci/cinnamon-common/package.nix

@@ -68,6 +68,7 @@ let
     requests
   ]);
 in
+# TODO (after 25.05 branch-off): Rename to pkgs.cinnamon
 stdenv.mkDerivation rec {
   pname = "cinnamon-common";
   version = "6.2.9";

pkgs/desktops/cinnamon/default.nix

@@ -91,10 +91,6 @@ in rec {
     pythonAtLeast = lib.versionAtLeast pythonVersion;
     pythonOlder = lib.versionOlder pythonVersion;
     inherit hasDistutilsCxxPatch;
-    # Remove after 24.11 is released.
-    pythonForBuild =
-      lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2311) "`pythonForBuild` (from `python*`) has been renamed to `pythonOnBuildForHost`"
-        pythonOnBuildForHost_overridden;
     pythonOnBuildForHost = pythonOnBuildForHost_overridden;
 
     tests = callPackage ./tests.nix {

pkgs/development/interpreters/python/passthrufun.nix

@@ -22,9 +22,6 @@
 , withPython ? false
 }:
 
-# Added 2024-09-03. Drop this assertion after 24.11 is released.
-assert lib.assertMsg (config.avahi or {} == {}) "config.avahi has been removed; please use an overlay or services.avahi.package to configure the avahi package.";
-
 stdenv.mkDerivation rec {
   pname = "avahi${lib.optionalString withLibdnssdCompat "-compat"}";
   version = "0.8";

pkgs/development/libraries/avahi/default.nix

@@ -91,8 +91,7 @@ mapAliases {
   adoptopenjdk-openj9-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09
   adoptopenjdk-openj9-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09
   adoptopenjdk-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-8`."; # Added 2024-05-09
-  # Post 24.11 branch-off, this should throw an error
-  addOpenGLRunpath = addDriverRunpath; # Added 2024-05-25
+  addOpenGLRunpath = throw "addOpenGLRunpath has been removed. Use addDriverRunpath instead."; # Converted to throw 2024-11-17
   aeon = throw "aeon has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-07-15
   afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21
   agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10"
@@ -211,6 +210,7 @@ mapAliases {
   ChowKick = chow-kick; # Added 2024-06-12
   CHOWTapeModel = chow-tape-model; # Added 2024-06-12
   chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27
+  cinnamon = throw "The cinnamon scope has been removed and all packages have been moved to the top-level"; # Added 2024-11-25
   cloog = throw "cloog has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
   cloog_0_18_0 = throw "cloog_0_18_0 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
   cloogppl = throw "cloogppl has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13

pkgs/top-level/aliases.nix

@@ -17421,8 +17421,6 @@ with pkgs;
     appls = [ prio ];
   };
 
-  cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { });
-
   deepin = recurseIntoAttrs (callPackage ../desktops/deepin { });
 
   enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { });

pkgs/top-level/all-packages.nix

@@ -80,7 +80,6 @@ let
     mkDerivation = true;
     overrideDerivation = true;
     overrideScope = true;
-    overrideScope' = true;
 
     # Special case: lib/types.nix leaks into a lot of nixos-related
     # derivations, and does not eval deeply.