Moves sideload to contributed

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: </details>
 
+*** [[proposed/pantheon.scm][Sideload]]
+#+HTML: <details>
+#+HTML: <summary>An application for installing Flatpaks.<br/><a href="https://repology.org/tools/project-by?repo=gnuguix&name_type=binname&target_page=project_versions&name=sideload"><img src="https://repology.org/tools/project-by?repo=gnuguix&name_type=binname&target_page=badge_version_for_repo&name=sideload" alt="GNU Guix package for sideload"></a></summary>
+
+- Package :: https://guix.gnu.org/packages/sideload-1.1.1/
+- Issue tracker :: https://issues.guix.gnu.org/issue/41293
+
+#+HTML: </details>
+
 *** [[contributed/importmagic.scm][importmagic]]
 #+HTML: <details>
 #+HTML: <summary>Library for adding, removing and managing Python imports<br/><a href="https://repology.org/tools/project-by?repo=gnuguix&name_type=binname&target_page=project_versions&name=python-importmagic"><img src="https://repology.org/tools/project-by?repo=gnuguix&name_type=binname&target_page=badge_version_for_repo&name=python-importmagic" alt="GNU Guix package for python-importmagic"></a></summary>

README.org

@@ -14,13 +14,6 @@ Browse the directory of packages I've contributed [[CONTRIBUTED.org][over here]]
 
 #+HTML: </details>
 
-*** [[proposed/pantheon.scm][Sideload]]
-#+HTML: <details>
-#+HTML: <summary>An application for installing Flatpaks.</summary>
-
-- Issue tracker :: https://issues.guix.gnu.org/issue/41293
-
-#+HTML: </details>
 *** [[proposed/pantheon.scm][Appstream]]
 #+HTML: <details>
 #+HTML: <summary>The foundation to build software-center applications.</summary>

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+)))

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")