7 files changed, 91 insertions, 21 deletions
diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix
index 515b834b41ea..c06a79727094 100644
--- a/pkgs/applications/graphics/mirage/default.nix
+++ b/pkgs/applications/graphics/mirage/default.nix
@@ -11,6 +11,8 @@ pythonPackages.buildPythonApplication rec {
 
     doCheck = false;
 
+    nativeBuildInputs = [ gettext ];
+
     buildInputs = [ stdenv libX11 gettext ];
 
     patchPhase = ''
diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix
index d5a071fcb54b..10c8a03fa0a2 100644
--- a/pkgs/applications/misc/plank/default.nix
+++ b/pkgs/applications/misc/plank/default.nix
@@ -1,21 +1,43 @@
-{ stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3
-, libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2
-, bamf, gdk-pixbuf, libdbusmenu-gtk3, file, gnome-menus, libgee
-, wrapGAppsHook, autoreconfHook, pantheon }:
+{ stdenv
+, fetchurl
+, vala
+, atk
+, cairo
+, glib
+, gnome3
+, gtk3
+, libwnck3
+, libX11
+, libXfixes
+, libXi
+, pango
+, gettext
+, pkgconfig
+, libxml2
+, bamf
+, gdk-pixbuf
+, libdbusmenu-gtk3
+, file
+, gnome-menus
+, libgee
+, wrapGAppsHook
+, autoreconfHook
+, pantheon
+}:
 
 stdenv.mkDerivation rec {
   pname = "plank";
-  version = "0.11.4";
+  version = "0.11.89";
 
   src = fetchurl {
     url = "https://launchpad.net/${pname}/1.0/${version}/+download/${pname}-${version}.tar.xz";
-    sha256 = "1f41i45xpqhjxql9nl4a1sz30s0j46aqdhbwbvgrawz6himcvdc8";
+    sha256 = "17cxlmy7n13jp1v8i4abxyx9hylzb39andhz3mk41ggzmrpa8qm6";
   };
 
   nativeBuildInputs = [
     autoreconfHook
+    gettext
     gnome3.gnome-common
-    intltool
     libxml2 # xmllint
     pkgconfig
     vala
@@ -47,7 +69,9 @@ stdenv.mkDerivation rec {
   ];
 
   # Make plank's application launcher hidden in Pantheon
-  patches = [ ./hide-in-pantheon.patch ];
+  patches = [
+    ./hide-in-pantheon.patch
+  ];
 
   postPatch = ''
     substituteInPlace ./configure \
@@ -56,7 +80,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Elegant, simple, clean dock";
-    homepage = https://launchpad.net/plank;
+    homepage = "https://launchpad.net/plank";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers;
diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix
index 6226cb338d95..369689520d8a 100644
--- a/pkgs/applications/networking/browsers/ephemeral/default.nix
+++ b/pkgs/applications/networking/browsers/ephemeral/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ephemeral";
-  version = "5.2.1";
+  version = "5.3.0";
 
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "ephemeral";
     rev = version;
-    sha256 = "01mj5gksz2qcwhp28zyk8qswmrw93db1g7mw3mg4klz99vzcry74";
+    sha256 = "1xglhv4rpl6vqryvliyvr9y8mqli4x4bjcfjsl1v8gdxkzkwfy39";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 2c427bb18242..bda811353f60 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "git-repo-${version}";
-  version = "1.13.4";
+  pname = "git-repo";
+  version = "1.13.5";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    sha256 = "0p55mx1ry0r3bb8nja09cfpiv1jjxf98r41vrqba1b5hm8hbzfhj";
+    sha256 = "0p9qzgdp88jzzl2zc6c263iww3phcqkyn02yvavhdgii926gi34q";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix
new file mode 100644
index 000000000000..be45d68dc5df
--- /dev/null
+++ b/pkgs/applications/window-managers/cage/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub
+, meson, ninja, pkgconfig, makeWrapper
+, wlroots, wayland, wayland-protocols, pixman, libxkbcommon
+, systemd, mesa, libX11
+, xwayland ? null
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cage";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "Hjdskes";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1vp4mfkflrjmlgyx5mkbzdi3iq58m76q7l9dfrsk85xn0642d6q1";
+  };
+
+  nativeBuildInputs = [ meson ninja pkgconfig makeWrapper ];
+
+  buildInputs = [
+    wlroots wayland wayland-protocols pixman libxkbcommon
+    # TODO: Not specified but required:
+    systemd mesa libX11
+  ];
+
+  enableParallelBuilding = true;
+
+  mesonFlags = [ "-Dxwayland=${stdenv.lib.boolToString (xwayland != null)}" ];
+
+  postFixup = stdenv.lib.optionalString (xwayland != null) ''
+    wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Wayland kiosk";
+    homepage    = https://www.hjdskes.nl/projects/cage/;
+    license     = licenses.mit;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index cc88153bab9c..ee561840da86 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase }:
+{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }:
 
-stdenv.mkDerivation rec {
-  name = "cmst-${version}";
+mkDerivation rec {
+  pname = "cmst";
   version = "2019.01.13";
 
   src = fetchFromGitHub {
     repo = "cmst";
     owner = "andrew-bibb";
-    rev = name;
+    rev = "cmst-${version}";
     sha256 = "13739f0ddld34dcqlfhylzn1zqz5a7jbp4a4id7gj7pcxjx1lafh";
   };
 
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "QT GUI for Connman with system tray icon";
     homepage = https://github.com/andrew-bibb/cmst;
-    maintainers = [ stdenv.lib.maintainers.matejc ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ lib.maintainers.matejc ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc5a35320adf..9eeb1084144c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17522,6 +17522,8 @@ in
 
   bviplus = callPackage ../applications/editors/bviplus { };
 
+  cage = callPackage ../applications/window-managers/cage { };
+
   calf = callPackage ../applications/audio/calf {
       inherit (gnome2) libglade;
       stdenv = gcc5Stdenv;