diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
commit | 457f28f6f85eea1b1671d62d2abe39297c9c90f7 (patch) | |
tree | 3c6e68534e7bfcde19893c830af7498b0606e6d2 /pkgs/desktops/gnome/extensions/extensionRenames.nix | |
parent | a25e03e76ae1e0367419db1de009e1139d08de68 (diff) | |
parent | 1aa7d4e6c61526606d9e26f939cdb60ec8f45fcd (diff) |
Merge branch 'master' into staging-next
; Conflicts: ; pkgs/development/tools/codespell/default.nix codespell 2.2.2 switched to pyproject & setuptools_scm: https://github.com/codespell-project/codespell/pull/2523
Diffstat (limited to 'pkgs/desktops/gnome/extensions/extensionRenames.nix')
-rw-r--r-- | pkgs/desktops/gnome/extensions/extensionRenames.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome/extensions/extensionRenames.nix b/pkgs/desktops/gnome/extensions/extensionRenames.nix index cbafc7c2e3a96..8d27481e845fb 100644 --- a/pkgs/desktops/gnome/extensions/extensionRenames.nix +++ b/pkgs/desktops/gnome/extensions/extensionRenames.nix @@ -12,6 +12,10 @@ "workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator"; "horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2"; + # forks of each other, azan@faissal.bensefia.id is more recent + "azan@faissal.bensefia.id" = "azan-islamic-prayer-times"; + "azan@hatem.masmoudi.org" = null; + # ############################################################################ # These are conflicts for older extensions (i.e. they don't support the latest GNOME version). # Make sure to move them up once they are updated |