gnu: Use version-major+minor in gnome and gtk.

* gnu/packages/gnome.scm (gnome-desktop, gnome-doc-utils,
  libgnome-keyring, evince, gsettings-desktop-schemas,
  gnome-icon-theme, libnotify, lipeas, glade, libcroco, libgsf,
  librsvg, libidl, orbit2, gconf, gnome-mime-data, gnome-vfs,
  libgnome, libart-lgpl, libgnomecanvas, libgnomeui, libglade,
  libgnomeprint, libgnomeprintui, libbonoboui, goffice, gnumeric): Use
  version-major+minor.
  (shared-mime-info, hicolor-icon-theme): Wrap long uri lines.
* gnu/packages/gtk.scm (atk, pangox-compat, gtksourceview, gdk-pixbuf,
  at-spi2-core, at-spi2-atk, gtk+-2, gtk+, pangomm, atkmm, gtkmm,
  gtkmm-2): Use version-major+minor.
This commit is contained in:
Eric Bavier 2014-11-04 05:02:51 -06:00
parent c37a74bd3e
commit b38e45d813
2 changed files with 114 additions and 121 deletions

View file

@ -2,6 +2,7 @@
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -90,7 +91,8 @@ (define-public gnome-desktop
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/3.10/"
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
@ -131,7 +133,8 @@ (define-public gnome-doc-utils
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/0.20/"
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
@ -170,10 +173,9 @@ (define-public libgnome-keyring
(version "3.6.0")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/libgnome-keyring/3.6/libgnome-keyring-"
version
".tar.xz"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"0c4qrjpmv1hqga3xv6wsq2z10x2n78qgw7q3k3s01y1pggxkgjkd"))))
@ -202,8 +204,9 @@ (define-public evince
(version "3.6.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/evince/3.6/evince-"
version ".tar.xz"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"1da1pij030dh8mb0pr0jnyszgsbjnh8lc17rj5ii52j3kmbv51qv"))))
@ -270,7 +273,7 @@ (define-public gsettings-desktop-schemas
(origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(string-copy version 0 (string-rindex version #\.)) "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
@ -323,7 +326,7 @@ (define-public gnome-icon-theme
(origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(string-copy version 0 (string-rindex version #\.)) "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
@ -348,8 +351,8 @@ (define-public shared-mime-info
(version "1.2")
(source (origin
(method url-fetch)
(uri (string-append "http://freedesktop.org/~hadess/shared-mime-info-"
version ".tar.xz"))
(uri (string-append "http://freedesktop.org/~hadess/"
"shared-mime-info-" version ".tar.xz"))
(sha256
(base32
"0y5vi0vr6rbhvfzcfg57cfskn362bpvcpca9cy598nmr87i6lld5"))))
@ -380,8 +383,8 @@ (define-public hicolor-icon-theme
(source
(origin
(method url-fetch)
(uri (string-append "http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-"
version ".tar.gz"))
(uri (string-append "http://icon-theme.freedesktop.org/releases/"
"hicolor-icon-theme-" version ".tar.gz"))
(sha256
(base32
"0wzc7g4ldb2l8zc0x2785ck808c03i857jji942ikakyc68adp4y"))))
@ -403,7 +406,7 @@ (define-public libnotify
(origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(string-copy version 0 (string-rindex version #\.)) "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
@ -435,7 +438,7 @@ (define-public libpeas
(origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(substring version 0 (string-rindex version #\.)) "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
@ -494,12 +497,11 @@ (define-public glade3
(package
(name "glade")
(version "3.8.4")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(substring version 0 (string-rindex version #\.)) "/"
name "3-" version ".tar.xz"))
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "3-" version ".tar.xz"))
(sha256
(base32 "021xgq2l18w3rvwms9aq2idm0fk66vwb4f777gs0qh3ap5shgbn7"))))
(build-system gnu-build-system)
@ -523,10 +525,9 @@ (define-public libcroco
(version "0.6.8")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/libcroco/0.6/libcroco-"
version
".tar.xz"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa"))))
@ -554,8 +555,9 @@ (define-public libgsf
(version "1.14.30")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/libgsf/1.14/libgsf-"
version ".tar.xz"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"0w2v1a9sxsymd1mcy4mwsz4r6za9iwq69rj86nb939p41d4c6j6b"))))
@ -586,9 +588,9 @@ (define-public librsvg
(version "2.40.2")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/librsvg/2.40/librsvg-"
version ".tar.xz"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"071959yjb2i1bja7ciy4bmpnd6fn2is9jjqsvvvnsqwl69j9n128"))))
@ -638,10 +640,9 @@ (define-public libidl
(source (origin
(method url-fetch)
(uri (let ((upstream-name "libIDL"))
(string-append
"mirror://gnome/sources/" upstream-name "/" (string-take version 3) "/" upstream-name "-"
version
".tar.bz2")))
(string-append "mirror://gnome/sources/" upstream-name "/"
(version-major+minor version) "/"
upstream-name "-" version ".tar.bz2")))
(sha256
(base32
"08129my8s9fbrk0vqvnmx6ph4nid744g5vbwphzkaik51664vln5"))))
@ -668,10 +669,9 @@ (define-public orbit2
(source (origin
(method url-fetch)
(uri (let ((upstream-name "ORBit2"))
(string-append
"mirror://gnome/sources/" upstream-name "/" (string-take version 4) "/" upstream-name "-"
version
".tar.bz2")))
(string-append "mirror://gnome/sources/" upstream-name "/"
(version-major+minor version) "/"
upstream-name "-" version ".tar.bz2")))
(sha256
(base32 "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"))))
(build-system gnu-build-system)
@ -755,10 +755,9 @@ (define-public gconf
(method url-fetch)
(uri
(let ((upstream-name "GConf"))
(string-append
"mirror://gnome/sources/" upstream-name "/" (string-take version 3) "/" upstream-name "-"
version
".tar.xz")))
(string-append "mirror://gnome/sources/" upstream-name "/"
(version-major+minor version) "/"
upstream-name "-" version ".tar.xz")))
(sha256
(base32 "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"))))
(build-system gnu-build-system)
@ -784,10 +783,9 @@ (define-public gnome-mime-data
(version "2.18.0")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/" name "/" (string-take version 4) "/" name "-"
version
".tar.bz2"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.bz2"))
(sha256
(base32
"1mvg8glb2a40yilmyabmb7fkbzlqd3i3d31kbkabqnq86xdnn69p"))))
@ -809,10 +807,9 @@ (define-public gnome-vfs
(version "2.24.4")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/" name "/" (string-take version 4) "/" name "-"
version
".tar.bz2"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.bz2"))
(sha256
(base32 "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2"))))
(build-system gnu-build-system)
@ -856,11 +853,9 @@ (define-public libgnome
(version "2.32.1")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/" name "/"
(string-take version 4) "/" name "-"
version
".tar.bz2"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.bz2"))
(sha256
(base32
"197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj"))))
@ -904,10 +899,9 @@ (define-public libart-lgpl
(source (origin
(method url-fetch)
(uri (let ((upstream-name "libart_lgpl"))
(string-append
"mirror://gnome/sources/" upstream-name "/"
(string-take version 3) "/" upstream-name "-" version
".tar.bz2")))
(string-append "mirror://gnome/sources/" upstream-name "/"
(version-major+minor version) "/"
upstream-name "-" version ".tar.bz2")))
(sha256
(base32
"1yknfkyzgz9s616is0l9gp5aray0f2ry4dw533jgzj8gq5s1xhgx"))))
@ -928,10 +922,9 @@ (define-public libgnomecanvas
(version "2.30.3")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/" name "/" (string-take version 4) "/" name "-"
version
".tar.gz"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.gz"))
(sha256
(base32
"1nhnq4lfkk8ljkdafscwaggx0h95mq0rxnd7zgqyq0xb6kkqbjm8"))))
@ -955,10 +948,9 @@ (define-public libgnomeui
(version "2.24.5")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/" name "/" (string-take version 4) "/" name "-"
version
".tar.bz2"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.bz2"))
(sha256
(base32
"03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf"))))
@ -989,10 +981,9 @@ (define-public libglade
(version "2.6.4")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/" name "/" (string-take version 3) "/" name "-"
version
".tar.bz2"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.bz2"))
(sha256
(base32
"1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4"))))
@ -1016,10 +1007,9 @@ (define-public libgnomeprint
(version "2.8.2")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/" name "/" (string-take version 3) "/" name "-"
version
".tar.bz2"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.bz2"))
(sha256
(base32
"129ka3nn8gx9dlfry17ib79azxk45wzfv5rgqzw6dwx2b5ns8phm"))))
@ -1045,10 +1035,9 @@ (define-public libgnomeprintui
(version "2.8.2")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/" name "/" (string-take version 3) "/" name "-"
version
".tar.bz2"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.bz2"))
(sha256
(base32
"1ivipk7r61rg90p9kp889j28xlyyj6466ypvwa4jvnrcllnaajsw"))))
@ -1075,10 +1064,9 @@ (define-public libbonoboui
(version "2.24.5")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/" name "/"
(version-major+minor version)
"/" name "-" version ".tar.bz2"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.bz2"))
(sha256
(base32
"1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs"))))
@ -1123,10 +1111,9 @@ (define-public goffice
(version "0.10.14")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/" name "/"
(string-take version 4) "/" name "-"
version ".tar.xz"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32 "0kj0iwng6w4axm7yv2zy7myn5dhw5ilrlq2pzrjlm9i852ikqy60"))))
(build-system gnu-build-system)
@ -1154,10 +1141,9 @@ (define-public gnumeric
(version "1.12.17")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/" name "/"
(string-take version 4) "/" name "-" version
".tar.xz"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"18bvc3phghr4p5440fp8hm6gvp53d3mqs9cyc637zpmk0b6bcp7c"))))

