summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-02-13 12:33:29 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-02-13 12:33:29 +0100
commit7257dedd7cf28634e08fc0458ed34a183065b70e (patch)
tree53d0274ecfd0474666bceec021ce059e428a4b47 /pkgs/desktops/gnome-3
parent7c3588d8ddc35909ca56394c3a5464d6e1551fe0 (diff)
parent563b491ce89bafaa928beba19a37f6381bfc60d0 (diff)
downloadnixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar
nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.gz
nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.bz2
nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.lz
nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.xz
nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.zst
nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r--pkgs/desktops/gnome-3/core/epiphany/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/default.nix2
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 28310124718..c8ca0016d57 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "epiphany-${version}";
-  version = "3.30.2";
+  version = "3.30.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0141bb37nd8wc743g4wy491crjh6ig76ack07aj2ba4z3gjz2zlc";
+    sha256 = "05qdzx18ld1m3xiajpz6y6snfj56bgyjsgm7f4rqrnpjdbdvikbn";
   };
 
   # Tests need an X display
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 7c028656fae..34b3faf71a4 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -19,7 +19,7 @@ lib.makeScope pkgs.newScope (self: with self; {
     in
       lib.filter (x: !(builtins.elem (pkgName x) namesToRemove)) packages;
 
-  maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar hedning ];
+  maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar hedning worldofpeace ];
 
   corePackages = with gnome3; [
     pkgs.desktop-file-utils