From 90d6fcd59d4cdbe936016110d9d6fc4b510282d6 Mon Sep 17 00:00:00 2001 From: nomike Date: Wed, 14 May 2025 23:48:49 +0200 Subject: [PATCH] gnu: Remove duplicate package tgs2png. The exact same package is also defined in gnu/packages/telegram.scm * gnu/packages/animation.scm (tgs2png): Remove variable. * gnu/packages/emacs-xyz.scm: Add import (gnu packages telegram). Change-Id: I53984b6ba0dbfe72e95ad0ec157b1c7b9ab81e15 Signed-off-by: Danny Milosavljevic --- gnu/packages/animation.scm | 31 ------------------------------- gnu/packages/emacs-xyz.scm | 7 +++++++ 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index ebafe0aea76..1ce546d4b4b 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -380,37 +380,6 @@ lets you create traditional hand-drawn animations (cartoons) using both bitmap and vector graphics.") (license license:gpl2))) -(define-public tgs2png - (let ((commit "25c15b7c2ca3b1a580a383d9d3cb13bf8531d04a") - (revision "0")) - (package - (name "tgs2png") - (version (git-version "0.3.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/zevlg/tgs2png") - (commit commit))) - (sha256 - (base32 "0camvzapkfvr9v0nkk96n26rdmw0g8wbpv41i5l03j6bzdgm4myl")) - (file-name (git-file-name "tgs2png" version)) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "rlottie") - #t)))) - (arguments '(#:tests? #f)) - (build-system cmake-build-system) - (inputs - (list rlottie libpng)) - (native-inputs - (list pkg-config)) - (home-page "https://github.com/zevlg/tgs2png") - (synopsis "Convert Telegram's animated stickers to PNG") - (description "Convert Telegram's animated stickers in TGS format into series of PNG images.") - (license license:gpl3+)))) - (define-public swftools ;; Last release of swftools was 0.9.2 on 2012-04-21 - it is really old and ;; does not compile with what's available in guix, master on the other hand diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3fc9a5d5fc3..a21e14855fc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -299,6 +299,7 @@ #:use-module (gnu packages erlang) #:use-module (gnu packages statistics) #:use-module (gnu packages libcanberra) + #:use-module (gnu packages telegram) #:use-module (gnu packages texinfo) #:use-module (gnu packages text-editors) #:use-module (gnu packages virtualization) @@ -17738,6 +17739,12 @@ ack, ag, helm and pt.") (sha256 (base32 "0l9p6yiv8w9s0rpa4fyrp9gw1dgwpyr9fmkhs53bhc6v9x7br8ix")))) (build-system emacs-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'die + (lambda _ + (exit 1)))))) (propagated-inputs (list emacs-async emacs-popup)) (home-page "https://emacs-helm.github.io/helm/")