From c9fe0d779c7ad11d327df0764bcf96326f43610a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 19 Apr 2016 14:45:46 +0200 Subject: [PATCH 01/12] libjpeg(-turbo): drop unneeded autoreconf, fix cross --- pkgs/development/libraries/libjpeg-turbo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 79cf45a8005..da4d3a9822f 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -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; From 7629cd6b34c5aac801655e2b021aa7007ea15045 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 3 Apr 2016 08:06:27 +0200 Subject: [PATCH 02/12] libsigcxx: 2.6.2 -> 2.8.0 --- pkgs/development/libraries/libsigcxx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index 1171fa079cf..e062e2db5c2 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -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" From 9c8148dbab84527ff6fec76345487f4c73b521a0 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 29 Mar 2016 19:51:18 +0200 Subject: [PATCH 03/12] glib: 2.46.1 -> 2.48.0 --- pkgs/development/libraries/glib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 120d398bd44..b3b9dfcef16 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -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; From 39af1c76e12222ddf365cd3380ff36e7fc013e51 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 31 Mar 2016 07:25:44 +0200 Subject: [PATCH 04/12] gobject-introspection: 1.46.0 -> 1.48.0 --- pkgs/development/libraries/gobject-introspection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 47ccb17e484..55abb21845b 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -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" ]; From 4d968dd416c9e5125a905a4360e317626e7ac96d Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 3 Apr 2016 07:28:15 +0200 Subject: [PATCH 05/12] pygobject: 3.18.2 -> 3.20.0 --- pkgs/development/python-modules/pygobject/3.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index b8082890299..6a58550e7c5 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -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 ]; From 3e3a24e2c688a8e0015caa595193de18ff22499d Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 30 Mar 2016 17:28:08 +0200 Subject: [PATCH 06/12] json-glib: 1.0.2 -> 1.2.0 --- pkgs/development/libraries/json-glib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index e49063a9de9..5cfafc8e69a 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -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"; From 386597c132ef953b6803f44feb5384a73686ab8d Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 30 Mar 2016 11:14:02 +0200 Subject: [PATCH 07/12] gdk-pixbuf: 2.32.3 -> 2.34.0 --- pkgs/development/libraries/gdk-pixbuf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 756ebf81619..1487d92dada 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -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" ]; From 325cfb219280bb9f6a5be39290750775572156fd Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 29 Mar 2016 10:37:39 +0200 Subject: [PATCH 08/12] gtk3: 3.18.5 -> 3.20.0 --- pkgs/development/libraries/gtk+/3.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index a2da4c7b033..a8b0118567a 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -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 = "0"; 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 = "00yqlqxzhpizdbg71g3gqlgch9gsp36ln1ybdiiwi7lmdr53lg8w"; }; outputs = [ "dev" "out" ]; From 972fd22fe4dc38ee3a0bc1658b1f8dd366df3a20 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 30 Mar 2016 16:33:16 +0200 Subject: [PATCH 09/12] cantarell-fonts: 0.0.17 -> 0.0.24 --- pkgs/data/fonts/cantarell-fonts/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 34434f60172..65df7fc1f95 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -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 = { From d30a9fd186e3d191a0164c932c90317d1f3e015b Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 2 Apr 2016 12:15:19 +0200 Subject: [PATCH 10/12] telepathy-glib: 0.24.0 -> 0.24.1 --- pkgs/development/libraries/telepathy/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 9167ecc76d4..bb187ce1202 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -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"; From 914e193dba94a8e3d65a46c53b0874398b7a205d Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 2 Apr 2016 08:27:23 +0200 Subject: [PATCH 11/12] gegl: 0.3.0-20140619 -> 0.3.6 --- pkgs/development/libraries/gegl/3.0.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 575e2d562aa..1ca0a2b5925 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -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"; From 802f830b2af18feb8cebe0c71323dadb5e407829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 19 Apr 2016 15:07:54 +0200 Subject: [PATCH 12/12] gtk3: maintenance update 3.20.0 -> 3.20.3 --- pkgs/development/libraries/gtk+/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index a8b0118567a..dcbf0b4a47c 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -12,7 +12,7 @@ with stdenv.lib; let ver_maj = "3.20"; - ver_min = "0"; + 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 = "00yqlqxzhpizdbg71g3gqlgch9gsp36ln1ybdiiwi7lmdr53lg8w"; + sha256 = "3834f3bf23b260b3e5ebfea41102e2026a8af29e36c3620edf4a5cf05e82f694"; }; outputs = [ "dev" "out" ];