summary refs log tree commit diff
path: root/pkgs/desktops/pantheon
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-02-02 10:04:13 +0800
committerBobby Rong <rjl931189261@126.com>2022-02-02 13:48:07 +0800
commit9137abbea8bef42c6412eaf72682f6e00340ce64 (patch)
tree07e4bc0b375506cc7b6a6f92e10367ffe6746558 /pkgs/desktops/pantheon
parent246f4949ede10370f98742e815172858509e4364 (diff)
downloadnixpkgs-9137abbea8bef42c6412eaf72682f6e00340ce64.tar
nixpkgs-9137abbea8bef42c6412eaf72682f6e00340ce64.tar.gz
nixpkgs-9137abbea8bef42c6412eaf72682f6e00340ce64.tar.bz2
nixpkgs-9137abbea8bef42c6412eaf72682f6e00340ce64.tar.lz
nixpkgs-9137abbea8bef42c6412eaf72682f6e00340ce64.tar.xz
nixpkgs-9137abbea8bef42c6412eaf72682f6e00340ce64.tar.zst
nixpkgs-9137abbea8bef42c6412eaf72682f6e00340ce64.zip
pkgs/pantheon: remove old aliases
This is mostly Pantheon version of e703bc0ade3b6a3669f77d0acede1c2047e51fc2,
we move the aliases outside of the scope.
Diffstat (limited to 'pkgs/desktops/pantheon')
-rw-r--r--pkgs/desktops/pantheon/default.nix14
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index e005f08ba30..29192a4dd80 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -234,18 +234,20 @@ lib.makeScope pkgs.newScope (self: with self; {
   # Please call these packages in pkgs/top-level/all-packages.nix instead of this file.
   # https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
 
-} // lib.optionalAttrs (config.allowAliases or true) {
+}) // lib.optionalAttrs (config.allowAliases or true) {
 
   ### ALIASES
 
-  inherit (pkgs) vala; # added 2019-10-10
+  # They need to be outside the scope or they will shadow the attributes from parent scope.
 
-  cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1.";
+  vala = throw "The ‘pantheon.vala’ alias was removed on 2022-02-02, please use ‘pkgs.vala’ directly."; # added 2019-10-10
 
-  elementary-screenshot-tool = elementary-screenshot; # added 2021-07-21
+  cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1."; # added 2020-04-06
+
+  elementary-screenshot-tool = throw "The ‘pantheon.elementary-screenshot-tool’ alias was removed on 2022-02-02, please use ‘pantheon.elementary-screenshot’ directly."; # added 2021-07-21
 
   extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01
 
-  inherit (pkgs) notes-up; # added 2021-12-18
+  notes-up = throw "The ‘pantheon.notes-up’ alias was removed on 2022-02-02, please use ‘pkgs.notes-up’ directly."; # added 2021-12-18
 
-})
+}