treewide: remove deprecations after 24.11 branch-off (#358735)
This commit is contained in:
Emily
@@ -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 = <...>;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
{ config, pkgs, lib }:
|
||||
|
||||
# The cinnamon scope is deprecated and no package additions should be done here.
|
||||
#
|
||||
# TODO (after 24.11 branch-off): Remove this scope entirely.
|
||||
# TODO (after 25.05 branch-off): Rename pkgs.cinnamon-common to pkgs.cinnamon.
|
||||
|
||||
lib.makeScope pkgs.newScope (self: { }) // lib.optionalAttrs config.allowAliases {
|
||||
# Aliases need to be outside the scope or they will shadow the attributes from parent scope.
|
||||
bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14
|
||||
cinnamon-common = lib.warn "cinnamon.cinnamon-common was moved to top-level. Please use pkgs.cinnamon-common directly." pkgs.cinnamon-common; # Added on 2024-07-22
|
||||
cinnamon-control-center = lib.warn "cinnamon.cinnamon-control-center was moved to top-level. Please use pkgs.cinnamon-control-center directly." pkgs.cinnamon-control-center; # Added on 2024-07-22
|
||||
cinnamon-desktop = lib.warn "cinnamon.cinnamon-desktop was moved to top-level. Please use pkgs.cinnamon-desktop directly." pkgs.cinnamon-desktop; # Added on 2024-07-22
|
||||
cinnamon-gsettings-overrides = lib.warn "cinnamon.cinnamon-gsettings-overrides was moved to top-level. Please use pkgs.cinnamon-gsettings-overrides directly." pkgs.cinnamon-gsettings-overrides; # Added on 2024-07-22
|
||||
cinnamon-menus = lib.warn "cinnamon.cinnamon-menus was moved to top-level. Please use pkgs.cinnamon-menus directly." pkgs.cinnamon-menus; # Added on 2024-07-22
|
||||
cinnamon-screensaver = lib.warn "cinnamon.cinnamon-screensaver was moved to top-level. Please use pkgs.cinnamon-screensaver directly." pkgs.cinnamon-screensaver; # Added on 2024-07-22
|
||||
cinnamon-session = lib.warn "cinnamon.cinnamon-session was moved to top-level. Please use pkgs.cinnamon-session directly." pkgs.cinnamon-session; # Added on 2024-07-22
|
||||
cinnamon-settings-daemon = lib.warn "cinnamon.cinnamon-settings-daemon was moved to top-level. Please use pkgs.cinnamon-settings-daemon directly." pkgs.cinnamon-settings-daemon; # Added on 2024-07-22
|
||||
cinnamon-translations = lib.warn "cinnamon.cinnamon-translations was moved to top-level. Please use pkgs.cinnamon-translations directly." pkgs.cinnamon-translations; # Added on 2024-07-22
|
||||
cjs = lib.warn "cinnamon.cjs was moved to top-level. Please use pkgs.cjs directly." pkgs.cjs; # Added on 2024-07-22
|
||||
iso-flags-png-320x420 = lib.warn "cinnamon.iso-flags-png-320x420 was moved to top-level and renamed to pkgs.iso-flags-png-320x240." pkgs.iso-flags-png-320x240; # Added on 2024-07-14
|
||||
iso-flags-svg = throw "cinnamon.iso-flags-svg was removed because this is not used in Cinnamon. You can directly obtain the images from \"\${pkgs.iso-flags.src}/svg\"."; # Added on 2024-07-14
|
||||
folder-color-switcher = lib.warn "cinnamon.folder-color-switcher was moved to top-level. Please use pkgs.folder-color-switcher directly." pkgs.folder-color-switcher; # Added on 2024-07-14
|
||||
mint-artwork = lib.warn "cinnamon.mint-artwork was moved to top-level. Please use pkgs.mint-artwork directly." pkgs.mint-artwork; # Added on 2024-07-14
|
||||
mint-cursor-themes = lib.warn "cinnamon.mint-cursor-themes was moved to top-level. Please use pkgs.mint-cursor-themes directly." pkgs.mint-cursor-themes; # Added on 2024-07-14
|
||||
mint-l-icons = lib.warn "cinnamon.mint-l-icons was moved to top-level. Please use pkgs.mint-l-icons directly." pkgs.mint-l-icons; # Added on 2024-07-14
|
||||
mint-l-theme = lib.warn "cinnamon.mint-l-theme was moved to top-level. Please use pkgs.mint-l-theme directly." pkgs.mint-l-theme; # Added on 2024-07-14
|
||||
mint-themes = lib.warn "cinnamon.mint-themes was moved to top-level. Please use pkgs.mint-themes directly." pkgs.mint-themes; # Added on 2024-07-14
|
||||
mint-x-icons = lib.warn "cinnamon.mint-x-icons was moved to top-level. Please use pkgs.mint-x-icons directly." pkgs.mint-x-icons; # Added on 2024-07-14
|
||||
mint-y-icons = lib.warn "cinnamon.mint-y-icons was moved to top-level. Please use pkgs.mint-y-icons directly." pkgs.mint-y-icons; # Added on 2024-07-14
|
||||
muffin = lib.warn "cinnamon.muffin was moved to top-level. Please use pkgs.muffin directly." pkgs.muffin; # Added on 2024-07-22
|
||||
nemo = lib.warn "cinnamon.nemo was moved to top-level. Please use pkgs.nemo directly." pkgs.nemo; # Added on 2024-07-22
|
||||
nemo-emblems = lib.warn "cinnamon.nemo-emblems was moved to top-level. Please use pkgs.nemo-emblems directly." pkgs.nemo-emblems; # Added on 2024-07-22
|
||||
nemo-fileroller = lib.warn "cinnamon.nemo-fileroller was moved to top-level. Please use pkgs.nemo-fileroller directly." pkgs.nemo-fileroller; # Added on 2024-07-22
|
||||
nemo-python = lib.warn "cinnamon.nemo-python was moved to top-level. Please use pkgs.nemo-python directly." pkgs.nemo-python; # Added on 2024-07-22
|
||||
nemo-with-extensions = lib.warn "cinnamon.nemo-with-extensions was moved to top-level. Please use pkgs.nemo-with-extensions directly." pkgs.nemo-with-extensions; # Added on 2024-07-22
|
||||
nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override pkgs.nemo-with-extensions."; # Added on 2024-07-14
|
||||
pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # Added on 2024-07-14
|
||||
warpinator = lib.warn "cinnamon.warpinator was moved to top-level. Please use pkgs.warpinator directly." pkgs.warpinator; # Added on 2024-07-14
|
||||
xapp = lib.warn "cinnamon.xapp was moved to top-level. Please use pkgs.xapp directly." pkgs.xapp; # Added on 2024-07-14
|
||||
xapps = lib.warn "cinnamon.xapps was moved to top-level and renamed to pkgs.xapp." pkgs.xapp; # Added 2022-07-27
|
||||
xreader = lib.warn "cinnamon.xreader was moved to top-level. Please use pkgs.xreader directly." pkgs.xreader; # Added on 2024-07-14
|
||||
xviewer = lib.warn "cinnamon.xviewer was moved to top-level. Please use pkgs.xviewer directly." pkgs.xviewer; # Added on 2024-07-14
|
||||
}
|
||||
@@ -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 {
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -17421,8 +17421,6 @@ with pkgs;
|
||||
appls = [ prio ];
|
||||
};
|
||||
|
||||
cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { });
|
||||
|
||||
deepin = recurseIntoAttrs (callPackage ../desktops/deepin { });
|
||||
|
||||
enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { });
|
||||
|
||||
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user