diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-08 22:07:15 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-13 02:04:41 -0400 |
commit | ccbbe127213ab2f26163c54835727cf76417f8f4 (patch) | |
tree | 9b8b0cf082b859a7ac832f9286f92bf13821bf35 | |
parent | 00ca5ce621656f46f0e7221a12e793b54b5cc503 (diff) | |
download | guix-ccbbe127213ab2f26163c54835727cf76417f8f4.tar.gz guix-ccbbe127213ab2f26163c54835727cf76417f8f4.zip |
gnu: cambalache: Update to 0.10.3.
* gnu/packages/gnome.scm (cambalache): Update to 0.10.3 and fix indentation.
[phases]{patch-source}: Use format to double-quote string.
-rw-r--r-- | gnu/packages/gnome.scm | 174 |
1 files changed, 87 insertions, 87 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cccd63fd80..438d326f46 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3285,95 +3285,95 @@ compiles to GTKBuilder XML.") (define-public cambalache (package - (name "cambalache") - (version "0.10.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.gnome.org/jpu/cambalache") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1mw5gk98zx03yal3p8slaqwhwkc9p2vnh0cssnmg6ivxsjscqhgz")))) - (build-system meson-build-system) - (arguments - (list - #:glib-or-gtk? #t - #:imported-modules `((guix build python-build-system) - ,@%meson-build-system-modules) - #:modules '((guix build meson-build-system) - ((guix build python-build-system) #:prefix python:) - (guix build utils)) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "cambalache/cmb_view.py" - (("GLib\\.find_program_in_path\\('(.*)'\\)" all cmd) - (string-append "'" - (search-input-file inputs - (string-append "/bin/" cmd)) - "'"))))) - (add-after 'unpack 'patch-build - (lambda _ - (substitute* "postinstall.py" - (("update-desktop-database") "true")))) - (add-after 'wrap 'python-wrap (assoc-ref python:%standard-phases 'wrap)) - (delete 'check) - (add-after 'install 'add-install-to-pythonpath - (assoc-ref python:%standard-phases 'add-install-to-pythonpath)) - (add-after 'add-install-to-pythonpath 'pre-check - (lambda _ - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1"))) - (add-after 'pre-check 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (with-directory-excursion ".." - (invoke "python3" "-m" "pytest"))))) - (add-after 'glib-or-gtk-wrap 'wrap-typelib - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each - (lambda (prog) - (unless (wrapped-program? prog) - (wrap-program prog - `("GI_TYPELIB_PATH" suffix - (,(string-append out "/lib/girepository-1.0") - ,(getenv "GI_TYPELIB_PATH"))) - ;; icons and schemas - `("XDG_DATA_DIRS" suffix - #$(map - (lambda (input) - (file-append (this-package-input input) "/share")) - '("adwaita-icon-theme" "hicolor-icon-theme" - "gsettings-desktop-schemas"))) - ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Cambalache to - ;; load its own icons in pure environments. - `("GDK_PIXBUF_MODULE_FILE" = - (,(getenv "GDK_PIXBUF_MODULE_FILE")))))) - (find-files (string-append out "/bin"))))))))) - (inputs (list bash-minimal - adwaita-icon-theme hicolor-icon-theme - gsettings-desktop-schemas - gtk - `(,gtk+ "bin") ; broadwayd - `(,gtk "bin") - libadwaita - libhandy - (librsvg-for-system) - python python-pygobject python-lxml - webkitgtk-with-libsoup2)) - (native-inputs (list `(,glib "bin") gobject-introspection - gettext-minimal pkg-config - python-pytest xorg-server-for-tests)) - (home-page "https://gitlab.gnome.org/jpu/cambalache") - (synopsis "Rapid application development tool") - (description "Cambalache is a rapid application development (RAD) tool for + (name "cambalache") + (version "0.10.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/jpu/cambalache") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nq9bvly4dm1xnh90z3b4c5455qpdgm3jgz2155vg2ai23f22vsy")))) + (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + #:imported-modules `((guix build python-build-system) + ,@%meson-build-system-modules) + #:modules '((guix build meson-build-system) + ((guix build python-build-system) #:prefix python:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "cambalache/cmb_view.py" + (("GLib\\.find_program_in_path\\('(.*)'\\)" all cmd) + (format #f "~s" (search-input-file + inputs (string-append "bin/" cmd))))))) + (add-after 'unpack 'patch-build + (lambda _ + (substitute* "postinstall.py" + (("update-desktop-database") "true")))) + (add-after 'wrap 'python-wrap (assoc-ref python:%standard-phases 'wrap)) + (delete 'check) + (add-after 'install 'add-install-to-pythonpath + (assoc-ref python:%standard-phases 'add-install-to-pythonpath)) + (add-after 'add-install-to-pythonpath 'pre-check + (lambda _ + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1"))) + (add-after 'pre-check 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion ".." + (invoke "python3" "-m" "pytest"))))) + (add-after 'glib-or-gtk-wrap 'wrap-typelib + (lambda _ + (for-each + (lambda (prog) + (unless (wrapped-program? prog) + (wrap-program prog + `("GI_TYPELIB_PATH" suffix + (,(string-append #$output "/lib/girepository-1.0") + ,(getenv "GI_TYPELIB_PATH"))) + ;; icons and schemas + `("XDG_DATA_DIRS" suffix + #$(map + (lambda (input) + (file-append (this-package-input input) "/share")) + '("adwaita-icon-theme" "hicolor-icon-theme" + "gsettings-desktop-schemas"))) + ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Cambalache to + ;; load its own icons in pure environments. + `("GDK_PIXBUF_MODULE_FILE" = + (,(getenv "GDK_PIXBUF_MODULE_FILE")))))) + (find-files (string-append #$output "/bin")))))))) + (inputs + (list bash-minimal + adwaita-icon-theme hicolor-icon-theme + gsettings-desktop-schemas + gtk + `(,gtk+ "bin") ; broadwayd + `(,gtk "bin") + libadwaita + libhandy + (librsvg-for-system) + python + python-pygobject + python-lxml + webkitgtk-with-libsoup2)) + (native-inputs (list `(,glib "bin") gobject-introspection + gettext-minimal pkg-config + python-pytest xorg-server-for-tests)) + (home-page "https://gitlab.gnome.org/jpu/cambalache") + (synopsis "Rapid application development tool") + (description "Cambalache is a rapid application development (RAD) tool for Gtk 4 and 3 with a clear model-view-controller (MVC) design and data model first philosophy.") - (license (list license:lgpl2.1 - license:gpl2)))) ; tools + (license (list license:lgpl2.1 + license:gpl2)))) ; tools (define-public libcroco (package |