treewide: remove deprecations up until 24.11 (staging part) (#356735)

NixOS · Nov 22, 2024 · ba15591 · ba15591
2 parents 768e2ec + 71306e6
commit ba15591
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 44 deletions.
diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py
@@ -210,43 +210,6 @@ def create_machine(
         name: Optional[str] = None,
         keep_vm_state: bool = False,
     ) -> Machine:
-        # Legacy args handling
-        # FIXME: remove after 24.05
-        if isinstance(start_command, dict):
-            if name is not None or keep_vm_state:
-                raise TypeError(
-                    "Dictionary passed to create_machine must be the only argument"
-                )
-
-            args = start_command
-            start_command = args.pop("startCommand", SENTINEL)
-
-            if start_command is SENTINEL:
-                raise TypeError(
-                    "Dictionary passed to create_machine must contain startCommand"
-                )
-
-            if not isinstance(start_command, str):
-                raise TypeError(
-                    f"startCommand must be a string, got: {repr(start_command)}"
-                )
-
-            name = args.pop("name", None)
-            keep_vm_state = args.pop("keep_vm_state", False)
-
-            if args:
-                raise TypeError(
-                    f"Unsupported arguments passed to create_machine: {args}"
-                )
-
-            self.logger.warning(
-                Fore.YELLOW
-                + Style.BRIGHT
-                + "WARNING: Using create_machine with a single dictionary argument is deprecated and will be removed in NixOS 24.11"
-                + Style.RESET_ALL
-            )
-        # End legacy args handling
-
         tmp_dir = get_tmp_dir()
 
         cmd = NixStartScript(start_command)

diff --git a/pkgs/by-name/e2/e2fsprogs/package.nix b/pkgs/by-name/e2/e2fsprogs/package.nix
@@ -23,13 +23,6 @@ stdenv.mkDerivation rec {
     ++ lib.optionals withFuse [ fuse3 ];
 
   patches = [
-    # Avoid trouble with older systems like NixOS 23.05.
-    # TODO: most likely drop this at some point, e.g. when 23.05 loses support.
-    (fetchurl {
-      name = "mke2fs-avoid-incompatible-features.patch";
-      url = "https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/plain/debian/patches/disable-metadata_csum_seed-and-orphan_file-by-default?h=debian/master&id=3fb3d18baba90e5d48d94f4c0b79b2d271b0c913";
-      hash = "sha256-YD11K4s2bqv0rvzrxtaiodzLp3ztULlOlPUf1XcpxRY=";
-    })
     (fetchurl {
       name = "SIZEOF_SIZE_T.patch";
       url = "https://lore.kernel.org/linux-ext4/[email protected]/raw";