summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/packages/gnome.scm1
-rw-r--r--gnu/packages/rust-crates.scm6
-rw-r--r--gnu/packages/rust-sources.scm80
3 files changed, 86 insertions, 1 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 65d748ea26e..2715b73a4de 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6919,6 +6919,7 @@ side panel;
6919 ;; ".gresource.eog_postasa_plugin" ELF section. 6919 ;; ".gresource.eog_postasa_plugin" ELF section.
6920 (license license:gpl2+))) 6920 (license license:gpl2+)))
6921 6921
6922;; Also update (@ (gnu packages rust-sources) rust-glycin-3) when updating this.
6922(define-public glycin-loaders 6923(define-public glycin-loaders
6923 (package 6924 (package
6924 (name "glycin-loaders") 6925 (name "glycin-loaders")
diff --git a/gnu/packages/rust-crates.scm b/gnu/packages/rust-crates.scm
index 56368d1f728..33a129d59dc 100644
--- a/gnu/packages/rust-crates.scm
+++ b/gnu/packages/rust-crates.scm
@@ -10549,6 +10549,12 @@
10549 (crate-source "glutin_wgl_sys" "0.6.1" 10549 (crate-source "glutin_wgl_sys" "0.6.1"
10550 "0gng2810jb5x133lmy17qifjx6s90lnprm86afg7mfls505y0kic")) 10550 "0gng2810jb5x133lmy17qifjx6s90lnprm86afg7mfls505y0kic"))
10551 10551
10552(define rust-glycin-3.0.7 package:rust-glycin-3)
10553
10554(define rust-glycin-common-1.0.3 package:rust-glycin-3)
10555
10556(define rust-glycin-utils-4.0.4 package:rust-glycin-3)
10557
10552(define rust-gobject-sys-0.10.0 10558(define rust-gobject-sys-0.10.0
10553 (crate-source "gobject-sys" "0.10.0" 10559 (crate-source "gobject-sys" "0.10.0"
10554 "1311d3zbdhl1g7ibj1iy1650513yrhxbjxgfhazn52ii1jv368cm")) 10560 "1311d3zbdhl1g7ibj1iy1650513yrhxbjxgfhazn52ii1jv368cm"))
diff --git a/gnu/packages/rust-sources.scm b/gnu/packages/rust-sources.scm
index 378ac797d1b..1c87eacb0ee 100644
--- a/gnu/packages/rust-sources.scm
+++ b/gnu/packages/rust-sources.scm
@@ -1,6 +1,7 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2025 Hilton Chain <hako@ultrarare.space> 2;;; Copyright © 2025 Hilton Chain <hako@ultrarare.space>
3;;; Copyright © 2023-2025 Efraim Flashner <efraim@flashner.co.il> 3;;; Copyright © 2023-2025 Efraim Flashner <efraim@flashner.co.il>
4;;; Copyright © 2025 Noé Lopez <noelopez@free.fr>
4;;; 5;;;
5;;; This file is part of GNU Guix. 6;;; This file is part of GNU Guix.
6;;; 7;;;
@@ -23,8 +24,10 @@
23 #:use-module (guix packages) 24 #:use-module (guix packages)
24 #:use-module (guix download) 25 #:use-module (guix download)
25 #:use-module (guix git-download) 26 #:use-module (guix git-download)
27 #:use-module (guix search-paths)
26 #:use-module (guix build-system cargo) 28 #:use-module (guix build-system cargo)
27 #:use-module (guix build-system trivial) 29 #:use-module (guix build-system trivial)
30 #:use-module ((guix config) #:select (%storedir))
28 #:use-module (guix utils) 31 #:use-module (guix utils)
29 #:use-module (gnu packages) 32 #:use-module (gnu packages)
30 #:use-module (gnu packages assembly) 33 #:use-module (gnu packages assembly)
@@ -36,7 +39,8 @@
36 #:use-module (gnu packages pkg-config) 39 #:use-module (gnu packages pkg-config)
37 #:use-module (gnu packages python) 40 #:use-module (gnu packages python)
38 #:use-module (gnu packages rust) 41 #:use-module (gnu packages rust)
39 #:use-module (gnu packages textutils)) 42 #:use-module (gnu packages textutils)
43 #:use-module (gnu packages virtualization))
40 44
41;;; 45;;;
42;;; Cargo workspaces and Rust libraries requiring external inputs to unbundle. 46;;; Cargo workspaces and Rust libraries requiring external inputs to unbundle.
@@ -673,6 +677,35 @@ intelligence.")
673 (inputs (cons oniguruma 677 (inputs (cons oniguruma
674 (cargo-inputs 'rust-syntect-5.3)))))) 678 (cargo-inputs 'rust-syntect-5.3))))))
675 679
680(define-public rust-web-view-0.7.3.82d7cbc
681 (let ((commit "82d7cbce6228b1a964673cc0f22944ad808eab42")
682 (revision "0"))
683 (hidden-package
684 (package
685 (name "rust-web-view")
686 (version (git-version "0.7.3" revision commit))
687 (source (origin
688 (method git-fetch)
689 (uri (git-reference
690 (url "https://github.com/Boscop/web-view")
691 (commit commit)))
692 (file-name (git-file-name name version))
693 (sha256
694 (base32
695 "1cl65wabbx9cd97qdmbq22d4whqrdsfykm8pbafh67srqjj1qlvr"))))
696 (build-system cargo-build-system)
697 (arguments
698 (list #:skip-build? #t
699 #:cargo-package-crates ''("webview-sys" "web-view")))
700 (inputs (cargo-inputs 'rust-web-view-0.7.3.82d7cbc))
701 (home-page "https://github.com/Boscop/web-view")
702 (synopsis "Rust bindings for webview.")
703 (description
704 "This library provides a Rust binding to the original implementation of
705webview, a tiny cross-platform library to render web-based GUIs as desktop
706applications.")
707 (license license:expat)))))
708
676(define-public rust-codex-0.0.0.785c0c43 709(define-public rust-codex-0.0.0.785c0c43
677 (let ((commit "785c0c43df941e6997ff3a9e8a9dd48da2661f20") 710 (let ((commit "785c0c43df941e6997ff3a9e8a9dd48da2661f20")
678 (revision "0")) 711 (revision "0"))
@@ -778,3 +811,48 @@ intelligence.")
778 "This package provides the workspace crates for the Zed Codex CLI 811 "This package provides the workspace crates for the Zed Codex CLI
779and runtime for AI-assisted coding.") 812and runtime for AI-assisted coding.")
780 (license license:asl2.0))))) 813 (license license:asl2.0)))))
814
815;; Also update (@ (gnu packages gnome) glycin-loaders) when updating this.
816(define-public rust-glycin-3
817 (package
818 (name "rust-glycin")
819 (version "3.0.7")
820 (source
821 (origin
822 (method git-fetch)
823 (uri (git-reference
824 (url "https://gitlab.gnome.org/GNOME/glycin.git")
825 ;; Rust library version is different from the tagged version.
826 (commit "2.0.7")))
827 (file-name (git-file-name name version))
828 (sha256
829 (base32
830 "0v6szxk5h8a4b28xb0lrhqrq6b4vka2ha4qgpdp35f6c49v9pdyp"))
831 (patches (search-patches "glycin-sandbox-Adapt-bwrap-invocation.patch"))))
832 (build-system cargo-build-system)
833 (arguments
834 (list
835 #:skip-build? #t
836 #:cargo-package-crates ''("glycin-common" "glycin-utils" "glycin")
837 #:phases
838 #~(modify-phases %standard-phases
839 (add-after 'unpack 'set-bin-paths
840 (lambda* (#:key inputs #:allow-other-keys)
841 (substitute* "glycin/src/sandbox.rs"
842 (("@bwrap@")
843 (search-input-file inputs "bin/bwrap"))
844 (("@storedir@")
845 #$%storedir)
846 (("/usr/bin/true")
847 (search-input-file inputs "bin/true"))))))))
848 (inputs (cons* bubblewrap (cargo-inputs 'glycin)))
849 ;; Uses XDG_DATA_DIRS to search for the loaders. See Config::data_dirs() in
850 ;; config.rs. Using a specific search path was discussed in
851 ;; <https://codeberg.org/guix/guix/pulls/1653> and
852 ;; <https://gitlab.gnome.org/GNOME/glycin/-/merge_requests/343>.
853 (native-search-paths (list $XDG_DATA_DIRS))
854 (home-page "https://gitlab.gnome.org/GNOME/glycin")
855 (synopsis "Rust library for sandboxed image decoding")
856 (description "Glycin is a sandbox image decoder for image viewers and
857thumbnails to display untrusted content safely.")
858 (license (list license:mpl2.0 license:lgpl2.1+))))