diff options
author | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
commit | 32787d652460871a79f99b63230f92759e2e0de2 (patch) | |
tree | ce883cac0d602b10b7c005755d035a08197e73a9 /gnu/packages/pantheon.scm | |
parent | 052939c2f6e36de00a5e756ea29a4cc96884a55d (diff) | |
parent | c2396ceb6eb30ac87755eb8b39583403b35fbd12 (diff) | |
download | guix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar guix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar.gz |
Merge branch 'master' into staging
Conflicts:
gnu/local.mk
gnu/packages/gdb.scm
gnu/packages/lisp-xyz.scm
gnu/packages/web-browsers.scm
Diffstat (limited to 'gnu/packages/pantheon.scm')
-rw-r--r-- | gnu/packages/pantheon.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm index aa7074827e..249c27e4db 100644 --- a/gnu/packages/pantheon.scm +++ b/gnu/packages/pantheon.scm @@ -37,7 +37,7 @@ (define-public granite (package (name "granite") - (version "5.4.0") + (version "5.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -46,7 +46,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0acicv3f9gksb352v88lwap8ailjsxdrfknl2xql7blasbjzl2q0")))) + "13qfhq8xndikk6kmybibs6a4ddyp6mhvbsp2yy4qr7aiiyxf7mna")))) (build-system meson-build-system) (arguments `(#:phases |