Merge into staging: various gnome-related updates

Taken from https://github.com/NixOS/nixpkgs/pull/14290
This commit is contained in:
Vladimír Čunát 2016-04-20 16:47:53 +02:00
commit 4d37411b35
11 changed files with 37 additions and 34 deletions

View file

@ -1,11 +1,13 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "cantarell-fonts-0.0.17";
stdenv.mkDerivation rec {
major = "0.0";
minor = "24";
name = "cantarell-fonts-${major}.${minor}";
src = fetchurl {
url = mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.17.tar.xz;
sha256 = "0kx05fw1i11zcqx5yv9y9iprpl49k51sibz86bc58a50n1w6gcwn";
url = "mirror://gnome/sources/cantarell-fonts/${major}/${name}.tar.xz";
sha256 = "0r4jnc2x9yncf40lixjb1pqgpq8rzbi2fz33pshlqzjgx2d69bcw";
};
meta = {

View file

@ -2,15 +2,15 @@
, jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }:
let
ver_maj = "2.32";
ver_min = "3";
ver_maj = "2.34";
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "gdk-pixbuf-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
sha256 = "0cfh87aqyqbfcwpbv1ihgmgfcn66il5q2n8yjyl8gxkjmkqp2rrb";
sha256 = "0yc8indbl3hf18z6x6kjg59xp9sngm1d8vmz4c7bs6g27qw5npnm";
};
outputs = [ "dev" "out" "docdev" ];

View file

@ -1,13 +1,12 @@
{ stdenv, fetchgit, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
, librsvg, pango, gtk, bzip2, intltool, libtool, automake, autoconf, json_glib }:
stdenv.mkDerivation rec {
name = "gegl-0.3.0-20140619";
name = "gegl-0.3.6";
src = fetchgit {
url = "https://git.gnome.org/browse/gegl";
sha256 = "1rjmv2y7z34zrnlqczmmh0bm724iszzdf6jpibszxnp3w0npwjrb";
rev = "0014eb1bad50244314ed09592fe57efa9322678c";
src = fetchurl {
url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2";
sha256 = "08m7dlf2kwmp7jw3qskwxas192swhn1g4jcd8aldg9drfjygprvh";
};
configureScript = "./autogen.sh";

View file

@ -39,8 +39,8 @@ let
ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
'';
ver_maj = "2.46";
ver_min = "2";
ver_maj = "2.48";
ver_min = "0";
in
stdenv.mkDerivation rec {
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
sha256 = "5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db";
sha256 = "0d3w2hblrw7vvpx60l1kbvb830ygn3v8zhwdz65cc5593j9ycjvl";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;

View file

@ -7,7 +7,7 @@
# In that case its about 6MB which could be separated
let
ver_maj = "1.46";
ver_maj = "1.48";
ver_min = "0";
in
with stdenv.lib;
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
sha256 = "6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233";
sha256 = "0xsqwxhfqzr79av89mg766kxpb2i41bd0vwspk01xjdzrnn5l9zs";
};
outputs = [ "dev" "out" ];

View file

@ -11,8 +11,8 @@ assert cupsSupport -> cups != null;
with stdenv.lib;
let
ver_maj = "3.18";
ver_min = "5";
ver_maj = "3.20";
ver_min = "3";
version = "${ver_maj}.${ver_min}";
in
stdenv.mkDerivation rec {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
sha256 = "107aeb9a4244ce3c044becdd6dffc32d83202595181597180d4c736302a71852";
sha256 = "3834f3bf23b260b3e5ebfea41102e2026a8af29e36c3620edf4a5cf05e82f694";
};
outputs = [ "dev" "out" ];

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, glib, pkgconfig, gobjectIntrospection, dbus }:
stdenv.mkDerivation rec {
name = "json-glib-${minVer}.2";
minVer = "1.0";
name = "json-glib-${minVer}.0";
minVer = "1.2";
src = fetchurl {
url = "mirror://gnome/sources/json-glib/${minVer}/${name}.tar.xz";
sha256 = "887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a";
sha256 = "1lx7p1c7cl21byvfgw92n8dhm09vi6qxrs0zkx9dg3y096zdzmlr";
};
configureflags= "--with-introspection";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, nasm, autoreconfHook }:
{ stdenv, fetchurl, nasm }:
stdenv.mkDerivation rec {
name = "libjpeg-turbo-1.4.2";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
outputs = [ "dev" "out" "doc" "bin" ];
buildInputs = [ autoreconfHook nasm ];
nativeBuildInputs = [ nasm ];
enableParallelBuilding = true;

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4 }:
let
ver_maj = "2.6"; # odd major numbers are unstable
ver_min = "2";
ver_maj = "2.8"; # odd major numbers are unstable
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "libsigc++-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/libsigc++/${ver_maj}/${name}.tar.xz";
sha256 = "fdace7134c31de792c17570f9049ca0657909b28c4c70ec4882f91a03de54437";
sha256 = "0lcnzzdq6718znfshs1hflpwqq6awbzwdyp4kv5lfaf54z880jbp";
};
patches = [(fetchpatch {
url = "https://anonscm.debian.org/cgit/collab-maint/libsigc++-2.0.git/plain"

View file

@ -2,11 +2,11 @@
, gobjectIntrospection, valaSupport ? true, vala }:
stdenv.mkDerivation rec {
name = "telepathy-glib-0.24.0";
name = "telepathy-glib-0.24.1";
src = fetchurl {
url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
sha256 = "ae0002134991217f42e503c43dea7817853afc18863b913744d51ffa029818cf";
sha256 = "1symyzbjmxvksn2ifdkk50lafjm2llf2sbmky062gq2pz3cg23cy";
};
configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings";

View file

@ -1,11 +1,13 @@
{ stdenv, fetchurl, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }:
stdenv.mkDerivation rec {
name = "pygobject-3.18.2";
major = "3.20";
minor = "0";
name = "pygobject-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/pygobject/3.18/${name}.tar.xz";
sha256 = "0prc3ky7g50ixmfxbc7zf43fw6in4hw2q07667hp8swi2wassg1a";
url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz";
sha256 = "0ikzh3l7g1gjh8jj8vg6mdvrb25svp63gxcam4m0i404yh0lgari";
};
buildInputs = [ python pkgconfig glib gobjectIntrospection ];