View file

@ -2,6 +2,7 @@
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -20,6 +21,7 @@
(define-module (gnu packages gtk)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
@ -45,8 +47,8 @@ (define-public atk
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(string-take version 4) "/" name "-"
version ".tar.xz"))
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"1c2hbg66wfvibsz2ia0ri48yr62751fn950i97c53j3b0fjifsb3"))))
@ -178,10 +180,9 @@ (define-public pangox-compat
(version "0.0.2")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/" name "/" (string-take version 3) "/" name "-"
version
".tar.xz"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"0ip0ziys6mrqqmz4n71ays0kf5cs1xflj1gfpvs4fgy2nsrr482m"))))
@ -206,9 +207,9 @@ (define-public gtksourceview
(version "2.10.5") ; This is the last version which builds against gtk+2
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gtksourceview/"
(string-take version 4) "/gtksourceview-"
version ".tar.bz2"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.bz2"))
(sha256
(base32
"07hrabhpl6n8ajz10s0d960jdwndxs87szxyn428mpxi8cvpg1f5"))))
@ -260,8 +261,9 @@ (define-public gdk-pixbuf
(version "2.28.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gdk-pixbuf/2.28/gdk-pixbuf-"
version ".tar.xz"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"05s6ksvy1yan6h6zny9n3bmvygcnzma6ljl6i0z9cci2xg116c8q"))))
@ -289,8 +291,8 @@ (define-public at-spi2-core
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(string-take version 4) "/" name "-"
version ".tar.xz"))
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"1ns44yibdgcwzwri7sr075hfs5rh5lgxkh71247a0822az3mahcn"))))
@ -319,8 +321,8 @@ (define-public at-spi2-atk
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(string-take version 4) "/" name "-"
version ".tar.xz"))
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"150sqc21difazqd53llwfdaqnwfy73bic9hia41xpfy9kcpzz9yy"))))
@ -348,8 +350,8 @@ (define-public gtk+-2
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(string-take version 4) "/" name "-"
version ".tar.xz"))
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"1qyw73pr9ryqhir2h1kbx3vm70km4dg2fxrgkrdlpv0rvlb94bih"))))
@ -383,12 +385,13 @@ (define-public gtk+-2
(define-public gtk+
(package (inherit gtk+-2)
(name "gtk+")
(version "3.10.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gtk+/"
(string-take version 4) "/gtk+-"
version ".tar.xz"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"1f3a7r3z7i9xh5imlfpfcgyydzkj2fnd0v6ylvqxij0yzfbnhbn1"))))
@ -534,8 +537,9 @@ (define-public pangomm
(version "2.34.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/pangomm/2.34/pangomm-"
version ".tar.xz"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"0hcyvv7c5zmivprdam6cp111i6hn2y5jsxzk00m6j9pncbzvp0hf"))))
@ -559,8 +563,9 @@ (define-public atkmm
(version "2.22.7")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/atkmm/2.22/atkmm-"
version ".tar.xz"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"06zrf2ymml2dzp53sss0d4ch4dk9v09jm8rglnrmwk4v81mq9gxz"))))
@ -581,8 +586,9 @@ (define-public gtkmm
(version "3.9.16")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gtkmm/3.9/gtkmm-"
version ".tar.xz"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"0yf8wwv4w02p70nrxsbs0nhm0w4gkn2wggdjygd8vif062anf1rs"))))
@ -608,12 +614,13 @@ (define-public gtkmm
(define-public gtkmm-2
(package (inherit gtkmm)
(name "gtkmm")
(version "2.24.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gtkmm/"
(string-take version 4) "/gtkmm-"
version ".tar.xz"))
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
"0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369"))))