From 6a19f7245890972b245c37796cc28f2819ef62fd Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 12 Aug 2016 12:13:02 +0200 Subject: [PATCH 01/12] appstream-glib: 0.5.11 -> 0.5.12 --- pkgs/development/libraries/appstream-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index e6051552ab71..8450def08452 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { - name = "appstream-glib-0.5.11"; + name = "appstream-glib-0.5.12"; src = fetchFromGitHub { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; - sha256 = "1rvfncm9z29h70pd718j73cd263g6yyxkxrg7zfzy0gj6wwzvhkh"; + sha256 = "00b0441f409vzgy0znn42k093w7hwv3495qvsakxnhvk1h1ws23s"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ]; From 7144b294d7e28b73896cfac20b92aa75e1042741 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 12 Aug 2016 12:13:29 +0200 Subject: [PATCH 02/12] evolution: 3.20.4 -> 3.20.5 --- pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix index 9c55a6b60e2e..b43dc9c505d1 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/evolution/src.nix @@ -1,11 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update -fetchurl: rec { - major = "3.20"; - name = "evolution-${major}.4"; +fetchurl: { + name = "evolution-3.20.5"; src = fetchurl { - url = "mirror://gnome/sources/evolution/${major}/${name}.tar.xz"; - sha256 = "1g1nai6jz0irz94d06vx8gbwbzdp7r53qjxvjfhdqhlhnhy76a9c"; + url = mirror://gnome/sources/evolution/3.20/evolution-3.20.5.tar.xz; + sha256 = "2e13551ce0996963506f0bdde5e01c3b8aa0622849a272ff12877cd595baeb6e"; }; } From 4a192c25dbcbe908e9cce5eab68faa595637f27e Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 12 Aug 2016 12:13:43 +0200 Subject: [PATCH 03/12] gnome-maps: 3.20.1 -> 3.20.2 --- pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix index 1ef58f33c90d..054f340bf42f 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-maps-3.20.1"; + name = "gnome-maps-3.20.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-maps/3.20/gnome-maps-3.20.1.tar.xz; - sha256 = "4874d10a3cfdffd5d1db6084d67b5e8dc8c2db2ff995302b80060ecfc5e99bd5"; + url = mirror://gnome/sources/gnome-maps/3.20/gnome-maps-3.20.2.tar.xz; + sha256 = "e860144795339fdbb2f1239c4db092ad12beb9acaa3f3f8aa1d935c36d86bc3f"; }; } From 182083c68e4d5b69b5bb491132e0037daec33d81 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 12 Aug 2016 12:13:54 +0200 Subject: [PATCH 04/12] gnome-photos: 3.20.2 -> 3.20.3 --- pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix index c24de8525a87..e8569dc5433a 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-photos/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-photos-3.20.2"; + name = "gnome-photos-3.20.3"; src = fetchurl { - url = mirror://gnome/sources/gnome-photos/3.20/gnome-photos-3.20.2.tar.xz; - sha256 = "ec6b95ad1c4aeeb065a65d2d48335036c0750761c7f6762bafcf874791272b46"; + url = mirror://gnome/sources/gnome-photos/3.20/gnome-photos-3.20.3.tar.xz; + sha256 = "d1dd8bd8178dd1d0120abd2ff3e959fb1199f4e1751558f925ce7f1278548996"; }; } From 05ffaa5df16df711478b2173695e669dbb458ed1 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 12 Aug 2016 12:14:06 +0200 Subject: [PATCH 05/12] evolution-data-server: 3.20.4 -> 3.20.5 --- .../gnome-3/3.20/core/evolution-data-server/src.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix index cdb3dacf7ab5..eaeece5baf20 100644 --- a/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/evolution-data-server/src.nix @@ -1,11 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update -fetchurl: rec { - major = "3.20"; - name = "evolution-data-server-${major}.4"; +fetchurl: { + name = "evolution-data-server-3.20.5"; src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/${major}/${name}.tar.xz"; - sha256 = "03h81dnk34b3xf2065rymr1jd7as4dmpd89hyf380c5np36f6l7j"; + url = mirror://gnome/sources/evolution-data-server/3.20/evolution-data-server-3.20.5.tar.xz; + sha256 = "0d1586cd326d997497a2a6fddd939a83892be07cb20f8c88fda5013f8c5bbe7e"; }; } From b5c2b4fc80256180cd885974f5d8eb24af41e288 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 12 Aug 2016 12:14:29 +0200 Subject: [PATCH 06/12] gnome-calculator: 3.20.1 -> 3.20.2 --- pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix index a24b0b5b8767..60270be06b7f 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-calculator/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-calculator-3.20.1"; + name = "gnome-calculator-3.20.2"; src = fetchurl { - url = mirror://gnome/sources/gnome-calculator/3.20/gnome-calculator-3.20.1.tar.xz; - sha256 = "02edcf99857599ac10ecd2faaf33ad20a9f11f7c5a89a52ee1b511d99b594b90"; + url = mirror://gnome/sources/gnome-calculator/3.20/gnome-calculator-3.20.2.tar.xz; + sha256 = "2af1c12a12a230f90fc221ff908efd80fe7eebfeaad56cd698c393d2fc34a8fb"; }; } From 874fb49d19ee20958fa2c7978cea01f34df8e016 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 12 Aug 2016 12:14:44 +0200 Subject: [PATCH 07/12] gnome-online-accounts: 3.20.2 -> 3.20.3 --- .../gnome-3/3.20/core/gnome-online-accounts/src.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix index 4c263d9d2d68..088c4127b800 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/src.nix @@ -1,11 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update -fetchurl: rec { - major = "3.20"; - name = "gnome-online-accounts-${major}.2"; +fetchurl: { + name = "gnome-online-accounts-3.20.3"; src = fetchurl { - url = "mirror://gnome/sources/gnome-online-accounts/${major}/${name}.tar.xz"; - sha256 = "1pf1rn1i7dqll9ph6scg2g281njx5pq6z0wyj9493m474nfmsmab"; + url = mirror://gnome/sources/gnome-online-accounts/3.20/gnome-online-accounts-3.20.3.tar.xz; + sha256 = "094fc04cf3e0b4ace667fce3b5bdcca5093e0c93f9184439e663c69546c1e046"; }; } From 85c90e7a9112859348555c2fe30b130e357ef7ef Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 12 Aug 2016 12:15:06 +0200 Subject: [PATCH 08/12] gnome-software: 3.20.0 -> 3.20.4 --- pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix index 4d377903cc1d..ea9378fcd3cc 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-software/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-software-3.20.0"; + name = "gnome-software-3.20.4"; src = fetchurl { - url = mirror://gnome/sources/gnome-software/3.20/gnome-software-3.20.0.tar.xz; - sha256 = "0w0bp29fm13a235gq8vylihzjfxx20ri46w4w2syaw0cixxihbix"; + url = mirror://gnome/sources/gnome-software/3.20/gnome-software-3.20.4.tar.xz; + sha256 = "d6a2794348e2c543218e3efb01105a7e6d51e93ad3055a2482e3104ca75345f2"; }; } From f3f0ddbae456cf1ce8b03623337c1dafc16c2998 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 12 Aug 2016 12:15:18 +0200 Subject: [PATCH 09/12] nautilus: 3.20.1 -> 3.20.2 --- pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix index b9e1ceeba204..467bb13a74ed 100644 --- a/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/nautilus/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "nautilus-3.20.1"; + name = "nautilus-3.20.2"; src = fetchurl { - url = mirror://gnome/sources/nautilus/3.20/nautilus-3.20.1.tar.xz; - sha256 = "f2a907b994026412a7ed7c8145d4ab4f886ac87e780353b967473305a35e81e8"; + url = mirror://gnome/sources/nautilus/3.20/nautilus-3.20.2.tar.xz; + sha256 = "8d6e679b880dc78c0c2e2dabf6025e6da34ff279dee501f7c75f3649c1a6caae"; }; } From 29e16541bd706931adcb10fb0a2badbff017042f Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 12 Aug 2016 12:15:35 +0200 Subject: [PATCH 10/12] five-or-more: 3.20.0 -> 3.20.1 --- pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix index 207917c9772c..3bdd6e27645e 100644 --- a/pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix +++ b/pkgs/desktops/gnome-3/3.20/games/five-or-more/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "five-or-more-3.20.0"; + name = "five-or-more-3.20.1"; src = fetchurl { - url = mirror://gnome/sources/five-or-more/3.20/five-or-more-3.20.0.tar.xz; - sha256 = "4290a0e4a1817d76db2f042854efbc580d6ac06f2c42176afac2b412dcd456e0"; + url = mirror://gnome/sources/five-or-more/3.20/five-or-more-3.20.1.tar.xz; + sha256 = "9f6dff43b6511b12ef062f4dc4d9ab8de2579676747f0ead4802e0f166a5e85f"; }; } From bcb8e76619277cf2d3aed8f8697244d86008ffee Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 12 Aug 2016 14:11:53 +0200 Subject: [PATCH 11/12] gegl: add missing libraw dependency --- pkgs/development/libraries/gegl/3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index f66ade28da9d..2a201ed55236 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which -, librsvg, pango, gtk, bzip2, intltool, libtool, automake, autoconf, json_glib }: +, librsvg, pango, gtk, bzip2, intltool, libtool, automake, autoconf, json_glib , libraw }: stdenv.mkDerivation rec { name = "gegl-0.3.6"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-docs"; buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool - autoconf automake libtool which json_glib ]; + autoconf automake libtool which json_glib libraw ]; nativeBuildInputs = [ pkgconfig ]; From 8cac3752f15c2412a2f955537577abab94e561a3 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 12 Aug 2016 14:12:36 +0200 Subject: [PATCH 12/12] libraw: propagate lcms2 so gegl finds it --- pkgs/development/libraries/libraw/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index ee842b0c4bdd..0b196cc22e01 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "18fygk896gxbx47nh2rn5jp4skisgkl6pdfjqb7h0zn39hd6b6g5"; }; - buildInputs = [ lcms2 jasper ]; + buildInputs = [ jasper ]; + + propagatedBuildInputs = [ lcms2 ]; nativeBuildInputs = [ pkgconfig ];