Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Nov 22, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
894fb07
e2fsprogs: remove compat patch
wolfgangwalther Nov 17, 2024
71306e6
nixos/lib/test-driver: remove legacy args handling
wolfgangwalther Nov 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions nixos/lib/test-driver/test_driver/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 0 additions & 7 deletions pkgs/by-name/e2/e2fsprogs/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down