From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id wDIKA4QH8V+TSgAA0tVLHw (envelope-from ) for ; Sat, 02 Jan 2021 23:53:40 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4NFoOoMH8V86aQAAB5/wlQ (envelope-from ) for ; Sat, 02 Jan 2021 23:53:39 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7D6C994043B for ; Sat, 2 Jan 2021 23:53:39 +0000 (UTC) Received: from localhost ([::1]:44654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kvqiI-0002Oy-DU for larch@yhetil.org; Sat, 02 Jan 2021 18:53:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kvqhl-0001pQ-EO for guix-patches@gnu.org; Sat, 02 Jan 2021 18:53:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49649) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kvqhl-000372-7I for guix-patches@gnu.org; Sat, 02 Jan 2021 18:53:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kvqhl-0006gd-6Y for guix-patches@gnu.org; Sat, 02 Jan 2021 18:53:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45616] [PATCH 8/9] gnu: gnome-xyz.scm: Reorder packages. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Jan 2021 23:53:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45616 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45616@debbugs.gnu.org Received: via spool by 45616-submit@debbugs.gnu.org id=B45616.160963155825600 (code B ref 45616); Sat, 02 Jan 2021 23:53:05 +0000 Received: (at 45616) by debbugs.gnu.org; 2 Jan 2021 23:52:38 +0000 Received: from localhost ([127.0.0.1]:32946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvqhJ-0006ej-KE for submit@debbugs.gnu.org; Sat, 02 Jan 2021 18:52:38 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:19805) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvqhG-0006e8-0u for 45616@debbugs.gnu.org; Sat, 02 Jan 2021 18:52:34 -0500 Received: from localhost.localdomain (217-149-174-13.nat.highway.telekom.at [217.149.174.13]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4D7dwv4lJHz3wVn for <45616@debbugs.gnu.org>; Sun, 3 Jan 2021 00:52:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1609631551; bh=t26WeSMnJLa+TwAgoU9Oxitq26lY8yOmZjyEH7UqulA=; h=From:To:Subject:Date:In-Reply-To:References; b=k+nHh1LvibpOWIADg37l5qxWQ7e+fV8cZaRKGCceT//yQIHQl2lXtpbYi4cdFQT9h rkJHX0xURHG+HIFB1VhM+hzKjzE1C3cujE1N5VGN27XQ0I4Xm2KOyphSHhXR1lbqW0 zMqbYkn5eAphe73j9zh1TefGxCjvGy7cwN0unm6o= From: Leo Prikler Date: Sun, 3 Jan 2021 00:51:57 +0100 Message-Id: <20210102235157.9726-8-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210102235157.9726-1-leo.prikler@student.tugraz.at> References: <20210102235157.9726-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 3.77 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=tugraz.at header.s=mailrelay header.b=k+nHh1Lv; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 7D6C994043B X-Spam-Score: 3.77 X-Migadu-Scanner: scn1.migadu.com X-TUID: NyMIXeqhAbNm Make it so that icon themes, shell extensions and GTK themes are grouped in that order. * gnu/packages/gnome-xyz.scm (matcha-theme): Move before numix-gtk-theme. (papirus-icon-theme): Move after moka-icon-theme. --- gnu/packages/gnome-xyz.scm | 154 ++++++++++++++++++------------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 4c7ab729bc..c07834f27e 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -49,52 +49,6 @@ #:use-module (gnu packages web) #:use-module (gnu packages xml)) -(define-public matcha-theme - (package - (name "matcha-theme") - (version "2021-01-01") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/vinceliuice/Matcha-gtk-theme") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1pa6ra87wlq0gwz4n03l6xv0pxiamr5dygycvppms8v6xyc2aa0r")))) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let* ((out (assoc-ref %outputs "out")) - (source (assoc-ref %build-inputs "source")) - (bash (assoc-ref %build-inputs "bash")) - (coreutils (assoc-ref %build-inputs "coreutils")) - (themesdir (string-append out "/share/themes"))) - (setenv "PATH" - (string-append coreutils "/bin:" - (string-append bash "/bin:"))) - (copy-recursively source (getcwd)) - (patch-shebang "install.sh") - (mkdir-p themesdir) - (invoke "./install.sh" "-d" themesdir) - #t)))) - (inputs - `(("gtk-engines" ,gtk-engines))) - (native-inputs - `(("bash" ,bash) - ("coreutils" ,coreutils))) - (synopsis "Flat design theme for GTK 3, GTK 2 and GNOME-Shell") - (description "Matcha is a flat Design theme for GTK 3, GTK 2 and -Gnome-Shell which supports GTK 3 and GTK 2 based desktop environments -like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.") - (home-page "https://github.com/vinceliuice/matcha") - (license license:gpl3+))) - (define-public arc-icon-theme (package (name "arc-icon-theme") @@ -219,6 +173,37 @@ simple and consistent.") (license (list license:gpl3+ license:cc-by-sa4.0)))) +(define-public papirus-icon-theme + (package + (name "papirus-icon-theme") + (version "20210101") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme") + (commit version))) + (sha256 + (base32 + "0w6qg3zjhfvjg1gg5inranf8ianb4mrp0jm9qgi6hg87ig1rashs")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f + #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'bootstrap) + (delete 'configure) + (delete 'build)))) + (native-inputs + `(("gtk+:bin" ,gtk+ "bin"))) + (home-page "https://git.io/papirus-icon-theme") + (synopsis "Fork of Paper icon theme with a lot of new icons and a few extras") + (description "Papirus is a fork of the icon theme Paper with a lot of new icons +and a few extra features.") + (license license:gpl3))) + (define-public gnome-shell-extension-appindicator (package (name "gnome-shell-extension-appindicator") @@ -683,6 +668,52 @@ like GNOME, Unity, Budgie, Pantheon, XFCE, Mate, etc.") Shimmer Project. It supports GNOME, Unity, and Xfce.") (license (list license:gpl2+ license:cc-by-sa3.0)))) +(define-public matcha-theme + (package + (name "matcha-theme") + (version "2021-01-01") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/vinceliuice/Matcha-gtk-theme") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pa6ra87wlq0gwz4n03l6xv0pxiamr5dygycvppms8v6xyc2aa0r")))) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (source (assoc-ref %build-inputs "source")) + (bash (assoc-ref %build-inputs "bash")) + (coreutils (assoc-ref %build-inputs "coreutils")) + (themesdir (string-append out "/share/themes"))) + (setenv "PATH" + (string-append coreutils "/bin:" + (string-append bash "/bin:"))) + (copy-recursively source (getcwd)) + (patch-shebang "install.sh") + (mkdir-p themesdir) + (invoke "./install.sh" "-d" themesdir) + #t)))) + (inputs + `(("gtk-engines" ,gtk-engines))) + (native-inputs + `(("bash" ,bash) + ("coreutils" ,coreutils))) + (synopsis "Flat design theme for GTK 3, GTK 2 and GNOME-Shell") + (description "Matcha is a flat Design theme for GTK 3, GTK 2 and +Gnome-Shell which supports GTK 3 and GTK 2 based desktop environments +like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.") + (home-page "https://github.com/vinceliuice/matcha") + (license license:gpl3+))) + (define-public numix-gtk-theme (package (name "numix-gtk-theme") @@ -721,37 +752,6 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.") (define-public numix-theme (deprecated-package "numix-theme" numix-gtk-theme)) -(define-public papirus-icon-theme - (package - (name "papirus-icon-theme") - (version "20210101") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme") - (commit version))) - (sha256 - (base32 - "0w6qg3zjhfvjg1gg5inranf8ianb4mrp0jm9qgi6hg87ig1rashs")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (arguments - '(#:tests? #f - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'bootstrap) - (delete 'configure) - (delete 'build)))) - (native-inputs - `(("gtk+:bin" ,gtk+ "bin"))) - (home-page "https://git.io/papirus-icon-theme") - (synopsis "Fork of Paper icon theme with a lot of new icons and a few extras") - (description "Papirus is a fork of the icon theme Paper with a lot of new icons -and a few extra features.") - (license license:gpl3))) - (define-public vala-language-server (package (name "vala-language-server") -- 2.29.2