diff --git a/CONTRIBUTED.org b/CONTRIBUTED.org index 38a7e48..2dbf3e2 100644 --- a/CONTRIBUTED.org +++ b/CONTRIBUTED.org @@ -36,6 +36,15 @@ Here is a directory of packages I've contributed to Guix. - Issue tracker :: https://issues.guix.gnu.org/issue/41293 #+HTML: +*** [[proposed/pantheon.scm][Sideload]] +#+HTML:
+#+HTML: An application for installing Flatpaks.
GNU Guix package for sideload
+ +- Package :: https://guix.gnu.org/packages/sideload-1.1.1/ +- Issue tracker :: https://issues.guix.gnu.org/issue/41293 + +#+HTML:
+ *** [[contributed/importmagic.scm][importmagic]] #+HTML:
#+HTML: Library for adding, removing and managing Python imports
GNU Guix package for python-importmagic
diff --git a/README.org b/README.org index 648b7cb..5780837 100644 --- a/README.org +++ b/README.org @@ -14,13 +14,6 @@ Browse the directory of packages I've contributed [[CONTRIBUTED.org][over here]] #+HTML:
-*** [[proposed/pantheon.scm][Sideload]] -#+HTML:
-#+HTML: An application for installing Flatpaks. - -- Issue tracker :: https://issues.guix.gnu.org/issue/41293 - -#+HTML:
*** [[proposed/pantheon.scm][Appstream]] #+HTML:
#+HTML: The foundation to build software-center applications. diff --git a/contributed/pantheon.scm b/contributed/pantheon.scm index 76c59a1..b6c5204 100644 --- a/contributed/pantheon.scm +++ b/contributed/pantheon.scm @@ -84,3 +84,64 @@ in apps built for the Pantheon desktop.") (description "Calculator is an application for performing simple arithmatic. It is the default calculator application in the Pantheon desktop.") (license license:gpl3))) + +(define-public sideload + (package + (name "sideload") + (version "1.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elementary/sideload") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mlc3nm2navzxm8k1rwpbw4w6mv30lmhqybm8jqxd4v8x7my73vq")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:configure-flags (list (string-append "-Dflatpak=" + (assoc-ref %build-inputs "flatpak") + "/include")) + #:phases + (modify-phases %standard-phases + (add-before 'install 'set-environment-variables + (lambda _ + ;; Disable compiling schemas and updating desktop databases + (setenv "DESTDIR" "/") + #t)) + (add-after 'install 'install-symlinks + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/io.elementary.sideload")) + (link (string-append out "/bin/sideload"))) + (symlink bin link) + #t)))))) + (inputs + `(("flatpak" ,flatpak) + ("glib" ,glib) + ("granite" ,granite) + ("gtk" ,gtk+) + ("hicolor-icon-theme" ,hicolor-icon-theme) + ("libgee" ,libgee) + ("libostree" ,libostree) + ("libxml2" ,libxml2))) + (propagated-inputs + ;; Sideload needs these in the environment to fetch data securely from + ;; Flatpak remotes. + `(("gnupg" ,gnupg) + ("gpgme" ,gpgme))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (home-page "https://github.com/elementary/sideload") + (synopsis "Graphical application to side-load Flatpaks") + (description "Sideload handles flatpakref files, like those you might find +on Flathub or another third-party website providing a Flatpak app for +download.") + (license license:gpl3+))) diff --git a/proposed/pantheon.scm b/proposed/pantheon.scm index 2e254b1..be35809 100644 --- a/proposed/pantheon.scm +++ b/proposed/pantheon.scm @@ -1,5 +1,4 @@ (define-module (proposed pantheon) - #:use-module (contributed pantheon) #:use-module (gnu packages cmake) #:use-module (gnu packages databases) #:use-module (gnu packages freedesktop) @@ -24,67 +23,6 @@ #:use-module (guix packages) #:use-module (guix utils)) -(define-public sideload - (package - (name "sideload") - (version "1.1.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/elementary/sideload.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0mlc3nm2navzxm8k1rwpbw4w6mv30lmhqybm8jqxd4v8x7my73vq")))) - (build-system meson-build-system) - (arguments - `(#:glib-or-gtk? #t - #:configure-flags (list (string-append "-Dflatpak=" - (assoc-ref %build-inputs "flatpak") - "/include")) - #:phases - (modify-phases %standard-phases - (add-before 'install 'set-environment-variables - (lambda _ - ;; Disable compiling schemas and updating desktop databases - (setenv "DESTDIR" "/") - #t)) - (add-after 'install 'install-symlinks - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/io.elementary.sideload")) - (link (string-append out "/bin/sideload"))) - (symlink bin link) - #t)))))) - (inputs - `(("flatpak" ,flatpak) - ("granite" ,granite) - ("gtk" ,gtk+) - ("hicolor-icon-theme" ,hicolor-icon-theme) - ("libostree" ,libostree))) - (propagated-inputs - ;; Sideload needs these in the environment to fetch data securely from - ;; Flatpak remotes. - `(("gnupg" ,gnupg) - ("gpgme" ,gpgme))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("glib" ,glib) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("libgee" ,libgee) - ("libxml2" ,libxml2) - ("pkg-config" ,pkg-config) - ("vala" ,vala))) - (home-page "https://github.com/elementary/sideload") - (synopsis "Graphical application to side-load Flatpaks") - (description "Sideload handles flatpakref files, like those you might find -on Flathub or another third-party website providing a Flatpak app for -download.") - (license license:gpl3+))) - (define-public appstream (package (name "appstream")