01/04: gnu: ungoogled-chromium: Inline %PACKAGE-VERSION.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 3163bc5f44a1e173922c105ca67609f7d806afec
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Jun 26 13:50:20 2020 +0200

    gnu: ungoogled-chromium: Inline %PACKAGE-VERSION.
    
    * gnu/packages/chromium.scm (%chromium-version, package-revision,
    %package-version): Remove.
    (ungoogled-chromium)[version, source]: Adjust accordingly.
---
 gnu/packages/chromium.scm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index ac45bef..d9ba53d 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -254,14 +254,9 @@
   ;; run the Blink performance tests, just remove everything to save ~24MiB.
   '("third_party/blink/perf_tests"))
 
-(define %chromium-version "83.0.4103.116")
 (define %ungoogled-revision "f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d")
 (define %debian-revision "debian/81.0.4044.92-1")
 (define %gentoo-revision "55ef09d6709f4e4cbe23418e4ade0f219fa2fa1f")
-(define package-revision "0")
-(define %package-version (string-append %chromium-version "-"
-                                        package-revision "."
-                                        (string-take %ungoogled-revision 7)))
 
 (define (gentoo-patch name revision hash)
   (origin
@@ -410,13 +405,14 @@
 (define-public ungoogled-chromium
   (package
     (name "ungoogled-chromium")
-    (version %package-version)
+    (version (string-append "83.0.4103.116-0."
+                            (string-take %ungoogled-revision 7)))
     (synopsis "Graphical web browser")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://commondatastorage.googleapis.com";
                                   "/chromium-browser-official/chromium-"
-                                  %chromium-version ".tar.xz"))
+                                  (car (string-split version #\-)) ".tar.xz"))
               (sha256
                (base32
                 "1hravbi1lazmab2mih465alfzji1kzy38zya1visbwz9zs6pw35v"))