diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 17:37:59 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 17:37:59 +0100 |
commit | 69a0de865e8c2171d484e0e8e1ccf8fb16485c49 (patch) | |
tree | 1d17072e22a77909ae533a4e601676893e4d0875 /pkgs/development/libraries/gtkmm | |
parent | a5110391ddf0cb739f69eb34c723433ce7bae1c6 (diff) |
gtkmm*: update, enable tests
Also add myself as a maintainer to be able to monitor all gtk2/3 deps easily.
Diffstat (limited to 'pkgs/development/libraries/gtkmm')
-rw-r--r-- | pkgs/development/libraries/gtkmm/2.x.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/gtkmm/3.x.nix | 14 |
2 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index ec7f01a8be5e7..c7ae2ee53126b 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -5,14 +5,16 @@ stdenv.mkDerivation rec { src = fetchurl_gnome { project = "gtkmm"; - major = "2"; minor = "24"; patchlevel = "2"; extension = "xz"; - sha256 = "0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369"; + major = "2"; minor = "24"; patchlevel = "4"; extension = "xz"; + sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4"; }; nativeBuildInputs = [pkgconfig]; propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ]; + doCheck = true; + meta = { description = "C++ interface to the GTK+ graphical user interface library"; @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; - maintainers = [stdenv.lib.maintainers.raskin]; + maintainers = with stdenv.lib.maintainers; [ raskin vcunat ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 5c4a13fe507c5..8649abec6378b 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,17 +1,23 @@ { stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: +let + ver_maj = "3.10"; + ver_min = "1"; +in stdenv.mkDerivation rec { - name = "gtkmm-3.7.12"; # gnome 3.8 release; stable 3.6 has problems with our new glibc + name = "gtkmm-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/gtkmm/3.7/${name}.tar.xz"; - sha256 = "05nrilm34gid7kqlq09hcdd7942prn2vbr1qgqvdhgy4x8pvz9p9"; + url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz"; + sha256 = "0f1587pc6x8hn268vqj5zr4dvyisj5zd9zpsfxyfm1pkbjmcv9bg"; }; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; + doCheck = true; + meta = { description = "C++ interface to the GTK+ graphical user interface library"; @@ -29,7 +35,7 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; - maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; + maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ]; platforms = stdenv.lib.platforms.linux; }; } |