Skip to content

treewide: remove deprecations up until 24.11#356732

Merged
emilazy merged 14 commits intoNixOS:masterfrom
wolfgangwalther:remove-deprecations-for-2411
Nov 24, 2024
Merged

treewide: remove deprecations up until 24.11#356732
emilazy merged 14 commits intoNixOS:masterfrom
wolfgangwalther:remove-deprecations-for-2411

Conversation

@wolfgangwalther
Copy link
Contributor

@wolfgangwalther wolfgangwalther commented Nov 17, 2024

Grepping through the repo for NixOS version numbers brought up those candidates for removal. Many were targeted at 24.11, but some have already been forgotten for a while.

If any of those are controversial, I can split those into a separate PR.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: module system About "NixOS" module system internals 6.topic: lib The Nixpkgs function library labels Nov 17, 2024
@wolfgangwalther wolfgangwalther added backport release-24.11 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: module system About "NixOS" module system internals 6.topic: lib The Nixpkgs function library and removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: module system About "NixOS" module system internals 6.topic: lib The Nixpkgs function library labels Nov 17, 2024
@wolfgangwalther wolfgangwalther added 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes labels Nov 17, 2024
@wolfgangwalther
nixos/screen: remove assertion
8bdfc5e 
Scheduled for 24.11.
@wolfgangwalther
nixos/pipewire: remove version reference from warning message
e1e2193 
This is also true in 24.11 and up, so no need to state the version
number explicitly.
@wolfgangwalther
nixos/archisteamfarm: remove dataDir fallback
4255d7a 
Scheduled for 24.11.

Added in NixOS#272147.
@wolfgangwalther wolfgangwalther force-pushed the remove-deprecations-for-2411 branch from bde5418 to 07ae95e Compare November 22, 2024 17:33
@wolfgangwalther
Copy link
Contributor Author

wolfgangwalther commented Nov 22, 2024

Rebased, hoping that the eval errors before were not mine. No changes.

@wolfgangwalther
writeReferencesToFile: remove
51da8b6 
Had been deprecated and scheduled for removal in 24.11.
@wolfgangwalther
makeSetupHook: remove deprecated deps argument
6646eeb 
This had been scheduled for removal in 23.11.
@wolfgangwalther
singularity: remove deprecated arguments
89981f1 
Those were scheduled for removal in 24.11.
@wolfgangwalther
{qt5,qt6}: remove overrideScope' errors
352f462 
Scheduled for removal for 24.11.
@wolfgangwalther wolfgangwalther force-pushed the remove-deprecations-for-2411 branch from 07ae95e to c35379a Compare November 22, 2024 20:04
emilazy
emilazy approved these changes Nov 22, 2024
View reviewed changes
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved by release manager; ping me after ofborg eval is done for merge.

@emilazy
Copy link
Member

emilazy commented Nov 22, 2024

BTW, it looks like this may leave some ({ … }) that could be cleaned up (but this is non‐blocking).

@wegank wegank added the 12.approvals: 3+ This PR was reviewed and approved by three or more persons. label Nov 23, 2024
@wolfgangwalther
hocon: remove deprecated indicators
97c3fa4 
This was scheduled for 24.11.
@wolfgangwalther
redocly: remove compat symlink
b6c3e15 
This was scheduled for 24.11.
@wolfgangwalther
lammps: remove mpi passthru
6c258ee 
Scheduled for 24.05.
@wolfgangwalther wolfgangwalther force-pushed the remove-deprecations-for-2411 branch from c35379a to 6c258ee Compare November 23, 2024 18:39
@wolfgangwalther
Copy link
Contributor Author

wolfgangwalther commented Nov 23, 2024

@emilazy ofborg eval complete, but I noticed a left-over test for hocon, that I removed in the latest push. No other changes.

@emilazy
Copy link
Member

emilazy commented Nov 23, 2024

Looks good, thanks!

szlend
szlend approved these changes Nov 23, 2024
View reviewed changes
Copy link
Member

@szlend szlend left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for redocly. I should have done this myself. Though personally I would just keep it as is since we're already past the change freeze.

@ofborg ofborg bot requested a review from szlend November 24, 2024 14:34
@wolfgangwalther
Copy link
Contributor Author

wolfgangwalther commented Nov 24, 2024

@emilazy ofborg-eval is done again.

@wolfgangwalther wolfgangwalther mentioned this pull request Nov 24, 2024
Merged
13 tasks
@emilazy emilazy merged commit 49d9ef1 into NixOS:master Nov 24, 2024
@github-actions
Copy link
Contributor

github-actions bot commented Nov 24, 2024

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-356732-to-release-24.11 origin/release-24.11
cd .worktree/backport-356732-to-release-24.11
git switch --create backport-356732-to-release-24.11
git cherry-pick -x 73df63f8ef1e0a578ed047428491bd02588c9f11 de69ff528bb5f3028f4c8f303b170c5fb83f9f8b 749a6fe1adb3a8bd9e9013d524e4fbae5ca6e901 9966353ee7cd830cb25b60d2360a3a0069802426 8bdfc5eca22d86b70b53f5422e273b29be20a3dc e1e2193dff2750fb33b8c115a21498e322879a71 4255d7a658c0b247588f38a64b96eaa7b74f8357 51da8b6b00c2b18b6a2fac9bc15e6fd67932396b 6646eeb500eeb27b8bcd56b9910fa967bf8ba410 89981f1968f2047bc7b860a726a8e6bf9b292711 352f462ad9d2aa2cde75fdd8f1734e86402a3ff6 97c3fa4ebd116c8e4983325afb87e5e7043cd092 b6c3e15ee52784dab633c8612dd5f20d3b3f011a 6c258ee2bd97c5211e582a59398cb1765f77ebb3

@emilazy
Copy link
Member

emilazy commented Nov 24, 2024

How ironic.

@wolfgangwalther wolfgangwalther deleted the remove-deprecations-for-2411 branch November 24, 2024 19:56
@wolfgangwalther wolfgangwalther mentioned this pull request Nov 24, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hsjobeki hsjobeki hsjobeki requested changes

@wegank wegank wegank approved these changes

@emilazy emilazy emilazy approved these changes

@fricklerhandwerk fricklerhandwerk Awaiting requested review from fricklerhandwerk

@h7x4 h7x4 Awaiting requested review from h7x4

@infinisil infinisil Awaiting requested review from infinisil

@K900 K900 Awaiting requested review from K900

@mweinelt mweinelt Awaiting requested review from mweinelt

@NickCao NickCao Awaiting requested review from NickCao

@philiptaron philiptaron Awaiting requested review from philiptaron

@roberth roberth Awaiting requested review from roberth

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@ttuegel ttuegel Awaiting requested review from ttuegel

@szlend szlend Awaiting requested review from szlend

+1 more reviewer

@GetPsyched GetPsyched GetPsyched approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: lib The Nixpkgs function library 6.topic: module system About "NixOS" module system internals 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 3+ This PR was reviewed and approved by three or more persons.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@wolfgangwalther @Aleksanaa @emilazy @szlend @wegank @GetPsyched @hsjobeki