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.

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 after 24.11 branch-off #358735

Merged
merged 6 commits into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions doc/languages-frameworks/chicken.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 = <...>;
Expand Down
4 changes: 0 additions & 4 deletions lib/customisation.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
32 changes: 0 additions & 32 deletions pkgs/build-support/singularity-tools/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions pkgs/by-name/ci/cinnamon-common/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
44 changes: 0 additions & 44 deletions pkgs/desktops/cinnamon/default.nix

This file was deleted.

4 changes: 0 additions & 4 deletions pkgs/development/interpreters/python/passthrufun.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 0 additions & 3 deletions pkgs/development/libraries/avahi/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17431,8 +17431,6 @@ with pkgs;
appls = [ prio ];
};

cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { });

deepin = recurseIntoAttrs (callPackage ../desktops/deepin { });

enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { });
Expand Down
1 change: 0 additions & 1 deletion pkgs/top-level/release-attrpaths-superset.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down