diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-04-08 11:32:55 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-04-08 11:33:08 +0200 |
| commit | fd77cd7a01f558ae47b446fc21e5666e5ded6814 (patch) | |
| tree | 1e44aa7c533520b8d8158d554a200e3fa088055d /pkgs/applications/networking/instant-messengers/telegram | |
| parent | 46f29d4bd6305a9f7c743d3f9022a8d5f6d3cb12 (diff) | |
| parent | 97ad0928a5cb6512af4f92be062e9b31edc485d4 (diff) | |
| download | nixpkgs-fd77cd7a01f558ae47b446fc21e5666e5ded6814.tar nixpkgs-fd77cd7a01f558ae47b446fc21e5666e5ded6814.tar.gz nixpkgs-fd77cd7a01f558ae47b446fc21e5666e5ded6814.tar.bz2 nixpkgs-fd77cd7a01f558ae47b446fc21e5666e5ded6814.tar.lz nixpkgs-fd77cd7a01f558ae47b446fc21e5666e5ded6814.tar.xz nixpkgs-fd77cd7a01f558ae47b446fc21e5666e5ded6814.tar.zst nixpkgs-fd77cd7a01f558ae47b446fc21e5666e5ded6814.zip | |
Merge branch 'master' into staging-next
Indentation conflict in vulkan-related src fetches.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telegram')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix (renamed from pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix) | 1 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix (renamed from pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix) | 0 | ||||
| -rwxr-xr-x | pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/update.py (renamed from pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py) | 0 |
3 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 835e2197e18..ab8a24bb093 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -76,7 +76,6 @@ stdenv.mkDerivation rec { version = "4.7.1"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py - # Telegram-Desktop with submodules src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 6e57a81dc29..6e57a81dc29 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/update.py index 89e40218623..89e40218623 100755 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/update.py |