From 27549494994f1ceb1d9c99144c0fc490705a5bb4 Mon Sep 17 00:00:00 2001 From: arkhan Date: Tue, 18 Jul 2023 20:30:31 -0500 Subject: [PATCH 1/6] nongnu: hplip-plugin: Update hash --- nongnu/packages/printers.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nongnu/packages/printers.scm b/nongnu/packages/printers.scm index 93abf1e5..6238e808 100644 --- a/nongnu/packages/printers.scm +++ b/nongnu/packages/printers.scm @@ -36,7 +36,7 @@ (package-version hplip) "-plugin.run")) (sha256 (base32 - "100zyvmqlp71v8691s9wfzrllqq8aaqj9a4pki36gqs1bn4429h3"))))) + "1396d9skaq5c5vxxi331nc81yhm9daws7awq0rcn1faq89mvygps"))))) (package-native-inputs hplip))) (arguments (substitute-keyword-arguments (package-arguments hplip) From 303b1288c7734b6cb0fa39945fac5a76ec08b3cc Mon Sep 17 00:00:00 2001 From: arkhan Date: Wed, 19 Jul 2023 08:45:40 -0500 Subject: [PATCH 2/6] nongnu: hplip-plugin: Add FIXME --- nongnu/packages/printers.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nongnu/packages/printers.scm b/nongnu/packages/printers.scm index 6238e808..252bf69f 100644 --- a/nongnu/packages/printers.scm +++ b/nongnu/packages/printers.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2021 Kahka F ;;; Copyright © 2021 Jonathan Brielmaier + (define-module (nongnu packages printers) #:use-module (gnu packages) #:use-module (gnu packages cups) @@ -34,6 +35,8 @@ (method url-fetch) (uri (string-append "https://developers.hp.com/sites/default/files/hplip-" (package-version hplip) "-plugin.run")) + ;; FIXME: this hash needs to be manually updated each time + ;; upstream is updated. (sha256 (base32 "1396d9skaq5c5vxxi331nc81yhm9daws7awq0rcn1faq89mvygps"))))) From 4c57d237c917030a995b00243494c5f7397e03cc Mon Sep 17 00:00:00 2001 From: arkhan Date: Thu, 26 Oct 2023 10:56:17 -0500 Subject: [PATCH 3/6] nongnu: anydesk: Update to 6.3.0 --- nongnu/packages/anydesk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/anydesk.scm b/nongnu/packages/anydesk.scm index 655e0e2f..27b6a48c 100644 --- a/nongnu/packages/anydesk.scm +++ b/nongnu/packages/anydesk.scm @@ -21,14 +21,14 @@ (define-public anydesk (package (name "anydesk") - (version "6.1.1") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append "https://download.anydesk.com/linux/anydesk-" version "-amd64.tar.gz")) (sha256 (base32 - "1ai58fsivb8al1279bayl800qavy0kfj40rjhf87g902ap3p4bhh")))) + "0lp4zvbdriwbzfnvblbbpzxsrs0l425rha9qjs9sy6ff6myk7qxi")))) (build-system binary-build-system) (arguments `(#:validate-runpath? #f From ccea5f501fc1069d80933acf01525234fc9a375e Mon Sep 17 00:00:00 2001 From: arkhan Date: Wed, 16 Jul 2025 21:57:30 -0500 Subject: [PATCH 4/6] nongnu: anydesk: Update to 7.0.2. * nongnu/packages/anydesk.scm (anydesk-next): Update to 7.0.2. [source]: Update uri and hash for new tar.gz format. [arguments]: <#:patchelf-plan>: Add missing dependencies (harfbuzz, libepoxy, at-spi2-core, libxkbcommon, wayland, libxcursor, libxcomposite, libxinerama, libthai, libpng, pixman, libjpeg-turbo, util-linux:lib, libffi, pcre2, libxau, libxdmcp, elogind, bzip2, expat, graphite2, libdatrie, libcap). <#:install-plan>: Update file paths for new archive structure. <#:phases>: Update 'binary-unpack' phase to handle tar.gz format instead of .deb. Adjust 'fix-desktop-entry' phase to set GDK_BACKEND=x11 environment variable. Add 'install-icon' phase for proper icon installation. [inputs]: Add all new required dependencies for version 7.0.2. --- nongnu/packages/anydesk.scm | 165 ++++++++++++++++++++++-------------- 1 file changed, 103 insertions(+), 62 deletions(-) diff --git a/nongnu/packages/anydesk.scm b/nongnu/packages/anydesk.scm index 78e16f1b..49ec592e 100644 --- a/nongnu/packages/anydesk.scm +++ b/nongnu/packages/anydesk.scm @@ -11,41 +11,46 @@ #:use-module (gnu packages gl) #:use-module (gnu packages fontutils) #:use-module (gnu packages polkit) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages image) + #:use-module (gnu packages linux) + #:use-module (gnu packages libffi) + #:use-module (gnu packages pcre) #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg) + #:use-module (gnu packages xdisorg) #:use-module (guix download) #:use-module (guix packages) #:use-module (nonguix build-system binary) + #:use-module (nongnu packages anydesk) #:use-module (nonguix licenses)) (define-public anydesk (package (name "anydesk") - (version "6.3.2-1") - (source (origin - (method url-fetch) - (uri (string-append "https://download.anydesk.com/linux/anydesk_" - version "_amd64.deb")) - (sha256 - (base32 - "13b5ab4a889vz39d36f45mhv3mlaxb305wsh3plk3dbjcrkkkirb")))) + (version "7.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.anydesk.com/linux/anydesk-" + version "-amd64.tar.gz")) + (sha256 + (base32 + "0jmrhcic5kmhxlw7rxw0d37fp9lzzz10qs8ar0dqjgfhbynkskm8")))) (build-system binary-build-system) (arguments `(#:validate-runpath? #f - #:strip-binaries? #f ;; For some reason it breaks the program + #:strip-binaries? #f #:patchelf-plan - `(("usr/bin/anydesk" ("atk" + `(("anydesk" ("atk" "cairo" "fontconfig" "freetype" "gcc:lib" "gdk-pixbuf" "glib" - "glu" "gtk+" - "gtkglext" - "libice" - "libsm" "libx11" "libxcb" "libxdamage" @@ -53,62 +58,102 @@ "libxfixes" "libxi" "libxkbfile" - "libxmu" "libxrandr" "libxrender" - "libxsts" - "libxt" - "mesa" - "minizip" + "libxtst" + "libxcursor" + "libxcomposite" + "libxinerama" + "libxau" + "libxdmcp" "pango" - "pangox-compat" + "harfbuzz" + "libepoxy" + "pixman" + "libjpeg-turbo" + "libpng" + "libthai" + "graphite2" + "libdatrie" "polkit" - "polkit-gnome" - "pulseaudio"))) + "zlib" + "dbus" + "at-spi2-core" + "libxkbcommon" + "wayland" + "util-linux:lib" + "libffi" + "pcre2" + "elogind" + "bzip2" + "expat" + "libcap"))) #:install-plan - `(("usr/bin/anydesk" "/bin/") - ("usr/share/polkit-1/actions/com.anydesk.anydesk.policy" "/etc/polkit-1/actions/") - ("usr/share/icons" "/share/icons/")) + `(("anydesk" "/bin/") + ("polkit-1/com.anydesk.anydesk.policy" "/share/polkit-1/actions/") + ("icons" "/share/icons/") + ("anydesk.desktop" "/share/applications/") + ("copyright" "/share/licenses/anydesk/")) #:phases (modify-phases %standard-phases (replace 'binary-unpack (lambda* (#:key source #:allow-other-keys) (let* ((files (filter (lambda (f) - (not (string=? (basename f) "environment-variables"))) - (find-files (getcwd)))) - (binary-file (car files))) - (when (= 1 (length files)) - (mkdir "binary") - (chdir "binary") - (invoke "ar" "x" binary-file) - (invoke "tar" "xvf" "data.tar.gz") - (invoke "rm" "-rfv" "control.tar.gz" - "data.tar.gz" - binary-file - "debian-binary"))))) - (add-after 'install 'install-desktop-entry + (not (string=? (basename f) "environment-variables"))) + (find-files (getcwd)))) + (binary-file (car files))) + (when (= 1 (length files)) + (mkdir "binary") + (chdir "binary") + (invoke "tar" "xvf" binary-file) + (chdir (string-append "anydesk-" ,(package-version this-package))))))) + (add-after 'install 'fix-desktop-entry (lambda* (#:key outputs #:allow-other-keys) - (let* ((desktop-file "usr/share/applications/anydesk.desktop") - (out (assoc-ref outputs "out")) - (applications (string-append out "/share/applications"))) + (let* ((out (assoc-ref outputs "out")) + (desktop-file (string-append out "/share/applications/anydesk.desktop"))) (substitute* desktop-file - (("^Exec=.*") (string-append "Exec=" out "/bin/anydesk\n")) - (("^Icon=.*") "Icon=anydesk\n")) - (install-file desktop-file applications)) - #t))))) + (("^Exec=anydesk") (string-append "Exec=env GDK_BACKEND=x11 " out "/bin/anydesk")) + (("^Icon=anydesk") "Icon=anydesk")) + #t))) + (add-after 'install 'install-icon + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (icon-src "icons/hicolor/scalable/apps/anydesk.svg") + (icon-dest (string-append out "/share/pixmaps/anydesk.svg"))) + (when (file-exists? icon-src) + (install-file icon-src (dirname icon-dest))) + #t)))))) (inputs `(("atk" ,atk) ("cairo" ,cairo) ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("gcc:lib" ,gcc "lib") ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) - ("glu" ,glu) - ("gtk+" ,gtk+-2) - ("gtkglext" ,gtkglext) - ("libice" ,libice) - ("libsm" ,libsm) + ("gtk+" ,gtk+) + ("pango" ,pango) + ("harfbuzz" ,harfbuzz) + ("libepoxy" ,libepoxy) + ("pixman" ,pixman) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libthai" ,libthai) + ("graphite2" ,graphite2) + ("libdatrie" ,libdatrie) + ("gcc:lib" ,gcc "lib") + ("polkit" ,polkit) + ("zlib" ,zlib) + ("dbus" ,dbus) + ("at-spi2-core" ,at-spi2-core) + ("libxkbcommon" ,libxkbcommon) + ("wayland" ,wayland) + ("util-linux:lib" ,util-linux "lib") + ("libffi" ,libffi) + ("pcre2" ,pcre2) + ("elogind" ,elogind) + ("bzip2" ,bzip2) + ("expat" ,expat) + ("libcap" ,libcap) ("libx11" ,libx11) ("libxcb" ,libxcb) ("libxdamage" ,libxdamage) @@ -116,19 +161,15 @@ ("libxfixes" ,libxfixes) ("libxi" ,libxi) ("libxkbfile" ,libxkbfile) - ("libxmu" ,libxmu) ("libxrandr" ,libxrandr) ("libxrender" ,libxrender) - ("libxsts" ,libxtst) - ("libxt" ,libxt) - ("mesa" ,mesa) - ("minizip" ,minizip) - ("pango" ,pango) - ("pangox-compat" ,pangox-compat) - ("polkit" ,polkit) - ("polkit-gnome" ,polkit-gnome) - ("pulseaudio" ,pulseaudio))) - (synopsis "Remote desktop software") + ("libxtst" ,libxtst) + ("libxcursor" ,libxcursor) + ("libxcomposite" ,libxcomposite) + ("libxinerama" ,libxinerama) + ("libxau" ,libxau) + ("libxdmcp" ,libxdmcp))) + (synopsis "Remote desktop software") (supported-systems '("x86_64-linux")) (description "Connect to a computer remotely, be it from the other end of the office or halfway around the world. AnyDesk ensures secure and reliable From f65133ad09afd5b07bdd9690f3e7c7df8710488a Mon Sep 17 00:00:00 2001 From: arkhan Date: Wed, 30 Jul 2025 08:09:23 -0500 Subject: [PATCH 5/6] nongnu: hplip-plugin: Add FIXME --- nongnu/packages/printers.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/printers.scm b/nongnu/packages/printers.scm index 5ee6f210..65b4ea02 100644 --- a/nongnu/packages/printers.scm +++ b/nongnu/packages/printers.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2021 Kahka F ;;; Copyright © 2021, 2023 Jonathan Brielmaier + (define-module (nongnu packages printers) #:use-module (gnu packages) #:use-module (gnu packages cups) @@ -155,7 +156,7 @@ installed=1 eula=1 version=~A -" #$(package-version hplip)))) +" #$(package-version hplip (substitute* (string-append out "/etc/hp/hplip.conf") - (("/usr") out))))))))))) + (("/usr") out))))))))))))))) From 19d78e808b3cb88064a4aa0797e8aec2526a9e12 Mon Sep 17 00:00:00 2001 From: arkhan Date: Wed, 30 Jul 2025 08:11:45 -0500 Subject: [PATCH 6/6] nongnu: anydesk: Update to 6.3.0 --- nongnu/packages/anydesk.scm | 165 ++++++++++++++++++++++-------------- 1 file changed, 103 insertions(+), 62 deletions(-) diff --git a/nongnu/packages/anydesk.scm b/nongnu/packages/anydesk.scm index 78e16f1b..49ec592e 100644 --- a/nongnu/packages/anydesk.scm +++ b/nongnu/packages/anydesk.scm @@ -11,41 +11,46 @@ #:use-module (gnu packages gl) #:use-module (gnu packages fontutils) #:use-module (gnu packages polkit) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages image) + #:use-module (gnu packages linux) + #:use-module (gnu packages libffi) + #:use-module (gnu packages pcre) #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg) + #:use-module (gnu packages xdisorg) #:use-module (guix download) #:use-module (guix packages) #:use-module (nonguix build-system binary) + #:use-module (nongnu packages anydesk) #:use-module (nonguix licenses)) (define-public anydesk (package (name "anydesk") - (version "6.3.2-1") - (source (origin - (method url-fetch) - (uri (string-append "https://download.anydesk.com/linux/anydesk_" - version "_amd64.deb")) - (sha256 - (base32 - "13b5ab4a889vz39d36f45mhv3mlaxb305wsh3plk3dbjcrkkkirb")))) + (version "7.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.anydesk.com/linux/anydesk-" + version "-amd64.tar.gz")) + (sha256 + (base32 + "0jmrhcic5kmhxlw7rxw0d37fp9lzzz10qs8ar0dqjgfhbynkskm8")))) (build-system binary-build-system) (arguments `(#:validate-runpath? #f - #:strip-binaries? #f ;; For some reason it breaks the program + #:strip-binaries? #f #:patchelf-plan - `(("usr/bin/anydesk" ("atk" + `(("anydesk" ("atk" "cairo" "fontconfig" "freetype" "gcc:lib" "gdk-pixbuf" "glib" - "glu" "gtk+" - "gtkglext" - "libice" - "libsm" "libx11" "libxcb" "libxdamage" @@ -53,62 +58,102 @@ "libxfixes" "libxi" "libxkbfile" - "libxmu" "libxrandr" "libxrender" - "libxsts" - "libxt" - "mesa" - "minizip" + "libxtst" + "libxcursor" + "libxcomposite" + "libxinerama" + "libxau" + "libxdmcp" "pango" - "pangox-compat" + "harfbuzz" + "libepoxy" + "pixman" + "libjpeg-turbo" + "libpng" + "libthai" + "graphite2" + "libdatrie" "polkit" - "polkit-gnome" - "pulseaudio"))) + "zlib" + "dbus" + "at-spi2-core" + "libxkbcommon" + "wayland" + "util-linux:lib" + "libffi" + "pcre2" + "elogind" + "bzip2" + "expat" + "libcap"))) #:install-plan - `(("usr/bin/anydesk" "/bin/") - ("usr/share/polkit-1/actions/com.anydesk.anydesk.policy" "/etc/polkit-1/actions/") - ("usr/share/icons" "/share/icons/")) + `(("anydesk" "/bin/") + ("polkit-1/com.anydesk.anydesk.policy" "/share/polkit-1/actions/") + ("icons" "/share/icons/") + ("anydesk.desktop" "/share/applications/") + ("copyright" "/share/licenses/anydesk/")) #:phases (modify-phases %standard-phases (replace 'binary-unpack (lambda* (#:key source #:allow-other-keys) (let* ((files (filter (lambda (f) - (not (string=? (basename f) "environment-variables"))) - (find-files (getcwd)))) - (binary-file (car files))) - (when (= 1 (length files)) - (mkdir "binary") - (chdir "binary") - (invoke "ar" "x" binary-file) - (invoke "tar" "xvf" "data.tar.gz") - (invoke "rm" "-rfv" "control.tar.gz" - "data.tar.gz" - binary-file - "debian-binary"))))) - (add-after 'install 'install-desktop-entry + (not (string=? (basename f) "environment-variables"))) + (find-files (getcwd)))) + (binary-file (car files))) + (when (= 1 (length files)) + (mkdir "binary") + (chdir "binary") + (invoke "tar" "xvf" binary-file) + (chdir (string-append "anydesk-" ,(package-version this-package))))))) + (add-after 'install 'fix-desktop-entry (lambda* (#:key outputs #:allow-other-keys) - (let* ((desktop-file "usr/share/applications/anydesk.desktop") - (out (assoc-ref outputs "out")) - (applications (string-append out "/share/applications"))) + (let* ((out (assoc-ref outputs "out")) + (desktop-file (string-append out "/share/applications/anydesk.desktop"))) (substitute* desktop-file - (("^Exec=.*") (string-append "Exec=" out "/bin/anydesk\n")) - (("^Icon=.*") "Icon=anydesk\n")) - (install-file desktop-file applications)) - #t))))) + (("^Exec=anydesk") (string-append "Exec=env GDK_BACKEND=x11 " out "/bin/anydesk")) + (("^Icon=anydesk") "Icon=anydesk")) + #t))) + (add-after 'install 'install-icon + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (icon-src "icons/hicolor/scalable/apps/anydesk.svg") + (icon-dest (string-append out "/share/pixmaps/anydesk.svg"))) + (when (file-exists? icon-src) + (install-file icon-src (dirname icon-dest))) + #t)))))) (inputs `(("atk" ,atk) ("cairo" ,cairo) ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("gcc:lib" ,gcc "lib") ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) - ("glu" ,glu) - ("gtk+" ,gtk+-2) - ("gtkglext" ,gtkglext) - ("libice" ,libice) - ("libsm" ,libsm) + ("gtk+" ,gtk+) + ("pango" ,pango) + ("harfbuzz" ,harfbuzz) + ("libepoxy" ,libepoxy) + ("pixman" ,pixman) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libthai" ,libthai) + ("graphite2" ,graphite2) + ("libdatrie" ,libdatrie) + ("gcc:lib" ,gcc "lib") + ("polkit" ,polkit) + ("zlib" ,zlib) + ("dbus" ,dbus) + ("at-spi2-core" ,at-spi2-core) + ("libxkbcommon" ,libxkbcommon) + ("wayland" ,wayland) + ("util-linux:lib" ,util-linux "lib") + ("libffi" ,libffi) + ("pcre2" ,pcre2) + ("elogind" ,elogind) + ("bzip2" ,bzip2) + ("expat" ,expat) + ("libcap" ,libcap) ("libx11" ,libx11) ("libxcb" ,libxcb) ("libxdamage" ,libxdamage) @@ -116,19 +161,15 @@ ("libxfixes" ,libxfixes) ("libxi" ,libxi) ("libxkbfile" ,libxkbfile) - ("libxmu" ,libxmu) ("libxrandr" ,libxrandr) ("libxrender" ,libxrender) - ("libxsts" ,libxtst) - ("libxt" ,libxt) - ("mesa" ,mesa) - ("minizip" ,minizip) - ("pango" ,pango) - ("pangox-compat" ,pangox-compat) - ("polkit" ,polkit) - ("polkit-gnome" ,polkit-gnome) - ("pulseaudio" ,pulseaudio))) - (synopsis "Remote desktop software") + ("libxtst" ,libxtst) + ("libxcursor" ,libxcursor) + ("libxcomposite" ,libxcomposite) + ("libxinerama" ,libxinerama) + ("libxau" ,libxau) + ("libxdmcp" ,libxdmcp))) + (synopsis "Remote desktop software") (supported-systems '("x86_64-linux")) (description "Connect to a computer remotely, be it from the other end of the office or halfway around the world. AnyDesk ensures secure and reliable