diff --git a/nongnu/packages/liquidlauncher.scm b/nongnu/packages/liquidlauncher.scm new file mode 100644 index 00000000..1683b04b --- /dev/null +++ b/nongnu/packages/liquidlauncher.scm @@ -0,0 +1,109 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 YOUR NAME +;;; +;;; This file is not part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +;; define-module +(define-module (nongnu packages liquidbounce liquidlauncher) +(use-modules #:use-module + (guix packages) +(guix download) +((non guix licenses) #:prefix license:) +(non guix build-system trivial binary rust) +;;public +(define-public liquidlauncher + (package + (name "liquidlauncher") + (version version) + (source + (origin + (method url-fetch/tarbomb git-fetch) + (uri (git-reference (string-append + (url "https://github.com/CCBlueX/LiquidLauncher/releases/download/" + version "/liquidlauncher_" version "_" + (%current-system) architecture "." packaging ".tar.gz")) + (commit version))) + (file-name (git-file-name "liquid-launcher")) +;; checksum + (sha256 + (base32 + "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73")))) ;; empty hash + + (snippet + '(begin + (setenv "PATH" (string-append (getenv "PATH") ":" (assoc-ref %build-inputs "node") ":" (assoc-ref %build-inputs "yarn"))) + (zero? (system* "yarn")) + (zero? (system* "yarn" "build")))))) +;; building + (build-system trivial cargo binary gnu) + ;; LiquidLauncher is an AppImage which is ready to run, no need for a build. + ;; We need to specify the location of the binary after unpacking. You will need to adjust this path if it's incorrect. +;; input + (native-inputs + `(("node" ,node) + ("yarn" ,yarn) + ("npm" ,npm) + ("rust" ,rust) + ("runtime" "java-runtime")))))) +;; arguments + (arguments + `(#:install-plan `(("liquidlauncher/LiquidLauncher" "bin/")) + #:tests? #f)) + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'prepare add-after 'unpack 'install-node-dependencies + (chdir "path-to-package.json-in-source") + (lambda _ + (zero? (system* "tar" "-xzf" "LiquidLauncher.tar.gz")) +;; chmod + (chmod target "LiquidLauncher" #o755) + (zero? (system* "./LiquidLauncher" "--appimage-extract" "npm" "install")))) + + (add-after 'install 'install-node-dependencies 'build-tauri 'desktop-integration + (lambda* _ + (zero? (system* "npm" "run" "tauri" "build") + (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (iconsdir (string-append out "/usr/share/icons")) + (desktopfile (string-append + out "/usr/share/applications/liquid-launcher.desktop")) + (bindir (string-append out "/usr/bin")) + (license-symlink (string-append + out "/usr/share/licenses/liquid-launcher"))) + (system* "sed" "-i" "-E" + "s|Exec=AppRun|Exec=env DESKTOPINTEGRATION=false " bindir "|" desktopfile) + (mkdir-p iconsdir) + (install-file "/path/to/license" license-symlink) + (symlink "/opt/liquid-launcher-appimage/LiquidLauncher.AppImage" bindir) + (symlink "/opt/liquid-launcher-appimage/LICENSE" license-symlink) +;; copy + (copy-recursively file source "squashfs-root/usr/share/icons" iconsdir target)))))) + (inputs + `(("fuse2" ,fuse2) + ("zlib" ,zlib))) +;; modules + `(use-modules #:modules ((guix build utils)) + #:builder + (begin + (let* ((source (assoc-ref %build-inputs "source")) + (out (assoc-ref %outputs "out")) + (target (string-append out "/bin/liquidlauncher"))) + (mkdir-p (string-append out "/bin")) +;; properties + (home-page "https://github.com/CCBlueX/LiquidLauncher https://liquidbounce.net") + (synopsis "A LiquidBounce LiquidLauncher launcher for Minecraft, written in Rust using Tauri.client with mod support built from source code keeps it automatically up to date") + (description "LiquidLauncher is the official Minecraft client and launcher for the LiquidBounce mod. It streamlines the installation process and automatically keeps the client up to date.") + (license license:gpl3 gpl3+ expat))) diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index 12d88625..675c6d2c 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -83,7 +83,7 @@ its core.") (define-public signal-desktop (package (name "signal-desktop") - (version "7.57.0") + (version "7.58.0") (source (origin (method url-fetch) @@ -92,7 +92,7 @@ its core.") "https://updates.signal.org/desktop/apt/pool/s/" name "/" name "_" version "_amd64.deb")) (sha256 - (base32 "0xy4xfyx58v0869x0inypy9rgnbcxzrdnfh3r8qq00640wfj9j2c")))) + (base32 "1bhh9z7mclxlzq4pfs695pnkb5x36wm5ihniydvzqqi2g3xjbqam")))) (supported-systems '("x86_64-linux")) (build-system chromium-binary-build-system) (arguments diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index 86d4b26d..8e0b234d 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -228,9 +228,9 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\ (define-public nvidia-driver (package (name "nvidia-driver") - (version "570.153.02") + (version "570.169") (source (nvidia-source - version "1dp1bpx4scx7lzqnajn75q5zjlbfvpjych3ils7zlxlmyvj8d20l")) + version "0r9phz9rv0n208f61lvv3m492387mjmqk4gph3ww7iawg53shcjz")) (build-system copy-build-system) (arguments (list #:modules '((guix build copy-build-system) @@ -627,9 +627,9 @@ add @code{nvidia_drm.modeset=1} to @code{kernel-arguments} as well.") (define-public nvidia-settings (package (name "nvidia-settings") - (version "570.153.02") + (version "570.169") (source (nvidia-settings-source - name version "1qvvsrhlswpnv9aldqnynjch8y1x219ccsk3w4rfrw3swxm9qvp6")) + name version "15sxzczan9kq55hyiq73arls95lsdakpfbbzf4b6741fjfgd8kfh")) (build-system gnu-build-system) (arguments (list #:tests? #f ;no test suite diff --git a/nonguix/transformations.scm b/nonguix/transformations.scm index 90dab066..f3b5e771 100644 --- a/nonguix/transformations.scm +++ b/nonguix/transformations.scm @@ -2,6 +2,8 @@ ;;; Copyright © 2025 Hilton Chain (define-module (nonguix transformations) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (guix channels) #:use-module (guix diagnostics) #:use-module (guix gexp) @@ -74,10 +76,11 @@ FIXME: GUIX-SOURCE? is disabled by default due to performance issue." (cons %nonguix-signing-key (guix-configuration-authorized-keys config))) (substitute-urls - `(,@(guix-configuration-substitute-urls config) - ,@(if substitutes? - '("https://substitutes.nonguix.org") - '())))))))))) + (delete-duplicates + `(,@(guix-configuration-substitute-urls config) + ,@(if substitutes? + '("https://substitutes.nonguix.org") + '()))))))))))) (define* (nonguix-transformation-linux #:key (linux linux) (firmware (list linux-firmware)) @@ -128,11 +131,13 @@ TODO: Xorg configuration." (operating-system (inherit os) (kernel-arguments - `("modprobe.blacklist=nouveau" - ,@(if kernel-mode-setting? - '("nvidia_drm.modeset=1") - '()) - ,@(operating-system-user-kernel-arguments os))) + (delete-duplicates + (cons* "modprobe.blacklist=nouveau" + (string-append + "nvidia_drm.modeset=" (if kernel-mode-setting? "1" "0")) + (remove + (cut string-prefix? "nvidia_drm.modeset=" <>) + (operating-system-user-kernel-arguments os))))) (services `(,(or (assoc-ref %presets driver) (leave