Skip to content

Commit

Permalink
Moves granite 5.5.0 to contributed
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Prior committed Nov 4, 2020
1 parent e36cdcf commit 58e83e2
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 56 deletions.
6 changes: 4 additions & 2 deletions CONTRIBUTED.org
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ Here is a directory of packages I've contributed to Guix.
#+HTML: <details>
#+HTML: <summary>An extension to gtk+ used in elementary OS applications.<br/><a href="https://repology.org/tools/project-by?repo=gnuguix&name_type=binname&target_page=project_versions&name=granite"><img src="https://repology.org/tools/project-by?repo=gnuguix&name_type=binname&target_page=badge_version_for_repo&name=granite" alt="GNU Guix package for granite"></a></summary>

- Package :: https://guix.gnu.org/packages/granite-5.4.0/
- Issue tracker :: https://issues.guix.gnu.org/issue/41293
- Package :: https://guix.gnu.org/packages/granite-5.5.0/
- Issues ::
+ https://issues.guix.gnu.org/issue/41293
+ https://issues.guix.gnu.org/issue/44357
#+HTML: </details>

*** [[contributed/pantheon.scm][Pantheon Calculator]]
Expand Down
8 changes: 0 additions & 8 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@ Browse the directory of packages I've contributed [[CONTRIBUTED.org][over here]]

** Proposed packages 🚚📦📨

*** [[proposed/pantheon.scm][granite 5.5.0]]
#+HTML: <details>
#+HTML: <summary>An extension to gtk+ used in elementary OS applications.</summary>

- Issue tracker :: https://issues.guix.gnu.org/issue/44357

#+HTML: </details>

*** [[proposed/esbuild.scm][esbuild 0.8.0]]
#+HTML: <details>
#+HTML: <summary>Bundler and transpiler for js & ts.</summary>
Expand Down
28 changes: 19 additions & 9 deletions contributed/pantheon.scm
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,31 @@
(define-public granite
(package
(name "granite")
(version "5.3.1")
(version "5.5.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/elementary/granite/archive/"
version ".tar.gz"))
(sha256 (base32 "1dash69rii1zpr2smmc89gkwnl6jj4sfpkin9r1afy20xcf8fhrh"))))
(method git-fetch)
(uri (git-reference
(url "https://github.com/elementary/granite")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"13qfhq8xndikk6kmybibs6a4ddyp6mhvbsp2yy4qr7aiiyxf7mna"))))
(build-system meson-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-icon-cache
(lambda _
(setenv "DESTDIR" "/")
#t)))))
(inputs
`(("gtk" ,gtk+)
("gtk+-bin" ,gtk+ "bin"))) ; for gtk-update-icon-cache
`(("glib" ,glib)
("gtk" ,gtk+)
("libgee" ,libgee)))
(native-inputs
`(("gettext" ,gettext-minimal)
("glib" ,glib)
("gobject-introspection" ,gobject-introspection)
("libgee" ,libgee)
("pkg-config" ,pkg-config)
("vala" ,vala)))
(home-page "https://github.com/elementary/granite")
Expand Down
37 changes: 0 additions & 37 deletions proposed/pantheon.scm
Original file line number Diff line number Diff line change
Expand Up @@ -23,43 +23,6 @@
#:use-module (guix packages)
#:use-module (guix utils))

(define-public granite
(package
(name "granite")
(version "5.5.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/elementary/granite")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"13qfhq8xndikk6kmybibs6a4ddyp6mhvbsp2yy4qr7aiiyxf7mna"))))
(build-system meson-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-icon-cache
(lambda _
(setenv "DESTDIR" "/")
#t)))))
(inputs
`(("glib" ,glib)
("gtk" ,gtk+)
("libgee" ,libgee)))
(native-inputs
`(("gettext" ,gettext-minimal)
("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config)
("vala" ,vala)))
(home-page "https://github.com/elementary/granite")
(synopsis "Library that extends GTK with common widgets and utilities")
(description "Granite is a companion library for GTK+ and GLib. Among other
things, it provides complex widgets and convenience functions designed for use
in apps built for the Pantheon desktop.")
(license license:lgpl3+)))

(define-public appstream
(package
(name "appstream")
Expand Down

0 comments on commit 58e83e2

Please sign in to comment.