about summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-11-27 12:19:01 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-11-27 12:19:01 +0100
commit6345089ca0af23a29387f48060a53dff0d0d30f5 (patch)
treeaa11989838217951662f46c011205e11d525e4dc /pkgs/desktops/gnome-3/default.nix
parent658951917437e7d587c8a206cc6497a7f1192891 (diff)
parente69a3248f7c8308b0d583941e8f1bb1a99a431a7 (diff)
downloadnixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar
nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.gz
nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.bz2
nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.lz
nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.xz
nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.zst
nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.zip
Merge #29392: gnome3: 3.24 -> 3.26
It might be slightly confusing that a couple of the changes will be twice
in the history, but let's merge this way.
Diffstat (limited to 'pkgs/desktops/gnome-3/default.nix')
-rw-r--r--pkgs/desktops/gnome-3/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 585f79ddea67..30afc85ae8a0 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -13,7 +13,7 @@ let
 
   callPackage = pkgs.newScope self;
 
-  version = "3.24";
+  version = "3.26";
   maintainers = with pkgs.lib.maintainers; [ lethalman ];
 
   corePackages = with gnome3; [
@@ -54,7 +54,7 @@ let
   gnome3 = self // { recurseForDerivations = false; };
   gtk = gtk3;
   gtkmm = gtkmm3;
-  vala = pkgs.vala_0_32;
+  vala = pkgs.vala_0_38;
   gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
 
 # Simplify the nixos module and gnome packages
@@ -237,7 +237,9 @@ let
 
   totem-pl-parser = callPackage ./core/totem-pl-parser { };
 
-  tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; };
+  tracker = callPackage ./core/tracker { };
+
+  tracker-miners = callPackage ./core/tracker-miners { };
 
   vte = callPackage ./core/vte { };