@@ -72,8 +72,6 @@ (define-module (gnu packages telegram)
#:use-module (guix build-system python)
#:use-module (guix build-system qt))
-(define %telegram-version "2.9.3")
-
(define libvpx-for-telegram-desktop
(let ((commit "5b63f0f821e94f8072eb483014cfc33b05978bb9")
(revision "112"))
@@ -104,197 +102,263 @@ (define libyuv-for-telegram-desktop
(base32
"01knnk4h247rq536097n9n3s3brxlbby3nv3ppdgsqfda3k159ll")))))
-(define cmake-helpers-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/desktop-app/cmake_helpers.git")
- (commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72")))
- (file-name
- (git-file-name "cmake-helpers-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5"))))
+;; NOTE:
+;; TDESKTOP_KEEP=(tgcalls)
+;; git checkout v2.9.3
+;; git submodule init
+;; git submodule deinit --force Telegram/ThirdParty
+;;
+;; for source in ${TDESKTOP_KEEP}
+;; do
+;; git submodule init "Telegram/ThirdParty/${source}"
+;; done
+;;
+;; git submodule update --checkout
+;; git submodule foreach "git rev-parse HEAD \
+;; && git rev-list HEAD | wc -l \
+;; && guix hash -rx . \
+;; && echo ------" \
+;; | less
+
+(define tgcalls-for-telegram-desktop
+ (let ((commit "81e97fa52e25b7775b62ce07bb653533d81e91b3")
+ (revision "738"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/TelegramMessenger/tgcalls.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "tgcalls-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj")))))
(define codegen-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/desktop-app/codegen.git")
- (commit "248614b49cd7d5aff69d75a737f2e35b79fbb119")))
- (file-name
- (git-file-name "codegen-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk"))))
+ (let ((commit "248614b49cd7d5aff69d75a737f2e35b79fbb119")
+ (revision "35"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/codegen.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "codegen-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "00f7g2z6xmkbkrmi3q27hscjl44mg66wf9q0mz3rhy3jaa6cfdrk")))))
(define lib-base-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/desktop-app/lib_base.git")
- (commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6")))
- (file-name
- (git-file-name "lib-base-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78"))))
+ (let ((commit "a23c05c44e4f01dc4428f4d75d4db98c59d313a6")
+ (revision "265"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/lib_base.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "lib-base-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "0vh5zgxwalmbnvz8lzlnba87ch8vnpmcz6nvf56w09f3nlxvvq78")))))
(define lib-crl-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/desktop-app/lib_crl.git")
- (commit "3ccf2ed5095442e5874bba8852cb7dc4efeae29f")))
- (file-name
- (git-file-name "lib-crl-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "11my7q54m4lvvlgma6pbdyjxi1cv1adk1gph2j50mh18sqlm8myz"))))
+ (let ((commit "4e620bc383d032aadea8e6af02661f8c76695cec")
+ (revision "16"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/lib_crl.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "lib-crl-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "17bngj247qwq0dg4h37xdi5v1mk22y4yp7sp6ph3irmnz4awah0x")))))
(define lib-lottie-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/desktop-app/lib_lottie.git")
- (commit "0770df009db7928df1d0cad0900dc5110106d229")))
- (file-name
- (git-file-name "lib-lottie-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb"))))
+ (let ((commit "0770df009db7928df1d0cad0900dc5110106d229")
+ (revision "26"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/lib_lottie.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "lib-lottie-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "1gj56ymlbk5dnk82jw674808m511lv9dky8891a5wm4gp3pph5jb")))))
(define lib-qr-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/desktop-app/lib_qr.git")
- (commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189")))
- (file-name
- (git-file-name "lib-qr-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0"))))
+ (let ((commit "2b08c71c6edcfc3e31f7d7f518cc963493b6e189")
+ (revision "7"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/lib_qr.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "lib-qr-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "05hrkmwgrczyjv87r507i2r7m1zr6k2i43mq3my0s6j4szr1rjq0")))))
(define lib-rlottie-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/desktop-app/lib_rlottie.git")
- (commit "0671bf70547381effcf442ec9618e04502a8adbc")))
- (file-name
- (git-file-name "lib-rlottie-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv"))))
+ (let ((commit "0671bf70547381effcf442ec9618e04502a8adbc")
+ (revision "2"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/lib_rlottie.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "lib-rlottie-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv")))))
(define lib-rpl-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/desktop-app/lib_rpl.git")
- (commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617")))
- (file-name
- (git-file-name "lib-rpl-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn"))))
+ (let ((commit "df721be3fa14a27dfc230d2e3c42bb1a7c9d0617")
+ (revision "15"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/lib_rpl.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "lib-rpl-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "15fnv3ssn7rn5d0j52gggdvyqc2wm464678dj7v2x9h8lka2jjxn")))))
(define lib-spellcheck-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/desktop-app/lib_spellcheck.git")
- (commit "68c9b788958904aea7de79f986a0f82ec8c5b094")))
- (file-name
- (git-file-name "lib-spellcheck-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn"))))
+ (let ((commit "68c9b788958904aea7de79f986a0f82ec8c5b094")
+ (revision "187"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/lib_spellcheck.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "lib-spellcheck-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "0d8s4wwk6fxf536mhzq2vb9qw3j0m8nqia7ylvvpsbc4kh09dadn")))))
(define lib-storage-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/desktop-app/lib_storage.git")
- (commit "403df6c4a29562bd417c92d410e49819f5a48cc1")))
- (file-name
- (git-file-name "lib-storage-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5"))))
+ (let ((commit "403df6c4a29562bd417c92d410e49819f5a48cc1")
+ (revision "20"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/lib_storage.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "lib-storage-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "1zxvzfrxbj4d395fzyb5pm9wn3n8jyimxx88cyqjcdd46sx4h7r5")))))
(define lib-tl-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/desktop-app/lib_tl.git")
- (commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb")))
- (file-name
- (git-file-name "lib-tl-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m"))))
+ (let ((commit "45faed44e7f4d11fec79b7a70e4a35dc91ef3fdb")
+ (revision "24"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/lib_tl.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "lib-tl-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "0h43xvzklda02494d466jp52hl8c1kmav9f12dyld10dpf1w6c7m")))))
(define lib-ui-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/desktop-app/lib_ui.git")
- (commit "1b590f9e16eb9571a039f072d6fea66c607e419f")))
- (file-name
- (git-file-name "lib-ui-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f"))))
+ (let ((commit "1b590f9e16eb9571a039f072d6fea66c607e419f")
+ (revision "508"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/lib_ui.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "lib-ui-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "0ighyhfp29h9h8c7vr70pnhcv2xnsr9ln084pssn8hb5z4pmb62f")))))
(define lib-waylandshells-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/desktop-app/lib_waylandshells.git")
- (commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7")))
- (file-name
- (git-file-name "lib-waylandshells-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf"))))
+ (let ((commit "59b0ee55a68976d27f1bf7cec0e11d5939e185e7")
+ (revision "6"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/lib_waylandshells.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "lib-waylandshells-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "0l2xrpc5mvvdlsj333pmkgfvn9wi1ijfdaaz8skfnw9icw52faaf")))))
(define lib-webrtc-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/desktop-app/lib_webrtc.git")
- (commit "ef49f953f12b112008a094a719f40939aaf39db4")))
- (file-name
- (git-file-name "lib-webrtc-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw"))))
+ (let ((commit "ef49f953f12b112008a094a719f40939aaf39db4")
+ (revision "72"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/lib_webrtc.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "lib-webrtc-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "15k4xs3462p3ddp5cn9im3nvdiaijmxir8wxsf5yrj70ghy26ibw")))))
(define lib-webview-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/desktop-app/lib_webview.git")
- (commit "e06427c624515485774e2e2181d4afeb05ad5a67")))
- (file-name
- (git-file-name "lib-webview-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4"))))
+ (let ((commit "e06427c624515485774e2e2181d4afeb05ad5a67")
+ (revision "40"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/lib_webview.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "lib-webview-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "148z7xzfscynwwwqssdsd97npax6yn8zrd64xw8qzbwff2g2r7k4")))))
-(define tgcalls-for-telegram-desktop
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/TelegramMessenger/tgcalls.git")
- (commit "81e97fa52e25b7775b62ce07bb653533d81e91b3")))
- (file-name
- (git-file-name "tgcalls-for-telegram-desktop" %telegram-version))
- (sha256
- (base32
- "0fvad87hyxli83xn19mgf8jjrrh6y6iaig14pckpbkg33vf4wqkj"))))
+(define cmake-helpers-for-telegram-desktop
+ (let ((commit "4d44d822e01b3b5fbec3ce824e01f56aa35d7f72")
+ (revision "261"))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/desktop-app/cmake_helpers.git")
+ (commit commit)))
+ (file-name (git-file-name
+ "cmake-helpers-for-telegram-desktop"
+ (git-version "0" revision commit)))
+ (sha256
+ (base32
+ "0h6cjiqy014h2mz90h1z5a7plb3ihbnds4bja8994ybr1dy3m7m5")))))
(define-public webrtc-for-telegram-desktop
(let ((commit "91d836dc84a16584c6ac52b36c04c0de504d9c34")
@@ -464,7 +528,7 @@ (define-public libtgvoip-for-telegram-desktop
(define-public telegram-desktop
(package
(name "telegram-desktop")
- (version %telegram-version)
+ (version "2.9.3")
(source
(origin
(method git-fetch)